From 649337f6059f09d15dd54899bf9f230d82a7fca8 Mon Sep 17 00:00:00 2001
From: jordankzf <jordan@secretkeylabs.com>
Date: Tue, 30 Jul 2024 12:57:50 +0800
Subject: [PATCH 001/227] Show Swap button in SIP-10 Coin detail

---
 src/app/screens/coinDashboard/coinHeader.tsx | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/app/screens/coinDashboard/coinHeader.tsx b/src/app/screens/coinDashboard/coinHeader.tsx
index 98e0bf6ea..75177e0b2 100644
--- a/src/app/screens/coinDashboard/coinHeader.tsx
+++ b/src/app/screens/coinDashboard/coinHeader.tsx
@@ -168,7 +168,9 @@ export default function CoinHeader({ currency, fungibleToken }: Props) {
 
   const isCrossChainSwapsEnabled = useHasFeature(FeatureId.CROSS_CHAIN_SWAPS);
   const showRunesSwap =
-    (currency === 'FT' && fungibleToken?.protocol === 'runes') || currency === 'BTC';
+    (currency === 'FT' && fungibleToken?.protocol === 'runes') ||
+    fungibleToken?.protocol === 'stacks' ||
+    currency === 'BTC';
   // ledger is disabled for now
   const showSwaps = isCrossChainSwapsEnabled && showRunesSwap && !isLedgerAccount(selectedAccount);
 

From b9a531eddfeabf8f75e581d5e967d0636ab6e64c Mon Sep 17 00:00:00 2001
From: jordankzf <jordan@secretkeylabs.com>
Date: Tue, 30 Jul 2024 13:04:35 +0800
Subject: [PATCH 002/227] Notes

---
 src/app/screens/swap/index.tsx | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/app/screens/swap/index.tsx b/src/app/screens/swap/index.tsx
index b12ecdf54..c9e37b780 100644
--- a/src/app/screens/swap/index.tsx
+++ b/src/app/screens/swap/index.tsx
@@ -125,6 +125,7 @@ export default function SwapScreen() {
 
   const { fiatCurrency } = useWalletSelector();
 
+  // Hook for SIP-10
   const { unfilteredData } = useRuneFungibleTokensQuery();
   const { data: btcBalance } = useBtcWalletData();
   const { btcFiatRate } = useCoinRates();
@@ -135,6 +136,7 @@ export default function SwapScreen() {
   const defaultFrom = params.get('from');
   const { quotes, loading: quotesLoading, error: quotesError, fetchQuotes } = useGetQuotes();
 
+  // Combined list
   const runesCoinsList = unfilteredData ?? [];
 
   useEffect(() => {

From 34b518fe4babbc89b9be8b7092dddb85e335b093 Mon Sep 17 00:00:00 2001
From: jordankzf <jordan@secretkeylabs.com>
Date: Tue, 30 Jul 2024 14:19:21 +0800
Subject: [PATCH 003/227] Show Swap button in STX Coin detail

---
 src/app/screens/coinDashboard/coinHeader.tsx | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/app/screens/coinDashboard/coinHeader.tsx b/src/app/screens/coinDashboard/coinHeader.tsx
index 75177e0b2..fe21c13f7 100644
--- a/src/app/screens/coinDashboard/coinHeader.tsx
+++ b/src/app/screens/coinDashboard/coinHeader.tsx
@@ -170,7 +170,8 @@ export default function CoinHeader({ currency, fungibleToken }: Props) {
   const showRunesSwap =
     (currency === 'FT' && fungibleToken?.protocol === 'runes') ||
     fungibleToken?.protocol === 'stacks' ||
-    currency === 'BTC';
+    currency === 'BTC' ||
+    currency === 'STX';
   // ledger is disabled for now
   const showSwaps = isCrossChainSwapsEnabled && showRunesSwap && !isLedgerAccount(selectedAccount);
 

From f3bd69a472685d88249f01b71d476cb6410a0e0c Mon Sep 17 00:00:00 2001
From: jordankzf <jordan@secretkeylabs.com>
Date: Tue, 30 Jul 2024 17:56:35 +0800
Subject: [PATCH 004/227] wip

---
 .../components/tokenFromBottomSheet/index.tsx |   2 +-
 .../tokenFromBottomSheet/useFromTokens.ts     |   8 +-
 src/app/screens/swap/index.tsx                | 118 ++++++++++++------
 src/app/screens/swap/useMasterCoinsList.tsx   |  18 +++
 4 files changed, 107 insertions(+), 39 deletions(-)
 create mode 100644 src/app/screens/swap/useMasterCoinsList.tsx

diff --git a/src/app/screens/swap/components/tokenFromBottomSheet/index.tsx b/src/app/screens/swap/components/tokenFromBottomSheet/index.tsx
index 1a989bb10..70589f00d 100644
--- a/src/app/screens/swap/components/tokenFromBottomSheet/index.tsx
+++ b/src/app/screens/swap/components/tokenFromBottomSheet/index.tsx
@@ -30,7 +30,7 @@ interface Props {
   visible: boolean;
   title: string;
   to?: TokenBasic;
-  onSelectCoin: (token: FungibleToken | 'BTC') => void;
+  onSelectCoin: (token: FungibleToken) => void;
   onClose: () => void;
 }
 
diff --git a/src/app/screens/swap/components/tokenFromBottomSheet/useFromTokens.ts b/src/app/screens/swap/components/tokenFromBottomSheet/useFromTokens.ts
index 06d585620..2a69305b1 100644
--- a/src/app/screens/swap/components/tokenFromBottomSheet/useFromTokens.ts
+++ b/src/app/screens/swap/components/tokenFromBottomSheet/useFromTokens.ts
@@ -14,10 +14,16 @@ import { sortFtByFiatBalance } from '@utils/tokens';
 
 const useFromTokens = (to?: TokenBasic) => {
   const { network } = useWalletSelector();
-  const { unfilteredData: runesCoinsList } = useRuneFungibleTokensQuery();
+  const { acceptableCoinList: sip10FtList } = useStxCurrencyConversion();
+  const { unfilteredData: runesFtList } = useRuneFungibleTokensQuery();
   const { stxBtcRate, btcFiatRate } = useCoinRates();
   const { btcAddress } = useSelectedAccount();
 
+  const coinsMasterList = useMemo(
+    () => [...sip10FtList, ...(runesFtList || []), btcFt, stxFt] ?? [],
+    [sip10FtList, runesFtList],
+  );
+
   const filteredRunesTokensObject = (runesCoinsList ?? []).reduce((acc, ft) => {
     acc[ft.principal] = ft;
     return acc;
diff --git a/src/app/screens/swap/index.tsx b/src/app/screens/swap/index.tsx
index c9e37b780..4af452627 100644
--- a/src/app/screens/swap/index.tsx
+++ b/src/app/screens/swap/index.tsx
@@ -10,6 +10,7 @@ import {
   AnalyticsEvents,
   btcToSats,
   getBtcFiatEquivalent,
+  type BaseToken,
   type ExecuteOrderRequest,
   type FungibleToken,
   type GetUtxosRequest,
@@ -26,7 +27,7 @@ import { satsToBtcString } from '@utils/helper';
 import { trackMixPanel } from '@utils/mixpanel';
 import { getFtBalance } from '@utils/tokens';
 import BigNumber from 'bignumber.js';
-import { useEffect, useState } from 'react';
+import { useEffect, useMemo, useState } from 'react';
 import toast from 'react-hot-toast';
 import { useTranslation } from 'react-i18next';
 import { useLocation, useNavigate } from 'react-router-dom';
@@ -38,6 +39,7 @@ import TokenFromBottomSheet from './components/tokenFromBottomSheet';
 import TokenToBottomSheet from './components/tokenToBottomSheet';
 import QuoteSummary from './quoteSummary';
 import QuotesModal from './quotesModal';
+import { useStxCurrencyConversion } from './useStxCurrencyConversion';
 import {
   mapFTNativeSwapTokenToTokenBasic,
   mapFTProtocolToSwapProtocol,
@@ -93,14 +95,51 @@ const Icon = styled.img`
   rotate: 90deg;
 `;
 
-const mapFtToSwapToken = (ft: FungibleToken | 'BTC'): Token => ({
-  ticker: ft === 'BTC' ? 'BTC' : ft.principal ?? '',
-  name: ft === 'BTC' ? 'Bitcoin' : ft.name ?? ft.assetName ?? '',
-  protocol: ft === 'BTC' ? 'btc' : mapFTProtocolToSwapProtocol(ft.protocol ?? 'runes'),
-  divisibility: ft === 'BTC' ? 8 : ft?.decimals ?? 0,
-  logo: ft === 'BTC' ? undefined : ft.image ?? ft.runeInscriptionId ?? '',
-  symbol: ft === 'BTC' ? undefined : ft.runeSymbol ?? '',
-});
+export const btcFt: FungibleToken = {
+  name: 'Bitcoin',
+  balance: '',
+  total_sent: '',
+  total_received: '',
+  principal: 'BTC',
+  assetName: 'Bitcoin',
+};
+
+export const stxFt: FungibleToken = {
+  name: 'Stacks',
+  balance: '',
+  total_sent: '',
+  total_received: '',
+  principal: 'STX',
+  assetName: 'Stacks',
+};
+
+const mapFtToSwapToken = (st: FungibleToken): Token => {
+  if (st.principal === 'BTC') {
+    return {
+      ticker: 'BTC',
+      name: 'Bitcoin',
+      protocol: 'btc',
+      divisibility: 8,
+    };
+  }
+  if (st.principal === 'STX') {
+    return {
+      ticker: 'STX',
+      name: 'Stacks',
+      protocol: 'stx',
+      divisibility: 6,
+    };
+  }
+
+  return {
+    ticker: st.principal ?? '',
+    name: st.name ?? st.assetName ?? '',
+    protocol: mapFTProtocolToSwapProtocol(st.protocol ?? 'runes'),
+    divisibility: st.decimals ?? 0,
+    logo: st.image ?? st.runeInscriptionId ?? '',
+    symbol: st.runeSymbol ?? '',
+  };
+};
 
 export default function SwapScreen() {
   const [amount, setAmount] = useState('');
@@ -112,7 +151,7 @@ export default function SwapScreen() {
   const [tokenSelectionBottomSheet, setTokenSelectionBottomSheet] = useState<'from' | 'to' | null>(
     null,
   );
-  const [fromToken, setFromToken] = useState<FungibleToken | 'BTC' | undefined>();
+  const [fromToken, setFromToken] = useState<FungibleToken | undefined>();
   const [toToken, setToToken] = useState<Token | undefined>();
   const [utxosRequest, setUtxosRequest] = useState<GetUtxosRequest | null>(null);
   const [inputError, setInputError] = useState('');
@@ -126,7 +165,8 @@ export default function SwapScreen() {
   const { fiatCurrency } = useWalletSelector();
 
   // Hook for SIP-10
-  const { unfilteredData } = useRuneFungibleTokensQuery();
+  const { acceptableCoinList: sip10FtList } = useStxCurrencyConversion();
+  const { unfilteredData: runesFtList } = useRuneFungibleTokensQuery();
   const { data: btcBalance } = useBtcWalletData();
   const { btcFiatRate } = useCoinRates();
   const navigate = useNavigate();
@@ -137,17 +177,17 @@ export default function SwapScreen() {
   const { quotes, loading: quotesLoading, error: quotesError, fetchQuotes } = useGetQuotes();
 
   // Combined list
-  const runesCoinsList = unfilteredData ?? [];
+  const coinsMasterList = useMemo(
+    () => [...sip10FtList, ...(runesFtList || []), btcFt, stxFt] ?? [],
+    [sip10FtList, runesFtList],
+  );
 
   useEffect(() => {
     if (defaultFrom) {
-      const token =
-        defaultFrom === 'BTC'
-          ? 'BTC'
-          : runesCoinsList.find((coin) => coin.principal === defaultFrom);
+      const token = coinsMasterList.find((coin) => coin.principal === defaultFrom);
       setFromToken(token);
     }
-  }, [defaultFrom, runesCoinsList.length]);
+  }, [defaultFrom, coinsMasterList.length]);
 
   const handleGoBack = () => {
     navigate(-1);
@@ -165,7 +205,8 @@ export default function SwapScreen() {
     setGetQuotesModalVisible(true);
   }, [quotes, quotesLoading, quotesError]);
 
-  const amountForQuote = fromToken === 'BTC' ? btcToSats(new BigNumber(amount)).toString() : amount;
+  const amountForQuote =
+    fromToken?.principal === 'BTC' ? btcToSats(new BigNumber(amount)).toString() : amount;
 
   const getQuotes = async () => {
     if (!fromToken || !toToken) {
@@ -173,7 +214,7 @@ export default function SwapScreen() {
     }
 
     trackMixPanel(AnalyticsEvents.FetchSwapQuote, {
-      from: fromToken === 'BTC' ? 'BTC' : fromToken.name,
+      from: fromToken.principal === 'BTC' ? 'BTC' : fromToken.name,
       to: toToken.protocol === 'btc' ? 'BTC' : toToken.name ?? toToken.ticker,
     });
 
@@ -196,7 +237,7 @@ export default function SwapScreen() {
     // add more protocols here when needed
     switch (ftProtocol) {
       case 'runes':
-        return runesCoinsList.find((coin) => coin.principal === ticker);
+        return coinsMasterList.find((coin) => coin.principal === ticker);
       default:
         return undefined;
     }
@@ -213,9 +254,7 @@ export default function SwapScreen() {
     setAmount('');
     setHasQuoteError(false);
     const newFrom =
-      toToken.protocol === 'btc'
-        ? 'BTC'
-        : getUserFTFromTokenTicker(toToken.protocol, toToken.ticker) ?? mapSwapTokenToFT(toToken);
+      getUserFTFromTokenTicker(toToken.protocol, toToken.ticker) ?? mapSwapTokenToFT(toToken);
     const newTo = mapFtToSwapToken(fromToken);
     setFromToken(newFrom);
     setToToken(newTo);
@@ -226,7 +265,7 @@ export default function SwapScreen() {
     setToToken(token);
   };
 
-  const onChangeFromToken = (token: FungibleToken | 'BTC') => {
+  const onChangeFromToken = (token: FungibleToken) => {
     setInputError('');
     setAmount('');
     setHasQuoteError(false);
@@ -241,7 +280,7 @@ export default function SwapScreen() {
       return;
     }
 
-    if (fromToken === 'BTC') {
+    if (fromToken.principal === 'BTC') {
       const amountInSats = btcToSats(new BigNumber(value));
       setInputError(
         BigNumber(amountInSats).gt(BigNumber(btcBalance ?? 0))
@@ -263,7 +302,7 @@ export default function SwapScreen() {
       return undefined;
     }
 
-    if (fromToken === 'BTC') {
+    if (fromToken.principal === 'BTC') {
       return satsToBtcString(BigNumber(btcBalance ?? 0));
     }
 
@@ -276,7 +315,7 @@ export default function SwapScreen() {
   const getFromAmountFiatValue = () => {
     const balance = new BigNumber(amount || '0');
 
-    if (fromToken === 'BTC') {
+    if (fromToken?.principal === 'BTC') {
       const amountInSats = btcToSats(new BigNumber(balance));
       return getBtcFiatEquivalent(amountInSats, new BigNumber(btcFiatRate)).toFixed(2);
     }
@@ -295,7 +334,7 @@ export default function SwapScreen() {
     }
 
     // we can't use max for btc
-    if (fromToken === 'BTC') {
+    if (fromToken.principal === 'BTC' || fromToken.principal === 'STX') {
       return;
     }
 
@@ -312,9 +351,11 @@ export default function SwapScreen() {
   const isGetQuotesDisabled = ifFormInValid || quotesLoading || Boolean(quotesError);
 
   const isMaxDisabled =
-    !fromToken || fromToken === 'BTC' || BigNumber(amount).eq(getFtBalance(fromToken));
+    !fromToken || fromToken.principal === 'BTC' || BigNumber(amount).eq(getFtBalance(fromToken));
   const isRunesToBtcRoute =
-    fromToken !== 'BTC' && fromToken?.protocol === 'runes' && toToken?.protocol === 'btc';
+    fromToken?.principal !== 'BTC' &&
+    fromToken?.protocol === 'runes' &&
+    toToken?.protocol === 'btc';
 
   useEffect(() => {
     if (errorMessage) {
@@ -341,7 +382,7 @@ export default function SwapScreen() {
 
     trackMixPanel(AnalyticsEvents.SelectSwapQuote, {
       provider: provider.provider.name,
-      from: fromToken === 'BTC' ? 'BTC' : fromToken.name,
+      from: fromToken.principal === 'BTC' ? 'BTC' : fromToken.name,
       to: toToken.protocol === 'btc' ? 'BTC' : toToken.name ?? toToken.ticker,
     });
 
@@ -357,7 +398,8 @@ export default function SwapScreen() {
         providerCode: provider.provider.code,
         from: provider.from,
         to: provider.to,
-        amount: fromToken === 'BTC' ? btcToSats(new BigNumber(amount)).toString() : amount,
+        amount:
+          fromToken.principal === 'BTC' ? btcToSats(new BigNumber(amount)).toString() : amount,
       };
       setUtxosRequest(request);
     }
@@ -371,7 +413,7 @@ export default function SwapScreen() {
     }
     trackMixPanel(AnalyticsEvents.SignSwap, {
       provider: provider.name,
-      from: fromToken === 'BTC' ? 'BTC' : fromToken.name,
+      from: fromToken.principal === 'BTC' ? 'BTC' : fromToken.name,
       to: toToken.protocol === 'btc' ? 'BTC' : toToken.name ?? toToken.ticker,
     });
   };
@@ -485,16 +527,18 @@ export default function SwapScreen() {
               fiatValue: getFromAmountFiatValue(),
               fiatCurrency,
               protocol:
-                fromToken === 'BTC'
+                fromToken?.principal === 'BTC'
                   ? 'btc'
                   : fromToken?.protocol
                   ? mapFTProtocolToSwapProtocol(fromToken.protocol)
                   : undefined,
-              decimals: fromToken === 'BTC' ? 8 : fromToken?.decimals,
-              unit: fromToken === 'BTC' ? 'BTC' : fromToken?.runeSymbol ?? '',
+              decimals: fromToken?.principal === 'BTC' ? 8 : fromToken?.decimals,
+              unit: fromToken?.principal === 'BTC' ? 'BTC' : fromToken?.runeSymbol ?? '',
             }}
             max={
-              fromToken === 'BTC' ? undefined : { isDisabled: isMaxDisabled, onClick: onClickMax }
+              fromToken?.principal === 'BTC'
+                ? undefined
+                : { isDisabled: isMaxDisabled, onClick: onClickMax }
             }
             balance={getFromBalance()}
           />
diff --git a/src/app/screens/swap/useMasterCoinsList.tsx b/src/app/screens/swap/useMasterCoinsList.tsx
new file mode 100644
index 000000000..e2e1dfde2
--- /dev/null
+++ b/src/app/screens/swap/useMasterCoinsList.tsx
@@ -0,0 +1,18 @@
+import { useRuneFungibleTokensQuery } from '@hooks/queries/runes/useRuneFungibleTokensQuery';
+import { useMemo } from 'react';
+import { btcFt, stxFt } from './index';
+import { useStxCurrencyConversion } from './useStxCurrencyConversion';
+
+const useMasterCoinsList = () => {
+  const { acceptableCoinList: sip10FtList } = useStxCurrencyConversion();
+  const { unfilteredData: runesFtList } = useRuneFungibleTokensQuery();
+
+  const coinsMasterList = useMemo(
+    () => [...sip10FtList, ...(runesFtList || []), btcFt, stxFt] ?? [],
+    [sip10FtList, runesFtList],
+  );
+
+  return coinsMasterList;
+};
+
+export default useMasterCoinsList;

From de8748a161c25feae0c19ff66d97ff4279468fb6 Mon Sep 17 00:00:00 2001
From: jordankzf <jordan@secretkeylabs.com>
Date: Thu, 1 Aug 2024 21:32:02 +0800
Subject: [PATCH 005/227] wip 2

---
 .../tokenFromBottomSheet/useFromTokens.ts     |  6 ++----
 src/app/screens/swap/index.tsx                | 18 -----------------
 src/app/screens/swap/useMasterCoinsList.tsx   | 20 ++++++++++++++++++-
 3 files changed, 21 insertions(+), 23 deletions(-)

diff --git a/src/app/screens/swap/components/tokenFromBottomSheet/useFromTokens.ts b/src/app/screens/swap/components/tokenFromBottomSheet/useFromTokens.ts
index 2a69305b1..eb96c3b2c 100644
--- a/src/app/screens/swap/components/tokenFromBottomSheet/useFromTokens.ts
+++ b/src/app/screens/swap/components/tokenFromBottomSheet/useFromTokens.ts
@@ -2,6 +2,7 @@ import { useRuneFungibleTokensQuery } from '@hooks/queries/runes/useRuneFungible
 import useCoinRates from '@hooks/queries/useCoinRates';
 import useSelectedAccount from '@hooks/useSelectedAccount';
 import useWalletSelector from '@hooks/useWalletSelector';
+import useMasterCoinsList from '@screens/swap/useMasterCoinsList';
 import { mapFTProtocolToSwapProtocol } from '@screens/swap/utils';
 import {
   getXverseApiClient,
@@ -19,10 +20,7 @@ const useFromTokens = (to?: TokenBasic) => {
   const { stxBtcRate, btcFiatRate } = useCoinRates();
   const { btcAddress } = useSelectedAccount();
 
-  const coinsMasterList = useMemo(
-    () => [...sip10FtList, ...(runesFtList || []), btcFt, stxFt] ?? [],
-    [sip10FtList, runesFtList],
-  );
+  const coinsMasterList = useMasterCoinsList();
 
   const filteredRunesTokensObject = (runesCoinsList ?? []).reduce((acc, ft) => {
     acc[ft.principal] = ft;
diff --git a/src/app/screens/swap/index.tsx b/src/app/screens/swap/index.tsx
index 4af452627..1d4a0a63f 100644
--- a/src/app/screens/swap/index.tsx
+++ b/src/app/screens/swap/index.tsx
@@ -95,24 +95,6 @@ const Icon = styled.img`
   rotate: 90deg;
 `;
 
-export const btcFt: FungibleToken = {
-  name: 'Bitcoin',
-  balance: '',
-  total_sent: '',
-  total_received: '',
-  principal: 'BTC',
-  assetName: 'Bitcoin',
-};
-
-export const stxFt: FungibleToken = {
-  name: 'Stacks',
-  balance: '',
-  total_sent: '',
-  total_received: '',
-  principal: 'STX',
-  assetName: 'Stacks',
-};
-
 const mapFtToSwapToken = (st: FungibleToken): Token => {
   if (st.principal === 'BTC') {
     return {
diff --git a/src/app/screens/swap/useMasterCoinsList.tsx b/src/app/screens/swap/useMasterCoinsList.tsx
index e2e1dfde2..8f291169b 100644
--- a/src/app/screens/swap/useMasterCoinsList.tsx
+++ b/src/app/screens/swap/useMasterCoinsList.tsx
@@ -1,8 +1,26 @@
 import { useRuneFungibleTokensQuery } from '@hooks/queries/runes/useRuneFungibleTokensQuery';
+import type { FungibleToken } from '@secretkeylabs/xverse-core';
 import { useMemo } from 'react';
-import { btcFt, stxFt } from './index';
 import { useStxCurrencyConversion } from './useStxCurrencyConversion';
 
+export const btcFt: FungibleToken = {
+  name: 'Bitcoin',
+  balance: '',
+  total_sent: '',
+  total_received: '',
+  principal: 'BTC',
+  assetName: 'Bitcoin',
+};
+
+export const stxFt: FungibleToken = {
+  name: 'Stacks',
+  balance: '',
+  total_sent: '',
+  total_received: '',
+  principal: 'STX',
+  assetName: 'Stacks',
+};
+
 const useMasterCoinsList = () => {
   const { acceptableCoinList: sip10FtList } = useStxCurrencyConversion();
   const { unfilteredData: runesFtList } = useRuneFungibleTokensQuery();

From e96f5f470a3c7a86b879c7505d25d4faf8ddbe99 Mon Sep 17 00:00:00 2001
From: jordankzf <jordan@secretkeylabs.com>
Date: Wed, 7 Aug 2024 00:33:58 +0800
Subject: [PATCH 006/227] complete stacks

---
 .../components/tokenFromBottomSheet/index.tsx | 24 ++++++++++++++---
 .../tokenFromBottomSheet/useFromTokens.ts     | 26 +++++++++----------
 .../components/tokenToBottomSheet/index.tsx   |  6 ++---
 .../tokenToBottomSheet/useToTokens.ts         | 14 ++++------
 src/app/screens/swap/index.tsx                | 20 ++++----------
 src/app/screens/swap/useMasterCoinsList.tsx   |  8 +++++-
 .../swap/useVisibleMasterCoinsList.tsx        | 21 +++++++++++++++
 src/app/screens/swap/utils.ts                 | 10 ++++---
 8 files changed, 81 insertions(+), 48 deletions(-)
 create mode 100644 src/app/screens/swap/useVisibleMasterCoinsList.tsx

diff --git a/src/app/screens/swap/components/tokenFromBottomSheet/index.tsx b/src/app/screens/swap/components/tokenFromBottomSheet/index.tsx
index 7bd4adacc..ce8d1c110 100644
--- a/src/app/screens/swap/components/tokenFromBottomSheet/index.tsx
+++ b/src/app/screens/swap/components/tokenFromBottomSheet/index.tsx
@@ -23,7 +23,7 @@ const StyledTokenTile = styled(TokenTile)`
 interface Props {
   visible: boolean;
   title: string;
-  onSelectCoin: (token: FungibleToken | 'BTC') => void;
+  onSelectCoin: (token: FungibleToken) => void;
   onClose: () => void;
   to?: Token;
 }
@@ -36,10 +36,10 @@ export default function TokenFromBottomSheet({ visible, title, onSelectCoin, onC
     <Sheet visible={visible} title={title} onClose={onClose}>
       <Container>
         {fromTokens.map((token) => {
-          if (token === 'BTC') {
+          if (token.principal === 'BTC') {
             return (
               <StyledTokenTile
-                key={token}
+                key={token.principal}
                 title="Bitcoin"
                 currency="BTC"
                 onPress={() => {
@@ -52,7 +52,23 @@ export default function TokenFromBottomSheet({ visible, title, onSelectCoin, onC
               />
             );
           }
-          if (token.protocol === 'runes' && 'principal' in token) {
+          if (token.principal === 'STX') {
+            return (
+              <StyledTokenTile
+                key={token.principal}
+                title="Stacks"
+                currency="STX"
+                onPress={() => {
+                  onSelectCoin(token);
+                  trackMixPanel(AnalyticsEvents.SelectTokenToSwapFrom, {
+                    token: 'Stacks',
+                  });
+                  onClose();
+                }}
+              />
+            );
+          }
+          if ((token.protocol === 'runes' || token.protocol === 'stacks') && 'principal' in token) {
             return (
               <StyledTokenTile
                 key={token.principal}
diff --git a/src/app/screens/swap/components/tokenFromBottomSheet/useFromTokens.ts b/src/app/screens/swap/components/tokenFromBottomSheet/useFromTokens.ts
index 7ce7dd4bc..84a9a32d5 100644
--- a/src/app/screens/swap/components/tokenFromBottomSheet/useFromTokens.ts
+++ b/src/app/screens/swap/components/tokenFromBottomSheet/useFromTokens.ts
@@ -1,24 +1,24 @@
-import { useRuneFungibleTokensQuery } from '@hooks/queries/runes/useRuneFungibleTokensQuery';
 import useCoinRates from '@hooks/queries/useCoinRates';
-import useSelectedAccount from '@hooks/useSelectedAccount';
-import { type FungibleToken, type Token } from '@secretkeylabs/xverse-core';
+import useMasterCoinsList from '@screens/swap/useMasterCoinsList';
+import { type Token } from '@secretkeylabs/xverse-core';
 import { sortFtByFiatBalance } from '@utils/tokens';
 
 const useFromTokens = (toToken?: Token) => {
-  const { unfilteredData: runesCoinsList } = useRuneFungibleTokensQuery();
+  const tokens = useMasterCoinsList();
   const { stxBtcRate, btcFiatRate } = useCoinRates();
-  const { btcAddress } = useSelectedAccount();
 
-  // Create a copy of the tokens array to avoid global changes
-  const tokens: (FungibleToken | 'BTC')[] = [...(runesCoinsList ?? [])].sort((a, b) =>
-    sortFtByFiatBalance(a, b, stxBtcRate, btcFiatRate),
-  );
-
-  if (btcAddress && toToken?.protocol !== 'btc') tokens.unshift('BTC');
+  // Sort tokens, keeping BTC as the first element, and STX (if enabled) as the second
+  const sortedTokens = tokens.sort((a, b) => {
+    if (a.principal === 'BTC') return -1;
+    if (b.principal === 'BTC') return 1;
+    if (a.principal === 'STX') return -1;
+    if (b.principal === 'STX') return 1;
+    return sortFtByFiatBalance(a, b, stxBtcRate, btcFiatRate);
+  });
 
   const filteredTokens = toToken
-    ? tokens.filter((token) => token === 'BTC' || token.principal !== toToken.ticker)
-    : tokens;
+    ? sortedTokens.filter((token) => token.principal !== toToken.ticker)
+    : sortedTokens;
 
   return filteredTokens;
 };
diff --git a/src/app/screens/swap/components/tokenToBottomSheet/index.tsx b/src/app/screens/swap/components/tokenToBottomSheet/index.tsx
index 51dfa62e2..bc0fc447a 100644
--- a/src/app/screens/swap/components/tokenToBottomSheet/index.tsx
+++ b/src/app/screens/swap/components/tokenToBottomSheet/index.tsx
@@ -73,7 +73,7 @@ const ProtocolItem = styled.button<{ selected: boolean }>`
 interface Props {
   visible: boolean;
   title: string;
-  from?: FungibleToken | 'BTC';
+  from?: FungibleToken;
   onSelectCoin: (token: Token) => void;
   onClose: () => void;
   resetFrom: () => void;
@@ -96,8 +96,8 @@ export default function TokenToBottomSheet({
   const search = useDebounce(query, 500);
   const fromTokenBasic: TokenBasic | undefined = from
     ? {
-        protocol: from === 'BTC' ? 'btc' : mapFTProtocolToSwapProtocol(from.protocol ?? 'runes'),
-        ticker: from === 'BTC' ? 'BTC' : from.principal,
+        protocol: mapFTProtocolToSwapProtocol(from),
+        ticker: from.principal,
       }
     : undefined;
   const { data, error, isLoading } = useToTokens(selectedProtocol, fromTokenBasic, search);
diff --git a/src/app/screens/swap/components/tokenToBottomSheet/useToTokens.ts b/src/app/screens/swap/components/tokenToBottomSheet/useToTokens.ts
index 71fc4c184..6a03497d9 100644
--- a/src/app/screens/swap/components/tokenToBottomSheet/useToTokens.ts
+++ b/src/app/screens/swap/components/tokenToBottomSheet/useToTokens.ts
@@ -1,6 +1,5 @@
-import { useVisibleRuneFungibleTokens } from '@hooks/queries/runes/useRuneFungibleTokensQuery';
-import useSelectedAccount from '@hooks/useSelectedAccount';
 import useWalletSelector from '@hooks/useWalletSelector';
+import useVisibleMasterCoinsList from '@screens/swap/useVisibleMasterCoinsList';
 import { mapFTProtocolToSwapProtocol } from '@screens/swap/utils';
 import { getXverseApiClient, type Protocol, type TokenBasic } from '@secretkeylabs/xverse-core';
 import { useQuery } from '@tanstack/react-query';
@@ -8,18 +7,15 @@ import { handleRetries } from '@utils/query';
 
 const useToTokens = (protocol: Protocol, from?: TokenBasic, query?: string) => {
   const { network } = useWalletSelector();
-  const { visible: runesCoinsList } = useVisibleRuneFungibleTokens();
-  const { btcAddress } = useSelectedAccount();
+  const coinsMasterList = useVisibleMasterCoinsList();
 
-  const runesBasicTokens =
-    runesCoinsList.map((ft) => ({
+  const userTokens =
+    coinsMasterList.map((ft) => ({
       ticker: ft.principal,
-      protocol: mapFTProtocolToSwapProtocol(ft.protocol ?? 'runes'),
+      protocol: mapFTProtocolToSwapProtocol(ft),
     })) ?? [];
 
   const search = query?.trim().replace(/\s+/g, ' ').replace(/ /g, '•') ?? '';
-  const btcBasicToken: TokenBasic = { protocol: 'btc', ticker: 'BTC' };
-  const userTokens = [...(btcAddress ? [btcBasicToken] : [])].concat(runesBasicTokens);
 
   const queryFn = async () => {
     const response = await getXverseApiClient(network.type).swaps.getDestinationTokens({
diff --git a/src/app/screens/swap/index.tsx b/src/app/screens/swap/index.tsx
index 4ef8b375c..cf2cbf6c1 100644
--- a/src/app/screens/swap/index.tsx
+++ b/src/app/screens/swap/index.tsx
@@ -2,7 +2,6 @@ import ArrowSwap from '@assets/img/icons/ArrowSwap.svg';
 import BottomBar from '@components/tabBar';
 import TopRow from '@components/topRow';
 import useRuneFloorPriceQuery from '@hooks/queries/runes/useRuneFloorPriceQuery';
-import { useRuneFungibleTokensQuery } from '@hooks/queries/runes/useRuneFungibleTokensQuery';
 import useGetQuotes from '@hooks/queries/swaps/useGetQuotes';
 import useBtcWalletData from '@hooks/queries/useBtcWalletData';
 import useCoinRates from '@hooks/queries/useCoinRates';
@@ -11,7 +10,6 @@ import {
   AnalyticsEvents,
   btcToSats,
   getBtcFiatEquivalent,
-  type BaseToken,
   type ExecuteOrderRequest,
   type FungibleToken,
   type GetUtxosRequest,
@@ -28,7 +26,7 @@ import { satsToBtcString } from '@utils/helper';
 import { trackMixPanel } from '@utils/mixpanel';
 import { getFtBalance } from '@utils/tokens';
 import BigNumber from 'bignumber.js';
-import { useEffect, useMemo, useState } from 'react';
+import { useEffect, useState } from 'react';
 import toast from 'react-hot-toast';
 import { useTranslation } from 'react-i18next';
 import { useLocation, useNavigate } from 'react-router-dom';
@@ -41,7 +39,7 @@ import TokenToBottomSheet from './components/tokenToBottomSheet';
 import trackSwapMixPanel from './mixpanel';
 import QuoteSummary from './quoteSummary';
 import QuotesModal from './quotesModal';
-import { useStxCurrencyConversion } from './useStxCurrencyConversion';
+import useMasterCoinsList from './useMasterCoinsList';
 import {
   mapFTNativeSwapTokenToTokenBasic,
   mapFTProtocolToSwapProtocol,
@@ -118,7 +116,7 @@ const mapFtToSwapToken = (st: FungibleToken): Token => {
   return {
     ticker: st.principal ?? '',
     name: st.name ?? st.assetName ?? '',
-    protocol: mapFTProtocolToSwapProtocol(st.protocol ?? 'runes'),
+    protocol: mapFTProtocolToSwapProtocol(st),
     divisibility: st.decimals ?? 0,
     logo: st.image ?? st.runeInscriptionId ?? '',
     symbol: st.runeSymbol ?? '',
@@ -148,9 +146,6 @@ export default function SwapScreen() {
 
   const { fiatCurrency } = useWalletSelector();
 
-  // Hook for SIP-10
-  const { acceptableCoinList: sip10FtList } = useStxCurrencyConversion();
-  const { unfilteredData: runesFtList } = useRuneFungibleTokensQuery();
   const { data: btcBalance } = useBtcWalletData();
   const { btcFiatRate } = useCoinRates();
   const navigate = useNavigate();
@@ -160,12 +155,7 @@ export default function SwapScreen() {
   const defaultFrom = params.get('from');
   const { quotes, loading: quotesLoading, error: quotesError, fetchQuotes } = useGetQuotes();
   const { data: runeFloorPrice } = useRuneFloorPriceQuery(toToken?.name ?? '');
-
-  // Combined list
-  const coinsMasterList = useMemo(
-    () => [...sip10FtList, ...(runesFtList || []), btcFt, stxFt] ?? [],
-    [sip10FtList, runesFtList],
-  );
+  const coinsMasterList = useMasterCoinsList();
 
   useEffect(() => {
     if (defaultFrom) {
@@ -523,7 +513,7 @@ export default function SwapScreen() {
                 fromToken?.principal === 'BTC'
                   ? 'btc'
                   : fromToken?.protocol
-                  ? mapFTProtocolToSwapProtocol(fromToken.protocol)
+                  ? mapFTProtocolToSwapProtocol(fromToken)
                   : undefined,
               decimals: fromToken?.principal === 'BTC' ? 8 : fromToken?.decimals,
               unit: fromToken?.principal === 'BTC' ? 'BTC' : fromToken?.runeSymbol ?? '',
diff --git a/src/app/screens/swap/useMasterCoinsList.tsx b/src/app/screens/swap/useMasterCoinsList.tsx
index 8f291169b..f9c5780cc 100644
--- a/src/app/screens/swap/useMasterCoinsList.tsx
+++ b/src/app/screens/swap/useMasterCoinsList.tsx
@@ -1,4 +1,7 @@
+import IconBitcoin from '@assets/img/dashboard/bitcoin_icon.svg';
+import IconStacks from '@assets/img/dashboard/stx_icon.svg';
 import { useRuneFungibleTokensQuery } from '@hooks/queries/runes/useRuneFungibleTokensQuery';
+import useWalletSelector from '@hooks/useWalletSelector';
 import type { FungibleToken } from '@secretkeylabs/xverse-core';
 import { useMemo } from 'react';
 import { useStxCurrencyConversion } from './useStxCurrencyConversion';
@@ -10,6 +13,7 @@ export const btcFt: FungibleToken = {
   total_received: '',
   principal: 'BTC',
   assetName: 'Bitcoin',
+  image: IconBitcoin,
 };
 
 export const stxFt: FungibleToken = {
@@ -19,14 +23,16 @@ export const stxFt: FungibleToken = {
   total_received: '',
   principal: 'STX',
   assetName: 'Stacks',
+  image: IconStacks,
 };
 
 const useMasterCoinsList = () => {
   const { acceptableCoinList: sip10FtList } = useStxCurrencyConversion();
   const { unfilteredData: runesFtList } = useRuneFungibleTokensQuery();
+  const { hideStx } = useWalletSelector();
 
   const coinsMasterList = useMemo(
-    () => [...sip10FtList, ...(runesFtList || []), btcFt, stxFt] ?? [],
+    () => [...sip10FtList, ...(runesFtList || []), btcFt, ...(hideStx ? [] : [stxFt])] ?? [],
     [sip10FtList, runesFtList],
   );
 
diff --git a/src/app/screens/swap/useVisibleMasterCoinsList.tsx b/src/app/screens/swap/useVisibleMasterCoinsList.tsx
new file mode 100644
index 000000000..65ac42291
--- /dev/null
+++ b/src/app/screens/swap/useVisibleMasterCoinsList.tsx
@@ -0,0 +1,21 @@
+import { useVisibleRuneFungibleTokens } from '@hooks/queries/runes/useRuneFungibleTokensQuery';
+import { useVisibleSip10FungibleTokens } from '@hooks/queries/stx/useGetSip10FungibleTokens';
+import useWalletSelector from '@hooks/useWalletSelector';
+import { useMemo } from 'react';
+import { btcFt, stxFt } from './useMasterCoinsList';
+
+const useVisibleMasterCoinsList = () => {
+  const { visible: sip10FtList } = useVisibleSip10FungibleTokens();
+  const { visible: runesFtList } = useVisibleRuneFungibleTokens();
+
+  const { hideStx } = useWalletSelector();
+
+  const coinsMasterList = useMemo(
+    () => [...sip10FtList, ...runesFtList, btcFt, ...(hideStx ? [] : [stxFt])] ?? [],
+    [sip10FtList, runesFtList],
+  );
+
+  return coinsMasterList;
+};
+
+export default useVisibleMasterCoinsList;
diff --git a/src/app/screens/swap/utils.ts b/src/app/screens/swap/utils.ts
index c495cae9b..98dcb9eaf 100644
--- a/src/app/screens/swap/utils.ts
+++ b/src/app/screens/swap/utils.ts
@@ -6,13 +6,17 @@ import type {
   TokenBasic,
 } from '@secretkeylabs/xverse-core';
 
-export const mapFTProtocolToSwapProtocol = (protocol: FungibleTokenProtocol): Protocol => {
+export const mapFTProtocolToSwapProtocol = (ft: FungibleToken): Protocol => {
+  if (ft.principal === 'BTC') return 'btc';
+  if (ft.principal === 'STX') return 'stx';
+  if (!ft.protocol) return 'runes';
+
   const protocolMap: Record<FungibleTokenProtocol, Protocol> = {
     stacks: 'sip10',
     runes: 'runes',
     'brc-20': 'brc20',
   };
-  return protocolMap[protocol];
+  return protocolMap[ft.protocol];
 };
 
 export const mapSwapProtocolToFTProtocol = (protocol: Protocol): FungibleTokenProtocol => {
@@ -48,7 +52,7 @@ export const mapFTNativeSwapTokenToTokenBasic = (
 
   // if token is FungibleToken
   if ('principal' in token && token.protocol) {
-    return { ticker: token.principal, protocol: mapFTProtocolToSwapProtocol(token.protocol) };
+    return { ticker: token.principal, protocol: mapFTProtocolToSwapProtocol(token) };
   }
 
   // token will never have a principal prop so we can safely cast it as Token

From b49f3805860b9f0acfed155d87bd24a581f5e040 Mon Sep 17 00:00:00 2001
From: Christine Pinto <chrissie2788@gmail.com>
Date: Thu, 15 Aug 2024 14:59:30 +0200
Subject: [PATCH 007/227] Adjust worker amount for local transaction e2e
 execution (#506)

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

diff --git a/package.json b/package.json
index ce18c2076..09af0a788 100644
--- a/package.json
+++ b/package.json
@@ -17,7 +17,7 @@
     "e2etest": "npx playwright test -g \"\" --grep-invert \"#localexecution\"",
     "e2etest:ui": "npx playwright test --ui",
     "e2etest:smoketest": "npx playwright test --grep \"#smoketest\"",
-    "e2etest:skipped": "npx playwright test --grep \"#localexecution\"",
+    "e2etest:skipped": "npx playwright test --grep \"#localexecution\" --workers=1",
     "e2etest:report": "playwright show-report",
     "knip": "knip",
     "ts-check": "tsc --noEmit",

From c65a6db03f65f0f2b8078809dedc46d000effc93 Mon Sep 17 00:00:00 2001
From: jordankzf <jordan@secretkeylabs.com>
Date: Thu, 15 Aug 2024 21:09:56 +0800
Subject: [PATCH 008/227] feature flag

---
 package-lock.json                            | 14 +++++++-------
 package.json                                 |  2 +-
 src/app/screens/coinDashboard/coinHeader.tsx |  9 ++++++---
 src/app/screens/swap/useMasterCoinsList.tsx  | 11 +++++++++--
 4 files changed, 23 insertions(+), 13 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index adadede5e..f121f896c 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -15,7 +15,7 @@
         "@react-spring/web": "^9.6.1",
         "@sats-connect/core": "0.2.1",
         "@scure/btc-signer": "1.2.1",
-        "@secretkeylabs/xverse-core": "18.7.0",
+        "@secretkeylabs/xverse-core": "18.7.0-49281c0",
         "@stacks/connect": "7.4.1",
         "@stacks/stacks-blockchain-api-types": "6.1.1",
         "@stacks/transactions": "6.13.1",
@@ -1862,9 +1862,9 @@
       }
     },
     "node_modules/@secretkeylabs/xverse-core": {
-      "version": "18.7.0",
-      "resolved": "https://npm.pkg.github.com/download/@secretkeylabs/xverse-core/18.7.0/e3ab51151b17b6c49fade2a104bb3122f76a1e17",
-      "integrity": "sha512-hoNCtY7LNBL908Hmh8Yxpo0IPLGg6wnrUYsdVkxyvhn9+IsXZE2GtrafVn5bAibw02wbQdTUX0OUckyd1/ZW+Q==",
+      "version": "18.7.0-49281c0",
+      "resolved": "https://npm.pkg.github.com/download/@secretkeylabs/xverse-core/18.7.0-49281c0/5edda6e48bb4c8ecb7b35a454358600b8a57e684",
+      "integrity": "sha512-PJSQZlWHMw8t+Y4+PTM2r67qSxYhAYFyNJ9potyH/PKK6NbfQ5bdB3FKE6nSelOAYJuiZPaTMbxqDidmvUkcrw==",
       "license": "ISC",
       "dependencies": {
         "@bitcoinerlab/secp256k1": "^1.0.2",
@@ -15328,9 +15328,9 @@
       }
     },
     "@secretkeylabs/xverse-core": {
-      "version": "18.7.0",
-      "resolved": "https://npm.pkg.github.com/download/@secretkeylabs/xverse-core/18.7.0/e3ab51151b17b6c49fade2a104bb3122f76a1e17",
-      "integrity": "sha512-hoNCtY7LNBL908Hmh8Yxpo0IPLGg6wnrUYsdVkxyvhn9+IsXZE2GtrafVn5bAibw02wbQdTUX0OUckyd1/ZW+Q==",
+      "version": "18.7.0-49281c0",
+      "resolved": "https://npm.pkg.github.com/download/@secretkeylabs/xverse-core/18.7.0-49281c0/5edda6e48bb4c8ecb7b35a454358600b8a57e684",
+      "integrity": "sha512-PJSQZlWHMw8t+Y4+PTM2r67qSxYhAYFyNJ9potyH/PKK6NbfQ5bdB3FKE6nSelOAYJuiZPaTMbxqDidmvUkcrw==",
       "requires": {
         "@bitcoinerlab/secp256k1": "^1.0.2",
         "@noble/curves": "^1.2.0",
diff --git a/package.json b/package.json
index 974c9bc0b..648b128c8 100644
--- a/package.json
+++ b/package.json
@@ -44,7 +44,7 @@
     "@react-spring/web": "^9.6.1",
     "@sats-connect/core": "0.2.1",
     "@scure/btc-signer": "1.2.1",
-    "@secretkeylabs/xverse-core": "18.7.0",
+    "@secretkeylabs/xverse-core": "18.7.0-49281c0",
     "@stacks/connect": "7.4.1",
     "@stacks/stacks-blockchain-api-types": "6.1.1",
     "@stacks/transactions": "6.13.1",
diff --git a/src/app/screens/coinDashboard/coinHeader.tsx b/src/app/screens/coinDashboard/coinHeader.tsx
index f91ff47c7..7b69cfdfd 100644
--- a/src/app/screens/coinDashboard/coinHeader.tsx
+++ b/src/app/screens/coinDashboard/coinHeader.tsx
@@ -167,12 +167,15 @@ export default function CoinHeader({ currency, fungibleToken }: Props) {
   };
 
   const isCrossChainSwapsEnabled = useHasFeature(FeatureId.CROSS_CHAIN_SWAPS);
-  const showRunesSwap =
+  const isStacksSwapsEnabled = useHasFeature(FeatureId.STACKS_SWAPS);
+
+  const isSwapEligibleCurrency =
     (currency === 'FT' &&
-      (fungibleToken?.protocol === 'runes' || fungibleToken?.protocol === 'stacks')) ||
+      (fungibleToken?.protocol === 'runes' ||
+        (isStacksSwapsEnabled && fungibleToken?.protocol === 'stacks'))) ||
     currency === 'BTC' ||
     currency === 'STX';
-  const showSwaps = isCrossChainSwapsEnabled && showRunesSwap;
+  const showSwaps = isCrossChainSwapsEnabled && isSwapEligibleCurrency;
 
   const navigateToSwaps = () => {
     if (!showSwaps) {
diff --git a/src/app/screens/swap/useMasterCoinsList.tsx b/src/app/screens/swap/useMasterCoinsList.tsx
index f9c5780cc..62fec126f 100644
--- a/src/app/screens/swap/useMasterCoinsList.tsx
+++ b/src/app/screens/swap/useMasterCoinsList.tsx
@@ -1,8 +1,9 @@
 import IconBitcoin from '@assets/img/dashboard/bitcoin_icon.svg';
 import IconStacks from '@assets/img/dashboard/stx_icon.svg';
 import { useRuneFungibleTokensQuery } from '@hooks/queries/runes/useRuneFungibleTokensQuery';
+import useHasFeature from '@hooks/useHasFeature';
 import useWalletSelector from '@hooks/useWalletSelector';
-import type { FungibleToken } from '@secretkeylabs/xverse-core';
+import { FeatureId, type FungibleToken } from '@secretkeylabs/xverse-core';
 import { useMemo } from 'react';
 import { useStxCurrencyConversion } from './useStxCurrencyConversion';
 
@@ -30,9 +31,15 @@ const useMasterCoinsList = () => {
   const { acceptableCoinList: sip10FtList } = useStxCurrencyConversion();
   const { unfilteredData: runesFtList } = useRuneFungibleTokensQuery();
   const { hideStx } = useWalletSelector();
+  const isStacksSwapsEnabled = useHasFeature(FeatureId.STACKS_SWAPS);
 
   const coinsMasterList = useMemo(
-    () => [...sip10FtList, ...(runesFtList || []), btcFt, ...(hideStx ? [] : [stxFt])] ?? [],
+    () =>
+      [
+        ...(runesFtList || []),
+        btcFt,
+        ...(!hideStx && isStacksSwapsEnabled ? [stxFt, ...sip10FtList] : []),
+      ] ?? [],
     [sip10FtList, runesFtList],
   );
 

From 83d43d1e45a7df9cc66a6ee197351101e73bfffb Mon Sep 17 00:00:00 2001
From: jordankzf <jordan@secretkeylabs.com>
Date: Thu, 15 Aug 2024 21:12:44 +0800
Subject: [PATCH 009/227] fix merge conflicts

---
 src/app/screens/swap/components/tokenFromBottomSheet/index.tsx | 2 +-
 src/app/screens/swap/index.tsx                                 | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/app/screens/swap/components/tokenFromBottomSheet/index.tsx b/src/app/screens/swap/components/tokenFromBottomSheet/index.tsx
index 19f9d1b7f..4dbbe6566 100644
--- a/src/app/screens/swap/components/tokenFromBottomSheet/index.tsx
+++ b/src/app/screens/swap/components/tokenFromBottomSheet/index.tsx
@@ -61,7 +61,7 @@ export default function TokenFromBottomSheet({ visible, title, onSelectCoin, onC
                 onPress={() => {
                   onSelectCoin(token);
                   trackMixPanel(AnalyticsEvents.SelectTokenToSwapFrom, {
-                    token: 'Stacks',
+                    selectedToken: 'Stacks',
                   });
                   onClose();
                 }}
diff --git a/src/app/screens/swap/index.tsx b/src/app/screens/swap/index.tsx
index 6dda1eb1c..0c7ca1789 100644
--- a/src/app/screens/swap/index.tsx
+++ b/src/app/screens/swap/index.tsx
@@ -188,7 +188,7 @@ export default function SwapScreen() {
     trackSwapMixPanel(AnalyticsEvents.FetchSwapQuote, {
       fromToken,
       toToken,
-      amount: fromToken === 'BTC' ? btcToSats(new BigNumber(amount)).toString() : amount,
+      amount: fromToken?.principal === 'BTC' ? btcToSats(new BigNumber(amount)).toString() : amount,
       quote,
       btcUsdRate,
       runeFloorPrice,

From e669ced2ebdb888c6b0dc3c5411ad5607f9340c1 Mon Sep 17 00:00:00 2001
From: jordankzf <jordan@secretkeylabs.com>
Date: Thu, 15 Aug 2024 21:24:38 +0800
Subject: [PATCH 010/227] remove remaining traces of 'BTC'

---
 src/app/screens/swap/mixpanel.ts            |  6 +++---
 src/app/screens/swap/quoteSummary/index.tsx | 14 +++++++-------
 src/app/screens/swap/utils.ts               | 10 ++--------
 3 files changed, 12 insertions(+), 18 deletions(-)

diff --git a/src/app/screens/swap/mixpanel.ts b/src/app/screens/swap/mixpanel.ts
index e40afede5..aace8675d 100644
--- a/src/app/screens/swap/mixpanel.ts
+++ b/src/app/screens/swap/mixpanel.ts
@@ -20,7 +20,7 @@ function trackSwapMixPanel(
     runeFloorPrice,
   }: {
     provider?: Provider;
-    fromToken?: FungibleToken | 'BTC';
+    fromToken?: FungibleToken;
     toToken?: Token;
     amount: string;
     quote?: Quote;
@@ -28,11 +28,11 @@ function trackSwapMixPanel(
     runeFloorPrice?: number;
   },
 ) {
-  const from = fromToken === 'BTC' ? 'BTC' : fromToken?.name;
+  const from = fromToken?.name;
   const to = toToken?.protocol === 'btc' ? 'BTC' : toToken?.name ?? toToken?.ticker;
 
   const fromAmount =
-    fromToken === 'BTC'
+    fromToken?.principal === 'BTC'
       ? getBtcFiatEquivalent(new BigNumber(amount), new BigNumber(btcUsdRate)).toFixed(2)
       : new BigNumber(fromToken?.tokenFiatRate ?? 0).multipliedBy(amount).toFixed(2);
 
diff --git a/src/app/screens/swap/quoteSummary/index.tsx b/src/app/screens/swap/quoteSummary/index.tsx
index cdf918fbe..bd7c268a1 100644
--- a/src/app/screens/swap/quoteSummary/index.tsx
+++ b/src/app/screens/swap/quoteSummary/index.tsx
@@ -132,7 +132,7 @@ const FeeRate = styled.div`
 
 type QuoteSummaryProps = {
   amount: string;
-  fromToken?: FungibleToken | 'BTC';
+  fromToken?: FungibleToken;
   toToken?: Token;
   quote: Quote;
   onClose: () => void;
@@ -183,7 +183,7 @@ export default function QuoteSummary({
   const { fiatCurrency } = useWalletSelector();
 
   const fromUnit =
-    fromToken === 'BTC'
+    fromToken?.principal === 'BTC'
       ? 'Sats'
       : (fromToken as FungibleToken)?.runeSymbol ?? RUNE_DISPLAY_DEFAULTS.symbol;
 
@@ -282,14 +282,14 @@ export default function QuoteSummary({
               provider="Amount"
               price={amount}
               image={{
-                currency: fromToken === 'BTC' ? 'BTC' : 'FT',
-                ft: fromToken === 'BTC' ? undefined : fromToken,
+                currency: fromToken?.principal === 'BTC' ? 'BTC' : 'FT',
+                ft: fromToken?.principal === 'BTC' ? undefined : fromToken,
               }}
-              subtitle={fromToken === 'BTC' ? 'Bitcoin' : fromToken?.assetName}
+              subtitle={fromToken?.principal === 'BTC' ? 'Bitcoin' : fromToken?.assetName}
               subtitleColor="white_400"
-              unit={fromToken === 'BTC' ? 'Sats' : fromToken?.runeSymbol ?? ''}
+              unit={fromToken?.principal === 'BTC' ? 'Sats' : fromToken?.runeSymbol ?? ''}
               fiatValue={
-                fromToken === 'BTC'
+                fromToken?.principal === 'BTC'
                   ? getBtcFiatEquivalent(new BigNumber(amount), new BigNumber(btcFiatRate)).toFixed(
                       2,
                     )
diff --git a/src/app/screens/swap/utils.ts b/src/app/screens/swap/utils.ts
index 98dcb9eaf..16350cb32 100644
--- a/src/app/screens/swap/utils.ts
+++ b/src/app/screens/swap/utils.ts
@@ -43,15 +43,9 @@ export const mapSwapTokenToFT = (token: Token): FungibleToken => ({
   runeInscriptionId: token.logo,
 });
 
-export const mapFTNativeSwapTokenToTokenBasic = (
-  token: FungibleToken | 'BTC' | Token,
-): TokenBasic => {
-  if (token === 'BTC') {
-    return { ticker: 'BTC', protocol: 'btc' };
-  }
-
+export const mapFTNativeSwapTokenToTokenBasic = (token: FungibleToken | Token): TokenBasic => {
   // if token is FungibleToken
-  if ('principal' in token && token.protocol) {
+  if ('principal' in token) {
     return { ticker: token.principal, protocol: mapFTProtocolToSwapProtocol(token) };
   }
 

From b4d8768c425d4422178d0b65f1c92ebc1158ae20 Mon Sep 17 00:00:00 2001
From: jordankzf <jordan@secretkeylabs.com>
Date: Tue, 20 Aug 2024 17:43:33 +0800
Subject: [PATCH 011/227] stx swaps

---
 .../components/tokenToBottomSheet/index.tsx   | 11 +++--
 src/app/screens/swap/index.tsx                | 24 ++++++++++-
 src/app/screens/swap/quoteSummary/index.tsx   | 40 ++++++++++++++++---
 .../swap/quoteSummary/usePlaceOrder.tsx       | 20 ++++++++--
 src/app/screens/swap/quotesModal/index.tsx    | 38 +++++++++++++++---
 src/app/screens/swap/types.ts                 | 12 +++++-
 src/app/screens/swap/utils.ts                 |  2 +-
 7 files changed, 124 insertions(+), 23 deletions(-)

diff --git a/src/app/screens/swap/components/tokenToBottomSheet/index.tsx b/src/app/screens/swap/components/tokenToBottomSheet/index.tsx
index fc6502bea..ed12b65f7 100644
--- a/src/app/screens/swap/components/tokenToBottomSheet/index.tsx
+++ b/src/app/screens/swap/components/tokenToBottomSheet/index.tsx
@@ -79,7 +79,12 @@ interface Props {
   resetFrom: () => void;
 }
 
-const supportedProtocols: Protocol[] = ['runes']; // add more protocols here
+const supportedProtocols: Protocol[] = ['runes', 'sip10']; // add more protocols here
+
+const mapProtocolName = (protocol: Protocol) => {
+  if (protocol === 'sip10') return 'SIP-10';
+  return protocol.toUpperCase();
+};
 
 export default function TokenToBottomSheet({
   visible,
@@ -138,7 +143,7 @@ export default function TokenToBottomSheet({
                   selected={key === selectedProtocol}
                   onClick={onChangeProtocol(key)}
                 >
-                  {key.toUpperCase()}
+                  {mapProtocolName(key)}
                 </ProtocolItem>
               ))}
             </ProtocolList>
@@ -168,7 +173,7 @@ export default function TokenToBottomSheet({
                 />
               );
             }
-            if (token.protocol === 'runes') {
+            if (token.protocol === 'runes' || token.protocol === 'sip10') {
               return (
                 <StyledTokenTile
                   key={token.ticker}
diff --git a/src/app/screens/swap/index.tsx b/src/app/screens/swap/index.tsx
index 0c7ca1789..6aa52c60e 100644
--- a/src/app/screens/swap/index.tsx
+++ b/src/app/screens/swap/index.tsx
@@ -17,12 +17,14 @@ import {
   type Token,
   type UtxoQuote,
 } from '@secretkeylabs/xverse-core';
+import { deserializeTransaction } from '@stacks/transactions';
 import Button, { LinkButton } from '@ui-library/button';
 import { StyledP } from '@ui-library/common.styled';
 import SnackBar from '@ui-library/snackBar';
 import { satsToBtcString } from '@utils/helper';
 import { trackMixPanel } from '@utils/mixpanel';
 import { getFtBalance } from '@utils/tokens';
+import RoutePaths from 'app/routes/paths';
 import BigNumber from 'bignumber.js';
 import { useEffect, useState } from 'react';
 import toast from 'react-hot-toast';
@@ -37,7 +39,7 @@ import TokenToBottomSheet from './components/tokenToBottomSheet';
 import trackSwapMixPanel from './mixpanel';
 import QuoteSummary from './quoteSummary';
 import QuotesModal from './quotesModal';
-import type { OrderInfo } from './types';
+import type { OrderInfo, StxOrderInfo } from './types';
 import useMasterCoinsList from './useMasterCoinsList';
 import {
   mapFTNativeSwapTokenToTokenBasic,
@@ -138,6 +140,8 @@ export default function SwapScreen() {
   const [inputError, setInputError] = useState('');
   const [hasQuoteError, setHasQuoteError] = useState(false);
   const [orderInfo, setOrderInfo] = useState<OrderInfo | undefined>();
+  const [stxOrderInfo, setStxOrderInfo] = useState<StxOrderInfo | undefined>();
+
   const [selectedUtxos, setSelectedUtxos] = useState<Omit<MarketUtxo, 'token'>[]>();
   const [utxoProviderSendAmount, setUtxoProviderSendAmount] = useState<string | undefined>();
 
@@ -170,7 +174,10 @@ export default function SwapScreen() {
       return;
     }
 
-    if ((quotes.amm.length === 0 && quotes.utxo.length === 0) || quotesError) {
+    if (
+      (quotes.amm.length === 0 && quotes.utxo.length === 0 && quotes.stx.length === 0) ||
+      quotesError
+    ) {
       return setHasQuoteError(true);
     }
 
@@ -400,6 +407,7 @@ export default function SwapScreen() {
       }}
       ammProviders={quotes?.amm || []}
       utxoProviders={quotes?.utxo || []}
+      stxProviders={quotes?.stx || []}
       toToken={toToken}
       ammProviderClicked={(provider: Quote) => {
         setProvider(true, provider);
@@ -420,6 +428,17 @@ export default function SwapScreen() {
     );
   }
 
+  if (stxOrderInfo?.order.unsignedTransaction) {
+    const unsignedTransaction = deserializeTransaction(stxOrderInfo.order.unsignedTransaction);
+
+    navigate(RoutePaths.ConfirmStacksTransaction, {
+      state: {
+        unsignedTx: unsignedTransaction,
+        fee: unsignedTransaction.auth.spendingCondition.fee.toString(),
+      },
+    });
+  }
+
   if (quote) {
     return (
       <>
@@ -433,6 +452,7 @@ export default function SwapScreen() {
             setGetQuotesModalVisible(true);
           }}
           onOrderPlaced={setOrderInfo}
+          onStxOrderPlaced={setStxOrderInfo}
           onError={setErrorMessage}
           selectedIdentifiers={selectedUtxos}
         />
diff --git a/src/app/screens/swap/quoteSummary/index.tsx b/src/app/screens/swap/quoteSummary/index.tsx
index bd7c268a1..a007a12a7 100644
--- a/src/app/screens/swap/quoteSummary/index.tsx
+++ b/src/app/screens/swap/quoteSummary/index.tsx
@@ -28,7 +28,7 @@ import styled, { useTheme } from 'styled-components';
 import trackSwapMixPanel from '../mixpanel';
 import QuoteTile from '../quotesModal/quoteTile';
 import { SlippageModalContent } from '../slippageModal';
-import type { OrderInfo } from '../types';
+import type { OrderInfo, StxOrderInfo } from '../types';
 import { mapFTNativeSwapTokenToTokenBasic } from '../utils';
 import EditFee from './EditFee';
 import QuoteSummaryTile from './quoteSummaryTile';
@@ -139,6 +139,7 @@ type QuoteSummaryProps = {
   onChangeProvider: () => void;
   onError: (errorMessage: string) => void;
   onOrderPlaced: ({ order, providerCode }: OrderInfo) => void;
+  onStxOrderPlaced: ({ order, providerCode }: StxOrderInfo) => void;
   selectedIdentifiers?: Omit<MarketUtxo, 'token'>[];
 };
 
@@ -150,14 +151,21 @@ export default function QuoteSummary({
   onClose,
   onChangeProvider,
   onOrderPlaced,
+  onStxOrderPlaced,
   onError,
   selectedIdentifiers,
 }: QuoteSummaryProps) {
   const { t } = useTranslation('translation');
   const theme = useTheme();
   const { btcFiatRate, btcUsdRate } = useCoinRates();
-  const { btcAddress, ordinalsAddress, btcPublicKey, ordinalsPublicKey } = useSelectedAccount();
-  const { loading: isPlaceOrderLoading, error: placeOrderError, placeOrder } = usePlaceOrder();
+  const { btcAddress, ordinalsAddress, btcPublicKey, ordinalsPublicKey, stxAddress, stxPublicKey } =
+    useSelectedAccount();
+  const {
+    loading: isPlaceOrderLoading,
+    error: placeOrderError,
+    placeOrder,
+    placeStxOrder,
+  } = usePlaceOrder();
   const {
     loading: isPlaceUtxoOrderLoading,
     error: placeUtxoOrderError,
@@ -185,11 +193,16 @@ export default function QuoteSummary({
   const fromUnit =
     fromToken?.principal === 'BTC'
       ? 'Sats'
-      : (fromToken as FungibleToken)?.runeSymbol ?? RUNE_DISPLAY_DEFAULTS.symbol;
+      : (fromToken as FungibleToken)?.runeSymbol ??
+        (fromToken as FungibleToken).assetName ??
+        RUNE_DISPLAY_DEFAULTS.symbol;
 
   const toUnit =
     toToken?.protocol === 'btc' ? 'Sats' : toToken?.symbol ?? RUNE_DISPLAY_DEFAULTS.symbol;
 
+  const isRunesSwap = fromToken?.protocol === 'runes' || toToken?.protocol === 'runes';
+  const isSip10Swap = fromToken?.protocol === 'stacks' || toToken?.protocol === 'sip10';
+
   const [showSlippageModal, setShowSlippageModal] = useState(false);
   const [slippage, setSlippage] = useSearchParamsState('slippage', 0.05);
 
@@ -229,7 +242,7 @@ export default function QuoteSummary({
       if (placeUtxoOrderResponse?.orders.length === 0) {
         onError(t('SWAP_SCREEN.ERRORS.NO_UTXOS_FOR_PURCHASE'));
       }
-    } else {
+    } else if (isRunesSwap) {
       const placeOrderRequest = {
         providerCode: quote.provider.code,
         from: mapFTNativeSwapTokenToTokenBasic(fromToken),
@@ -248,6 +261,23 @@ export default function QuoteSummary({
       if (placeOrderResponse?.psbt) {
         onOrderPlaced({ order: placeOrderResponse, providerCode: quote.provider.code });
       }
+    } else if (isSip10Swap) {
+      const placeStxOrderRequest = {
+        providerCode: quote.provider.code,
+        from: mapFTNativeSwapTokenToTokenBasic(fromToken),
+        to: mapFTNativeSwapTokenToTokenBasic(toToken),
+        sendAmount: amount,
+        receiveAmount: quote.receiveAmount,
+        slippage,
+        feeRate: Number(feeRate),
+        stxAddress,
+        stxPublicKey,
+      };
+      const placeOrderResponse = await placeStxOrder(placeStxOrderRequest);
+
+      if (placeOrderResponse?.unsignedTransaction) {
+        onStxOrderPlaced({ order: placeOrderResponse, providerCode: quote.provider.code });
+      }
     }
   };
 
diff --git a/src/app/screens/swap/quoteSummary/usePlaceOrder.tsx b/src/app/screens/swap/quoteSummary/usePlaceOrder.tsx
index 4f931e394..617ead829 100644
--- a/src/app/screens/swap/quoteSummary/usePlaceOrder.tsx
+++ b/src/app/screens/swap/quoteSummary/usePlaceOrder.tsx
@@ -2,12 +2,11 @@ import useWalletSelector from '@hooks/useWalletSelector';
 import {
   getXverseApiClient,
   type PlaceOrderRequest,
-  type PlaceOrderResponse,
+  type PlaceStxOrderRequest,
 } from '@secretkeylabs/xverse-core';
 import { useState } from 'react';
 
 const usePlaceOrder = () => {
-  const [order, setOrder] = useState<PlaceOrderResponse>();
   const [loading, setLoading] = useState<boolean>(false);
   const [error, setError] = useState<string | null>(null);
   const { network } = useWalletSelector();
@@ -19,7 +18,6 @@ const usePlaceOrder = () => {
     setError(null);
     try {
       const response = await xverseApiClient.swaps.placeOrder(request);
-      setOrder(response);
       return response;
     } catch (err: any) {
       setError(err?.response?.data?.message ?? 'Failed to place order');
@@ -28,7 +26,21 @@ const usePlaceOrder = () => {
     }
   };
 
-  return { order, loading, error, placeOrder };
+  const placeStxOrder = async (request: PlaceStxOrderRequest) => {
+    setLoading(true);
+    setError(null);
+    try {
+      const response = await xverseApiClient.swaps.placeStxOrder(request);
+
+      return response;
+    } catch (err: any) {
+      setError(err?.response?.data?.message ?? 'Failed to place order');
+    } finally {
+      setLoading(false);
+    }
+  };
+
+  return { loading, error, placeOrder, placeStxOrder };
 };
 
 export default usePlaceOrder;
diff --git a/src/app/screens/swap/quotesModal/index.tsx b/src/app/screens/swap/quotesModal/index.tsx
index 41e4e3950..bc3c57bf3 100644
--- a/src/app/screens/swap/quotesModal/index.tsx
+++ b/src/app/screens/swap/quotesModal/index.tsx
@@ -1,8 +1,10 @@
 import useCoinRates from '@hooks/queries/useCoinRates';
 import {
   getBtcFiatEquivalent,
+  getStxFiatEquivalent,
   type FungibleToken,
   type Quote,
+  type StxQuote,
   type Token,
   type UtxoQuote,
 } from '@secretkeylabs/xverse-core';
@@ -19,6 +21,7 @@ interface Props {
   onClose: () => void;
   ammProviders: Quote[];
   utxoProviders: UtxoQuote[];
+  stxProviders: StxQuote[];
   toToken?: Token;
   ammProviderClicked?: (amm: Quote) => void;
   utxoProviderClicked?: (utxoProvider: UtxoQuote) => void;
@@ -54,13 +57,14 @@ function QuotesModal({
   onClose,
   ammProviders,
   utxoProviders,
+  stxProviders,
   toToken,
   ammProviderClicked,
   utxoProviderClicked,
 }: Props) {
   const { t } = useTranslation('translation', { keyPrefix: 'SWAP_SCREEN' });
 
-  const { btcFiatRate } = useCoinRates();
+  const { btcFiatRate, stxBtcRate } = useCoinRates();
 
   const numberOfUtxoProviders = utxoProviders.length;
   const lowestUtxoQuoteFloorRate = Math.min(
@@ -102,11 +106,12 @@ function QuotesModal({
         <StyledP typography="body_m" color="white_200">
           {t('QUOTE_TITLE')}
         </StyledP>
-        {ammProviders.length > 0 && (
-          <Heading typography="headline_s" color="white_0">
-            {t('EXCHANGE')}
-          </Heading>
-        )}
+        {ammProviders.length > 0 ||
+          (stxProviders.length > 0 && (
+            <Heading typography="headline_s" color="white_0">
+              {t('EXCHANGE')}
+            </Heading>
+          ))}
         {/* todo: get fiat rates of rune from API */}
         {ammProviders.map((amm) => (
           <QuoteTile
@@ -133,6 +138,27 @@ function QuotesModal({
             {t('MARKETPLACE')}
           </SecondHeading>
         )}
+        {stxProviders.map((stx) => (
+          <QuoteTile
+            key={stx.provider.name}
+            provider={stx.provider.name}
+            price={stx.receiveAmount}
+            image={{ ft: { image: stx.provider.logo } as FungibleToken }}
+            onClick={() => ammProviderClicked && ammProviderClicked(stx)}
+            subtitle={t('RECOMMENDED')}
+            subtitleColor="success_light"
+            unit={stx.to.protocol === 'stx' ? 'STX' : toToken?.symbol || ''}
+            fiatValue={
+              stx.to.protocol === 'stx'
+                ? getStxFiatEquivalent(
+                    new BigNumber(stx.receiveAmount),
+                    new BigNumber(stxBtcRate),
+                    new BigNumber(btcFiatRate),
+                  ).toFixed(2)
+                : ''
+            }
+          />
+        ))}
         {utxoQuotes.map((utxoProvider) => {
           const subTitle = getSubtitle(utxoProvider);
           let subTitleColour: Color = 'success_light';
diff --git a/src/app/screens/swap/types.ts b/src/app/screens/swap/types.ts
index 7077d8730..9a6cc21ec 100644
--- a/src/app/screens/swap/types.ts
+++ b/src/app/screens/swap/types.ts
@@ -3,6 +3,7 @@ import {
   type ExecuteOrderRequest,
   type FungibleToken,
   type PlaceOrderResponse,
+  type PlaceStxOrderResponse,
   type PlaceUtxoOrderResponse,
 } from '@secretkeylabs/xverse-core';
 import { Currency } from 'alex-sdk';
@@ -52,7 +53,14 @@ export type SelectedCurrencyState = {
   prevFrom?: Currency;
 };
 
-export type OrderInfo = {
-  order: PlaceOrderResponse | PlaceUtxoOrderResponse;
+type BaseOrderInfo = {
   providerCode: ExecuteOrderRequest['providerCode'];
 };
+
+export type OrderInfo = BaseOrderInfo & {
+  order: PlaceOrderResponse | PlaceUtxoOrderResponse;
+};
+
+export type StxOrderInfo = BaseOrderInfo & {
+  order: PlaceStxOrderResponse;
+};
diff --git a/src/app/screens/swap/utils.ts b/src/app/screens/swap/utils.ts
index 16350cb32..5088bed83 100644
--- a/src/app/screens/swap/utils.ts
+++ b/src/app/screens/swap/utils.ts
@@ -36,7 +36,7 @@ export const mapSwapTokenToFT = (token: Token): FungibleToken => ({
   principal: token.ticker,
   balance: '0',
   decimals: token.divisibility,
-  image: undefined,
+  image: token.logo,
   total_received: '0',
   total_sent: '0',
   runeSymbol: token.symbol,

From 89e626bc7eab407d19bc2f9a37d995dcded50b20 Mon Sep 17 00:00:00 2001
From: jordankzf <jordan@secretkeylabs.com>
Date: Thu, 22 Aug 2024 14:49:35 +0800
Subject: [PATCH 012/227] clean up

---
 .../ContractCallRequest.tsx                   | 33 +++++++++-
 .../psbtConfirmation/useExecuteOrder.tsx      | 17 +++++-
 src/app/screens/swap/index.tsx                | 61 ++++++++-----------
 src/app/screens/swap/quoteSummary/index.tsx   | 26 +++++---
 src/app/screens/swap/utils.ts                 | 47 ++++++++++++++
 src/app/screens/transactionRequest/index.tsx  | 13 ++--
 .../useStxTransactionRequest/index.ts         | 32 ++++++++--
 7 files changed, 174 insertions(+), 55 deletions(-)

diff --git a/src/app/components/transactionsRequests/ContractCallRequest.tsx b/src/app/components/transactionsRequests/ContractCallRequest.tsx
index a53fe53be..020ca66bd 100644
--- a/src/app/components/transactionsRequests/ContractCallRequest.tsx
+++ b/src/app/components/transactionsRequests/ContractCallRequest.tsx
@@ -15,6 +15,7 @@ import StxPostConditionCard from '@components/postCondition/stxPostConditionCard
 import TransactionDetailComponent from '@components/transactionDetailComponent';
 import useNetworkSelector from '@hooks/useNetwork';
 import useOnOriginTabClose from '@hooks/useOnTabClosed';
+import useExecuteOrder from '@screens/swap/components/psbtConfirmation/useExecuteOrder';
 import {
   addressToString,
   broadcastSignedTransaction,
@@ -26,6 +27,7 @@ import {
   type Args,
   type Coin,
   type ContractFunction,
+  type ExecuteStxOrderRequest,
 } from '@secretkeylabs/xverse-core';
 import type { ContractCallPayload } from '@stacks/connect';
 import {
@@ -110,6 +112,8 @@ export default function ContractCallRequest({
   const [hasTabClosed, setHasTabClosed] = useState(false);
   const { t } = useTranslation('translation');
   const [fee, setFee] = useState<BigNumber | undefined>(undefined);
+  const { executeStxOrder } = useExecuteOrder();
+  const [isLoading, setIsLoading] = useState(false);
 
   // SignTransaction Params
   const isMultiSigTx = isMultiSig(unsignedTx);
@@ -262,7 +266,32 @@ export default function ContractCallRequest({
     }
   };
 
-  const confirmCallback = (transactions: StacksTransaction[]) => {
+  const confirmCallback = async (transactions: StacksTransaction[]) => {
+    if (messageId === 'velar') {
+      const order: ExecuteStxOrderRequest = {
+        providerCode: 'velar',
+        signedTransaction: buf2hex(transactions[0].serialize()),
+      };
+      setIsLoading(true);
+      const response = await executeStxOrder(order);
+      setIsLoading(false);
+
+      if (response) {
+        navigate('/tx-status', {
+          state: {
+            txid: response.txid,
+            currency: 'STX',
+            error: '',
+            browserTx: false,
+            tabId,
+            messageId,
+            rpcMethod,
+          },
+        });
+      }
+      return;
+    }
+
     if (request?.sponsored) {
       if (rpcMethod && tabId && messageId) {
         switch (rpcMethod) {
@@ -356,7 +385,7 @@ export default function ContractCallRequest({
         initialStxTransactions={[unsignedTx]}
         onConfirmClick={confirmCallback}
         onCancelClick={cancelCallback}
-        loading={false}
+        loading={isLoading}
         title={request.functionName}
         subTitle={`Requested by ${request.appDetails?.name}`}
         hasSignatures={hasSignatures}
diff --git a/src/app/screens/swap/components/psbtConfirmation/useExecuteOrder.tsx b/src/app/screens/swap/components/psbtConfirmation/useExecuteOrder.tsx
index e4d7e6fc7..afce53d08 100644
--- a/src/app/screens/swap/components/psbtConfirmation/useExecuteOrder.tsx
+++ b/src/app/screens/swap/components/psbtConfirmation/useExecuteOrder.tsx
@@ -3,6 +3,7 @@ import {
   getXverseApiClient,
   type ExecuteOrderRequest,
   type ExecuteOrderResponse,
+  type ExecuteStxOrderRequest,
 } from '@secretkeylabs/xverse-core';
 import { useState } from 'react';
 
@@ -28,7 +29,21 @@ const useExecuteOrder = () => {
     }
   };
 
-  return { order, loading, error, executeOrder };
+  const executeStxOrder = async (request: ExecuteStxOrderRequest) => {
+    setLoading(true);
+    setError(null);
+    try {
+      const response = await xverseApiClient.swaps.executeStxOrder(request);
+      setOrder(response);
+      return response;
+    } catch (err: any) {
+      setError(err?.response?.data?.message ?? 'Failed to execute order');
+    } finally {
+      setLoading(false);
+    }
+  };
+
+  return { order, loading, error, executeOrder, executeStxOrder };
 };
 
 export default useExecuteOrder;
diff --git a/src/app/screens/swap/index.tsx b/src/app/screens/swap/index.tsx
index 6aa52c60e..8d8525de9 100644
--- a/src/app/screens/swap/index.tsx
+++ b/src/app/screens/swap/index.tsx
@@ -1,11 +1,14 @@
 import ArrowSwap from '@assets/img/icons/ArrowSwap.svg';
+import RequestsRoutes from '@common/utils/route-urls';
 import BottomBar from '@components/tabBar';
 import TopRow from '@components/topRow';
 import useRuneFloorPriceQuery from '@hooks/queries/runes/useRuneFloorPriceQuery';
 import useGetQuotes from '@hooks/queries/swaps/useGetQuotes';
 import useBtcWalletData from '@hooks/queries/useBtcWalletData';
 import useCoinRates from '@hooks/queries/useCoinRates';
+import useSelectedAccount from '@hooks/useSelectedAccount';
 import useWalletSelector from '@hooks/useWalletSelector';
+import type { DataStxSignTransaction } from '@screens/transactionRequest/useStxTransactionRequest';
 import {
   AnalyticsEvents,
   btcToSats,
@@ -17,14 +20,12 @@ import {
   type Token,
   type UtxoQuote,
 } from '@secretkeylabs/xverse-core';
-import { deserializeTransaction } from '@stacks/transactions';
 import Button, { LinkButton } from '@ui-library/button';
 import { StyledP } from '@ui-library/common.styled';
 import SnackBar from '@ui-library/snackBar';
 import { satsToBtcString } from '@utils/helper';
 import { trackMixPanel } from '@utils/mixpanel';
 import { getFtBalance } from '@utils/tokens';
-import RoutePaths from 'app/routes/paths';
 import BigNumber from 'bignumber.js';
 import { useEffect, useState } from 'react';
 import toast from 'react-hot-toast';
@@ -44,6 +45,7 @@ import useMasterCoinsList from './useMasterCoinsList';
 import {
   mapFTNativeSwapTokenToTokenBasic,
   mapFTProtocolToSwapProtocol,
+  mapFtToSwapToken,
   mapSwapProtocolToFTProtocol,
   mapSwapTokenToFT,
 } from './utils';
@@ -96,34 +98,6 @@ const Icon = styled.img`
   rotate: 90deg;
 `;
 
-const mapFtToSwapToken = (st: FungibleToken): Token => {
-  if (st.principal === 'BTC') {
-    return {
-      ticker: 'BTC',
-      name: 'Bitcoin',
-      protocol: 'btc',
-      divisibility: 8,
-    };
-  }
-  if (st.principal === 'STX') {
-    return {
-      ticker: 'STX',
-      name: 'Stacks',
-      protocol: 'stx',
-      divisibility: 6,
-    };
-  }
-
-  return {
-    ticker: st.principal ?? '',
-    name: st.name ?? st.assetName ?? '',
-    protocol: mapFTProtocolToSwapProtocol(st),
-    divisibility: st.decimals ?? 0,
-    logo: st.image ?? st.runeInscriptionId ?? '',
-    symbol: st.runeSymbol ?? '',
-  };
-};
-
 export default function SwapScreen() {
   const [amount, setAmount] = useState('');
   const [quote, setQuote] = useState<Quote>();
@@ -146,6 +120,7 @@ export default function SwapScreen() {
   const [utxoProviderSendAmount, setUtxoProviderSendAmount] = useState<string | undefined>();
 
   const { fiatCurrency } = useWalletSelector();
+  const { stxPublicKey } = useSelectedAccount();
 
   const { data: btcBalance } = useBtcWalletData();
   const { btcFiatRate, btcUsdRate } = useCoinRates();
@@ -428,13 +403,29 @@ export default function SwapScreen() {
     );
   }
 
-  if (stxOrderInfo?.order.unsignedTransaction) {
-    const unsignedTransaction = deserializeTransaction(stxOrderInfo.order.unsignedTransaction);
+  const unsignedTransactionHexString = stxOrderInfo?.order.unsignedTransaction;
+
+  if (unsignedTransactionHexString) {
+    const dataStxSignTransactionOverride: DataStxSignTransaction = {
+      context: {
+        origin: 'extension',
+        tabId: 0,
+      },
+      data: {
+        method: 'stx_signTransaction',
+        params: {
+          transaction: unsignedTransactionHexString,
+          pubkey: stxPublicKey,
+          broadcast: true,
+        },
+        id: 'velar',
+        jsonrpc: '2.0',
+      },
+    };
 
-    navigate(RoutePaths.ConfirmStacksTransaction, {
+    navigate(RequestsRoutes.TransactionRequest, {
       state: {
-        unsignedTx: unsignedTransaction,
-        fee: unsignedTransaction.auth.spendingCondition.fee.toString(),
+        dataStxSignTransactionOverride,
       },
     });
   }
diff --git a/src/app/screens/swap/quoteSummary/index.tsx b/src/app/screens/swap/quoteSummary/index.tsx
index a007a12a7..03448e99c 100644
--- a/src/app/screens/swap/quoteSummary/index.tsx
+++ b/src/app/screens/swap/quoteSummary/index.tsx
@@ -29,7 +29,12 @@ import trackSwapMixPanel from '../mixpanel';
 import QuoteTile from '../quotesModal/quoteTile';
 import { SlippageModalContent } from '../slippageModal';
 import type { OrderInfo, StxOrderInfo } from '../types';
-import { mapFTNativeSwapTokenToTokenBasic } from '../utils';
+import {
+  mapFTNativeSwapTokenToTokenBasic,
+  mapFtToCurrencyType,
+  mapSwapTokenToFT,
+  mapTokenToCurrencyType,
+} from '../utils';
 import EditFee from './EditFee';
 import QuoteSummaryTile from './quoteSummaryTile';
 import usePlaceOrder from './usePlaceOrder';
@@ -312,8 +317,11 @@ export default function QuoteSummary({
               provider="Amount"
               price={amount}
               image={{
-                currency: fromToken?.principal === 'BTC' ? 'BTC' : 'FT',
-                ft: fromToken?.principal === 'BTC' ? undefined : fromToken,
+                currency: mapFtToCurrencyType(fromToken),
+                ft:
+                  fromToken?.principal === 'BTC' || fromToken?.principal === 'STX'
+                    ? undefined
+                    : fromToken,
               }}
               subtitle={fromToken?.principal === 'BTC' ? 'Bitcoin' : fromToken?.assetName}
               subtitleColor="white_400"
@@ -335,16 +343,18 @@ export default function QuoteSummary({
               provider="Amount"
               price={quote.receiveAmount}
               image={{
-                currency: toToken?.protocol === 'btc' ? 'BTC' : 'FT',
+                currency: mapTokenToCurrencyType(toToken),
                 ft:
-                  toToken?.protocol === 'btc'
-                    ? undefined
-                    : ({
+                  toToken?.protocol === 'runes'
+                    ? ({
                         runeSymbol: toToken?.symbol,
                         runeInscriptionId: toToken?.logo,
                         ticker: toToken?.name,
                         protocol: 'runes',
-                      } as FungibleToken),
+                      } as FungibleToken)
+                    : toToken?.protocol === 'sip10'
+                    ? mapSwapTokenToFT(toToken)
+                    : undefined,
               }}
               subtitle={toToken?.protocol === 'btc' ? 'Bitcoin' : toToken?.name}
               subtitleColor="white_400"
diff --git a/src/app/screens/swap/utils.ts b/src/app/screens/swap/utils.ts
index 5088bed83..811dc795a 100644
--- a/src/app/screens/swap/utils.ts
+++ b/src/app/screens/swap/utils.ts
@@ -5,6 +5,25 @@ import type {
   Token,
   TokenBasic,
 } from '@secretkeylabs/xverse-core';
+import type { CurrencyTypes } from '@utils/constants';
+
+export const mapFtToCurrencyType = (ft?: FungibleToken): CurrencyTypes => {
+  const principalToCurrencyTypeMap: Record<string, CurrencyTypes> = {
+    BTC: 'BTC',
+    STX: 'STX',
+  };
+
+  return ft ? principalToCurrencyTypeMap[ft.principal] ?? 'FT' : 'FT';
+};
+
+export const mapTokenToCurrencyType = (t?: Token): CurrencyTypes => {
+  const protocolToCurrencyTypeMap: Record<string, CurrencyTypes> = {
+    btc: 'BTC',
+    stx: 'STX',
+  };
+
+  return t ? protocolToCurrencyTypeMap[t.protocol] ?? 'FT' : 'FT';
+};
 
 export const mapFTProtocolToSwapProtocol = (ft: FungibleToken): Protocol => {
   if (ft.principal === 'BTC') return 'btc';
@@ -53,3 +72,31 @@ export const mapFTNativeSwapTokenToTokenBasic = (token: FungibleToken | Token):
   const safeTypeToken = token as Token;
   return { ticker: safeTypeToken.ticker, protocol: safeTypeToken.protocol };
 };
+
+export const mapFtToSwapToken = (st: FungibleToken): Token => {
+  if (st.principal === 'BTC') {
+    return {
+      ticker: 'BTC',
+      name: 'Bitcoin',
+      protocol: 'btc',
+      divisibility: 8,
+    };
+  }
+  if (st.principal === 'STX') {
+    return {
+      ticker: 'STX',
+      name: 'Stacks',
+      protocol: 'stx',
+      divisibility: 6,
+    };
+  }
+
+  return {
+    ticker: st.principal ?? '',
+    name: st.name ?? st.assetName ?? '',
+    protocol: mapFTProtocolToSwapProtocol(st),
+    divisibility: st.decimals ?? 0,
+    logo: st.image ?? st.runeInscriptionId ?? '',
+    symbol: st.runeSymbol ?? '',
+  };
+};
diff --git a/src/app/screens/transactionRequest/index.tsx b/src/app/screens/transactionRequest/index.tsx
index 6c265f56a..718149ea9 100644
--- a/src/app/screens/transactionRequest/index.tsx
+++ b/src/app/screens/transactionRequest/index.tsx
@@ -25,9 +25,9 @@ import RoutePaths from 'app/routes/paths';
 import { useEffect, useState } from 'react';
 import toast from 'react-hot-toast';
 import { useTranslation } from 'react-i18next';
-import { useNavigate } from 'react-router-dom';
+import { useLocation, useNavigate } from 'react-router-dom';
 import styled from 'styled-components';
-import useStxTransactionRequest from './useStxTransactionRequest';
+import useStxTransactionRequest, { type DataStxSignTransaction } from './useStxTransactionRequest';
 
 const LoaderContainer = styled.div((props) => ({
   display: 'flex',
@@ -40,7 +40,11 @@ const LoaderContainer = styled.div((props) => ({
 function TransactionRequest() {
   const selectedAccount = useSelectedAccount();
   const { network, feeMultipliers, accountsList } = useWalletSelector();
-  const txReq = useStxTransactionRequest();
+  const location = useLocation();
+  const { dataStxSignTransactionOverride } = (location.state || {}) as {
+    dataStxSignTransactionOverride?: DataStxSignTransaction;
+  };
+  const txReq = useStxTransactionRequest(dataStxSignTransactionOverride);
   const navigate = useNavigate();
   const selectedNetwork = useNetworkSelector();
   const { switchAccount } = useWalletReducer();
@@ -84,11 +88,12 @@ function TransactionRequest() {
       transaction?.auth,
     );
     setUnsignedTx(unsignedSendStxTx);
+
     navigate(RoutePaths.ConfirmStacksTransaction, {
       state: {
         unsignedTx: buf2hex(unsignedSendStxTx.serialize()),
         sponsored: tokenTransferPayload.sponsored,
-        isBrowserTx: true,
+        isBrowserTx: !dataStxSignTransactionOverride,
         tabId,
         messageId,
         requestToken,
diff --git a/src/app/screens/transactionRequest/useStxTransactionRequest/index.ts b/src/app/screens/transactionRequest/useStxTransactionRequest/index.ts
index d0f430f47..081a3f897 100644
--- a/src/app/screens/transactionRequest/useStxTransactionRequest/index.ts
+++ b/src/app/screens/transactionRequest/useStxTransactionRequest/index.ts
@@ -1,5 +1,5 @@
 import { parseData } from '@common/utils';
-import { getPopupPayload } from '@common/utils/popup';
+import { getPopupPayload, type Context } from '@common/utils/popup';
 import { callContractParamsSchema } from '@common/utils/rpc/stx/callContract/paramsSchema';
 import { deployContractParamsSchema } from '@common/utils/rpc/stx/deployContract/paramsSchema';
 import useNetworkSelector from '@hooks/useNetwork';
@@ -18,7 +18,23 @@ import * as v from 'valibot';
 import type { Return } from './types';
 import { getPayload, isDeployContractPayload } from './utils';
 
-const useStxTransactionRequest = (): Return => {
+export type DataStxSignTransaction = {
+  context: Context;
+  data: {
+    method: 'stx_signTransaction';
+    params: {
+      transaction: string;
+      pubkey?: string | undefined;
+      broadcast?: boolean | undefined;
+    };
+    id: string;
+    jsonrpc: '2.0';
+  };
+} | null;
+
+const useStxTransactionRequest = (
+  dataStxSignTransactionOverride?: DataStxSignTransaction,
+): Return => {
   // Params
   const { search } = useLocation();
   const params = new URLSearchParams(search);
@@ -30,12 +46,18 @@ const useStxTransactionRequest = (): Return => {
   // Common to all WebBTC RPC methods
   const tabId = Number(params.get('tabId')) ?? 0;
   const messageId = params.get('messageId') ?? '';
-  const rpcMethod = params.get('rpcMethod') ?? '';
+  let rpcMethod = params.get('rpcMethod') ?? '';
 
-  const [errorStxSignTransaction, dataStxSignTransaction] = getPopupPayload((data) =>
+  const [errorStxSignTransaction, payloadDataStxSignTransaction] = getPopupPayload((data) =>
     v.parse(stxSignTransactionRequestMessageSchema, data),
   );
-  if (!errorStxSignTransaction) {
+
+  const dataStxSignTransaction = dataStxSignTransactionOverride ?? payloadDataStxSignTransaction;
+
+  if (dataStxSignTransaction) {
+    if (dataStxSignTransaction.data.method) {
+      rpcMethod = dataStxSignTransaction.data.method;
+    }
     const { transaction: transactionHex } = dataStxSignTransaction.data.params;
     const transaction = deserializeTransaction(transactionHex);
 

From 149bf4ff74c6e02ee595ca22165cebc9801da5fa Mon Sep 17 00:00:00 2001
From: jordankzf <jordan@secretkeylabs.com>
Date: Thu, 22 Aug 2024 21:50:15 +0800
Subject: [PATCH 013/227] more improvements

---
 .../swap/components/routeItem/index.tsx       | 17 +++--
 .../tokenFromBottomSheet/useFromTokens.ts     |  7 +-
 .../components/tokenToBottomSheet/index.tsx   | 36 ++++++++--
 .../tokenToBottomSheet/useToTokens.ts         |  8 ++-
 src/app/screens/swap/index.tsx                | 25 +++++--
 src/app/screens/swap/quoteSummary/index.tsx   | 68 +++++++++++++++----
 src/app/screens/swap/quotesModal/index.tsx    |  6 +-
 src/app/screens/swap/useMasterCoinsList.tsx   |  2 +
 src/app/screens/swap/utils.ts                 | 10 +++
 9 files changed, 147 insertions(+), 32 deletions(-)

diff --git a/src/app/screens/swap/components/routeItem/index.tsx b/src/app/screens/swap/components/routeItem/index.tsx
index 9438489f7..793f10d77 100644
--- a/src/app/screens/swap/components/routeItem/index.tsx
+++ b/src/app/screens/swap/components/routeItem/index.tsx
@@ -1,6 +1,6 @@
 import TokenImage from '@components/tokenImage';
 import { CaretDown } from '@phosphor-icons/react';
-import { mapSwapTokenToFT } from '@screens/swap/utils';
+import { mapFtToCurrencyType, mapSwapTokenToFT, mapTokenToCurrencyType } from '@screens/swap/utils';
 import type { FungibleToken, Token } from '@secretkeylabs/xverse-core';
 import { StyledP } from '@ui-library/common.styled';
 import { useTranslation } from 'react-i18next';
@@ -37,14 +37,15 @@ const TokenName = styled(StyledP)`
 
 type RouteItemProps = {
   label: string;
-  token?: FungibleToken | Token | 'BTC';
+  token?: FungibleToken | Token;
   onClick: () => void;
 };
 
 export default function RouteItem({ label, token, onClick }: RouteItemProps) {
   const { t } = useTranslation('translation', { keyPrefix: 'SWAP_SCREEN' });
 
-  const isBtcToken = token === 'BTC' || token?.protocol === 'btc';
+  const currency =
+    token && 'principal' in token ? mapFtToCurrencyType(token) : mapTokenToCurrencyType(token);
 
   return (
     <div>
@@ -54,16 +55,20 @@ export default function RouteItem({ label, token, onClick }: RouteItemProps) {
       <RouteItemButtonContainer onClick={onClick}>
         {token && (
           <TokenImage
-            currency={isBtcToken ? 'BTC' : 'FT'}
+            currency={currency}
             fungibleToken={
-              isBtcToken ? undefined : 'principal' in token ? token : mapSwapTokenToFT(token)
+              currency === 'FT'
+                ? 'principal' in token
+                  ? token
+                  : mapSwapTokenToFT(token)
+                : undefined
             }
             showProtocolIcon={false}
             size={20}
           />
         )}
         <TokenName data-testid="token-name" typography="body_medium_m" color="white_0">
-          {isBtcToken ? 'BTC' : token?.name ?? t('SELECT_COIN')}
+          {currency !== 'FT' ? currency : token?.name ?? t('SELECT_COIN')}
         </TokenName>
         <CaretDown
           data-testid="down-arrow-button"
diff --git a/src/app/screens/swap/components/tokenFromBottomSheet/useFromTokens.ts b/src/app/screens/swap/components/tokenFromBottomSheet/useFromTokens.ts
index 84a9a32d5..e5aca1f1e 100644
--- a/src/app/screens/swap/components/tokenFromBottomSheet/useFromTokens.ts
+++ b/src/app/screens/swap/components/tokenFromBottomSheet/useFromTokens.ts
@@ -1,5 +1,6 @@
 import useCoinRates from '@hooks/queries/useCoinRates';
 import useMasterCoinsList from '@screens/swap/useMasterCoinsList';
+import { mapSwapProtocolToFTProtocol } from '@screens/swap/utils';
 import { type Token } from '@secretkeylabs/xverse-core';
 import { sortFtByFiatBalance } from '@utils/tokens';
 
@@ -17,7 +18,11 @@ const useFromTokens = (toToken?: Token) => {
   });
 
   const filteredTokens = toToken
-    ? sortedTokens.filter((token) => token.principal !== toToken.ticker)
+    ? sortedTokens.filter(
+        (token) =>
+          token.principal !== toToken.ticker &&
+          mapSwapProtocolToFTProtocol(toToken.protocol) === token.protocol,
+      )
     : sortedTokens;
 
   return filteredTokens;
diff --git a/src/app/screens/swap/components/tokenToBottomSheet/index.tsx b/src/app/screens/swap/components/tokenToBottomSheet/index.tsx
index ed12b65f7..0c0f8ddda 100644
--- a/src/app/screens/swap/components/tokenToBottomSheet/index.tsx
+++ b/src/app/screens/swap/components/tokenToBottomSheet/index.tsx
@@ -1,7 +1,11 @@
 import TokenTile from '@components/tokenTile';
 import useDebounce from '@hooks/useDebounce';
 import { MagnifyingGlass } from '@phosphor-icons/react';
-import { mapFTProtocolToSwapProtocol, mapSwapTokenToFT } from '@screens/swap/utils';
+import {
+  mapFTMotherProtocolToSwapProtocol,
+  mapFTProtocolToSwapProtocol,
+  mapSwapTokenToFT,
+} from '@screens/swap/utils';
 import {
   AnalyticsEvents,
   type FungibleToken,
@@ -14,7 +18,7 @@ import Input from '@ui-library/input';
 import Sheet from '@ui-library/sheet';
 import Spinner from '@ui-library/spinner';
 import { trackMixPanel } from '@utils/mixpanel';
-import { useState } from 'react';
+import { useEffect, useState } from 'react';
 import { useTranslation } from 'react-i18next';
 import styled from 'styled-components';
 import Theme from 'theme';
@@ -95,8 +99,15 @@ export default function TokenToBottomSheet({
   resetFrom,
 }: Props) {
   const [query, setQuery] = useState('');
+
   const [selectedProtocol, setSelectedProtocol] = useState<Protocol>(supportedProtocols[0]);
 
+  useEffect(() => {
+    if (from) {
+      setSelectedProtocol(mapFTMotherProtocolToSwapProtocol(from));
+    }
+  }, [from]);
+
   const { t } = useTranslation('translation', { keyPrefix: 'SWAP_SCREEN' });
   const search = useDebounce(query, 500);
   const fromTokenBasic: TokenBasic | undefined = from
@@ -111,7 +122,7 @@ export default function TokenToBottomSheet({
     if (selectedProtocol === protocol) {
       return;
     }
-    resetFrom();
+    // resetFrom();
     setQuery('');
     setSelectedProtocol(protocol);
   };
@@ -156,7 +167,7 @@ export default function TokenToBottomSheet({
         )}
         {!!(data && !isLoading) &&
           data.map((token) => {
-            if (token.protocol === 'btc') {
+            if (token.protocol === 'btc' && selectedProtocol === 'runes') {
               return (
                 <StyledTokenTile
                   key={token.name}
@@ -173,6 +184,23 @@ export default function TokenToBottomSheet({
                 />
               );
             }
+            if (token.protocol === 'stx' && selectedProtocol === 'sip10') {
+              return (
+                <StyledTokenTile
+                  key={token.name}
+                  title={token.name ?? token.ticker}
+                  currency="STX"
+                  onPress={() => {
+                    onSelectCoin(token);
+                    trackMixPanel(AnalyticsEvents.SelectTokenToSwapTo, {
+                      selectedToken: 'Stacks',
+                    });
+                    handleClose();
+                  }}
+                  hideBalance
+                />
+              );
+            }
             if (token.protocol === 'runes' || token.protocol === 'sip10') {
               return (
                 <StyledTokenTile
diff --git a/src/app/screens/swap/components/tokenToBottomSheet/useToTokens.ts b/src/app/screens/swap/components/tokenToBottomSheet/useToTokens.ts
index c0b601b3a..c3085aea6 100644
--- a/src/app/screens/swap/components/tokenToBottomSheet/useToTokens.ts
+++ b/src/app/screens/swap/components/tokenToBottomSheet/useToTokens.ts
@@ -26,7 +26,13 @@ const useToTokens = (protocol: Protocol, from?: TokenBasic, query?: string) => {
       userTokens,
     });
 
-    const sortedResponse = response.items.sort((a) => (a.protocol === 'btc' ? -1 : 1));
+    const sortedResponse = response.items.sort((a, b) => {
+      if (a.protocol === 'btc') return -1;
+      if (b.protocol === 'btc') return 1;
+      if (a.protocol === 'stx') return -1;
+      if (b.protocol === 'stx') return 1;
+      return 0;
+    });
 
     const filteredResponse = from
       ? sortedResponse.filter((s) => s.ticker !== from.ticker)
diff --git a/src/app/screens/swap/index.tsx b/src/app/screens/swap/index.tsx
index 4fdcb01a9..9bce1af86 100644
--- a/src/app/screens/swap/index.tsx
+++ b/src/app/screens/swap/index.tsx
@@ -3,9 +3,11 @@ import RequestsRoutes from '@common/utils/route-urls';
 import BottomBar from '@components/tabBar';
 import TopRow from '@components/topRow';
 import useRuneFloorPriceQuery from '@hooks/queries/runes/useRuneFloorPriceQuery';
+import { useGetSip10FungibleTokens } from '@hooks/queries/stx/useGetSip10FungibleTokens';
 import useGetQuotes from '@hooks/queries/swaps/useGetQuotes';
 import useBtcWalletData from '@hooks/queries/useBtcWalletData';
 import useCoinRates from '@hooks/queries/useCoinRates';
+import useStxWalletData from '@hooks/queries/useStxWalletData';
 import useSelectedAccount from '@hooks/useSelectedAccount';
 import useWalletSelector from '@hooks/useWalletSelector';
 import type { DataStxSignTransaction } from '@screens/transactionRequest/useStxTransactionRequest';
@@ -13,6 +15,7 @@ import {
   AnalyticsEvents,
   btcToSats,
   getBtcFiatEquivalent,
+  microstacksToStx,
   type FungibleToken,
   type GetUtxosRequest,
   type MarketUtxo,
@@ -23,7 +26,7 @@ import {
 import Button, { LinkButton } from '@ui-library/button';
 import { StyledP } from '@ui-library/common.styled';
 import SnackBar from '@ui-library/snackBar';
-import { satsToBtcString } from '@utils/helper';
+import { formatNumber, satsToBtcString } from '@utils/helper';
 import { trackMixPanel } from '@utils/mixpanel';
 import { getFtBalance } from '@utils/tokens';
 import BigNumber from 'bignumber.js';
@@ -103,6 +106,7 @@ export default function SwapScreen() {
   const [quote, setQuote] = useState<Quote>();
   const [selectedUtxoProvider, setSelectedUtxoProvider] = useState<UtxoQuote>();
   const [errorMessage, setErrorMessage] = useState('');
+  const { data: sip10CoinsList } = useGetSip10FungibleTokens();
 
   const [getQuotesModalVisible, setGetQuotesModalVisible] = useState(false);
   const [tokenSelectionBottomSheet, setTokenSelectionBottomSheet] = useState<'from' | 'to' | null>(
@@ -123,6 +127,8 @@ export default function SwapScreen() {
   const { stxPublicKey } = useSelectedAccount();
 
   const { data: btcBalance } = useBtcWalletData();
+  const { data: stxData } = useStxWalletData();
+
   const { btcFiatRate, btcUsdRate } = useCoinRates();
   const navigate = useNavigate();
   const { t } = useTranslation('translation');
@@ -196,6 +202,8 @@ export default function SwapScreen() {
     switch (ftProtocol) {
       case 'runes':
         return coinsMasterList.find((coin) => coin.principal === ticker);
+      case 'stacks':
+        return coinsMasterList.find((coin) => coin.principal === ticker);
       default:
         return undefined;
     }
@@ -264,7 +272,11 @@ export default function SwapScreen() {
       return satsToBtcString(BigNumber(btcBalance ?? 0));
     }
 
-    if (fromToken.protocol === 'runes') {
+    if (fromToken.principal === 'STX') {
+      return formatNumber(microstacksToStx(BigNumber(stxData?.availableBalance ?? 0)).toString());
+    }
+
+    if (fromToken.protocol === 'runes' || fromToken.protocol === 'stacks') {
       return getFtBalance(fromToken);
     }
   };
@@ -278,7 +290,7 @@ export default function SwapScreen() {
       return getBtcFiatEquivalent(amountInSats, new BigNumber(btcFiatRate)).toFixed(2);
     }
 
-    if (fromToken?.protocol !== 'runes' || !fromToken?.tokenFiatRate || !fromToken.decimals) {
+    if (!fromToken?.tokenFiatRate || !fromToken.decimals) {
       return '0.00';
     }
 
@@ -309,7 +321,10 @@ export default function SwapScreen() {
   const isGetQuotesDisabled = ifFormInValid || quotesLoading || Boolean(quotesError);
 
   const isMaxDisabled =
-    !fromToken || fromToken.principal === 'BTC' || BigNumber(amount).eq(getFtBalance(fromToken));
+    !fromToken ||
+    fromToken.principal === 'BTC' ||
+    fromToken.principal === 'STX' ||
+    BigNumber(amount).eq(getFtBalance(fromToken));
   const isRunesToBtcRoute =
     fromToken?.principal !== 'BTC' &&
     fromToken?.protocol === 'runes' &&
@@ -527,7 +542,7 @@ export default function SwapScreen() {
               unit: fromToken?.principal === 'BTC' ? 'BTC' : fromToken?.runeSymbol ?? '',
             }}
             max={
-              fromToken?.principal === 'BTC'
+              fromToken?.principal === 'BTC' || fromToken?.principal === 'STX'
                 ? undefined
                 : { isDisabled: isMaxDisabled, onClick: onClickMax }
             }
diff --git a/src/app/screens/swap/quoteSummary/index.tsx b/src/app/screens/swap/quoteSummary/index.tsx
index e8dc85047..59e531f27 100644
--- a/src/app/screens/swap/quoteSummary/index.tsx
+++ b/src/app/screens/swap/quoteSummary/index.tsx
@@ -1,6 +1,7 @@
 import SlippageEditIcon from '@assets/img/swap/slippageEdit.svg';
 import TopRow from '@components/topRow';
 import useRuneFloorPriceQuery from '@hooks/queries/runes/useRuneFloorPriceQuery';
+import { useGetSip10FungibleTokens } from '@hooks/queries/stx/useGetSip10FungibleTokens';
 import useCoinRates from '@hooks/queries/useCoinRates';
 import useBtcFeeRate from '@hooks/useBtcFeeRate';
 import useSearchParamsState from '@hooks/useSearchParamsState';
@@ -11,6 +12,8 @@ import {
   AnalyticsEvents,
   RUNE_DISPLAY_DEFAULTS,
   getBtcFiatEquivalent,
+  getStxFiatEquivalent,
+  stxToMicrostacks,
   type FungibleToken,
   type MarketUtxo,
   type PlaceUtxoOrderRequest,
@@ -167,8 +170,9 @@ export default function QuoteSummary({
   selectedIdentifiers,
 }: QuoteSummaryProps) {
   const { t } = useTranslation('translation');
+  const { data: sip10CoinsList } = useGetSip10FungibleTokens();
   const theme = useTheme();
-  const { btcFiatRate, btcUsdRate } = useCoinRates();
+  const { btcFiatRate, btcUsdRate, stxBtcRate } = useCoinRates();
   const { btcAddress, ordinalsAddress, btcPublicKey, ordinalsPublicKey, stxAddress, stxPublicKey } =
     useSelectedAccount();
   const {
@@ -201,15 +205,35 @@ export default function QuoteSummary({
 
   const { fiatCurrency } = useWalletSelector();
 
-  const fromUnit =
-    fromToken?.principal === 'BTC'
-      ? 'Sats'
-      : (fromToken as FungibleToken)?.runeSymbol ??
-        (fromToken as FungibleToken).assetName ??
-        RUNE_DISPLAY_DEFAULTS.symbol;
+  const fromUnit = (() => {
+    if (fromToken?.principal === 'BTC') {
+      return 'Sats';
+    }
+    if (fromToken?.principal === 'STX') {
+      return 'STX';
+    }
+    if (fromToken?.protocol === 'runes') {
+      return fromToken?.runeSymbol ?? RUNE_DISPLAY_DEFAULTS.symbol;
+    }
 
-  const toUnit =
-    toToken?.protocol === 'btc' ? 'Sats' : toToken?.symbol ?? RUNE_DISPLAY_DEFAULTS.symbol;
+    return fromToken?.ticker;
+  })();
+
+  const toUnit = (() => {
+    if (toToken?.protocol === 'btc') {
+      return 'Sats';
+    }
+    if (toToken?.symbol) {
+      return toToken.symbol;
+    }
+    if (toToken?.protocol === 'runes') {
+      return RUNE_DISPLAY_DEFAULTS.symbol;
+    }
+    if (toToken?.ticker === 'STX') {
+      return 'STX';
+    }
+    return toToken?.name;
+  })();
 
   const isRunesSwap = fromToken?.protocol === 'runes' || toToken?.protocol === 'runes';
   const isSip10Swap = fromToken?.protocol === 'stacks' || toToken?.protocol === 'sip10';
@@ -301,6 +325,12 @@ export default function QuoteSummary({
   const fromTokenFiatValue =
     fromToken?.principal === 'BTC'
       ? getBtcFiatEquivalent(new BigNumber(amount), new BigNumber(btcFiatRate)).toFixed(2)
+      : fromToken?.principal === 'STX'
+      ? getStxFiatEquivalent(
+          stxToMicrostacks(new BigNumber(amount)),
+          new BigNumber(stxBtcRate),
+          new BigNumber(btcFiatRate),
+        ).toFixed(2)
       : new BigNumber(fromToken?.tokenFiatRate ?? 0).multipliedBy(amount).toFixed(2);
 
   const toTokenFiatValue =
@@ -309,10 +339,22 @@ export default function QuoteSummary({
           new BigNumber(quote.receiveAmount),
           new BigNumber(btcFiatRate),
         ).toFixed(2)
-      : getBtcFiatEquivalent(
+      : toToken?.protocol === 'runes'
+      ? getBtcFiatEquivalent(
           new BigNumber(runeFloorPrice ?? 0).multipliedBy(quote.receiveAmount),
           new BigNumber(btcFiatRate),
-        ).toFixed(2);
+        ).toFixed(2)
+      : toToken?.protocol === 'stx'
+      ? getStxFiatEquivalent(
+          stxToMicrostacks(new BigNumber(quote.receiveAmount)),
+          new BigNumber(stxBtcRate),
+          new BigNumber(btcFiatRate),
+        ).toFixed(2)
+      : new BigNumber(
+          sip10CoinsList?.find((s) => s.principal === toToken?.ticker)?.tokenFiatRate ?? 0,
+        )
+          .multipliedBy(quote.receiveAmount)
+          .toFixed(2);
 
   const showBadQuoteWarning =
     quote.slippageSupported &&
@@ -370,7 +412,7 @@ export default function QuoteSummary({
               }}
               subtitle={fromToken?.principal === 'BTC' ? 'Bitcoin' : fromToken?.assetName}
               subtitleColor="white_400"
-              unit={fromToken?.principal === 'BTC' ? 'Sats' : fromToken?.runeSymbol ?? ''}
+              unit={fromUnit}
               fiatValue={fromTokenFiatValue}
             />
             <ArrowOuterContainer>
@@ -397,7 +439,7 @@ export default function QuoteSummary({
               }}
               subtitle={toToken?.protocol === 'btc' ? 'Bitcoin' : toToken?.name}
               subtitleColor="white_400"
-              unit={toToken?.protocol === 'btc' ? 'Sats' : toToken?.symbol}
+              unit={toUnit}
               fiatValue={toTokenFiatValue}
             />
           </QuoteToBaseContainer>
diff --git a/src/app/screens/swap/quotesModal/index.tsx b/src/app/screens/swap/quotesModal/index.tsx
index bc3c57bf3..c358d1521 100644
--- a/src/app/screens/swap/quotesModal/index.tsx
+++ b/src/app/screens/swap/quotesModal/index.tsx
@@ -1,7 +1,9 @@
+import { microStxToStx } from '@components/postCondition/postConditionView/helper';
 import useCoinRates from '@hooks/queries/useCoinRates';
 import {
   getBtcFiatEquivalent,
   getStxFiatEquivalent,
+  stxToMicrostacks,
   type FungibleToken,
   type Quote,
   type StxQuote,
@@ -147,11 +149,11 @@ function QuotesModal({
             onClick={() => ammProviderClicked && ammProviderClicked(stx)}
             subtitle={t('RECOMMENDED')}
             subtitleColor="success_light"
-            unit={stx.to.protocol === 'stx' ? 'STX' : toToken?.symbol || ''}
+            unit={stx.to.protocol === 'stx' ? 'STX' : toToken?.name || ''}
             fiatValue={
               stx.to.protocol === 'stx'
                 ? getStxFiatEquivalent(
-                    new BigNumber(stx.receiveAmount),
+                    stxToMicrostacks(new BigNumber(stx.receiveAmount)),
                     new BigNumber(stxBtcRate),
                     new BigNumber(btcFiatRate),
                   ).toFixed(2)
diff --git a/src/app/screens/swap/useMasterCoinsList.tsx b/src/app/screens/swap/useMasterCoinsList.tsx
index 62fec126f..4081dafa5 100644
--- a/src/app/screens/swap/useMasterCoinsList.tsx
+++ b/src/app/screens/swap/useMasterCoinsList.tsx
@@ -15,6 +15,7 @@ export const btcFt: FungibleToken = {
   principal: 'BTC',
   assetName: 'Bitcoin',
   image: IconBitcoin,
+  protocol: 'runes',
 };
 
 export const stxFt: FungibleToken = {
@@ -25,6 +26,7 @@ export const stxFt: FungibleToken = {
   principal: 'STX',
   assetName: 'Stacks',
   image: IconStacks,
+  protocol: 'stacks',
 };
 
 const useMasterCoinsList = () => {
diff --git a/src/app/screens/swap/utils.ts b/src/app/screens/swap/utils.ts
index ff60f6aa1..1bb74ba29 100644
--- a/src/app/screens/swap/utils.ts
+++ b/src/app/screens/swap/utils.ts
@@ -40,8 +40,18 @@ export const mapFTProtocolToSwapProtocol = (ft: FungibleToken): Protocol => {
   return protocolMap[ft.protocol];
 };
 
+export const mapFTMotherProtocolToSwapProtocol = (ft: FungibleToken): Protocol => {
+  if (ft.principal === 'BTC') return 'runes';
+  if (ft.principal === 'STX') return 'sip10';
+  if (ft.protocol === 'stacks') return 'sip10';
+  if (ft.protocol === 'runes') return 'runes';
+  return 'runes';
+};
+
 export const mapSwapProtocolToFTProtocol = (protocol: Protocol): FungibleTokenProtocol => {
   const protocolMap: Partial<Record<Protocol, FungibleTokenProtocol>> = {
+    stx: 'stacks',
+    btc: 'runes',
     sip10: 'stacks',
     runes: 'runes',
     brc20: 'brc-20',

From 799d737029cdc4e77ca781d6251421b9c9fda799 Mon Sep 17 00:00:00 2001
From: jordankzf <jordan@secretkeylabs.com>
Date: Thu, 22 Aug 2024 22:55:02 +0800
Subject: [PATCH 014/227] remove old stacks swaps and add default slippage

---
 .../ContractCallRequest.tsx                   |   2 +-
 src/app/routes/index.tsx                      |   5 -
 src/app/screens/swap/quoteSummary/index.tsx   |  12 +-
 src/app/screens/swap/slippageModal/index.tsx  |   4 +-
 src/app/screens/swap/swap-stacks.tsx          | 146 ---------
 src/app/screens/swap/swapInfoBlock/index.tsx  | 181 ----------
 src/app/screens/swap/useSwap.test.ts          |  72 ----
 src/app/screens/swap/useSwap.tsx              | 310 ------------------
 8 files changed, 14 insertions(+), 718 deletions(-)
 delete mode 100644 src/app/screens/swap/swap-stacks.tsx
 delete mode 100644 src/app/screens/swap/swapInfoBlock/index.tsx
 delete mode 100644 src/app/screens/swap/useSwap.test.ts
 delete mode 100644 src/app/screens/swap/useSwap.tsx

diff --git a/src/app/components/transactionsRequests/ContractCallRequest.tsx b/src/app/components/transactionsRequests/ContractCallRequest.tsx
index 020ca66bd..8d06e861e 100644
--- a/src/app/components/transactionsRequests/ContractCallRequest.tsx
+++ b/src/app/components/transactionsRequests/ContractCallRequest.tsx
@@ -387,7 +387,7 @@ export default function ContractCallRequest({
         onCancelClick={cancelCallback}
         loading={isLoading}
         title={request.functionName}
-        subTitle={`Requested by ${request.appDetails?.name}`}
+        subTitle={request.appDetails?.name ? `Requested by ${request.appDetails.name}` : undefined}
         hasSignatures={hasSignatures}
         fee={fee ? microstacksToStx(fee).toString() : undefined}
         setFeeRate={(feeRate: string) => {
diff --git a/src/app/routes/index.tsx b/src/app/routes/index.tsx
index 34f38c6c2..ab5c39a67 100644
--- a/src/app/routes/index.tsx
+++ b/src/app/routes/index.tsx
@@ -76,7 +76,6 @@ import SignatureRequest from '@screens/signatureRequest';
 import SpeedUpTransactionScreen from '@screens/speedUpTransaction';
 import Stacking from '@screens/stacking';
 import SwapScreen from '@screens/swap';
-import SwapStacksScreen from '@screens/swap/swap-stacks';
 import SwapStacksConfirmation from '@screens/swap/swapStacksConfirmation';
 import TransactionRequest from '@screens/transactionRequest';
 import TransactionStatus from '@screens/transactionStatus';
@@ -154,10 +153,6 @@ const router = createHashRouter([
         path: 'swap',
         element: <SwapScreen />,
       },
-      {
-        path: 'swap-stacks',
-        element: <SwapStacksScreen />,
-      },
       {
         path: 'swap-stacks-confirm',
         element: <SwapStacksConfirmation />,
diff --git a/src/app/screens/swap/quoteSummary/index.tsx b/src/app/screens/swap/quoteSummary/index.tsx
index ace13ad96..bc0960abd 100644
--- a/src/app/screens/swap/quoteSummary/index.tsx
+++ b/src/app/screens/swap/quoteSummary/index.tsx
@@ -239,7 +239,8 @@ export default function QuoteSummary({
   const isSip10Swap = fromToken?.protocol === 'stacks' || toToken?.protocol === 'sip10';
 
   const [showSlippageModal, setShowSlippageModal] = useState(false);
-  const [slippage, setSlippage] = useSearchParamsState('slippage', 0.05);
+  const DEFAULT_SLIPPAGE = quote.provider.code === 'velar' ? 0.04 : 0.05;
+  const [slippage, setSlippage] = useSearchParamsState('slippage', DEFAULT_SLIPPAGE);
 
   const handleSwap = async () => {
     if (!fromToken || !toToken) {
@@ -417,7 +418,13 @@ export default function QuoteSummary({
                     ? undefined
                     : fromToken,
               }}
-              subtitle={fromToken?.principal === 'BTC' ? 'Bitcoin' : fromToken?.assetName}
+              subtitle={
+                fromToken?.principal === 'BTC'
+                  ? 'Bitcoin'
+                  : fromToken?.assetName !== ''
+                  ? fromToken?.assetName
+                  : fromToken?.name
+              }
               subtitleColor="white_400"
               unit={fromUnit}
               fiatValue={fromTokenFiatValue}
@@ -554,6 +561,7 @@ export default function QuoteSummary({
           onClose={() => setShowSlippageModal(false)}
         >
           <SlippageModalContent
+            defaultSlippage={DEFAULT_SLIPPAGE}
             slippage={slippage}
             slippageThreshold={quote.slippageThreshold}
             slippageDecimals={quote.slippageDecimals}
diff --git a/src/app/screens/swap/slippageModal/index.tsx b/src/app/screens/swap/slippageModal/index.tsx
index 4f11fb545..d4aa86be4 100644
--- a/src/app/screens/swap/slippageModal/index.tsx
+++ b/src/app/screens/swap/slippageModal/index.tsx
@@ -36,13 +36,14 @@ const Description = styled.p((props) => ({
   color: props.theme.colors.white_400,
 }));
 
-const DEFAULT_SLIPPAGE = '5';
 export function SlippageModalContent({
+  defaultSlippage,
   slippage,
   slippageThreshold,
   slippageDecimals,
   onChange,
 }: {
+  defaultSlippage: number;
   slippage: number;
   slippageThreshold?: number;
   slippageDecimals?: number;
@@ -53,6 +54,7 @@ export function SlippageModalContent({
   const result = Number(percentage);
   const invalid = !Number.isNaN(result) && result >= 100;
   const showSlippageWarning = slippageThreshold ? result > slippageThreshold * 100 : false;
+  const DEFAULT_SLIPPAGE = (defaultSlippage * 100).toString();
 
   const allowDecimalsNumber = slippageDecimals ?? 2;
 
diff --git a/src/app/screens/swap/swap-stacks.tsx b/src/app/screens/swap/swap-stacks.tsx
deleted file mode 100644
index ba9bc0a2f..000000000
--- a/src/app/screens/swap/swap-stacks.tsx
+++ /dev/null
@@ -1,146 +0,0 @@
-import BottomBar from '@components/tabBar';
-import TopRow from '@components/topRow';
-import { ArrowDown } from '@phosphor-icons/react';
-import CoinSelectModal from '@screens/home/coinSelectModal';
-import { SwapInfoBlock } from '@screens/swap/swapInfoBlock';
-import SwapTokenBlock from '@screens/swap/swapTokenBlock';
-import { useSwap } from '@screens/swap/useSwap';
-import Button from '@ui-library/button';
-import { isFungibleToken } from '@utils/helper';
-import { useCallback, useEffect, useState } from 'react';
-import { useTranslation } from 'react-i18next';
-import { useLocation, useNavigate } from 'react-router-dom';
-import styled from 'styled-components';
-
-const ScrollContainer = styled.div`
-  display: flex;
-  flex: 1;
-  flex-direction: column;
-  row-gap: 16px;
-  overflow-y: auto;
-  &::-webkit-scrollbar {
-    display: none;
-  }
-  margin-left: 5%;
-  margin-right: 5%;
-  padding-bottom: 16px;
-`;
-
-const Container = styled.div((props) => ({
-  display: 'flex',
-  flexDirection: 'column',
-  rowGap: props.theme.spacing(8),
-  marginTop: props.theme.spacing(16),
-}));
-
-const DownArrowButton = styled.button((props) => ({
-  alignSelf: 'center',
-  borderRadius: props.theme.radius(2),
-  width: props.theme.spacing(18),
-  height: props.theme.spacing(18),
-  background: props.theme.colors.elevation3,
-  transition: 'all 0.2s ease',
-  ':hover': {
-    opacity: 0.8,
-  },
-}));
-
-const SendButtonContainer = styled.div((props) => ({
-  paddingBottom: props.theme.spacing(12),
-  paddingTop: props.theme.spacing(4),
-  marginLeft: '5%',
-  marginRight: '5%',
-}));
-
-function SwapStacksScreen() {
-  const navigate = useNavigate();
-  const { t } = useTranslation('translation', { keyPrefix: 'SWAP_SCREEN' });
-  const swap = useSwap();
-  const location = useLocation();
-  const params = new URLSearchParams(location.search);
-  const defaultFrom = params.get('from');
-
-  const [selecting, setSelecting] = useState<'from' | 'to'>();
-  const [loading, setLoading] = useState(false);
-
-  useEffect(() => {
-    if (
-      !swap.selectedFromToken &&
-      !swap.selectedToToken &&
-      defaultFrom &&
-      (defaultFrom === 'STX' || isFungibleToken(defaultFrom))
-    ) {
-      swap.onSelectToken(defaultFrom, 'from');
-    }
-  }, [defaultFrom, swap]);
-
-  const handleGoBack = () => {
-    navigate(-1);
-  };
-
-  const handleClickContinue = useCallback(async () => {
-    if (swap.submitError || !swap.onSwap) {
-      return;
-    }
-    try {
-      setLoading(true);
-      await swap.onSwap();
-    } finally {
-      setLoading(false);
-    }
-  }, [swap, setLoading]);
-
-  return (
-    <>
-      <TopRow title={t('SWAP')} onClick={handleGoBack} />
-      <ScrollContainer>
-        <Container>
-          <SwapTokenBlock
-            title={t('CONVERT')}
-            selectedCoin={swap.selectedFromToken}
-            amount={swap.inputAmount}
-            error={swap.inputAmountInvalid}
-            onAmountChange={swap.onInputAmountChanged}
-            onSelectCoin={() => setSelecting('from')}
-          />
-          <DownArrowButton data-testid="down-arrow-button" onClick={swap.handleClickDownArrow}>
-            <ArrowDown size={20} weight="regular" color="white" />
-          </DownArrowButton>
-          <SwapTokenBlock
-            title={t('TO')}
-            selectedCoin={swap.selectedToToken}
-            onSelectCoin={() => setSelecting('to')}
-          />
-        </Container>
-        <SwapInfoBlock swap={swap} />
-      </ScrollContainer>
-      {selecting != null && (
-        <CoinSelectModal
-          onSelectStacks={() => {
-            swap.onSelectToken('STX', selecting);
-          }}
-          onClose={() => setSelecting(undefined)}
-          onSelectCoin={(coin) => {
-            swap.onSelectToken(coin, selecting);
-          }}
-          visible={!!selecting}
-          coins={swap.coinsList}
-          title={selecting === 'from' ? t('ASSET_TO_CONVERT_FROM') : t('ASSET_TO_CONVERT_TO')}
-          loadingWalletData={swap.isLoadingWalletData}
-        />
-      )}
-      <SendButtonContainer>
-        <Button
-          disabled={!!swap.submitError || swap.onSwap == null}
-          variant={swap.submitError ? 'danger' : 'primary'}
-          title={swap.submitError ?? t('CONTINUE')}
-          loading={loading || swap.isLoadingRates}
-          onClick={handleClickContinue}
-        />
-      </SendButtonContainer>
-      <BottomBar tab="dashboard" />
-    </>
-  );
-}
-
-export default SwapStacksScreen;
diff --git a/src/app/screens/swap/swapInfoBlock/index.tsx b/src/app/screens/swap/swapInfoBlock/index.tsx
deleted file mode 100644
index e7c336f99..000000000
--- a/src/app/screens/swap/swapInfoBlock/index.tsx
+++ /dev/null
@@ -1,181 +0,0 @@
-/* eslint-disable import/prefer-default-export */
-import ChevronIcon from '@assets/img/swap/chevron.svg';
-import SlippageEditIcon from '@assets/img/swap/slippageEdit.svg';
-import BottomModal from '@components/bottomModal';
-import { SlippageModalContent } from '@screens/swap/slippageModal';
-import { type UseSwap } from '@screens/swap/types';
-import {
-  EMPTY_LABEL,
-  SUPPORT_URL_TAB_TARGET,
-  SWAP_SPONSOR_DISABLED_SUPPORT_URL,
-} from '@utils/constants';
-import { useState } from 'react';
-import { useTranslation } from 'react-i18next';
-import Switch from 'react-switch';
-import styled, { useTheme } from 'styled-components';
-
-const CustomSwitch = styled(Switch)`
-  .react-switch-handle {
-    background-color: ${({ checked }) =>
-      checked ? '#FFFFFF' : 'rgba(255, 255, 255, 0.2)'} !important;
-    border: ${({ checked }) => (checked ? '' : '4px solid rgba(255, 255, 255, 0.2)')} !important;
-    height: 16px !important;
-    width: 16px !important;
-  }
-`;
-
-const PoweredByAlexText = styled.span((props) => ({
-  ...props.theme.body_xs,
-  color: props.theme.colors.white_400,
-}));
-
-const DetailButton = styled.button((props) => ({
-  display: 'flex',
-  flexDirection: 'row',
-  columnGap: props.theme.spacing(2),
-  background: 'transparent',
-  alignItems: 'center',
-  ...props.theme.body_medium_m,
-  color: props.theme.colors.white_200,
-}));
-
-const DL = styled.dl((props) => ({
-  display: 'flex',
-  flexWrap: 'wrap',
-  justifyContent: 'space-between',
-  rowGap: props.theme.spacing(8),
-}));
-
-const DT = styled.dt((props) => ({
-  ...props.theme.body_medium_m,
-  color: props.theme.colors.white_200,
-  flex: '50%',
-}));
-
-const DD = styled.dd((props) => ({
-  ...props.theme.body_medium_m,
-  color: props.theme.colors.white_0,
-  flex: '50%',
-  display: 'flex',
-  justifyContent: 'flex-end',
-  textAlign: 'right',
-}));
-
-const ChevronImage = styled.img<{ rotated: boolean }>(({ rotated }) => ({
-  transform: `rotate(${rotated ? 180 : 0}deg)`,
-  transition: 'transform 0.1s ease-in-out',
-}));
-
-const SlippageImg = styled.img(() => ({
-  width: 16,
-  height: 16,
-}));
-
-const CannotBeSponsored = styled.p((props) => ({
-  ...props.theme.body_medium_m,
-  color: props.theme.colors.white_200,
-}));
-
-const SponsorTransactionSwitchLabel = styled(DT)<{ disabled: boolean }>((props) => ({
-  color: props.disabled ? props.theme.colors.white_400 : props.theme.colors.white_200,
-}));
-
-const ToggleContainer = styled(DD)({
-  flex: 0,
-});
-
-const LearnMoreAnchor = styled.a((props) => ({
-  ...props.theme.body_bold_m,
-  color: props.theme.colors.white_0,
-  marginTop: props.theme.spacing(2),
-  display: 'block',
-}));
-
-export function SwapInfoBlock({ swap }: { swap: UseSwap }) {
-  const [expandDetail, setExpandDetail] = useState(false);
-  const { t } = useTranslation('translation', { keyPrefix: 'SWAP_SCREEN' });
-  const [showSlippageModal, setShowSlippageModal] = useState(false);
-  const theme = useTheme();
-
-  return (
-    <>
-      <DL>
-        <DT>
-          <DetailButton onClick={() => setExpandDetail(!expandDetail)}>
-            {t('DETAILS')}
-            <ChevronImage alt={t('DETAILS')} src={ChevronIcon} rotated={expandDetail} />
-          </DetailButton>
-        </DT>
-        <DD>{swap.swapInfo?.exchangeRate ?? EMPTY_LABEL}</DD>
-        {expandDetail && (
-          <>
-            <DT>{t('MIN_RECEIVE')}</DT>
-            <DD>{swap.minReceived ?? EMPTY_LABEL}</DD>
-            <DT>{t('SLIPPAGE')}</DT>
-            <DD>
-              <DetailButton onClick={() => setShowSlippageModal(true)}>
-                {swap.slippage * 100}%
-                <SlippageImg alt={t('SLIPPAGE')} src={SlippageEditIcon} />
-              </DetailButton>
-            </DD>
-            <DT>{t('LP_FEE')}</DT>
-            <DD>{swap.swapInfo?.lpFee ?? EMPTY_LABEL}</DD>
-            <DT>{t('ROUTE')}</DT>
-            <DD>{swap.swapInfo?.route ?? EMPTY_LABEL}</DD>
-            {swap.isServiceRunning && (
-              <>
-                <>
-                  <SponsorTransactionSwitchLabel disabled={swap.isSponsorDisabled}>
-                    {t('SPONSOR_TRANSACTION')}
-                  </SponsorTransactionSwitchLabel>
-                  <ToggleContainer>
-                    <CustomSwitch
-                      onColor={theme.colors.orange_main}
-                      offColor={theme.colors.background.elevation3}
-                      onChange={swap.handleChangeUserOverrideSponsorValue}
-                      checked={swap.isSponsored}
-                      disabled={swap.isSponsorDisabled}
-                      uncheckedIcon={false}
-                      checkedIcon={false}
-                      height={19}
-                      width={36}
-                    />
-                  </ToggleContainer>
-                </>
-                {swap.isSponsorDisabled && (
-                  <div>
-                    <CannotBeSponsored>
-                      {t('SWAP_TRANSACTION_CANNOT_BE_SPONSORED')}
-                    </CannotBeSponsored>
-                    <LearnMoreAnchor
-                      href={SWAP_SPONSOR_DISABLED_SUPPORT_URL}
-                      target={SUPPORT_URL_TAB_TARGET}
-                      rel="noopener noreferrer"
-                    >
-                      {t('LEARN_MORE')}
-                      {' →'}
-                    </LearnMoreAnchor>
-                  </div>
-                )}
-              </>
-            )}
-          </>
-        )}
-      </DL>
-      <PoweredByAlexText>{t('POWERED_BY_ALEX')}</PoweredByAlexText>
-      <BottomModal
-        header={t('SLIPPAGE_TITLE')}
-        visible={showSlippageModal}
-        onClose={() => setShowSlippageModal(false)}
-      >
-        <SlippageModalContent
-          slippage={swap.slippage}
-          onChange={(slippage) => {
-            swap.onSlippageChanged(slippage);
-            setShowSlippageModal(false);
-          }}
-        />
-      </BottomModal>
-    </>
-  );
-}
diff --git a/src/app/screens/swap/useSwap.test.ts b/src/app/screens/swap/useSwap.test.ts
deleted file mode 100644
index f690ed8c1..000000000
--- a/src/app/screens/swap/useSwap.test.ts
+++ /dev/null
@@ -1,72 +0,0 @@
-import { Currency } from 'alex-sdk';
-import { describe, expect, test } from 'vitest';
-import { type Side } from './types';
-import { selectedTokenReducer } from './useSwap';
-
-describe('useSwap', () => {
-  describe('selectedTokenReducer', () => {
-    [
-      {
-        name: 'simple case, no same tokens',
-        state: {
-          to: undefined,
-          from: undefined,
-          prevTo: undefined,
-          prevFrom: undefined,
-        },
-        payload: {
-          newCurrency: Currency.ALEX,
-          side: 'to' as Side,
-        },
-        expected: {
-          to: Currency.ALEX,
-          from: undefined,
-          prevTo: undefined,
-          prevFrom: undefined,
-        },
-      },
-      {
-        name: 'same token selected, other token will fall back to previously selected token',
-        state: {
-          to: Currency.ALEX,
-          from: undefined,
-          prevTo: Currency.STX,
-          prevFrom: undefined,
-        },
-        payload: {
-          newCurrency: Currency.ALEX,
-          side: 'from' as Side,
-        },
-        expected: {
-          to: Currency.STX,
-          from: Currency.ALEX,
-          prevTo: Currency.STX,
-          prevFrom: undefined,
-        },
-      },
-      {
-        name: 'same token selected, and other token cannot fallback. should be unselected',
-        state: {
-          to: Currency.STX,
-          from: Currency.ALEX,
-          prevTo: Currency.ALEX,
-          prevFrom: Currency.ALEX,
-        },
-        payload: {
-          newCurrency: Currency.ALEX,
-          side: 'to' as Side,
-        },
-        expected: {
-          to: Currency.ALEX,
-          from: undefined,
-          prevTo: Currency.STX,
-          prevFrom: Currency.ALEX,
-        },
-      },
-    ].forEach(({ name, state, payload, expected }) => {
-      test(name, () => {
-        expect(selectedTokenReducer(state, payload)).toEqual(expected);
-      });
-    });
-  });
-});
diff --git a/src/app/screens/swap/useSwap.tsx b/src/app/screens/swap/useSwap.tsx
deleted file mode 100644
index 800025cd3..000000000
--- a/src/app/screens/swap/useSwap.tsx
+++ /dev/null
@@ -1,310 +0,0 @@
-import useStxPendingTxData from '@hooks/queries/useStxPendingTxData';
-import useSelectedAccount from '@hooks/useSelectedAccount';
-import { type SwapConfirmationInput } from '@screens/swap/swapStacksConfirmation/useConfirmSwap';
-import {
-  buf2hex,
-  getNewNonce,
-  getNonce,
-  microstacksToStx,
-  setNonce,
-  type FungibleToken,
-} from '@secretkeylabs/xverse-core';
-import { AnchorMode, PostConditionMode, makeUnsignedContractCall } from '@stacks/transactions';
-import { AlexSDK, Currency } from 'alex-sdk';
-import BigNumber from 'bignumber.js';
-import { useEffect, useState } from 'react';
-import { useTranslation } from 'react-i18next';
-import { useNavigate } from 'react-router-dom';
-import {
-  type STXOrFungibleToken,
-  type SelectedCurrencyState,
-  type Side,
-  type UseSwap,
-} from './types';
-import { useAlexSponsoredTransaction } from './useAlexSponsoredTransaction';
-import { useStxCurrencyConversion } from './useStxCurrencyConversion';
-
-const isNotNull = <T extends any>(t: T | null | undefined): t is T => t != null;
-
-const updateOppositeCurrencyIfSameAsSelected = (
-  state: SelectedCurrencyState,
-  { newCurrency, side }: { newCurrency: Currency; side: Side },
-) => {
-  switch (side) {
-    case 'from':
-      if (state.to !== newCurrency) {
-        return state.to;
-      }
-      if (state.to === newCurrency && state.prevTo !== newCurrency) {
-        return state.prevTo;
-      }
-      return undefined;
-    case 'to':
-      if (state.from !== newCurrency) {
-        return state.from;
-      }
-      if (state.from === newCurrency && state.prevFrom !== newCurrency) {
-        return state.prevFrom;
-      }
-      return undefined;
-    default:
-      return state.to;
-  }
-};
-
-export const selectedTokenReducer: (
-  state: SelectedCurrencyState,
-  { newCurrency, side }: { newCurrency: Currency; side: Side },
-) => SelectedCurrencyState = (state, { newCurrency, side }) => {
-  switch (side) {
-    case 'from':
-      return {
-        ...state,
-        prevFrom: state.from,
-        from: newCurrency,
-        to: updateOppositeCurrencyIfSameAsSelected(state, { newCurrency, side }),
-      };
-    case 'to':
-      return {
-        ...state,
-        prevTo: state.to,
-        to: newCurrency,
-        from: updateOppositeCurrencyIfSameAsSelected(state, { newCurrency, side }),
-      };
-    default:
-      return state;
-  }
-};
-
-export function useSwap(): UseSwap {
-  const navigate = useNavigate();
-  const alexSDK = useState(() => new AlexSDK())[0];
-  const { t } = useTranslation('translation', { keyPrefix: 'SWAP_SCREEN' });
-  const { stxAddress, stxPublicKey } = useSelectedAccount();
-  const { acceptableCoinList, currencyToToken } = useStxCurrencyConversion();
-  const [userOverrideSponsorValue, setUserOverrideSponsorValue] = useState(true);
-  const { data: stxPendingTxData } = useStxPendingTxData();
-  const { isSponsored, isServiceRunning, isSponsorDisabled } =
-    useAlexSponsoredTransaction(userOverrideSponsorValue);
-
-  const [inputAmount, setInputAmount] = useState('');
-  const [slippage, setSlippage] = useState(0.04);
-  const [selectedCurrency, setSelectedCurrency] = useState<SelectedCurrencyState>({
-    to: undefined,
-    from: undefined,
-    prevTo: undefined,
-    prevFrom: undefined,
-  });
-  const [isLoadingRates, setIsLoadingRates] = useState(false);
-
-  const fromAmount = Number.isNaN(Number(inputAmount)) ? undefined : Number(inputAmount);
-
-  function getCurrencyName(currency: Currency) {
-    if (currency === Currency.STX) {
-      return 'STX';
-    }
-    const token = acceptableCoinList.find(
-      (c) => alexSDK.getCurrencyFrom(c.principal) === currency,
-    )!;
-    if (token == null) {
-      return currency;
-    }
-    return (token.ticker ?? token.name).toUpperCase();
-  }
-
-  function getCurrencyFromToken(token: 'STX' | FungibleToken) {
-    return token === 'STX' ? Currency.STX : alexSDK.getCurrencyFrom(token.principal)!;
-  }
-
-  function onSelectToken(token: STXOrFungibleToken, side: Side) {
-    const newCurrency = getCurrencyFromToken(token);
-    setSelectedCurrency(selectedTokenReducer(selectedCurrency, { newCurrency, side }));
-  }
-
-  const fromToken = currencyToToken(selectedCurrency.from, fromAmount);
-  const inputAmountInvalid =
-    Number.isNaN(Number(inputAmount)) ||
-    (fromAmount != null &&
-      (fromAmount < 0 || (fromToken?.balance != null && fromToken.balance < fromAmount)));
-
-  const [info, setInfo] = useState<{
-    route: Currency[];
-    feeRate: number;
-  }>();
-
-  useEffect(() => {
-    if (
-      selectedCurrency.from == null ||
-      selectedCurrency.to == null ||
-      selectedCurrency.from === selectedCurrency.to
-    ) {
-      setInfo(undefined);
-    } else {
-      let cancelled = false;
-      Promise.all([
-        alexSDK.getFeeRate(selectedCurrency.from, selectedCurrency.to),
-        alexSDK.getRouter(selectedCurrency.from, selectedCurrency.to),
-      ]).then((a) => {
-        if (cancelled) {
-          return;
-        }
-        setInfo({
-          route: a[1],
-          feeRate: Number(a[0]) / 1e8,
-        });
-      });
-      return () => {
-        cancelled = true;
-      };
-    }
-  }, [selectedCurrency.from, selectedCurrency.to, alexSDK]);
-
-  const [exchangeRate, setExchangeRate] = useState<number>();
-
-  useEffect(() => {
-    if (
-      selectedCurrency.from == null ||
-      selectedCurrency.to == null ||
-      fromAmount == null ||
-      fromAmount === 0 ||
-      selectedCurrency.from === selectedCurrency.to
-    ) {
-      setExchangeRate(undefined);
-      setIsLoadingRates(false);
-    } else {
-      setIsLoadingRates(true);
-      let cancelled = false;
-      alexSDK
-        .getAmountTo(
-          selectedCurrency.from,
-          BigInt(Math.floor(fromAmount * 1e8)),
-          selectedCurrency.to,
-        )
-        .then((result) => {
-          if (cancelled) {
-            return;
-          }
-          setExchangeRate(Number(result) / 1e8 / fromAmount);
-        })
-        .finally(() => {
-          setIsLoadingRates(false);
-        });
-      return () => {
-        cancelled = true;
-      };
-    }
-  }, [selectedCurrency.from, selectedCurrency.to, fromAmount, alexSDK]);
-
-  function roundForDisplay(input?: number) {
-    if (input == null) {
-      return undefined;
-    }
-    return input.toFixed(4);
-  }
-
-  const toAmount =
-    exchangeRate != null && fromAmount != null ? fromAmount * exchangeRate : undefined;
-
-  function toggleFromToTokens() {
-    setSelectedCurrency((prevState) => ({
-      to: prevState.from,
-      from: prevState.to,
-    }));
-    if (toAmount) {
-      setInputAmount(String(toAmount));
-    }
-  }
-
-  const toToken = currencyToToken(selectedCurrency.to, toAmount);
-  return {
-    coinsList: acceptableCoinList,
-    isLoadingWalletData: false,
-    inputAmount,
-    onInputAmountChanged: setInputAmount,
-    selectedFromToken: fromToken,
-    selectedToToken: toToken,
-    slippage,
-    onSlippageChanged: setSlippage,
-    onSelectToken,
-    inputAmountInvalid,
-    handleClickDownArrow: toggleFromToTokens,
-    minReceived:
-      toAmount != null
-        ? `${roundForDisplay(toAmount * (1 - slippage))} ${toToken?.name}`
-        : undefined,
-    swapInfo: {
-      exchangeRate:
-        exchangeRate != null && fromToken != null && toToken != null
-          ? `1 ${fromToken.name} = ${roundForDisplay(exchangeRate)} ${toToken.name}`
-          : undefined,
-      route: info?.route.map(getCurrencyName).join(' \u2192 '),
-      lpFee:
-        info?.feeRate != null && fromAmount != null && fromToken != null
-          ? `${roundForDisplay(info.feeRate * fromAmount)} ${fromToken.name}`
-          : undefined,
-    },
-    submitError: inputAmountInvalid ? t('ERRORS.INSUFFICIENT_BALANCE_FEES') : undefined,
-    onSwap:
-      fromAmount != null &&
-      toAmount != null &&
-      selectedCurrency.from != null &&
-      selectedCurrency.to != null &&
-      info != null
-        ? async () => {
-            const tx = alexSDK.runSwap(
-              stxAddress,
-              selectedCurrency.from!,
-              selectedCurrency.to!,
-              BigInt(Math.floor(fromAmount * 1e8)),
-              BigInt(Math.floor(toAmount * (1 - slippage) * 1e8)),
-              info.route,
-            );
-            const unsignedTx = await makeUnsignedContractCall({
-              publicKey: stxPublicKey,
-              contractAddress: tx.contractAddress,
-              contractName: tx.contractName,
-              functionName: tx.functionName,
-              functionArgs: tx.functionArgs as any,
-              anchorMode: AnchorMode.Any,
-              postConditionMode: PostConditionMode.Deny,
-              postConditions: tx.postConditions,
-              sponsored: isSponsored,
-            });
-
-            // bump nonce if pendingTxs
-            setNonce(
-              unsignedTx,
-              getNewNonce(stxPendingTxData?.pendingTransactions || [], getNonce(unsignedTx)),
-            );
-            const fee = microstacksToStx(
-              new BigNumber(unsignedTx.auth.spendingCondition.fee.toString()),
-            ).toNumber();
-            const state: SwapConfirmationInput = {
-              from: selectedCurrency.from!,
-              to: selectedCurrency.to!,
-              fromToken: fromToken!,
-              toToken: toToken!,
-              address: stxAddress,
-              fromAmount: fromAmount!,
-              minToAmount: toAmount! * (1 - slippage),
-              txFeeAmount: fee,
-              txFeeFiatAmount: currencyToToken(Currency.STX, fee)?.fiatAmount,
-              routers: info.route.map(currencyToToken).filter(isNotNull),
-              unsignedTx: buf2hex(unsignedTx.serialize()),
-              functionName: `${tx.contractName}\n${tx.functionName}`,
-              userOverrideSponsorValue,
-            };
-            navigate('/swap-stacks-confirm', {
-              state,
-            });
-          }
-        : undefined,
-    isSponsored,
-    isServiceRunning,
-    handleChangeUserOverrideSponsorValue: (checked: boolean) => {
-      setUserOverrideSponsorValue(checked);
-    },
-    isSponsorDisabled,
-    isLoadingRates,
-  };
-}

From c6cb9ce81393b7c9c2e2dd32ef52700272826b25 Mon Sep 17 00:00:00 2001
From: jordankzf <jordan@secretkeylabs.com>
Date: Fri, 23 Aug 2024 17:26:34 +0800
Subject: [PATCH 015/227] Bump xverse-core

---
 package-lock.json | 14814 ++++----------------------------------------
 package.json      |     2 +-
 2 files changed, 1349 insertions(+), 13467 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index f121f896c..56ea1036d 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "xverse-web-extension",
-  "version": "0.40.0",
-  "lockfileVersion": 2,
+  "version": "0.41.0",
+  "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "xverse-web-extension",
-      "version": "0.40.0",
+      "version": "0.41.0",
       "dependencies": {
         "@aryzing/superqs": "0.0.6",
         "@ledgerhq/hw-transport-webusb": "^6.27.13",
@@ -15,7 +15,7 @@
         "@react-spring/web": "^9.6.1",
         "@sats-connect/core": "0.2.1",
         "@scure/btc-signer": "1.2.1",
-        "@secretkeylabs/xverse-core": "18.7.0-49281c0",
+        "@secretkeylabs/xverse-core": "18.7.2",
         "@stacks/connect": "7.4.1",
         "@stacks/stacks-blockchain-api-types": "6.1.1",
         "@stacks/transactions": "6.13.1",
@@ -134,98 +134,17 @@
         "node": "^18.18.2"
       }
     },
-    "../xverse-core": {
-      "name": "@secretkeylabs/xverse-core",
-      "version": "12.0.1",
-      "extraneous": true,
-      "license": "ISC",
-      "dependencies": {
-        "@bitcoinerlab/secp256k1": "^1.0.2",
-        "@noble/curves": "^1.2.0",
-        "@noble/secp256k1": "^1.7.1",
-        "@scure/base": "^1.1.1",
-        "@scure/btc-signer": "1.2.1",
-        "@stacks/auth": "^6.9.0",
-        "@stacks/connect": "^7.4.1",
-        "@stacks/encryption": "6.9.0",
-        "@stacks/network": "6.8.1",
-        "@stacks/stacking": "^6.12.0",
-        "@stacks/storage": "^6.9.0",
-        "@stacks/transactions": "6.9.0",
-        "@stacks/wallet-sdk": "^6.9.0",
-        "@tanstack/react-query": "^4.29.3",
-        "@zondax/ledger-stacks": "^1.0.4",
-        "async-mutex": "^0.4.0",
-        "axios": "1.6.2",
-        "base64url": "^3.0.1",
-        "bip32": "^4.0.0",
-        "bip39": "3.0.3",
-        "bitcoin-address-validation": "^2.2.1",
-        "bitcoinjs-lib": "^6.1.3",
-        "bitcoinjs-message": "^2.2.0",
-        "bn.js": "^5.1.3",
-        "bs58": "^5.0.0",
-        "bs58check": "^3.0.1",
-        "buffer": "6.0.3",
-        "c32check": "^2.0.0",
-        "ecdsa-sig-formatter": "^1.0.11",
-        "ecpair": "^2.1.0",
-        "json-bigint": "^1.0.0",
-        "jsontokens": "^4.0.1",
-        "ledger-bitcoin": "^0.2.1",
-        "process": "^0.11.10",
-        "util": "^0.12.4",
-        "uuidv4": "^6.2.13",
-        "varuint-bitcoin": "^1.1.2"
-      },
-      "devDependencies": {
-        "@types/json-bigint": "^1.0.4",
-        "@types/react": "^18.2.18",
-        "@typescript-eslint/eslint-plugin": "^5.58.0",
-        "@typescript-eslint/parser": "^5.58.0",
-        "@vitest/coverage-c8": "^0.31.1",
-        "airbnb": "^0.0.2",
-        "axios-mock-adapter": "^1.22.0",
-        "bip322-js": "^1.1.0",
-        "eslint": "^8.38.0",
-        "eslint-config-airbnb-base": "^15.0.0",
-        "eslint-config-airbnb-typescript": "^17.0.0",
-        "eslint-config-prettier": "^8.8.0",
-        "eslint-plugin-import": "^2.27.5",
-        "eslint-plugin-prettier": "^4.2.1",
-        "husky": "^8.0.3",
-        "lint-staged": "^13.2.3",
-        "mockdate": "^3.0.5",
-        "prettier": "^2.8.7",
-        "rimraf": "^3.0.2",
-        "ts-loader": "^9.4.1",
-        "typescript": "^4.8.3",
-        "vitest": "^0.31.1",
-        "webpack": "^5.74.0",
-        "webpack-cli": "^4.10.0"
-      },
-      "engines": {
-        "node": "^18.18.2"
-      },
-      "peerDependencies": {
-        "bignumber.js": "^9.0.0",
-        "react": ">18.0.0",
-        "react-dom": ">18.0.0"
-      }
-    },
     "node_modules/@aashutoshrathi/word-wrap": {
       "version": "1.2.6",
-      "resolved": "https://registry.npmjs.org/@aashutoshrathi/word-wrap/-/word-wrap-1.2.6.tgz",
-      "integrity": "sha512-1Yjs2SvM8TflER/OD3cOjhWWOZb58A2t7wpE2S9XfBYTiIl+XFhQG2bjy4Pu1I+EAlCNUzRDYDdFwFYUKvXcIA==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=0.10.0"
       }
     },
     "node_modules/@ampproject/remapping": {
       "version": "2.2.1",
-      "resolved": "https://registry.npmjs.org/@ampproject/remapping/-/remapping-2.2.1.tgz",
-      "integrity": "sha512-lFMjJTrFL3j7L9yBxwYfCq2k6qqwHyzuUl/XBnif78PWTJYyL/dfowQHWE3sp6U6ZzqWiiIZnpTMO96zhkjwtg==",
+      "license": "Apache-2.0",
       "peer": true,
       "dependencies": {
         "@jridgewell/gen-mapping": "^0.3.0",
@@ -237,16 +156,14 @@
     },
     "node_modules/@aryzing/superqs": {
       "version": "0.0.6",
-      "resolved": "https://registry.npmjs.org/@aryzing/superqs/-/superqs-0.0.6.tgz",
-      "integrity": "sha512-MQR7BysZv1BqEmiFohs967UvMJMnWBipn2EFTG9AotyYXGgY67g7iofVOq8K83LAiOLVImr5kLhlzsmMTKLjFA==",
+      "license": "MIT",
       "dependencies": {
         "superjson": "2.2.1"
       }
     },
     "node_modules/@babel/code-frame": {
       "version": "7.23.4",
-      "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.23.4.tgz",
-      "integrity": "sha512-r1IONyb6Ia+jYR2vvIDhdWdlTGhqbBoFqLTQidzZ4kepUFH15ejXvFHxCVbtl7BOXIudsIubf4E81xeA3h3IXA==",
+      "license": "MIT",
       "dependencies": {
         "@babel/highlight": "^7.23.4",
         "chalk": "^2.4.2"
@@ -257,8 +174,7 @@
     },
     "node_modules/@babel/compat-data": {
       "version": "7.23.3",
-      "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.23.3.tgz",
-      "integrity": "sha512-BmR4bWbDIoFJmJ9z2cZ8Gmm2MXgEDgjdWgpKmKWUt54UGFJdlj31ECtbaDvCG/qVdG3AQ1SfpZEs01lUFbzLOQ==",
+      "license": "MIT",
       "peer": true,
       "engines": {
         "node": ">=6.9.0"
@@ -266,8 +182,7 @@
     },
     "node_modules/@babel/core": {
       "version": "7.23.3",
-      "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.23.3.tgz",
-      "integrity": "sha512-Jg+msLuNuCJDyBvFv5+OKOUjWMZgd85bKjbICd3zWrKAo+bJ49HJufi7CQE0q0uR8NGyO6xkCACScNqyjHSZew==",
+      "license": "MIT",
       "peer": true,
       "dependencies": {
         "@ampproject/remapping": "^2.2.0",
@@ -296,14 +211,12 @@
     },
     "node_modules/@babel/core/node_modules/convert-source-map": {
       "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-2.0.0.tgz",
-      "integrity": "sha512-Kvp459HrV2FEJ1CAsi1Ku+MY3kasH19TFykTz2xWmMeq6bk2NU3XXvfJ+Q61m0xktWwt+1HSYf3JZsTms3aRJg==",
+      "license": "MIT",
       "peer": true
     },
     "node_modules/@babel/generator": {
       "version": "7.23.4",
-      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.23.4.tgz",
-      "integrity": "sha512-esuS49Cga3HcThFNebGhlgsrVLkvhqvYDTzgjfFFlHJcIfLe5jFmRRfCQ1KuBfc4Jrtn3ndLgKWAKjBE+IraYQ==",
+      "license": "MIT",
       "dependencies": {
         "@babel/types": "^7.23.4",
         "@jridgewell/gen-mapping": "^0.3.2",
@@ -316,8 +229,7 @@
     },
     "node_modules/@babel/helper-annotate-as-pure": {
       "version": "7.22.5",
-      "resolved": "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.22.5.tgz",
-      "integrity": "sha512-LvBTxu8bQSQkcyKOU+a1btnNFQ1dMAd0R6PyW3arXes06F6QLWLIrd681bxRPIXlrMGR3XYnW9JyML7dP3qgxg==",
+      "license": "MIT",
       "dependencies": {
         "@babel/types": "^7.22.5"
       },
@@ -327,8 +239,7 @@
     },
     "node_modules/@babel/helper-compilation-targets": {
       "version": "7.22.15",
-      "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.22.15.tgz",
-      "integrity": "sha512-y6EEzULok0Qvz8yyLkCvVX+02ic+By2UdOhylwUOvOn9dvYc9mKICJuuU1n1XBI02YWsNsnrY1kc6DVbjcXbtw==",
+      "license": "MIT",
       "peer": true,
       "dependencies": {
         "@babel/compat-data": "^7.22.9",
@@ -343,16 +254,14 @@
     },
     "node_modules/@babel/helper-environment-visitor": {
       "version": "7.22.20",
-      "resolved": "https://registry.npmjs.org/@babel/helper-environment-visitor/-/helper-environment-visitor-7.22.20.tgz",
-      "integrity": "sha512-zfedSIzFhat/gFhWfHtgWvlec0nqB9YEIVrpuwjruLlXfUSnA8cJB0miHKwqDnQ7d32aKo2xt88/xZptwxbfhA==",
+      "license": "MIT",
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/helper-function-name": {
       "version": "7.23.0",
-      "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.23.0.tgz",
-      "integrity": "sha512-OErEqsrxjZTJciZ4Oo+eoZqeW9UIiOcuYKRJA4ZAgV9myA+pOXhhmpfNCKjEH/auVfEYVFJ6y1Tc4r0eIApqiw==",
+      "license": "MIT",
       "dependencies": {
         "@babel/template": "^7.22.15",
         "@babel/types": "^7.23.0"
@@ -363,8 +272,7 @@
     },
     "node_modules/@babel/helper-hoist-variables": {
       "version": "7.22.5",
-      "resolved": "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.22.5.tgz",
-      "integrity": "sha512-wGjk9QZVzvknA6yKIUURb8zY3grXCcOZt+/7Wcy8O2uctxhplmUPkOdlgoNhmdVee2c92JXbf1xpMtVNbfoxRw==",
+      "license": "MIT",
       "dependencies": {
         "@babel/types": "^7.22.5"
       },
@@ -374,8 +282,7 @@
     },
     "node_modules/@babel/helper-module-imports": {
       "version": "7.22.15",
-      "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.22.15.tgz",
-      "integrity": "sha512-0pYVBnDKZO2fnSPCrgM/6WMc7eS20Fbok+0r88fp+YtWVLZrp4CkafFGIp+W0VKw4a22sgebPT99y+FDNMdP4w==",
+      "license": "MIT",
       "dependencies": {
         "@babel/types": "^7.22.15"
       },
@@ -385,8 +292,7 @@
     },
     "node_modules/@babel/helper-module-transforms": {
       "version": "7.23.3",
-      "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.23.3.tgz",
-      "integrity": "sha512-7bBs4ED9OmswdfDzpz4MpWgSrV7FXlc3zIagvLFjS5H+Mk7Snr21vQ6QwrsoCGMfNC4e4LQPdoULEt4ykz0SRQ==",
+      "license": "MIT",
       "peer": true,
       "dependencies": {
         "@babel/helper-environment-visitor": "^7.22.20",
@@ -404,16 +310,14 @@
     },
     "node_modules/@babel/helper-plugin-utils": {
       "version": "7.22.5",
-      "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.22.5.tgz",
-      "integrity": "sha512-uLls06UVKgFG9QD4OeFYLEGteMIAa5kpTPcFL28yuCIIzsf6ZyKZMllKVOCZFhiZ5ptnwX4mtKdWCBE/uT4amg==",
+      "license": "MIT",
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/helper-simple-access": {
       "version": "7.22.5",
-      "resolved": "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.22.5.tgz",
-      "integrity": "sha512-n0H99E/K+Bika3++WNL17POvo4rKWZ7lZEp1Q+fStVbUi8nxPQEBOlTmCOxW/0JsS56SKKQ+ojAe2pHKJHN35w==",
+      "license": "MIT",
       "peer": true,
       "dependencies": {
         "@babel/types": "^7.22.5"
@@ -424,8 +328,7 @@
     },
     "node_modules/@babel/helper-split-export-declaration": {
       "version": "7.22.6",
-      "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.22.6.tgz",
-      "integrity": "sha512-AsUnxuLhRYsisFiaJwvp1QF+I3KjD5FOxut14q/GzovUe6orHLesW2C7d754kRm53h5gqrz6sFl6sxc4BVtE/g==",
+      "license": "MIT",
       "dependencies": {
         "@babel/types": "^7.22.5"
       },
@@ -435,24 +338,21 @@
     },
     "node_modules/@babel/helper-string-parser": {
       "version": "7.23.4",
-      "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.23.4.tgz",
-      "integrity": "sha512-803gmbQdqwdf4olxrX4AJyFBV/RTr3rSmOj0rKwesmzlfhYNDEs+/iOcznzpNWlJlIlTJC2QfPFcHB6DlzdVLQ==",
+      "license": "MIT",
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/helper-validator-identifier": {
       "version": "7.22.20",
-      "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.22.20.tgz",
-      "integrity": "sha512-Y4OZ+ytlatR8AI+8KZfKuL5urKp7qey08ha31L8b3BwewJAoJamTzyvxPR/5D+KkdJCGPq/+8TukHBlY10FX9A==",
+      "license": "MIT",
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/helper-validator-option": {
       "version": "7.22.15",
-      "resolved": "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.22.15.tgz",
-      "integrity": "sha512-bMn7RmyFjY/mdECUbgn9eoSY4vqvacUnS9i9vGAGttgFWesO6B4CYWA7XlpbWgBt71iv/hfbPlynohStqnu5hA==",
+      "license": "MIT",
       "peer": true,
       "engines": {
         "node": ">=6.9.0"
@@ -460,8 +360,7 @@
     },
     "node_modules/@babel/helpers": {
       "version": "7.23.4",
-      "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.23.4.tgz",
-      "integrity": "sha512-HfcMizYz10cr3h29VqyfGL6ZWIjTwWfvYBMsBVGwpcbhNGe3wQ1ZXZRPzZoAHhd9OqHadHqjQ89iVKINXnbzuw==",
+      "license": "MIT",
       "peer": true,
       "dependencies": {
         "@babel/template": "^7.22.15",
@@ -474,8 +373,7 @@
     },
     "node_modules/@babel/highlight": {
       "version": "7.23.4",
-      "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.23.4.tgz",
-      "integrity": "sha512-acGdbYSfp2WheJoJm/EBBBLh/ID8KDc64ISZ9DYtBmC8/Q204PZJLHyzeB5qMzJ5trcOkybd78M4x2KWsUq++A==",
+      "license": "MIT",
       "dependencies": {
         "@babel/helper-validator-identifier": "^7.22.20",
         "chalk": "^2.4.2",
@@ -487,8 +385,7 @@
     },
     "node_modules/@babel/parser": {
       "version": "7.23.4",
-      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.23.4.tgz",
-      "integrity": "sha512-vf3Xna6UEprW+7t6EtOmFpHNAuxw3xqPZghy+brsnusscJRW5BMUzzHZc5ICjULee81WeUV2jjakG09MDglJXQ==",
+      "license": "MIT",
       "bin": {
         "parser": "bin/babel-parser.js"
       },
@@ -498,8 +395,7 @@
     },
     "node_modules/@babel/plugin-syntax-jsx": {
       "version": "7.23.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.23.3.tgz",
-      "integrity": "sha512-EB2MELswq55OHUoRZLGg/zC7QWUKfNLpE57m/S2yr1uEneIgsTgrSzXP3NXEsMkVn76OlaVVnzN+ugObuYGwhg==",
+      "license": "MIT",
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.22.5"
       },
@@ -512,8 +408,7 @@
     },
     "node_modules/@babel/runtime": {
       "version": "7.22.6",
-      "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.22.6.tgz",
-      "integrity": "sha512-wDb5pWm4WDdF6LFUde3Jl8WzPA+3ZbxYqkC6xAXuD3irdEHN1k0NfTRrJD8ZD378SJ61miMLCqIOXYhd8x+AJQ==",
+      "license": "MIT",
       "dependencies": {
         "regenerator-runtime": "^0.13.11"
       },
@@ -523,8 +418,7 @@
     },
     "node_modules/@babel/template": {
       "version": "7.22.15",
-      "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.22.15.tgz",
-      "integrity": "sha512-QPErUVm4uyJa60rkI73qneDacvdvzxshT3kksGqlGWYdOTIUOwJ7RDUL8sGqslY1uXWSL6xMFKEXDS3ox2uF0w==",
+      "license": "MIT",
       "dependencies": {
         "@babel/code-frame": "^7.22.13",
         "@babel/parser": "^7.22.15",
@@ -536,8 +430,7 @@
     },
     "node_modules/@babel/traverse": {
       "version": "7.23.4",
-      "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.23.4.tgz",
-      "integrity": "sha512-IYM8wSUwunWTB6tFC2dkKZhxbIjHoWemdK+3f8/wq8aKhbUscxD5MX72ubd90fxvFknaLPeGw5ycU84V1obHJg==",
+      "license": "MIT",
       "dependencies": {
         "@babel/code-frame": "^7.23.4",
         "@babel/generator": "^7.23.4",
@@ -556,8 +449,7 @@
     },
     "node_modules/@babel/types": {
       "version": "7.23.4",
-      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.23.4.tgz",
-      "integrity": "sha512-7uIFwVYpoplT5jp/kVv6EF93VaJ8H+Yn5IczYiaAi98ajzjfoZfslet/e0sLh+wVBjb2qqIut1b0S26VSafsSQ==",
+      "license": "MIT",
       "dependencies": {
         "@babel/helper-string-parser": "^7.23.4",
         "@babel/helper-validator-identifier": "^7.22.20",
@@ -606,27 +498,23 @@
     },
     "node_modules/@emotion/is-prop-valid": {
       "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/@emotion/is-prop-valid/-/is-prop-valid-1.2.1.tgz",
-      "integrity": "sha512-61Mf7Ufx4aDxx1xlDeOm8aFFigGHE4z+0sKCa+IHCeZKiyP9RLD0Mmx7m8b9/Cf37f7NAvQOOJAbQQGVr5uERw==",
+      "license": "MIT",
       "dependencies": {
         "@emotion/memoize": "^0.8.1"
       }
     },
     "node_modules/@emotion/memoize": {
       "version": "0.8.1",
-      "resolved": "https://registry.npmjs.org/@emotion/memoize/-/memoize-0.8.1.tgz",
-      "integrity": "sha512-W2P2c/VRW1/1tLox0mVUalvnWXxavmv/Oum2aPsRcoDJuob75FC3Y8FbpfLwUegRcxINtGUMPq0tFCvYNTBXNA=="
+      "license": "MIT"
     },
     "node_modules/@emotion/stylis": {
       "version": "0.8.5",
-      "resolved": "https://registry.npmjs.org/@emotion/stylis/-/stylis-0.8.5.tgz",
-      "integrity": "sha512-h6KtPihKFn3T9fuIrwvXXUOwlx3rfUvfZIcP5a6rh8Y7zjE3O06hT5Ss4S/YI1AYhuZ1kjaE/5EaOOI2NqSylQ=="
+      "license": "MIT"
     },
     "node_modules/@ericcornelissen/bash-parser": {
       "version": "0.5.3",
-      "resolved": "https://registry.npmjs.org/@ericcornelissen/bash-parser/-/bash-parser-0.5.3.tgz",
-      "integrity": "sha512-9Z0sGuXqf6En19qmwB0Syi1Mc8TYl756dNuuaYal9mrypKa0Jq/IX6aJfh6Rk2S3z66KBisWTqloDo7weYj4zg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "array-last": "^1.1.1",
         "babylon": "^6.9.1",
@@ -652,524 +540,157 @@
     },
     "node_modules/@ericcornelissen/bash-parser/node_modules/magic-string": {
       "version": "0.16.0",
-      "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.16.0.tgz",
-      "integrity": "sha512-c4BEos3y6G2qO0B9X7K0FVLOPT9uGrjYwYRLFmDqyl5YMboUviyecnXWp94fJTSMwPw2/sf+CEYt5AGpmklkkQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "vlq": "^0.2.1"
       }
     },
-    "node_modules/@esbuild/aix-ppc64": {
+    "node_modules/@esbuild/darwin-arm64": {
       "version": "0.21.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/aix-ppc64/-/aix-ppc64-0.21.5.tgz",
-      "integrity": "sha512-1SDgH6ZSPTlggy1yI6+Dbkiz8xzpHJEVAlF/AM1tHPLsf5STom9rwtjE4hKAF20FfXXNTFqEYXyJNWh1GiZedQ==",
       "cpu": [
-        "ppc64"
+        "arm64"
       ],
       "dev": true,
+      "license": "MIT",
       "optional": true,
       "os": [
-        "aix"
+        "darwin"
       ],
       "engines": {
         "node": ">=12"
       }
     },
-    "node_modules/@esbuild/android-arm": {
-      "version": "0.21.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.21.5.tgz",
-      "integrity": "sha512-vCPvzSjpPHEi1siZdlvAlsPxXl7WbOVUBBAowWug4rJHb68Ox8KualB+1ocNvT5fjv6wpkX6o/iEpbDrf68zcg==",
-      "cpu": [
-        "arm"
-      ],
+    "node_modules/@eslint-community/eslint-utils": {
+      "version": "4.4.0",
       "dev": true,
-      "optional": true,
-      "os": [
-        "android"
-      ],
+      "license": "MIT",
+      "dependencies": {
+        "eslint-visitor-keys": "^3.3.0"
+      },
       "engines": {
-        "node": ">=12"
+        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+      },
+      "peerDependencies": {
+        "eslint": "^6.0.0 || ^7.0.0 || >=8.0.0"
       }
     },
-    "node_modules/@esbuild/android-arm64": {
-      "version": "0.21.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.21.5.tgz",
-      "integrity": "sha512-c0uX9VAUBQ7dTDCjq+wdyGLowMdtR/GoC2U5IYk/7D1H1JYC0qseD7+11iMP2mRLN9RcCMRcjC4YMclCzGwS/A==",
-      "cpu": [
-        "arm64"
-      ],
+    "node_modules/@eslint-community/regexpp": {
+      "version": "4.6.2",
       "dev": true,
-      "optional": true,
-      "os": [
-        "android"
-      ],
+      "license": "MIT",
       "engines": {
-        "node": ">=12"
+        "node": "^12.0.0 || ^14.0.0 || >=16.0.0"
       }
     },
-    "node_modules/@esbuild/android-x64": {
-      "version": "0.21.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.21.5.tgz",
-      "integrity": "sha512-D7aPRUUNHRBwHxzxRvp856rjUHRFW1SdQATKXH2hqA0kAZb1hKmi02OpYRacl0TxIGz/ZmXWlbZgjwWYaCakTA==",
-      "cpu": [
-        "x64"
-      ],
+    "node_modules/@eslint/eslintrc": {
+      "version": "2.1.4",
       "dev": true,
-      "optional": true,
-      "os": [
-        "android"
-      ],
+      "license": "MIT",
+      "dependencies": {
+        "ajv": "^6.12.4",
+        "debug": "^4.3.2",
+        "espree": "^9.6.0",
+        "globals": "^13.19.0",
+        "ignore": "^5.2.0",
+        "import-fresh": "^3.2.1",
+        "js-yaml": "^4.1.0",
+        "minimatch": "^3.1.2",
+        "strip-json-comments": "^3.1.1"
+      },
       "engines": {
-        "node": ">=12"
+        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+      },
+      "funding": {
+        "url": "https://opencollective.com/eslint"
       }
     },
-    "node_modules/@esbuild/darwin-arm64": {
-      "version": "0.21.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.21.5.tgz",
-      "integrity": "sha512-DwqXqZyuk5AiWWf3UfLiRDJ5EDd49zg6O9wclZ7kUMv2WRFr4HKjXp/5t8JZ11QbQfUS6/cRCKGwYhtNAY88kQ==",
-      "cpu": [
-        "arm64"
-      ],
+    "node_modules/@eslint/eslintrc/node_modules/globals": {
+      "version": "13.24.0",
       "dev": true,
-      "optional": true,
-      "os": [
-        "darwin"
-      ],
+      "license": "MIT",
+      "dependencies": {
+        "type-fest": "^0.20.2"
+      },
       "engines": {
-        "node": ">=12"
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/@esbuild/darwin-x64": {
-      "version": "0.21.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.21.5.tgz",
-      "integrity": "sha512-se/JjF8NlmKVG4kNIuyWMV/22ZaerB+qaSi5MdrXtd6R08kvs2qCN4C09miupktDitvh8jRFflwGFBQcxZRjbw==",
-      "cpu": [
-        "x64"
-      ],
+    "node_modules/@eslint/eslintrc/node_modules/type-fest": {
+      "version": "0.20.2",
       "dev": true,
-      "optional": true,
-      "os": [
-        "darwin"
-      ],
+      "license": "(MIT OR CC0-1.0)",
       "engines": {
-        "node": ">=12"
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/@esbuild/freebsd-arm64": {
-      "version": "0.21.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.21.5.tgz",
-      "integrity": "sha512-5JcRxxRDUJLX8JXp/wcBCy3pENnCgBR9bN6JsY4OmhfUtIHe3ZW0mawA7+RDAcMLrMIZaf03NlQiX9DGyB8h4g==",
-      "cpu": [
-        "arm64"
-      ],
+    "node_modules/@eslint/js": {
+      "version": "8.40.0",
       "dev": true,
-      "optional": true,
-      "os": [
-        "freebsd"
-      ],
+      "license": "MIT",
       "engines": {
-        "node": ">=12"
+        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
       }
     },
-    "node_modules/@esbuild/freebsd-x64": {
-      "version": "0.21.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.21.5.tgz",
-      "integrity": "sha512-J95kNBj1zkbMXtHVH29bBriQygMXqoVQOQYA+ISs0/2l3T9/kj42ow2mpqerRBxDJnmkUDCaQT/dfNXWX/ZZCQ==",
-      "cpu": [
-        "x64"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "freebsd"
-      ],
-      "engines": {
-        "node": ">=12"
+    "node_modules/@floating-ui/core": {
+      "version": "1.4.1",
+      "license": "MIT",
+      "dependencies": {
+        "@floating-ui/utils": "^0.1.1"
       }
     },
-    "node_modules/@esbuild/linux-arm": {
-      "version": "0.21.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.21.5.tgz",
-      "integrity": "sha512-bPb5AHZtbeNGjCKVZ9UGqGwo8EUu4cLq68E95A53KlxAPRmUyYv2D6F0uUI65XisGOL1hBP5mTronbgo+0bFcA==",
-      "cpu": [
-        "arm"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": ">=12"
+    "node_modules/@floating-ui/dom": {
+      "version": "1.5.1",
+      "license": "MIT",
+      "dependencies": {
+        "@floating-ui/core": "^1.4.1",
+        "@floating-ui/utils": "^0.1.1"
       }
     },
-    "node_modules/@esbuild/linux-arm64": {
-      "version": "0.21.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.21.5.tgz",
-      "integrity": "sha512-ibKvmyYzKsBeX8d8I7MH/TMfWDXBF3db4qM6sy+7re0YXya+K1cem3on9XgdT2EQGMu4hQyZhan7TeQ8XkGp4Q==",
-      "cpu": [
-        "arm64"
-      ],
+    "node_modules/@floating-ui/utils": {
+      "version": "0.1.1",
+      "license": "MIT"
+    },
+    "node_modules/@humanwhocodes/config-array": {
+      "version": "0.11.14",
       "dev": true,
-      "optional": true,
-      "os": [
-        "linux"
-      ],
+      "license": "Apache-2.0",
+      "dependencies": {
+        "@humanwhocodes/object-schema": "^2.0.2",
+        "debug": "^4.3.1",
+        "minimatch": "^3.0.5"
+      },
       "engines": {
-        "node": ">=12"
+        "node": ">=10.10.0"
       }
     },
-    "node_modules/@esbuild/linux-ia32": {
-      "version": "0.21.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.21.5.tgz",
-      "integrity": "sha512-YvjXDqLRqPDl2dvRODYmmhz4rPeVKYvppfGYKSNGdyZkA01046pLWyRKKI3ax8fbJoK5QbxblURkwK/MWY18Tg==",
-      "cpu": [
-        "ia32"
-      ],
+    "node_modules/@humanwhocodes/module-importer": {
+      "version": "1.0.1",
       "dev": true,
-      "optional": true,
-      "os": [
-        "linux"
-      ],
+      "license": "Apache-2.0",
       "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/@esbuild/linux-loong64": {
-      "version": "0.21.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.21.5.tgz",
-      "integrity": "sha512-uHf1BmMG8qEvzdrzAqg2SIG/02+4/DHB6a9Kbya0XDvwDEKCoC8ZRWI5JJvNdUjtciBGFQ5PuBlpEOXQj+JQSg==",
-      "cpu": [
-        "loong64"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/@esbuild/linux-mips64el": {
-      "version": "0.21.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.21.5.tgz",
-      "integrity": "sha512-IajOmO+KJK23bj52dFSNCMsz1QP1DqM6cwLUv3W1QwyxkyIWecfafnI555fvSGqEKwjMXVLokcV5ygHW5b3Jbg==",
-      "cpu": [
-        "mips64el"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/@esbuild/linux-ppc64": {
-      "version": "0.21.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.21.5.tgz",
-      "integrity": "sha512-1hHV/Z4OEfMwpLO8rp7CvlhBDnjsC3CttJXIhBi+5Aj5r+MBvy4egg7wCbe//hSsT+RvDAG7s81tAvpL2XAE4w==",
-      "cpu": [
-        "ppc64"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/@esbuild/linux-riscv64": {
-      "version": "0.21.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.21.5.tgz",
-      "integrity": "sha512-2HdXDMd9GMgTGrPWnJzP2ALSokE/0O5HhTUvWIbD3YdjME8JwvSCnNGBnTThKGEB91OZhzrJ4qIIxk/SBmyDDA==",
-      "cpu": [
-        "riscv64"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/@esbuild/linux-s390x": {
-      "version": "0.21.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.21.5.tgz",
-      "integrity": "sha512-zus5sxzqBJD3eXxwvjN1yQkRepANgxE9lgOW2qLnmr8ikMTphkjgXu1HR01K4FJg8h1kEEDAqDcZQtbrRnB41A==",
-      "cpu": [
-        "s390x"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/@esbuild/linux-x64": {
-      "version": "0.21.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.21.5.tgz",
-      "integrity": "sha512-1rYdTpyv03iycF1+BhzrzQJCdOuAOtaqHTWJZCWvijKD2N5Xu0TtVC8/+1faWqcP9iBCWOmjmhoH94dH82BxPQ==",
-      "cpu": [
-        "x64"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/@esbuild/netbsd-x64": {
-      "version": "0.21.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.21.5.tgz",
-      "integrity": "sha512-Woi2MXzXjMULccIwMnLciyZH4nCIMpWQAs049KEeMvOcNADVxo0UBIQPfSmxB3CWKedngg7sWZdLvLczpe0tLg==",
-      "cpu": [
-        "x64"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "netbsd"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/@esbuild/openbsd-x64": {
-      "version": "0.21.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.21.5.tgz",
-      "integrity": "sha512-HLNNw99xsvx12lFBUwoT8EVCsSvRNDVxNpjZ7bPn947b8gJPzeHWyNVhFsaerc0n3TsbOINvRP2byTZ5LKezow==",
-      "cpu": [
-        "x64"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "openbsd"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/@esbuild/sunos-x64": {
-      "version": "0.21.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.21.5.tgz",
-      "integrity": "sha512-6+gjmFpfy0BHU5Tpptkuh8+uw3mnrvgs+dSPQXQOv3ekbordwnzTVEb4qnIvQcYXq6gzkyTnoZ9dZG+D4garKg==",
-      "cpu": [
-        "x64"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "sunos"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/@esbuild/win32-arm64": {
-      "version": "0.21.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.21.5.tgz",
-      "integrity": "sha512-Z0gOTd75VvXqyq7nsl93zwahcTROgqvuAcYDUr+vOv8uHhNSKROyU961kgtCD1e95IqPKSQKH7tBTslnS3tA8A==",
-      "cpu": [
-        "arm64"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "win32"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/@esbuild/win32-ia32": {
-      "version": "0.21.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.21.5.tgz",
-      "integrity": "sha512-SWXFF1CL2RVNMaVs+BBClwtfZSvDgtL//G/smwAc5oVK/UPu2Gu9tIaRgFmYFFKrmg3SyAjSrElf0TiJ1v8fYA==",
-      "cpu": [
-        "ia32"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "win32"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/@esbuild/win32-x64": {
-      "version": "0.21.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.21.5.tgz",
-      "integrity": "sha512-tQd/1efJuzPC6rCFwEvLtci/xNFcTZknmXs98FYDfGE4wP9ClFV98nyKrzJKVPMhdDnjzLhdUyMX4PsQAPjwIw==",
-      "cpu": [
-        "x64"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "win32"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/@eslint-community/eslint-utils": {
-      "version": "4.4.0",
-      "resolved": "https://registry.npmjs.org/@eslint-community/eslint-utils/-/eslint-utils-4.4.0.tgz",
-      "integrity": "sha512-1/sA4dwrzBAyeUoQ6oxahHKmrZvsnLCg4RfxW3ZFGGmQkSNQPFNLV9CUEFQP1x9EYXHTo5p6xdhZM1Ne9p/AfA==",
-      "dev": true,
-      "dependencies": {
-        "eslint-visitor-keys": "^3.3.0"
-      },
-      "engines": {
-        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
-      },
-      "peerDependencies": {
-        "eslint": "^6.0.0 || ^7.0.0 || >=8.0.0"
-      }
-    },
-    "node_modules/@eslint-community/regexpp": {
-      "version": "4.6.2",
-      "resolved": "https://registry.npmjs.org/@eslint-community/regexpp/-/regexpp-4.6.2.tgz",
-      "integrity": "sha512-pPTNuaAG3QMH+buKyBIGJs3g/S5y0caxw0ygM3YyE6yJFySwiGGSzA+mM3KJ8QQvzeLh3blwgSonkFjgQdxzMw==",
-      "dev": true,
-      "engines": {
-        "node": "^12.0.0 || ^14.0.0 || >=16.0.0"
-      }
-    },
-    "node_modules/@eslint/eslintrc": {
-      "version": "2.1.4",
-      "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-2.1.4.tgz",
-      "integrity": "sha512-269Z39MS6wVJtsoUl10L60WdkhJVdPG24Q4eZTH3nnF6lpvSShEK3wQjDX9JRWAUPvPh7COouPpU9IrqaZFvtQ==",
-      "dev": true,
-      "dependencies": {
-        "ajv": "^6.12.4",
-        "debug": "^4.3.2",
-        "espree": "^9.6.0",
-        "globals": "^13.19.0",
-        "ignore": "^5.2.0",
-        "import-fresh": "^3.2.1",
-        "js-yaml": "^4.1.0",
-        "minimatch": "^3.1.2",
-        "strip-json-comments": "^3.1.1"
-      },
-      "engines": {
-        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
-      },
-      "funding": {
-        "url": "https://opencollective.com/eslint"
-      }
-    },
-    "node_modules/@eslint/eslintrc/node_modules/globals": {
-      "version": "13.24.0",
-      "resolved": "https://registry.npmjs.org/globals/-/globals-13.24.0.tgz",
-      "integrity": "sha512-AhO5QUcj8llrbG09iWhPU2B204J1xnPeL8kQmVorSsy+Sjj1sk8gIyh6cUocGmH4L0UuhAJy+hJMRA4mgA4mFQ==",
-      "dev": true,
-      "dependencies": {
-        "type-fest": "^0.20.2"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/@eslint/eslintrc/node_modules/type-fest": {
-      "version": "0.20.2",
-      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.20.2.tgz",
-      "integrity": "sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/@eslint/js": {
-      "version": "8.40.0",
-      "resolved": "https://registry.npmjs.org/@eslint/js/-/js-8.40.0.tgz",
-      "integrity": "sha512-ElyB54bJIhXQYVKjDSvCkPO1iU1tSAeVQJbllWJq1XQSmmA4dgFk8CbiBGpiOPxleE48vDogxCtmMYku4HSVLA==",
-      "dev": true,
-      "engines": {
-        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
-      }
-    },
-    "node_modules/@floating-ui/core": {
-      "version": "1.4.1",
-      "resolved": "https://registry.npmjs.org/@floating-ui/core/-/core-1.4.1.tgz",
-      "integrity": "sha512-jk3WqquEJRlcyu7997NtR5PibI+y5bi+LS3hPmguVClypenMsCY3CBa3LAQnozRCtCrYWSEtAdiskpamuJRFOQ==",
-      "dependencies": {
-        "@floating-ui/utils": "^0.1.1"
-      }
-    },
-    "node_modules/@floating-ui/dom": {
-      "version": "1.5.1",
-      "resolved": "https://registry.npmjs.org/@floating-ui/dom/-/dom-1.5.1.tgz",
-      "integrity": "sha512-KwvVcPSXg6mQygvA1TjbN/gh///36kKtllIF8SUm0qpFj8+rvYrpvlYdL1JoA71SHpDqgSSdGOSoQ0Mp3uY5aw==",
-      "dependencies": {
-        "@floating-ui/core": "^1.4.1",
-        "@floating-ui/utils": "^0.1.1"
-      }
-    },
-    "node_modules/@floating-ui/utils": {
-      "version": "0.1.1",
-      "resolved": "https://registry.npmjs.org/@floating-ui/utils/-/utils-0.1.1.tgz",
-      "integrity": "sha512-m0G6wlnhm/AX0H12IOWtK8gASEMffnX08RtKkCgTdHb9JpHKGloI7icFfLg9ZmQeavcvR0PKmzxClyuFPSjKWw=="
-    },
-    "node_modules/@humanwhocodes/config-array": {
-      "version": "0.11.14",
-      "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.11.14.tgz",
-      "integrity": "sha512-3T8LkOmg45BV5FICb15QQMsyUSWrQ8AygVfC7ZG32zOalnqrilm018ZVCw0eapXux8FtA33q8PSRSstjee3jSg==",
-      "dev": true,
-      "dependencies": {
-        "@humanwhocodes/object-schema": "^2.0.2",
-        "debug": "^4.3.1",
-        "minimatch": "^3.0.5"
-      },
-      "engines": {
-        "node": ">=10.10.0"
-      }
-    },
-    "node_modules/@humanwhocodes/module-importer": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/@humanwhocodes/module-importer/-/module-importer-1.0.1.tgz",
-      "integrity": "sha512-bxveV4V8v5Yb4ncFTT3rPSgZBOpCkjfK0y4oVVVJwIuDVBRMDXrPyXRL988i5ap9m9bnyEEjWfm5WkBmtffLfA==",
-      "dev": true,
-      "engines": {
-        "node": ">=12.22"
-      },
-      "funding": {
-        "type": "github",
-        "url": "https://github.com/sponsors/nzakas"
+        "node": ">=12.22"
+      },
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/nzakas"
       }
     },
     "node_modules/@humanwhocodes/object-schema": {
       "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/@humanwhocodes/object-schema/-/object-schema-2.0.2.tgz",
-      "integrity": "sha512-6EwiSjwWYP7pTckG6I5eyFANjPhmPjUX9JRLUSfNPC7FX7zK9gyZAfUEaECL6ALTpGX5AjnBq3C9XmVWPitNpw==",
-      "dev": true
+      "dev": true,
+      "license": "BSD-3-Clause"
     },
     "node_modules/@jest/schemas": {
       "version": "29.6.3",
-      "resolved": "https://registry.npmjs.org/@jest/schemas/-/schemas-29.6.3.tgz",
-      "integrity": "sha512-mo5j5X+jIZmJQveBKeS/clAueipV7KgiX1vMgCxam1RNYiqE1w62n0/tJJnHtjW8ZHcQco5gY85jA3mi0L+nSA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@sinclair/typebox": "^0.27.8"
       },
@@ -1179,8 +700,7 @@
     },
     "node_modules/@jridgewell/gen-mapping": {
       "version": "0.3.3",
-      "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.3.tgz",
-      "integrity": "sha512-HLhSWOLRi875zjjMG/r+Nv0oCW8umGb0BgEhyX3dDX3egwZtB8PqLnjz3yedt8R5StBrzcg4aBpnh8UA9D1BoQ==",
+      "license": "MIT",
       "dependencies": {
         "@jridgewell/set-array": "^1.0.1",
         "@jridgewell/sourcemap-codec": "^1.4.10",
@@ -1192,25 +712,22 @@
     },
     "node_modules/@jridgewell/resolve-uri": {
       "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.1.0.tgz",
-      "integrity": "sha512-F2msla3tad+Mfht5cJq7LSXcdudKTWCVYUgw6pLFOOHSTtZlj6SWNYAp+AhuqLmWdBO2X5hPrLcu8cVP8fy28w==",
+      "license": "MIT",
       "engines": {
         "node": ">=6.0.0"
       }
     },
     "node_modules/@jridgewell/set-array": {
       "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/@jridgewell/set-array/-/set-array-1.1.2.tgz",
-      "integrity": "sha512-xnkseuNADM0gt2bs+BvhO0p78Mk762YnZdsuzFV018NoG1Sj1SCQvpSqa7XUaTam5vAGasABV9qXASMKnFMwMw==",
+      "license": "MIT",
       "engines": {
         "node": ">=6.0.0"
       }
     },
     "node_modules/@jridgewell/source-map": {
       "version": "0.3.5",
-      "resolved": "https://registry.npmjs.org/@jridgewell/source-map/-/source-map-0.3.5.tgz",
-      "integrity": "sha512-UTYAUj/wviwdsMfzoSJspJxbkH5o1snzwX0//0ENX1u/55kkZZkcTZP6u9bwKGkv+dkk9at4m1Cpt0uY80kcpQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@jridgewell/gen-mapping": "^0.3.0",
         "@jridgewell/trace-mapping": "^0.3.9"
@@ -1218,13 +735,11 @@
     },
     "node_modules/@jridgewell/sourcemap-codec": {
       "version": "1.4.15",
-      "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.15.tgz",
-      "integrity": "sha512-eF2rxCRulEKXHTRiDrDy6erMYWqNw4LPdQ8UQA4huuxaQsVeRPFl2oM8oDGxMFhJUWZf9McpLtJasDDZb/Bpeg=="
+      "license": "MIT"
     },
     "node_modules/@jridgewell/trace-mapping": {
       "version": "0.3.18",
-      "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.18.tgz",
-      "integrity": "sha512-w+niJYzMHdd7USdiH2U6869nqhD2nbfZXND5Yp93qIbEmnDNk7PD48o+YchRVpzMU7M6jVCbenTR7PA1FLQ9pA==",
+      "license": "MIT",
       "dependencies": {
         "@jridgewell/resolve-uri": "3.1.0",
         "@jridgewell/sourcemap-codec": "1.4.14"
@@ -1232,13 +747,11 @@
     },
     "node_modules/@jridgewell/trace-mapping/node_modules/@jridgewell/sourcemap-codec": {
       "version": "1.4.14",
-      "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.14.tgz",
-      "integrity": "sha512-XPSJHWmi394fuUuzDnGz1wiKqWfo1yXecHQMRf2l6hztTO+nPru658AyDngaBe7isIxEkRsPR3FZh+s7iVa4Uw=="
+      "license": "MIT"
     },
     "node_modules/@ledgerhq/devices": {
       "version": "8.0.5",
-      "resolved": "https://registry.npmjs.org/@ledgerhq/devices/-/devices-8.0.5.tgz",
-      "integrity": "sha512-Cy4LOfcYhYGWLd2nRA/CY/AneJT+Q3RyNwzoRx28gqAN21vF3+IZtL0jqs1n78rZ2bTEHyBS1GMOX13s5Y+O4g==",
+      "license": "Apache-2.0",
       "dependencies": {
         "@ledgerhq/errors": "^6.13.0",
         "@ledgerhq/logs": "^6.10.1",
@@ -1248,8 +761,7 @@
     },
     "node_modules/@ledgerhq/devices/node_modules/lru-cache": {
       "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
-      "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
+      "license": "ISC",
       "dependencies": {
         "yallist": "^4.0.0"
       },
@@ -1259,8 +771,7 @@
     },
     "node_modules/@ledgerhq/devices/node_modules/semver": {
       "version": "7.5.4",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz",
-      "integrity": "sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==",
+      "license": "ISC",
       "dependencies": {
         "lru-cache": "^6.0.0"
       },
@@ -1273,18 +784,15 @@
     },
     "node_modules/@ledgerhq/devices/node_modules/yallist": {
       "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
-      "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A=="
+      "license": "ISC"
     },
     "node_modules/@ledgerhq/errors": {
       "version": "6.13.0",
-      "resolved": "https://registry.npmjs.org/@ledgerhq/errors/-/errors-6.13.0.tgz",
-      "integrity": "sha512-cMFNX2AN6Gdj4RVIizI/7vWb+JYRu5na0rQSjybf7xGW5MSVdFVRcOg90VvqnDRsNfgFBbJzhpf7o4D7S3yFgg=="
+      "license": "Apache-2.0"
     },
     "node_modules/@ledgerhq/hw-transport": {
       "version": "6.28.6",
-      "resolved": "https://registry.npmjs.org/@ledgerhq/hw-transport/-/hw-transport-6.28.6.tgz",
-      "integrity": "sha512-0VVB4jIG6ZTRtHusI5kO2jPcc1yFQ+iIcNKiTaaBHytsdGjTfhipje+W4vxo+nCdOKdrkOqB80GwykmKuNNXyA==",
+      "license": "Apache-2.0",
       "dependencies": {
         "@ledgerhq/devices": "^8.0.5",
         "@ledgerhq/errors": "^6.13.0",
@@ -1293,8 +801,7 @@
     },
     "node_modules/@ledgerhq/hw-transport-webusb": {
       "version": "6.27.17",
-      "resolved": "https://registry.npmjs.org/@ledgerhq/hw-transport-webusb/-/hw-transport-webusb-6.27.17.tgz",
-      "integrity": "sha512-HRh3PWwAHqfuibAif15H2X5ZbH8nNisDX49IxBoexBz/fM5ivP95kZZQsXLxzPxey5ima49B7AjWY3LyGBytqA==",
+      "license": "Apache-2.0",
       "dependencies": {
         "@ledgerhq/devices": "^8.0.5",
         "@ledgerhq/errors": "^6.13.0",
@@ -1304,19 +811,16 @@
     },
     "node_modules/@ledgerhq/logs": {
       "version": "6.10.1",
-      "resolved": "https://registry.npmjs.org/@ledgerhq/logs/-/logs-6.10.1.tgz",
-      "integrity": "sha512-z+ILK8Q3y+nfUl43ctCPuR4Y2bIxk/ooCQFwZxhtci1EhAtMDzMAx2W25qx8G1PPL9UUOdnUax19+F0OjXoj4w=="
+      "license": "Apache-2.0"
     },
     "node_modules/@leichtgewicht/ip-codec": {
       "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/@leichtgewicht/ip-codec/-/ip-codec-2.0.4.tgz",
-      "integrity": "sha512-Hcv+nVC0kZnQ3tD9GVu5xSMR4VVYOteQIr/hwFPVEvPdlXqgGEuRjiheChHgdM+JyqdgNcmzZOX/tnl0JOiI7A==",
-      "dev": true
-    },
+      "dev": true,
+      "license": "MIT"
+    },
     "node_modules/@noble/curves": {
       "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/@noble/curves/-/curves-1.3.0.tgz",
-      "integrity": "sha512-t01iSXPuN+Eqzb4eBX0S5oubSqXbK/xXa1Ne18Hj8f9pStxztHCE2gfboSp/dZRLSqfuLpRK2nDXDK+W9puocA==",
+      "license": "MIT",
       "dependencies": {
         "@noble/hashes": "1.3.3"
       },
@@ -1326,8 +830,7 @@
     },
     "node_modules/@noble/hashes": {
       "version": "1.3.3",
-      "resolved": "https://registry.npmjs.org/@noble/hashes/-/hashes-1.3.3.tgz",
-      "integrity": "sha512-V7/fPHgl+jsVPXqqeOzT8egNj2iBIVt+ECeMMG8TdcnTikP3oaBtUVqpT/gYCR68aEBJSF+XbYUxStjbFMqIIA==",
+      "license": "MIT",
       "engines": {
         "node": ">= 16"
       },
@@ -1337,20 +840,18 @@
     },
     "node_modules/@noble/secp256k1": {
       "version": "1.7.1",
-      "resolved": "https://registry.npmjs.org/@noble/secp256k1/-/secp256k1-1.7.1.tgz",
-      "integrity": "sha512-hOUk6AyBFmqVrv7k5WAw/LpszxVbj9gGN4JRkIX52fdFAj1UA61KXmZDvqVEm+pOyec3+fIeZB02LYa/pWOArw==",
       "funding": [
         {
           "type": "individual",
           "url": "https://paulmillr.com/funding/"
         }
-      ]
+      ],
+      "license": "MIT"
     },
     "node_modules/@nodelib/fs.scandir": {
       "version": "2.1.5",
-      "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz",
-      "integrity": "sha512-vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@nodelib/fs.stat": "2.0.5",
         "run-parallel": "^1.1.9"
@@ -1361,18 +862,16 @@
     },
     "node_modules/@nodelib/fs.stat": {
       "version": "2.0.5",
-      "resolved": "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz",
-      "integrity": "sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">= 8"
       }
     },
     "node_modules/@nodelib/fs.walk": {
       "version": "1.2.8",
-      "resolved": "https://registry.npmjs.org/@nodelib/fs.walk/-/fs.walk-1.2.8.tgz",
-      "integrity": "sha512-oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@nodelib/fs.scandir": "2.1.5",
         "fastq": "^1.6.0"
@@ -1383,8 +882,7 @@
     },
     "node_modules/@phosphor-icons/react": {
       "version": "2.0.10",
-      "resolved": "https://registry.npmjs.org/@phosphor-icons/react/-/react-2.0.10.tgz",
-      "integrity": "sha512-q5ITPNFhmEiYZLZOvEhjo2phlfxoOmit7vE1tBYMxcMqnZX2vdbMw3deDE7wCegpBKM/q/p39BJmhhoPcjZyCg==",
+      "license": "MIT",
       "engines": {
         "node": ">=10"
       },
@@ -1395,8 +893,6 @@
     },
     "node_modules/@playwright/test": {
       "version": "1.45.2",
-      "resolved": "https://registry.npmjs.org/@playwright/test/-/test-1.45.2.tgz",
-      "integrity": "sha512-JxG9eq92ET75EbVi3s+4sYbcG7q72ECeZNbdBlaMkGcNbiDQ4cAi8U2QP5oKkOx+1gpaiL1LDStmzCaEM1Z6fQ==",
       "license": "Apache-2.0",
       "dependencies": {
         "playwright": "1.45.2"
@@ -1410,9 +906,8 @@
     },
     "node_modules/@pmmmwh/react-refresh-webpack-plugin": {
       "version": "0.5.10",
-      "resolved": "https://registry.npmjs.org/@pmmmwh/react-refresh-webpack-plugin/-/react-refresh-webpack-plugin-0.5.10.tgz",
-      "integrity": "sha512-j0Ya0hCFZPd4x40qLzbhGsh9TMtdb+CJQiso+WxLOPNasohq9cc5SNUcwsZaRH6++Xh91Xkm/xHCkuIiIu0LUA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "ansi-html-community": "^0.0.8",
         "common-path-prefix": "^3.0.0",
@@ -1460,8 +955,7 @@
     },
     "node_modules/@rc-component/portal": {
       "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/@rc-component/portal/-/portal-1.1.2.tgz",
-      "integrity": "sha512-6f813C0IsasTZms08kfA8kPAGxbbkYToa8ALaiDIGGECU4i9hj8Plgbx0sNJDrey3EtHO30hmdaxtT0138xZcg==",
+      "license": "MIT",
       "dependencies": {
         "@babel/runtime": "^7.18.0",
         "classnames": "^2.3.2",
@@ -1477,8 +971,7 @@
     },
     "node_modules/@react-spring/animated": {
       "version": "9.7.3",
-      "resolved": "https://registry.npmjs.org/@react-spring/animated/-/animated-9.7.3.tgz",
-      "integrity": "sha512-5CWeNJt9pNgyvuSzQH+uy2pvTg8Y4/OisoscZIR8/ZNLIOI+CatFBhGZpDGTF/OzdNFsAoGk3wiUYTwoJ0YIvw==",
+      "license": "MIT",
       "dependencies": {
         "@react-spring/shared": "~9.7.3",
         "@react-spring/types": "~9.7.3"
@@ -1489,8 +982,7 @@
     },
     "node_modules/@react-spring/core": {
       "version": "9.7.3",
-      "resolved": "https://registry.npmjs.org/@react-spring/core/-/core-9.7.3.tgz",
-      "integrity": "sha512-IqFdPVf3ZOC1Cx7+M0cXf4odNLxDC+n7IN3MDcVCTIOSBfqEcBebSv+vlY5AhM0zw05PDbjKrNmBpzv/AqpjnQ==",
+      "license": "MIT",
       "dependencies": {
         "@react-spring/animated": "~9.7.3",
         "@react-spring/shared": "~9.7.3",
@@ -1506,8 +998,7 @@
     },
     "node_modules/@react-spring/shared": {
       "version": "9.7.3",
-      "resolved": "https://registry.npmjs.org/@react-spring/shared/-/shared-9.7.3.tgz",
-      "integrity": "sha512-NEopD+9S5xYyQ0pGtioacLhL2luflh6HACSSDUZOwLHoxA5eku1UPuqcJqjwSD6luKjjLfiLOspxo43FUHKKSA==",
+      "license": "MIT",
       "dependencies": {
         "@react-spring/types": "~9.7.3"
       },
@@ -1517,13 +1008,11 @@
     },
     "node_modules/@react-spring/types": {
       "version": "9.7.3",
-      "resolved": "https://registry.npmjs.org/@react-spring/types/-/types-9.7.3.tgz",
-      "integrity": "sha512-Kpx/fQ/ZFX31OtlqVEFfgaD1ACzul4NksrvIgYfIFq9JpDHFwQkMVZ10tbo0FU/grje4rcL4EIrjekl3kYwgWw=="
+      "license": "MIT"
     },
     "node_modules/@react-spring/web": {
       "version": "9.7.3",
-      "resolved": "https://registry.npmjs.org/@react-spring/web/-/web-9.7.3.tgz",
-      "integrity": "sha512-BXt6BpS9aJL/QdVqEIX9YoUy8CE6TJrU0mNCqSoxdXlIeNcEBWOfIyE6B14ENNsyQKS3wOWkiJfco0tCr/9tUg==",
+      "license": "MIT",
       "dependencies": {
         "@react-spring/animated": "~9.7.3",
         "@react-spring/core": "~9.7.3",
@@ -1537,224 +1026,25 @@
     },
     "node_modules/@remix-run/router": {
       "version": "1.7.2",
-      "resolved": "https://registry.npmjs.org/@remix-run/router/-/router-1.7.2.tgz",
-      "integrity": "sha512-7Lcn7IqGMV+vizMPoEl5F0XDshcdDYtMI6uJLQdQz5CfZAwy3vvGKYSUk789qndt5dEC4HfSjviSYlSoHGL2+A==",
+      "license": "MIT",
       "engines": {
         "node": ">=14"
       }
     },
-    "node_modules/@rollup/rollup-android-arm-eabi": {
-      "version": "4.18.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.18.0.tgz",
-      "integrity": "sha512-Tya6xypR10giZV1XzxmH5wr25VcZSncG0pZIjfePT0OVBvqNEurzValetGNarVrGiq66EBVAFn15iYX4w6FKgQ==",
-      "cpu": [
-        "arm"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "android"
-      ]
-    },
-    "node_modules/@rollup/rollup-android-arm64": {
-      "version": "4.18.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.18.0.tgz",
-      "integrity": "sha512-avCea0RAP03lTsDhEyfy+hpfr85KfyTctMADqHVhLAF3MlIkq83CP8UfAHUssgXTYd+6er6PaAhx/QGv4L1EiA==",
-      "cpu": [
-        "arm64"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "android"
-      ]
-    },
     "node_modules/@rollup/rollup-darwin-arm64": {
       "version": "4.18.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.18.0.tgz",
-      "integrity": "sha512-IWfdwU7KDSm07Ty0PuA/W2JYoZ4iTj3TUQjkVsO/6U+4I1jN5lcR71ZEvRh52sDOERdnNhhHU57UITXz5jC1/w==",
       "cpu": [
         "arm64"
       ],
       "dev": true,
+      "license": "MIT",
       "optional": true,
       "os": [
         "darwin"
       ]
     },
-    "node_modules/@rollup/rollup-darwin-x64": {
-      "version": "4.18.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.18.0.tgz",
-      "integrity": "sha512-n2LMsUz7Ynu7DoQrSQkBf8iNrjOGyPLrdSg802vk6XT3FtsgX6JbE8IHRvposskFm9SNxzkLYGSq9QdpLYpRNA==",
-      "cpu": [
-        "x64"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "darwin"
-      ]
-    },
-    "node_modules/@rollup/rollup-linux-arm-gnueabihf": {
-      "version": "4.18.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.18.0.tgz",
-      "integrity": "sha512-C/zbRYRXFjWvz9Z4haRxcTdnkPt1BtCkz+7RtBSuNmKzMzp3ZxdM28Mpccn6pt28/UWUCTXa+b0Mx1k3g6NOMA==",
-      "cpu": [
-        "arm"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "linux"
-      ]
-    },
-    "node_modules/@rollup/rollup-linux-arm-musleabihf": {
-      "version": "4.18.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-musleabihf/-/rollup-linux-arm-musleabihf-4.18.0.tgz",
-      "integrity": "sha512-l3m9ewPgjQSXrUMHg93vt0hYCGnrMOcUpTz6FLtbwljo2HluS4zTXFy2571YQbisTnfTKPZ01u/ukJdQTLGh9A==",
-      "cpu": [
-        "arm"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "linux"
-      ]
-    },
-    "node_modules/@rollup/rollup-linux-arm64-gnu": {
-      "version": "4.18.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.18.0.tgz",
-      "integrity": "sha512-rJ5D47d8WD7J+7STKdCUAgmQk49xuFrRi9pZkWoRD1UeSMakbcepWXPF8ycChBoAqs1pb2wzvbY6Q33WmN2ftw==",
-      "cpu": [
-        "arm64"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "linux"
-      ]
-    },
-    "node_modules/@rollup/rollup-linux-arm64-musl": {
-      "version": "4.18.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.18.0.tgz",
-      "integrity": "sha512-be6Yx37b24ZwxQ+wOQXXLZqpq4jTckJhtGlWGZs68TgdKXJgw54lUUoFYrg6Zs/kjzAQwEwYbp8JxZVzZLRepQ==",
-      "cpu": [
-        "arm64"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "linux"
-      ]
-    },
-    "node_modules/@rollup/rollup-linux-powerpc64le-gnu": {
-      "version": "4.18.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-powerpc64le-gnu/-/rollup-linux-powerpc64le-gnu-4.18.0.tgz",
-      "integrity": "sha512-hNVMQK+qrA9Todu9+wqrXOHxFiD5YmdEi3paj6vP02Kx1hjd2LLYR2eaN7DsEshg09+9uzWi2W18MJDlG0cxJA==",
-      "cpu": [
-        "ppc64"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "linux"
-      ]
-    },
-    "node_modules/@rollup/rollup-linux-riscv64-gnu": {
-      "version": "4.18.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-gnu/-/rollup-linux-riscv64-gnu-4.18.0.tgz",
-      "integrity": "sha512-ROCM7i+m1NfdrsmvwSzoxp9HFtmKGHEqu5NNDiZWQtXLA8S5HBCkVvKAxJ8U+CVctHwV2Gb5VUaK7UAkzhDjlg==",
-      "cpu": [
-        "riscv64"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "linux"
-      ]
-    },
-    "node_modules/@rollup/rollup-linux-s390x-gnu": {
-      "version": "4.18.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-s390x-gnu/-/rollup-linux-s390x-gnu-4.18.0.tgz",
-      "integrity": "sha512-0UyyRHyDN42QL+NbqevXIIUnKA47A+45WyasO+y2bGJ1mhQrfrtXUpTxCOrfxCR4esV3/RLYyucGVPiUsO8xjg==",
-      "cpu": [
-        "s390x"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "linux"
-      ]
-    },
-    "node_modules/@rollup/rollup-linux-x64-gnu": {
-      "version": "4.18.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.18.0.tgz",
-      "integrity": "sha512-xuglR2rBVHA5UsI8h8UbX4VJ470PtGCf5Vpswh7p2ukaqBGFTnsfzxUBetoWBWymHMxbIG0Cmx7Y9qDZzr648w==",
-      "cpu": [
-        "x64"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "linux"
-      ]
-    },
-    "node_modules/@rollup/rollup-linux-x64-musl": {
-      "version": "4.18.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.18.0.tgz",
-      "integrity": "sha512-LKaqQL9osY/ir2geuLVvRRs+utWUNilzdE90TpyoX0eNqPzWjRm14oMEE+YLve4k/NAqCdPkGYDaDF5Sw+xBfg==",
-      "cpu": [
-        "x64"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "linux"
-      ]
-    },
-    "node_modules/@rollup/rollup-win32-arm64-msvc": {
-      "version": "4.18.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.18.0.tgz",
-      "integrity": "sha512-7J6TkZQFGo9qBKH0pk2cEVSRhJbL6MtfWxth7Y5YmZs57Pi+4x6c2dStAUvaQkHQLnEQv1jzBUW43GvZW8OFqA==",
-      "cpu": [
-        "arm64"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "win32"
-      ]
-    },
-    "node_modules/@rollup/rollup-win32-ia32-msvc": {
-      "version": "4.18.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.18.0.tgz",
-      "integrity": "sha512-Txjh+IxBPbkUB9+SXZMpv+b/vnTEtFyfWZgJ6iyCmt2tdx0OF5WhFowLmnh8ENGNpfUlUZkdI//4IEmhwPieNg==",
-      "cpu": [
-        "ia32"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "win32"
-      ]
-    },
-    "node_modules/@rollup/rollup-win32-x64-msvc": {
-      "version": "4.18.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.18.0.tgz",
-      "integrity": "sha512-UOo5FdvOL0+eIVTgS4tIdbW+TtnBLWg1YBCcU2KWM7nuNwRz9bksDX1bekJJCpu25N1DVWaCwnT39dVQxzqS8g==",
-      "cpu": [
-        "x64"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "win32"
-      ]
-    },
     "node_modules/@sats-connect/core": {
       "version": "0.2.1",
-      "resolved": "https://registry.npmjs.org/@sats-connect/core/-/core-0.2.1.tgz",
-      "integrity": "sha512-e7ARFqN4JE8kBiSUNOcEvBffiBK9v7k+/PlwgYY5lGyanmBOMj5twBn/f/4+52GBLZXkwhJtidIWZ8LgnBdlbw==",
       "license": "ISC",
       "dependencies": {
         "axios": "1.6.8",
@@ -1769,8 +1059,6 @@
     },
     "node_modules/@sats-connect/core/node_modules/axios": {
       "version": "1.6.8",
-      "resolved": "https://registry.npmjs.org/axios/-/axios-1.6.8.tgz",
-      "integrity": "sha512-v/ZHtJDU39mDpyBoFVkETcd/uNdxrWRrg3bKpOKzXFA6Bvqopts6ALSMU3y6ijYxbw2B+wPrIv46egTzJXCLGQ==",
       "license": "MIT",
       "dependencies": {
         "follow-redirects": "^1.15.6",
@@ -1780,8 +1068,7 @@
     },
     "node_modules/@scure/base": {
       "version": "1.1.7",
-      "resolved": "https://registry.npmjs.org/@scure/base/-/base-1.1.7.tgz",
-      "integrity": "sha512-PPNYBslrLNNUQ/Yad37MHYsNQtK67EhWb6WtSvNLLPo7SdVZgkUjD6Dg+5On7zNwmskf8OX7I7Nx5oN+MIWE0g==",
+      "license": "MIT",
       "funding": {
         "url": "https://paulmillr.com/funding/"
       }
@@ -1823,14 +1110,13 @@
     },
     "node_modules/@scure/bip39": {
       "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/@scure/bip39/-/bip39-1.1.0.tgz",
-      "integrity": "sha512-pwrPOS16VeTKg98dYXQyIjJEcWfz7/1YJIwxUEPFfQPtc86Ym/1sVgQ2RLoD43AazMk2l/unK4ITySSpW2+82w==",
       "funding": [
         {
           "type": "individual",
           "url": "https://paulmillr.com/funding/"
         }
       ],
+      "license": "MIT",
       "dependencies": {
         "@noble/hashes": "~1.1.1",
         "@scure/base": "~1.1.0"
@@ -1838,19 +1124,17 @@
     },
     "node_modules/@scure/bip39/node_modules/@noble/hashes": {
       "version": "1.1.5",
-      "resolved": "https://registry.npmjs.org/@noble/hashes/-/hashes-1.1.5.tgz",
-      "integrity": "sha512-LTMZiiLc+V4v1Yi16TD6aX2gmtKszNye0pQgbaLqkvhIqP7nVsSaJsWloGQjJfJ8offaoP5GtX3yY5swbcJxxQ==",
       "funding": [
         {
           "type": "individual",
           "url": "https://paulmillr.com/funding/"
         }
-      ]
+      ],
+      "license": "MIT"
     },
     "node_modules/@scure/btc-signer": {
       "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/@scure/btc-signer/-/btc-signer-1.2.1.tgz",
-      "integrity": "sha512-/Zle18/aWhYDBuBeXGDGJTdo0/LKpQhU8ETBJeWABCQkbk0QHCFCinidTiz9hdQFfh0HtasPGq5p6EodVCfEew==",
+      "license": "MIT",
       "dependencies": {
         "@noble/curves": "~1.3.0",
         "@noble/hashes": "~1.3.3",
@@ -1862,9 +1146,9 @@
       }
     },
     "node_modules/@secretkeylabs/xverse-core": {
-      "version": "18.7.0-49281c0",
-      "resolved": "https://npm.pkg.github.com/download/@secretkeylabs/xverse-core/18.7.0-49281c0/5edda6e48bb4c8ecb7b35a454358600b8a57e684",
-      "integrity": "sha512-PJSQZlWHMw8t+Y4+PTM2r67qSxYhAYFyNJ9potyH/PKK6NbfQ5bdB3FKE6nSelOAYJuiZPaTMbxqDidmvUkcrw==",
+      "version": "18.7.2",
+      "resolved": "https://npm.pkg.github.com/download/@secretkeylabs/xverse-core/18.7.2/0dc4ba04ad9b58f27031a976faf112a6648ea945",
+      "integrity": "sha512-B07GqC77UFeelKAjnpW0ZNjv7jc/m12PdVJJhRJdB7PRhsl+KHD8Z33JMHazdR6P3VbNlzUeEZ5R8WX+eBQWaA==",
       "license": "ISC",
       "dependencies": {
         "@bitcoinerlab/secp256k1": "^1.0.2",
@@ -1987,15 +1271,13 @@
     },
     "node_modules/@sinclair/typebox": {
       "version": "0.27.8",
-      "resolved": "https://registry.npmjs.org/@sinclair/typebox/-/typebox-0.27.8.tgz",
-      "integrity": "sha512-+Fj43pSMwJs4KRrH/938Uf+uAELIgVBmQzg/q1YG10djyfA3TnrU8N8XzqCh/okZdszqBQTZf96idMfE5lnwTA==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/@snyk/github-codeowners": {
       "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/@snyk/github-codeowners/-/github-codeowners-1.1.0.tgz",
-      "integrity": "sha512-lGFf08pbkEac0NYgVf4hdANpAgApRjNByLXB+WBip3qj1iendOIyAwP2GKkKbQMNVy2r1xxDf0ssfWscoiC+Vw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "commander": "^4.1.1",
         "ignore": "^5.1.8",
@@ -2010,18 +1292,16 @@
     },
     "node_modules/@snyk/github-codeowners/node_modules/commander": {
       "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/commander/-/commander-4.1.1.tgz",
-      "integrity": "sha512-NOKm8xhkzAjzFx8B2v5OAHT+u5pRQc2UCa2Vq9jYL/31o2wi9mxBA7LIFs3sV5VSC49z6pEhfbMULvShKj26WA==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">= 6"
       }
     },
     "node_modules/@snyk/github-codeowners/node_modules/p-map": {
       "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/p-map/-/p-map-4.0.0.tgz",
-      "integrity": "sha512-/bjOqmgETBYB5BoEeGVea8dmvHb2m9GLy1E9W43yeyfP6QQCZGFNa+XRceJEuDB6zqr+gKpIAmlLebMpykw/MQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "aggregate-error": "^3.0.0"
       },
@@ -2034,8 +1314,7 @@
     },
     "node_modules/@stacks/auth": {
       "version": "6.13.1",
-      "resolved": "https://registry.npmjs.org/@stacks/auth/-/auth-6.13.1.tgz",
-      "integrity": "sha512-nr5VeLIJBVI72eWYs/oQ7nrmuZxe89AlS5Lt/WxCcUDK9Z+oqQR1qsxBo86yVDlmrxoNWncHWD38LX54HsOEzA==",
+      "license": "MIT",
       "dependencies": {
         "@stacks/common": "^6.13.0",
         "@stacks/encryption": "^6.13.1",
@@ -2047,8 +1326,7 @@
     },
     "node_modules/@stacks/common": {
       "version": "6.13.0",
-      "resolved": "https://registry.npmjs.org/@stacks/common/-/common-6.13.0.tgz",
-      "integrity": "sha512-wwzyihjaSdmL6NxKvDeayy3dqM0L0Q2sawmdNtzJDi0FnXuJGm5PeapJj7bEfcI9XwI7Bw5jZoC6mCn9nc5YIw==",
+      "license": "MIT",
       "dependencies": {
         "@types/bn.js": "^5.1.0",
         "@types/node": "^18.0.4"
@@ -2056,16 +1334,14 @@
     },
     "node_modules/@stacks/common/node_modules/@types/node": {
       "version": "18.19.26",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-18.19.26.tgz",
-      "integrity": "sha512-+wiMJsIwLOYCvUqSdKTrfkS8mpTp+MPINe6+Np4TAGFWWRWiBQ5kSq9nZGCSPkzx9mvT+uEukzpX4MOSCydcvw==",
+      "license": "MIT",
       "dependencies": {
         "undici-types": "~5.26.4"
       }
     },
     "node_modules/@stacks/connect": {
       "version": "7.4.1",
-      "resolved": "https://registry.npmjs.org/@stacks/connect/-/connect-7.4.1.tgz",
-      "integrity": "sha512-kvF7Fnx8oMHNi/9At6UI6kThey+gYlYlbtsxhNL2VqflReXI8z3EndaMJ1WrD55ePIOoydAzV/Fx0rdNFjd4rQ==",
+      "license": "MIT",
       "dependencies": {
         "@stacks/auth": "^6.1.1",
         "@stacks/connect-ui": "6.1.2",
@@ -2077,16 +1353,14 @@
     },
     "node_modules/@stacks/connect-ui": {
       "version": "6.1.2",
-      "resolved": "https://registry.npmjs.org/@stacks/connect-ui/-/connect-ui-6.1.2.tgz",
-      "integrity": "sha512-V4gUINXRDB2MO6YHk/JZZeApSnANrMFvIRv9qLBaJPamKsgeiCOBkiC88T7ucLVCz+NvCmS93Ntg4wytDIqdOg==",
+      "license": "MIT",
       "dependencies": {
         "@stencil/core": "^2.17.1"
       }
     },
     "node_modules/@stacks/encryption": {
       "version": "6.13.1",
-      "resolved": "https://registry.npmjs.org/@stacks/encryption/-/encryption-6.13.1.tgz",
-      "integrity": "sha512-y5IFX3/nGI3fCk70gE0JwH70GpshD8RhUfvhMLcL96oNaec1cCdj1ZUiQupeicfYTHuraaVBYU9xLls4TRmypg==",
+      "license": "MIT",
       "dependencies": {
         "@noble/hashes": "1.1.5",
         "@noble/secp256k1": "1.7.1",
@@ -2101,27 +1375,24 @@
     },
     "node_modules/@stacks/encryption/node_modules/@noble/hashes": {
       "version": "1.1.5",
-      "resolved": "https://registry.npmjs.org/@noble/hashes/-/hashes-1.1.5.tgz",
-      "integrity": "sha512-LTMZiiLc+V4v1Yi16TD6aX2gmtKszNye0pQgbaLqkvhIqP7nVsSaJsWloGQjJfJ8offaoP5GtX3yY5swbcJxxQ==",
       "funding": [
         {
           "type": "individual",
           "url": "https://paulmillr.com/funding/"
         }
-      ]
+      ],
+      "license": "MIT"
     },
     "node_modules/@stacks/encryption/node_modules/@types/node": {
       "version": "18.19.31",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-18.19.31.tgz",
-      "integrity": "sha512-ArgCD39YpyyrtFKIqMDvjz79jto5fcI/SVUs2HwB+f0dAzq68yqOdyaSivLiLugSziTpNXLQrVb7RZFmdZzbhA==",
+      "license": "MIT",
       "dependencies": {
         "undici-types": "~5.26.4"
       }
     },
     "node_modules/@stacks/network": {
       "version": "6.13.0",
-      "resolved": "https://registry.npmjs.org/@stacks/network/-/network-6.13.0.tgz",
-      "integrity": "sha512-Ss/Da4BNyPBBj1OieM981fJ7SkevKqLPkzoI1+Yo7cYR2df+0FipIN++Z4RfpJpc8ne60vgcx7nJZXQsiGhKBQ==",
+      "license": "MIT",
       "dependencies": {
         "@stacks/common": "^6.13.0",
         "cross-fetch": "^3.1.5"
@@ -2129,8 +1400,7 @@
     },
     "node_modules/@stacks/profile": {
       "version": "6.13.1",
-      "resolved": "https://registry.npmjs.org/@stacks/profile/-/profile-6.13.1.tgz",
-      "integrity": "sha512-GCDE13hwoUYZvZKTb5c0Tr74DcxIP/n4bffcYrKa5UabITPQ7JwsJIOyDoAwdtl3lu7fi9aBsKrdfHpBBUSQIQ==",
+      "license": "MIT",
       "dependencies": {
         "@stacks/common": "^6.13.0",
         "@stacks/network": "^6.13.0",
@@ -2184,8 +1454,7 @@
     },
     "node_modules/@stacks/stacks-blockchain-api-types": {
       "version": "6.1.1",
-      "resolved": "https://registry.npmjs.org/@stacks/stacks-blockchain-api-types/-/stacks-blockchain-api-types-6.1.1.tgz",
-      "integrity": "sha512-Mw5dBPx3DySPupwaq0iBdm1WdEVXIfhjUVaTjI2iSyzWz4Fgs3U7JCaAezLbgNu7Q69c/ZN4JUDWuo9FVjy7oA=="
+      "license": "ISC"
     },
     "node_modules/@stacks/storage": {
       "version": "6.13.1",
@@ -2202,8 +1471,7 @@
     },
     "node_modules/@stacks/transactions": {
       "version": "6.13.1",
-      "resolved": "https://registry.npmjs.org/@stacks/transactions/-/transactions-6.13.1.tgz",
-      "integrity": "sha512-PWw2I+2Fj3CaFYQIoVcqQN6E2qGHNhFv03nuR0CxMq0sx8stPgYZbdzUlnlBcJQdsFiHrw3sPeqnXDZt+Hg5YQ==",
+      "license": "MIT",
       "dependencies": {
         "@noble/hashes": "1.1.5",
         "@noble/secp256k1": "1.7.1",
@@ -2215,14 +1483,13 @@
     },
     "node_modules/@stacks/transactions/node_modules/@noble/hashes": {
       "version": "1.1.5",
-      "resolved": "https://registry.npmjs.org/@noble/hashes/-/hashes-1.1.5.tgz",
-      "integrity": "sha512-LTMZiiLc+V4v1Yi16TD6aX2gmtKszNye0pQgbaLqkvhIqP7nVsSaJsWloGQjJfJ8offaoP5GtX3yY5swbcJxxQ==",
       "funding": [
         {
           "type": "individual",
           "url": "https://paulmillr.com/funding/"
         }
-      ]
+      ],
+      "license": "MIT"
     },
     "node_modules/@stacks/wallet-sdk": {
       "version": "6.13.1",
@@ -2274,8 +1541,7 @@
     },
     "node_modules/@stencil/core": {
       "version": "2.22.3",
-      "resolved": "https://registry.npmjs.org/@stencil/core/-/core-2.22.3.tgz",
-      "integrity": "sha512-kmVA0M/HojwsfkeHsifvHVIYe4l5tin7J5+DLgtl8h6WWfiMClND5K3ifCXXI2ETDNKiEk21p6jql3Fx9o2rng==",
+      "license": "MIT",
       "bin": {
         "stencil": "bin/stencil"
       },
@@ -2286,9 +1552,8 @@
     },
     "node_modules/@tanstack/eslint-plugin-query": {
       "version": "4.32.1",
-      "resolved": "https://registry.npmjs.org/@tanstack/eslint-plugin-query/-/eslint-plugin-query-4.32.1.tgz",
-      "integrity": "sha512-29oveq5n7momN+/d0SheNccnp1qws4JRG/PdeiPHwWAVQ9HxwtZTFxhFJxvMzVk7UsY3LsQB0keIajC+K9ZJ7w==",
       "dev": true,
+      "license": "MIT",
       "funding": {
         "type": "github",
         "url": "https://github.com/sponsors/tannerlinsley"
@@ -2296,8 +1561,7 @@
     },
     "node_modules/@tanstack/match-sorter-utils": {
       "version": "8.8.4",
-      "resolved": "https://registry.npmjs.org/@tanstack/match-sorter-utils/-/match-sorter-utils-8.8.4.tgz",
-      "integrity": "sha512-rKH8LjZiszWEvmi01NR72QWZ8m4xmXre0OOwlRGnjU01Eqz/QnN+cqpty2PJ0efHblq09+KilvyR7lsbzmXVEw==",
+      "license": "MIT",
       "dependencies": {
         "remove-accents": "0.4.2"
       },
@@ -2311,8 +1575,7 @@
     },
     "node_modules/@tanstack/query-core": {
       "version": "4.32.1",
-      "resolved": "https://registry.npmjs.org/@tanstack/query-core/-/query-core-4.32.1.tgz",
-      "integrity": "sha512-VEAGHboOFWN/bvf/7cCoeLQfld0AA8n0V/kfc77W+FvxnnSwJufEh6gfjqpX5bRE/DEYfYDYdNtuL3KM+lIs8Q==",
+      "license": "MIT",
       "funding": {
         "type": "github",
         "url": "https://github.com/sponsors/tannerlinsley"
@@ -2320,8 +1583,7 @@
     },
     "node_modules/@tanstack/query-persist-client-core": {
       "version": "4.32.1",
-      "resolved": "https://registry.npmjs.org/@tanstack/query-persist-client-core/-/query-persist-client-core-4.32.1.tgz",
-      "integrity": "sha512-KgnkNigmOMi2aikxdhCRe0MaAh1Dq94/nNjmcSxfflj9L3v4F9tEQAig/F7m2+jethP1AiIYBax5nN4aqm7NFg==",
+      "license": "MIT",
       "dependencies": {
         "@tanstack/query-core": "4.32.1"
       },
@@ -2332,8 +1594,7 @@
     },
     "node_modules/@tanstack/query-sync-storage-persister": {
       "version": "4.32.1",
-      "resolved": "https://registry.npmjs.org/@tanstack/query-sync-storage-persister/-/query-sync-storage-persister-4.32.1.tgz",
-      "integrity": "sha512-kqE+L0uSzVMuPpY8iKtnyZexsZ5IxsJbgiI4s+m+FB8Dzn+5go3snpZIYMQu36S+sWy0N90P2xNR57EOaFMlsg==",
+      "license": "MIT",
       "dependencies": {
         "@tanstack/query-persist-client-core": "4.32.1"
       },
@@ -2344,8 +1605,7 @@
     },
     "node_modules/@tanstack/react-query": {
       "version": "4.32.1",
-      "resolved": "https://registry.npmjs.org/@tanstack/react-query/-/react-query-4.32.1.tgz",
-      "integrity": "sha512-lPTfOq6bR6DorPaS018gTMd3zs8r06tlERiVY6BRP9SnDkkl4ckqeANava/jPLWrSZP+EA15loQUTmvZs6k2GA==",
+      "license": "MIT",
       "dependencies": {
         "@tanstack/query-core": "4.32.1",
         "use-sync-external-store": "^1.2.0"
@@ -2370,8 +1630,7 @@
     },
     "node_modules/@tanstack/react-query-devtools": {
       "version": "4.32.1",
-      "resolved": "https://registry.npmjs.org/@tanstack/react-query-devtools/-/react-query-devtools-4.32.1.tgz",
-      "integrity": "sha512-/ZgxCfGXLIXUvaIRzrNCP+C4iv1bIleNzXCjGKFZ4qKEifnv5A/SpWE2dG4SBjqXVlIkMAP82lesfoHcsOm+zg==",
+      "license": "MIT",
       "dependencies": {
         "@tanstack/match-sorter-utils": "^8.7.0",
         "superjson": "^1.10.0",
@@ -2389,8 +1648,7 @@
     },
     "node_modules/@tanstack/react-query-devtools/node_modules/superjson": {
       "version": "1.13.3",
-      "resolved": "https://registry.npmjs.org/superjson/-/superjson-1.13.3.tgz",
-      "integrity": "sha512-mJiVjfd2vokfDxsQPOwJ/PtanO87LhpYY88ubI5dUB1Ab58Txbyje3+jpm+/83R/fevaq/107NNhtYBLuoTrFg==",
+      "license": "MIT",
       "dependencies": {
         "copy-anything": "^3.0.2"
       },
@@ -2400,8 +1658,7 @@
     },
     "node_modules/@tanstack/react-query-persist-client": {
       "version": "4.32.1",
-      "resolved": "https://registry.npmjs.org/@tanstack/react-query-persist-client/-/react-query-persist-client-4.32.1.tgz",
-      "integrity": "sha512-HtfhSOyMSjdASpPXWBWv9JquUk5b8HjOwbFVmtA8xIDFQm9qS35PikXO2YbBXhuz/LEknRhct/M3PMI/XkRQSg==",
+      "license": "MIT",
       "dependencies": {
         "@tanstack/query-persist-client-core": "4.32.1"
       },
@@ -2415,23 +1672,20 @@
     },
     "node_modules/@types/argon2-browser": {
       "version": "1.18.1",
-      "resolved": "https://registry.npmjs.org/@types/argon2-browser/-/argon2-browser-1.18.1.tgz",
-      "integrity": "sha512-PZffP/CqH9m2kovDSRQMfMMxUC3V98I7i7/caa0RB0/nvsXzYbL9bKyqZpNMFmLFGZslROlG1R60ONt7abrwlA==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/@types/bn.js": {
       "version": "5.1.1",
-      "resolved": "https://registry.npmjs.org/@types/bn.js/-/bn.js-5.1.1.tgz",
-      "integrity": "sha512-qNrYbZqMx0uJAfKnKclPh+dTwK33KfLHYqtyODwd5HnXOjnkhc4qgn3BrK6RWyGZm5+sIFE7Q7Vz6QQtJB7w7g==",
+      "license": "MIT",
       "dependencies": {
         "@types/node": "*"
       }
     },
     "node_modules/@types/body-parser": {
       "version": "1.19.2",
-      "resolved": "https://registry.npmjs.org/@types/body-parser/-/body-parser-1.19.2.tgz",
-      "integrity": "sha512-ALYone6pm6QmwZoAgeyNksccT9Q4AWZQ6PvfwR37GT6r6FWUPguq6sUmNGSMV2Wr761oQoBxwGGa6DR5o1DC9g==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@types/connect": "*",
         "@types/node": "*"
@@ -2439,33 +1693,29 @@
     },
     "node_modules/@types/bonjour": {
       "version": "3.5.10",
-      "resolved": "https://registry.npmjs.org/@types/bonjour/-/bonjour-3.5.10.tgz",
-      "integrity": "sha512-p7ienRMiS41Nu2/igbJxxLDWrSZ0WxM8UQgCeO9KhoVF7cOVFkrKsiDr1EsJIla8vV3oEEjGcz11jc5yimhzZw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@types/node": "*"
       }
     },
     "node_modules/@types/chai": {
       "version": "4.3.11",
-      "resolved": "https://registry.npmjs.org/@types/chai/-/chai-4.3.11.tgz",
-      "integrity": "sha512-qQR1dr2rGIHYlJulmr8Ioq3De0Le9E4MJ5AiaeAETJJpndT1uUNHsGFK3L/UIu+rbkQSdj8J/w2bCsBZc/Y5fQ==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/@types/chai-subset": {
       "version": "1.3.5",
-      "resolved": "https://registry.npmjs.org/@types/chai-subset/-/chai-subset-1.3.5.tgz",
-      "integrity": "sha512-c2mPnw+xHtXDoHmdtcCXGwyLMiauiAyxWMzhGpqHC4nqI/Y5G2XhTampslK2rb59kpcuHon03UH8W6iYUzw88A==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@types/chai": "*"
       }
     },
     "node_modules/@types/chrome": {
       "version": "0.0.237",
-      "resolved": "https://registry.npmjs.org/@types/chrome/-/chrome-0.0.237.tgz",
-      "integrity": "sha512-krsRmyfMlck5r+H1EapsrrucDRq6iRm0NAi5fapr93CgnpVMDdK+h2+z4x79GegdW7BNH9Vb//gkptORwwwVIQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@types/filesystem": "*",
         "@types/har-format": "*"
@@ -2473,18 +1723,16 @@
     },
     "node_modules/@types/connect": {
       "version": "3.4.35",
-      "resolved": "https://registry.npmjs.org/@types/connect/-/connect-3.4.35.tgz",
-      "integrity": "sha512-cdeYyv4KWoEgpBISTxWvqYsVy444DOqehiF3fM3ne10AmJ62RSyNkUnxMJXHQWRQQX2eR94m5y1IZyDwBjV9FQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@types/node": "*"
       }
     },
     "node_modules/@types/connect-history-api-fallback": {
       "version": "1.5.0",
-      "resolved": "https://registry.npmjs.org/@types/connect-history-api-fallback/-/connect-history-api-fallback-1.5.0.tgz",
-      "integrity": "sha512-4x5FkPpLipqwthjPsF7ZRbOv3uoLUFkTA9G9v583qi4pACvq0uTELrB8OLUzPWUI4IJIyvM85vzkV1nyiI2Lig==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@types/express-serve-static-core": "*",
         "@types/node": "*"
@@ -2492,9 +1740,8 @@
     },
     "node_modules/@types/eslint": {
       "version": "8.44.1",
-      "resolved": "https://registry.npmjs.org/@types/eslint/-/eslint-8.44.1.tgz",
-      "integrity": "sha512-XpNDc4Z5Tb4x+SW1MriMVeIsMoONHCkWFMkR/aPJbzEsxqHy+4Glu/BqTdPrApfDeMaXbtNh6bseNgl5KaWrSg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@types/estree": "*",
         "@types/json-schema": "*"
@@ -2502,9 +1749,8 @@
     },
     "node_modules/@types/eslint-scope": {
       "version": "3.7.4",
-      "resolved": "https://registry.npmjs.org/@types/eslint-scope/-/eslint-scope-3.7.4.tgz",
-      "integrity": "sha512-9K4zoImiZc3HlIp6AVUDE4CWYx22a+lhSZMYNpbjW04+YF0KWj4pJXnEMjdnFTiQibFFmElcsasJXDbdI/EPhA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@types/eslint": "*",
         "@types/estree": "*"
@@ -2512,15 +1758,13 @@
     },
     "node_modules/@types/estree": {
       "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.5.tgz",
-      "integrity": "sha512-/kYRxGDLWzHOB7q+wtSUQlFrtcdUccpfy+X+9iMBpHK8QLLhx2wIPYuS5DYtR9Wa/YlZAbIovy7qVdB1Aq6Lyw==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/@types/express": {
       "version": "4.17.17",
-      "resolved": "https://registry.npmjs.org/@types/express/-/express-4.17.17.tgz",
-      "integrity": "sha512-Q4FmmuLGBG58btUnfS1c1r/NQdlp3DMfGDGig8WhfpA2YRUtEkxAjkZb0yvplJGYdF1fsQ81iMDcH24sSCNC/Q==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@types/body-parser": "*",
         "@types/express-serve-static-core": "^4.17.33",
@@ -2530,9 +1774,8 @@
     },
     "node_modules/@types/express-serve-static-core": {
       "version": "4.17.35",
-      "resolved": "https://registry.npmjs.org/@types/express-serve-static-core/-/express-serve-static-core-4.17.35.tgz",
-      "integrity": "sha512-wALWQwrgiB2AWTT91CB62b6Yt0sNHpznUXeZEcnPU3DRdlDIz74x8Qg1UUYKSVFi+va5vKOLYRBI1bRKiLLKIg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@types/node": "*",
         "@types/qs": "*",
@@ -2542,24 +1785,21 @@
     },
     "node_modules/@types/filesystem": {
       "version": "0.0.32",
-      "resolved": "https://registry.npmjs.org/@types/filesystem/-/filesystem-0.0.32.tgz",
-      "integrity": "sha512-Yuf4jR5YYMR2DVgwuCiP11s0xuVRyPKmz8vo6HBY3CGdeMj8af93CFZX+T82+VD1+UqHOxTq31lO7MI7lepBtQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@types/filewriter": "*"
       }
     },
     "node_modules/@types/filewriter": {
       "version": "0.0.29",
-      "resolved": "https://registry.npmjs.org/@types/filewriter/-/filewriter-0.0.29.tgz",
-      "integrity": "sha512-BsPXH/irW0ht0Ji6iw/jJaK8Lj3FJemon2gvEqHKpCdDCeemHa+rI3WBGq5z7cDMZgoLjY40oninGxqk+8NzNQ==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/@types/glob": {
       "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/@types/glob/-/glob-7.2.0.tgz",
-      "integrity": "sha512-ZUxbzKl0IfJILTS6t7ip5fQQM/J3TJYubDm3nMbgubNNYS62eXeUpoLUC8/7fJNiFYHTrGPQn7hspDUzIHX3UA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@types/minimatch": "*",
         "@types/node": "*"
@@ -2567,14 +1807,12 @@
     },
     "node_modules/@types/har-format": {
       "version": "1.2.11",
-      "resolved": "https://registry.npmjs.org/@types/har-format/-/har-format-1.2.11.tgz",
-      "integrity": "sha512-T232/TneofqK30AD1LRrrf8KnjLvzrjWDp7eWST5KoiSzrBfRsLrWDPk4STQPW4NZG6v2MltnduBVmakbZOBIQ==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/@types/hoist-non-react-statics": {
       "version": "3.3.1",
-      "resolved": "https://registry.npmjs.org/@types/hoist-non-react-statics/-/hoist-non-react-statics-3.3.1.tgz",
-      "integrity": "sha512-iMIqiko6ooLrTh1joXodJK5X9xeEALT1kM5G3ZLhD3hszxBdIEd5C75U834D9mLcINgD4OyZf5uQXjkuYydWvA==",
+      "license": "MIT",
       "dependencies": {
         "@types/react": "*",
         "hoist-non-react-statics": "^3.3.0"
@@ -2582,84 +1820,71 @@
     },
     "node_modules/@types/html-minifier-terser": {
       "version": "6.1.0",
-      "resolved": "https://registry.npmjs.org/@types/html-minifier-terser/-/html-minifier-terser-6.1.0.tgz",
-      "integrity": "sha512-oh/6byDPnL1zeNXFrDXFLyZjkr1MsBG667IM792caf1L2UPOOMf65NFzjUH/ltyfwjAGfs1rsX1eftK0jC/KIg==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/@types/http-errors": {
       "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/@types/http-errors/-/http-errors-2.0.1.tgz",
-      "integrity": "sha512-/K3ds8TRAfBvi5vfjuz8y6+GiAYBZ0x4tXv1Av6CWBWn0IlADc+ZX9pMq7oU0fNQPnBwIZl3rmeLp6SBApbxSQ==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/@types/http-proxy": {
       "version": "1.17.11",
-      "resolved": "https://registry.npmjs.org/@types/http-proxy/-/http-proxy-1.17.11.tgz",
-      "integrity": "sha512-HC8G7c1WmaF2ekqpnFq626xd3Zz0uvaqFmBJNRZCGEZCXkvSdJoNFn/8Ygbd9fKNQj8UzLdCETaI0UWPAjK7IA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@types/node": "*"
       }
     },
     "node_modules/@types/json-schema": {
       "version": "7.0.12",
-      "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.12.tgz",
-      "integrity": "sha512-Hr5Jfhc9eYOQNPYO5WLDq/n4jqijdHNlDXjuAQkkt+mWdQR+XJToOHrsD4cPaMXpn6KO7y2+wM8AZEs8VpBLVA==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/@types/json5": {
       "version": "0.0.29",
-      "resolved": "https://registry.npmjs.org/@types/json5/-/json5-0.0.29.tgz",
-      "integrity": "sha512-dRLjCWHYg4oaA77cxO64oO+7JwCwnIzkZPdrrC71jQmQtlhM556pwKo5bUzqvZndkVbeFLIIi+9TC40JNF5hNQ==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/@types/mime": {
       "version": "1.3.2",
-      "resolved": "https://registry.npmjs.org/@types/mime/-/mime-1.3.2.tgz",
-      "integrity": "sha512-YATxVxgRqNH6nHEIsvg6k2Boc1JHI9ZbH5iWFFv/MTkchz3b1ieGDa5T0a9RznNdI0KhVbdbWSN+KWWrQZRxTw==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/@types/minimatch": {
       "version": "5.1.2",
-      "resolved": "https://registry.npmjs.org/@types/minimatch/-/minimatch-5.1.2.tgz",
-      "integrity": "sha512-K0VQKziLUWkVKiRVrx4a40iPaxTUefQmjtkQofBkYRcoaaL/8rhwDWww9qWbrgicNOgnpIsMxyNIUM4+n6dUIA==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/@types/mixpanel-browser": {
       "version": "2.49.0",
-      "resolved": "https://registry.npmjs.org/@types/mixpanel-browser/-/mixpanel-browser-2.49.0.tgz",
-      "integrity": "sha512-StmgUnS58d44DmIAEX9Kk8qwisAYCl6E2qulIjYyHXUPuJCPOuyUMTTKBp+aU2F2do+kxAzCxiBtsB4fnBT9Fg==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/@types/node": {
       "version": "20.14.9",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-20.14.9.tgz",
-      "integrity": "sha512-06OCtnTXtWOZBJlRApleWndH4JsRVs1pDCc8dLSQp+7PpUpX3ePdHyeNSFTeSe7FtKyQkrlPvHwJOW3SLd8Oyg==",
+      "license": "MIT",
       "dependencies": {
         "undici-types": "~5.26.4"
       }
     },
     "node_modules/@types/prop-types": {
       "version": "15.7.5",
-      "resolved": "https://registry.npmjs.org/@types/prop-types/-/prop-types-15.7.5.tgz",
-      "integrity": "sha512-JCB8C6SnDoQf0cNycqd/35A7MjcnK+ZTqE7judS6o7utxUCg6imJg3QK2qzHKszlTjcj2cn+NwMB2i96ubpj7w=="
+      "license": "MIT"
     },
     "node_modules/@types/qs": {
       "version": "6.9.7",
-      "resolved": "https://registry.npmjs.org/@types/qs/-/qs-6.9.7.tgz",
-      "integrity": "sha512-FGa1F62FT09qcrueBA6qYTrJPVDzah9a+493+o2PCXsesWHIn27G98TsSMs3WPNbZIEj4+VJf6saSFpvD+3Zsw==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/@types/range-parser": {
       "version": "1.2.4",
-      "resolved": "https://registry.npmjs.org/@types/range-parser/-/range-parser-1.2.4.tgz",
-      "integrity": "sha512-EEhsLsD6UsDM1yFhAvy0Cjr6VwmpMWqFBCb9w07wVugF7w9nfajxLuVmngTIpgS6svCnm6Vaw+MZhoDCKnOfsw==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/@types/react": {
       "version": "18.2.18",
-      "resolved": "https://registry.npmjs.org/@types/react/-/react-18.2.18.tgz",
-      "integrity": "sha512-da4NTSeBv/P34xoZPhtcLkmZuJ+oYaCxHmyHzwaDQo9RQPBeXV+06gEk2FpqEcsX9XrnNLvRpVh6bdavDSjtiQ==",
+      "license": "MIT",
       "dependencies": {
         "@types/prop-types": "*",
         "@types/scheduler": "*",
@@ -2668,35 +1893,31 @@
     },
     "node_modules/@types/react-dom": {
       "version": "18.2.7",
-      "resolved": "https://registry.npmjs.org/@types/react-dom/-/react-dom-18.2.7.tgz",
-      "integrity": "sha512-GRaAEriuT4zp9N4p1i8BDBYmEyfo+xQ3yHjJU4eiK5NDa1RmUZG+unZABUTK4/Ox/M+GaHwb6Ow8rUITrtjszA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@types/react": "*"
       }
     },
     "node_modules/@types/react-lottie": {
       "version": "1.2.10",
-      "resolved": "https://registry.npmjs.org/@types/react-lottie/-/react-lottie-1.2.10.tgz",
-      "integrity": "sha512-rCd1p3US4ELKJlqwVnP0h5b24zt5p9OCvKUoNpYExLqwbFZMWEiJ6EGLMmH7nmq5V7KomBIbWO2X/XRFsL0vCA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@types/react": "*"
       }
     },
     "node_modules/@types/react-modal": {
       "version": "3.16.0",
-      "resolved": "https://registry.npmjs.org/@types/react-modal/-/react-modal-3.16.0.tgz",
-      "integrity": "sha512-iphdqXAyUfByLbxJn5j6d+yh93dbMgshqGP0IuBeaKbZXx0aO+OXsvEkt6QctRdxjeM9/bR+Gp3h9F9djVWTQQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@types/react": "*"
       }
     },
     "node_modules/@types/react-redux": {
       "version": "7.1.25",
-      "resolved": "https://registry.npmjs.org/@types/react-redux/-/react-redux-7.1.25.tgz",
-      "integrity": "sha512-bAGh4e+w5D8dajd6InASVIyCo4pZLJ66oLb80F9OBLO1gKESbZcRCJpTT6uLXX+HAB57zw1WTdwJdAsewuTweg==",
+      "license": "MIT",
       "dependencies": {
         "@types/hoist-non-react-statics": "^3.3.0",
         "@types/react": "*",
@@ -2706,9 +1927,8 @@
     },
     "node_modules/@types/redux-state-sync": {
       "version": "3.1.5",
-      "resolved": "https://registry.npmjs.org/@types/redux-state-sync/-/redux-state-sync-3.1.5.tgz",
-      "integrity": "sha512-NtcV94bmZNFMmcjgYzjK9WHN/0NVHyH4OO/a4sAd4WG1ywcVZA5vdczjPQZLC1IVMRBi693b3FWsWB7wELL+tg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "broadcast-channel": "^2.1.8",
         "redux": "^4.0.1"
@@ -2716,26 +1936,22 @@
     },
     "node_modules/@types/retry": {
       "version": "0.12.0",
-      "resolved": "https://registry.npmjs.org/@types/retry/-/retry-0.12.0.tgz",
-      "integrity": "sha512-wWKOClTTiizcZhXnPY4wikVAwmdYHp8q6DmC+EJUzAMsycb7HB32Kh9RN4+0gExjmPmZSAQjgURXIGATPegAvA==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/@types/scheduler": {
       "version": "0.16.3",
-      "resolved": "https://registry.npmjs.org/@types/scheduler/-/scheduler-0.16.3.tgz",
-      "integrity": "sha512-5cJ8CB4yAx7BH1oMvdU0Jh9lrEXyPkar6F9G/ERswkCuvP4KQZfZkSjcMbAICCpQTN4OuZn8tz0HiKv9TGZgrQ=="
+      "license": "MIT"
     },
     "node_modules/@types/semver": {
       "version": "7.5.0",
-      "resolved": "https://registry.npmjs.org/@types/semver/-/semver-7.5.0.tgz",
-      "integrity": "sha512-G8hZ6XJiHnuhQKR7ZmysCeJWE08o8T0AXtk5darsCaTVsYZhhgUrq53jizaR2FvsoeCwJhlmwTjkXBY5Pn/ZHw==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/@types/send": {
       "version": "0.17.1",
-      "resolved": "https://registry.npmjs.org/@types/send/-/send-0.17.1.tgz",
-      "integrity": "sha512-Cwo8LE/0rnvX7kIIa3QHCkcuF21c05Ayb0ZfxPiv0W8VRiZiNW/WuRupHKpqqGVGf7SUA44QSOUKaEd9lIrd/Q==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@types/mime": "^1",
         "@types/node": "*"
@@ -2743,18 +1959,16 @@
     },
     "node_modules/@types/serve-index": {
       "version": "1.9.1",
-      "resolved": "https://registry.npmjs.org/@types/serve-index/-/serve-index-1.9.1.tgz",
-      "integrity": "sha512-d/Hs3nWDxNL2xAczmOVZNj92YZCS6RGxfBPjKzuu/XirCgXdpKEb88dYNbrYGint6IVWLNP+yonwVAuRC0T2Dg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@types/express": "*"
       }
     },
     "node_modules/@types/serve-static": {
       "version": "1.15.2",
-      "resolved": "https://registry.npmjs.org/@types/serve-static/-/serve-static-1.15.2.tgz",
-      "integrity": "sha512-J2LqtvFYCzaj8pVYKw8klQXrLLk7TBZmQ4ShlcdkELFKGwGMfevMLneMMRkMgZxotOD9wg497LpC7O8PcvAmfw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@types/http-errors": "*",
         "@types/mime": "*",
@@ -2771,18 +1985,16 @@
     },
     "node_modules/@types/sockjs": {
       "version": "0.3.33",
-      "resolved": "https://registry.npmjs.org/@types/sockjs/-/sockjs-0.3.33.tgz",
-      "integrity": "sha512-f0KEEe05NvUnat+boPTZ0dgaLZ4SfSouXUgv5noUiefG2ajgKjmETo9ZJyuqsl7dfl2aHlLJUiki6B4ZYldiiw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@types/node": "*"
       }
     },
     "node_modules/@types/styled-components": {
       "version": "5.1.26",
-      "resolved": "https://registry.npmjs.org/@types/styled-components/-/styled-components-5.1.26.tgz",
-      "integrity": "sha512-KuKJ9Z6xb93uJiIyxo/+ksS7yLjS1KzG6iv5i78dhVg/X3u5t1H7juRWqVmodIdz6wGVaIApo1u01kmFRdJHVw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@types/hoist-non-react-statics": "*",
         "@types/react": "*",
@@ -2796,30 +2008,26 @@
     },
     "node_modules/@types/webextension-polyfill": {
       "version": "0.9.2",
-      "resolved": "https://registry.npmjs.org/@types/webextension-polyfill/-/webextension-polyfill-0.9.2.tgz",
-      "integrity": "sha512-op8YeoK60K6/GIx3snWs3JowBZ+/aeSnZzZuuwynA7VARWfzr3st9aQNk9RWfoBx5xqlNZjAsh2QttPUZnabCw==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/@types/ws": {
       "version": "8.5.5",
-      "resolved": "https://registry.npmjs.org/@types/ws/-/ws-8.5.5.tgz",
-      "integrity": "sha512-lwhs8hktwxSjf9UaZ9tG5M03PGogvFaH8gUgLNbN9HKIg0dvv6q+gkSuJ8HN4/VbyxkuLzCjlN7GquQ0gUJfIg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@types/node": "*"
       }
     },
     "node_modules/@types/zxcvbn": {
       "version": "4.4.1",
-      "resolved": "https://registry.npmjs.org/@types/zxcvbn/-/zxcvbn-4.4.1.tgz",
-      "integrity": "sha512-3NoqvZC2W5gAC5DZbTpCeJ251vGQmgcWIHQJGq2J240HY6ErQ9aWKkwfoKJlHLx+A83WPNTZ9+3cd2ILxbvr1w==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/@typescript-eslint/eslint-plugin": {
       "version": "5.62.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.62.0.tgz",
-      "integrity": "sha512-TiZzBSJja/LbhNPvk6yc0JrX9XqhQ0hdh6M2svYfsHGejaKFIAGd9MQ+ERIMzLGlN/kZoYIgdxFV0PuljTKXag==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@eslint-community/regexpp": "^4.4.0",
         "@typescript-eslint/scope-manager": "5.62.0",
@@ -2851,9 +2059,8 @@
     },
     "node_modules/@typescript-eslint/eslint-plugin/node_modules/lru-cache": {
       "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
-      "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
       "dev": true,
+      "license": "ISC",
       "dependencies": {
         "yallist": "^4.0.0"
       },
@@ -2863,9 +2070,8 @@
     },
     "node_modules/@typescript-eslint/eslint-plugin/node_modules/semver": {
       "version": "7.5.4",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz",
-      "integrity": "sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==",
       "dev": true,
+      "license": "ISC",
       "dependencies": {
         "lru-cache": "^6.0.0"
       },
@@ -2878,15 +2084,13 @@
     },
     "node_modules/@typescript-eslint/eslint-plugin/node_modules/yallist": {
       "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
-      "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==",
-      "dev": true
+      "dev": true,
+      "license": "ISC"
     },
     "node_modules/@typescript-eslint/parser": {
       "version": "5.62.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-5.62.0.tgz",
-      "integrity": "sha512-VlJEV0fOQ7BExOsHYAGrgbEiZoi8D+Bl2+f6V2RrXerRSylnp+ZBHmPvaIa8cz0Ajx7WO7Z5RqfgYg7ED1nRhA==",
       "dev": true,
+      "license": "BSD-2-Clause",
       "dependencies": {
         "@typescript-eslint/scope-manager": "5.62.0",
         "@typescript-eslint/types": "5.62.0",
@@ -2911,9 +2115,8 @@
     },
     "node_modules/@typescript-eslint/scope-manager": {
       "version": "5.62.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-5.62.0.tgz",
-      "integrity": "sha512-VXuvVvZeQCQb5Zgf4HAxc04q5j+WrNAtNh9OwCsCgpKqESMTu3tF/jhZ3xG6T4NZwWl65Bg8KuS2uEvhSfLl0w==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@typescript-eslint/types": "5.62.0",
         "@typescript-eslint/visitor-keys": "5.62.0"
@@ -2928,9 +2131,8 @@
     },
     "node_modules/@typescript-eslint/type-utils": {
       "version": "5.62.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-5.62.0.tgz",
-      "integrity": "sha512-xsSQreu+VnfbqQpW5vnCJdq1Z3Q0U31qiWmRhr98ONQmcp/yhiPJFPq8MXiJVLiksmOKSjIldZzkebzHuCGzew==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@typescript-eslint/typescript-estree": "5.62.0",
         "@typescript-eslint/utils": "5.62.0",
@@ -2955,9 +2157,8 @@
     },
     "node_modules/@typescript-eslint/types": {
       "version": "5.62.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-5.62.0.tgz",
-      "integrity": "sha512-87NVngcbVXUahrRTqIK27gD2t5Cu1yuCXxbLcFtCzZGlfyVWWh8mLHkoxzjsB6DDNnvdL+fW8MiwPEJyGJQDgQ==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
       },
@@ -2968,9 +2169,8 @@
     },
     "node_modules/@typescript-eslint/typescript-estree": {
       "version": "5.62.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-5.62.0.tgz",
-      "integrity": "sha512-CmcQ6uY7b9y694lKdRB8FEel7JbU/40iSAPomu++SjLMntB+2Leay2LO6i8VnJk58MtE9/nQSFIH6jpyRWyYzA==",
       "dev": true,
+      "license": "BSD-2-Clause",
       "dependencies": {
         "@typescript-eslint/types": "5.62.0",
         "@typescript-eslint/visitor-keys": "5.62.0",
@@ -2995,9 +2195,8 @@
     },
     "node_modules/@typescript-eslint/typescript-estree/node_modules/lru-cache": {
       "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
-      "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
       "dev": true,
+      "license": "ISC",
       "dependencies": {
         "yallist": "^4.0.0"
       },
@@ -3007,9 +2206,8 @@
     },
     "node_modules/@typescript-eslint/typescript-estree/node_modules/semver": {
       "version": "7.5.4",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz",
-      "integrity": "sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==",
       "dev": true,
+      "license": "ISC",
       "dependencies": {
         "lru-cache": "^6.0.0"
       },
@@ -3022,15 +2220,13 @@
     },
     "node_modules/@typescript-eslint/typescript-estree/node_modules/yallist": {
       "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
-      "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==",
-      "dev": true
+      "dev": true,
+      "license": "ISC"
     },
     "node_modules/@typescript-eslint/utils": {
       "version": "5.62.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-5.62.0.tgz",
-      "integrity": "sha512-n8oxjeb5aIbPFEtmQxQYOLI0i9n5ySBEY/ZEHHZqKQSFnxio1rv6dthascc9dLuwrL0RC5mPCxB7vnAVGAYWAQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@eslint-community/eslint-utils": "^4.2.0",
         "@types/json-schema": "^7.0.9",
@@ -3054,9 +2250,8 @@
     },
     "node_modules/@typescript-eslint/utils/node_modules/lru-cache": {
       "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
-      "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
       "dev": true,
+      "license": "ISC",
       "dependencies": {
         "yallist": "^4.0.0"
       },
@@ -3066,9 +2261,8 @@
     },
     "node_modules/@typescript-eslint/utils/node_modules/semver": {
       "version": "7.5.4",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz",
-      "integrity": "sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==",
       "dev": true,
+      "license": "ISC",
       "dependencies": {
         "lru-cache": "^6.0.0"
       },
@@ -3081,15 +2275,13 @@
     },
     "node_modules/@typescript-eslint/utils/node_modules/yallist": {
       "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
-      "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==",
-      "dev": true
+      "dev": true,
+      "license": "ISC"
     },
     "node_modules/@typescript-eslint/visitor-keys": {
       "version": "5.62.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-5.62.0.tgz",
-      "integrity": "sha512-07ny+LHRzQXepkGg6w0mFY41fVUNBrL2Roj/++7V1txKugfjm/Ci/qSND03r2RhlJhJYMcTn9AhhSSqQp0Ysyw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@typescript-eslint/types": "5.62.0",
         "eslint-visitor-keys": "^3.3.0"
@@ -3104,9 +2296,8 @@
     },
     "node_modules/@vitest/expect": {
       "version": "0.34.6",
-      "resolved": "https://registry.npmjs.org/@vitest/expect/-/expect-0.34.6.tgz",
-      "integrity": "sha512-QUzKpUQRc1qC7qdGo7rMK3AkETI7w18gTCUrsNnyjjJKYiuUB9+TQK3QnR1unhCnWRC0AbKv2omLGQDF/mIjOw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@vitest/spy": "0.34.6",
         "@vitest/utils": "0.34.6",
@@ -3118,9 +2309,8 @@
     },
     "node_modules/@vitest/runner": {
       "version": "0.34.6",
-      "resolved": "https://registry.npmjs.org/@vitest/runner/-/runner-0.34.6.tgz",
-      "integrity": "sha512-1CUQgtJSLF47NnhN+F9X2ycxUP0kLHQ/JWvNHbeBfwW8CzEGgeskzNnHDyv1ieKTltuR6sdIHV+nmR6kPxQqzQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@vitest/utils": "0.34.6",
         "p-limit": "^4.0.0",
@@ -3132,9 +2322,8 @@
     },
     "node_modules/@vitest/runner/node_modules/p-limit": {
       "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-4.0.0.tgz",
-      "integrity": "sha512-5b0R4txpzjPWVw/cXXUResoD4hb6U/x9BH08L7nw+GN1sezDzPdxeRvpc9c433fZhBan/wusjbCsqwqm4EIBIQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "yocto-queue": "^1.0.0"
       },
@@ -3147,9 +2336,8 @@
     },
     "node_modules/@vitest/runner/node_modules/yocto-queue": {
       "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/yocto-queue/-/yocto-queue-1.0.0.tgz",
-      "integrity": "sha512-9bnSc/HEW2uRy67wc+T8UwauLuPJVn28jb+GtJY16iiKWyvmYJRXVT4UamsAEGQfPohgr2q4Tq0sQbQlxTfi1g==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=12.20"
       },
@@ -3159,9 +2347,8 @@
     },
     "node_modules/@vitest/snapshot": {
       "version": "0.34.6",
-      "resolved": "https://registry.npmjs.org/@vitest/snapshot/-/snapshot-0.34.6.tgz",
-      "integrity": "sha512-B3OZqYn6k4VaN011D+ve+AA4whM4QkcwcrwaKwAbyyvS/NB1hCWjFIBQxAQQSQir9/RtyAAGuq+4RJmbn2dH4w==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "magic-string": "^0.30.1",
         "pathe": "^1.1.1",
@@ -3173,9 +2360,8 @@
     },
     "node_modules/@vitest/snapshot/node_modules/ansi-styles": {
       "version": "5.2.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-5.2.0.tgz",
-      "integrity": "sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=10"
       },
@@ -3185,9 +2371,8 @@
     },
     "node_modules/@vitest/snapshot/node_modules/pretty-format": {
       "version": "29.7.0",
-      "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-29.7.0.tgz",
-      "integrity": "sha512-Pdlw/oPxN+aXdmM9R00JVC9WVFoCLTKJvDVLgmJ+qAffBMxsV85l/Lu7sNx4zSzPyoL2euImuEwHhOXdEgNFZQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@jest/schemas": "^29.6.3",
         "ansi-styles": "^5.0.0",
@@ -3199,9 +2384,8 @@
     },
     "node_modules/@vitest/spy": {
       "version": "0.34.6",
-      "resolved": "https://registry.npmjs.org/@vitest/spy/-/spy-0.34.6.tgz",
-      "integrity": "sha512-xaCvneSaeBw/cz8ySmF7ZwGvL0lBjfvqc1LpQ/vcdHEvpLn3Ff1vAvjw+CoGn0802l++5L/pxb7whwcWAw+DUQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "tinyspy": "^2.1.1"
       },
@@ -3211,9 +2395,8 @@
     },
     "node_modules/@vitest/utils": {
       "version": "0.34.6",
-      "resolved": "https://registry.npmjs.org/@vitest/utils/-/utils-0.34.6.tgz",
-      "integrity": "sha512-IG5aDD8S6zlvloDsnzHw0Ut5xczlF+kv2BOTo+iXfPr54Yhi5qbVOgGB1hZaVq4iJ4C/MZ2J0y15IlsV/ZcI0A==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "diff-sequences": "^29.4.3",
         "loupe": "^2.3.6",
@@ -3225,9 +2408,8 @@
     },
     "node_modules/@vitest/utils/node_modules/ansi-styles": {
       "version": "5.2.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-5.2.0.tgz",
-      "integrity": "sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=10"
       },
@@ -3237,18 +2419,16 @@
     },
     "node_modules/@vitest/utils/node_modules/diff-sequences": {
       "version": "29.6.3",
-      "resolved": "https://registry.npmjs.org/diff-sequences/-/diff-sequences-29.6.3.tgz",
-      "integrity": "sha512-EjePK1srD3P08o2j4f0ExnylqRs5B9tJjcp9t1krH2qRi8CCdsYfwe9JgSLurFBWwq4uOlipzfk5fHNvwFKr8Q==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
       }
     },
     "node_modules/@vitest/utils/node_modules/pretty-format": {
       "version": "29.7.0",
-      "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-29.7.0.tgz",
-      "integrity": "sha512-Pdlw/oPxN+aXdmM9R00JVC9WVFoCLTKJvDVLgmJ+qAffBMxsV85l/Lu7sNx4zSzPyoL2euImuEwHhOXdEgNFZQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@jest/schemas": "^29.6.3",
         "ansi-styles": "^5.0.0",
@@ -3260,9 +2440,8 @@
     },
     "node_modules/@webassemblyjs/ast": {
       "version": "1.11.6",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/ast/-/ast-1.11.6.tgz",
-      "integrity": "sha512-IN1xI7PwOvLPgjcf180gC1bqn3q/QaOCwYUahIOhbYUu8KA/3tw2RT/T0Gidi1l7Hhj5D/INhJxiICObqpMu4Q==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@webassemblyjs/helper-numbers": "1.11.6",
         "@webassemblyjs/helper-wasm-bytecode": "1.11.6"
@@ -3270,27 +2449,23 @@
     },
     "node_modules/@webassemblyjs/floating-point-hex-parser": {
       "version": "1.11.6",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.11.6.tgz",
-      "integrity": "sha512-ejAj9hfRJ2XMsNHk/v6Fu2dGS+i4UaXBXGemOfQ/JfQ6mdQg/WXtwleQRLLS4OvfDhv8rYnVwH27YJLMyYsxhw==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/@webassemblyjs/helper-api-error": {
       "version": "1.11.6",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-api-error/-/helper-api-error-1.11.6.tgz",
-      "integrity": "sha512-o0YkoP4pVu4rN8aTJgAyj9hC2Sv5UlkzCHhxqWj8butaLvnpdc2jOwh4ewE6CX0txSfLn/UYaV/pheS2Txg//Q==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/@webassemblyjs/helper-buffer": {
       "version": "1.11.6",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-buffer/-/helper-buffer-1.11.6.tgz",
-      "integrity": "sha512-z3nFzdcp1mb8nEOFFk8DrYLpHvhKC3grJD2ardfKOzmbmJvEf/tPIqCY+sNcwZIY8ZD7IkB2l7/pqhUhqm7hLA==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/@webassemblyjs/helper-numbers": {
       "version": "1.11.6",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-numbers/-/helper-numbers-1.11.6.tgz",
-      "integrity": "sha512-vUIhZ8LZoIWHBohiEObxVm6hwP034jwmc9kuq5GdHZH0wiLVLIPcMCdpJzG4C11cHoQ25TFIQj9kaVADVX7N3g==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@webassemblyjs/floating-point-hex-parser": "1.11.6",
         "@webassemblyjs/helper-api-error": "1.11.6",
@@ -3299,15 +2474,13 @@
     },
     "node_modules/@webassemblyjs/helper-wasm-bytecode": {
       "version": "1.11.6",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.11.6.tgz",
-      "integrity": "sha512-sFFHKwcmBprO9e7Icf0+gddyWYDViL8bpPjJJl0WHxCdETktXdmtWLGVzoHbqUcY4Be1LkNfwTmXOJUFZYSJdA==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/@webassemblyjs/helper-wasm-section": {
       "version": "1.11.6",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.11.6.tgz",
-      "integrity": "sha512-LPpZbSOwTpEC2cgn4hTydySy1Ke+XEu+ETXuoyvuyezHO3Kjdu90KK95Sh9xTbmjrCsUwvWwCOQQNta37VrS9g==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@webassemblyjs/ast": "1.11.6",
         "@webassemblyjs/helper-buffer": "1.11.6",
@@ -3317,33 +2490,29 @@
     },
     "node_modules/@webassemblyjs/ieee754": {
       "version": "1.11.6",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/ieee754/-/ieee754-1.11.6.tgz",
-      "integrity": "sha512-LM4p2csPNvbij6U1f19v6WR56QZ8JcHg3QIJTlSwzFcmx6WSORicYj6I63f9yU1kEUtrpG+kjkiIAkevHpDXrg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@xtuc/ieee754": "^1.2.0"
       }
     },
     "node_modules/@webassemblyjs/leb128": {
       "version": "1.11.6",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/leb128/-/leb128-1.11.6.tgz",
-      "integrity": "sha512-m7a0FhE67DQXgouf1tbN5XQcdWoNgaAuoULHIfGFIEVKA6tu/edls6XnIlkmS6FrXAquJRPni3ZZKjw6FSPjPQ==",
       "dev": true,
+      "license": "Apache-2.0",
       "dependencies": {
         "@xtuc/long": "4.2.2"
       }
     },
     "node_modules/@webassemblyjs/utf8": {
       "version": "1.11.6",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/utf8/-/utf8-1.11.6.tgz",
-      "integrity": "sha512-vtXf2wTQ3+up9Zsg8sa2yWiQpzSsMyXj0qViVP6xKGCUT8p8YJ6HqI7l5eCnWx1T/FYdsv07HQs2wTFbbof/RA==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/@webassemblyjs/wasm-edit": {
       "version": "1.11.6",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-edit/-/wasm-edit-1.11.6.tgz",
-      "integrity": "sha512-Ybn2I6fnfIGuCR+Faaz7YcvtBKxvoLV3Lebn1tM4o/IAJzmi9AWYIPWpyBfU8cC+JxAO57bk4+zdsTjJR+VTOw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@webassemblyjs/ast": "1.11.6",
         "@webassemblyjs/helper-buffer": "1.11.6",
@@ -3357,9 +2526,8 @@
     },
     "node_modules/@webassemblyjs/wasm-gen": {
       "version": "1.11.6",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-gen/-/wasm-gen-1.11.6.tgz",
-      "integrity": "sha512-3XOqkZP/y6B4F0PBAXvI1/bky7GryoogUtfwExeP/v7Nzwo1QLcq5oQmpKlftZLbT+ERUOAZVQjuNVak6UXjPA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@webassemblyjs/ast": "1.11.6",
         "@webassemblyjs/helper-wasm-bytecode": "1.11.6",
@@ -3370,9 +2538,8 @@
     },
     "node_modules/@webassemblyjs/wasm-opt": {
       "version": "1.11.6",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-opt/-/wasm-opt-1.11.6.tgz",
-      "integrity": "sha512-cOrKuLRE7PCe6AsOVl7WasYf3wbSo4CeOk6PkrjS7g57MFfVUF9u6ysQBBODX0LdgSvQqRiGz3CXvIDKcPNy4g==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@webassemblyjs/ast": "1.11.6",
         "@webassemblyjs/helper-buffer": "1.11.6",
@@ -3382,9 +2549,8 @@
     },
     "node_modules/@webassemblyjs/wasm-parser": {
       "version": "1.11.6",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-parser/-/wasm-parser-1.11.6.tgz",
-      "integrity": "sha512-6ZwPeGzMJM3Dqp3hCsLgESxBGtT/OeCvCZ4TA1JUPYgmhAx38tTPR9JaKy0S5H3evQpO/h2uWs2j6Yc/fjkpTQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@webassemblyjs/ast": "1.11.6",
         "@webassemblyjs/helper-api-error": "1.11.6",
@@ -3396,9 +2562,8 @@
     },
     "node_modules/@webassemblyjs/wast-printer": {
       "version": "1.11.6",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/wast-printer/-/wast-printer-1.11.6.tgz",
-      "integrity": "sha512-JM7AhRcE+yW2GWYaKeHL5vt4xqee5N2WcezptmgyhNS+ScggqcT1OtXykhAb13Sn5Yas0j2uv9tHgrjwvzAP4A==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@webassemblyjs/ast": "1.11.6",
         "@xtuc/long": "4.2.2"
@@ -3406,15 +2571,13 @@
     },
     "node_modules/@xtuc/ieee754": {
       "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/@xtuc/ieee754/-/ieee754-1.2.0.tgz",
-      "integrity": "sha512-DX8nKgqcGwsc0eJSqYt5lwP4DH5FlHnmuWWBRy7X0NcaGR0ZtuyeESgMwTYVEtxmsNGY+qit4QYT/MIYTOTPeA==",
-      "dev": true
+      "dev": true,
+      "license": "BSD-3-Clause"
     },
     "node_modules/@xtuc/long": {
       "version": "4.2.2",
-      "resolved": "https://registry.npmjs.org/@xtuc/long/-/long-4.2.2.tgz",
-      "integrity": "sha512-NuHqBY1PB/D8xU6s/thBgOAiAP7HOYDQ32+BFZILJ8ivkUkAHQnWfn6WhL79Owj1qmUnoN/YPhktdIoucipkAQ==",
-      "dev": true
+      "dev": true,
+      "license": "Apache-2.0"
     },
     "node_modules/@zondax/ledger-stacks": {
       "version": "1.0.4",
@@ -3465,9 +2628,9 @@
       }
     },
     "node_modules/@zondax/ledger-stacks/node_modules/@types/node": {
-      "version": "18.19.42",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-18.19.42.tgz",
-      "integrity": "sha512-d2ZFc/3lnK2YCYhos8iaNIYu9Vfhr92nHiyJHRltXWjXUBjEE+A4I58Tdbnw4VhggSW+2j5y5gTrLs4biNnubg==",
+      "version": "18.19.45",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-18.19.45.tgz",
+      "integrity": "sha512-VZxPKNNhjKmaC1SUYowuXSRSMGyQGmQjvvA1xE4QZ0xce2kLtEhPDS+kqpCPBZYgqblCLQ2DAjSzmgCM5auvhA==",
       "dependencies": {
         "undici-types": "~5.26.4"
       }
@@ -3495,9 +2658,8 @@
     },
     "node_modules/accepts": {
       "version": "1.3.8",
-      "resolved": "https://registry.npmjs.org/accepts/-/accepts-1.3.8.tgz",
-      "integrity": "sha512-PYAthTa2m2VKxuvSD3DPC/Gy+U+sOA1LAuT8mkmRuvw+NACSaeXEQ+NHcVF7rONl6qcaxV3Uuemwawk+7+SJLw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "mime-types": "~2.1.34",
         "negotiator": "0.6.3"
@@ -3508,9 +2670,8 @@
     },
     "node_modules/acorn": {
       "version": "8.10.0",
-      "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.10.0.tgz",
-      "integrity": "sha512-F0SAmZ8iUtS//m8DmCTA0jlh6TDKkHQyK6xc6V4KDTyZKA9dnvX9/3sRTVQrWm79glUAZbnmmNcdYwUIHWVybw==",
       "dev": true,
+      "license": "MIT",
       "bin": {
         "acorn": "bin/acorn"
       },
@@ -3520,36 +2681,32 @@
     },
     "node_modules/acorn-import-assertions": {
       "version": "1.9.0",
-      "resolved": "https://registry.npmjs.org/acorn-import-assertions/-/acorn-import-assertions-1.9.0.tgz",
-      "integrity": "sha512-cmMwop9x+8KFhxvKrKfPYmN6/pKTYYHBqLa0DfvVZcKMJWNyWLnaqND7dx/qn66R7ewM1UX5XMaDVP5wlVTaVA==",
       "dev": true,
+      "license": "MIT",
       "peerDependencies": {
         "acorn": "^8"
       }
     },
     "node_modules/acorn-jsx": {
       "version": "5.3.2",
-      "resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.3.2.tgz",
-      "integrity": "sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==",
       "dev": true,
+      "license": "MIT",
       "peerDependencies": {
         "acorn": "^6.0.0 || ^7.0.0 || ^8.0.0"
       }
     },
     "node_modules/acorn-walk": {
       "version": "8.3.0",
-      "resolved": "https://registry.npmjs.org/acorn-walk/-/acorn-walk-8.3.0.tgz",
-      "integrity": "sha512-FS7hV565M5l1R08MXqo8odwMTB02C2UqzB17RVgu9EyuYFBqJZ3/ZY97sQD5FewVu1UyDFc1yztUDrAwT0EypA==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=0.4.0"
       }
     },
     "node_modules/aggregate-error": {
       "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/aggregate-error/-/aggregate-error-3.1.0.tgz",
-      "integrity": "sha512-4I7Td01quW/RpocfNayFdFVk1qSuoh0E7JrbRJ16nH01HhKFQ88INq9Sd+nd72zqRySlr9BmDA8xlEJ6vJMrYA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "clean-stack": "^2.0.0",
         "indent-string": "^4.0.0"
@@ -3560,9 +2717,8 @@
     },
     "node_modules/ajv": {
       "version": "6.12.6",
-      "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
-      "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "fast-deep-equal": "^3.1.1",
         "fast-json-stable-stringify": "^2.0.0",
@@ -3576,9 +2732,8 @@
     },
     "node_modules/ajv-formats": {
       "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/ajv-formats/-/ajv-formats-2.1.1.tgz",
-      "integrity": "sha512-Wx0Kx52hxE7C18hkMEggYlEifqWZtYaRgouJor+WMdPnQyEK13vgEWyVNup7SoeeoLMsr4kf5h6dOW11I15MUA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "ajv": "^8.0.0"
       },
@@ -3593,9 +2748,8 @@
     },
     "node_modules/ajv-formats/node_modules/ajv": {
       "version": "8.12.0",
-      "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.12.0.tgz",
-      "integrity": "sha512-sRu1kpcO9yLtYxBKvqfTeh9KzZEwO3STyX1HT+4CaDzC6HpTGYhIhPIzj9XuKU7KYDwnaeh5hcOwjy1QuJzBPA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "fast-deep-equal": "^3.1.1",
         "json-schema-traverse": "^1.0.0",
@@ -3609,23 +2763,20 @@
     },
     "node_modules/ajv-formats/node_modules/json-schema-traverse": {
       "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz",
-      "integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/ajv-keywords": {
       "version": "3.5.2",
-      "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.5.2.tgz",
-      "integrity": "sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==",
       "dev": true,
+      "license": "MIT",
       "peerDependencies": {
         "ajv": "^6.9.1"
       }
     },
     "node_modules/alex-sdk": {
       "version": "0.1.26",
-      "resolved": "https://registry.npmjs.org/alex-sdk/-/alex-sdk-0.1.26.tgz",
-      "integrity": "sha512-uUjbONoAit6htxZGLOFev8v2h59kE31fM1X9efH0Yi1eLXYSSXojj+iFPTlQTQvIysyseXGxkX4VVTc9aQ13sg==",
+      "license": "MIT",
       "dependencies": {
         "clarity-codegen": "^0.3.5"
       },
@@ -3639,9 +2790,8 @@
     },
     "node_modules/ansi-escapes": {
       "version": "4.3.2",
-      "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-4.3.2.tgz",
-      "integrity": "sha512-gKXj5ALrKWQLsYG9jlTRmR/xKluxHV+Z9QEwNIgCfM1/uwPMCuzVVnh5mwTd+OuBZcwSIMbqssNWRm1lE51QaQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "type-fest": "^0.21.3"
       },
@@ -3654,9 +2804,8 @@
     },
     "node_modules/ansi-escapes/node_modules/type-fest": {
       "version": "0.21.3",
-      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.21.3.tgz",
-      "integrity": "sha512-t0rzBq87m3fVcduHDUFhKmyyX+9eo6WQjZvf51Ea/M0Q7+T374Jp1aUiyUl0GKxp8M/OETVHSDvmkyPgvX+X2w==",
       "dev": true,
+      "license": "(MIT OR CC0-1.0)",
       "engines": {
         "node": ">=10"
       },
@@ -3666,28 +2815,25 @@
     },
     "node_modules/ansi-html-community": {
       "version": "0.0.8",
-      "resolved": "https://registry.npmjs.org/ansi-html-community/-/ansi-html-community-0.0.8.tgz",
-      "integrity": "sha512-1APHAyr3+PCamwNw3bXCPp4HFLONZt/yIH0sZp0/469KWNTEy+qN5jQ3GVX6DMZ1UXAi34yVwtTeaG/HpBuuzw==",
       "dev": true,
       "engines": [
         "node >= 0.8.0"
       ],
+      "license": "Apache-2.0",
       "bin": {
         "ansi-html": "bin/ansi-html"
       }
     },
     "node_modules/ansi-regex": {
       "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
-      "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
+      "license": "MIT",
       "engines": {
         "node": ">=8"
       }
     },
     "node_modules/ansi-styles": {
       "version": "3.2.1",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
-      "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
+      "license": "MIT",
       "dependencies": {
         "color-convert": "^1.9.0"
       },
@@ -3697,9 +2843,8 @@
     },
     "node_modules/anymatch": {
       "version": "3.1.3",
-      "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.3.tgz",
-      "integrity": "sha512-KMReFUr0B4t+D+OBkjR3KYqvocp2XaSzO55UcB6mgQMd3KbcE+mWTyvVV7D/zsdEbNnV6acZUutkiHQXvTr1Rw==",
       "dev": true,
+      "license": "ISC",
       "dependencies": {
         "normalize-path": "^3.0.0",
         "picomatch": "^2.0.4"
@@ -3710,35 +2855,30 @@
     },
     "node_modules/argon2-browser": {
       "version": "1.18.0",
-      "resolved": "https://registry.npmjs.org/argon2-browser/-/argon2-browser-1.18.0.tgz",
-      "integrity": "sha512-ImVAGIItnFnvET1exhsQB7apRztcoC5TnlSqernMJDUjbc/DLq3UEYeXFrLPrlaIl8cVfwnXb6wX2KpFf2zxHw=="
+      "license": "MIT"
     },
     "node_modules/argparse": {
       "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz",
-      "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==",
-      "dev": true
+      "dev": true,
+      "license": "Python-2.0"
     },
     "node_modules/aria-query": {
       "version": "5.1.3",
-      "resolved": "https://registry.npmjs.org/aria-query/-/aria-query-5.1.3.tgz",
-      "integrity": "sha512-R5iJ5lkuHybztUfuOAznmboyjWq8O6sqNqtK7CLOqdydi54VNbORp49mb14KbWgG1QD3JFO9hJdZ+y4KutfdOQ==",
       "dev": true,
+      "license": "Apache-2.0",
       "dependencies": {
         "deep-equal": "^2.0.5"
       }
     },
     "node_modules/arity-n": {
       "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/arity-n/-/arity-n-1.0.4.tgz",
-      "integrity": "sha512-fExL2kFDC1Q2DUOx3whE/9KoN66IzkY4b4zUHUBFM1ojEYjZZYDcUW3bek/ufGionX9giIKDC5redH2IlGqcQQ==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/array-buffer-byte-length": {
       "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/array-buffer-byte-length/-/array-buffer-byte-length-1.0.0.tgz",
-      "integrity": "sha512-LPuwb2P+NrQw3XhxGc36+XSvuBPopovXYTR9Ew++Du9Yb/bx5AzBfrIsBoj0EZUifjQU+sHL21sseZ3jerWO/A==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "call-bind": "^1.0.2",
         "is-array-buffer": "^3.0.1"
@@ -3749,15 +2889,13 @@
     },
     "node_modules/array-flatten": {
       "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/array-flatten/-/array-flatten-2.1.2.tgz",
-      "integrity": "sha512-hNfzcOV8W4NdualtqBFPyVO+54DSJuZGY9qT4pRroB6S9e3iiido2ISIC5h9R2sPJ8H3FHCIiEnsv1lPXO3KtQ==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/array-includes": {
       "version": "3.1.6",
-      "resolved": "https://registry.npmjs.org/array-includes/-/array-includes-3.1.6.tgz",
-      "integrity": "sha512-sgTbLvL6cNnw24FnbaDyjmvddQ2ML8arZsgaJhoABMoplz/4QRhtrYS+alr1BUM1Bwp6dhx8vVCBSLG+StwOFw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "call-bind": "^1.0.2",
         "define-properties": "^1.1.4",
@@ -3774,9 +2912,8 @@
     },
     "node_modules/array-last": {
       "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/array-last/-/array-last-1.3.0.tgz",
-      "integrity": "sha512-eOCut5rXlI6aCOS7Z7kCplKRKyiFQ6dHFBem4PwlwKeNFk2/XxTrhRh5T9PyaEWGy/NHTZWbY+nsZlNFJu9rYg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "is-number": "^4.0.0"
       },
@@ -3786,36 +2923,32 @@
     },
     "node_modules/array-last/node_modules/is-number": {
       "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/is-number/-/is-number-4.0.0.tgz",
-      "integrity": "sha512-rSklcAIlf1OmFdyAqbnWTLVelsQ58uvZ66S/ZyawjWqIviTWCjg2PzVGw8WUA+nNuPTqb4wgA+NszrJ+08LlgQ==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=0.10.0"
       }
     },
     "node_modules/array-union": {
       "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/array-union/-/array-union-2.1.0.tgz",
-      "integrity": "sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=8"
       }
     },
     "node_modules/array-uniq": {
       "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/array-uniq/-/array-uniq-1.0.3.tgz",
-      "integrity": "sha512-MNha4BWQ6JbwhFhj03YK552f7cb3AzoE8SzeljgChvL1dl3IcvggXVz1DilzySZkCja+CXuZbdW7yATchWn8/Q==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=0.10.0"
       }
     },
     "node_modules/array.prototype.findlastindex": {
       "version": "1.2.2",
-      "resolved": "https://registry.npmjs.org/array.prototype.findlastindex/-/array.prototype.findlastindex-1.2.2.tgz",
-      "integrity": "sha512-tb5thFFlUcp7NdNF6/MpDk/1r/4awWG1FIz3YqDf+/zJSTezBb+/5WViH41obXULHVpDzoiCLpJ/ZO9YbJMsdw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "call-bind": "^1.0.2",
         "define-properties": "^1.1.4",
@@ -3832,9 +2965,8 @@
     },
     "node_modules/array.prototype.flat": {
       "version": "1.3.1",
-      "resolved": "https://registry.npmjs.org/array.prototype.flat/-/array.prototype.flat-1.3.1.tgz",
-      "integrity": "sha512-roTU0KWIOmJ4DRLmwKd19Otg0/mT3qPNt0Qb3GWW8iObuZXxrjB/pzn0R3hqpRSWg4HCwqx+0vwOnWnvlOyeIA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "call-bind": "^1.0.2",
         "define-properties": "^1.1.4",
@@ -3850,9 +2982,8 @@
     },
     "node_modules/array.prototype.flatmap": {
       "version": "1.3.1",
-      "resolved": "https://registry.npmjs.org/array.prototype.flatmap/-/array.prototype.flatmap-1.3.1.tgz",
-      "integrity": "sha512-8UGn9O1FDVvMNB0UlLv4voxRMze7+FpHyF5mSMRjWHUMlpoDViniy05870VlxhfgTnLbpuwTzvD76MTtWxB/mQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "call-bind": "^1.0.2",
         "define-properties": "^1.1.4",
@@ -3868,9 +2999,8 @@
     },
     "node_modules/array.prototype.tosorted": {
       "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/array.prototype.tosorted/-/array.prototype.tosorted-1.1.1.tgz",
-      "integrity": "sha512-pZYPXPRl2PqWcsUs6LOMn+1f1532nEoPTYowBtqLwAW+W8vSVhkIGnmOX1t/UQjD6YGI0vcD2B1U7ZFGQH9jnQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "call-bind": "^1.0.2",
         "define-properties": "^1.1.4",
@@ -3881,9 +3011,8 @@
     },
     "node_modules/arraybuffer.prototype.slice": {
       "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/arraybuffer.prototype.slice/-/arraybuffer.prototype.slice-1.0.1.tgz",
-      "integrity": "sha512-09x0ZWFEjj4WD8PDbykUwo3t9arLn8NIzmmYEJFpYekOAQjpkGSyrQhNoRTcwwcFRu+ycWF78QZ63oWTqSjBcw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "array-buffer-byte-length": "^1.0.0",
         "call-bind": "^1.0.2",
@@ -3901,8 +3030,7 @@
     },
     "node_modules/asn1.js": {
       "version": "5.4.1",
-      "resolved": "https://registry.npmjs.org/asn1.js/-/asn1.js-5.4.1.tgz",
-      "integrity": "sha512-+I//4cYPccV8LdmBLiX8CYvf9Sp3vQsrqu2QNXRcrbiWvcx/UdlFiqUJJzxRQxgsZmvhXhn4cSKeSmoFjVdupA==",
+      "license": "MIT",
       "dependencies": {
         "bn.js": "^4.0.0",
         "inherits": "^2.0.1",
@@ -3912,58 +3040,50 @@
     },
     "node_modules/asn1.js/node_modules/bn.js": {
       "version": "4.12.0",
-      "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.0.tgz",
-      "integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA=="
+      "license": "MIT"
     },
     "node_modules/assertion-error": {
       "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/assertion-error/-/assertion-error-1.1.0.tgz",
-      "integrity": "sha512-jgsaNduz+ndvGyFt3uSuWqvy4lCnIJiovtouQN5JZHOKCS2QuhEdbcQHFhVksz2N2U9hXJo8odG7ETyWlEeuDw==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": "*"
       }
     },
     "node_modules/ast-types-flow": {
       "version": "0.0.7",
-      "resolved": "https://registry.npmjs.org/ast-types-flow/-/ast-types-flow-0.0.7.tgz",
-      "integrity": "sha512-eBvWn1lvIApYMhzQMsu9ciLfkBY499mFZlNqG+/9WR7PVlroQw0vG30cOQQbaKz3sCEc44TAOu2ykzqXSNnwag==",
-      "dev": true
+      "dev": true,
+      "license": "ISC"
     },
     "node_modules/astral-regex": {
       "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/astral-regex/-/astral-regex-2.0.0.tgz",
-      "integrity": "sha512-Z7tMw1ytTXt5jqMcOP+OQteU1VuNK9Y02uuJtKQ1Sv69jXQKKg5cibLwGJow8yzZP+eAc18EmLGPal0bp36rvQ==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=8"
       }
     },
     "node_modules/async": {
       "version": "2.6.4",
-      "resolved": "https://registry.npmjs.org/async/-/async-2.6.4.tgz",
-      "integrity": "sha512-mzo5dfJYwAn29PeiJ0zvwTo04zj8HDJj0Mn8TD7sno7q12prdbnasKJHhkm2c1LgrhlJ0teaea8860oxi51mGA==",
+      "license": "MIT",
       "dependencies": {
         "lodash": "^4.17.14"
       }
     },
     "node_modules/async-mutex": {
       "version": "0.5.0",
-      "resolved": "https://registry.npmjs.org/async-mutex/-/async-mutex-0.5.0.tgz",
-      "integrity": "sha512-1A94B18jkJ3DYq284ohPxoXbfTA5HsQ7/Mf4DEhcyLx3Bz27Rh59iScbB6EPiP+B+joue6YCxcMXSbFC1tZKwA==",
+      "license": "MIT",
       "dependencies": {
         "tslib": "^2.4.0"
       }
     },
     "node_modules/asynckit": {
       "version": "0.4.0",
-      "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz",
-      "integrity": "sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q=="
+      "license": "MIT"
     },
     "node_modules/available-typed-arrays": {
       "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/available-typed-arrays/-/available-typed-arrays-1.0.5.tgz",
-      "integrity": "sha512-DMD0KiN46eipeziST1LPP/STfDU0sufISXmjSgvVsoU2tqxctQeASejWcfNtxYKqETM1UxQ8sp2OrSBWpHY6sw==",
+      "license": "MIT",
       "engines": {
         "node": ">= 0.4"
       },
@@ -3973,17 +3093,15 @@
     },
     "node_modules/axe-core": {
       "version": "4.7.2",
-      "resolved": "https://registry.npmjs.org/axe-core/-/axe-core-4.7.2.tgz",
-      "integrity": "sha512-zIURGIS1E1Q4pcrMjp+nnEh+16G56eG/MUllJH8yEvw7asDo7Ac9uhC9KIH5jzpITueEZolfYglnCGIuSBz39g==",
       "dev": true,
+      "license": "MPL-2.0",
       "engines": {
         "node": ">=4"
       }
     },
     "node_modules/axios": {
       "version": "1.7.0",
-      "resolved": "https://registry.npmjs.org/axios/-/axios-1.7.0.tgz",
-      "integrity": "sha512-IiB0wQeKyPRdsFVhBgIo31FbzOyf2M6wYl7/NVutFwFBRMiAbjNiydJIHKeLmPugF4kJLfA1uWZ82Is2QzqqFA==",
+      "license": "MIT",
       "dependencies": {
         "follow-redirects": "^1.15.6",
         "form-data": "^4.0.0",
@@ -3992,17 +3110,15 @@
     },
     "node_modules/axobject-query": {
       "version": "3.2.1",
-      "resolved": "https://registry.npmjs.org/axobject-query/-/axobject-query-3.2.1.tgz",
-      "integrity": "sha512-jsyHu61e6N4Vbz/v18DHwWYKK0bSWLqn47eeDSKPB7m8tqMHF9YJ+mhIk2lVteyZrY8tnSj/jHOv4YiTCuCJgg==",
       "dev": true,
+      "license": "Apache-2.0",
       "dependencies": {
         "dequal": "^2.0.3"
       }
     },
     "node_modules/babel-plugin-styled-components": {
       "version": "2.1.4",
-      "resolved": "https://registry.npmjs.org/babel-plugin-styled-components/-/babel-plugin-styled-components-2.1.4.tgz",
-      "integrity": "sha512-Xgp9g+A/cG47sUyRwwYxGM4bR/jDRg5N6it/8+HxCnbT5XNKSKDT9xm4oag/osgqjC2It/vH0yXsomOG6k558g==",
+      "license": "MIT",
       "dependencies": {
         "@babel/helper-annotate-as-pure": "^7.22.5",
         "@babel/helper-module-imports": "^7.22.5",
@@ -4016,8 +3132,7 @@
     },
     "node_modules/babel-runtime": {
       "version": "6.26.0",
-      "resolved": "https://registry.npmjs.org/babel-runtime/-/babel-runtime-6.26.0.tgz",
-      "integrity": "sha512-ITKNuq2wKlW1fJg9sSW52eepoYgZBggvOAHC0u/CYu/qxQ9EVzThCgR69BnSXLHjy2f7SY5zaQ4yt7H9ZVxY2g==",
+      "license": "MIT",
       "dependencies": {
         "core-js": "^2.4.0",
         "regenerator-runtime": "^0.11.0"
@@ -4025,40 +3140,33 @@
     },
     "node_modules/babel-runtime/node_modules/regenerator-runtime": {
       "version": "0.11.1",
-      "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.11.1.tgz",
-      "integrity": "sha512-MguG95oij0fC3QV3URf4V2SDYGJhJnJGqvIIgdECeODCT98wSWDAJ94SSuVpYQUoTcGUIL6L4yNB7j1DFFHSBg=="
+      "license": "MIT"
     },
     "node_modules/babylon": {
       "version": "6.18.0",
-      "resolved": "https://registry.npmjs.org/babylon/-/babylon-6.18.0.tgz",
-      "integrity": "sha512-q/UEjfGJ2Cm3oKV71DJz9d25TPnq5rhBVL2Q4fA5wcC3jcrdn7+SssEybFIxwAvvP+YCsCYNKughoF33GxgycQ==",
       "dev": true,
+      "license": "MIT",
       "bin": {
         "babylon": "bin/babylon.js"
       }
     },
     "node_modules/balanced-match": {
       "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz",
-      "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw=="
+      "license": "MIT"
     },
     "node_modules/base-x": {
       "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/base-x/-/base-x-4.0.0.tgz",
-      "integrity": "sha512-FuwxlW4H5kh37X/oW59pwTzzTKRzfrrQwhmyspRM7swOEZcHtDZSCt45U6oKgtuFE+WYPblePMVIPR4RZrh/hw=="
+      "license": "MIT"
     },
     "node_modules/base58-js": {
       "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/base58-js/-/base58-js-1.0.5.tgz",
-      "integrity": "sha512-LkkAPP8Zu+c0SVNRTRVDyMfKVORThX+rCViget00xdgLRrKkClCTz1T7cIrpr69ShwV5XJuuoZvMvJ43yURwkA==",
+      "license": "MIT",
       "engines": {
         "node": ">= 8"
       }
     },
     "node_modules/base64-js": {
       "version": "1.5.1",
-      "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.5.1.tgz",
-      "integrity": "sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==",
       "funding": [
         {
           "type": "github",
@@ -4072,13 +3180,13 @@
           "type": "consulting",
           "url": "https://feross.org/support"
         }
-      ]
+      ],
+      "license": "MIT"
     },
     "node_modules/base64-loader": {
       "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/base64-loader/-/base64-loader-1.0.0.tgz",
-      "integrity": "sha512-p32+F8dg+ANGx7s8QsZS74ZPHfIycmC2yZcoerzFgbersIYWitPbbF39G6SBx3gyvzyLH5nt1ooocxr0IHuWKA==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/base64url": {
       "version": "3.0.1",
@@ -4090,45 +3198,39 @@
     },
     "node_modules/batch": {
       "version": "0.6.1",
-      "resolved": "https://registry.npmjs.org/batch/-/batch-0.6.1.tgz",
-      "integrity": "sha512-x+VAiMRL6UPkx+kudNvxTl6hB2XNNCG2r+7wixVfIYwu/2HKRXimwQyaumLjMveWvT2Hkd/cAJw+QBMfJ/EKVw==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/bech32": {
       "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/bech32/-/bech32-2.0.0.tgz",
-      "integrity": "sha512-LcknSilhIGatDAsY1ak2I8VtGaHNhgMSYVxFrGLXv+xLHytaKZKcaUJJUE7qmBr7h33o5YQwP55pMI0xmkpJwg=="
+      "license": "MIT"
     },
     "node_modules/big-integer": {
       "version": "1.6.51",
-      "resolved": "https://registry.npmjs.org/big-integer/-/big-integer-1.6.51.tgz",
-      "integrity": "sha512-GPEid2Y9QU1Exl1rpO9B2IPJGHPSupF5GnVIP0blYvNOMer2bTvSWs1jGOUg04hTmu67nmLsQ9TBo1puaotBHg==",
+      "license": "Unlicense",
       "engines": {
         "node": ">=0.6"
       }
     },
     "node_modules/big.js": {
       "version": "5.2.2",
-      "resolved": "https://registry.npmjs.org/big.js/-/big.js-5.2.2.tgz",
-      "integrity": "sha512-vyL2OymJxmarO8gxMr0mhChsO9QGwhynfuu4+MHTAW6czfq9humCB7rKpUjDd9YUiDPU4mzpyupFSvOClAwbmQ==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": "*"
       }
     },
     "node_modules/bignumber.js": {
       "version": "9.1.1",
-      "resolved": "https://registry.npmjs.org/bignumber.js/-/bignumber.js-9.1.1.tgz",
-      "integrity": "sha512-pHm4LsMJ6lzgNGVfZHjMoO8sdoRhOzOH4MLmY65Jg70bpxCKu5iOHNJyfF6OyvYw7t8Fpf35RuzUyqnQsj8Vig==",
+      "license": "MIT",
       "engines": {
         "node": "*"
       }
     },
     "node_modules/binary-extensions": {
       "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.2.0.tgz",
-      "integrity": "sha512-jDctJ/IVQbZoJykoeHbhXpOlNBqGNcwXJKJog42E5HDPUwQTSdjCHdihjj0DlnheQ7blbT6dHOafNAiS8ooQKA==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=8"
       }
@@ -4170,8 +3272,7 @@
     },
     "node_modules/bip39": {
       "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/bip39/-/bip39-3.1.0.tgz",
-      "integrity": "sha512-c9kiwdk45Do5GL0vJMe7tS95VjCii65mYAH7DfWl3uW8AVzXKQVUm64i3hzVybBDMp9r7j9iNxR85+ul8MdN/A==",
+      "license": "ISC",
       "dependencies": {
         "@noble/hashes": "^1.2.0"
       }
@@ -4194,8 +3295,7 @@
     },
     "node_modules/bitcoin-address-validation": {
       "version": "2.2.3",
-      "resolved": "https://registry.npmjs.org/bitcoin-address-validation/-/bitcoin-address-validation-2.2.3.tgz",
-      "integrity": "sha512-1uGCGl26Ye8JG5qcExtFLQfuib6qEZWNDo1ZlLlwp/z7ygUFby3IxolgEfgMGaC+LG9csbVASLcH8fRLv7DIOg==",
+      "license": "MIT",
       "dependencies": {
         "base58-js": "^1.0.0",
         "bech32": "^2.0.0",
@@ -4267,14 +3367,12 @@
     },
     "node_modules/bn.js": {
       "version": "5.2.1",
-      "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-5.2.1.tgz",
-      "integrity": "sha512-eXRvHzWyYPBuB4NBy0cmYQjGitUrtqwbvlzP3G6VFnNRbsZQIxQ10PbKKHt8gZ/HW/D/747aDl+QkDqg3KQLMQ=="
+      "license": "MIT"
     },
     "node_modules/body-parser": {
       "version": "1.20.1",
-      "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.20.1.tgz",
-      "integrity": "sha512-jWi7abTbYwajOytWCQc37VulmWiRae5RyTpaCyDcS5/lMdtwSz5lOpDE67srw/HYe35f1z3fDQw+3txg7gNtWw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "bytes": "3.1.2",
         "content-type": "~1.0.4",
@@ -4296,27 +3394,24 @@
     },
     "node_modules/body-parser/node_modules/bytes": {
       "version": "3.1.2",
-      "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.1.2.tgz",
-      "integrity": "sha512-/Nf7TyzTx6S3yRJObOAV7956r8cr2+Oj8AC5dt8wSP3BQAoeX58NoHyCU8P8zGkNXStjTSi6fzO6F0pBdcYbEg==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">= 0.8"
       }
     },
     "node_modules/body-parser/node_modules/debug": {
       "version": "2.6.9",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-      "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "ms": "2.0.0"
       }
     },
     "node_modules/body-parser/node_modules/iconv-lite": {
       "version": "0.4.24",
-      "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz",
-      "integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "safer-buffer": ">= 2.1.2 < 3"
       },
@@ -4326,15 +3421,13 @@
     },
     "node_modules/body-parser/node_modules/ms": {
       "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-      "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/body-parser/node_modules/qs": {
       "version": "6.11.0",
-      "resolved": "https://registry.npmjs.org/qs/-/qs-6.11.0.tgz",
-      "integrity": "sha512-MvjoMCJwEarSbUYk5O+nmoSzSutSsTwF85zcHPQ9OrlFoZOYIjaqBAJIqIXjptyD5vThxGq52Xu/MaJzRkIk4Q==",
       "dev": true,
+      "license": "BSD-3-Clause",
       "dependencies": {
         "side-channel": "^1.0.4"
       },
@@ -4347,9 +3440,8 @@
     },
     "node_modules/bonjour-service": {
       "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/bonjour-service/-/bonjour-service-1.1.1.tgz",
-      "integrity": "sha512-Z/5lQRMOG9k7W+FkeGTNjh7htqn/2LMnfOvBZ8pynNZCM9MwkQkI3zeI4oz09uWdcgmgHugVvBqxGg4VQJ5PCg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "array-flatten": "^2.1.2",
         "dns-equal": "^1.0.0",
@@ -4359,14 +3451,12 @@
     },
     "node_modules/boolbase": {
       "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/boolbase/-/boolbase-1.0.0.tgz",
-      "integrity": "sha512-JZOSA7Mo9sNGB8+UjSgzdLtokWAky1zbztM3WRLCbZ70/3cTANmQmOdR7y2g+J0e2WXywy1yS468tY+IruqEww==",
-      "dev": true
+      "dev": true,
+      "license": "ISC"
     },
     "node_modules/brace-expansion": {
       "version": "1.1.11",
-      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
-      "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
+      "license": "MIT",
       "dependencies": {
         "balanced-match": "^1.0.0",
         "concat-map": "0.0.1"
@@ -4374,9 +3464,8 @@
     },
     "node_modules/braces": {
       "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz",
-      "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "fill-range": "^7.0.1"
       },
@@ -4386,9 +3475,8 @@
     },
     "node_modules/broadcast-channel": {
       "version": "2.3.4",
-      "resolved": "https://registry.npmjs.org/broadcast-channel/-/broadcast-channel-2.3.4.tgz",
-      "integrity": "sha512-cx1/dSb6KZ9HW1VtlqM/HLPjrdyzkKoteVmUpLXEpra00mDQW/F9ieDkoavuZMoh9/hC/6OplGzCERsZBfz/Wg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@babel/runtime": "^7.6.2",
         "detect-node": "^2.0.4",
@@ -4401,9 +3489,8 @@
     },
     "node_modules/broadcast-channel/node_modules/rimraf": {
       "version": "2.6.3",
-      "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.6.3.tgz",
-      "integrity": "sha512-mwqeW5XsA2qAejG46gYdENaxXjx9onRNCfn7L0duuP4hCuTIi/QO7PDK07KJfp1d+izWPrzEJDcSqBa0OZQriA==",
       "dev": true,
+      "license": "ISC",
       "dependencies": {
         "glob": "^7.1.3"
       },
@@ -4413,13 +3500,11 @@
     },
     "node_modules/brorand": {
       "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/brorand/-/brorand-1.1.0.tgz",
-      "integrity": "sha512-cKV8tMCEpQs4hK/ik71d6LrPOnpkpGBR0wzxqr68g2m/LB2GxVYQroAjMJZRVM1Y4BCjCKc3vAamxSzOY2RP+w=="
+      "license": "MIT"
     },
     "node_modules/browserify-aes": {
       "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/browserify-aes/-/browserify-aes-1.2.0.tgz",
-      "integrity": "sha512-+7CHXqGuspUn/Sl5aO7Ea0xWGAtETPXNSAjHo48JfLdPWcMng33Xe4znFvQweqc/uzk5zSOI3H52CYnjCfb5hA==",
+      "license": "MIT",
       "dependencies": {
         "buffer-xor": "^1.0.3",
         "cipher-base": "^1.0.0",
@@ -4431,8 +3516,7 @@
     },
     "node_modules/browserify-cipher": {
       "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/browserify-cipher/-/browserify-cipher-1.0.1.tgz",
-      "integrity": "sha512-sPhkz0ARKbf4rRQt2hTpAHqn47X3llLkUGn+xEJzLjwY8LRs2p0v7ljvI5EyoRO/mexrNunNECisZs+gw2zz1w==",
+      "license": "MIT",
       "dependencies": {
         "browserify-aes": "^1.0.4",
         "browserify-des": "^1.0.0",
@@ -4441,8 +3525,7 @@
     },
     "node_modules/browserify-des": {
       "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/browserify-des/-/browserify-des-1.0.2.tgz",
-      "integrity": "sha512-BioO1xf3hFwz4kc6iBhI3ieDFompMhrMlnDFC4/0/vd5MokpuAc3R+LYbwTA9A5Yc9pq9UYPqffKpW2ObuwX5A==",
+      "license": "MIT",
       "dependencies": {
         "cipher-base": "^1.0.1",
         "des.js": "^1.0.0",
@@ -4452,8 +3535,7 @@
     },
     "node_modules/browserify-rsa": {
       "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/browserify-rsa/-/browserify-rsa-4.1.0.tgz",
-      "integrity": "sha512-AdEER0Hkspgno2aR97SAf6vi0y0k8NuOpGnVH3O99rcA5Q6sh8QxcngtHuJ6uXwnfAXNM4Gn1Gb7/MV1+Ymbog==",
+      "license": "MIT",
       "dependencies": {
         "bn.js": "^5.0.0",
         "randombytes": "^2.0.1"
@@ -4461,8 +3543,7 @@
     },
     "node_modules/browserify-sign": {
       "version": "4.2.2",
-      "resolved": "https://registry.npmjs.org/browserify-sign/-/browserify-sign-4.2.2.tgz",
-      "integrity": "sha512-1rudGyeYY42Dk6texmv7c4VcQ0EsvVbLwZkA+AQB7SxvXxmcD93jcHie8bzecJ+ChDlmAm2Qyu0+Ccg5uhZXCg==",
+      "license": "ISC",
       "dependencies": {
         "bn.js": "^5.2.1",
         "browserify-rsa": "^4.1.0",
@@ -4480,8 +3561,6 @@
     },
     "node_modules/browserslist": {
       "version": "4.22.1",
-      "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.22.1.tgz",
-      "integrity": "sha512-FEVc202+2iuClEhZhrWy6ZiAcRLvNMyYcxZ8raemul1DYVOVdFsbqckWLdsixQZCpJlwe77Z3UTalE7jsjnKfQ==",
       "funding": [
         {
           "type": "opencollective",
@@ -4496,6 +3575,7 @@
           "url": "https://github.com/sponsors/ai"
         }
       ],
+      "license": "MIT",
       "dependencies": {
         "caniuse-lite": "^1.0.30001541",
         "electron-to-chromium": "^1.4.535",
@@ -4511,8 +3591,7 @@
     },
     "node_modules/bs58": {
       "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/bs58/-/bs58-5.0.0.tgz",
-      "integrity": "sha512-r+ihvQJvahgYT50JD05dyJNKlmmSlMoOGwn1lCcEzanPglg7TxYjioQUYehQ9mAR/+hOSd2jRc/Z2y5UxBymvQ==",
+      "license": "MIT",
       "dependencies": {
         "base-x": "^4.0.0"
       }
@@ -4528,8 +3607,6 @@
     },
     "node_modules/buffer": {
       "version": "6.0.3",
-      "resolved": "https://registry.npmjs.org/buffer/-/buffer-6.0.3.tgz",
-      "integrity": "sha512-FTiCpNxtwiZZHEZbcbTIcZjERVICn9yq/pDFkTl95/AxzD1naBctN7YO68riM/gLSDY7sdrMby8hofADYuuqOA==",
       "funding": [
         {
           "type": "github",
@@ -4544,6 +3621,7 @@
           "url": "https://feross.org/support"
         }
       ],
+      "license": "MIT",
       "dependencies": {
         "base64-js": "^1.3.1",
         "ieee754": "^1.2.1"
@@ -4559,28 +3637,24 @@
     },
     "node_modules/buffer-from": {
       "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.2.tgz",
-      "integrity": "sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/buffer-xor": {
       "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/buffer-xor/-/buffer-xor-1.0.3.tgz",
-      "integrity": "sha512-571s0T7nZWK6vB67HI5dyUF7wXiNcfaPPPTl6zYCNApANjIvYJTg7hlud/+cJpdAhS7dVzqMLmfhfHR3rAcOjQ=="
+      "license": "MIT"
     },
     "node_modules/bytes": {
       "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.0.0.tgz",
-      "integrity": "sha512-pMhOfFDPiv9t5jjIXkHosWmkSyQbvsgEVNkz0ERHbuLh2T/7j4Mqqpz523Fe8MVY89KC6Sh/QfS2sM+SjgFDcw==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">= 0.8"
       }
     },
     "node_modules/c32check": {
       "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/c32check/-/c32check-2.0.0.tgz",
-      "integrity": "sha512-rpwfAcS/CMqo0oCqDf3r9eeLgScRE3l/xHDCXhM3UyrfvIn7PrLq63uHh7yYbv8NzaZn5MVsVhIRpQ+5GZ5HyA==",
+      "license": "MIT",
       "dependencies": {
         "@noble/hashes": "^1.1.2",
         "base-x": "^4.0.0"
@@ -4591,17 +3665,15 @@
     },
     "node_modules/cac": {
       "version": "6.7.14",
-      "resolved": "https://registry.npmjs.org/cac/-/cac-6.7.14.tgz",
-      "integrity": "sha512-b6Ilus+c3RrdDk+JhLKUAQfzzgLEPy6wcXqS7f/xe1EETvsDP6GORG7SFuOs6cID5YkqchW/LXZbX5bc8j7ZcQ==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=8"
       }
     },
     "node_modules/call-bind": {
       "version": "1.0.7",
-      "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.7.tgz",
-      "integrity": "sha512-GHTSNSYICQ7scH7sZ+M2rFopRoLh8t2bLSW6BbgrtLsahOIB5iyAVJf9GjWK3cYTDaMj4XdBpM1cA6pIS0Kv2w==",
+      "license": "MIT",
       "dependencies": {
         "es-define-property": "^1.0.0",
         "es-errors": "^1.3.0",
@@ -4618,18 +3690,16 @@
     },
     "node_modules/callsites": {
       "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz",
-      "integrity": "sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=6"
       }
     },
     "node_modules/camel-case": {
       "version": "4.1.2",
-      "resolved": "https://registry.npmjs.org/camel-case/-/camel-case-4.1.2.tgz",
-      "integrity": "sha512-gxGWBrTT1JuMx6R+o5PTXMmUnhnVzLQ9SNutD4YqKtI6ap897t3tKECYla6gCWEkplXnlNybEkZg9GEGxKFCgw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "pascal-case": "^3.1.2",
         "tslib": "^2.0.3"
@@ -4637,16 +3707,13 @@
     },
     "node_modules/camelize": {
       "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/camelize/-/camelize-1.0.1.tgz",
-      "integrity": "sha512-dU+Tx2fsypxTgtLoE36npi3UqcjSSMNYfkqgmoEhtZrraP5VWq0K7FkWVTYa8eMPtnU/G2txVsfdCJTn9uzpuQ==",
+      "license": "MIT",
       "funding": {
         "url": "https://github.com/sponsors/ljharb"
       }
     },
     "node_modules/caniuse-lite": {
       "version": "1.0.30001559",
-      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001559.tgz",
-      "integrity": "sha512-cPiMKZgqgkg5LY3/ntGeLFUpi6tzddBNS58A4tnTgQw1zON7u2sZMU7SzOeVH4tj20++9ggL+V6FDOFMTaFFYA==",
       "funding": [
         {
           "type": "opencollective",
@@ -4660,13 +3727,13 @@
           "type": "github",
           "url": "https://github.com/sponsors/ai"
         }
-      ]
+      ],
+      "license": "CC-BY-4.0"
     },
     "node_modules/chai": {
       "version": "4.3.10",
-      "resolved": "https://registry.npmjs.org/chai/-/chai-4.3.10.tgz",
-      "integrity": "sha512-0UXG04VuVbruMUYbJ6JctvH0YnC/4q3/AkT18q4NaITo91CUm0liMS9VqzT9vZhVQ/1eqPanMWjBM+Juhfb/9g==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "assertion-error": "^1.1.0",
         "check-error": "^1.0.3",
@@ -4682,8 +3749,7 @@
     },
     "node_modules/chalk": {
       "version": "2.4.2",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
-      "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
+      "license": "MIT",
       "dependencies": {
         "ansi-styles": "^3.2.1",
         "escape-string-regexp": "^1.0.5",
@@ -4695,9 +3761,8 @@
     },
     "node_modules/check-error": {
       "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/check-error/-/check-error-1.0.3.tgz",
-      "integrity": "sha512-iKEoDYaRmd1mxM90a2OEfWhjsjPpYPuQ+lMYsoxB126+t8fw7ySEO48nmDg5COTjxDI65/Y2OWpeEHk3ZOe8zg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "get-func-name": "^2.0.2"
       },
@@ -4707,8 +3772,6 @@
     },
     "node_modules/chokidar": {
       "version": "3.5.3",
-      "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.5.3.tgz",
-      "integrity": "sha512-Dr3sfKRP6oTcjf2JmUmFJfeVMvXBdegxB0iVQ5eb2V10uFJUCAS8OByZdVAyVb8xXNz3GjjTgj9kLWsZTqE6kw==",
       "dev": true,
       "funding": [
         {
@@ -4716,6 +3779,7 @@
           "url": "https://paulmillr.com/funding/"
         }
       ],
+      "license": "MIT",
       "dependencies": {
         "anymatch": "~3.1.2",
         "braces": "~3.0.2",
@@ -4734,9 +3798,8 @@
     },
     "node_modules/chokidar/node_modules/glob-parent": {
       "version": "5.1.2",
-      "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz",
-      "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==",
       "dev": true,
+      "license": "ISC",
       "dependencies": {
         "is-glob": "^4.0.1"
       },
@@ -4746,17 +3809,15 @@
     },
     "node_modules/chrome-trace-event": {
       "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/chrome-trace-event/-/chrome-trace-event-1.0.3.tgz",
-      "integrity": "sha512-p3KULyQg4S7NIHixdwbGX+nFHkoBiA4YQmyWtjb8XngSKV124nJmRysgAeujbUVb15vh+RvFUfCPqU7rXk+hZg==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=6.0"
       }
     },
     "node_modules/cipher-base": {
       "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/cipher-base/-/cipher-base-1.0.4.tgz",
-      "integrity": "sha512-Kkht5ye6ZGmwv40uUDZztayT2ThLQGfnj/T71N/XzeZeo3nf8foyW7zGTsPYkEya3m5f3cAypH+qe7YOrM1U2Q==",
+      "license": "MIT",
       "dependencies": {
         "inherits": "^2.0.1",
         "safe-buffer": "^5.0.1"
@@ -4764,8 +3825,7 @@
     },
     "node_modules/clarity-codegen": {
       "version": "0.3.6",
-      "resolved": "https://registry.npmjs.org/clarity-codegen/-/clarity-codegen-0.3.6.tgz",
-      "integrity": "sha512-Be1J8RFtPFGfWtQ/7enl3xkU1j2KkIS9W7RbuofIVYfKp11MCZSGQeNV+Gh0dQOQIs3O0WQLLg03ikyNaWtYzQ==",
+      "license": "MIT",
       "dependencies": {
         "@stacks/stacks-blockchain-api-types": "^7.1.10",
         "axios": "^1.5.0",
@@ -4782,19 +3842,16 @@
     },
     "node_modules/clarity-codegen/node_modules/@stacks/stacks-blockchain-api-types": {
       "version": "7.9.0",
-      "resolved": "https://registry.npmjs.org/@stacks/stacks-blockchain-api-types/-/stacks-blockchain-api-types-7.9.0.tgz",
-      "integrity": "sha512-29tcIOxEj0jIAVrMLH2hDuTM0wWtOT4z9EnNgOCEQvipEDPyvoaPjbYJmQUTxzvVjfoLjZAQsvTlJw7fnbkkrg=="
+      "license": "ISC"
     },
     "node_modules/classnames": {
       "version": "2.3.2",
-      "resolved": "https://registry.npmjs.org/classnames/-/classnames-2.3.2.tgz",
-      "integrity": "sha512-CSbhY4cFEJRe6/GQzIk5qXZ4Jeg5pcsP7b5peFSDpffpe1cqjASH/n9UTjBwOp6XpMSTwQ8Za2K5V02ueA7Tmw=="
+      "license": "MIT"
     },
     "node_modules/clean-css": {
       "version": "5.3.2",
-      "resolved": "https://registry.npmjs.org/clean-css/-/clean-css-5.3.2.tgz",
-      "integrity": "sha512-JVJbM+f3d3Q704rF4bqQ5UUyTtuJ0JRKNbTKVEeujCCBoMdkEi+V+e8oktO9qGQNSvHrFTM6JZRXrUvGR1czww==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "source-map": "~0.6.0"
       },
@@ -4804,27 +3861,24 @@
     },
     "node_modules/clean-css/node_modules/source-map": {
       "version": "0.6.1",
-      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
       "dev": true,
+      "license": "BSD-3-Clause",
       "engines": {
         "node": ">=0.10.0"
       }
     },
     "node_modules/clean-stack": {
       "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/clean-stack/-/clean-stack-2.2.0.tgz",
-      "integrity": "sha512-4diC9HaTE+KRAMWhDhrGOECgWZxoevMc5TlkObMqNSsVU62PYzXZ/SMTjzyGAFF1YusgxGcSWTEXBhp0CPwQ1A==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=6"
       }
     },
     "node_modules/clean-webpack-plugin": {
       "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/clean-webpack-plugin/-/clean-webpack-plugin-4.0.0.tgz",
-      "integrity": "sha512-WuWE1nyTNAyW5T7oNyys2EN0cfP2fdRxhxnIQWiAp0bMabPdHhoGxM8A6YL2GhqwgrPnnaemVE7nv5XJ2Fhh2w==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "del": "^4.1.1"
       },
@@ -4837,9 +3891,8 @@
     },
     "node_modules/cli-cursor": {
       "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-3.1.0.tgz",
-      "integrity": "sha512-I/zHAwsKf9FqGoXM4WWRACob9+SNukZTd94DWF57E4toouRulbCxcUh6RKUEOQlYTHJnzkPMySvPNaaSLNfLZw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "restore-cursor": "^3.1.0"
       },
@@ -4849,9 +3902,8 @@
     },
     "node_modules/cli-truncate": {
       "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/cli-truncate/-/cli-truncate-3.1.0.tgz",
-      "integrity": "sha512-wfOBkjXteqSnI59oPcJkcPl/ZmwvMMOj340qUIY1SKZCv0B9Cf4D4fAucRkIKQmsIuYK3x1rrgU7MeGRruiuiA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "slice-ansi": "^5.0.0",
         "string-width": "^5.0.0"
@@ -4865,8 +3917,7 @@
     },
     "node_modules/cliui": {
       "version": "8.0.1",
-      "resolved": "https://registry.npmjs.org/cliui/-/cliui-8.0.1.tgz",
-      "integrity": "sha512-BSeNnyus75C4//NQ9gQt1/csTXyo/8Sb+afLAkzAptFuMsod9HFokGNudZpi/oQV73hnVK+sR+5PVRMd+Dr7YQ==",
+      "license": "ISC",
       "dependencies": {
         "string-width": "^4.2.0",
         "strip-ansi": "^6.0.1",
@@ -4878,21 +3929,18 @@
     },
     "node_modules/cliui/node_modules/emoji-regex": {
       "version": "8.0.0",
-      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
-      "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A=="
+      "license": "MIT"
     },
     "node_modules/cliui/node_modules/is-fullwidth-code-point": {
       "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
-      "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
+      "license": "MIT",
       "engines": {
         "node": ">=8"
       }
     },
     "node_modules/cliui/node_modules/string-width": {
       "version": "4.2.3",
-      "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
-      "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
+      "license": "MIT",
       "dependencies": {
         "emoji-regex": "^8.0.0",
         "is-fullwidth-code-point": "^3.0.0",
@@ -4904,9 +3952,8 @@
     },
     "node_modules/clone": {
       "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/clone/-/clone-1.0.4.tgz",
-      "integrity": "sha512-JQHZ2QMW6l3aH/j6xCqQThY/9OH4D/9ls34cgkUBiEeocRTU04tHfKPBsUK1PqZCUQM7GiA0IIXJSuXHI64Kbg==",
       "dev": true,
+      "license": "MIT",
       "optional": true,
       "engines": {
         "node": ">=0.8"
@@ -4914,40 +3961,34 @@
     },
     "node_modules/clsx": {
       "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/clsx/-/clsx-2.0.0.tgz",
-      "integrity": "sha512-rQ1+kcj+ttHG0MKVGBUXwayCCF1oh39BF5COIpRzuCEv8Mwjv0XucrI2ExNTOn9IlLifGClWQcU9BrZORvtw6Q==",
+      "license": "MIT",
       "engines": {
         "node": ">=6"
       }
     },
     "node_modules/color-convert": {
       "version": "1.9.3",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
-      "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
+      "license": "MIT",
       "dependencies": {
         "color-name": "1.1.3"
       }
     },
     "node_modules/color-name": {
       "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
-      "integrity": "sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw=="
+      "license": "MIT"
     },
     "node_modules/colorette": {
       "version": "2.0.20",
-      "resolved": "https://registry.npmjs.org/colorette/-/colorette-2.0.20.tgz",
-      "integrity": "sha512-IfEDxwoWIjkeXL1eXcDiow4UbKjhLdq6/EuSVR9GMN7KVH3r9gQ83e73hsz1Nd1T3ijd5xv1wcWRYO+D6kCI2w==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/colornames": {
       "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/colornames/-/colornames-1.1.1.tgz",
-      "integrity": "sha512-/pyV40IrsdulWv+wFPmERh9k/mjsPZ64yUMDmWrtj/k1nmgrzzIENWKdaVKyBbvFdQWqkcaRxr+polCo3VMe7A=="
+      "license": "MIT"
     },
     "node_modules/combined-stream": {
       "version": "1.0.8",
-      "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz",
-      "integrity": "sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==",
+      "license": "MIT",
       "dependencies": {
         "delayed-stream": "~1.0.0"
       },
@@ -4957,33 +3998,29 @@
     },
     "node_modules/commander": {
       "version": "10.0.1",
-      "resolved": "https://registry.npmjs.org/commander/-/commander-10.0.1.tgz",
-      "integrity": "sha512-y4Mg2tXshplEbSGzx7amzPwKKOCGuoSRP/CjEdwwk0FOGlUbq6lKuoyDZTNZkmxHdJtp54hdfY/JUrdL7Xfdug==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=14"
       }
     },
     "node_modules/common-path-prefix": {
       "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/common-path-prefix/-/common-path-prefix-3.0.0.tgz",
-      "integrity": "sha512-QE33hToZseCH3jS0qN96O/bSh3kaw/h+Tq7ngyY9eWDUnTlTNUyqfqvCXioLe5Na5jFsL78ra/wuBU4iuEgd4w==",
-      "dev": true
+      "dev": true,
+      "license": "ISC"
     },
     "node_modules/compose-function": {
       "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/compose-function/-/compose-function-3.0.3.tgz",
-      "integrity": "sha512-xzhzTJ5eC+gmIzvZq+C3kCJHsp9os6tJkrigDRZclyGtOKINbZtE8n1Tzmeh32jW+BUDPbvZpibwvJHBLGMVwg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "arity-n": "^1.0.4"
       }
     },
     "node_modules/compressible": {
       "version": "2.0.18",
-      "resolved": "https://registry.npmjs.org/compressible/-/compressible-2.0.18.tgz",
-      "integrity": "sha512-AF3r7P5dWxL8MxyITRMlORQNaOA2IkAFaTr4k7BUumjPtRpGDTZpl0Pb1XCO6JeDCBdp126Cgs9sMxqSjgYyRg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "mime-db": ">= 1.43.0 < 2"
       },
@@ -4993,9 +4030,8 @@
     },
     "node_modules/compression": {
       "version": "1.7.4",
-      "resolved": "https://registry.npmjs.org/compression/-/compression-1.7.4.tgz",
-      "integrity": "sha512-jaSIDzP9pZVS4ZfQ+TzvtiWhdpFhE2RDHz8QJkpX9SIpLq88VueF5jJw6t+6CUQcAoA6t+x89MLrWAqpfDE8iQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "accepts": "~1.3.5",
         "bytes": "3.0.0",
@@ -5011,50 +4047,43 @@
     },
     "node_modules/compression/node_modules/debug": {
       "version": "2.6.9",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-      "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "ms": "2.0.0"
       }
     },
     "node_modules/compression/node_modules/ms": {
       "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-      "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/compression/node_modules/safe-buffer": {
       "version": "5.1.2",
-      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
-      "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/concat-map": {
       "version": "0.0.1",
-      "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
-      "integrity": "sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg=="
+      "license": "MIT"
     },
     "node_modules/confusing-browser-globals": {
       "version": "1.0.11",
-      "resolved": "https://registry.npmjs.org/confusing-browser-globals/-/confusing-browser-globals-1.0.11.tgz",
-      "integrity": "sha512-JsPKdmh8ZkmnHxDk55FZ1TqVLvEQTvoByJZRN9jzI0UjxK/QgAmsphz7PGtqgPieQZ/CQcHWXCR7ATDNhGe+YA==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/connect-history-api-fallback": {
       "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/connect-history-api-fallback/-/connect-history-api-fallback-2.0.0.tgz",
-      "integrity": "sha512-U73+6lQFmfiNPrYbXqr6kZ1i1wiRqXnp2nhMsINseWXO8lDau0LGEffJ8kQi4EjLZympVgRdvqjAgiZ1tgzDDA==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=0.8"
       }
     },
     "node_modules/content-disposition": {
       "version": "0.5.4",
-      "resolved": "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.4.tgz",
-      "integrity": "sha512-FveZTNuGw04cxlAiWbzi6zTAL/lhehaWbTtgluJh4/E95DqMwTmha3KZN1aAWA8cFIhHzMZUvLevkw5Rqk+tSQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "safe-buffer": "5.2.1"
       },
@@ -5064,32 +4093,28 @@
     },
     "node_modules/content-type": {
       "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/content-type/-/content-type-1.0.5.tgz",
-      "integrity": "sha512-nTjqfcBFEipKdXCv4YDQWCfmcLZKm81ldF0pAopTvyrFGVbcR6P/VAAd5G7N+0tTr8QqiU0tFadD6FK4NtJwOA==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">= 0.6"
       }
     },
     "node_modules/cookie": {
       "version": "0.5.0",
-      "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.5.0.tgz",
-      "integrity": "sha512-YZ3GUyn/o8gfKJlnlX7g7xq4gyO6OSuhGPKaaGssGB2qgDUS0gPgtTvoyZLTt9Ab6dC4hfc9dV5arkvc/OCmrw==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">= 0.6"
       }
     },
     "node_modules/cookie-signature": {
       "version": "1.0.6",
-      "resolved": "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.6.tgz",
-      "integrity": "sha512-QADzlaHc8icV8I7vbaJXJwod9HWYp8uCqf1xa4OfNu1T7JVxQIrUgOWtHdNDtPiywmFbiS12VjotIXLrKM3orQ==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/copy-anything": {
       "version": "3.0.5",
-      "resolved": "https://registry.npmjs.org/copy-anything/-/copy-anything-3.0.5.tgz",
-      "integrity": "sha512-yCEafptTtb4bk7GLEQoM8KVJpxAfdBJYaXyzQEgQQQgYrZiDp8SJmGKlYza6CYjEDNstAdNdKA3UuoULlEbS6w==",
+      "license": "MIT",
       "dependencies": {
         "is-what": "^4.1.8"
       },
@@ -5102,9 +4127,8 @@
     },
     "node_modules/copy-webpack-plugin": {
       "version": "11.0.0",
-      "resolved": "https://registry.npmjs.org/copy-webpack-plugin/-/copy-webpack-plugin-11.0.0.tgz",
-      "integrity": "sha512-fX2MWpamkW0hZxMEg0+mYnA40LTosOSa5TqZ9GYIBzyJa9C3QUaMPSE2xAi/buNr8u89SfD9wHSQVBzrRa/SOQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "fast-glob": "^3.2.11",
         "glob-parent": "^6.0.1",
@@ -5126,9 +4150,8 @@
     },
     "node_modules/copy-webpack-plugin/node_modules/ajv": {
       "version": "8.12.0",
-      "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.12.0.tgz",
-      "integrity": "sha512-sRu1kpcO9yLtYxBKvqfTeh9KzZEwO3STyX1HT+4CaDzC6HpTGYhIhPIzj9XuKU7KYDwnaeh5hcOwjy1QuJzBPA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "fast-deep-equal": "^3.1.1",
         "json-schema-traverse": "^1.0.0",
@@ -5142,9 +4165,8 @@
     },
     "node_modules/copy-webpack-plugin/node_modules/ajv-keywords": {
       "version": "5.1.0",
-      "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-5.1.0.tgz",
-      "integrity": "sha512-YCS/JNFAUyr5vAuhk1DWm1CBxRHW9LbJ2ozWeemrIqpbsqKjHVxYPyi5GC0rjZIT5JxJ3virVTS8wk4i/Z+krw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "fast-deep-equal": "^3.1.3"
       },
@@ -5154,9 +4176,8 @@
     },
     "node_modules/copy-webpack-plugin/node_modules/globby": {
       "version": "13.2.2",
-      "resolved": "https://registry.npmjs.org/globby/-/globby-13.2.2.tgz",
-      "integrity": "sha512-Y1zNGV+pzQdh7H39l9zgB4PJqjRNqydvdYCDG4HFXM4XuvSaQQlEc91IU1yALL8gUTDomgBAfz3XJdmUS+oo0w==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "dir-glob": "^3.0.1",
         "fast-glob": "^3.3.0",
@@ -5173,15 +4194,13 @@
     },
     "node_modules/copy-webpack-plugin/node_modules/json-schema-traverse": {
       "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz",
-      "integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/copy-webpack-plugin/node_modules/schema-utils": {
       "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-4.2.0.tgz",
-      "integrity": "sha512-L0jRsrPpjdckP3oPug3/VxNKt2trR8TcabrM6FOAAlvC/9Phcmm+cuAgTlxBqdBR1WJx7Naj9WHw+aOmheSVbw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@types/json-schema": "^7.0.9",
         "ajv": "^8.9.0",
@@ -5198,9 +4217,8 @@
     },
     "node_modules/copy-webpack-plugin/node_modules/slash": {
       "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/slash/-/slash-4.0.0.tgz",
-      "integrity": "sha512-3dOsAHXXUkQTpOYcoAxLIorMTp4gIQr5IW3iVb7A7lFIp0VHhnynm9izx6TssdrIcVIESAlVjtnO2K8bg+Coew==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=12"
       },
@@ -5210,17 +4228,14 @@
     },
     "node_modules/core-js": {
       "version": "2.6.12",
-      "resolved": "https://registry.npmjs.org/core-js/-/core-js-2.6.12.tgz",
-      "integrity": "sha512-Kb2wC0fvsWfQrgk8HU5lW6U/Lcs8+9aaYcy4ZFc6DDlo4nZ7n70dEgE5rtR0oG6ufKDUnrwfWL1mXR5ljDatrQ==",
-      "deprecated": "core-js@<3.23.3 is no longer maintained and not recommended for usage due to the number of issues. Because of the V8 engine whims, feature detection in old core-js versions could cause a slowdown up to 100x even if nothing is polyfilled. Some versions have web compatibility issues. Please, upgrade your dependencies to the actual version of core-js.",
-      "hasInstallScript": true
+      "hasInstallScript": true,
+      "license": "MIT"
     },
     "node_modules/core-js-pure": {
       "version": "3.32.0",
-      "resolved": "https://registry.npmjs.org/core-js-pure/-/core-js-pure-3.32.0.tgz",
-      "integrity": "sha512-qsev1H+dTNYpDUEURRuOXMvpdtAnNEvQWS/FMJ2Vb5AY8ZP4rAPQldkE27joykZPJTe0+IVgHZYh1P5Xu1/i1g==",
       "dev": true,
       "hasInstallScript": true,
+      "license": "MIT",
       "funding": {
         "type": "opencollective",
         "url": "https://opencollective.com/core-js"
@@ -5228,14 +4243,12 @@
     },
     "node_modules/core-util-is": {
       "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.3.tgz",
-      "integrity": "sha512-ZQBvi1DcpJ4GDqanjucZ2Hj3wEO5pZDS89BWbkcrvdxksJorwUDDZamX9ldFkp9aw2lmBDLgkObEA4DWNJ9FYQ==",
-      "dev": true
-    },
+      "dev": true,
+      "license": "MIT"
+    },
     "node_modules/create-ecdh": {
       "version": "4.0.4",
-      "resolved": "https://registry.npmjs.org/create-ecdh/-/create-ecdh-4.0.4.tgz",
-      "integrity": "sha512-mf+TCx8wWc9VpuxfP2ht0iSISLZnt0JgWlrOKZiNqyUZWnjIaCIVNQArMHnCZKfEYRg6IM7A+NeJoN8gf/Ws0A==",
+      "license": "MIT",
       "dependencies": {
         "bn.js": "^4.1.0",
         "elliptic": "^6.5.3"
@@ -5243,13 +4256,11 @@
     },
     "node_modules/create-ecdh/node_modules/bn.js": {
       "version": "4.12.0",
-      "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.0.tgz",
-      "integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA=="
+      "license": "MIT"
     },
     "node_modules/create-hash": {
       "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/create-hash/-/create-hash-1.2.0.tgz",
-      "integrity": "sha512-z00bCGNHDG8mHAkP7CtT1qVu+bFQUPjYq/4Iv3C3kWjTFV10zIjfSoeqXo9Asws8gwSHDGj/hl2u4OGIjapeCg==",
+      "license": "MIT",
       "dependencies": {
         "cipher-base": "^1.0.1",
         "inherits": "^2.0.1",
@@ -5260,8 +4271,7 @@
     },
     "node_modules/create-hmac": {
       "version": "1.1.7",
-      "resolved": "https://registry.npmjs.org/create-hmac/-/create-hmac-1.1.7.tgz",
-      "integrity": "sha512-MJG9liiZ+ogc4TzUwuvbER1JRdgvUFSB5+VR/g5h82fGaIRWMWddtKBHi7/sVhfjQZ6SehlyhvQYrcYkaUIpLg==",
+      "license": "MIT",
       "dependencies": {
         "cipher-base": "^1.0.3",
         "create-hash": "^1.1.0",
@@ -5273,8 +4283,7 @@
     },
     "node_modules/cross-fetch": {
       "version": "3.1.8",
-      "resolved": "https://registry.npmjs.org/cross-fetch/-/cross-fetch-3.1.8.tgz",
-      "integrity": "sha512-cvA+JwZoU0Xq+h6WkMvAUqPEYy92Obet6UdKLfW60qn99ftItKjB5T+BkyWOFWe2pUyfQ+IJHmpOTznqk1M6Kg==",
+      "license": "MIT",
       "dependencies": {
         "node-fetch": "^2.6.12"
       }
@@ -5289,9 +4298,8 @@
     },
     "node_modules/cross-spawn": {
       "version": "7.0.3",
-      "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz",
-      "integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "path-key": "^3.1.0",
         "shebang-command": "^2.0.0",
@@ -5303,8 +4311,7 @@
     },
     "node_modules/crypto-browserify": {
       "version": "3.12.0",
-      "resolved": "https://registry.npmjs.org/crypto-browserify/-/crypto-browserify-3.12.0.tgz",
-      "integrity": "sha512-fz4spIh+znjO2VjL+IdhEpRJ3YN6sMzITSBijk6FK2UvTqruSQW+/cCZTSNsMiZNvUeq0CqurF+dAbyiGOY6Wg==",
+      "license": "MIT",
       "dependencies": {
         "browserify-cipher": "^1.0.0",
         "browserify-sign": "^4.0.0",
@@ -5324,17 +4331,15 @@
     },
     "node_modules/css-color-keywords": {
       "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/css-color-keywords/-/css-color-keywords-1.0.0.tgz",
-      "integrity": "sha512-FyyrDHZKEjXDpNJYvVsV960FiqQyXc/LlYmsxl2BcdMb2WPx0OGRVgTg55rPSyLSNMqP52R9r8geSp7apN3Ofg==",
+      "license": "ISC",
       "engines": {
         "node": ">=4"
       }
     },
     "node_modules/css-loader": {
       "version": "6.8.1",
-      "resolved": "https://registry.npmjs.org/css-loader/-/css-loader-6.8.1.tgz",
-      "integrity": "sha512-xDAXtEVGlD0gJ07iclwWVkLoZOpEvAWaSyf6W18S2pOC//K8+qUDIx8IIT3D+HjnmkJPQeesOPv5aiUaJsCM2g==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "icss-utils": "^5.1.0",
         "postcss": "^8.4.21",
@@ -5358,9 +4363,8 @@
     },
     "node_modules/css-loader/node_modules/lru-cache": {
       "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
-      "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
       "dev": true,
+      "license": "ISC",
       "dependencies": {
         "yallist": "^4.0.0"
       },
@@ -5370,9 +4374,8 @@
     },
     "node_modules/css-loader/node_modules/semver": {
       "version": "7.5.4",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz",
-      "integrity": "sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==",
       "dev": true,
+      "license": "ISC",
       "dependencies": {
         "lru-cache": "^6.0.0"
       },
@@ -5385,15 +4388,13 @@
     },
     "node_modules/css-loader/node_modules/yallist": {
       "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
-      "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==",
-      "dev": true
+      "dev": true,
+      "license": "ISC"
     },
     "node_modules/css-select": {
       "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/css-select/-/css-select-4.3.0.tgz",
-      "integrity": "sha512-wPpOYtnsVontu2mODhA19JrqWxNsfdatRKd64kmpRbQgh1KtItko5sTnEpPdpSaJszTOhEMlF/RPz28qj4HqhQ==",
       "dev": true,
+      "license": "BSD-2-Clause",
       "dependencies": {
         "boolbase": "^1.0.0",
         "css-what": "^6.0.1",
@@ -5407,8 +4408,7 @@
     },
     "node_modules/css-to-react-native": {
       "version": "3.2.0",
-      "resolved": "https://registry.npmjs.org/css-to-react-native/-/css-to-react-native-3.2.0.tgz",
-      "integrity": "sha512-e8RKaLXMOFii+02mOlqwjbD00KSEKqblnpO9e++1aXS1fPQOpS1YoqdVHBqPjHNoxeF2mimzVqawm2KCbEdtHQ==",
+      "license": "MIT",
       "dependencies": {
         "camelize": "^1.0.0",
         "css-color-keywords": "^1.0.0",
@@ -5417,9 +4417,8 @@
     },
     "node_modules/css-what": {
       "version": "6.1.0",
-      "resolved": "https://registry.npmjs.org/css-what/-/css-what-6.1.0.tgz",
-      "integrity": "sha512-HTUrgRJ7r4dsZKU6GjmpfRK1O76h97Z8MfS1G0FozR+oF2kG6Vfe8JE6zwrkbxigziPHinCJ+gCPjA9EaBDtRw==",
       "dev": true,
+      "license": "BSD-2-Clause",
       "engines": {
         "node": ">= 6"
       },
@@ -5429,9 +4428,8 @@
     },
     "node_modules/cssesc": {
       "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/cssesc/-/cssesc-3.0.0.tgz",
-      "integrity": "sha512-/Tb/JcjK111nNScGob5MNtsntNM1aCNUDipB/TkwZFhyDrrE47SOx/18wF2bbjgc3ZzCSKW1T5nt5EbFoAz/Vg==",
       "dev": true,
+      "license": "MIT",
       "bin": {
         "cssesc": "bin/cssesc"
       },
@@ -5441,19 +4439,16 @@
     },
     "node_modules/csstype": {
       "version": "3.1.2",
-      "resolved": "https://registry.npmjs.org/csstype/-/csstype-3.1.2.tgz",
-      "integrity": "sha512-I7K1Uu0MBPzaFKg4nI5Q7Vs2t+3gWWW648spaF+Rg7pI9ds18Ugn+lvg4SHczUdKlHI5LWBXyqfS8+DufyBsgQ=="
+      "license": "MIT"
     },
     "node_modules/damerau-levenshtein": {
       "version": "1.0.8",
-      "resolved": "https://registry.npmjs.org/damerau-levenshtein/-/damerau-levenshtein-1.0.8.tgz",
-      "integrity": "sha512-sdQSFB7+llfUcQHUQO3+B8ERRj0Oa4w9POWMI/puGtuf7gFywGmkaLCElnudfTiKZV+NvHqL0ifzdrI8Ro7ESA==",
-      "dev": true
+      "dev": true,
+      "license": "BSD-2-Clause"
     },
     "node_modules/date-fns": {
       "version": "2.30.0",
-      "resolved": "https://registry.npmjs.org/date-fns/-/date-fns-2.30.0.tgz",
-      "integrity": "sha512-fnULvOpxnC5/Vg3NCiWelDsLiUc9bRwAPs/+LfTLNvetFCtCTN+yQz15C/fs4AwX1R9K5GLtLfn8QW+dWisaAw==",
+      "license": "MIT",
       "dependencies": {
         "@babel/runtime": "^7.21.0"
       },
@@ -5467,8 +4462,7 @@
     },
     "node_modules/debug": {
       "version": "4.3.4",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
-      "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==",
+      "license": "MIT",
       "dependencies": {
         "ms": "2.1.2"
       },
@@ -5483,9 +4477,8 @@
     },
     "node_modules/deep-eql": {
       "version": "4.1.3",
-      "resolved": "https://registry.npmjs.org/deep-eql/-/deep-eql-4.1.3.tgz",
-      "integrity": "sha512-WaEtAOpRA1MQ0eohqZjpGD8zdI0Ovsm8mmFhaDN8dvDZzyoUMcYDnf5Y6iu7HTXxf8JDS23qWa4a+hKCDyOPzw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "type-detect": "^4.0.0"
       },
@@ -5495,9 +4488,8 @@
     },
     "node_modules/deep-equal": {
       "version": "2.2.2",
-      "resolved": "https://registry.npmjs.org/deep-equal/-/deep-equal-2.2.2.tgz",
-      "integrity": "sha512-xjVyBf0w5vH0I42jdAZzOKVldmPgSulmiyPRywoyq7HXC9qdgo17kxJE+rdnif5Tz6+pIrpJI8dCpMNLIGkUiA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "array-buffer-byte-length": "^1.0.0",
         "call-bind": "^1.0.2",
@@ -5524,24 +4516,21 @@
     },
     "node_modules/deep-is": {
       "version": "0.1.4",
-      "resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.4.tgz",
-      "integrity": "sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/deepmerge": {
       "version": "4.3.1",
-      "resolved": "https://registry.npmjs.org/deepmerge/-/deepmerge-4.3.1.tgz",
-      "integrity": "sha512-3sUqbMEc77XqpdNO7FRyRog+eW3ph+GYCbj+rK+uYyRMuwsVy0rMiVtPn+QJlKFvWP/1PYpapqYn0Me2knFn+A==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=0.10.0"
       }
     },
     "node_modules/default-gateway": {
       "version": "6.0.3",
-      "resolved": "https://registry.npmjs.org/default-gateway/-/default-gateway-6.0.3.tgz",
-      "integrity": "sha512-fwSOJsbbNzZ/CUFpqFBqYfYNLj1NbMPm8MMCIzHjC83iSJRBEGmDUxU+WP661BaBQImeC2yHwXtz+P/O9o+XEg==",
       "dev": true,
+      "license": "BSD-2-Clause",
       "dependencies": {
         "execa": "^5.0.0"
       },
@@ -5551,9 +4540,8 @@
     },
     "node_modules/defaults": {
       "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/defaults/-/defaults-1.0.4.tgz",
-      "integrity": "sha512-eFuaLoy/Rxalv2kr+lqMlUnrDWV+3j4pljOIJgLIhI058IQfWJ7vXhyEIHu+HtC738klGALYxOKDO0bQP3tg8A==",
       "dev": true,
+      "license": "MIT",
       "optional": true,
       "dependencies": {
         "clone": "^1.0.2"
@@ -5564,8 +4552,7 @@
     },
     "node_modules/define-data-property": {
       "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/define-data-property/-/define-data-property-1.1.4.tgz",
-      "integrity": "sha512-rBMvIzlpA8v6E+SJZoo++HAYqsLrkg7MSfIinMPFhmkorw7X+dOXVJQs+QT69zGkzMyfDnIMN2Wid1+NbL3T+A==",
+      "license": "MIT",
       "dependencies": {
         "es-define-property": "^1.0.0",
         "es-errors": "^1.3.0",
@@ -5580,18 +4567,16 @@
     },
     "node_modules/define-lazy-prop": {
       "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/define-lazy-prop/-/define-lazy-prop-2.0.0.tgz",
-      "integrity": "sha512-Ds09qNh8yw3khSjiJjiUInaGX9xlqZDY7JVryGxdxV7NPeuqQfplOpQ66yJFZut3jLa5zOwkXw1g9EI2uKh4Og==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=8"
       }
     },
     "node_modules/define-properties": {
       "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.2.0.tgz",
-      "integrity": "sha512-xvqAVKGfT1+UAvPwKTVw/njhdQ8ZhXK4lI0bCIuCMrp2up9nPnaDftrLtmpTazqd1o+UY4zgzU+avtMbDP+ldA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "has-property-descriptors": "^1.0.0",
         "object-keys": "^1.1.1"
@@ -5605,9 +4590,8 @@
     },
     "node_modules/del": {
       "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/del/-/del-4.1.1.tgz",
-      "integrity": "sha512-QwGuEUouP2kVwQenAsOof5Fv8K9t3D8Ca8NxcXKrIpEHjTXK5J2nXLdP+ALI1cgv8wj7KuwBhTwBkOZSJKM5XQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@types/glob": "^7.1.1",
         "globby": "^6.1.0",
@@ -5623,9 +4607,8 @@
     },
     "node_modules/del/node_modules/array-union": {
       "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/array-union/-/array-union-1.0.2.tgz",
-      "integrity": "sha512-Dxr6QJj/RdU/hCaBjOfxW+q6lyuVE6JFWIrAUpuOOhoJJoQ99cUn3igRaHVB5P9WrgFVN0FfArM3x0cueOU8ng==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "array-uniq": "^1.0.1"
       },
@@ -5635,9 +4618,8 @@
     },
     "node_modules/del/node_modules/globby": {
       "version": "6.1.0",
-      "resolved": "https://registry.npmjs.org/globby/-/globby-6.1.0.tgz",
-      "integrity": "sha512-KVbFv2TQtbzCoxAnfD6JcHZTYCzyliEaaeM/gH8qQdkKr5s0OP9scEgvdcngyk7AVdY6YVW/TJHd+lQ/Df3Daw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "array-union": "^1.0.1",
         "glob": "^7.0.3",
@@ -5651,18 +4633,16 @@
     },
     "node_modules/del/node_modules/globby/node_modules/pify": {
       "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
-      "integrity": "sha512-udgsAY+fTnvv7kI7aaxbqwWNb0AHiB0qBO89PZKPkoTmGOgdbrHDKD+0B2X4uTfJ/FT1R09r9gTsjUjNJotuog==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=0.10.0"
       }
     },
     "node_modules/del/node_modules/rimraf": {
       "version": "2.7.1",
-      "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz",
-      "integrity": "sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==",
       "dev": true,
+      "license": "ISC",
       "dependencies": {
         "glob": "^7.1.3"
       },
@@ -5672,34 +4652,30 @@
     },
     "node_modules/delayed-stream": {
       "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz",
-      "integrity": "sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ==",
+      "license": "MIT",
       "engines": {
         "node": ">=0.4.0"
       }
     },
     "node_modules/depd": {
       "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/depd/-/depd-2.0.0.tgz",
-      "integrity": "sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">= 0.8"
       }
     },
     "node_modules/dequal": {
       "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/dequal/-/dequal-2.0.3.tgz",
-      "integrity": "sha512-0je+qPKHEMohvfRTCEo3CrPG6cAzAYgmzKyxRiYSSDkS6eGJdyVJm7WaYA5ECaAD9wLB2T4EEeymA5aFVcYXCA==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=6"
       }
     },
     "node_modules/des.js": {
       "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/des.js/-/des.js-1.1.0.tgz",
-      "integrity": "sha512-r17GxjhUCjSRy8aiJpr8/UadFIzMzJGexI3Nmz4ADi9LYSFx4gTBp80+NaX/YsXWWLhpZ7v/v/ubEc/bCNfKwg==",
+      "license": "MIT",
       "dependencies": {
         "inherits": "^2.0.1",
         "minimalistic-assert": "^1.0.0"
@@ -5707,9 +4683,8 @@
     },
     "node_modules/destroy": {
       "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/destroy/-/destroy-1.2.0.tgz",
-      "integrity": "sha512-2sJGJTaXIIaR1w4iJSNoN0hnMY7Gpc/n8D4qSCJw8QqFWXf7cuAgnEHxBpweaVcPevC2l3KpjYCx3NypQQgaJg==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">= 0.8",
         "npm": "1.2.8000 || >= 1.4.16"
@@ -5717,13 +4692,11 @@
     },
     "node_modules/detect-node": {
       "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/detect-node/-/detect-node-2.1.0.tgz",
-      "integrity": "sha512-T0NIuQpnTvFDATNuHN5roPwSBG83rFsuO+MXXH9/3N1eFbn4wcPjttvjMLEPWJ0RGUYgQE7cGgS3tNxbqCGM7g=="
+      "license": "MIT"
     },
     "node_modules/diffie-hellman": {
       "version": "5.0.3",
-      "resolved": "https://registry.npmjs.org/diffie-hellman/-/diffie-hellman-5.0.3.tgz",
-      "integrity": "sha512-kqag/Nl+f3GwyK25fhUMYj81BUOrZ9IuJsjIcDE5icNM9FJHAVm3VcUDxdLPoQtTuUylWm6ZIknYJwwaPxsUzg==",
+      "license": "MIT",
       "dependencies": {
         "bn.js": "^4.1.0",
         "miller-rabin": "^4.0.0",
@@ -5732,14 +4705,12 @@
     },
     "node_modules/diffie-hellman/node_modules/bn.js": {
       "version": "4.12.0",
-      "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.0.tgz",
-      "integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA=="
+      "license": "MIT"
     },
     "node_modules/dir-glob": {
       "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/dir-glob/-/dir-glob-3.0.1.tgz",
-      "integrity": "sha512-WkrWp9GR4KXfKGYzOLmTuGVi1UWFfws377n9cc55/tb6DuqyF6pcQ5AbiHEshaDpY9v6oaSr2XCDidGmMwdzIA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "path-type": "^4.0.0"
       },
@@ -5749,15 +4720,13 @@
     },
     "node_modules/dns-equal": {
       "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/dns-equal/-/dns-equal-1.0.0.tgz",
-      "integrity": "sha512-z+paD6YUQsk+AbGCEM4PrOXSss5gd66QfcVBFTKR/HpFL9jCqikS94HYwKww6fQyO7IxrIIyUu+g0Ka9tUS2Cg==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/dns-packet": {
       "version": "5.6.0",
-      "resolved": "https://registry.npmjs.org/dns-packet/-/dns-packet-5.6.0.tgz",
-      "integrity": "sha512-rza3UH1LwdHh9qyPXp8lkwpjSNk/AMD3dPytUoRoqnypDUhY0xvbdmVhWOfxO68frEfV9BU8V12Ez7ZsHGZpCQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@leichtgewicht/ip-codec": "^2.0.1"
       },
@@ -5767,9 +4736,8 @@
     },
     "node_modules/doctrine": {
       "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-3.0.0.tgz",
-      "integrity": "sha512-yS+Q5i3hBf7GBkd4KG8a7eBNNWNGLTaEwwYWUijIYM7zrlYDM0BFXHjjPWlWZ1Rg7UaddZeIDmi9jF3HmqiQ2w==",
       "dev": true,
+      "license": "Apache-2.0",
       "dependencies": {
         "esutils": "^2.0.2"
       },
@@ -5779,18 +4747,16 @@
     },
     "node_modules/dom-converter": {
       "version": "0.2.0",
-      "resolved": "https://registry.npmjs.org/dom-converter/-/dom-converter-0.2.0.tgz",
-      "integrity": "sha512-gd3ypIPfOMr9h5jIKq8E3sHOTCjeirnl0WK5ZdS1AW0Odt0b1PaWaHdJ4Qk4klv+YB9aJBS7mESXjFoDQPu6DA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "utila": "~0.4"
       }
     },
     "node_modules/dom-serializer": {
       "version": "1.4.1",
-      "resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-1.4.1.tgz",
-      "integrity": "sha512-VHwB3KfrcOOkelEG2ZOfxqLZdfkil8PtJi4P8N2MMXucZq2yLp75ClViUlOVwyoHEDjYU433Aq+5zWP61+RGag==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "domelementtype": "^2.0.1",
         "domhandler": "^4.2.0",
@@ -5802,30 +4768,27 @@
     },
     "node_modules/dom-serializer/node_modules/entities": {
       "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/entities/-/entities-2.2.0.tgz",
-      "integrity": "sha512-p92if5Nz619I0w+akJrLZH0MX0Pb5DX39XOwQTtXSdQQOaYH03S1uIQp4mhOZtAXrxq4ViO67YTiLBo2638o9A==",
       "dev": true,
+      "license": "BSD-2-Clause",
       "funding": {
         "url": "https://github.com/fb55/entities?sponsor=1"
       }
     },
     "node_modules/domelementtype": {
       "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-2.3.0.tgz",
-      "integrity": "sha512-OLETBj6w0OsagBwdXnPdN0cnMfF9opN69co+7ZrbfPGrdpPVNBUj02spi6B1N7wChLQiPn4CSH/zJvXw56gmHw==",
       "dev": true,
       "funding": [
         {
           "type": "github",
           "url": "https://github.com/sponsors/fb55"
         }
-      ]
+      ],
+      "license": "BSD-2-Clause"
     },
     "node_modules/domhandler": {
       "version": "4.3.1",
-      "resolved": "https://registry.npmjs.org/domhandler/-/domhandler-4.3.1.tgz",
-      "integrity": "sha512-GrwoxYN+uWlzO8uhUXRl0P+kHE4GtVPfYzVLcUxPL7KNdHKj66vvlhiweIHqYYXWlw+T8iLMp42Lm67ghw4WMQ==",
       "dev": true,
+      "license": "BSD-2-Clause",
       "dependencies": {
         "domelementtype": "^2.2.0"
       },
@@ -5838,9 +4801,8 @@
     },
     "node_modules/domutils": {
       "version": "2.8.0",
-      "resolved": "https://registry.npmjs.org/domutils/-/domutils-2.8.0.tgz",
-      "integrity": "sha512-w96Cjofp72M5IIhpjgobBimYEfoPjx1Vx0BSX9P30WBdZW2WIKU0T1Bd0kz2eNZ9ikjKgHbEyKx8BB6H1L3h3A==",
       "dev": true,
+      "license": "BSD-2-Clause",
       "dependencies": {
         "dom-serializer": "^1.0.1",
         "domelementtype": "^2.2.0",
@@ -5852,9 +4814,8 @@
     },
     "node_modules/dot-case": {
       "version": "3.0.4",
-      "resolved": "https://registry.npmjs.org/dot-case/-/dot-case-3.0.4.tgz",
-      "integrity": "sha512-Kv5nKlh6yRrdrGvxeJ2e5y2eRUpkUosIW4A2AS38zwSz27zu7ufDwQPi5Jhs3XAlGNetl3bmnGhQsMtkKJnj3w==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "no-case": "^3.0.4",
         "tslib": "^2.0.3"
@@ -5862,8 +4823,7 @@
     },
     "node_modules/dotenv": {
       "version": "16.4.5",
-      "resolved": "https://registry.npmjs.org/dotenv/-/dotenv-16.4.5.tgz",
-      "integrity": "sha512-ZmdL2rui+eB2YwhsWzjInR8LldtZHGDoQ1ugH85ppHKwpUHL7j7rN0Ti9NCnGiQbhaZ11FpR+7ao1dNsmduNUg==",
+      "license": "BSD-2-Clause",
       "engines": {
         "node": ">=12"
       },
@@ -5873,27 +4833,24 @@
     },
     "node_modules/dotenv-defaults": {
       "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/dotenv-defaults/-/dotenv-defaults-2.0.2.tgz",
-      "integrity": "sha512-iOIzovWfsUHU91L5i8bJce3NYK5JXeAwH50Jh6+ARUdLiiGlYWfGw6UkzsYqaXZH/hjE/eCd/PlfM/qqyK0AMg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "dotenv": "^8.2.0"
       }
     },
     "node_modules/dotenv-defaults/node_modules/dotenv": {
       "version": "8.6.0",
-      "resolved": "https://registry.npmjs.org/dotenv/-/dotenv-8.6.0.tgz",
-      "integrity": "sha512-IrPdXQsk2BbzvCBGBOTmmSH5SodmqZNt4ERAZDmW4CT+tL8VtvinqywuANaFu4bOMWki16nqf0e4oC0QIaDr/g==",
       "dev": true,
+      "license": "BSD-2-Clause",
       "engines": {
         "node": ">=10"
       }
     },
     "node_modules/dotenv-webpack": {
       "version": "8.0.1",
-      "resolved": "https://registry.npmjs.org/dotenv-webpack/-/dotenv-webpack-8.0.1.tgz",
-      "integrity": "sha512-CdrgfhZOnx4uB18SgaoP9XHRN2v48BbjuXQsZY5ixs5A8579NxQkmMxRtI7aTwSiSQcM2ao12Fdu+L3ZS3bG4w==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "dotenv-defaults": "^2.0.2"
       },
@@ -5919,15 +4876,13 @@
     },
     "node_modules/eastasianwidth": {
       "version": "0.2.0",
-      "resolved": "https://registry.npmjs.org/eastasianwidth/-/eastasianwidth-0.2.0.tgz",
-      "integrity": "sha512-I88TYZWc9XiYHRQ4/3c5rjjfgkjhLyW2luGIheGERbNQ6OY7yTybanSpDXZa8y7VUP9YmDcYa+eyq4ca7iLqWA==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/easy-table": {
       "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/easy-table/-/easy-table-1.2.0.tgz",
-      "integrity": "sha512-OFzVOv03YpvtcWGe5AayU5G2hgybsg3iqA6drU8UaoZyB9jLGMTrz9+asnLp/E+6qPh88yEI1gvyZFZ41dmgww==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "ansi-regex": "^5.0.1"
       },
@@ -5958,19 +4913,16 @@
     },
     "node_modules/ee-first": {
       "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz",
-      "integrity": "sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/electron-to-chromium": {
       "version": "1.4.572",
-      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.572.tgz",
-      "integrity": "sha512-RlFobl4D3ieetbnR+2EpxdzFl9h0RAJkPK3pfiwMug2nhBin2ZCsGIAJWdpNniLz43sgXam/CgipOmvTA+rUiA=="
+      "license": "ISC"
     },
     "node_modules/elliptic": {
       "version": "6.5.4",
-      "resolved": "https://registry.npmjs.org/elliptic/-/elliptic-6.5.4.tgz",
-      "integrity": "sha512-iLhC6ULemrljPZb+QutR5TQGB+pdW6KGD5RSegS+8sorOZT+rdQFbsQFJgvN3eRqNALqJer4oQ16YvJHlU8hzQ==",
+      "license": "MIT",
       "dependencies": {
         "bn.js": "^4.11.9",
         "brorand": "^1.1.0",
@@ -5983,38 +4935,33 @@
     },
     "node_modules/elliptic/node_modules/bn.js": {
       "version": "4.12.0",
-      "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.0.tgz",
-      "integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA=="
+      "license": "MIT"
     },
     "node_modules/emoji-regex": {
       "version": "9.2.2",
-      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-9.2.2.tgz",
-      "integrity": "sha512-L18DaJsXSUk2+42pv8mLs5jJT2hqFkFE4j21wOmgbUqsZ2hL72NsUU785g9RXgo3s0ZNgVl42TiHp3ZtOv/Vyg==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/emojis-list": {
       "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/emojis-list/-/emojis-list-3.0.0.tgz",
-      "integrity": "sha512-/kyM18EfinwXZbno9FyUGeFh87KC8HRQBQGildHZbEuRyWFOmv1U10o9BBp8XVZDVNNuQKyIGIu5ZYAAXJ0V2Q==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">= 4"
       }
     },
     "node_modules/encodeurl": {
       "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.2.tgz",
-      "integrity": "sha512-TPJXq8JqFaVYm2CWmPvnP2Iyo4ZSM7/QKcSmuMLDObfpH5fi7RUGmd/rTDf+rut/saiDiQEeVTNgAmJEdAOx0w==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">= 0.8"
       }
     },
     "node_modules/enhanced-resolve": {
       "version": "5.15.0",
-      "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.15.0.tgz",
-      "integrity": "sha512-LXYT42KJ7lpIKECr2mAXIaMldcNCh/7E0KBKOu4KSfkHmP+mZmSs+8V5gBAqisWBy0OO4W5Oyys0GO1Y8KtdKg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "graceful-fs": "^4.2.4",
         "tapable": "^2.2.0"
@@ -6025,9 +4972,8 @@
     },
     "node_modules/entities": {
       "version": "4.5.0",
-      "resolved": "https://registry.npmjs.org/entities/-/entities-4.5.0.tgz",
-      "integrity": "sha512-V0hjH4dGPh9Ao5p0MoRY6BVqtwCjhz6vI5LT8AJ55H+4g9/4vbHx1I54fS0XuclLhDHArPQCiMjDxjaL8fPxhw==",
       "dev": true,
+      "license": "BSD-2-Clause",
       "engines": {
         "node": ">=0.12"
       },
@@ -6037,27 +4983,24 @@
     },
     "node_modules/error-ex": {
       "version": "1.3.2",
-      "resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.2.tgz",
-      "integrity": "sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "is-arrayish": "^0.2.1"
       }
     },
     "node_modules/error-stack-parser": {
       "version": "2.1.4",
-      "resolved": "https://registry.npmjs.org/error-stack-parser/-/error-stack-parser-2.1.4.tgz",
-      "integrity": "sha512-Sk5V6wVazPhq5MhpO+AUxJn5x7XSXGl1R93Vn7i+zS15KDVxQijejNCrz8340/2bgLBjR9GtEG8ZVKONDjcqGQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "stackframe": "^1.3.4"
       }
     },
     "node_modules/es-abstract": {
       "version": "1.22.1",
-      "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.22.1.tgz",
-      "integrity": "sha512-ioRRcXMO6OFyRpyzV3kE1IIBd4WG5/kltnzdxSCqoP8CMGs/Li+M1uF5o7lOkZVFjDs+NLesthnF66Pg/0q0Lw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "array-buffer-byte-length": "^1.0.0",
         "arraybuffer.prototype.slice": "^1.0.1",
@@ -6108,8 +5051,7 @@
     },
     "node_modules/es-define-property": {
       "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/es-define-property/-/es-define-property-1.0.0.tgz",
-      "integrity": "sha512-jxayLKShrEqqzJ0eumQbVhTYQM27CfT1T35+gCgDFoL82JLsXqTJ76zv6A0YLOgEnLUMvLzsDsGIrl8NFpT2gQ==",
+      "license": "MIT",
       "dependencies": {
         "get-intrinsic": "^1.2.4"
       },
@@ -6119,17 +5061,15 @@
     },
     "node_modules/es-errors": {
       "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/es-errors/-/es-errors-1.3.0.tgz",
-      "integrity": "sha512-Zf5H2Kxt2xjTvbJvP2ZWLEICxA6j+hAmMzIlypy4xcBg1vKVnx89Wy0GbS+kf5cwCVFFzdCFh2XSCFNULS6csw==",
+      "license": "MIT",
       "engines": {
         "node": ">= 0.4"
       }
     },
     "node_modules/es-get-iterator": {
       "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/es-get-iterator/-/es-get-iterator-1.1.3.tgz",
-      "integrity": "sha512-sPZmqHBe6JIiTfN5q2pEi//TwxmAFHwj/XEuYjTuse78i8KxaqMTTzxPoFKuzRpDpTJ+0NAbpfenkmH2rePtuw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "call-bind": "^1.0.2",
         "get-intrinsic": "^1.1.3",
@@ -6147,15 +5087,13 @@
     },
     "node_modules/es-module-lexer": {
       "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/es-module-lexer/-/es-module-lexer-1.3.0.tgz",
-      "integrity": "sha512-vZK7T0N2CBmBOixhmjdqx2gWVbFZ4DXZ/NyRMZVlJXPa7CyFS+/a4QQsDGDQy9ZfEzxFuNEsMLeQJnKP2p5/JA==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/es-set-tostringtag": {
       "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/es-set-tostringtag/-/es-set-tostringtag-2.0.1.tgz",
-      "integrity": "sha512-g3OMbtlwY3QewlqAiMLI47KywjWZoEytKr8pf6iTC8uJq5bIAH52Z9pnQ8pVL6whrCto53JZDuUIsifGeLorTg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "get-intrinsic": "^1.1.3",
         "has": "^1.0.3",
@@ -6167,18 +5105,16 @@
     },
     "node_modules/es-shim-unscopables": {
       "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/es-shim-unscopables/-/es-shim-unscopables-1.0.0.tgz",
-      "integrity": "sha512-Jm6GPcCdC30eMLbZ2x8z2WuRwAws3zTBBKuusffYVUrNj/GVSUAZ+xKMaUpfNDR5IbyNA5LJbaecoUVbmUcB1w==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "has": "^1.0.3"
       }
     },
     "node_modules/es-to-primitive": {
       "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.2.1.tgz",
-      "integrity": "sha512-QCOllgZJtaUo9miYBcLChTUaHNjJF3PYs1VidD7AwiEj1kYxKeQTctLAezAOH5ZKRH0g2IgPn6KwB4IT8iRpvA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "is-callable": "^1.1.4",
         "is-date-object": "^1.0.1",
@@ -6193,10 +5129,9 @@
     },
     "node_modules/esbuild": {
       "version": "0.21.5",
-      "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.21.5.tgz",
-      "integrity": "sha512-mg3OPMV4hXywwpoDxu3Qda5xCKQi+vCTZq8S9J/EpkhB2HzKXq4SNFZE3+NK93JYxc8VMSep+lOUSC/RVKaBqw==",
       "dev": true,
       "hasInstallScript": true,
+      "license": "MIT",
       "bin": {
         "esbuild": "bin/esbuild"
       },
@@ -6231,31 +5166,27 @@
     },
     "node_modules/escalade": {
       "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.1.tgz",
-      "integrity": "sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw==",
+      "license": "MIT",
       "engines": {
         "node": ">=6"
       }
     },
     "node_modules/escape-html": {
       "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.3.tgz",
-      "integrity": "sha512-NiSupZ4OeuGwr68lGIeym/ksIZMJodUGOSCZ/FSnTxcrekbvqrgdUxlJOMpijaKZVjAJrWrGs/6Jy8OMuyj9ow==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/escape-string-regexp": {
       "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
-      "integrity": "sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg==",
+      "license": "MIT",
       "engines": {
         "node": ">=0.8.0"
       }
     },
     "node_modules/eslint": {
       "version": "8.40.0",
-      "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.40.0.tgz",
-      "integrity": "sha512-bvR+TsP9EHL3TqNtj9sCNJVAFK3fBN8Q7g5waghxyRsPLIMwL73XSKnZFK0hk/O2ANC+iAoq6PWMQ+IfBAJIiQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@eslint-community/eslint-utils": "^4.2.0",
         "@eslint-community/regexpp": "^4.4.0",
@@ -6310,9 +5241,8 @@
     },
     "node_modules/eslint-config-airbnb": {
       "version": "19.0.4",
-      "resolved": "https://registry.npmjs.org/eslint-config-airbnb/-/eslint-config-airbnb-19.0.4.tgz",
-      "integrity": "sha512-T75QYQVQX57jiNgpF9r1KegMICE94VYwoFQyMGhrvc+lB8YF2E/M/PYDaQe1AJcWaEgqLE+ErXV1Og/+6Vyzew==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "eslint-config-airbnb-base": "^15.0.0",
         "object.assign": "^4.1.2",
@@ -6331,9 +5261,8 @@
     },
     "node_modules/eslint-config-airbnb-base": {
       "version": "15.0.0",
-      "resolved": "https://registry.npmjs.org/eslint-config-airbnb-base/-/eslint-config-airbnb-base-15.0.0.tgz",
-      "integrity": "sha512-xaX3z4ZZIcFLvh2oUNvcX5oEofXda7giYmuplVxoOg5A7EXJMrUyqRgR+mhDhPK8LZ4PttFOBvCYDbX3sUoUig==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "confusing-browser-globals": "^1.0.10",
         "object.assign": "^4.1.2",
@@ -6350,9 +5279,8 @@
     },
     "node_modules/eslint-config-airbnb-typescript": {
       "version": "17.1.0",
-      "resolved": "https://registry.npmjs.org/eslint-config-airbnb-typescript/-/eslint-config-airbnb-typescript-17.1.0.tgz",
-      "integrity": "sha512-GPxI5URre6dDpJ0CtcthSZVBAfI+Uw7un5OYNVxP2EYi3H81Jw701yFP7AU+/vCE7xBtFmjge7kfhhk4+RAiig==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "eslint-config-airbnb-base": "^15.0.0"
       },
@@ -6365,9 +5293,8 @@
     },
     "node_modules/eslint-config-prettier": {
       "version": "8.10.0",
-      "resolved": "https://registry.npmjs.org/eslint-config-prettier/-/eslint-config-prettier-8.10.0.tgz",
-      "integrity": "sha512-SM8AMJdeQqRYT9O9zguiruQZaN7+z+E4eAP9oiLNGKMtomwaB1E9dcgUD6ZAn/eQAb52USbvezbiljfZUhbJcg==",
       "dev": true,
+      "license": "MIT",
       "bin": {
         "eslint-config-prettier": "bin/cli.js"
       },
@@ -6377,9 +5304,8 @@
     },
     "node_modules/eslint-import-resolver-node": {
       "version": "0.3.7",
-      "resolved": "https://registry.npmjs.org/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.7.tgz",
-      "integrity": "sha512-gozW2blMLJCeFpBwugLTGyvVjNoeo1knonXAcatC6bjPBZitotxdWf7Gimr25N4c0AAOo4eOUfaG82IJPDpqCA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "debug": "^3.2.7",
         "is-core-module": "^2.11.0",
@@ -6388,18 +5314,16 @@
     },
     "node_modules/eslint-import-resolver-node/node_modules/debug": {
       "version": "3.2.7",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz",
-      "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "ms": "^2.1.1"
       }
     },
     "node_modules/eslint-module-utils": {
       "version": "2.8.0",
-      "resolved": "https://registry.npmjs.org/eslint-module-utils/-/eslint-module-utils-2.8.0.tgz",
-      "integrity": "sha512-aWajIYfsqCKRDgUfjEXNN/JlrzauMuSEy5sbd7WXbtW3EH6A6MpwEh42c7qD+MqQo9QMJ6fWLAeIJynx0g6OAw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "debug": "^3.2.7"
       },
@@ -6414,18 +5338,16 @@
     },
     "node_modules/eslint-module-utils/node_modules/debug": {
       "version": "3.2.7",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz",
-      "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "ms": "^2.1.1"
       }
     },
     "node_modules/eslint-plugin-import": {
       "version": "2.28.0",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-import/-/eslint-plugin-import-2.28.0.tgz",
-      "integrity": "sha512-B8s/n+ZluN7sxj9eUf7/pRFERX0r5bnFA2dCaLHy2ZeaQEAz0k+ZZkFWRFHJAqxfxQDx6KLv9LeIki7cFdwW+Q==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "array-includes": "^3.1.6",
         "array.prototype.findlastindex": "^1.2.2",
@@ -6455,18 +5377,16 @@
     },
     "node_modules/eslint-plugin-import/node_modules/debug": {
       "version": "3.2.7",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz",
-      "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "ms": "^2.1.1"
       }
     },
     "node_modules/eslint-plugin-import/node_modules/doctrine": {
       "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-2.1.0.tgz",
-      "integrity": "sha512-35mSku4ZXK0vfCuHEDAwt55dg2jNajHZ1odvF+8SSr82EsZY4QmXfuWso8oEd8zRhVObSN18aM0CjSdoBX7zIw==",
       "dev": true,
+      "license": "Apache-2.0",
       "dependencies": {
         "esutils": "^2.0.2"
       },
@@ -6476,9 +5396,8 @@
     },
     "node_modules/eslint-plugin-jsx-a11y": {
       "version": "6.7.1",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-jsx-a11y/-/eslint-plugin-jsx-a11y-6.7.1.tgz",
-      "integrity": "sha512-63Bog4iIethyo8smBklORknVjB0T2dwB8Mr/hIC+fBS0uyHdYYpzM/Ed+YC8VxTjlXHEWFOdmgwcDn1U2L9VCA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@babel/runtime": "^7.20.7",
         "aria-query": "^5.1.3",
@@ -6506,18 +5425,19 @@
     },
     "node_modules/eslint-plugin-no-inline-styles": {
       "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-no-inline-styles/-/eslint-plugin-no-inline-styles-1.0.5.tgz",
-      "integrity": "sha512-nftOfHV/ag0P0vEPQ3p54HVpGCp6k/E+pHdYnRm2wDK8QhClfmMjrCw+POL5RH/SN1AmTifCTh5VzkeubLgMpA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "lodash.get": "^4.4.2"
       }
     },
     "node_modules/eslint-plugin-playwright": {
       "version": "1.6.0",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-playwright/-/eslint-plugin-playwright-1.6.0.tgz",
-      "integrity": "sha512-tI1E/EDbHT4Fx5KvukUG3RTIT0gk44gvTP8bNwxLCFsUXVM98ZJG5zWU6Om5JOzH9FrmN4AhMu/UKyEsu0ZoDA==",
       "dev": true,
+      "license": "MIT",
+      "workspaces": [
+        "examples"
+      ],
       "dependencies": {
         "globals": "^13.23.0"
       },
@@ -6536,9 +5456,8 @@
     },
     "node_modules/eslint-plugin-playwright/node_modules/globals": {
       "version": "13.24.0",
-      "resolved": "https://registry.npmjs.org/globals/-/globals-13.24.0.tgz",
-      "integrity": "sha512-AhO5QUcj8llrbG09iWhPU2B204J1xnPeL8kQmVorSsy+Sjj1sk8gIyh6cUocGmH4L0UuhAJy+hJMRA4mgA4mFQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "type-fest": "^0.20.2"
       },
@@ -6551,9 +5470,8 @@
     },
     "node_modules/eslint-plugin-playwright/node_modules/type-fest": {
       "version": "0.20.2",
-      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.20.2.tgz",
-      "integrity": "sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==",
       "dev": true,
+      "license": "(MIT OR CC0-1.0)",
       "engines": {
         "node": ">=10"
       },
@@ -6563,9 +5481,8 @@
     },
     "node_modules/eslint-plugin-prettier": {
       "version": "4.2.1",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-prettier/-/eslint-plugin-prettier-4.2.1.tgz",
-      "integrity": "sha512-f/0rXLXUt0oFYs8ra4w49wYZBG5GKZpAYsJSm6rnYL5uVDjd+zowwMwVZHnAjf4edNrKpCDYfXDgmRE/Ak7QyQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "prettier-linter-helpers": "^1.0.0"
       },
@@ -6584,9 +5501,8 @@
     },
     "node_modules/eslint-plugin-react": {
       "version": "7.33.1",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-react/-/eslint-plugin-react-7.33.1.tgz",
-      "integrity": "sha512-L093k0WAMvr6VhNwReB8VgOq5s2LesZmrpPdKz/kZElQDzqS7G7+DnKoqT+w4JwuiGeAhAvHO0fvy0Eyk4ejDA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "array-includes": "^3.1.6",
         "array.prototype.flatmap": "^1.3.1",
@@ -6613,9 +5529,8 @@
     },
     "node_modules/eslint-plugin-react-hooks": {
       "version": "4.6.0",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-react-hooks/-/eslint-plugin-react-hooks-4.6.0.tgz",
-      "integrity": "sha512-oFc7Itz9Qxh2x4gNHStv3BqJq54ExXmfC+a1NjAta66IAN87Wu0R/QArgIS9qKzX3dXKPI9H5crl9QchNMY9+g==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=10"
       },
@@ -6625,9 +5540,8 @@
     },
     "node_modules/eslint-plugin-react/node_modules/doctrine": {
       "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-2.1.0.tgz",
-      "integrity": "sha512-35mSku4ZXK0vfCuHEDAwt55dg2jNajHZ1odvF+8SSr82EsZY4QmXfuWso8oEd8zRhVObSN18aM0CjSdoBX7zIw==",
       "dev": true,
+      "license": "Apache-2.0",
       "dependencies": {
         "esutils": "^2.0.2"
       },
@@ -6637,9 +5551,8 @@
     },
     "node_modules/eslint-plugin-react/node_modules/resolve": {
       "version": "2.0.0-next.4",
-      "resolved": "https://registry.npmjs.org/resolve/-/resolve-2.0.0-next.4.tgz",
-      "integrity": "sha512-iMDbmAWtfU+MHpxt/I5iWI7cY6YVEZUQ3MBgPQ++XD1PELuJHIl82xBmObyP2KyQmkNB2dsqF7seoQQiAn5yDQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "is-core-module": "^2.9.0",
         "path-parse": "^1.0.7",
@@ -6654,9 +5567,8 @@
     },
     "node_modules/eslint-scope": {
       "version": "5.1.1",
-      "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.1.1.tgz",
-      "integrity": "sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw==",
       "dev": true,
+      "license": "BSD-2-Clause",
       "dependencies": {
         "esrecurse": "^4.3.0",
         "estraverse": "^4.1.1"
@@ -6667,18 +5579,16 @@
     },
     "node_modules/eslint-scope/node_modules/estraverse": {
       "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.3.0.tgz",
-      "integrity": "sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==",
       "dev": true,
+      "license": "BSD-2-Clause",
       "engines": {
         "node": ">=4.0"
       }
     },
     "node_modules/eslint-visitor-keys": {
       "version": "3.4.2",
-      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.4.2.tgz",
-      "integrity": "sha512-8drBzUEyZ2llkpCA67iYrgEssKDUu68V8ChqqOfFupIaG/LCVPUT+CoGJpT77zJprs4T/W7p07LP7zAIMuweVw==",
       "dev": true,
+      "license": "Apache-2.0",
       "engines": {
         "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
       },
@@ -6688,9 +5598,8 @@
     },
     "node_modules/eslint/node_modules/ansi-styles": {
       "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "color-convert": "^2.0.1"
       },
@@ -6703,9 +5612,8 @@
     },
     "node_modules/eslint/node_modules/chalk": {
       "version": "4.1.2",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "ansi-styles": "^4.1.0",
         "supports-color": "^7.1.0"
@@ -6719,9 +5627,8 @@
     },
     "node_modules/eslint/node_modules/color-convert": {
       "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "color-name": "~1.1.4"
       },
@@ -6731,15 +5638,13 @@
     },
     "node_modules/eslint/node_modules/color-name": {
       "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/eslint/node_modules/escape-string-regexp": {
       "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz",
-      "integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=10"
       },
@@ -6749,9 +5654,8 @@
     },
     "node_modules/eslint/node_modules/eslint-scope": {
       "version": "7.2.2",
-      "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-7.2.2.tgz",
-      "integrity": "sha512-dOt21O7lTMhDM+X9mB4GX+DZrZtCUJPL/wlcTqxyrx5IvO0IYtILdtrQGQp+8n5S0gwSVmOf9NQrjMOgfQZlIg==",
       "dev": true,
+      "license": "BSD-2-Clause",
       "dependencies": {
         "esrecurse": "^4.3.0",
         "estraverse": "^5.2.0"
@@ -6765,9 +5669,8 @@
     },
     "node_modules/eslint/node_modules/globals": {
       "version": "13.20.0",
-      "resolved": "https://registry.npmjs.org/globals/-/globals-13.20.0.tgz",
-      "integrity": "sha512-Qg5QtVkCy/kv3FUSlu4ukeZDVf9ee0iXLAUYX13gbR17bnejFTzr4iS9bY7kwCf1NztRNm1t91fjOiyx4CSwPQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "type-fest": "^0.20.2"
       },
@@ -6780,27 +5683,24 @@
     },
     "node_modules/eslint/node_modules/has-flag": {
       "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=8"
       }
     },
     "node_modules/eslint/node_modules/is-path-inside": {
       "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/is-path-inside/-/is-path-inside-3.0.3.tgz",
-      "integrity": "sha512-Fd4gABb+ycGAmKou8eMftCupSir5lRxqf4aD/vd0cD2qc4HL07OjCeuHMr8Ro4CoMaeCKDB0/ECBOVWjTwUvPQ==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=8"
       }
     },
     "node_modules/eslint/node_modules/supports-color": {
       "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "has-flag": "^4.0.0"
       },
@@ -6810,9 +5710,8 @@
     },
     "node_modules/eslint/node_modules/type-fest": {
       "version": "0.20.2",
-      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.20.2.tgz",
-      "integrity": "sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==",
       "dev": true,
+      "license": "(MIT OR CC0-1.0)",
       "engines": {
         "node": ">=10"
       },
@@ -6822,9 +5721,8 @@
     },
     "node_modules/espree": {
       "version": "9.6.1",
-      "resolved": "https://registry.npmjs.org/espree/-/espree-9.6.1.tgz",
-      "integrity": "sha512-oruZaFkjorTpF32kDSI5/75ViwGeZginGGy2NoOSg3Q9bnwlnmDm4HLnkl0RE3n+njDXR037aY1+x58Z/zFdwQ==",
       "dev": true,
+      "license": "BSD-2-Clause",
       "dependencies": {
         "acorn": "^8.9.0",
         "acorn-jsx": "^5.3.2",
@@ -6839,9 +5737,8 @@
     },
     "node_modules/esquery": {
       "version": "1.5.0",
-      "resolved": "https://registry.npmjs.org/esquery/-/esquery-1.5.0.tgz",
-      "integrity": "sha512-YQLXUplAwJgCydQ78IMJywZCceoqk1oH01OERdSAJc/7U2AylwjhSCLDEtqwg811idIS/9fIU5GjG73IgjKMVg==",
       "dev": true,
+      "license": "BSD-3-Clause",
       "dependencies": {
         "estraverse": "^5.1.0"
       },
@@ -6851,9 +5748,8 @@
     },
     "node_modules/esrecurse": {
       "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/esrecurse/-/esrecurse-4.3.0.tgz",
-      "integrity": "sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag==",
       "dev": true,
+      "license": "BSD-2-Clause",
       "dependencies": {
         "estraverse": "^5.2.0"
       },
@@ -6863,48 +5759,42 @@
     },
     "node_modules/estraverse": {
       "version": "5.3.0",
-      "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz",
-      "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==",
       "dev": true,
+      "license": "BSD-2-Clause",
       "engines": {
         "node": ">=4.0"
       }
     },
     "node_modules/esutils": {
       "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.3.tgz",
-      "integrity": "sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==",
       "dev": true,
+      "license": "BSD-2-Clause",
       "engines": {
         "node": ">=0.10.0"
       }
     },
     "node_modules/etag": {
       "version": "1.8.1",
-      "resolved": "https://registry.npmjs.org/etag/-/etag-1.8.1.tgz",
-      "integrity": "sha512-aIL5Fx7mawVa300al2BnEE4iNvo1qETxLrPI/o05L7z6go7fCw1J6EQmbK4FmJ2AS7kgVF/KEZWufBfdClMcPg==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">= 0.6"
       }
     },
     "node_modules/eventemitter3": {
       "version": "4.0.7",
-      "resolved": "https://registry.npmjs.org/eventemitter3/-/eventemitter3-4.0.7.tgz",
-      "integrity": "sha512-8guHBZCwKnFhYdHr2ysuRWErTwhoN2X8XELRlrRwpmfeY2jjuUN4taQMsULKUVo1K4DvZl+0pgfyoysHxvmvEw=="
+      "license": "MIT"
     },
     "node_modules/events": {
       "version": "3.3.0",
-      "resolved": "https://registry.npmjs.org/events/-/events-3.3.0.tgz",
-      "integrity": "sha512-mQw+2fkQbALzQ7V0MY0IqdnXNOeTtP4r0lN9z7AAawCXgqea7bDii20AYrIBrFd/Hx0M2Ocz6S111CaFkUcb0Q==",
+      "license": "MIT",
       "engines": {
         "node": ">=0.8.x"
       }
     },
     "node_modules/evp_bytestokey": {
       "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/evp_bytestokey/-/evp_bytestokey-1.0.3.tgz",
-      "integrity": "sha512-/f2Go4TognH/KvCISP7OUsHn85hT9nUkxxA9BEWxFn+Oj9o8ZNLm/40hdlgSLyuOimsrTKLUMEorQexp/aPQeA==",
+      "license": "MIT",
       "dependencies": {
         "md5.js": "^1.3.4",
         "safe-buffer": "^5.1.1"
@@ -6912,9 +5802,8 @@
     },
     "node_modules/execa": {
       "version": "5.1.1",
-      "resolved": "https://registry.npmjs.org/execa/-/execa-5.1.1.tgz",
-      "integrity": "sha512-8uSpZZocAZRBAPIEINJj3Lo9HyGitllczc27Eh5YYojjMFMn8yHMDMaUHE2Jqfq05D/wucwI4JGURyXt1vchyg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "cross-spawn": "^7.0.3",
         "get-stream": "^6.0.0",
@@ -6935,14 +5824,12 @@
     },
     "node_modules/exenv": {
       "version": "1.2.2",
-      "resolved": "https://registry.npmjs.org/exenv/-/exenv-1.2.2.tgz",
-      "integrity": "sha512-Z+ktTxTwv9ILfgKCk32OX3n/doe+OcLTRtqK9pcL+JsP3J1/VW8Uvl4ZjLlKqeW4rzK4oesDOGMEMRIZqtP4Iw=="
+      "license": "BSD-3-Clause"
     },
     "node_modules/express": {
       "version": "4.18.2",
-      "resolved": "https://registry.npmjs.org/express/-/express-4.18.2.tgz",
-      "integrity": "sha512-5/PsL6iGPdfQ/lKM1UuielYgv3BUoJfz1aUwU9vHZ+J7gyvwdQXFEBIEIaxeGf0GIcreATNyBExtalisDbuMqQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "accepts": "~1.3.8",
         "array-flatten": "1.1.1",
@@ -6982,30 +5869,26 @@
     },
     "node_modules/express/node_modules/array-flatten": {
       "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/array-flatten/-/array-flatten-1.1.1.tgz",
-      "integrity": "sha512-PCVAQswWemu6UdxsDFFX/+gVeYqKAod3D3UVm91jHwynguOwAvYPhx8nNlM++NqRcK6CxxpUafjmhIdKiHibqg==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/express/node_modules/debug": {
       "version": "2.6.9",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-      "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "ms": "2.0.0"
       }
     },
     "node_modules/express/node_modules/ms": {
       "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-      "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/express/node_modules/qs": {
       "version": "6.11.0",
-      "resolved": "https://registry.npmjs.org/qs/-/qs-6.11.0.tgz",
-      "integrity": "sha512-MvjoMCJwEarSbUYk5O+nmoSzSutSsTwF85zcHPQ9OrlFoZOYIjaqBAJIqIXjptyD5vThxGq52Xu/MaJzRkIk4Q==",
       "dev": true,
+      "license": "BSD-3-Clause",
       "dependencies": {
         "side-channel": "^1.0.4"
       },
@@ -7018,21 +5901,18 @@
     },
     "node_modules/fast-deep-equal": {
       "version": "3.1.3",
-      "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz",
-      "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/fast-diff": {
       "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/fast-diff/-/fast-diff-1.3.0.tgz",
-      "integrity": "sha512-VxPP4NqbUjj6MaAOafWeUn2cXWLcCtljklUtZf0Ind4XQ+QPtmA0b18zZy0jIQx+ExRVCR/ZQpBmik5lXshNsw==",
-      "dev": true
+      "dev": true,
+      "license": "Apache-2.0"
     },
     "node_modules/fast-glob": {
       "version": "3.3.2",
-      "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.3.2.tgz",
-      "integrity": "sha512-oX2ruAFQwf/Orj8m737Y5adxDQO0LAB7/S5MnxCdTNDd4p6BsyIVsv9JQsATbTSq8KHRpLwIHbVlUNatxd+1Ow==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@nodelib/fs.stat": "^2.0.2",
         "@nodelib/fs.walk": "^1.2.3",
@@ -7046,9 +5926,8 @@
     },
     "node_modules/fast-glob/node_modules/glob-parent": {
       "version": "5.1.2",
-      "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz",
-      "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==",
       "dev": true,
+      "license": "ISC",
       "dependencies": {
         "is-glob": "^4.0.1"
       },
@@ -7058,30 +5937,26 @@
     },
     "node_modules/fast-json-stable-stringify": {
       "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz",
-      "integrity": "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/fast-levenshtein": {
       "version": "2.0.6",
-      "resolved": "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz",
-      "integrity": "sha512-DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/fastq": {
       "version": "1.15.0",
-      "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.15.0.tgz",
-      "integrity": "sha512-wBrocU2LCXXa+lWBt8RoIRD89Fi8OdABODa/kEnyeyjS5aZO5/GNvI5sEINADqP/h8M29UHTHUb53sUu5Ihqdw==",
       "dev": true,
+      "license": "ISC",
       "dependencies": {
         "reusify": "^1.0.4"
       }
     },
     "node_modules/faye-websocket": {
       "version": "0.11.4",
-      "resolved": "https://registry.npmjs.org/faye-websocket/-/faye-websocket-0.11.4.tgz",
-      "integrity": "sha512-CzbClwlXAuiRQAlUyfqPgvPoNKTckTPGfwZV4ZdAhVcP2lh9KUxJg2b5GkE7XbjKQ3YJnQ9z6D9ntLAlB+tP8g==",
       "dev": true,
+      "license": "Apache-2.0",
       "dependencies": {
         "websocket-driver": ">=0.5.1"
       },
@@ -7091,9 +5966,8 @@
     },
     "node_modules/file-entry-cache": {
       "version": "6.0.1",
-      "resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-6.0.1.tgz",
-      "integrity": "sha512-7Gps/XWymbLk2QLYK4NzpMOrYjMhdIxXuIvy2QBsLE6ljuodKvdkWs/cpyJJ3CVIVpH0Oi1Hvg1ovbMzLdFBBg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "flat-cache": "^3.0.4"
       },
@@ -7108,9 +5982,8 @@
     },
     "node_modules/fill-range": {
       "version": "7.0.1",
-      "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz",
-      "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "to-regex-range": "^5.0.1"
       },
@@ -7120,18 +5993,16 @@
     },
     "node_modules/filter-obj": {
       "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/filter-obj/-/filter-obj-1.1.0.tgz",
-      "integrity": "sha512-8rXg1ZnX7xzy2NGDVkBVaAy+lSlPNwad13BtgSlLuxfIslyt5Vg64U7tFcCt4WS1R0hvtnQybT/IyCkGZ3DpXQ==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=0.10.0"
       }
     },
     "node_modules/finalhandler": {
       "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.2.0.tgz",
-      "integrity": "sha512-5uXcUVftlQMFnWC9qu/svkWv3GTd2PfUhK/3PLkYNAe7FbqJMt3515HaxE6eRL74GdsriiwujiawdaB1BpEISg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "debug": "2.6.9",
         "encodeurl": "~1.0.2",
@@ -7147,24 +6018,21 @@
     },
     "node_modules/finalhandler/node_modules/debug": {
       "version": "2.6.9",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-      "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "ms": "2.0.0"
       }
     },
     "node_modules/finalhandler/node_modules/ms": {
       "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-      "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/find-up": {
       "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/find-up/-/find-up-5.0.0.tgz",
-      "integrity": "sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "locate-path": "^6.0.0",
         "path-exists": "^4.0.0"
@@ -7178,9 +6046,8 @@
     },
     "node_modules/flat-cache": {
       "version": "3.0.4",
-      "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-3.0.4.tgz",
-      "integrity": "sha512-dm9s5Pw7Jc0GvMYbshN6zchCA9RgQlzzEZX3vylR9IqFfS8XciblUXOKfW6SiuJ0e13eDYZoZV5wdrev7P3Nwg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "flatted": "^3.1.0",
         "rimraf": "^3.0.2"
@@ -7191,20 +6058,18 @@
     },
     "node_modules/flatted": {
       "version": "3.2.7",
-      "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.2.7.tgz",
-      "integrity": "sha512-5nqDSxl8nn5BSNxyR3n4I6eDmbolI6WT+QqR547RwxQapgjQBmtktdP+HTBb/a/zLsbzERTONyUB5pefh5TtjQ==",
-      "dev": true
+      "dev": true,
+      "license": "ISC"
     },
     "node_modules/follow-redirects": {
       "version": "1.15.6",
-      "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.6.tgz",
-      "integrity": "sha512-wWN62YITEaOpSK584EZXJafH1AGpO8RVgElfkuXbTOrPX4fIfOyEpW/CsiNd8JdYrAoOvafRTOEnvsO++qCqFA==",
       "funding": [
         {
           "type": "individual",
           "url": "https://github.com/sponsors/RubenVerborgh"
         }
       ],
+      "license": "MIT",
       "engines": {
         "node": ">=4.0"
       },
@@ -7216,17 +6081,15 @@
     },
     "node_modules/for-each": {
       "version": "0.3.3",
-      "resolved": "https://registry.npmjs.org/for-each/-/for-each-0.3.3.tgz",
-      "integrity": "sha512-jqYfLp7mo9vIyQf8ykW2v7A+2N4QjeCeI5+Dz9XraiO1ign81wjiH7Fb9vSOWvQfNtmSa4H2RoQTrrXivdUZmw==",
+      "license": "MIT",
       "dependencies": {
         "is-callable": "^1.1.3"
       }
     },
     "node_modules/fork-ts-checker-webpack-plugin": {
       "version": "9.0.2",
-      "resolved": "https://registry.npmjs.org/fork-ts-checker-webpack-plugin/-/fork-ts-checker-webpack-plugin-9.0.2.tgz",
-      "integrity": "sha512-Uochze2R8peoN1XqlSi/rGUkDQpRogtLFocP9+PGu68zk1BDAKXfdeCdyVZpgTk8V8WFVQXdEz426VKjXLO1Gg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@babel/code-frame": "^7.16.7",
         "chalk": "^4.1.2",
@@ -7252,9 +6115,8 @@
     },
     "node_modules/fork-ts-checker-webpack-plugin/node_modules/ansi-styles": {
       "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "color-convert": "^2.0.1"
       },
@@ -7267,9 +6129,8 @@
     },
     "node_modules/fork-ts-checker-webpack-plugin/node_modules/chalk": {
       "version": "4.1.2",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "ansi-styles": "^4.1.0",
         "supports-color": "^7.1.0"
@@ -7283,9 +6144,8 @@
     },
     "node_modules/fork-ts-checker-webpack-plugin/node_modules/color-convert": {
       "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "color-name": "~1.1.4"
       },
@@ -7295,15 +6155,13 @@
     },
     "node_modules/fork-ts-checker-webpack-plugin/node_modules/color-name": {
       "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/fork-ts-checker-webpack-plugin/node_modules/cosmiconfig": {
       "version": "8.3.6",
-      "resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-8.3.6.tgz",
-      "integrity": "sha512-kcZ6+W5QzcJ3P1Mt+83OUv/oHFqZHIx8DuxG6eZ5RGMERoLqp4BuGjhHLYGK+Kf5XVkQvqBSmAy/nGWN3qDgEA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "import-fresh": "^3.3.0",
         "js-yaml": "^4.1.0",
@@ -7327,18 +6185,16 @@
     },
     "node_modules/fork-ts-checker-webpack-plugin/node_modules/has-flag": {
       "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=8"
       }
     },
     "node_modules/fork-ts-checker-webpack-plugin/node_modules/lru-cache": {
       "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
-      "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
       "dev": true,
+      "license": "ISC",
       "dependencies": {
         "yallist": "^4.0.0"
       },
@@ -7348,9 +6204,8 @@
     },
     "node_modules/fork-ts-checker-webpack-plugin/node_modules/semver": {
       "version": "7.5.4",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz",
-      "integrity": "sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==",
       "dev": true,
+      "license": "ISC",
       "dependencies": {
         "lru-cache": "^6.0.0"
       },
@@ -7363,9 +6218,8 @@
     },
     "node_modules/fork-ts-checker-webpack-plugin/node_modules/supports-color": {
       "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "has-flag": "^4.0.0"
       },
@@ -7375,14 +6229,12 @@
     },
     "node_modules/fork-ts-checker-webpack-plugin/node_modules/yallist": {
       "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
-      "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==",
-      "dev": true
+      "dev": true,
+      "license": "ISC"
     },
     "node_modules/form-data": {
       "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.0.tgz",
-      "integrity": "sha512-ETEklSGi5t0QMZuiXoA/Q6vcnxcLQP5vdugSpuAyi6SVGi2clPPp+xgEhuMaHC+zGgn31Kd235W35f7Hykkaww==",
+      "license": "MIT",
       "dependencies": {
         "asynckit": "^0.4.0",
         "combined-stream": "^1.0.8",
@@ -7394,27 +6246,24 @@
     },
     "node_modules/forwarded": {
       "version": "0.2.0",
-      "resolved": "https://registry.npmjs.org/forwarded/-/forwarded-0.2.0.tgz",
-      "integrity": "sha512-buRG0fpBtRHSTCOASe6hD258tEubFoRLb4ZNA6NxMVHNw2gOcwHo9wyablzMzOA5z9xA9L1KNjk/Nt6MT9aYow==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">= 0.6"
       }
     },
     "node_modules/fresh": {
       "version": "0.5.2",
-      "resolved": "https://registry.npmjs.org/fresh/-/fresh-0.5.2.tgz",
-      "integrity": "sha512-zJ2mQYM18rEFOudeV4GShTGIQ7RbzA7ozbU9I/XBpm7kqgMywgmylMwXHxZJmkVoYkna9d2pVXVXPdYTP9ej8Q==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">= 0.6"
       }
     },
     "node_modules/fs-extra": {
       "version": "10.1.0",
-      "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-10.1.0.tgz",
-      "integrity": "sha512-oRXApq54ETRj4eMiFzGnHWGy+zo5raudjuxN0b8H7s/RU2oW0Wvsx9O0ACRN/kRq9E8Vu/ReskGB5o3ji+FzHQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "graceful-fs": "^4.2.0",
         "jsonfile": "^6.0.1",
@@ -7426,21 +6275,17 @@
     },
     "node_modules/fs-monkey": {
       "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/fs-monkey/-/fs-monkey-1.0.4.tgz",
-      "integrity": "sha512-INM/fWAxMICjttnD0DX1rBvinKskj5G1w+oy/pnm9u/tSlnBrzFonJMcalKJ30P8RRsPzKcCG7Q8l0jx5Fh9YQ==",
-      "dev": true
+      "dev": true,
+      "license": "Unlicense"
     },
     "node_modules/fs.realpath": {
       "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
-      "integrity": "sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw=="
+      "license": "ISC"
     },
     "node_modules/fsevents": {
       "version": "2.3.3",
-      "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.3.tgz",
-      "integrity": "sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==",
       "dev": true,
-      "hasInstallScript": true,
+      "license": "MIT",
       "optional": true,
       "os": [
         "darwin"
@@ -7451,17 +6296,15 @@
     },
     "node_modules/function-bind": {
       "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.2.tgz",
-      "integrity": "sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA==",
+      "license": "MIT",
       "funding": {
         "url": "https://github.com/sponsors/ljharb"
       }
     },
     "node_modules/function.prototype.name": {
       "version": "1.1.5",
-      "resolved": "https://registry.npmjs.org/function.prototype.name/-/function.prototype.name-1.1.5.tgz",
-      "integrity": "sha512-uN7m/BzVKQnCUF/iW8jYea67v++2u7m5UgENbHRtdDVclOUP+FMPlCNdmk0h/ysGyo2tavMJEDqJAkJdRa1vMA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "call-bind": "^1.0.2",
         "define-properties": "^1.1.3",
@@ -7477,17 +6320,15 @@
     },
     "node_modules/functions-have-names": {
       "version": "1.2.3",
-      "resolved": "https://registry.npmjs.org/functions-have-names/-/functions-have-names-1.2.3.tgz",
-      "integrity": "sha512-xckBUXyTIqT97tq2x2AMb+g163b5JFysYk0x4qxNFwbfQkmNZoiRHb6sPzI9/QV33WeuvVYBUIiD4NzNIyqaRQ==",
       "dev": true,
+      "license": "MIT",
       "funding": {
         "url": "https://github.com/sponsors/ljharb"
       }
     },
     "node_modules/gensync": {
       "version": "1.0.0-beta.2",
-      "resolved": "https://registry.npmjs.org/gensync/-/gensync-1.0.0-beta.2.tgz",
-      "integrity": "sha512-3hN7NaskYvMDLQY55gnW3NQ+mesEAepTqlg+VEbj7zzqEMBVNhzcGYYeqFo/TlYz6eQiFcp1HcsCZO+nGgS8zg==",
+      "license": "MIT",
       "peer": true,
       "engines": {
         "node": ">=6.9.0"
@@ -7495,25 +6336,22 @@
     },
     "node_modules/get-caller-file": {
       "version": "2.0.5",
-      "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz",
-      "integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==",
+      "license": "ISC",
       "engines": {
         "node": "6.* || 8.* || >= 10.*"
       }
     },
     "node_modules/get-func-name": {
       "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/get-func-name/-/get-func-name-2.0.2.tgz",
-      "integrity": "sha512-8vXOvuE167CtIc3OyItco7N/dpRtBbYOsPsXCz7X/PMnlGjYjSGuZJgM1Y7mmew7BKf9BqvLX2tnOVy1BBUsxQ==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": "*"
       }
     },
     "node_modules/get-intrinsic": {
       "version": "1.2.4",
-      "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.2.4.tgz",
-      "integrity": "sha512-5uYhsJH8VJBTv7oslg4BznJYhDoRI6waYCxMmCdnTrcCrHA/fCFKoTFz2JKKE0HdDFUF7/oQuhzumXJK7paBRQ==",
+      "license": "MIT",
       "dependencies": {
         "es-errors": "^1.3.0",
         "function-bind": "^1.1.2",
@@ -7530,9 +6368,8 @@
     },
     "node_modules/get-stream": {
       "version": "6.0.1",
-      "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-6.0.1.tgz",
-      "integrity": "sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=10"
       },
@@ -7542,9 +6379,8 @@
     },
     "node_modules/get-symbol-description": {
       "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/get-symbol-description/-/get-symbol-description-1.0.0.tgz",
-      "integrity": "sha512-2EmdH1YvIQiZpltCNgkuiUnyukzxM/R6NDJX31Ke3BG1Nq5b0S2PhX59UKi9vZpPDQVdqn+1IcaAwnzTT5vCjw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "call-bind": "^1.0.2",
         "get-intrinsic": "^1.1.1"
@@ -7558,8 +6394,7 @@
     },
     "node_modules/glob": {
       "version": "7.2.3",
-      "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz",
-      "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==",
+      "license": "ISC",
       "dependencies": {
         "fs.realpath": "^1.0.0",
         "inflight": "^1.0.4",
@@ -7577,9 +6412,8 @@
     },
     "node_modules/glob-parent": {
       "version": "6.0.2",
-      "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-6.0.2.tgz",
-      "integrity": "sha512-XxwI8EOhVQgWp6iDL+3b0r86f4d6AX6zSU55HfB4ydCEuXLXc5FcYeOu+nnGftS4TEju/11rt4KJPTMgbfmv4A==",
       "dev": true,
+      "license": "ISC",
       "dependencies": {
         "is-glob": "^4.0.3"
       },
@@ -7589,23 +6423,20 @@
     },
     "node_modules/glob-to-regexp": {
       "version": "0.4.1",
-      "resolved": "https://registry.npmjs.org/glob-to-regexp/-/glob-to-regexp-0.4.1.tgz",
-      "integrity": "sha512-lkX1HJXwyMcprw/5YUZc2s7DrpAiHB21/V+E1rHUrVNokkvB6bqMzT0VfV6/86ZNabt1k14YOIaT7nDvOX3Iiw==",
-      "dev": true
+      "dev": true,
+      "license": "BSD-2-Clause"
     },
     "node_modules/globals": {
       "version": "11.12.0",
-      "resolved": "https://registry.npmjs.org/globals/-/globals-11.12.0.tgz",
-      "integrity": "sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==",
+      "license": "MIT",
       "engines": {
         "node": ">=4"
       }
     },
     "node_modules/globalthis": {
       "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/globalthis/-/globalthis-1.0.3.tgz",
-      "integrity": "sha512-sFdI5LyBiNTHjRd7cGPWapiHWMOXKyuBNX/cWJ3NfzrZQVa8GI/8cofCl74AOVqq9W5kNmguTIzJ/1s2gyI9wA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "define-properties": "^1.1.3"
       },
@@ -7618,9 +6449,8 @@
     },
     "node_modules/globby": {
       "version": "11.1.0",
-      "resolved": "https://registry.npmjs.org/globby/-/globby-11.1.0.tgz",
-      "integrity": "sha512-jhIXaOzy1sb8IyocaruWSn1TjmnBVs8Ayhcy83rmxNJ8q2uWKCAj3CnJY+KpGSXCueAPc0i05kVvVKtP1t9S3g==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "array-union": "^2.1.0",
         "dir-glob": "^3.0.1",
@@ -7638,22 +6468,19 @@
     },
     "node_modules/globrex": {
       "version": "0.1.2",
-      "resolved": "https://registry.npmjs.org/globrex/-/globrex-0.1.2.tgz",
-      "integrity": "sha512-uHJgbwAMwNFf5mLst7IWLNg14x1CkeqglJb/K3doi4dw6q2IvAAmM/Y81kevy83wP+Sst+nutFTYOGg3d1lsxg==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/goober": {
       "version": "2.1.13",
-      "resolved": "https://registry.npmjs.org/goober/-/goober-2.1.13.tgz",
-      "integrity": "sha512-jFj3BQeleOoy7t93E9rZ2de+ScC4lQICLwiAQmKMg9F6roKGaLSHoCDYKkWlSafg138jejvq/mTdvmnwDQgqoQ==",
+      "license": "MIT",
       "peerDependencies": {
         "csstype": "^3.0.10"
       }
     },
     "node_modules/gopd": {
       "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/gopd/-/gopd-1.0.1.tgz",
-      "integrity": "sha512-d65bNlIadxvpb/A2abVdlqKqV563juRnZ1Wtk6s1sIR8uNsXR70xqIzVqxVf1eTqDunwT2MkczEeaezCKTZhwA==",
+      "license": "MIT",
       "dependencies": {
         "get-intrinsic": "^1.1.3"
       },
@@ -7663,33 +6490,28 @@
     },
     "node_modules/graceful-fs": {
       "version": "4.2.11",
-      "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.11.tgz",
-      "integrity": "sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ==",
-      "dev": true
+      "dev": true,
+      "license": "ISC"
     },
     "node_modules/grapheme-splitter": {
       "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/grapheme-splitter/-/grapheme-splitter-1.0.4.tgz",
-      "integrity": "sha512-bzh50DW9kTPM00T8y4o8vQg89Di9oLJVLW/KaOGIXJWP/iqCN6WKYkbNOF04vFLJhwcpYUh9ydh/+5vpOqV4YQ==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/graphemer": {
       "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/graphemer/-/graphemer-1.4.0.tgz",
-      "integrity": "sha512-EtKwoO6kxCL9WO5xipiHTZlSzBm7WLT627TqC/uVRd0HKmq8NXyebnNYxDoBi7wt8eTWrUrKXCOVaFq9x1kgag==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/handle-thing": {
       "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/handle-thing/-/handle-thing-2.0.1.tgz",
-      "integrity": "sha512-9Qn4yBxelxoh2Ow62nP+Ka/kMnOXRi8BXnRaUwezLNhqelnN49xKz4F/dPP8OYLxLxq6JDtZb2i9XznUQbNPTg==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/has": {
       "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz",
-      "integrity": "sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "function-bind": "^1.1.1"
       },
@@ -7699,31 +6521,27 @@
     },
     "node_modules/has-bigints": {
       "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/has-bigints/-/has-bigints-1.0.2.tgz",
-      "integrity": "sha512-tSvCKtBr9lkF0Ex0aQiP9N+OpV4zi2r/Nee5VkRDbaqv35RLYMzbwQfFSZZH0kR+Rd6302UJZ2p/bJCEoR3VoQ==",
       "dev": true,
+      "license": "MIT",
       "funding": {
         "url": "https://github.com/sponsors/ljharb"
       }
     },
     "node_modules/has-flag": {
       "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
-      "integrity": "sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw==",
+      "license": "MIT",
       "engines": {
         "node": ">=4"
       }
     },
     "node_modules/has-own-property": {
       "version": "0.1.0",
-      "resolved": "https://registry.npmjs.org/has-own-property/-/has-own-property-0.1.0.tgz",
-      "integrity": "sha512-14qdBKoonU99XDhWcFKZTShK+QV47qU97u8zzoVo9cL5TZ3BmBHXogItSt9qJjR0KUMFRhcCW8uGIGl8nkl7Aw==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/has-property-descriptors": {
       "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/has-property-descriptors/-/has-property-descriptors-1.0.2.tgz",
-      "integrity": "sha512-55JNKuIW+vq4Ke1BjOTjM2YctQIvCT7GFzHwmfZPGo5wnrgkid0YQtnAleFSqumZm4az3n2BS+erby5ipJdgrg==",
+      "license": "MIT",
       "dependencies": {
         "es-define-property": "^1.0.0"
       },
@@ -7733,8 +6551,7 @@
     },
     "node_modules/has-proto": {
       "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/has-proto/-/has-proto-1.0.1.tgz",
-      "integrity": "sha512-7qE+iP+O+bgF9clE5+UoBFzE65mlBiVj3tKCrlNQ0Ogwm0BjpT/gK4SlLYDMybDh5I3TCTKnPPa0oMG7JDYrhg==",
+      "license": "MIT",
       "engines": {
         "node": ">= 0.4"
       },
@@ -7744,8 +6561,7 @@
     },
     "node_modules/has-symbols": {
       "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.3.tgz",
-      "integrity": "sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A==",
+      "license": "MIT",
       "engines": {
         "node": ">= 0.4"
       },
@@ -7755,8 +6571,7 @@
     },
     "node_modules/has-tostringtag": {
       "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/has-tostringtag/-/has-tostringtag-1.0.0.tgz",
-      "integrity": "sha512-kFjcSNhnlGV1kyoGk7OXKSawH5JOb/LzUc5w9B02hOTO0dfFRjbHQKvg1d6cf3HbeUmtU9VbbV3qzZ2Teh97WQ==",
+      "license": "MIT",
       "dependencies": {
         "has-symbols": "^1.0.2"
       },
@@ -7769,8 +6584,7 @@
     },
     "node_modules/hash-base": {
       "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/hash-base/-/hash-base-3.1.0.tgz",
-      "integrity": "sha512-1nmYp/rhMDiE7AYkDw+lLwlAzz0AntGIe51F3RfFfEqyQ3feY2eI/NcwC6umIQVOASPMsWJLJScWKSSvzL9IVA==",
+      "license": "MIT",
       "dependencies": {
         "inherits": "^2.0.4",
         "readable-stream": "^3.6.0",
@@ -7782,8 +6596,7 @@
     },
     "node_modules/hash.js": {
       "version": "1.1.7",
-      "resolved": "https://registry.npmjs.org/hash.js/-/hash.js-1.1.7.tgz",
-      "integrity": "sha512-taOaskGt4z4SOANNseOviYDvjEJinIkRgmp7LbKP2YTTmVxWBl87s/uzK9r+44BclBSp2X7K1hqeNfz9JbBeXA==",
+      "license": "MIT",
       "dependencies": {
         "inherits": "^2.0.3",
         "minimalistic-assert": "^1.0.1"
@@ -7791,8 +6604,7 @@
     },
     "node_modules/hasown": {
       "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/hasown/-/hasown-2.0.2.tgz",
-      "integrity": "sha512-0hJU9SCPvmMzIBdZFqNPXWa6dqh7WdH0cII9y+CyS8rG3nL48Bclra9HmKhVVUHyPWNH5Y7xDwAB7bfgSjkUMQ==",
+      "license": "MIT",
       "dependencies": {
         "function-bind": "^1.1.2"
       },
@@ -7802,17 +6614,15 @@
     },
     "node_modules/he": {
       "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/he/-/he-1.2.0.tgz",
-      "integrity": "sha512-F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw==",
       "dev": true,
+      "license": "MIT",
       "bin": {
         "he": "bin/he"
       }
     },
     "node_modules/hex-rgb": {
       "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/hex-rgb/-/hex-rgb-4.3.0.tgz",
-      "integrity": "sha512-Ox1pJVrDCyGHMG9CFg1tmrRUMRPRsAWYc/PinY0XzJU4K7y7vjNoLKIQ7BR5UJMCxNN8EM1MNDmHWA/B3aZUuw==",
+      "license": "MIT",
       "engines": {
         "node": ">=6"
       },
@@ -7822,8 +6632,7 @@
     },
     "node_modules/hmac-drbg": {
       "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/hmac-drbg/-/hmac-drbg-1.0.1.tgz",
-      "integrity": "sha512-Tti3gMqLdZfhOQY1Mzf/AanLiqh1WTiJgEj26ZuYQ9fbkLomzGchCws4FyrSd4VkpBfiNhaE1On+lOz894jvXg==",
+      "license": "MIT",
       "dependencies": {
         "hash.js": "^1.0.3",
         "minimalistic-assert": "^1.0.0",
@@ -7832,22 +6641,19 @@
     },
     "node_modules/hoist-non-react-statics": {
       "version": "3.3.2",
-      "resolved": "https://registry.npmjs.org/hoist-non-react-statics/-/hoist-non-react-statics-3.3.2.tgz",
-      "integrity": "sha512-/gGivxi8JPKWNm/W0jSmzcMPpfpPLc3dY/6GxhX2hQ9iGj3aDfklV4ET7NjKpSinLpJ5vafa9iiGIEZg10SfBw==",
+      "license": "BSD-3-Clause",
       "dependencies": {
         "react-is": "^16.7.0"
       }
     },
     "node_modules/hoist-non-react-statics/node_modules/react-is": {
       "version": "16.13.1",
-      "resolved": "https://registry.npmjs.org/react-is/-/react-is-16.13.1.tgz",
-      "integrity": "sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ=="
+      "license": "MIT"
     },
     "node_modules/hpack.js": {
       "version": "2.1.6",
-      "resolved": "https://registry.npmjs.org/hpack.js/-/hpack.js-2.1.6.tgz",
-      "integrity": "sha512-zJxVehUdMGIKsRaNt7apO2Gqp0BdqW5yaiGHXXmbpvxgBYVZnAql+BJb4RO5ad2MgpbZKn5G6nMnegrH1FcNYQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "inherits": "^2.0.1",
         "obuf": "^1.0.0",
@@ -7857,15 +6663,13 @@
     },
     "node_modules/hpack.js/node_modules/isarray": {
       "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
-      "integrity": "sha512-VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/hpack.js/node_modules/readable-stream": {
       "version": "2.3.8",
-      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.8.tgz",
-      "integrity": "sha512-8p0AUk4XODgIewSi0l8Epjs+EVnWiK7NoDIEGU0HhE7+ZyY8D1IMY7odu5lRrFXGg71L15KG8QrPmum45RTtdA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "core-util-is": "~1.0.0",
         "inherits": "~2.0.3",
@@ -7878,23 +6682,19 @@
     },
     "node_modules/hpack.js/node_modules/safe-buffer": {
       "version": "5.1.2",
-      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
-      "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/hpack.js/node_modules/string_decoder": {
       "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
-      "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "safe-buffer": "~5.1.0"
       }
     },
     "node_modules/html-entities": {
       "version": "2.4.0",
-      "resolved": "https://registry.npmjs.org/html-entities/-/html-entities-2.4.0.tgz",
-      "integrity": "sha512-igBTJcNNNhvZFRtm8uA6xMY6xYleeDwn3PeBCkDz7tHttv4F2hsDI2aPgNERWzvRcNYHNT3ymRaQzllmXj4YsQ==",
       "dev": true,
       "funding": [
         {
@@ -7905,13 +6705,13 @@
           "type": "patreon",
           "url": "https://patreon.com/mdevils"
         }
-      ]
-    },
+      ],
+      "license": "MIT"
+    },
     "node_modules/html-loader": {
       "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/html-loader/-/html-loader-4.2.0.tgz",
-      "integrity": "sha512-OxCHD3yt+qwqng2vvcaPApCEvbx+nXWu+v69TYHx1FO8bffHn/JjHtE3TTQZmHjwvnJe4xxzuecetDVBrQR1Zg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "html-minifier-terser": "^7.0.0",
         "parse5": "^7.0.0"
@@ -7929,9 +6729,8 @@
     },
     "node_modules/html-minifier-terser": {
       "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/html-minifier-terser/-/html-minifier-terser-7.2.0.tgz",
-      "integrity": "sha512-tXgn3QfqPIpGl9o+K5tpcj3/MN4SfLtsx2GWwBC3SSd0tXQGyF3gsSqad8loJgKZGM3ZxbYDd5yhiBIdWpmvLA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "camel-case": "^4.1.2",
         "clean-css": "~5.3.2",
@@ -7950,17 +6749,15 @@
     },
     "node_modules/html-parse-stringify": {
       "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/html-parse-stringify/-/html-parse-stringify-3.0.1.tgz",
-      "integrity": "sha512-KknJ50kTInJ7qIScF3jeaFRpMpE8/lfiTdzf/twXyPBLAGrLRTmkz3AdTnKeh40X8k9L2fdYwEp/42WGXIRGcg==",
+      "license": "MIT",
       "dependencies": {
         "void-elements": "3.1.0"
       }
     },
     "node_modules/html-webpack-plugin": {
       "version": "5.5.3",
-      "resolved": "https://registry.npmjs.org/html-webpack-plugin/-/html-webpack-plugin-5.5.3.tgz",
-      "integrity": "sha512-6YrDKTuqaP/TquFH7h4srYWsZx+x6k6+FbsTm0ziCwGHDP78Unr1r9F/H4+sGmMbX08GQcJ+K64x55b+7VM/jg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@types/html-minifier-terser": "^6.0.0",
         "html-minifier-terser": "^6.0.2",
@@ -7981,18 +6778,16 @@
     },
     "node_modules/html-webpack-plugin/node_modules/commander": {
       "version": "8.3.0",
-      "resolved": "https://registry.npmjs.org/commander/-/commander-8.3.0.tgz",
-      "integrity": "sha512-OkTL9umf+He2DZkUq8f8J9of7yL6RJKI24dVITBmNfZBmri9zYZQrKkuXiKhyfPSu8tUhnVBB1iKXevvnlR4Ww==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">= 12"
       }
     },
     "node_modules/html-webpack-plugin/node_modules/html-minifier-terser": {
       "version": "6.1.0",
-      "resolved": "https://registry.npmjs.org/html-minifier-terser/-/html-minifier-terser-6.1.0.tgz",
-      "integrity": "sha512-YXxSlJBZTP7RS3tWnQw74ooKa6L9b9i9QYXY21eUEvhZ3u9XLfv6OnFsQq6RxkhHygsaUMvYsZRV5rU/OVNZxw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "camel-case": "^4.1.2",
         "clean-css": "^5.2.2",
@@ -8011,8 +6806,6 @@
     },
     "node_modules/htmlparser2": {
       "version": "6.1.0",
-      "resolved": "https://registry.npmjs.org/htmlparser2/-/htmlparser2-6.1.0.tgz",
-      "integrity": "sha512-gyyPk6rgonLFEDGoeRgQNaEUvdJ4ktTmmUh/h2t7s+M8oPpIPxgNACWa+6ESR57kXstwqPiCut0V8NRpcwgU7A==",
       "dev": true,
       "funding": [
         "https://github.com/fb55/htmlparser2?sponsor=1",
@@ -8021,6 +6814,7 @@
           "url": "https://github.com/sponsors/fb55"
         }
       ],
+      "license": "MIT",
       "dependencies": {
         "domelementtype": "^2.0.1",
         "domhandler": "^4.0.0",
@@ -8030,24 +6824,21 @@
     },
     "node_modules/htmlparser2/node_modules/entities": {
       "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/entities/-/entities-2.2.0.tgz",
-      "integrity": "sha512-p92if5Nz619I0w+akJrLZH0MX0Pb5DX39XOwQTtXSdQQOaYH03S1uIQp4mhOZtAXrxq4ViO67YTiLBo2638o9A==",
       "dev": true,
+      "license": "BSD-2-Clause",
       "funding": {
         "url": "https://github.com/fb55/entities?sponsor=1"
       }
     },
     "node_modules/http-deceiver": {
       "version": "1.2.7",
-      "resolved": "https://registry.npmjs.org/http-deceiver/-/http-deceiver-1.2.7.tgz",
-      "integrity": "sha512-LmpOGxTfbpgtGVxJrj5k7asXHCgNZp5nLfp+hWc8QQRqtb7fUy6kRY3BO1h9ddF6yIPYUARgxGOwB42DnxIaNw==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/http-errors": {
       "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-2.0.0.tgz",
-      "integrity": "sha512-FtwrG/euBzaEjYeRqOgly7G0qviiXoJWnvEH2Z1plBdXgbyjv34pHTSb9zoeHMyDy33+DWy5Wt9Wo+TURtOYSQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "depd": "2.0.0",
         "inherits": "2.0.4",
@@ -8061,15 +6852,13 @@
     },
     "node_modules/http-parser-js": {
       "version": "0.5.8",
-      "resolved": "https://registry.npmjs.org/http-parser-js/-/http-parser-js-0.5.8.tgz",
-      "integrity": "sha512-SGeBX54F94Wgu5RH3X5jsDtf4eHyRogWX1XGT3b4HuW3tQPM4AaBzoUji/4AAJNXCEOWZ5O0DgZmJw1947gD5Q==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/http-proxy": {
       "version": "1.18.1",
-      "resolved": "https://registry.npmjs.org/http-proxy/-/http-proxy-1.18.1.tgz",
-      "integrity": "sha512-7mz/721AbnJwIVbnaSv1Cz3Am0ZLT/UBwkC92VlxhXv/k/BBQfM2fXElQNC27BVGr0uwUpplYPQM9LnaBMR5NQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "eventemitter3": "^4.0.0",
         "follow-redirects": "^1.0.0",
@@ -8081,9 +6870,8 @@
     },
     "node_modules/http-proxy-middleware": {
       "version": "2.0.6",
-      "resolved": "https://registry.npmjs.org/http-proxy-middleware/-/http-proxy-middleware-2.0.6.tgz",
-      "integrity": "sha512-ya/UeJ6HVBYxrgYotAZo1KvPWlgB48kUJLDePFeneHsVujFaW5WNj2NgWCAE//B1Dl02BIfYlpNgBy8Kf8Rjmw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@types/http-proxy": "^1.17.8",
         "http-proxy": "^1.18.1",
@@ -8105,18 +6893,16 @@
     },
     "node_modules/human-signals": {
       "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/human-signals/-/human-signals-2.1.0.tgz",
-      "integrity": "sha512-B4FFZ6q/T2jhhksgkbEW3HBvWIfDW85snkQgawt07S7J5QXTk6BkNV+0yAeZrM5QpMAdYlocGoljn0sJ/WQkFw==",
       "dev": true,
+      "license": "Apache-2.0",
       "engines": {
         "node": ">=10.17.0"
       }
     },
     "node_modules/husky": {
       "version": "8.0.3",
-      "resolved": "https://registry.npmjs.org/husky/-/husky-8.0.3.tgz",
-      "integrity": "sha512-+dQSyqPh4x1hlO1swXBiNb2HzTDN1I2IGLQx1GrBuiqFJfoMrnZWwVmatvSiO+Iz8fBUnf+lekwNo4c2LlXItg==",
       "dev": true,
+      "license": "MIT",
       "bin": {
         "husky": "lib/bin.js"
       },
@@ -8129,8 +6915,6 @@
     },
     "node_modules/i18next": {
       "version": "21.10.0",
-      "resolved": "https://registry.npmjs.org/i18next/-/i18next-21.10.0.tgz",
-      "integrity": "sha512-YeuIBmFsGjUfO3qBmMOc0rQaun4mIpGKET5WDwvu8lU7gvwpcariZLNtL0Fzj+zazcHUrlXHiptcFhBMFaxzfg==",
       "funding": [
         {
           "type": "individual",
@@ -8145,6 +6929,7 @@
           "url": "https://www.i18next.com/how-to/faq#i18next-is-awesome.-how-can-i-support-the-project"
         }
       ],
+      "license": "MIT",
       "dependencies": {
         "@babel/runtime": "^7.17.2"
       }
@@ -8169,9 +6954,8 @@
     },
     "node_modules/icss-utils": {
       "version": "5.1.0",
-      "resolved": "https://registry.npmjs.org/icss-utils/-/icss-utils-5.1.0.tgz",
-      "integrity": "sha512-soFhflCVWLfRNOPU3iv5Z9VUdT44xFRbzjLsEzSr5AQmgqPMTHdU3PMT1Cf1ssx8fLNJDA1juftYl+PUcv3MqA==",
       "dev": true,
+      "license": "ISC",
       "engines": {
         "node": "^10 || ^12 || >= 14"
       },
@@ -8181,14 +6965,11 @@
     },
     "node_modules/identity-function": {
       "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/identity-function/-/identity-function-1.0.0.tgz",
-      "integrity": "sha512-kNrgUK0qI+9qLTBidsH85HjDLpZfrrS0ElquKKe/fJFdB3D7VeKdXXEvOPDUHSHOzdZKCAAaQIWWyp0l2yq6pw==",
-      "dev": true
+      "dev": true,
+      "license": "public domain"
     },
     "node_modules/ieee754": {
       "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.2.1.tgz",
-      "integrity": "sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA==",
       "funding": [
         {
           "type": "github",
@@ -8202,22 +6983,21 @@
           "type": "consulting",
           "url": "https://feross.org/support"
         }
-      ]
+      ],
+      "license": "BSD-3-Clause"
     },
     "node_modules/ignore": {
       "version": "5.2.4",
-      "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.2.4.tgz",
-      "integrity": "sha512-MAb38BcSbH0eHNBxn7ql2NH/kX33OkB3lZ1BNdh7ENeRChHTYsTvWrMubiIAMNS2llXEEgZ1MUOBtXChP3kaFQ==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">= 4"
       }
     },
     "node_modules/import-fresh": {
       "version": "3.3.0",
-      "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.3.0.tgz",
-      "integrity": "sha512-veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "parent-module": "^1.0.0",
         "resolve-from": "^4.0.0"
@@ -8231,26 +7011,23 @@
     },
     "node_modules/imurmurhash": {
       "version": "0.1.4",
-      "resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz",
-      "integrity": "sha512-JmXMZ6wuvDmLiHEml9ykzqO6lwFbof0GG4IkcGaENdCRDDmMVnny7s5HsIgHCbaq0w2MyPhDqkhTUgS2LU2PHA==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=0.8.19"
       }
     },
     "node_modules/indent-string": {
       "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/indent-string/-/indent-string-4.0.0.tgz",
-      "integrity": "sha512-EdDDZu4A2OyIK7Lr/2zG+w5jmbuk1DVBnEwREQvBzspBJkCEbRa8GxU1lghYcaGJCnRWibjDXlq779X1/y5xwg==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=8"
       }
     },
     "node_modules/inflight": {
       "version": "1.0.6",
-      "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
-      "integrity": "sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA==",
+      "license": "ISC",
       "dependencies": {
         "once": "^1.3.0",
         "wrappy": "1"
@@ -8258,14 +7035,12 @@
     },
     "node_modules/inherits": {
       "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz",
-      "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ=="
+      "license": "ISC"
     },
     "node_modules/internal-slot": {
       "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/internal-slot/-/internal-slot-1.0.5.tgz",
-      "integrity": "sha512-Y+R5hJrzs52QCG2laLn4udYVnxsfny9CpOhNhUvk/SSSVyF6T27FzRbF0sroPidSu3X8oEAkOn2K804mjpt6UQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "get-intrinsic": "^1.2.0",
         "has": "^1.0.3",
@@ -8277,17 +7052,15 @@
     },
     "node_modules/ipaddr.js": {
       "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-2.1.0.tgz",
-      "integrity": "sha512-LlbxQ7xKzfBusov6UMi4MFpEg0m+mAm9xyNGEduwXMEDuf4WfzB/RZwMVYEd7IKGvh4IUkEXYxtAVu9T3OelJQ==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">= 10"
       }
     },
     "node_modules/is-arguments": {
       "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/is-arguments/-/is-arguments-1.1.1.tgz",
-      "integrity": "sha512-8Q7EARjzEnKpt/PCD7e1cgUS0a6X8u5tdSiMqXhojOdoV9TsMsiO+9VLC5vAmO8N7/GmXn7yjR8qnA6bVAEzfA==",
+      "license": "MIT",
       "dependencies": {
         "call-bind": "^1.0.2",
         "has-tostringtag": "^1.0.0"
@@ -8301,9 +7074,8 @@
     },
     "node_modules/is-array-buffer": {
       "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/is-array-buffer/-/is-array-buffer-3.0.2.tgz",
-      "integrity": "sha512-y+FyyR/w8vfIRq4eQcM1EYgSTnmHXPqaF+IgzgraytCFq5Xh8lllDVmAZolPJiZttZLeFSINPYMaEJ7/vWUa1w==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "call-bind": "^1.0.2",
         "get-intrinsic": "^1.2.0",
@@ -8315,15 +7087,13 @@
     },
     "node_modules/is-arrayish": {
       "version": "0.2.1",
-      "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz",
-      "integrity": "sha512-zz06S8t0ozoDXMG+ube26zeCTNXcKIPJZJi8hBrF4idCLms4CG9QtK7qBl1boi5ODzFpjswb5JPmHCbMpjaYzg==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/is-bigint": {
       "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/is-bigint/-/is-bigint-1.0.4.tgz",
-      "integrity": "sha512-zB9CruMamjym81i2JZ3UMn54PKGsQzsJeo6xvN3HJJ4CAsQNB6iRutp2To77OfCNuoxspsIhzaPoO1zyCEhFOg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "has-bigints": "^1.0.1"
       },
@@ -8333,9 +7103,8 @@
     },
     "node_modules/is-binary-path": {
       "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-2.1.0.tgz",
-      "integrity": "sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "binary-extensions": "^2.0.0"
       },
@@ -8345,9 +7114,8 @@
     },
     "node_modules/is-boolean-object": {
       "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/is-boolean-object/-/is-boolean-object-1.1.2.tgz",
-      "integrity": "sha512-gDYaKHJmnj4aWxyj6YHyXVpdQawtVLHU5cb+eztPGczf6cjuTdwve5ZIEfgXqH4e57An1D1AKf8CZ3kYrQRqYA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "call-bind": "^1.0.2",
         "has-tostringtag": "^1.0.0"
@@ -8361,8 +7129,7 @@
     },
     "node_modules/is-callable": {
       "version": "1.2.7",
-      "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.7.tgz",
-      "integrity": "sha512-1BC0BVFhS/p0qtw6enp8e+8OD0UrK0oFLztSjNzhcKA3WDuJxxAPXzPuPtKkjEY9UUoEWlX/8fgKeu2S8i9JTA==",
+      "license": "MIT",
       "engines": {
         "node": ">= 0.4"
       },
@@ -8372,9 +7139,8 @@
     },
     "node_modules/is-core-module": {
       "version": "2.14.0",
-      "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.14.0.tgz",
-      "integrity": "sha512-a5dFJih5ZLYlRtDc0dZWP7RiKr6xIKzmn/oAYCDvdLThadVgyJwlaoQPmRtMSpz+rk0OGAgIu+TcM9HUF0fk1A==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "hasown": "^2.0.2"
       },
@@ -8387,9 +7153,8 @@
     },
     "node_modules/is-date-object": {
       "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/is-date-object/-/is-date-object-1.0.5.tgz",
-      "integrity": "sha512-9YQaSxsAiSwcvS33MBk3wTCVnWK+HhF8VZR2jRxehM16QcVOdHqPn4VPHmRK4lSr38n9JriurInLcP90xsYNfQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "has-tostringtag": "^1.0.0"
       },
@@ -8402,9 +7167,8 @@
     },
     "node_modules/is-docker": {
       "version": "2.2.1",
-      "resolved": "https://registry.npmjs.org/is-docker/-/is-docker-2.2.1.tgz",
-      "integrity": "sha512-F+i2BKsFrH66iaUFc0woD8sLy8getkwTwtOBjvs56Cx4CgJDeKQeqfz8wAYiSb8JOprWhHH5p77PbmYCvvUuXQ==",
       "dev": true,
+      "license": "MIT",
       "bin": {
         "is-docker": "cli.js"
       },
@@ -8417,18 +7181,16 @@
     },
     "node_modules/is-extglob": {
       "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz",
-      "integrity": "sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=0.10.0"
       }
     },
     "node_modules/is-fullwidth-code-point": {
       "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-4.0.0.tgz",
-      "integrity": "sha512-O4L094N2/dZ7xqVdrXhh9r1KODPJpFms8B5sGdJLPy664AgvXsreZUyCQQNItZRDlYug4xStLjNp/sz3HvBowQ==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=12"
       },
@@ -8452,9 +7214,8 @@
     },
     "node_modules/is-glob": {
       "version": "4.0.3",
-      "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz",
-      "integrity": "sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "is-extglob": "^2.1.1"
       },
@@ -8464,27 +7225,24 @@
     },
     "node_modules/is-iterable": {
       "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/is-iterable/-/is-iterable-1.1.1.tgz",
-      "integrity": "sha512-EdOZCr0NsGE00Pot+x1ZFx9MJK3C6wy91geZpXwvwexDLJvA4nzYyZf7r+EIwSeVsOLDdBz7ATg9NqKTzuNYuQ==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">= 4"
       }
     },
     "node_modules/is-map": {
       "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/is-map/-/is-map-2.0.2.tgz",
-      "integrity": "sha512-cOZFQQozTha1f4MxLFzlgKYPTyj26picdZTx82hbc/Xf4K/tZOOXSCkMvU4pKioRXGDLJRn0GM7Upe7kR721yg==",
       "dev": true,
+      "license": "MIT",
       "funding": {
         "url": "https://github.com/sponsors/ljharb"
       }
     },
     "node_modules/is-negative-zero": {
       "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/is-negative-zero/-/is-negative-zero-2.0.2.tgz",
-      "integrity": "sha512-dqJvarLawXsFbNDeJW7zAz8ItJ9cd28YufuuFzh0G8pNHjJMnY08Dv7sYX2uF5UpQOwieAeOExEYAWWfu7ZZUA==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">= 0.4"
       },
@@ -8494,18 +7252,16 @@
     },
     "node_modules/is-number": {
       "version": "7.0.0",
-      "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz",
-      "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=0.12.0"
       }
     },
     "node_modules/is-number-object": {
       "version": "1.0.7",
-      "resolved": "https://registry.npmjs.org/is-number-object/-/is-number-object-1.0.7.tgz",
-      "integrity": "sha512-k1U0IRzLMo7ZlYIfzRu23Oh6MiIFasgpb9X76eqfFZAqwH44UI4KTBvBYIZ1dSL9ZzChTB9ShHfLkR4pdW5krQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "has-tostringtag": "^1.0.0"
       },
@@ -8518,18 +7274,16 @@
     },
     "node_modules/is-path-cwd": {
       "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/is-path-cwd/-/is-path-cwd-2.2.0.tgz",
-      "integrity": "sha512-w942bTcih8fdJPJmQHFzkS76NEP8Kzzvmw92cXsazb8intwLqPibPPdXf4ANdKV3rYMuuQYGIWtvz9JilB3NFQ==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=6"
       }
     },
     "node_modules/is-path-in-cwd": {
       "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/is-path-in-cwd/-/is-path-in-cwd-2.1.0.tgz",
-      "integrity": "sha512-rNocXHgipO+rvnP6dk3zI20RpOtrAM/kzbB258Uw5BWr3TpXi861yzjo16Dn4hUox07iw5AyeMLHWsujkjzvRQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "is-path-inside": "^2.1.0"
       },
@@ -8539,9 +7293,8 @@
     },
     "node_modules/is-path-inside": {
       "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/is-path-inside/-/is-path-inside-2.1.0.tgz",
-      "integrity": "sha512-wiyhTzfDWsvwAW53OBWF5zuvaOGlZ6PwYxAbPVDhpm+gM09xKQGjBq/8uYN12aDvMxnAnq3dxTyoSoRNmg5YFg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "path-is-inside": "^1.0.2"
       },
@@ -8551,9 +7304,8 @@
     },
     "node_modules/is-plain-obj": {
       "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-3.0.0.tgz",
-      "integrity": "sha512-gwsOE28k+23GP1B6vFl1oVh/WOzmawBrKwo5Ev6wMKzPkaXaCDIQKzLnvsA42DRlbVTWorkgTKIviAKCWkfUwA==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=10"
       },
@@ -8563,9 +7315,8 @@
     },
     "node_modules/is-regex": {
       "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.1.4.tgz",
-      "integrity": "sha512-kvRdxDsxZjhzUX07ZnLydzS1TU/TJlTUHHY4YLL87e37oUA49DfkLqgy+VjFocowy29cKvcSiu+kIv728jTTVg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "call-bind": "^1.0.2",
         "has-tostringtag": "^1.0.0"
@@ -8579,18 +7330,16 @@
     },
     "node_modules/is-set": {
       "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/is-set/-/is-set-2.0.2.tgz",
-      "integrity": "sha512-+2cnTEZeY5z/iXGbLhPrOAaK/Mau5k5eXq9j14CpRTftq0pAJu2MwVRSZhyZWBzx3o6X795Lz6Bpb6R0GKf37g==",
       "dev": true,
+      "license": "MIT",
       "funding": {
         "url": "https://github.com/sponsors/ljharb"
       }
     },
     "node_modules/is-shared-array-buffer": {
       "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/is-shared-array-buffer/-/is-shared-array-buffer-1.0.2.tgz",
-      "integrity": "sha512-sqN2UDu1/0y6uvXyStCOzyhAjCSlHceFoMKJW8W9EU9cvic/QdsZ0kEU93HEy3IUEFZIiH/3w+AH/UQbPHNdhA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "call-bind": "^1.0.2"
       },
@@ -8600,9 +7349,8 @@
     },
     "node_modules/is-stream": {
       "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-2.0.1.tgz",
-      "integrity": "sha512-hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=8"
       },
@@ -8612,9 +7360,8 @@
     },
     "node_modules/is-string": {
       "version": "1.0.7",
-      "resolved": "https://registry.npmjs.org/is-string/-/is-string-1.0.7.tgz",
-      "integrity": "sha512-tE2UXzivje6ofPW7l23cjDOMa09gb7xlAqG6jG5ej6uPV32TlWP3NKPigtaGeHNu9fohccRYvIiZMfOOnOYUtg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "has-tostringtag": "^1.0.0"
       },
@@ -8627,9 +7374,8 @@
     },
     "node_modules/is-symbol": {
       "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/is-symbol/-/is-symbol-1.0.4.tgz",
-      "integrity": "sha512-C/CPBqKWnvdcxqIARxyOh4v1UUEOCHpgDa0WYgpKDFMszcrPcffg5uhwSgPCLD2WWxmq6isisz87tzT01tuGhg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "has-symbols": "^1.0.2"
       },
@@ -8642,8 +7388,7 @@
     },
     "node_modules/is-typed-array": {
       "version": "1.1.12",
-      "resolved": "https://registry.npmjs.org/is-typed-array/-/is-typed-array-1.1.12.tgz",
-      "integrity": "sha512-Z14TF2JNG8Lss5/HMqt0//T9JeHXttXy5pH/DBU4vi98ozO2btxzq9MwYDZYnKwU8nRsz/+GVFVRDq3DkVuSPg==",
+      "license": "MIT",
       "dependencies": {
         "which-typed-array": "^1.1.11"
       },
@@ -8656,18 +7401,16 @@
     },
     "node_modules/is-weakmap": {
       "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/is-weakmap/-/is-weakmap-2.0.1.tgz",
-      "integrity": "sha512-NSBR4kH5oVj1Uwvv970ruUkCV7O1mzgVFO4/rev2cLRda9Tm9HrL70ZPut4rOHgY0FNrUu9BCbXA2sdQ+x0chA==",
       "dev": true,
+      "license": "MIT",
       "funding": {
         "url": "https://github.com/sponsors/ljharb"
       }
     },
     "node_modules/is-weakref": {
       "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/is-weakref/-/is-weakref-1.0.2.tgz",
-      "integrity": "sha512-qctsuLZmIQ0+vSSMfoVvyFe2+GSEvnmZ2ezTup1SBse9+twCCeial6EEi3Nc2KFcf6+qz2FBPnjXsk8xhKSaPQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "call-bind": "^1.0.2"
       },
@@ -8677,9 +7420,8 @@
     },
     "node_modules/is-weakset": {
       "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/is-weakset/-/is-weakset-2.0.2.tgz",
-      "integrity": "sha512-t2yVvttHkQktwnNNmBQ98AhENLdPUTDTE21uPqAQ0ARwQfGeQKRVS0NNurH7bTf7RrvcVn1OOge45CnBeHCSmg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "call-bind": "^1.0.2",
         "get-intrinsic": "^1.1.1"
@@ -8690,8 +7432,7 @@
     },
     "node_modules/is-what": {
       "version": "4.1.15",
-      "resolved": "https://registry.npmjs.org/is-what/-/is-what-4.1.15.tgz",
-      "integrity": "sha512-uKua1wfy3Yt+YqsD6mTUEa2zSi3G1oPlqTflgaPJ7z63vUGN5pxFpnQfeSLMFnJDEsdvOtkp1rUWkYjB4YfhgA==",
+      "license": "MIT",
       "engines": {
         "node": ">=12.13"
       },
@@ -8701,9 +7442,8 @@
     },
     "node_modules/is-wsl": {
       "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/is-wsl/-/is-wsl-2.2.0.tgz",
-      "integrity": "sha512-fKzAra0rGJUUBwGBgNkHZuToZcn+TtXHpeCgmkMJMMYx1sQDYaCSyjJBSCa2nH1DGm7s3n1oBnohoVTBaN7Lww==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "is-docker": "^2.0.0"
       },
@@ -8713,30 +7453,26 @@
     },
     "node_modules/isarray": {
       "version": "2.0.5",
-      "resolved": "https://registry.npmjs.org/isarray/-/isarray-2.0.5.tgz",
-      "integrity": "sha512-xHjhDr3cNBK0BzdUJSPXZntQUx/mwMS5Rw4A7lPJ90XGAO6ISP/ePDNuo0vhqOZU+UD5JoodwCAAoZQd3FeAKw==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/isexe": {
       "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz",
-      "integrity": "sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==",
-      "dev": true
+      "dev": true,
+      "license": "ISC"
     },
     "node_modules/iterable-lookahead": {
       "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/iterable-lookahead/-/iterable-lookahead-1.0.0.tgz",
-      "integrity": "sha512-hJnEP2Xk4+44DDwJqUQGdXal5VbyeWLaPyDl2AQc242Zr7iqz4DgpQOrEzglWVMGHMDCkguLHEKxd1+rOsmgSQ==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=4"
       }
     },
     "node_modules/jest-worker": {
       "version": "27.5.1",
-      "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-27.5.1.tgz",
-      "integrity": "sha512-7vuh85V5cdDofPyxn58nrPjBktZo0u9x1g8WtjQol+jZDaE+fhN+cIvTj11GndBnMnyfrUOG1sZQxCdjKh+DKg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@types/node": "*",
         "merge-stream": "^2.0.0",
@@ -8748,18 +7484,16 @@
     },
     "node_modules/jest-worker/node_modules/has-flag": {
       "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=8"
       }
     },
     "node_modules/jest-worker/node_modules/supports-color": {
       "version": "8.1.1",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz",
-      "integrity": "sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "has-flag": "^4.0.0"
       },
@@ -8772,18 +7506,16 @@
     },
     "node_modules/jiti": {
       "version": "1.21.6",
-      "resolved": "https://registry.npmjs.org/jiti/-/jiti-1.21.6.tgz",
-      "integrity": "sha512-2yTgeWTWzMWkHu6Jp9NKgePDaYHbntiwvYuuJLbbN9vl7DC9DvXKOB2BC3ZZ92D3cvV/aflH0osDfwpHepQ53w==",
       "dev": true,
+      "license": "MIT",
       "bin": {
         "jiti": "bin/jiti.js"
       }
     },
     "node_modules/js-sdsl": {
       "version": "4.4.2",
-      "resolved": "https://registry.npmjs.org/js-sdsl/-/js-sdsl-4.4.2.tgz",
-      "integrity": "sha512-dwXFwByc/ajSV6m5bcKAPwe4yDDF6D614pxmIi5odytzxRlwqF6nwoiCek80Ixc7Cvma5awClxrzFtxCQvcM8w==",
       "dev": true,
+      "license": "MIT",
       "funding": {
         "type": "opencollective",
         "url": "https://opencollective.com/js-sdsl"
@@ -8791,24 +7523,20 @@
     },
     "node_modules/js-sha256": {
       "version": "0.10.1",
-      "resolved": "https://registry.npmjs.org/js-sha256/-/js-sha256-0.10.1.tgz",
-      "integrity": "sha512-5obBtsz9301ULlsgggLg542s/jqtddfOpV5KJc4hajc9JV8GeY2gZHSVpYBn4nWqAUTJ9v+xwtbJ1mIBgIH5Vw=="
+      "license": "MIT"
     },
     "node_modules/js-sha3": {
       "version": "0.8.0",
-      "resolved": "https://registry.npmjs.org/js-sha3/-/js-sha3-0.8.0.tgz",
-      "integrity": "sha512-gF1cRrHhIzNfToc802P800N8PpXS+evLLXfsVpowqmAFR9uwbi89WvXg2QspOmXL8QL86J4T1EpFu+yUkwJY3Q=="
+      "license": "MIT"
     },
     "node_modules/js-tokens": {
       "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz",
-      "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ=="
+      "license": "MIT"
     },
     "node_modules/js-yaml": {
       "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz",
-      "integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "argparse": "^2.0.1"
       },
@@ -8818,8 +7546,7 @@
     },
     "node_modules/jsesc": {
       "version": "2.5.2",
-      "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-2.5.2.tgz",
-      "integrity": "sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA==",
+      "license": "MIT",
       "bin": {
         "jsesc": "bin/jsesc"
       },
@@ -8837,26 +7564,22 @@
     },
     "node_modules/json-parse-even-better-errors": {
       "version": "2.3.1",
-      "resolved": "https://registry.npmjs.org/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz",
-      "integrity": "sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/json-schema-traverse": {
       "version": "0.4.1",
-      "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
-      "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/json-stable-stringify-without-jsonify": {
       "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz",
-      "integrity": "sha512-Bdboy+l7tA3OGW6FjyFHWkP5LuByj1Tk33Ljyq0axyzdk9//JSi2u3fP1QSmd1KNwq6VOKYGlAu87CisVir6Pw==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/json5": {
       "version": "2.2.3",
-      "resolved": "https://registry.npmjs.org/json5/-/json5-2.2.3.tgz",
-      "integrity": "sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg==",
+      "license": "MIT",
       "bin": {
         "json5": "lib/cli.js"
       },
@@ -8866,15 +7589,13 @@
     },
     "node_modules/jsonc-parser": {
       "version": "3.2.0",
-      "resolved": "https://registry.npmjs.org/jsonc-parser/-/jsonc-parser-3.2.0.tgz",
-      "integrity": "sha512-gfFQZrcTc8CnKXp6Y4/CBT3fTc0OVuDofpre4aEeEpSBPV5X5v4+Vmx+8snU7RLPrNHPKSgLxGo9YuQzz20o+w==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/jsonfile": {
       "version": "6.1.0",
-      "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.1.0.tgz",
-      "integrity": "sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "universalify": "^2.0.0"
       },
@@ -8884,8 +7605,7 @@
     },
     "node_modules/jsontokens": {
       "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/jsontokens/-/jsontokens-4.0.1.tgz",
-      "integrity": "sha512-+MO415LEN6M+3FGsRz4wU20g7N2JA+2j9d9+pGaNJHviG4L8N0qzavGyENw6fJqsq9CcrHOIL6iWX5yeTZ86+Q==",
+      "license": "MIT",
       "dependencies": {
         "@noble/hashes": "^1.1.2",
         "@noble/secp256k1": "^1.6.3",
@@ -8894,9 +7614,8 @@
     },
     "node_modules/jsx-ast-utils": {
       "version": "3.3.5",
-      "resolved": "https://registry.npmjs.org/jsx-ast-utils/-/jsx-ast-utils-3.3.5.tgz",
-      "integrity": "sha512-ZZow9HBI5O6EPgSJLUb8n2NKgmVWTwCvHGwFuJlMjvLFqlGG6pjirPhtdsseaLZjSibD8eegzmYpUZwoIlj2cQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "array-includes": "^3.1.6",
         "array.prototype.flat": "^1.3.1",
@@ -8909,8 +7628,6 @@
     },
     "node_modules/knip": {
       "version": "5.23.3",
-      "resolved": "https://registry.npmjs.org/knip/-/knip-5.23.3.tgz",
-      "integrity": "sha512-i0vFlpe3D9AZmp3Hlq3ZncjJQB2x21LeVrIV+9rnBavaKpTLhV/sLmE4iqTjEWedLtpfJsax68S68aqZzcXpsQ==",
       "dev": true,
       "funding": [
         {
@@ -8926,6 +7643,7 @@
           "url": "https://polar.sh/webpro-nl"
         }
       ],
+      "license": "ISC",
       "dependencies": {
         "@ericcornelissen/bash-parser": "0.5.3",
         "@nodelib/fs.walk": "2.0.0",
@@ -8960,9 +7678,8 @@
     },
     "node_modules/knip/node_modules/@nodelib/fs.scandir": {
       "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-3.0.0.tgz",
-      "integrity": "sha512-ktI9+PxfHYtKjF3cLTUAh2N+b8MijCRPNwKJNqTVdL0gB0QxLU2rIRaZ1t71oEa3YBDE6bukH1sR0+CDnpp/Mg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@nodelib/fs.stat": "3.0.0",
         "run-parallel": "^1.2.0"
@@ -8973,18 +7690,16 @@
     },
     "node_modules/knip/node_modules/@nodelib/fs.stat": {
       "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-3.0.0.tgz",
-      "integrity": "sha512-2tQOI38s19P9i7X/Drt0v8iMA+KMsgdhB/dyPER+e+2Y8L1Z7QvnuRdW/uLuf5YRFUYmnj4bMA6qCuZHFI1GDQ==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=16.14.0"
       }
     },
     "node_modules/knip/node_modules/@nodelib/fs.walk": {
       "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/@nodelib/fs.walk/-/fs.walk-2.0.0.tgz",
-      "integrity": "sha512-54voNDBobGdMl3BUXSu7UaDh1P85PGHWlJ5e0XhPugo1JulOyCtp2I+5ri4wplGDJ8QGwPEQW7/x3yTLU7yF1A==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@nodelib/fs.scandir": "3.0.0",
         "fastq": "^1.15.0"
@@ -8995,9 +7710,8 @@
     },
     "node_modules/knip/node_modules/picomatch": {
       "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.2.tgz",
-      "integrity": "sha512-M7BAV6Rlcy5u+m6oPhAPFgJTzAioX/6B0DxyvDlo9l8+T3nLKbrczg2WLUyzd45L8RqfUMyGPzekbMvX2Ldkwg==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=12"
       },
@@ -9007,9 +7721,8 @@
     },
     "node_modules/knip/node_modules/strip-json-comments": {
       "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-5.0.1.tgz",
-      "integrity": "sha512-0fk9zBqO67Nq5M/m45qHCJxylV/DhBlIOVExqgOMiCCrzrhU6tCibRXNqE3jwJLftzE9SNuZtYbpzcO+i9FiKw==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=14.16"
       },
@@ -9019,9 +7732,8 @@
     },
     "node_modules/knip/node_modules/tsconfig-paths": {
       "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/tsconfig-paths/-/tsconfig-paths-4.2.0.tgz",
-      "integrity": "sha512-NoZ4roiN7LnbKn9QqE1amc9DJfzvZXxF4xDavcOWt1BPkdx+m+0gJuPM+S0vCe7zTJMYUP0R8pO2XMr+Y8oLIg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "json5": "^2.2.2",
         "minimist": "^1.2.6",
@@ -9033,24 +7745,21 @@
     },
     "node_modules/language-subtag-registry": {
       "version": "0.3.22",
-      "resolved": "https://registry.npmjs.org/language-subtag-registry/-/language-subtag-registry-0.3.22.tgz",
-      "integrity": "sha512-tN0MCzyWnoz/4nHS6uxdlFWoUZT7ABptwKPQ52Ea7URk6vll88bWBVhodtnlfEuCcKWNGoc+uGbw1cwa9IKh/w==",
-      "dev": true
+      "dev": true,
+      "license": "CC0-1.0"
     },
     "node_modules/language-tags": {
       "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/language-tags/-/language-tags-1.0.5.tgz",
-      "integrity": "sha512-qJhlO9cGXi6hBGKoxEG/sKZDAHD5Hnu9Hs4WbOY3pCWXDhw0N8x1NenNzm2EnNLkLkk7J2SdxAkDSbb6ftT+UQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "language-subtag-registry": "~0.3.2"
       }
     },
     "node_modules/launch-editor": {
       "version": "2.6.0",
-      "resolved": "https://registry.npmjs.org/launch-editor/-/launch-editor-2.6.0.tgz",
-      "integrity": "sha512-JpDCcQnyAAzZZaZ7vEiSqL690w7dAEyLao+KC96zBplnYbJS7TYNjvM3M7y3dGz+v7aIsJk3hllWuc0kWAjyRQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "picocolors": "^1.0.0",
         "shell-quote": "^1.7.3"
@@ -9073,9 +7782,8 @@
     },
     "node_modules/levn": {
       "version": "0.4.1",
-      "resolved": "https://registry.npmjs.org/levn/-/levn-0.4.1.tgz",
-      "integrity": "sha512-+bT2uH4E5LGE7h/n3evcS/sQlJXCpIp6ym8OWJ5eV6+67Dsql/LaaT7qJBAt2rzfoa/5QBGBhxDix1dMt2kQKQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "prelude-ls": "^1.2.1",
         "type-check": "~0.4.0"
@@ -9086,24 +7794,21 @@
     },
     "node_modules/lilconfig": {
       "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/lilconfig/-/lilconfig-2.1.0.tgz",
-      "integrity": "sha512-utWOt/GHzuUxnLKxB6dk81RoOeoNeHgbrXiuGk4yyF5qlRz+iIVWu56E2fqGHFrXz0QNUhLB/8nKqvRH66JKGQ==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=10"
       }
     },
     "node_modules/lines-and-columns": {
       "version": "1.2.4",
-      "resolved": "https://registry.npmjs.org/lines-and-columns/-/lines-and-columns-1.2.4.tgz",
-      "integrity": "sha512-7ylylesZQ/PV29jhEDl3Ufjo6ZX7gCqJr5F7PKrqc93v7fzSymt1BpwEU8nAUXs8qzzvqhbjhK5QZg6Mt/HkBg==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/lint-staged": {
       "version": "13.2.3",
-      "resolved": "https://registry.npmjs.org/lint-staged/-/lint-staged-13.2.3.tgz",
-      "integrity": "sha512-zVVEXLuQIhr1Y7R7YAWx4TZLdvuzk7DnmrsTNL0fax6Z3jrpFcas+vKbzxhhvp6TA55m1SQuWkpzI1qbfDZbAg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "chalk": "5.2.0",
         "cli-truncate": "^3.1.0",
@@ -9131,9 +7836,8 @@
     },
     "node_modules/lint-staged/node_modules/chalk": {
       "version": "5.2.0",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-5.2.0.tgz",
-      "integrity": "sha512-ree3Gqw/nazQAPuJJEy+avdl7QfZMcUvmHIKgEZkGL+xOBzRvup5Hxo6LHuMceSxOabuJLJm5Yp/92R9eMmMvA==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": "^12.17.0 || ^14.13 || >=16.0.0"
       },
@@ -9143,9 +7847,8 @@
     },
     "node_modules/lint-staged/node_modules/execa": {
       "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/execa/-/execa-7.2.0.tgz",
-      "integrity": "sha512-UduyVP7TLB5IcAQl+OzLyLcS/l32W/GLg+AhHJ+ow40FOk2U3SAllPwR44v4vmdFwIWqpdwxxpQbF1n5ta9seA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "cross-spawn": "^7.0.3",
         "get-stream": "^6.0.1",
@@ -9166,18 +7869,16 @@
     },
     "node_modules/lint-staged/node_modules/human-signals": {
       "version": "4.3.1",
-      "resolved": "https://registry.npmjs.org/human-signals/-/human-signals-4.3.1.tgz",
-      "integrity": "sha512-nZXjEF2nbo7lIw3mgYjItAfgQXog3OjJogSbKa2CQIIvSGWcKgeJnQlNXip6NglNzYH45nSRiEVimMvYL8DDqQ==",
       "dev": true,
+      "license": "Apache-2.0",
       "engines": {
         "node": ">=14.18.0"
       }
     },
     "node_modules/lint-staged/node_modules/is-stream": {
       "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-3.0.0.tgz",
-      "integrity": "sha512-LnQR4bZ9IADDRSkvpqMGvt/tEJWclzklNgSw48V5EAaAeDd6qGvN8ei6k5p0tvxSR171VmGyHuTiAOfxAbr8kA==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": "^12.20.0 || ^14.13.1 || >=16.0.0"
       },
@@ -9187,9 +7888,8 @@
     },
     "node_modules/lint-staged/node_modules/mimic-fn": {
       "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-4.0.0.tgz",
-      "integrity": "sha512-vqiC06CuhBTUdZH+RYl8sFrL096vA45Ok5ISO6sE/Mr1jRbGH4Csnhi8f3wKVl7x8mO4Au7Ir9D3Oyv1VYMFJw==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=12"
       },
@@ -9199,9 +7899,8 @@
     },
     "node_modules/lint-staged/node_modules/npm-run-path": {
       "version": "5.1.0",
-      "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-5.1.0.tgz",
-      "integrity": "sha512-sJOdmRGrY2sjNTRMbSvluQqg+8X7ZK61yvzBEIDhz4f8z1TZFYABsqjjCBd/0PUNE9M6QDgHJXQkGUEm7Q+l9Q==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "path-key": "^4.0.0"
       },
@@ -9214,9 +7913,8 @@
     },
     "node_modules/lint-staged/node_modules/onetime": {
       "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/onetime/-/onetime-6.0.0.tgz",
-      "integrity": "sha512-1FlR+gjXK7X+AsAHso35MnyN5KqGwJRi/31ft6x0M194ht7S+rWAvd7PHss9xSKMzE0asv1pyIHaJYq+BbacAQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "mimic-fn": "^4.0.0"
       },
@@ -9229,9 +7927,8 @@
     },
     "node_modules/lint-staged/node_modules/path-key": {
       "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/path-key/-/path-key-4.0.0.tgz",
-      "integrity": "sha512-haREypq7xkM7ErfgIyA0z+Bj4AGKlMSdlQE2jvJo6huWD1EdkKYV+G/T4nq0YEF2vgTT8kqMFKo1uHn950r4SQ==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=12"
       },
@@ -9241,9 +7938,8 @@
     },
     "node_modules/lint-staged/node_modules/strip-final-newline": {
       "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/strip-final-newline/-/strip-final-newline-3.0.0.tgz",
-      "integrity": "sha512-dOESqjYr96iWYylGObzd39EuNTa5VJxyvVAEm5Jnh7KGo75V43Hk1odPQkNDyXNmUR6k+gEiDVXnjB8HJ3crXw==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=12"
       },
@@ -9253,9 +7949,8 @@
     },
     "node_modules/listr2": {
       "version": "5.0.8",
-      "resolved": "https://registry.npmjs.org/listr2/-/listr2-5.0.8.tgz",
-      "integrity": "sha512-mC73LitKHj9w6v30nLNGPetZIlfpUniNSsxxrbaPcWOjDb92SHPzJPi/t+v1YC/lxKz/AJ9egOjww0qUuFxBpA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "cli-truncate": "^2.1.0",
         "colorette": "^2.0.19",
@@ -9280,9 +7975,8 @@
     },
     "node_modules/listr2/node_modules/ansi-styles": {
       "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "color-convert": "^2.0.1"
       },
@@ -9295,9 +7989,8 @@
     },
     "node_modules/listr2/node_modules/cli-truncate": {
       "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/cli-truncate/-/cli-truncate-2.1.0.tgz",
-      "integrity": "sha512-n8fOixwDD6b/ObinzTrp1ZKFzbgvKZvuz/TvejnLn1aQfC6r52XEx85FmuC+3HI+JM7coBRXUvNqEU2PHVrHpg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "slice-ansi": "^3.0.0",
         "string-width": "^4.2.0"
@@ -9311,9 +8004,8 @@
     },
     "node_modules/listr2/node_modules/color-convert": {
       "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "color-name": "~1.1.4"
       },
@@ -9323,30 +8015,26 @@
     },
     "node_modules/listr2/node_modules/color-name": {
       "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/listr2/node_modules/emoji-regex": {
       "version": "8.0.0",
-      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
-      "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/listr2/node_modules/is-fullwidth-code-point": {
       "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
-      "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=8"
       }
     },
     "node_modules/listr2/node_modules/p-map": {
       "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/p-map/-/p-map-4.0.0.tgz",
-      "integrity": "sha512-/bjOqmgETBYB5BoEeGVea8dmvHb2m9GLy1E9W43yeyfP6QQCZGFNa+XRceJEuDB6zqr+gKpIAmlLebMpykw/MQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "aggregate-error": "^3.0.0"
       },
@@ -9359,18 +8047,16 @@
     },
     "node_modules/listr2/node_modules/rxjs": {
       "version": "7.8.1",
-      "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-7.8.1.tgz",
-      "integrity": "sha512-AA3TVj+0A2iuIoQkWEK/tqFjBq2j+6PO6Y0zJcvzLAFhEFIO3HL0vls9hWLncZbAAbK0mar7oZ4V079I/qPMxg==",
       "dev": true,
+      "license": "Apache-2.0",
       "dependencies": {
         "tslib": "^2.1.0"
       }
     },
     "node_modules/listr2/node_modules/slice-ansi": {
       "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-3.0.0.tgz",
-      "integrity": "sha512-pSyv7bSTC7ig9Dcgbw9AuRNUb5k5V6oDudjZoMBSr13qpLBG7tB+zgCkARjq7xIUgdz5P1Qe8u+rSGdouOOIyQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "ansi-styles": "^4.0.0",
         "astral-regex": "^2.0.0",
@@ -9382,9 +8068,8 @@
     },
     "node_modules/listr2/node_modules/string-width": {
       "version": "4.2.3",
-      "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
-      "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "emoji-regex": "^8.0.0",
         "is-fullwidth-code-point": "^3.0.0",
@@ -9396,18 +8081,16 @@
     },
     "node_modules/loader-runner": {
       "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/loader-runner/-/loader-runner-4.3.0.tgz",
-      "integrity": "sha512-3R/1M+yS3j5ou80Me59j7F9IMs4PXs3VqRrm0TU3AbKPxlmpoY1TNscJV/oGJXo8qCatFGTfDbY6W6ipGOYXfg==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=6.11.5"
       }
     },
     "node_modules/loader-utils": {
       "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.4.tgz",
-      "integrity": "sha512-xXqpXoINfFhgua9xiqD8fPFHgkoq1mmmpE92WlDbm9rNRd/EbRb+Gqf908T2DMfuHjjJlksiK2RbHVOdD/MqSw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "big.js": "^5.2.2",
         "emojis-list": "^3.0.0",
@@ -9419,9 +8102,8 @@
     },
     "node_modules/local-pkg": {
       "version": "0.4.3",
-      "resolved": "https://registry.npmjs.org/local-pkg/-/local-pkg-0.4.3.tgz",
-      "integrity": "sha512-SFppqq5p42fe2qcZQqqEOiVRXl+WCP1MdT6k7BDEW1j++sp5fIY+/fdRQitvKgB5BrBcmrs5m/L0v2FrU5MY1g==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=14"
       },
@@ -9431,9 +8113,8 @@
     },
     "node_modules/locate-path": {
       "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-6.0.0.tgz",
-      "integrity": "sha512-iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "p-locate": "^5.0.0"
       },
@@ -9446,58 +8127,47 @@
     },
     "node_modules/lodash": {
       "version": "4.17.21",
-      "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz",
-      "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg=="
+      "license": "MIT"
     },
     "node_modules/lodash.clonedeep": {
       "version": "4.5.0",
-      "resolved": "https://registry.npmjs.org/lodash.clonedeep/-/lodash.clonedeep-4.5.0.tgz",
-      "integrity": "sha512-H5ZhCF25riFd9uB5UCkVKo61m3S/xZk1x4wA6yp/L3RFP6Z/eHH1ymQcGLo7J3GMPfm0V/7m1tryHuGVxpqEBQ=="
+      "license": "MIT"
     },
     "node_modules/lodash.curry": {
       "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/lodash.curry/-/lodash.curry-4.1.1.tgz",
-      "integrity": "sha512-/u14pXGviLaweY5JI0IUzgzF2J6Ne8INyzAZjImcryjgkZ+ebruBxy2/JaOOkTqScddcYtakjhSaeemV8lR0tA==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/lodash.get": {
       "version": "4.4.2",
-      "resolved": "https://registry.npmjs.org/lodash.get/-/lodash.get-4.4.2.tgz",
-      "integrity": "sha512-z+Uw/vLuy6gQe8cfaFWD7p0wVv8fJl3mbzXh33RS+0oW2wvUqiRXiQ69gLWSLpgB5/6sU+r6BlQR0MBILadqTQ==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/lodash.merge": {
       "version": "4.6.2",
-      "resolved": "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.2.tgz",
-      "integrity": "sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/lodash.omit": {
       "version": "4.5.0",
-      "resolved": "https://registry.npmjs.org/lodash.omit/-/lodash.omit-4.5.0.tgz",
-      "integrity": "sha512-XeqSp49hNGmlkj2EJlfrQFIzQ6lXdNro9sddtQzcJY8QaoC2GO0DT7xaIokHeyM+mIT0mPMlPvkYzg2xCuHdZg==",
       "license": "MIT"
     },
     "node_modules/lodash.padend": {
       "version": "4.6.1",
-      "resolved": "https://registry.npmjs.org/lodash.padend/-/lodash.padend-4.6.1.tgz",
-      "integrity": "sha512-sOQs2aqGpbl27tmCS1QNZA09Uqp01ZzWfDUoD+xzTii0E7dSQfRKcRetFwa+uXaxaqL+TKm7CgD2JdKP7aZBSw=="
+      "license": "MIT"
     },
     "node_modules/lodash.trimstart": {
       "version": "4.5.1",
-      "resolved": "https://registry.npmjs.org/lodash.trimstart/-/lodash.trimstart-4.5.1.tgz",
-      "integrity": "sha512-b/+D6La8tU76L/61/aN0jULWHkT0EeJCmVstPBn/K9MtD2qBW83AsBNrr63dKuWYwVMO7ucv13QNO/Ek/2RKaQ=="
+      "license": "MIT"
     },
     "node_modules/lodash.words": {
       "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/lodash.words/-/lodash.words-4.2.0.tgz",
-      "integrity": "sha512-mXxqd8Yx9BGPij3lZKFSdOsjOTbL4krbCCp9slEozaN4EMppA2dFmK/f8HeohodprY6W0vOdiQ5WFgPaTI75xQ=="
+      "license": "MIT"
     },
     "node_modules/log-update": {
       "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/log-update/-/log-update-4.0.0.tgz",
-      "integrity": "sha512-9fkkDevMefjg0mmzWFBW8YkFP91OrizzkW3diF7CpG+S2EYdy4+TVfGwz1zeF8x7hCx1ovSPTOE9Ngib74qqUg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "ansi-escapes": "^4.3.0",
         "cli-cursor": "^3.1.0",
@@ -9513,9 +8183,8 @@
     },
     "node_modules/log-update/node_modules/ansi-styles": {
       "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "color-convert": "^2.0.1"
       },
@@ -9528,9 +8197,8 @@
     },
     "node_modules/log-update/node_modules/color-convert": {
       "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "color-name": "~1.1.4"
       },
@@ -9540,30 +8208,26 @@
     },
     "node_modules/log-update/node_modules/color-name": {
       "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/log-update/node_modules/emoji-regex": {
       "version": "8.0.0",
-      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
-      "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/log-update/node_modules/is-fullwidth-code-point": {
       "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
-      "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=8"
       }
     },
     "node_modules/log-update/node_modules/slice-ansi": {
       "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-4.0.0.tgz",
-      "integrity": "sha512-qMCMfhY040cVHT43K9BFygqYbUPFZKHOg7K73mtTWJRb8pyP3fzf4Ixd5SzdEJQ6MRUg/WBnOLxghZtKKurENQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "ansi-styles": "^4.0.0",
         "astral-regex": "^2.0.0",
@@ -9578,9 +8242,8 @@
     },
     "node_modules/log-update/node_modules/string-width": {
       "version": "4.2.3",
-      "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
-      "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "emoji-regex": "^8.0.0",
         "is-fullwidth-code-point": "^3.0.0",
@@ -9592,9 +8255,8 @@
     },
     "node_modules/log-update/node_modules/wrap-ansi": {
       "version": "6.2.0",
-      "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-6.2.0.tgz",
-      "integrity": "sha512-r6lPcBGxZXlIcymEu7InxDMhdW0KDxpLgoFLcguasxCaJ/SOIZwINatK9KY/tf+ZrlywOKU0UDj3ATXUBfxJXA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "ansi-styles": "^4.0.0",
         "string-width": "^4.1.0",
@@ -9606,8 +8268,7 @@
     },
     "node_modules/loose-envify": {
       "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/loose-envify/-/loose-envify-1.4.0.tgz",
-      "integrity": "sha512-lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q==",
+      "license": "MIT",
       "dependencies": {
         "js-tokens": "^3.0.0 || ^4.0.0"
       },
@@ -9617,31 +8278,27 @@
     },
     "node_modules/lottie-web": {
       "version": "5.12.2",
-      "resolved": "https://registry.npmjs.org/lottie-web/-/lottie-web-5.12.2.tgz",
-      "integrity": "sha512-uvhvYPC8kGPjXT3MyKMrL3JitEAmDMp30lVkuq/590Mw9ok6pWcFCwXJveo0t5uqYw1UREQHofD+jVpdjBv8wg=="
+      "license": "MIT"
     },
     "node_modules/loupe": {
       "version": "2.3.7",
-      "resolved": "https://registry.npmjs.org/loupe/-/loupe-2.3.7.tgz",
-      "integrity": "sha512-zSMINGVYkdpYSOBmLi0D1Uo7JU9nVdQKrHxC8eYlV+9YKK9WePqAlL7lSlorG/U2Fw1w0hTBmaa/jrQ3UbPHtA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "get-func-name": "^2.0.1"
       }
     },
     "node_modules/lower-case": {
       "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/lower-case/-/lower-case-2.0.2.tgz",
-      "integrity": "sha512-7fm3l3NAF9WfN6W3JOmf5drwpVqX78JtoGJ3A6W0a6ZnldM41w2fV5D490psKFTpMds8TJse/eHLFFsNHHjHgg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "tslib": "^2.0.3"
       }
     },
     "node_modules/lru-cache": {
       "version": "5.1.1",
-      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-5.1.1.tgz",
-      "integrity": "sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==",
+      "license": "ISC",
       "peer": true,
       "dependencies": {
         "yallist": "^3.0.2"
@@ -9649,9 +8306,8 @@
     },
     "node_modules/magic-string": {
       "version": "0.30.5",
-      "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.30.5.tgz",
-      "integrity": "sha512-7xlpfBaQaP/T6Vh8MO/EqXSW5En6INHEvEXQiuff7Gku0PWjU3uf6w/j9o7O+SpB5fOAkrI5HeoNgwjEO0pFsA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@jridgewell/sourcemap-codec": "^1.4.15"
       },
@@ -9661,17 +8317,15 @@
     },
     "node_modules/map-obj": {
       "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/map-obj/-/map-obj-2.0.0.tgz",
-      "integrity": "sha512-TzQSV2DiMYgoF5RycneKVUzIa9bQsj/B3tTgsE3dOGqlzHnGIDaC7XBE7grnA+8kZPnfqSGFe95VHc2oc0VFUQ==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=4"
       }
     },
     "node_modules/md5.js": {
       "version": "1.3.5",
-      "resolved": "https://registry.npmjs.org/md5.js/-/md5.js-1.3.5.tgz",
-      "integrity": "sha512-xitP+WxNPcTTOgnTJcrhM0xvdPepipPSf3I8EIpGKeFLjt3PlJLIDG3u8EX53ZIubkb+5U2+3rELYpEhHhzdkg==",
+      "license": "MIT",
       "dependencies": {
         "hash-base": "^3.0.0",
         "inherits": "^2.0.1",
@@ -9680,18 +8334,16 @@
     },
     "node_modules/media-typer": {
       "version": "0.3.0",
-      "resolved": "https://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz",
-      "integrity": "sha512-dq+qelQ9akHpcOl/gUVRTxVIOkAJ1wR3QAvb4RsVjS8oVoFjDGTc679wJYmUmknUF5HwMLOgb5O+a3KxfWapPQ==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">= 0.6"
       }
     },
     "node_modules/memfs": {
       "version": "3.5.3",
-      "resolved": "https://registry.npmjs.org/memfs/-/memfs-3.5.3.tgz",
-      "integrity": "sha512-UERzLsxzllchadvbPs5aolHh65ISpKpM+ccLbOJ8/vvpBKmAWf+la7dXFy7Mr0ySHbdHrFv5kGFCUHHe6GFEmw==",
       "dev": true,
+      "license": "Unlicense",
       "dependencies": {
         "fs-monkey": "^1.0.4"
       },
@@ -9701,38 +8353,33 @@
     },
     "node_modules/merge-descriptors": {
       "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.1.tgz",
-      "integrity": "sha512-cCi6g3/Zr1iqQi6ySbseM1Xvooa98N0w31jzUYrXPX2xqObmFGHJ0tQ5u74H3mVh7wLouTseZyYIq39g8cNp1w==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/merge-stream": {
       "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/merge-stream/-/merge-stream-2.0.0.tgz",
-      "integrity": "sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/merge2": {
       "version": "1.4.1",
-      "resolved": "https://registry.npmjs.org/merge2/-/merge2-1.4.1.tgz",
-      "integrity": "sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">= 8"
       }
     },
     "node_modules/methods": {
       "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/methods/-/methods-1.1.2.tgz",
-      "integrity": "sha512-iclAHeNqNm68zFtnZ0e+1L2yUIdvzNoauKU4WBA3VvH/vPFieF7qfRlwUZU+DA9P9bPXIS90ulxoUoCH23sV2w==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">= 0.6"
       }
     },
     "node_modules/micro-packed": {
       "version": "0.5.1",
-      "resolved": "https://registry.npmjs.org/micro-packed/-/micro-packed-0.5.1.tgz",
-      "integrity": "sha512-VjBHcsMAVfivjCZPnqAEEkcihPBbNd39KLEMH76ksL3ORKSZE04gkrtsAmXtaTor67PmTO5h0Rq9+j3PA4zNrw==",
+      "license": "MIT",
       "dependencies": {
         "@scure/base": "~1.1.5"
       },
@@ -9742,9 +8389,8 @@
     },
     "node_modules/micromatch": {
       "version": "4.0.5",
-      "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.5.tgz",
-      "integrity": "sha512-DMy+ERcEW2q8Z2Po+WNXuw3c5YaUSFjAO5GsJqfEl7UjvtIuFKO6ZrKvcItdy98dwFI2N1tg3zNIdKaQT+aNdA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "braces": "^3.0.2",
         "picomatch": "^2.3.1"
@@ -9755,14 +8401,12 @@
     },
     "node_modules/microseconds": {
       "version": "0.1.0",
-      "resolved": "https://registry.npmjs.org/microseconds/-/microseconds-0.1.0.tgz",
-      "integrity": "sha512-yF2K4aHXKxO4OGhW7Ek2KLgKEAFbSblBLKlF6KzwQUhjK7+uAzatRr6fZ82bftdnuDQrkBHAJp5s8quj1ME3wA==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/miller-rabin": {
       "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/miller-rabin/-/miller-rabin-4.0.1.tgz",
-      "integrity": "sha512-115fLhvZVqWwHPbClyntxEVfVDfl9DLLTuJvq3g2O/Oxi8AiNouAHvDSzHS0viUJc+V5vm3eq91Xwqn9dp4jRA==",
+      "license": "MIT",
       "dependencies": {
         "bn.js": "^4.0.0",
         "brorand": "^1.0.1"
@@ -9773,14 +8417,12 @@
     },
     "node_modules/miller-rabin/node_modules/bn.js": {
       "version": "4.12.0",
-      "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.0.tgz",
-      "integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA=="
+      "license": "MIT"
     },
     "node_modules/mime": {
       "version": "1.6.0",
-      "resolved": "https://registry.npmjs.org/mime/-/mime-1.6.0.tgz",
-      "integrity": "sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg==",
       "dev": true,
+      "license": "MIT",
       "bin": {
         "mime": "cli.js"
       },
@@ -9790,16 +8432,14 @@
     },
     "node_modules/mime-db": {
       "version": "1.52.0",
-      "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.52.0.tgz",
-      "integrity": "sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==",
+      "license": "MIT",
       "engines": {
         "node": ">= 0.6"
       }
     },
     "node_modules/mime-types": {
       "version": "2.1.35",
-      "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.35.tgz",
-      "integrity": "sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==",
+      "license": "MIT",
       "dependencies": {
         "mime-db": "1.52.0"
       },
@@ -9809,27 +8449,23 @@
     },
     "node_modules/mimic-fn": {
       "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-2.1.0.tgz",
-      "integrity": "sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=6"
       }
     },
     "node_modules/minimalistic-assert": {
       "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/minimalistic-assert/-/minimalistic-assert-1.0.1.tgz",
-      "integrity": "sha512-UtJcAD4yEaGtjPezWuO9wC4nwUnVH/8/Im3yEHQP4b67cXlD/Qr9hdITCU1xDbSEXg2XKNaP8jsReV7vQd00/A=="
+      "license": "ISC"
     },
     "node_modules/minimalistic-crypto-utils": {
       "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/minimalistic-crypto-utils/-/minimalistic-crypto-utils-1.0.1.tgz",
-      "integrity": "sha512-JIYlbt6g8i5jKfJ3xz7rF0LXmv2TkDxBLUkiBeZ7bAx4GnnNMr8xFpGnOxn6GhTEHx3SjRrZEoU+j04prX1ktg=="
+      "license": "MIT"
     },
     "node_modules/minimatch": {
       "version": "3.1.2",
-      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
-      "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
+      "license": "ISC",
       "dependencies": {
         "brace-expansion": "^1.1.7"
       },
@@ -9839,23 +8475,20 @@
     },
     "node_modules/minimist": {
       "version": "1.2.8",
-      "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.8.tgz",
-      "integrity": "sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA==",
       "dev": true,
+      "license": "MIT",
       "funding": {
         "url": "https://github.com/sponsors/ljharb"
       }
     },
     "node_modules/mixpanel-browser": {
       "version": "2.47.0",
-      "resolved": "https://registry.npmjs.org/mixpanel-browser/-/mixpanel-browser-2.47.0.tgz",
-      "integrity": "sha512-Ldrva0fRBEIFWmEibBQO1PulfpJVF3pf28Guk09lDirDaSQqqU/xs9zQLwN2rL5VwVtsP1aD3JaCgaa98EjojQ=="
+      "license": "Apache-2.0"
     },
     "node_modules/mlly": {
       "version": "1.4.2",
-      "resolved": "https://registry.npmjs.org/mlly/-/mlly-1.4.2.tgz",
-      "integrity": "sha512-i/Ykufi2t1EZ6NaPLdfnZk2AX8cs0d+mTzVKuPfqPKPatxLApaBoxJQ9x1/uckXtrS/U5oisPMDkNs0yQTaBRg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "acorn": "^8.10.0",
         "pathe": "^1.1.1",
@@ -9873,14 +8506,12 @@
     },
     "node_modules/ms": {
       "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w=="
+      "license": "MIT"
     },
     "node_modules/multicast-dns": {
       "version": "7.2.5",
-      "resolved": "https://registry.npmjs.org/multicast-dns/-/multicast-dns-7.2.5.tgz",
-      "integrity": "sha512-2eznPJP8z2BFLX50tf0LuODrpINqP1RVIm/CObbTcBRITQgmC/TjcREF1NeTBzIcR5XO/ukWo+YHOjBbFwIupg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "dns-packet": "^5.2.2",
         "thunky": "^1.0.2"
@@ -9896,22 +8527,20 @@
     },
     "node_modules/nano-time": {
       "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/nano-time/-/nano-time-1.0.0.tgz",
-      "integrity": "sha512-flnngywOoQ0lLQOTRNexn2gGSNuM9bKj9RZAWSzhQ+UJYaAFG9bac4DW9VHjUAzrOaIcajHybCTHe/bkvozQqA==",
+      "license": "ISC",
       "dependencies": {
         "big-integer": "^1.6.16"
       }
     },
     "node_modules/nanoid": {
       "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-4.0.2.tgz",
-      "integrity": "sha512-7ZtY5KTCNheRGfEFxnedV5zFiORN1+Y1N6zvPTnHQd8ENUvfaDBeuJDZb2bN/oXwXxu3qkTXDzy57W5vAmDTBw==",
       "funding": [
         {
           "type": "github",
           "url": "https://github.com/sponsors/ai"
         }
       ],
+      "license": "MIT",
       "bin": {
         "nanoid": "bin/nanoid.js"
       },
@@ -9921,36 +8550,31 @@
     },
     "node_modules/natural-compare": {
       "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz",
-      "integrity": "sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/natural-compare-lite": {
       "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/natural-compare-lite/-/natural-compare-lite-1.4.0.tgz",
-      "integrity": "sha512-Tj+HTDSJJKaZnfiuw+iaF9skdPpTo2GtEly5JHnWV/hfv2Qj/9RKsGISQtLh2ox3l5EAGw487hnBee0sIJ6v2g==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/negotiator": {
       "version": "0.6.3",
-      "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.3.tgz",
-      "integrity": "sha512-+EUsqGPLsM+j/zdChZjsnX51g4XrHFOIXwfnCVPGlQk/k5giakcKsuxCObBRu6DSm9opw/O6slWbJdghQM4bBg==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">= 0.6"
       }
     },
     "node_modules/neo-async": {
       "version": "2.6.2",
-      "resolved": "https://registry.npmjs.org/neo-async/-/neo-async-2.6.2.tgz",
-      "integrity": "sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/no-case": {
       "version": "3.0.4",
-      "resolved": "https://registry.npmjs.org/no-case/-/no-case-3.0.4.tgz",
-      "integrity": "sha512-fgAN3jGAh+RoxUGZHTSOLJIqUc2wmoBwGR4tbpNAKmmovFoWq0OdRkb0VkldReO2a2iBT/OEulG9XSUc10r3zg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "lower-case": "^2.0.2",
         "tslib": "^2.0.3"
@@ -9958,14 +8582,12 @@
     },
     "node_modules/node-abort-controller": {
       "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/node-abort-controller/-/node-abort-controller-3.1.1.tgz",
-      "integrity": "sha512-AGK2yQKIjRuqnc6VkX2Xj5d+QW8xZ87pa1UK6yA6ouUyuxfHuMP6umE5QK7UmTeOAymo+Zx1Fxiuw9rVx8taHQ==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/node-fetch": {
       "version": "2.6.12",
-      "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.12.tgz",
-      "integrity": "sha512-C/fGU2E8ToujUivIO0H+tpQ6HWo4eEmchoPIoXtxCrVghxdKq+QOHqEZW7tuP3KlV3bC8FRMO5nMCC7Zm1VP6g==",
+      "license": "MIT",
       "dependencies": {
         "whatwg-url": "^5.0.0"
       },
@@ -9983,18 +8605,15 @@
     },
     "node_modules/node-fetch/node_modules/tr46": {
       "version": "0.0.3",
-      "resolved": "https://registry.npmjs.org/tr46/-/tr46-0.0.3.tgz",
-      "integrity": "sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw=="
+      "license": "MIT"
     },
     "node_modules/node-fetch/node_modules/webidl-conversions": {
       "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-3.0.1.tgz",
-      "integrity": "sha512-2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ=="
+      "license": "BSD-2-Clause"
     },
     "node_modules/node-fetch/node_modules/whatwg-url": {
       "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-5.0.0.tgz",
-      "integrity": "sha512-saE57nupxk6v3HY35+jzBwYa0rKSy0XR8JSxZPwgLr7ys0IBzhGviA1/TUGJLmSVqs8pb9AnvICXEuOHLprYTw==",
+      "license": "MIT",
       "dependencies": {
         "tr46": "~0.0.3",
         "webidl-conversions": "^3.0.0"
@@ -10002,32 +8621,28 @@
     },
     "node_modules/node-forge": {
       "version": "1.3.1",
-      "resolved": "https://registry.npmjs.org/node-forge/-/node-forge-1.3.1.tgz",
-      "integrity": "sha512-dPEtOeMvF9VMcYV/1Wb8CPoVAXtp6MKMlcbAt4ddqmGqUJ6fQZFXkNZNkNlfevtNkGtaSoXf/vNNNSvgrdXwtA==",
       "dev": true,
+      "license": "(BSD-3-Clause OR GPL-2.0)",
       "engines": {
         "node": ">= 6.13.0"
       }
     },
     "node_modules/node-releases": {
       "version": "2.0.13",
-      "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.13.tgz",
-      "integrity": "sha512-uYr7J37ae/ORWdZeQ1xxMJe3NtdmqMC/JZK+geofDrkLUApKRHPd18/TxtBOJ4A0/+uUIliorNrfYV6s1b02eQ=="
+      "license": "MIT"
     },
     "node_modules/normalize-path": {
       "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz",
-      "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=0.10.0"
       }
     },
     "node_modules/npm-run-path": {
       "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-4.0.1.tgz",
-      "integrity": "sha512-S48WzZW777zhNIrn7gxOlISNAqi9ZC/uQFnRdbeIHhZhCA6UqpkOT8T1G7BvfdgP4Er8gF4sUbaS0i7QvIfCWw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "path-key": "^3.0.0"
       },
@@ -10037,9 +8652,8 @@
     },
     "node_modules/nth-check": {
       "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/nth-check/-/nth-check-2.1.1.tgz",
-      "integrity": "sha512-lqjrjmaOoAnWfMmBPL+XNnynZh2+swxiX3WUE0s4yEHI6m+AwrK2UZOimIRl3X/4QctVqS8AiZjFqyOGrMXb/w==",
       "dev": true,
+      "license": "BSD-2-Clause",
       "dependencies": {
         "boolbase": "^1.0.0"
       },
@@ -10049,26 +8663,23 @@
     },
     "node_modules/object-assign": {
       "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
-      "integrity": "sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg==",
+      "license": "MIT",
       "engines": {
         "node": ">=0.10.0"
       }
     },
     "node_modules/object-inspect": {
       "version": "1.12.3",
-      "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.12.3.tgz",
-      "integrity": "sha512-geUvdk7c+eizMNUDkRpW1wJwgfOiOeHbxBR/hLXK1aT6zmVSO0jsQcs7fj6MGw89jC/cjGfLcNOrtMYtGqm81g==",
       "dev": true,
+      "license": "MIT",
       "funding": {
         "url": "https://github.com/sponsors/ljharb"
       }
     },
     "node_modules/object-is": {
       "version": "1.1.5",
-      "resolved": "https://registry.npmjs.org/object-is/-/object-is-1.1.5.tgz",
-      "integrity": "sha512-3cyDsyHgtmi7I7DfSSI2LDp6SK2lwvtbg0p0R1e0RvTqF5ceGx+K2dfSjm1bKDMVCFEDAQvy+o8c6a7VujOddw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "call-bind": "^1.0.2",
         "define-properties": "^1.1.3"
@@ -10082,33 +8693,29 @@
     },
     "node_modules/object-keys": {
       "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.1.1.tgz",
-      "integrity": "sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">= 0.4"
       }
     },
     "node_modules/object-pairs": {
       "version": "0.1.0",
-      "resolved": "https://registry.npmjs.org/object-pairs/-/object-pairs-0.1.0.tgz",
-      "integrity": "sha512-3ECr6K831I4xX/Mduxr9UC+HPOz/d6WKKYj9p4cmC8Lg8p7g8gitzsxNX5IWlSIgFWN/a4JgrJaoAMKn20oKwA==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/object-values": {
       "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/object-values/-/object-values-1.0.0.tgz",
-      "integrity": "sha512-+8hwcz/JnQ9EpLIXzN0Rs7DLsBpJNT/xYehtB/jU93tHYr5BFEO8E+JGQNOSqE7opVzz5cGksKFHt7uUJVLSjQ==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=0.10.0"
       }
     },
     "node_modules/object.assign": {
       "version": "4.1.4",
-      "resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.4.tgz",
-      "integrity": "sha512-1mxKf0e58bvyjSCtKYY4sRe9itRk3PJpquJOjeIkz885CczcI4IvJJDLPS72oowuSh+pBxUFROpX+TU++hxhZQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "call-bind": "^1.0.2",
         "define-properties": "^1.1.4",
@@ -10124,9 +8731,8 @@
     },
     "node_modules/object.entries": {
       "version": "1.1.6",
-      "resolved": "https://registry.npmjs.org/object.entries/-/object.entries-1.1.6.tgz",
-      "integrity": "sha512-leTPzo4Zvg3pmbQ3rDK69Rl8GQvIqMWubrkxONG9/ojtFE2rD9fjMKfSI5BxW3osRH1m6VdzmqK8oAY9aT4x5w==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "call-bind": "^1.0.2",
         "define-properties": "^1.1.4",
@@ -10138,9 +8744,8 @@
     },
     "node_modules/object.fromentries": {
       "version": "2.0.6",
-      "resolved": "https://registry.npmjs.org/object.fromentries/-/object.fromentries-2.0.6.tgz",
-      "integrity": "sha512-VciD13dswC4j1Xt5394WR4MzmAQmlgN72phd/riNp9vtD7tp4QQWJ0R4wvclXcafgcYK8veHRed2W6XeGBvcfg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "call-bind": "^1.0.2",
         "define-properties": "^1.1.4",
@@ -10155,9 +8760,8 @@
     },
     "node_modules/object.groupby": {
       "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/object.groupby/-/object.groupby-1.0.0.tgz",
-      "integrity": "sha512-70MWG6NfRH9GnbZOikuhPPYzpUpof9iW2J9E4dW7FXTqPNb6rllE6u39SKwwiNh8lCwX3DDb5OgcKGiEBrTTyw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "call-bind": "^1.0.2",
         "define-properties": "^1.2.0",
@@ -10167,9 +8771,8 @@
     },
     "node_modules/object.hasown": {
       "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/object.hasown/-/object.hasown-1.1.2.tgz",
-      "integrity": "sha512-B5UIT3J1W+WuWIU55h0mjlwaqxiE5vYENJXIXZ4VFe05pNYrkKuK0U/6aFcb0pKywYJh7IhfoqUfKVmrJJHZHw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "define-properties": "^1.1.4",
         "es-abstract": "^1.20.4"
@@ -10180,9 +8783,8 @@
     },
     "node_modules/object.values": {
       "version": "1.1.6",
-      "resolved": "https://registry.npmjs.org/object.values/-/object.values-1.1.6.tgz",
-      "integrity": "sha512-FVVTkD1vENCsAcwNs9k6jea2uHC/X0+JcjG8YA60FN5CMaJmG95wT9jek/xX9nornqGRrBkKtzuAu2wuHpKqvw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "call-bind": "^1.0.2",
         "define-properties": "^1.1.4",
@@ -10197,20 +8799,17 @@
     },
     "node_modules/oblivious-set": {
       "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/oblivious-set/-/oblivious-set-1.0.0.tgz",
-      "integrity": "sha512-z+pI07qxo4c2CulUHCDf9lcqDlMSo72N/4rLUpRXf6fu+q8vjt8y0xS+Tlf8NTJDdTXHbdeO1n3MlbctwEoXZw=="
+      "license": "MIT"
     },
     "node_modules/obuf": {
       "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/obuf/-/obuf-1.1.2.tgz",
-      "integrity": "sha512-PX1wu0AmAdPqOL1mWhqmlOd8kOIZQwGZw6rh7uby9fTc5lhaOWFLX3I6R1hrF9k3zUY40e6igsLGkDXK92LJNg==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/on-finished": {
       "version": "2.4.1",
-      "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.4.1.tgz",
-      "integrity": "sha512-oVlzkg3ENAhCk2zdv7IJwd/QUD4z2RxRwpkcGY8psCVcCYZNq4wYnVWALHM+brtuJjePWiYF/ClmuDr8Ch5+kg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "ee-first": "1.1.1"
       },
@@ -10220,26 +8819,23 @@
     },
     "node_modules/on-headers": {
       "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/on-headers/-/on-headers-1.0.2.tgz",
-      "integrity": "sha512-pZAE+FJLoyITytdqK0U5s+FIpjN0JP3OzFi/u8Rx+EV5/W+JTWGXG8xFzevE7AjBfDqHv/8vL8qQsIhHnqRkrA==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">= 0.8"
       }
     },
     "node_modules/once": {
       "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
-      "integrity": "sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==",
+      "license": "ISC",
       "dependencies": {
         "wrappy": "1"
       }
     },
     "node_modules/onetime": {
       "version": "5.1.2",
-      "resolved": "https://registry.npmjs.org/onetime/-/onetime-5.1.2.tgz",
-      "integrity": "sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "mimic-fn": "^2.1.0"
       },
@@ -10252,9 +8848,8 @@
     },
     "node_modules/open": {
       "version": "8.4.2",
-      "resolved": "https://registry.npmjs.org/open/-/open-8.4.2.tgz",
-      "integrity": "sha512-7x81NCL719oNbsq/3mh+hVrAWmFuEYUqrq/Iw3kUzH8ReypT9QQ0BLoJS7/G9k6N81XjW4qHWtjWwe/9eLy1EQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "define-lazy-prop": "^2.0.0",
         "is-docker": "^2.1.1",
@@ -10269,9 +8864,8 @@
     },
     "node_modules/optionator": {
       "version": "0.9.3",
-      "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.9.3.tgz",
-      "integrity": "sha512-JjCoypp+jKn1ttEFExxhetCKeJt9zhAgAve5FXHixTvFDW/5aEktX9bufBKLRRMdU7bNtpLfcGu94B3cdEJgjg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@aashutoshrathi/word-wrap": "^1.2.3",
         "deep-is": "^0.1.3",
@@ -10286,9 +8880,8 @@
     },
     "node_modules/p-limit": {
       "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz",
-      "integrity": "sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "yocto-queue": "^0.1.0"
       },
@@ -10301,9 +8894,8 @@
     },
     "node_modules/p-locate": {
       "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-5.0.0.tgz",
-      "integrity": "sha512-LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "p-limit": "^3.0.2"
       },
@@ -10316,17 +8908,15 @@
     },
     "node_modules/p-map": {
       "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/p-map/-/p-map-2.1.0.tgz",
-      "integrity": "sha512-y3b8Kpd8OAN444hxfBbFfj1FY/RjtTd8tzYwhUqNYXx0fXx2iX4maP4Qr6qhIKbQXI02wTLAda4fYUbDagTUFw==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=6"
       }
     },
     "node_modules/p-queue": {
       "version": "7.3.4",
-      "resolved": "https://registry.npmjs.org/p-queue/-/p-queue-7.3.4.tgz",
-      "integrity": "sha512-esox8CWt0j9EZECFvkFl2WNPat8LN4t7WWeXq73D9ha0V96qPRufApZi4ZhPwXAln1uVVal429HVVKPa2X0yQg==",
+      "license": "MIT",
       "dependencies": {
         "eventemitter3": "^4.0.7",
         "p-timeout": "^5.0.2"
@@ -10340,9 +8930,8 @@
     },
     "node_modules/p-retry": {
       "version": "4.6.2",
-      "resolved": "https://registry.npmjs.org/p-retry/-/p-retry-4.6.2.tgz",
-      "integrity": "sha512-312Id396EbJdvRONlngUx0NydfrIQ5lsYu0znKVUzVvArzEIt08V1qhtyESbGVd1FGX7UKtiFp5uwKZdM8wIuQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@types/retry": "0.12.0",
         "retry": "^0.13.1"
@@ -10353,8 +8942,7 @@
     },
     "node_modules/p-timeout": {
       "version": "5.1.0",
-      "resolved": "https://registry.npmjs.org/p-timeout/-/p-timeout-5.1.0.tgz",
-      "integrity": "sha512-auFDyzzzGZZZdHz3BtET9VEz0SE/uMEAx7uWfGPucfzEwwe/xH0iVeZibQmANYE/hp9T2+UUZT5m+BKyrDp3Ew==",
+      "license": "MIT",
       "engines": {
         "node": ">=12"
       },
@@ -10364,9 +8952,8 @@
     },
     "node_modules/param-case": {
       "version": "3.0.4",
-      "resolved": "https://registry.npmjs.org/param-case/-/param-case-3.0.4.tgz",
-      "integrity": "sha512-RXlj7zCYokReqWpOPH9oYivUzLYZ5vAPIfEmCTNViosC78F8F0H9y7T7gG2M39ymgutxF5gcFEsyZQSph9Bp3A==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "dot-case": "^3.0.4",
         "tslib": "^2.0.3"
@@ -10374,9 +8961,8 @@
     },
     "node_modules/parent-module": {
       "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/parent-module/-/parent-module-1.0.1.tgz",
-      "integrity": "sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "callsites": "^3.0.0"
       },
@@ -10386,8 +8972,7 @@
     },
     "node_modules/parse-asn1": {
       "version": "5.1.6",
-      "resolved": "https://registry.npmjs.org/parse-asn1/-/parse-asn1-5.1.6.tgz",
-      "integrity": "sha512-RnZRo1EPU6JBnra2vGHj0yhp6ebyjBZpmUCLHWiFhxlzvBCCpAuZ7elsBp1PVAbQN0/04VD/19rfzlBSwLstMw==",
+      "license": "ISC",
       "dependencies": {
         "asn1.js": "^5.2.0",
         "browserify-aes": "^1.0.0",
@@ -10398,9 +8983,8 @@
     },
     "node_modules/parse-json": {
       "version": "5.2.0",
-      "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-5.2.0.tgz",
-      "integrity": "sha512-ayCKvm/phCGxOkYRSCM82iDwct8/EonSEgCSxWxD7ve6jHggsFl4fZVQBPRNgQoKiuV/odhFrGzQXZwbifC8Rg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@babel/code-frame": "^7.0.0",
         "error-ex": "^1.3.1",
@@ -10416,9 +9000,8 @@
     },
     "node_modules/parse-ms": {
       "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/parse-ms/-/parse-ms-4.0.0.tgz",
-      "integrity": "sha512-TXfryirbmq34y8QBwgqCVLi+8oA3oWx2eAnSn62ITyEhEYaWRlVZ2DvMM9eZbMs/RfxPu/PK/aBLyGj4IrqMHw==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=18"
       },
@@ -10428,9 +9011,8 @@
     },
     "node_modules/parse5": {
       "version": "7.1.2",
-      "resolved": "https://registry.npmjs.org/parse5/-/parse5-7.1.2.tgz",
-      "integrity": "sha512-Czj1WaSVpaoj0wbhMzLmWD69anp2WH7FXMB9n1Sy8/ZFF9jolSQVMu1Ij5WIyGmcBmhk7EOndpO4mIpihVqAXw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "entities": "^4.4.0"
       },
@@ -10440,18 +9022,16 @@
     },
     "node_modules/parseurl": {
       "version": "1.3.3",
-      "resolved": "https://registry.npmjs.org/parseurl/-/parseurl-1.3.3.tgz",
-      "integrity": "sha512-CiyeOxFT/JZyN5m0z9PfXw4SCBJ6Sygz1Dpl0wqjlhDEGGBP1GnsUVEL0p63hoG1fcj3fHynXi9NYO4nWOL+qQ==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">= 0.8"
       }
     },
     "node_modules/pascal-case": {
       "version": "3.1.2",
-      "resolved": "https://registry.npmjs.org/pascal-case/-/pascal-case-3.1.2.tgz",
-      "integrity": "sha512-uWlGT3YSnK9x3BQJaOdcZwrnV6hPpd8jFH1/ucpiLRPh/2zCVJKS19E4GvYHvaCcACn3foXZ0cLB9Wrx1KGe5g==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "no-case": "^3.0.4",
         "tslib": "^2.0.3"
@@ -10459,8 +9039,7 @@
     },
     "node_modules/path": {
       "version": "0.12.7",
-      "resolved": "https://registry.npmjs.org/path/-/path-0.12.7.tgz",
-      "integrity": "sha512-aXXC6s+1w7otVF9UletFkFcDsJeO7lSZBPUQhtb5O0xJe8LtYhj/GxldoL09bBj9+ZmE2hNoHqQSFMN5fikh4Q==",
+      "license": "MIT",
       "dependencies": {
         "process": "^0.11.1",
         "util": "^0.10.3"
@@ -10468,89 +9047,77 @@
     },
     "node_modules/path-exists": {
       "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz",
-      "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=8"
       }
     },
     "node_modules/path-is-absolute": {
       "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
-      "integrity": "sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg==",
+      "license": "MIT",
       "engines": {
         "node": ">=0.10.0"
       }
     },
     "node_modules/path-is-inside": {
       "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/path-is-inside/-/path-is-inside-1.0.2.tgz",
-      "integrity": "sha512-DUWJr3+ULp4zXmol/SZkFf3JGsS9/SIv+Y3Rt93/UjPpDpklB5f1er4O3POIbUuUJ3FXgqte2Q7SrU6zAqwk8w==",
-      "dev": true
+      "dev": true,
+      "license": "(WTFPL OR MIT)"
     },
     "node_modules/path-key": {
       "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz",
-      "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=8"
       }
     },
     "node_modules/path-parse": {
       "version": "1.0.7",
-      "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.7.tgz",
-      "integrity": "sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/path-to-regexp": {
       "version": "0.1.7",
-      "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.7.tgz",
-      "integrity": "sha512-5DFkuoqlv1uYQKxy8omFBeJPQcdoE07Kv2sferDCrAq1ohOU+MSDswDIbnx3YAM60qIOnYa53wBhXW0EbMonrQ==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/path-type": {
       "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/path-type/-/path-type-4.0.0.tgz",
-      "integrity": "sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=8"
       }
     },
     "node_modules/path/node_modules/inherits": {
       "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
-      "integrity": "sha512-x00IRNXNy63jwGkJmzPigoySHbaqpNuzKbBOmzK+g2OdZpQ9w+sxCN+VSB3ja7IAge2OP2qpfxTjeNcyjmW1uw=="
+      "license": "ISC"
     },
     "node_modules/path/node_modules/util": {
       "version": "0.10.4",
-      "resolved": "https://registry.npmjs.org/util/-/util-0.10.4.tgz",
-      "integrity": "sha512-0Pm9hTQ3se5ll1XihRic3FDIku70C+iHUdT/W926rSgHV5QgXsYbKZN8MSC3tJtSkhuROzvsQjAaFENRXr+19A==",
+      "license": "MIT",
       "dependencies": {
         "inherits": "2.0.3"
       }
     },
     "node_modules/pathe": {
       "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/pathe/-/pathe-1.1.1.tgz",
-      "integrity": "sha512-d+RQGp0MAYTIaDBIMmOfMwz3E+LOZnxx1HZd5R18mmCZY0QBlK0LDZfPc8FW8Ed2DlvsuE6PRjroDY+wg4+j/Q==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/pathval": {
       "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/pathval/-/pathval-1.1.1.tgz",
-      "integrity": "sha512-Dp6zGqpTdETdR63lehJYPeIOqpiNBNtc7BpWSLrOje7UaIsE5aY92r/AunQA7rsXvet3lrJ3JnZX29UPTKXyKQ==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": "*"
       }
     },
     "node_modules/pbkdf2": {
       "version": "3.1.2",
-      "resolved": "https://registry.npmjs.org/pbkdf2/-/pbkdf2-3.1.2.tgz",
-      "integrity": "sha512-iuh7L6jA7JEGu2WxDwtQP1ddOpaJNC4KlDEFfdQajSGgGPNi4OyDc2R7QnbY2bR9QjBVGwgvTdNJZoE7RaxUMA==",
+      "license": "MIT",
       "dependencies": {
         "create-hash": "^1.1.2",
         "create-hmac": "^1.1.4",
@@ -10564,13 +9131,11 @@
     },
     "node_modules/picocolors": {
       "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.0.1.tgz",
-      "integrity": "sha512-anP1Z8qwhkbmu7MFP5iTt+wQKXgwzf7zTyGlcdzabySa9vd0Xt392U0rVmz9poOaBj0uHJKyyo9/upk0HrEQew=="
+      "license": "ISC"
     },
     "node_modules/picomatch": {
       "version": "2.3.1",
-      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz",
-      "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==",
+      "license": "MIT",
       "engines": {
         "node": ">=8.6"
       },
@@ -10580,9 +9145,8 @@
     },
     "node_modules/pidtree": {
       "version": "0.6.0",
-      "resolved": "https://registry.npmjs.org/pidtree/-/pidtree-0.6.0.tgz",
-      "integrity": "sha512-eG2dWTVw5bzqGRztnHExczNxt5VGsE6OwTeCG3fdUf9KBsZzO3R5OIIIzWR+iZA0NtZ+RDVdaoE2dK1cn6jH4g==",
       "dev": true,
+      "license": "MIT",
       "bin": {
         "pidtree": "bin/pidtree.js"
       },
@@ -10592,27 +9156,24 @@
     },
     "node_modules/pify": {
       "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/pify/-/pify-4.0.1.tgz",
-      "integrity": "sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=6"
       }
     },
     "node_modules/pinkie": {
       "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/pinkie/-/pinkie-2.0.4.tgz",
-      "integrity": "sha512-MnUuEycAemtSaeFSjXKW/aroV7akBbY+Sv+RkyqFjgAe73F+MR0TBWKBRDkmfWq/HiFmdavfZ1G7h4SPZXaCSg==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=0.10.0"
       }
     },
     "node_modules/pinkie-promise": {
       "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/pinkie-promise/-/pinkie-promise-2.0.1.tgz",
-      "integrity": "sha512-0Gni6D4UcLTbv9c57DfxDGdr41XfgUjqWZu492f0cIGr16zDU06BWP/RAEvOuo7CQ0CNjHaLlM59YJJFm3NWlw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "pinkie": "^2.0.0"
       },
@@ -10622,9 +9183,8 @@
     },
     "node_modules/pkg-types": {
       "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/pkg-types/-/pkg-types-1.0.3.tgz",
-      "integrity": "sha512-nN7pYi0AQqJnoLPC9eHFQ8AcyaixBUOwvqc5TDnIKCMEE6I0y8P7OKA7fPexsXGCGxQDl/cmrLAp26LhcwxZ4A==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "jsonc-parser": "^3.2.0",
         "mlly": "^1.2.0",
@@ -10633,8 +9193,6 @@
     },
     "node_modules/playwright": {
       "version": "1.45.2",
-      "resolved": "https://registry.npmjs.org/playwright/-/playwright-1.45.2.tgz",
-      "integrity": "sha512-ReywF2t/0teRvNBpfIgh5e4wnrI/8Su8ssdo5XsQKpjxJj+jspm00jSoz9BTg91TT0c9HRjXO7LBNVrgYj9X0g==",
       "license": "Apache-2.0",
       "dependencies": {
         "playwright-core": "1.45.2"
@@ -10651,8 +9209,6 @@
     },
     "node_modules/playwright-core": {
       "version": "1.45.2",
-      "resolved": "https://registry.npmjs.org/playwright-core/-/playwright-core-1.45.2.tgz",
-      "integrity": "sha512-ha175tAWb0dTK0X4orvBIqi3jGEt701SMxMhyujxNrgd8K0Uy5wMSwwcQHtyB4om7INUkfndx02XnQ2p6dvLDw==",
       "license": "Apache-2.0",
       "bin": {
         "playwright-core": "cli.js"
@@ -10663,9 +9219,7 @@
     },
     "node_modules/playwright/node_modules/fsevents": {
       "version": "2.3.2",
-      "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.2.tgz",
-      "integrity": "sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==",
-      "hasInstallScript": true,
+      "license": "MIT",
       "optional": true,
       "os": [
         "darwin"
@@ -10676,8 +9230,6 @@
     },
     "node_modules/postcss": {
       "version": "8.4.39",
-      "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.39.tgz",
-      "integrity": "sha512-0vzE+lAiG7hZl1/9I8yzKLx3aR9Xbof3fBHKunvMfOCYAtMhrsnccJY2iTURb9EZd5+pLuiNV9/c/GZJOHsgIw==",
       "dev": true,
       "funding": [
         {
@@ -10693,6 +9245,7 @@
           "url": "https://github.com/sponsors/ai"
         }
       ],
+      "license": "MIT",
       "dependencies": {
         "nanoid": "^3.3.7",
         "picocolors": "^1.0.1",
@@ -10704,9 +9257,8 @@
     },
     "node_modules/postcss-modules-extract-imports": {
       "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/postcss-modules-extract-imports/-/postcss-modules-extract-imports-3.0.0.tgz",
-      "integrity": "sha512-bdHleFnP3kZ4NYDhuGlVK+CMrQ/pqUm8bx/oGL93K6gVwiclvX5x0n76fYMKuIGKzlABOy13zsvqjb0f92TEXw==",
       "dev": true,
+      "license": "ISC",
       "engines": {
         "node": "^10 || ^12 || >= 14"
       },
@@ -10716,9 +9268,8 @@
     },
     "node_modules/postcss-modules-local-by-default": {
       "version": "4.0.3",
-      "resolved": "https://registry.npmjs.org/postcss-modules-local-by-default/-/postcss-modules-local-by-default-4.0.3.tgz",
-      "integrity": "sha512-2/u2zraspoACtrbFRnTijMiQtb4GW4BvatjaG/bCjYQo8kLTdevCUlwuBHx2sCnSyrI3x3qj4ZK1j5LQBgzmwA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "icss-utils": "^5.0.0",
         "postcss-selector-parser": "^6.0.2",
@@ -10733,9 +9284,8 @@
     },
     "node_modules/postcss-modules-scope": {
       "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/postcss-modules-scope/-/postcss-modules-scope-3.0.0.tgz",
-      "integrity": "sha512-hncihwFA2yPath8oZ15PZqvWGkWf+XUfQgUGamS4LqoP1anQLOsOJw0vr7J7IwLpoY9fatA2qiGUGmuZL0Iqlg==",
       "dev": true,
+      "license": "ISC",
       "dependencies": {
         "postcss-selector-parser": "^6.0.4"
       },
@@ -10748,9 +9298,8 @@
     },
     "node_modules/postcss-modules-values": {
       "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/postcss-modules-values/-/postcss-modules-values-4.0.0.tgz",
-      "integrity": "sha512-RDxHkAiEGI78gS2ofyvCsu7iycRv7oqw5xMWn9iMoR0N/7mf9D50ecQqUo5BZ9Zh2vH4bCUR/ktCqbB9m8vJjQ==",
       "dev": true,
+      "license": "ISC",
       "dependencies": {
         "icss-utils": "^5.0.0"
       },
@@ -10763,9 +9312,8 @@
     },
     "node_modules/postcss-selector-parser": {
       "version": "6.0.13",
-      "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.0.13.tgz",
-      "integrity": "sha512-EaV1Gl4mUEV4ddhDnv/xtj7sxwrwxdetHdWUGnT4VJQf+4d05v6lHYZr8N573k5Z0BViss7BDhfWtKS3+sfAqQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "cssesc": "^3.0.0",
         "util-deprecate": "^1.0.2"
@@ -10776,13 +9324,10 @@
     },
     "node_modules/postcss-value-parser": {
       "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.2.0.tgz",
-      "integrity": "sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ=="
+      "license": "MIT"
     },
     "node_modules/postcss/node_modules/nanoid": {
       "version": "3.3.7",
-      "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.7.tgz",
-      "integrity": "sha512-eSRppjcPIatRIMC1U6UngP8XFcz8MQWGQdt1MTBQ7NaAmvXDfvNxbvWV3x2y6CdEUciCSsDHDQZbhYaB8QEo2g==",
       "dev": true,
       "funding": [
         {
@@ -10790,6 +9335,7 @@
           "url": "https://github.com/sponsors/ai"
         }
       ],
+      "license": "MIT",
       "bin": {
         "nanoid": "bin/nanoid.cjs"
       },
@@ -10799,18 +9345,16 @@
     },
     "node_modules/prelude-ls": {
       "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.2.1.tgz",
-      "integrity": "sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">= 0.8.0"
       }
     },
     "node_modules/prettier": {
       "version": "2.8.8",
-      "resolved": "https://registry.npmjs.org/prettier/-/prettier-2.8.8.tgz",
-      "integrity": "sha512-tdN8qQGvNjw4CHbY+XXk0JgCXn9QiF21a55rBe5LJAU+kDyC4WQn4+awm2Xfk2lQMk5fKup9XgzTZtGkjBdP9Q==",
       "dev": true,
+      "license": "MIT",
       "bin": {
         "prettier": "bin-prettier.js"
       },
@@ -10823,9 +9367,8 @@
     },
     "node_modules/prettier-linter-helpers": {
       "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/prettier-linter-helpers/-/prettier-linter-helpers-1.0.0.tgz",
-      "integrity": "sha512-GbK2cP9nraSSUF9N2XwUwqfzlAFlMNYYl+ShE/V+H8a9uNl/oUqB1w2EL54Jh0OlyRSd8RfWYJ3coVS4TROP2w==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "fast-diff": "^1.1.2"
       },
@@ -10835,9 +9378,8 @@
     },
     "node_modules/prettier-plugin-organize-imports": {
       "version": "3.2.3",
-      "resolved": "https://registry.npmjs.org/prettier-plugin-organize-imports/-/prettier-plugin-organize-imports-3.2.3.tgz",
-      "integrity": "sha512-KFvk8C/zGyvUaE3RvxN2MhCLwzV6OBbFSkwZ2OamCrs9ZY4i5L77jQ/w4UmUr+lqX8qbaqVq6bZZkApn+IgJSg==",
       "dev": true,
+      "license": "MIT",
       "peerDependencies": {
         "@volar/vue-language-plugin-pug": "^1.0.4",
         "@volar/vue-typescript": "^1.0.4",
@@ -10855,9 +9397,8 @@
     },
     "node_modules/pretty-error": {
       "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/pretty-error/-/pretty-error-4.0.0.tgz",
-      "integrity": "sha512-AoJ5YMAcXKYxKhuJGdcvse+Voc6v1RgnsR3nWcYU7q4t6z0Q6T86sv5Zq8VIRbOWWFpvdGE83LtdSMNd+6Y0xw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "lodash": "^4.17.20",
         "renderkid": "^3.0.0"
@@ -10865,9 +9406,8 @@
     },
     "node_modules/pretty-ms": {
       "version": "9.0.0",
-      "resolved": "https://registry.npmjs.org/pretty-ms/-/pretty-ms-9.0.0.tgz",
-      "integrity": "sha512-E9e9HJ9R9NasGOgPaPE8VMeiPKAyWR5jcFpNnwIejslIhWqdqOrb2wShBsncMPUb+BcCd2OPYfh7p2W6oemTng==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "parse-ms": "^4.0.0"
       },
@@ -10880,17 +9420,15 @@
     },
     "node_modules/process": {
       "version": "0.11.10",
-      "resolved": "https://registry.npmjs.org/process/-/process-0.11.10.tgz",
-      "integrity": "sha512-cdGef/drWFoydD1JsMzuFf8100nZl+GT+yacc2bEced5f9Rjk4z+WtFUTBu9PhOi9j/jfmBPu0mMEY4wIdAF8A==",
+      "license": "MIT",
       "engines": {
         "node": ">= 0.6.0"
       }
     },
     "node_modules/process-nextick-args": {
       "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.1.tgz",
-      "integrity": "sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/progress": {
       "version": "1.1.8",
@@ -10902,8 +9440,7 @@
     },
     "node_modules/prop-types": {
       "version": "15.8.1",
-      "resolved": "https://registry.npmjs.org/prop-types/-/prop-types-15.8.1.tgz",
-      "integrity": "sha512-oj87CgZICdulUohogVAR7AjlC0327U4el4L6eAvOqCeudMDVU0NThNaV+b9Df4dXgSP1gXMTnPdhfe/2qDH5cg==",
+      "license": "MIT",
       "dependencies": {
         "loose-envify": "^1.4.0",
         "object-assign": "^4.1.1",
@@ -10912,14 +9449,12 @@
     },
     "node_modules/prop-types/node_modules/react-is": {
       "version": "16.13.1",
-      "resolved": "https://registry.npmjs.org/react-is/-/react-is-16.13.1.tgz",
-      "integrity": "sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ=="
+      "license": "MIT"
     },
     "node_modules/proxy-addr": {
       "version": "2.0.7",
-      "resolved": "https://registry.npmjs.org/proxy-addr/-/proxy-addr-2.0.7.tgz",
-      "integrity": "sha512-llQsMLSUDUPT44jdrU/O37qlnifitDP+ZwrmmZcoSKyLKvtZxpyV0n2/bD/N4tBAAZ/gJEdZU7KMraoK1+XYAg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "forwarded": "0.2.0",
         "ipaddr.js": "1.9.1"
@@ -10930,22 +9465,19 @@
     },
     "node_modules/proxy-addr/node_modules/ipaddr.js": {
       "version": "1.9.1",
-      "resolved": "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.9.1.tgz",
-      "integrity": "sha512-0KI/607xoxSToH7GjN1FfSbLoU0+btTicjsQSWQlh/hZykN8KpmMf7uYwPW3R+akZ6R/w18ZlXSHBYXiYUPO3g==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">= 0.10"
       }
     },
     "node_modules/proxy-from-env": {
       "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/proxy-from-env/-/proxy-from-env-1.1.0.tgz",
-      "integrity": "sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg=="
+      "license": "MIT"
     },
     "node_modules/public-encrypt": {
       "version": "4.0.3",
-      "resolved": "https://registry.npmjs.org/public-encrypt/-/public-encrypt-4.0.3.tgz",
-      "integrity": "sha512-zVpa8oKZSz5bTMTFClc1fQOnyyEzpl5ozpi1B5YcvBrdohMjH2rfsBtyXcuNuwjsDIXmBYlF2N5FlJYhR29t8Q==",
+      "license": "MIT",
       "dependencies": {
         "bn.js": "^4.1.0",
         "browserify-rsa": "^4.0.0",
@@ -10957,40 +9489,33 @@
     },
     "node_modules/public-encrypt/node_modules/bn.js": {
       "version": "4.12.0",
-      "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.0.tgz",
-      "integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA=="
+      "license": "MIT"
     },
     "node_modules/punycode": {
       "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.3.0.tgz",
-      "integrity": "sha512-rRV+zQD8tVFys26lAGR9WUuS4iUAngJScM+ZRSKtvl5tKeZ2t5bvdNFdNHBW9FWR4guGHlgmsZ1G7BSm2wTbuA==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=6"
       }
     },
     "node_modules/qr-code-styling": {
       "version": "1.5.0",
-      "resolved": "https://registry.npmjs.org/qr-code-styling/-/qr-code-styling-1.5.0.tgz",
-      "integrity": "sha512-7C+1cZGsZWH0BIRtv24faKZJwkxdYlynXktP9dDxKNSik2bqaUZck3B3MpQod/wqm9i3l4q7QsPGkRGKvcuqZw==",
+      "license": "MIT",
       "dependencies": {
         "qrcode-generator": "^1.4.3"
       }
     },
     "node_modules/qr.js": {
       "version": "0.0.0",
-      "resolved": "https://registry.npmjs.org/qr.js/-/qr.js-0.0.0.tgz",
-      "integrity": "sha512-c4iYnWb+k2E+vYpRimHqSu575b1/wKl4XFeJGpFmrJQz5I88v9aY2czh7s0w36srfCM1sXgC/xpoJz5dJfq+OQ=="
+      "license": "MIT"
     },
     "node_modules/qrcode-generator": {
       "version": "1.4.4",
-      "resolved": "https://registry.npmjs.org/qrcode-generator/-/qrcode-generator-1.4.4.tgz",
-      "integrity": "sha512-HM7yY8O2ilqhmULxGMpcHSF1EhJJ9yBj8gvDEuZ6M+KGJ0YY2hKpnXvRD+hZPLrDVck3ExIGhmPtSdcjC+guuw=="
+      "license": "MIT"
     },
     "node_modules/queue-microtask": {
       "version": "1.2.3",
-      "resolved": "https://registry.npmjs.org/queue-microtask/-/queue-microtask-1.2.3.tgz",
-      "integrity": "sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A==",
       "dev": true,
       "funding": [
         {
@@ -11005,20 +9530,19 @@
           "type": "consulting",
           "url": "https://feross.org/support"
         }
-      ]
+      ],
+      "license": "MIT"
     },
     "node_modules/randombytes": {
       "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/randombytes/-/randombytes-2.1.0.tgz",
-      "integrity": "sha512-vYl3iOX+4CKUWuxGi9Ukhie6fsqXqS9FE2Zaic4tNFD2N2QQaXOMFbuKK4QmDHC0JO6B1Zp41J0LpT0oR68amQ==",
+      "license": "MIT",
       "dependencies": {
         "safe-buffer": "^5.1.0"
       }
     },
     "node_modules/randomfill": {
       "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/randomfill/-/randomfill-1.0.4.tgz",
-      "integrity": "sha512-87lcbR8+MhcWcUiQ+9e+Rwx8MyR2P7qnt15ynUlbm3TU/fjbgz4GsvfSUDTemtCCtVCqb4ZcEFlyPNTh9bBTLw==",
+      "license": "MIT",
       "dependencies": {
         "randombytes": "^2.0.5",
         "safe-buffer": "^5.1.0"
@@ -11026,18 +9550,16 @@
     },
     "node_modules/range-parser": {
       "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/range-parser/-/range-parser-1.2.1.tgz",
-      "integrity": "sha512-Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">= 0.6"
       }
     },
     "node_modules/raw-body": {
       "version": "2.5.1",
-      "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.5.1.tgz",
-      "integrity": "sha512-qqJBtEyVgS0ZmPGdCFPWJ3FreoqvG4MVQln/kCgF7Olq95IbOp0/BWyMwbdtn4VTvkM8Y7khCQ2Xgk/tcrCXig==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "bytes": "3.1.2",
         "http-errors": "2.0.0",
@@ -11050,18 +9572,16 @@
     },
     "node_modules/raw-body/node_modules/bytes": {
       "version": "3.1.2",
-      "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.1.2.tgz",
-      "integrity": "sha512-/Nf7TyzTx6S3yRJObOAV7956r8cr2+Oj8AC5dt8wSP3BQAoeX58NoHyCU8P8zGkNXStjTSi6fzO6F0pBdcYbEg==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">= 0.8"
       }
     },
     "node_modules/raw-body/node_modules/iconv-lite": {
       "version": "0.4.24",
-      "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz",
-      "integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "safer-buffer": ">= 2.1.2 < 3"
       },
@@ -11071,8 +9591,7 @@
     },
     "node_modules/rc-dialog": {
       "version": "9.1.0",
-      "resolved": "https://registry.npmjs.org/rc-dialog/-/rc-dialog-9.1.0.tgz",
-      "integrity": "sha512-5ry+JABAWEbaKyYsmITtrJbZbJys8CtMyzV8Xn4LYuXMeUx5XVHNyJRoqLFE4AzBuXXzOWeaC49cg+XkxK6kHA==",
+      "license": "MIT",
       "dependencies": {
         "@babel/runtime": "^7.10.1",
         "@rc-component/portal": "^1.0.0-8",
@@ -11087,8 +9606,7 @@
     },
     "node_modules/rc-image": {
       "version": "5.18.1",
-      "resolved": "https://registry.npmjs.org/rc-image/-/rc-image-5.18.1.tgz",
-      "integrity": "sha512-xdr5zHpSJ6sGdV5oIkHWbttc21LlGKZZjWXVXxSS0sNmqSn97WzOKQBNrTA85UP7oBPPThZAGGGNmGnTkx2qYQ==",
+      "license": "MIT",
       "dependencies": {
         "@babel/runtime": "^7.11.2",
         "@rc-component/portal": "^1.0.2",
@@ -11104,8 +9622,7 @@
     },
     "node_modules/rc-motion": {
       "version": "2.7.3",
-      "resolved": "https://registry.npmjs.org/rc-motion/-/rc-motion-2.7.3.tgz",
-      "integrity": "sha512-2xUvo8yGHdOHeQbdI8BtBsCIrWKchEmFEIskf0nmHtJsou+meLd/JE+vnvSX2JxcBrJtXY2LuBpxAOxrbY/wMQ==",
+      "license": "MIT",
       "dependencies": {
         "@babel/runtime": "^7.11.1",
         "classnames": "^2.2.1",
@@ -11118,8 +9635,7 @@
     },
     "node_modules/rc-util": {
       "version": "5.35.0",
-      "resolved": "https://registry.npmjs.org/rc-util/-/rc-util-5.35.0.tgz",
-      "integrity": "sha512-MTXlixb3EoSTEchsOc7XWsVyoUQqoCsh2Z1a2IptwNgqleMF6ZgQeY52UzUbNj5CcVBg9YljOWjuOV07jSSm4Q==",
+      "license": "MIT",
       "dependencies": {
         "@babel/runtime": "^7.18.3",
         "react-is": "^16.12.0"
@@ -11131,13 +9647,11 @@
     },
     "node_modules/rc-util/node_modules/react-is": {
       "version": "16.13.1",
-      "resolved": "https://registry.npmjs.org/react-is/-/react-is-16.13.1.tgz",
-      "integrity": "sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ=="
+      "license": "MIT"
     },
     "node_modules/react": {
       "version": "18.2.0",
-      "resolved": "https://registry.npmjs.org/react/-/react-18.2.0.tgz",
-      "integrity": "sha512-/3IjMdb2L9QbBdWiW5e3P2/npwMBaU9mHCSCUzNln0ZCYbcfTsGbTJrU/kGemdH2IWmB2ioZ+zkxtmq6g09fGQ==",
+      "license": "MIT",
       "dependencies": {
         "loose-envify": "^1.1.0"
       },
@@ -11147,8 +9661,7 @@
     },
     "node_modules/react-content-loader": {
       "version": "6.2.1",
-      "resolved": "https://registry.npmjs.org/react-content-loader/-/react-content-loader-6.2.1.tgz",
-      "integrity": "sha512-6ONbFX+Hi3SHuP66JB8CPvJn372pj+qwltJV0J8z/8MFrq98I1cbFdZuhDWeQXu3CFxiiDTXJn7DFxx2ZvrO7g==",
+      "license": "MIT",
       "engines": {
         "node": ">=10"
       },
@@ -11158,8 +9671,7 @@
     },
     "node_modules/react-dom": {
       "version": "18.2.0",
-      "resolved": "https://registry.npmjs.org/react-dom/-/react-dom-18.2.0.tgz",
-      "integrity": "sha512-6IMTriUmvsjHUjNtEDudZfuDQUoWXVxKHhlEGSk81n4YFS+r/Kl99wXiwlVXtPBtJenozv2P+hxDsw9eA7Xo6g==",
+      "license": "MIT",
       "dependencies": {
         "loose-envify": "^1.1.0",
         "scheduler": "^0.23.0"
@@ -11170,8 +9682,7 @@
     },
     "node_modules/react-hot-toast": {
       "version": "2.4.1",
-      "resolved": "https://registry.npmjs.org/react-hot-toast/-/react-hot-toast-2.4.1.tgz",
-      "integrity": "sha512-j8z+cQbWIM5LY37pR6uZR6D4LfseplqnuAO4co4u8917hBUvXlEqyP1ZzqVLcqoyUesZZv/ImreoCeHVDpE5pQ==",
+      "license": "MIT",
       "dependencies": {
         "goober": "^2.1.10"
       },
@@ -11185,8 +9696,7 @@
     },
     "node_modules/react-i18next": {
       "version": "11.18.6",
-      "resolved": "https://registry.npmjs.org/react-i18next/-/react-i18next-11.18.6.tgz",
-      "integrity": "sha512-yHb2F9BiT0lqoQDt8loZ5gWP331GwctHz9tYQ8A2EIEUu+CcEdjBLQWli1USG3RdWQt3W+jqQLg/d4rrQR96LA==",
+      "license": "MIT",
       "dependencies": {
         "@babel/runtime": "^7.14.5",
         "html-parse-stringify": "^3.0.1"
@@ -11206,13 +9716,11 @@
     },
     "node_modules/react-is": {
       "version": "18.2.0",
-      "resolved": "https://registry.npmjs.org/react-is/-/react-is-18.2.0.tgz",
-      "integrity": "sha512-xWGDIW6x921xtzPkhiULtthJHoJvBbF3q26fzloPCK0hsvxtPVelvftw3zjbHWSkR2km9Z+4uxbDDK/6Zw9B8w=="
+      "license": "MIT"
     },
     "node_modules/react-is-visible": {
       "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/react-is-visible/-/react-is-visible-1.2.0.tgz",
-      "integrity": "sha512-052RH7aHdKrABOBH12wvS2zTAzJ8MnaswPvX2AQGq5wxvD8BnQ5vcnf0cA0cj2g4bjH0+qXz1AIkEL9ZlnN23A==",
+      "license": "MIT",
       "dependencies": {
         "@babel/runtime": "^7.12.5",
         "hoist-non-react-statics": "3.3.2"
@@ -11224,13 +9732,11 @@
     },
     "node_modules/react-lifecycles-compat": {
       "version": "3.0.4",
-      "resolved": "https://registry.npmjs.org/react-lifecycles-compat/-/react-lifecycles-compat-3.0.4.tgz",
-      "integrity": "sha512-fBASbA6LnOU9dOU2eW7aQ8xmYBSXUIWr+UmF9b1efZBazGNO+rcXT/icdKnYm2pTwcRylVUYwW7H1PHfLekVzA=="
+      "license": "MIT"
     },
     "node_modules/react-lottie": {
       "version": "1.2.4",
-      "resolved": "https://registry.npmjs.org/react-lottie/-/react-lottie-1.2.4.tgz",
-      "integrity": "sha512-kBGxI+MIZGBf4wZhNCWwHkMcVP+kbpmrLWH/SkO0qCKc7D7eSPcxQbfpsmsCo8v2KCBYjuGSou+xTqK44D/jMg==",
+      "license": "MIT",
       "dependencies": {
         "babel-runtime": "^6.26.0",
         "lottie-web": "^5.1.3"
@@ -11244,8 +9750,7 @@
     },
     "node_modules/react-modal": {
       "version": "3.16.1",
-      "resolved": "https://registry.npmjs.org/react-modal/-/react-modal-3.16.1.tgz",
-      "integrity": "sha512-VStHgI3BVcGo7OXczvnJN7yT2TWHJPDXZWyI/a0ssFNhGZWsPmB8cF0z33ewDXq4VfYMO1vXgiv/g8Nj9NDyWg==",
+      "license": "MIT",
       "dependencies": {
         "exenv": "^1.2.0",
         "prop-types": "^15.7.2",
@@ -11262,8 +9767,7 @@
     },
     "node_modules/react-number-format": {
       "version": "5.2.2",
-      "resolved": "https://registry.npmjs.org/react-number-format/-/react-number-format-5.2.2.tgz",
-      "integrity": "sha512-wCh64Z1HCwXcO2dbgkeYIaB+Rmp/fcsH8kAeRtUkc46dv1pIrgDjie2WkOqKBw8YqyqhwNdYgNFNQuuY+iGJ/g==",
+      "license": "MIT",
       "dependencies": {
         "prop-types": "^15.7.2"
       },
@@ -11274,8 +9778,7 @@
     },
     "node_modules/react-qr-code": {
       "version": "2.0.11",
-      "resolved": "https://registry.npmjs.org/react-qr-code/-/react-qr-code-2.0.11.tgz",
-      "integrity": "sha512-P7mvVM5vk9NjGdHMt4Z0KWeeJYwRAtonHTghZT2r+AASinLUUKQ9wfsGH2lPKsT++gps7hXmaiMGRvwTDEL9OA==",
+      "license": "MIT",
       "dependencies": {
         "prop-types": "^15.8.1",
         "qr.js": "0.0.0"
@@ -11292,8 +9795,7 @@
     },
     "node_modules/react-redux": {
       "version": "7.2.9",
-      "resolved": "https://registry.npmjs.org/react-redux/-/react-redux-7.2.9.tgz",
-      "integrity": "sha512-Gx4L3uM182jEEayZfRbI/G11ZpYdNAnBs70lFVMNdHJI76XYtR+7m0MN+eAs7UHBPhWXcnFPaS+9owSCJQHNpQ==",
+      "license": "MIT",
       "dependencies": {
         "@babel/runtime": "^7.15.4",
         "@types/react-redux": "^7.1.20",
@@ -11316,23 +9818,20 @@
     },
     "node_modules/react-redux/node_modules/react-is": {
       "version": "17.0.2",
-      "resolved": "https://registry.npmjs.org/react-is/-/react-is-17.0.2.tgz",
-      "integrity": "sha512-w2GsyukL62IJnlaff/nRegPQR94C/XXamvMWmSHRJ4y7Ts/4ocGRmTHvOs8PSE6pB3dWOrD/nueuU5sduBsQ4w=="
+      "license": "MIT"
     },
     "node_modules/react-refresh": {
       "version": "0.14.0",
-      "resolved": "https://registry.npmjs.org/react-refresh/-/react-refresh-0.14.0.tgz",
-      "integrity": "sha512-wViHqhAd8OHeLS/IRMJjTSDHF3U9eWi62F/MledQGPdJGDhodXJ9PBLNGr6WWL7qlH12Mt3TyTpbS+hGXMjCzQ==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=0.10.0"
       }
     },
     "node_modules/react-refresh-typescript": {
       "version": "2.0.9",
-      "resolved": "https://registry.npmjs.org/react-refresh-typescript/-/react-refresh-typescript-2.0.9.tgz",
-      "integrity": "sha512-chAnOO4vpxm/3WkgOVmti+eN8yUtkJzeGkOigV6UA9eDFz12W34e/SsYe2H5+RwYJ3+sfSZkVbiXcG1chEBxlg==",
       "dev": true,
+      "license": "MIT",
       "peerDependencies": {
         "react-refresh": "0.10.x || 0.11.x || 0.12.x || 0.13.x || 0.14.x",
         "typescript": "^4.8 || ^5.0"
@@ -11340,8 +9839,7 @@
     },
     "node_modules/react-router": {
       "version": "6.14.2",
-      "resolved": "https://registry.npmjs.org/react-router/-/react-router-6.14.2.tgz",
-      "integrity": "sha512-09Zss2dE2z+T1D03IheqAFtK4UzQyX8nFPWx6jkwdYzGLXd5ie06A6ezS2fO6zJfEb/SpG6UocN2O1hfD+2urQ==",
+      "license": "MIT",
       "dependencies": {
         "@remix-run/router": "1.7.2"
       },
@@ -11354,8 +9852,7 @@
     },
     "node_modules/react-router-dom": {
       "version": "6.14.2",
-      "resolved": "https://registry.npmjs.org/react-router-dom/-/react-router-dom-6.14.2.tgz",
-      "integrity": "sha512-5pWX0jdKR48XFZBuJqHosX3AAHjRAzygouMTyimnBPOLdY3WjzUSKhus2FVMihUFWzeLebDgr4r8UeQFAct7Bg==",
+      "license": "MIT",
       "dependencies": {
         "@remix-run/router": "1.7.2",
         "react-router": "6.14.2"
@@ -11370,8 +9867,7 @@
     },
     "node_modules/react-switch": {
       "version": "7.0.0",
-      "resolved": "https://registry.npmjs.org/react-switch/-/react-switch-7.0.0.tgz",
-      "integrity": "sha512-KkDeW+cozZXI6knDPyUt3KBN1rmhoVYgAdCJqAh7st7tk8YE6N0iR89zjCWO8T8dUTeJGTR0KU+5CHCRMRffiA==",
+      "license": "MIT",
       "dependencies": {
         "prop-types": "^15.7.2"
       },
@@ -11382,8 +9878,7 @@
     },
     "node_modules/react-tabs": {
       "version": "6.0.2",
-      "resolved": "https://registry.npmjs.org/react-tabs/-/react-tabs-6.0.2.tgz",
-      "integrity": "sha512-aQXTKolnM28k3KguGDBSAbJvcowOQr23A+CUJdzJtOSDOtTwzEaJA+1U4KwhNL9+Obe+jFS7geuvA7ICQPXOnQ==",
+      "license": "MIT",
       "dependencies": {
         "clsx": "^2.0.0",
         "prop-types": "^15.5.0"
@@ -11394,8 +9889,7 @@
     },
     "node_modules/react-tooltip": {
       "version": "5.19.0",
-      "resolved": "https://registry.npmjs.org/react-tooltip/-/react-tooltip-5.19.0.tgz",
-      "integrity": "sha512-NSUk77GMpxYKHFKJVNHL++QQXRuH2QW1qDrXPtJnp2s/MJvUnU73N5TTADwDyrO2+xGlr0xHhjvQphkF60cMEA==",
+      "license": "MIT",
       "dependencies": {
         "@floating-ui/dom": "^1.0.0",
         "classnames": "^2.3.0"
@@ -11407,8 +9901,7 @@
     },
     "node_modules/readable-stream": {
       "version": "3.6.2",
-      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.2.tgz",
-      "integrity": "sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA==",
+      "license": "MIT",
       "dependencies": {
         "inherits": "^2.0.3",
         "string_decoder": "^1.1.1",
@@ -11420,9 +9913,8 @@
     },
     "node_modules/readdirp": {
       "version": "3.6.0",
-      "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.6.0.tgz",
-      "integrity": "sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "picomatch": "^2.2.1"
       },
@@ -11432,32 +9924,28 @@
     },
     "node_modules/redux": {
       "version": "4.2.1",
-      "resolved": "https://registry.npmjs.org/redux/-/redux-4.2.1.tgz",
-      "integrity": "sha512-LAUYz4lc+Do8/g7aeRa8JkyDErK6ekstQaqWQrNRW//MY1TvCEpMtpTWvlQ+FPbWCx+Xixu/6SHt5N0HR+SB4w==",
+      "license": "MIT",
       "dependencies": {
         "@babel/runtime": "^7.9.2"
       }
     },
     "node_modules/redux-persist": {
       "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/redux-persist/-/redux-persist-6.0.0.tgz",
-      "integrity": "sha512-71LLMbUq2r02ng2We9S215LtPu3fY0KgaGE0k8WRgl6RkqxtGfl7HUozz1Dftwsb0D/5mZ8dwAaPbtnzfvbEwQ==",
+      "license": "MIT",
       "peerDependencies": {
         "redux": ">4.0.0"
       }
     },
     "node_modules/redux-state-sync": {
       "version": "3.1.4",
-      "resolved": "https://registry.npmjs.org/redux-state-sync/-/redux-state-sync-3.1.4.tgz",
-      "integrity": "sha512-nhJBzaXVXPXvUhQJ7m0LdoXBnrcw+cTYQ8bzW9DeJKdq6UNYynXwQWAlVUvsbT/hDV+vB6BC4DMLXkUVGpF2yQ==",
+      "license": "ISC",
       "dependencies": {
         "broadcast-channel": "^3.1.0"
       }
     },
     "node_modules/redux-state-sync/node_modules/broadcast-channel": {
       "version": "3.7.0",
-      "resolved": "https://registry.npmjs.org/broadcast-channel/-/broadcast-channel-3.7.0.tgz",
-      "integrity": "sha512-cIAKJXAxGJceNZGTZSBzMxzyOn72cVgPnKx4dc6LRjQgbaJUQqhy5rzL3zbMxkMWsGKkv2hSFkPRMEXfoMZ2Mg==",
+      "license": "MIT",
       "dependencies": {
         "@babel/runtime": "^7.7.2",
         "detect-node": "^2.1.0",
@@ -11471,19 +9959,16 @@
     },
     "node_modules/redux-state-sync/node_modules/microseconds": {
       "version": "0.2.0",
-      "resolved": "https://registry.npmjs.org/microseconds/-/microseconds-0.2.0.tgz",
-      "integrity": "sha512-n7DHHMjR1avBbSpsTBj6fmMGh2AGrifVV4e+WYc3Q9lO+xnSZ3NyhcBND3vzzatt05LFhoKFRxrIyklmLlUtyA=="
+      "license": "MIT"
     },
     "node_modules/regenerator-runtime": {
       "version": "0.13.11",
-      "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.11.tgz",
-      "integrity": "sha512-kY1AZVr2Ra+t+piVaJ4gxaFaReZVH40AKNo7UCX6W+dEwBo/2oZJzqfuN1qLq1oL45o56cPaTXELwrTh8Fpggg=="
+      "license": "MIT"
     },
     "node_modules/regexp.prototype.flags": {
       "version": "1.5.0",
-      "resolved": "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.5.0.tgz",
-      "integrity": "sha512-0SutC3pNudRKgquxGoRGIz946MZVHqbNfPjBdxeOhBrdgDKlRoXmYLQN9xRbrR09ZXWeGAdPuif7egofn6v5LA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "call-bind": "^1.0.2",
         "define-properties": "^1.2.0",
@@ -11498,23 +9983,20 @@
     },
     "node_modules/relateurl": {
       "version": "0.2.7",
-      "resolved": "https://registry.npmjs.org/relateurl/-/relateurl-0.2.7.tgz",
-      "integrity": "sha512-G08Dxvm4iDN3MLM0EsP62EDV9IuhXPR6blNz6Utcp7zyV3tr4HVNINt6MpaRWbxoOHT3Q7YN2P+jaHX8vUbgog==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">= 0.10"
       }
     },
     "node_modules/remove-accents": {
       "version": "0.4.2",
-      "resolved": "https://registry.npmjs.org/remove-accents/-/remove-accents-0.4.2.tgz",
-      "integrity": "sha512-7pXIJqJOq5tFgG1A2Zxti3Ht8jJF337m4sowbuHsW30ZnkQFnDzy9qBNhgzX8ZLW4+UBcXiiR7SwR6pokHsxiA=="
+      "license": "MIT"
     },
     "node_modules/renderkid": {
       "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/renderkid/-/renderkid-3.0.0.tgz",
-      "integrity": "sha512-q/7VIQA8lmM1hF+jn+sFSPWGlMkSAeNYcPLmDQx2zzuiDfaLrOmumR8iaUKlenFgh0XRPIUeSPlH3A+AW3Z5pg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "css-select": "^4.1.3",
         "dom-converter": "^0.2.0",
@@ -11525,32 +10007,28 @@
     },
     "node_modules/require-directory": {
       "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz",
-      "integrity": "sha512-fGxEI7+wsG9xrvdjsrlmL22OMTTiHRwAMroiEeMgq8gzoLC/PQr7RsRDSTLUg/bZAZtF+TVIkHc6/4RIKrui+Q==",
+      "license": "MIT",
       "engines": {
         "node": ">=0.10.0"
       }
     },
     "node_modules/require-from-string": {
       "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/require-from-string/-/require-from-string-2.0.2.tgz",
-      "integrity": "sha512-Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=0.10.0"
       }
     },
     "node_modules/requires-port": {
       "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/requires-port/-/requires-port-1.0.0.tgz",
-      "integrity": "sha512-KigOCHcocU3XODJxsu8i/j8T9tzT4adHiecwORRQ0ZZFcp7ahwXuRU1m+yuO90C5ZUyGeGfocHDI14M3L3yDAQ==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/resolve": {
       "version": "1.22.8",
-      "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.8.tgz",
-      "integrity": "sha512-oKWePCxqpd6FlLvGV1VU0x7bkPmmCNolxzjMf4NczoDnQcIWrAF+cPtZn5i6n+RfD2d9i0tzpKnG6Yk168yIyw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "is-core-module": "^2.13.0",
         "path-parse": "^1.0.7",
@@ -11565,18 +10043,16 @@
     },
     "node_modules/resolve-from": {
       "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz",
-      "integrity": "sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=4"
       }
     },
     "node_modules/restore-cursor": {
       "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-3.1.0.tgz",
-      "integrity": "sha512-l+sSefzHpj5qimhFSE5a8nufZYAM3sBSVMAPtYkmC+4EH2anSGaEMXSD0izRQbu9nfyQ9y5JrVmp7E8oZrUjvA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "onetime": "^5.1.0",
         "signal-exit": "^3.0.2"
@@ -11587,18 +10063,16 @@
     },
     "node_modules/retry": {
       "version": "0.13.1",
-      "resolved": "https://registry.npmjs.org/retry/-/retry-0.13.1.tgz",
-      "integrity": "sha512-XQBQ3I8W1Cge0Seh+6gjj03LbmRFWuoszgK9ooCpwYIrhhoO80pfq4cUkU5DkknwfOfFteRwlZ56PYOGYyFWdg==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">= 4"
       }
     },
     "node_modules/reusify": {
       "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/reusify/-/reusify-1.0.4.tgz",
-      "integrity": "sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "iojs": ">=1.0.0",
         "node": ">=0.10.0"
@@ -11606,28 +10080,24 @@
     },
     "node_modules/reverse-arguments": {
       "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/reverse-arguments/-/reverse-arguments-1.0.0.tgz",
-      "integrity": "sha512-/x8uIPdTafBqakK0TmPNJzgkLP+3H+yxpUJhCQHsLBg1rYEVNR2D8BRYNWQhVBjyOd7oo1dZRVzIkwMY2oqfYQ==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/rfdc": {
       "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/rfdc/-/rfdc-1.3.0.tgz",
-      "integrity": "sha512-V2hovdzFbOi77/WajaSMXk2OLm+xNIeQdMMuB7icj7bk6zi2F8GGAxigcnDFpJHbNyNcgyJDiP+8nOrY5cZGrA==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/rgb-hex": {
       "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/rgb-hex/-/rgb-hex-3.0.0.tgz",
-      "integrity": "sha512-8h7ZcwxCBDKvchSWbWngJuSCqJGQ6nDuLLg+QcRyQDbX9jMWt+PpPeXAhSla0GOooEomk3lCprUpGkMdsLjKyg==",
+      "license": "MIT",
       "engines": {
         "node": ">=8"
       }
     },
     "node_modules/rimraf": {
       "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz",
-      "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==",
+      "license": "ISC",
       "dependencies": {
         "glob": "^7.1.3"
       },
@@ -11640,8 +10110,7 @@
     },
     "node_modules/ripemd160": {
       "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/ripemd160/-/ripemd160-2.0.2.tgz",
-      "integrity": "sha512-ii4iagi25WusVoiC4B4lq7pbXfAp3D9v5CwfkY33vffw2+pkDjY1D8GaN7spsxvCSx8dkPqOZCEZyfxcmJG2IA==",
+      "license": "MIT",
       "dependencies": {
         "hash-base": "^3.0.0",
         "inherits": "^2.0.1"
@@ -11649,17 +10118,14 @@
     },
     "node_modules/ripemd160-min": {
       "version": "0.0.6",
-      "resolved": "https://registry.npmjs.org/ripemd160-min/-/ripemd160-min-0.0.6.tgz",
-      "integrity": "sha512-+GcJgQivhs6S9qvLogusiTcS9kQUfgR75whKuy5jIhuiOfQuJ8fjqxV6EGD5duH1Y/FawFUMtMhyeq3Fbnib8A==",
       "engines": {
         "node": ">=8"
       }
     },
     "node_modules/rollup": {
       "version": "4.18.0",
-      "resolved": "https://registry.npmjs.org/rollup/-/rollup-4.18.0.tgz",
-      "integrity": "sha512-QmJz14PX3rzbJCN1SG4Xe/bAAX2a6NpCP8ab2vfu2GiUr8AQcr2nCV/oEO3yneFarB67zk8ShlIyWb2LGTb3Sg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@types/estree": "1.0.5"
       },
@@ -11692,8 +10158,6 @@
     },
     "node_modules/run-parallel": {
       "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/run-parallel/-/run-parallel-1.2.0.tgz",
-      "integrity": "sha512-5l4VyZR86LZ/lDxZTR6jqL8AFE2S0IFLMP26AbjsLVADxHdhB/c0GUsH+y39UfCi3dzz8OlQuPmnaJOMoDHQBA==",
       "dev": true,
       "funding": [
         {
@@ -11709,14 +10173,14 @@
           "url": "https://feross.org/support"
         }
       ],
+      "license": "MIT",
       "dependencies": {
         "queue-microtask": "^1.2.2"
       }
     },
     "node_modules/rxjs": {
       "version": "6.6.7",
-      "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.6.7.tgz",
-      "integrity": "sha512-hTdwr+7yYNIT5n4AMYp85KA6yw2Va0FLa3Rguvbpa4W3I5xynaBZo41cM3XM+4Q6fRMj3sBYIR1VAmZMXYJvRQ==",
+      "license": "Apache-2.0",
       "dependencies": {
         "tslib": "^1.9.0"
       },
@@ -11726,14 +10190,12 @@
     },
     "node_modules/rxjs/node_modules/tslib": {
       "version": "1.14.1",
-      "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz",
-      "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg=="
+      "license": "0BSD"
     },
     "node_modules/safe-array-concat": {
       "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/safe-array-concat/-/safe-array-concat-1.0.0.tgz",
-      "integrity": "sha512-9dVEFruWIsnie89yym+xWTAYASdpw3CJV7Li/6zBewGf9z2i1j31rP6jnY0pHEO4QZh6N0K11bFjWmdR8UGdPQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "call-bind": "^1.0.2",
         "get-intrinsic": "^1.2.0",
@@ -11749,8 +10211,6 @@
     },
     "node_modules/safe-buffer": {
       "version": "5.2.1",
-      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz",
-      "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==",
       "funding": [
         {
           "type": "github",
@@ -11764,13 +10224,13 @@
           "type": "consulting",
           "url": "https://feross.org/support"
         }
-      ]
+      ],
+      "license": "MIT"
     },
     "node_modules/safe-regex-test": {
       "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/safe-regex-test/-/safe-regex-test-1.0.0.tgz",
-      "integrity": "sha512-JBUUzyOgEwXQY1NuPtvcj/qcBDbDmEvWufhlnXZIm75DEHp+afM1r1ujJpJsV/gSM4t59tpDyPi1sd6ZaPFfsA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "call-bind": "^1.0.2",
         "get-intrinsic": "^1.1.3",
@@ -11782,30 +10242,26 @@
     },
     "node_modules/safer-buffer": {
       "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz",
-      "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg=="
+      "license": "MIT"
     },
     "node_modules/scheduler": {
       "version": "0.23.0",
-      "resolved": "https://registry.npmjs.org/scheduler/-/scheduler-0.23.0.tgz",
-      "integrity": "sha512-CtuThmgHNg7zIZWAXi3AsyIzA3n4xx7aNyjwC2VJldO2LMVDhFK+63xGqq6CsJH4rTAt6/M+N4GhZiDYPx9eUw==",
+      "license": "MIT",
       "dependencies": {
         "loose-envify": "^1.1.0"
       }
     },
     "node_modules/schema-inspector": {
       "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/schema-inspector/-/schema-inspector-2.1.0.tgz",
-      "integrity": "sha512-3bmQVhbA01/EW8cZin4vIpqlpNU2SIy4BhKCfCgogJ3T/L76dLx3QAE+++4o+dNT33sa+SN9vOJL7iHiHFjiNg==",
+      "license": "MIT",
       "dependencies": {
         "async": "~2.6.3"
       }
     },
     "node_modules/schema-utils": {
       "version": "3.3.0",
-      "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.3.0.tgz",
-      "integrity": "sha512-pN/yOAvcC+5rQ5nERGuwrjLlYvLTbCibnZ1I7B1LaiAz9BRBlE9GMgE/eqV30P7aJQUf7Ddimy/RsbYO/GrVGg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@types/json-schema": "^7.0.8",
         "ajv": "^6.12.5",
@@ -11845,15 +10301,13 @@
     },
     "node_modules/select-hose": {
       "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/select-hose/-/select-hose-2.0.0.tgz",
-      "integrity": "sha512-mEugaLK+YfkijB4fx0e6kImuJdCIt2LxCRcbEYPqRGCs4F2ogyfZU5IAZRdjCP8JPq2AtdNoC/Dux63d9Kiryg==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/selfsigned": {
       "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/selfsigned/-/selfsigned-2.1.1.tgz",
-      "integrity": "sha512-GSL3aowiF7wa/WtSFwnUrludWFoNhftq8bUkH9pkzjpN2XSPOAYEgg6e0sS9s0rZwgJzJiQRPU18A6clnoW5wQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "node-forge": "^1"
       },
@@ -11863,17 +10317,15 @@
     },
     "node_modules/semver": {
       "version": "6.3.1",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
-      "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==",
+      "license": "ISC",
       "bin": {
         "semver": "bin/semver.js"
       }
     },
     "node_modules/send": {
       "version": "0.18.0",
-      "resolved": "https://registry.npmjs.org/send/-/send-0.18.0.tgz",
-      "integrity": "sha512-qqWzuOjSFOuqPjFe4NOsMLafToQQwBSOEpS+FwEt3A2V3vKubTquT3vmLTQpFgMXp8AlFWFuP1qKaJZOtPpVXg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "debug": "2.6.9",
         "depd": "2.0.0",
@@ -11895,39 +10347,34 @@
     },
     "node_modules/send/node_modules/debug": {
       "version": "2.6.9",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-      "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "ms": "2.0.0"
       }
     },
     "node_modules/send/node_modules/debug/node_modules/ms": {
       "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-      "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/send/node_modules/ms": {
       "version": "2.1.3",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz",
-      "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/serialize-javascript": {
       "version": "6.0.1",
-      "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-6.0.1.tgz",
-      "integrity": "sha512-owoXEFjWRllis8/M1Q+Cw5k8ZH40e3zhp/ovX+Xr/vi1qj6QesbyXXViFbpNvWvPNAD62SutwEXavefrLJWj7w==",
       "dev": true,
+      "license": "BSD-3-Clause",
       "dependencies": {
         "randombytes": "^2.1.0"
       }
     },
     "node_modules/serve-index": {
       "version": "1.9.1",
-      "resolved": "https://registry.npmjs.org/serve-index/-/serve-index-1.9.1.tgz",
-      "integrity": "sha512-pXHfKNP4qujrtteMrSBb0rc8HJ9Ms/GrXwcUtUtD5s4ewDJI8bT3Cz2zTVRMKtri49pLx2e0Ya8ziP5Ya2pZZw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "accepts": "~1.3.4",
         "batch": "0.6.1",
@@ -11943,27 +10390,24 @@
     },
     "node_modules/serve-index/node_modules/debug": {
       "version": "2.6.9",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-      "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "ms": "2.0.0"
       }
     },
     "node_modules/serve-index/node_modules/depd": {
       "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/depd/-/depd-1.1.2.tgz",
-      "integrity": "sha512-7emPTl6Dpo6JRXOXjLRxck+FlLRX5847cLKEn00PLAgc3g2hTZZgr+e4c2v6QpSmLeFP3n5yUo7ft6avBK/5jQ==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">= 0.6"
       }
     },
     "node_modules/serve-index/node_modules/http-errors": {
       "version": "1.6.3",
-      "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.6.3.tgz",
-      "integrity": "sha512-lks+lVC8dgGyh97jxvxeYTWQFvh4uw4yC12gVl63Cg30sjPX4wuGcdkICVXDAESr6OJGjqGA8Iz5mkeN6zlD7A==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "depd": "~1.1.2",
         "inherits": "2.0.3",
@@ -11976,36 +10420,31 @@
     },
     "node_modules/serve-index/node_modules/inherits": {
       "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
-      "integrity": "sha512-x00IRNXNy63jwGkJmzPigoySHbaqpNuzKbBOmzK+g2OdZpQ9w+sxCN+VSB3ja7IAge2OP2qpfxTjeNcyjmW1uw==",
-      "dev": true
+      "dev": true,
+      "license": "ISC"
     },
     "node_modules/serve-index/node_modules/ms": {
       "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-      "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/serve-index/node_modules/setprototypeof": {
       "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.1.0.tgz",
-      "integrity": "sha512-BvE/TwpZX4FXExxOxZyRGQQv651MSwmWKZGqvmPcRIjDqWub67kTKuIMx43cZZrS/cBBzwBcNDWoFxt2XEFIpQ==",
-      "dev": true
+      "dev": true,
+      "license": "ISC"
     },
     "node_modules/serve-index/node_modules/statuses": {
       "version": "1.5.0",
-      "resolved": "https://registry.npmjs.org/statuses/-/statuses-1.5.0.tgz",
-      "integrity": "sha512-OpZ3zP+jT1PI7I8nemJX4AKmAX070ZkYPVWV/AaKTJl+tXCTGyVdC1a4SL8RUQYEwk/f34ZX8UTykN68FwrqAA==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">= 0.6"
       }
     },
     "node_modules/serve-static": {
       "version": "1.15.0",
-      "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.15.0.tgz",
-      "integrity": "sha512-XGuRDNjXUijsUL0vl6nSD7cwURuzEgglbOaFuZM9g3kwDXOWVTck0jLzjPzGD+TazWbboZYu52/9/XPdUgne9g==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "encodeurl": "~1.0.2",
         "escape-html": "~1.0.3",
@@ -12018,8 +10457,7 @@
     },
     "node_modules/set-function-length": {
       "version": "1.2.2",
-      "resolved": "https://registry.npmjs.org/set-function-length/-/set-function-length-1.2.2.tgz",
-      "integrity": "sha512-pgRc4hJ4/sNjWCSS9AmnS40x3bNMDTknHgL5UaMBTMyJnU90EgWh1Rz+MC9eFu4BuN/UwZjKQuY/1v3rM7HMfg==",
+      "license": "MIT",
       "dependencies": {
         "define-data-property": "^1.1.4",
         "es-errors": "^1.3.0",
@@ -12034,14 +10472,12 @@
     },
     "node_modules/setprototypeof": {
       "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.2.0.tgz",
-      "integrity": "sha512-E5LDX7Wrp85Kil5bhZv46j8jOeboKq5JMmYM3gVGdGH8xFpPWXUMsNrlODCrkoxMEeNi/XZIwuRvY4XNwYMJpw==",
-      "dev": true
+      "dev": true,
+      "license": "ISC"
     },
     "node_modules/sha.js": {
       "version": "2.4.11",
-      "resolved": "https://registry.npmjs.org/sha.js/-/sha.js-2.4.11.tgz",
-      "integrity": "sha512-QMEp5B7cftE7APOjk5Y6xgrbWu+WkLVQwk8JNjZ8nKRciZaByEW6MubieAiToS7+dwvrjGhH8jRXz3MVd0AYqQ==",
+      "license": "(MIT AND BSD-3-Clause)",
       "dependencies": {
         "inherits": "^2.0.1",
         "safe-buffer": "^5.0.1"
@@ -12052,19 +10488,16 @@
     },
     "node_modules/sha256-uint8array": {
       "version": "0.10.7",
-      "resolved": "https://registry.npmjs.org/sha256-uint8array/-/sha256-uint8array-0.10.7.tgz",
-      "integrity": "sha512-1Q6JQU4tX9NqsDGodej6pkrUVQVNapLZnvkwIhddH/JqzBZF1fSaxSWNY6sziXBE8aEa2twtGkXUrwzGeZCMpQ=="
+      "license": "MIT"
     },
     "node_modules/shallowequal": {
       "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/shallowequal/-/shallowequal-1.1.0.tgz",
-      "integrity": "sha512-y0m1JoUZSlPAjXVtPPW70aZWfIL/dSP7AFkRnniLCrK/8MDKog3TySTBmckD+RObVxH0v4Tox67+F14PdED2oQ=="
+      "license": "MIT"
     },
     "node_modules/shebang-command": {
       "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz",
-      "integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "shebang-regex": "^3.0.0"
       },
@@ -12074,33 +10507,29 @@
     },
     "node_modules/shebang-regex": {
       "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz",
-      "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=8"
       }
     },
     "node_modules/shell-quote": {
       "version": "1.8.1",
-      "resolved": "https://registry.npmjs.org/shell-quote/-/shell-quote-1.8.1.tgz",
-      "integrity": "sha512-6j1W9l1iAs/4xYBI1SYOVZyFcCis9b4KCLQ8fgAGG07QvzaRLVVRQvAy85yNmmZSjYjg4MWh4gNvlPujU/5LpA==",
       "dev": true,
+      "license": "MIT",
       "funding": {
         "url": "https://github.com/sponsors/ljharb"
       }
     },
     "node_modules/shell-quote-word": {
       "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/shell-quote-word/-/shell-quote-word-1.0.1.tgz",
-      "integrity": "sha512-lT297f1WLAdq0A4O+AknIFRP6kkiI3s8C913eJ0XqBxJbZPGWUNkRQk2u8zk4bEAjUJ5i+fSLwB6z1HzeT+DEg==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/side-channel": {
       "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.0.4.tgz",
-      "integrity": "sha512-q5XPytqFEIKHkGdiMIrY10mvLRvnQh42/+GoBlFW3b2LXLE2xxJpZFdm94we0BaoV3RwJyGqg5wS7epxTv0Zvw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "call-bind": "^1.0.0",
         "get-intrinsic": "^1.0.2",
@@ -12112,30 +10541,26 @@
     },
     "node_modules/siginfo": {
       "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/siginfo/-/siginfo-2.0.0.tgz",
-      "integrity": "sha512-ybx0WO1/8bSBLEWXZvEd7gMW3Sn3JFlW3TvX1nREbDLRNQNaeNN8WK0meBwPdAaOI7TtRRRJn/Es1zhrrCHu7g==",
-      "dev": true
+      "dev": true,
+      "license": "ISC"
     },
     "node_modules/signal-exit": {
       "version": "3.0.7",
-      "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.7.tgz",
-      "integrity": "sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==",
-      "dev": true
+      "dev": true,
+      "license": "ISC"
     },
     "node_modules/slash": {
       "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz",
-      "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=8"
       }
     },
     "node_modules/slice-ansi": {
       "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-5.0.0.tgz",
-      "integrity": "sha512-FC+lgizVPfie0kkhqUScwRu1O/lF6NOgJmlCgK+/LYxDCTk8sGelYaHDhFcDN+Sn3Cv+3VSa4Byeo+IMCzpMgQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "ansi-styles": "^6.0.0",
         "is-fullwidth-code-point": "^4.0.0"
@@ -12149,9 +10574,8 @@
     },
     "node_modules/slice-ansi/node_modules/ansi-styles": {
       "version": "6.2.1",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-6.2.1.tgz",
-      "integrity": "sha512-bN798gFfQX+viw3R7yrGWRqnrN2oRkEkUjjl4JNn4E8GxxbjtG3FbrEIIY3l8/hrwUwIeCZvi4QuOTP4MErVug==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=12"
       },
@@ -12170,18 +10594,16 @@
     },
     "node_modules/smol-toml": {
       "version": "1.2.2",
-      "resolved": "https://registry.npmjs.org/smol-toml/-/smol-toml-1.2.2.tgz",
-      "integrity": "sha512-fVEjX2ybKdJKzFL46VshQbj9PuA4IUKivalgp48/3zwS9vXzyykzQ6AX92UxHSvWJagziMRLeHMgEzoGO7A8hQ==",
       "dev": true,
+      "license": "BSD-3-Clause",
       "engines": {
         "node": ">= 18"
       }
     },
     "node_modules/sockjs": {
       "version": "0.3.24",
-      "resolved": "https://registry.npmjs.org/sockjs/-/sockjs-0.3.24.tgz",
-      "integrity": "sha512-GJgLTZ7vYb/JtPSSZ10hsOYIvEYsjbNU+zPdIHcUaWVNUEPivzxku31865sSSud0Da0W4lEeOPlmw93zLQchuQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "faye-websocket": "^0.11.3",
         "uuid": "^8.3.2",
@@ -12190,27 +10612,24 @@
     },
     "node_modules/source-map": {
       "version": "0.7.4",
-      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.7.4.tgz",
-      "integrity": "sha512-l3BikUxvPOcn5E74dZiq5BGsTb5yEwhaTSzccU6t4sDOH8NWJCstKO5QT2CvtFoK6F0saL7p9xHAqHOlCPJygA==",
       "dev": true,
+      "license": "BSD-3-Clause",
       "engines": {
         "node": ">= 8"
       }
     },
     "node_modules/source-map-js": {
       "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.2.0.tgz",
-      "integrity": "sha512-itJW8lvSA0TXEphiRoawsCksnlf8SyvmFzIhltqAHluXd88pkCd+cXJVHTDwdCr0IzwptSm035IHQktUu1QUMg==",
       "dev": true,
+      "license": "BSD-3-Clause",
       "engines": {
         "node": ">=0.10.0"
       }
     },
     "node_modules/spdy": {
       "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/spdy/-/spdy-4.0.2.tgz",
-      "integrity": "sha512-r46gZQZQV+Kl9oItvl1JZZqJKGr+oEkB08A6BzkiR7593/7IbtuncXHd2YoYeTsG4157ZssMu9KYvUHLcjcDoA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "debug": "^4.1.0",
         "handle-thing": "^2.0.0",
@@ -12224,9 +10643,8 @@
     },
     "node_modules/spdy-transport": {
       "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/spdy-transport/-/spdy-transport-3.0.0.tgz",
-      "integrity": "sha512-hsLVFE5SjA6TCisWeJXFKniGGOpBgMLmerfO2aCyCU5s7nJ/rpAepqmFifv/GCbSbueEeAJJnmSQ2rKC/g8Fcw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "debug": "^4.1.0",
         "detect-node": "^2.0.4",
@@ -12238,36 +10656,31 @@
     },
     "node_modules/stackback": {
       "version": "0.0.2",
-      "resolved": "https://registry.npmjs.org/stackback/-/stackback-0.0.2.tgz",
-      "integrity": "sha512-1XMJE5fQo1jGH6Y/7ebnwPOBEkIEnT4QF32d5R1+VXdXveM0IBMJt8zfaxX1P3QhVwrYe+576+jkANtSS2mBbw==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/stackframe": {
       "version": "1.3.4",
-      "resolved": "https://registry.npmjs.org/stackframe/-/stackframe-1.3.4.tgz",
-      "integrity": "sha512-oeVtt7eWQS+Na6F//S4kJ2K2VbRlS9D43mAlMyVpVWovy9o+jfgH8O9agzANzaiLjclA0oYzUXEM4PurhSUChw==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/statuses": {
       "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/statuses/-/statuses-2.0.1.tgz",
-      "integrity": "sha512-RwNA9Z/7PrK06rYLIzFMlaF+l73iwpzsqRIFgbMLbTcLD6cOao82TaWefPXQvB2fOC4AjuYSEndS7N/mTCbkdQ==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">= 0.8"
       }
     },
     "node_modules/std-env": {
       "version": "3.5.0",
-      "resolved": "https://registry.npmjs.org/std-env/-/std-env-3.5.0.tgz",
-      "integrity": "sha512-JGUEaALvL0Mf6JCfYnJOTcobY+Nc7sG/TemDRBqCA0wEr4DER7zDchaaixTlmOxAjG1uRJmX82EQcxwTQTkqVA==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/stop-iteration-iterator": {
       "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/stop-iteration-iterator/-/stop-iteration-iterator-1.0.0.tgz",
-      "integrity": "sha512-iCGQj+0l0HOdZ2AEeBADlsRC+vsnDsZsbdSiH1yNSjcfKM7fdpCMfqAL/dwF5BLiw/XhRft/Wax6zQbhq2BcjQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "internal-slot": "^1.0.4"
       },
@@ -12277,8 +10690,7 @@
     },
     "node_modules/stream-browserify": {
       "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/stream-browserify/-/stream-browserify-3.0.0.tgz",
-      "integrity": "sha512-H73RAHsVBapbim0tU2JwwOiXUj+fikfiaoYAKHF3VJfA0pe2BCzkhAHBlLG6REzE+2WNZcxOXjK7lkso+9euLA==",
+      "license": "MIT",
       "dependencies": {
         "inherits": "~2.0.4",
         "readable-stream": "^3.5.0"
@@ -12286,25 +10698,22 @@
     },
     "node_modules/string_decoder": {
       "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.3.0.tgz",
-      "integrity": "sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==",
+      "license": "MIT",
       "dependencies": {
         "safe-buffer": "~5.2.0"
       }
     },
     "node_modules/string-argv": {
       "version": "0.3.2",
-      "resolved": "https://registry.npmjs.org/string-argv/-/string-argv-0.3.2.tgz",
-      "integrity": "sha512-aqD2Q0144Z+/RqG52NeHEkZauTAUWJO8c6yTftGJKO3Tja5tUgIfmIl6kExvhtxSDP7fXB6DvzkfMpCd/F3G+Q==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=0.6.19"
       }
     },
     "node_modules/string-to-color": {
       "version": "2.2.2",
-      "resolved": "https://registry.npmjs.org/string-to-color/-/string-to-color-2.2.2.tgz",
-      "integrity": "sha512-XeA2goP7PNsSlz8RRn6KhYswnMf5Tl+38ajfy8n4oZJyMGC4qqKgHNHsZ/3qwvr42NRIjf9eSr721SyetDeMkA==",
+      "license": "MIT",
       "dependencies": {
         "colornames": "^1.1.1",
         "hex-rgb": "^4.1.0",
@@ -12316,9 +10725,8 @@
     },
     "node_modules/string-width": {
       "version": "5.1.2",
-      "resolved": "https://registry.npmjs.org/string-width/-/string-width-5.1.2.tgz",
-      "integrity": "sha512-HnLOCR3vjcY8beoNLtcjZ5/nxn2afmME6lhrDrebokqMap+XbeW8n9TXpPDOqdGK5qcI3oT0GKTW6wC7EMiVqA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "eastasianwidth": "^0.2.0",
         "emoji-regex": "^9.2.2",
@@ -12333,9 +10741,8 @@
     },
     "node_modules/string-width/node_modules/ansi-regex": {
       "version": "6.0.1",
-      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.0.1.tgz",
-      "integrity": "sha512-n5M855fKb2SsfMIiFFoVrABHJC8QtHwVx+mHWP3QcEqBHYienj5dHSgjbxtC0WEZXYt4wcD6zrQElDPhFuZgfA==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=12"
       },
@@ -12345,9 +10752,8 @@
     },
     "node_modules/string-width/node_modules/strip-ansi": {
       "version": "7.1.0",
-      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.1.0.tgz",
-      "integrity": "sha512-iq6eVVI64nQQTRYq2KtEg2d2uU7LElhTJwsH4YzIHZshxlgZms/wIc4VoDQTlG/IvVIrBKG06CrZnp0qv7hkcQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "ansi-regex": "^6.0.1"
       },
@@ -12360,15 +10766,12 @@
     },
     "node_modules/string.fromcodepoint": {
       "version": "0.2.1",
-      "resolved": "https://registry.npmjs.org/string.fromcodepoint/-/string.fromcodepoint-0.2.1.tgz",
-      "integrity": "sha512-n69H31OnxSGSZyZbgBlvYIXlrMhJQ0dQAX1js1QDhpaUH6zmU3QYlj07bCwCNlPOu3oRXIubGPl2gDGnHsiCqg==",
       "dev": true
     },
     "node_modules/string.prototype.matchall": {
       "version": "4.0.8",
-      "resolved": "https://registry.npmjs.org/string.prototype.matchall/-/string.prototype.matchall-4.0.8.tgz",
-      "integrity": "sha512-6zOCOcJ+RJAQshcTvXPHoxoQGONa3e/Lqx90wUA+wEzX78sg5Bo+1tQo4N0pohS0erG9qtCqJDjNCQBjeWVxyg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "call-bind": "^1.0.2",
         "define-properties": "^1.1.4",
@@ -12385,9 +10788,8 @@
     },
     "node_modules/string.prototype.trim": {
       "version": "1.2.7",
-      "resolved": "https://registry.npmjs.org/string.prototype.trim/-/string.prototype.trim-1.2.7.tgz",
-      "integrity": "sha512-p6TmeT1T3411M8Cgg9wBTMRtY2q9+PNy9EV1i2lIXUN/btt763oIfxwN3RR8VU6wHX8j/1CFy0L+YuThm6bgOg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "call-bind": "^1.0.2",
         "define-properties": "^1.1.4",
@@ -12402,9 +10804,8 @@
     },
     "node_modules/string.prototype.trimend": {
       "version": "1.0.6",
-      "resolved": "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.6.tgz",
-      "integrity": "sha512-JySq+4mrPf9EsDBEDYMOb/lM7XQLulwg5R/m1r0PXEFqrV0qHvl58sdTilSXtKOflCsK2E8jxf+GKC0T07RWwQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "call-bind": "^1.0.2",
         "define-properties": "^1.1.4",
@@ -12416,9 +10817,8 @@
     },
     "node_modules/string.prototype.trimstart": {
       "version": "1.0.6",
-      "resolved": "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.6.tgz",
-      "integrity": "sha512-omqjMDaY92pbn5HOX7f9IccLA+U1tA9GvtU4JrodiXFfYB7jPzzHpRzpglLAjtUV6bB557zwClJezTqnAiYnQA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "call-bind": "^1.0.2",
         "define-properties": "^1.1.4",
@@ -12430,8 +10830,7 @@
     },
     "node_modules/strip-ansi": {
       "version": "6.0.1",
-      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
-      "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
+      "license": "MIT",
       "dependencies": {
         "ansi-regex": "^5.0.1"
       },
@@ -12441,27 +10840,24 @@
     },
     "node_modules/strip-bom": {
       "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz",
-      "integrity": "sha512-vavAMRXOgBVNF6nyEEmL3DBK19iRpDcoIwW+swQ+CbGiu7lju6t+JklA1MHweoWtadgt4ISVUsXLyDq34ddcwA==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=4"
       }
     },
     "node_modules/strip-final-newline": {
       "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/strip-final-newline/-/strip-final-newline-2.0.0.tgz",
-      "integrity": "sha512-BrpvfNAE3dcvq7ll3xVumzjKjZQ5tI1sEUIKr3Uoks0XUl45St3FlatVqef9prk4jRDzhW6WZg+3bk93y6pLjA==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=6"
       }
     },
     "node_modules/strip-json-comments": {
       "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz",
-      "integrity": "sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=8"
       },
@@ -12471,9 +10867,8 @@
     },
     "node_modules/strip-literal": {
       "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/strip-literal/-/strip-literal-1.3.0.tgz",
-      "integrity": "sha512-PugKzOsyXpArk0yWmUwqOZecSO0GH0bPoctLcqNDH9J04pVW3lflYE0ujElBGTloevcxF5MofAOZ7C5l2b+wLg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "acorn": "^8.10.0"
       },
@@ -12483,9 +10878,8 @@
     },
     "node_modules/style-loader": {
       "version": "3.3.3",
-      "resolved": "https://registry.npmjs.org/style-loader/-/style-loader-3.3.3.tgz",
-      "integrity": "sha512-53BiGLXAcll9maCYtZi2RCQZKa8NQQai5C4horqKyRmHj9H7QmcUyucrH+4KW/gBQbXM2AsB0axoEcFZPlfPcw==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">= 12.13.0"
       },
@@ -12499,8 +10893,7 @@
     },
     "node_modules/styled-components": {
       "version": "5.3.11",
-      "resolved": "https://registry.npmjs.org/styled-components/-/styled-components-5.3.11.tgz",
-      "integrity": "sha512-uuzIIfnVkagcVHv9nE0VPlHPSCmXIUGKfJ42LNjxCCTDTL5sgnJ8Z7GZBq0EnLYGln77tPpEpExt2+qa+cZqSw==",
+      "license": "MIT",
       "dependencies": {
         "@babel/helper-module-imports": "^7.0.0",
         "@babel/traverse": "^7.4.5",
@@ -12528,19 +10921,16 @@
     },
     "node_modules/styled-components/node_modules/@emotion/unitless": {
       "version": "0.7.5",
-      "resolved": "https://registry.npmjs.org/@emotion/unitless/-/unitless-0.7.5.tgz",
-      "integrity": "sha512-OWORNpfjMsSSUBVrRBVGECkhWcULOAJz9ZW8uK9qgxD+87M7jHRcvh/A96XXNhXTLmKcoYSQtBEX7lHMO7YRwg=="
+      "license": "MIT"
     },
     "node_modules/summary": {
       "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/summary/-/summary-2.1.0.tgz",
-      "integrity": "sha512-nMIjMrd5Z2nuB2RZCKJfFMjgS3fygbeyGk9PxPPaJR1RIcyN9yn4A63Isovzm3ZtQuEkLBVgMdPup8UeLH7aQw==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/superjson": {
       "version": "2.2.1",
-      "resolved": "https://registry.npmjs.org/superjson/-/superjson-2.2.1.tgz",
-      "integrity": "sha512-8iGv75BYOa0xRJHK5vRLEjE2H/i4lulTjzpUXic3Eg8akftYjkmQDa8JARQ42rlczXyFR3IeRoeFCc7RxHsYZA==",
+      "license": "MIT",
       "dependencies": {
         "copy-anything": "^3.0.2"
       },
@@ -12550,8 +10940,7 @@
     },
     "node_modules/supports-color": {
       "version": "5.5.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
-      "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
+      "license": "MIT",
       "dependencies": {
         "has-flag": "^3.0.0"
       },
@@ -12561,9 +10950,8 @@
     },
     "node_modules/supports-preserve-symlinks-flag": {
       "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz",
-      "integrity": "sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">= 0.4"
       },
@@ -12573,8 +10961,6 @@
     },
     "node_modules/swiper": {
       "version": "11.0.6",
-      "resolved": "https://registry.npmjs.org/swiper/-/swiper-11.0.6.tgz",
-      "integrity": "sha512-W/Me7MQl5rNgdM5x9i3Gll76WsyVpnHn91GhBOyL7RCFUeg62aVnflzlVfIpXzZ/87FtJOfAoDH79ZH2Yq76zA==",
       "funding": [
         {
           "type": "patreon",
@@ -12585,24 +10971,23 @@
           "url": "http://opencollective.com/swiper"
         }
       ],
+      "license": "MIT",
       "engines": {
         "node": ">= 4.7.0"
       }
     },
     "node_modules/tapable": {
       "version": "2.2.1",
-      "resolved": "https://registry.npmjs.org/tapable/-/tapable-2.2.1.tgz",
-      "integrity": "sha512-GNzQvQTOIP6RyTfE2Qxb8ZVlNmw0n88vp1szwWRimP02mnTsx3Wtn5qRdqY9w2XduFNUgvOwhNnQsjwCp+kqaQ==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=6"
       }
     },
     "node_modules/terser": {
       "version": "5.19.2",
-      "resolved": "https://registry.npmjs.org/terser/-/terser-5.19.2.tgz",
-      "integrity": "sha512-qC5+dmecKJA4cpYxRa5aVkKehYsQKc+AHeKl0Oe62aYjBL8ZA33tTljktDHJSaxxMnbI5ZYw+o/S2DxxLu8OfA==",
       "dev": true,
+      "license": "BSD-2-Clause",
       "dependencies": {
         "@jridgewell/source-map": "^0.3.3",
         "acorn": "^8.8.2",
@@ -12618,9 +11003,8 @@
     },
     "node_modules/terser-webpack-plugin": {
       "version": "5.3.9",
-      "resolved": "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-5.3.9.tgz",
-      "integrity": "sha512-ZuXsqE07EcggTWQjXUj+Aot/OMcD0bMKGgF63f7UxYcu5/AJF53aIpK1YoP5xR9l6s/Hy2b+t1AM0bLNPRuhwA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@jridgewell/trace-mapping": "^0.3.17",
         "jest-worker": "^27.4.5",
@@ -12652,24 +11036,21 @@
     },
     "node_modules/terser/node_modules/commander": {
       "version": "2.20.3",
-      "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz",
-      "integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/terser/node_modules/source-map": {
       "version": "0.6.1",
-      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
       "dev": true,
+      "license": "BSD-3-Clause",
       "engines": {
         "node": ">=0.10.0"
       }
     },
     "node_modules/terser/node_modules/source-map-support": {
       "version": "0.5.21",
-      "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.21.tgz",
-      "integrity": "sha512-uBHU3L3czsIyYXKX88fdrGovxdSCoTGDRZ6SYXtSRxLZUzHg5P/66Ht6uoUlHu9EZod+inXhKo3qQgwXUT/y1w==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "buffer-from": "^1.0.0",
         "source-map": "^0.6.0"
@@ -12677,74 +11058,64 @@
     },
     "node_modules/text-table": {
       "version": "0.2.0",
-      "resolved": "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz",
-      "integrity": "sha512-N+8UisAXDGk8PFXP4HAzVR9nbfmVJ3zYLAWiTIoqC5v5isinhr+r5uaO8+7r3BMfuNIufIsA7RdpVgacC2cSpw==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/through": {
       "version": "2.3.8",
-      "resolved": "https://registry.npmjs.org/through/-/through-2.3.8.tgz",
-      "integrity": "sha512-w89qg7PI8wAdvX60bMDP+bFoD5Dvhm9oLheFp5O4a2QF0cSBGsBX4qZmadPMvVqlLJBBci+WqGGOAPvcDeNSVg==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/thunky": {
       "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/thunky/-/thunky-1.1.0.tgz",
-      "integrity": "sha512-eHY7nBftgThBqOyHGVN+l8gF0BucP09fMo0oO/Lb0w1OF80dJv+lDVpXG60WMQvkcxAkNybKsrEIE3ZtKGmPrA==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/tinybench": {
       "version": "2.5.1",
-      "resolved": "https://registry.npmjs.org/tinybench/-/tinybench-2.5.1.tgz",
-      "integrity": "sha512-65NKvSuAVDP/n4CqH+a9w2kTlLReS9vhsAP06MWx+/89nMinJyB2icyl58RIcqCmIggpojIGeuJGhjU1aGMBSg==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/tinypool": {
       "version": "0.7.0",
-      "resolved": "https://registry.npmjs.org/tinypool/-/tinypool-0.7.0.tgz",
-      "integrity": "sha512-zSYNUlYSMhJ6Zdou4cJwo/p7w5nmAH17GRfU/ui3ctvjXFErXXkruT4MWW6poDeXgCaIBlGLrfU6TbTXxyGMww==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=14.0.0"
       }
     },
     "node_modules/tinyspy": {
       "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/tinyspy/-/tinyspy-2.2.0.tgz",
-      "integrity": "sha512-d2eda04AN/cPOR89F7Xv5bK/jrQEhmcLFe6HFldoeO9AJtps+fqEnh486vnT/8y4bw38pSyxDcTCAq+Ks2aJTg==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=14.0.0"
       }
     },
     "node_modules/to-fast-properties": {
       "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-2.0.0.tgz",
-      "integrity": "sha512-/OaKK0xYrs3DmxRYqL/yDc+FxFUVYhDlXMhRmv3z915w2HF1tnN1omB354j8VUGO/hbRzyD6Y3sA7v7GS/ceog==",
+      "license": "MIT",
       "engines": {
         "node": ">=4"
       }
     },
     "node_modules/to-no-case": {
       "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/to-no-case/-/to-no-case-1.0.2.tgz",
-      "integrity": "sha512-Z3g735FxuZY8rodxV4gH7LxClE4H0hTIyHNIHdk+vpQxjLm0cwnKXq/OFVZ76SOQmto7txVcwSCwkU5kqp+FKg==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/to-pascal-case": {
       "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/to-pascal-case/-/to-pascal-case-1.0.0.tgz",
-      "integrity": "sha512-QGMWHqM6xPrcQW57S23c5/3BbYb0Tbe9p+ur98ckRnGDwD4wbbtDiYI38CfmMKNB5Iv0REjs5SNDntTwvDxzZA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "to-space-case": "^1.0.0"
       }
     },
     "node_modules/to-regex-range": {
       "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz",
-      "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "is-number": "^7.0.0"
       },
@@ -12754,18 +11125,16 @@
     },
     "node_modules/to-space-case": {
       "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/to-space-case/-/to-space-case-1.0.0.tgz",
-      "integrity": "sha512-rLdvwXZ39VOn1IxGL3V6ZstoTbwLRckQmn/U8ZDLuWwIXNpuZDhQ3AiRUlhTbOXFVE9C+dR51wM0CBDhk31VcA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "to-no-case": "^1.0.0"
       }
     },
     "node_modules/toidentifier": {
       "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/toidentifier/-/toidentifier-1.0.1.tgz",
-      "integrity": "sha512-o5sSPKEkg/DIQNmH43V0/uerLrpzVedkUh8tGNvaeXpfpuwjKenlSox/2O/BTlZUtEe+JG7s5YhEz608PlAHRA==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=0.6"
       }
@@ -12785,9 +11154,8 @@
     },
     "node_modules/ts-loader": {
       "version": "9.5.1",
-      "resolved": "https://registry.npmjs.org/ts-loader/-/ts-loader-9.5.1.tgz",
-      "integrity": "sha512-rNH3sK9kGZcH9dYzC7CewQm4NtxJTjSEVRJ2DyBZR7f8/wcta+iV44UPCXc5+nzDzivKtlzV6c9P4e+oFhDLYg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "chalk": "^4.1.0",
         "enhanced-resolve": "^5.0.0",
@@ -12805,9 +11173,8 @@
     },
     "node_modules/ts-loader/node_modules/ansi-styles": {
       "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "color-convert": "^2.0.1"
       },
@@ -12820,9 +11187,8 @@
     },
     "node_modules/ts-loader/node_modules/chalk": {
       "version": "4.1.2",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "ansi-styles": "^4.1.0",
         "supports-color": "^7.1.0"
@@ -12836,9 +11202,8 @@
     },
     "node_modules/ts-loader/node_modules/color-convert": {
       "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "color-name": "~1.1.4"
       },
@@ -12848,24 +11213,21 @@
     },
     "node_modules/ts-loader/node_modules/color-name": {
       "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/ts-loader/node_modules/has-flag": {
       "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=8"
       }
     },
     "node_modules/ts-loader/node_modules/lru-cache": {
       "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
-      "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
       "dev": true,
+      "license": "ISC",
       "dependencies": {
         "yallist": "^4.0.0"
       },
@@ -12875,9 +11237,8 @@
     },
     "node_modules/ts-loader/node_modules/semver": {
       "version": "7.5.4",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz",
-      "integrity": "sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==",
       "dev": true,
+      "license": "ISC",
       "dependencies": {
         "lru-cache": "^6.0.0"
       },
@@ -12890,9 +11251,8 @@
     },
     "node_modules/ts-loader/node_modules/supports-color": {
       "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "has-flag": "^4.0.0"
       },
@@ -12902,23 +11262,20 @@
     },
     "node_modules/ts-loader/node_modules/yallist": {
       "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
-      "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==",
-      "dev": true
+      "dev": true,
+      "license": "ISC"
     },
     "node_modules/ts-transformer-keys": {
       "version": "0.4.4",
-      "resolved": "https://registry.npmjs.org/ts-transformer-keys/-/ts-transformer-keys-0.4.4.tgz",
-      "integrity": "sha512-LrqgvaFvar01/5mbunRyeLTSIkqoC2xfcpL/90aDY6vR07DGyH+UaYGdIEsUudnlAw2Sr0pxFgdZvE0QIyI4qA==",
+      "license": "MIT",
       "peerDependencies": {
         "typescript": ">=2.4.1"
       }
     },
     "node_modules/tsc-files": {
       "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/tsc-files/-/tsc-files-1.1.4.tgz",
-      "integrity": "sha512-RePsRsOLru3BPpnf237y1Xe1oCGta8rmSYzM76kYo5tLGsv5R2r3s64yapYorGTPuuLyfS9NVbh9ydzmvNie2w==",
       "dev": true,
+      "license": "MIT",
       "bin": {
         "tsc-files": "cli.js"
       },
@@ -12928,9 +11285,8 @@
     },
     "node_modules/tsconfck": {
       "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/tsconfck/-/tsconfck-3.1.0.tgz",
-      "integrity": "sha512-CMjc5zMnyAjcS9sPLytrbFmj89st2g+JYtY/c02ug4Q+CZaAtCgbyviI0n1YvjZE/pzoc6FbNsINS13DOL1B9w==",
       "dev": true,
+      "license": "MIT",
       "bin": {
         "tsconfck": "bin/tsconfck.js"
       },
@@ -12948,9 +11304,8 @@
     },
     "node_modules/tsconfig-paths": {
       "version": "3.14.2",
-      "resolved": "https://registry.npmjs.org/tsconfig-paths/-/tsconfig-paths-3.14.2.tgz",
-      "integrity": "sha512-o/9iXgCYc5L/JxCHPe3Hvh8Q/2xm5Z+p18PESBU6Ff33695QnCHBEjcytY2q19ua7Mbl/DavtBOLq+oG0RCL+g==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@types/json5": "^0.0.29",
         "json5": "^1.0.2",
@@ -12960,9 +11315,8 @@
     },
     "node_modules/tsconfig-paths-webpack-plugin": {
       "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/tsconfig-paths-webpack-plugin/-/tsconfig-paths-webpack-plugin-4.1.0.tgz",
-      "integrity": "sha512-xWFISjviPydmtmgeUAuXp4N1fky+VCtfhOkDUFIv5ea7p4wuTomI4QTrXvFBX2S4jZsmyTSrStQl+E+4w+RzxA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "chalk": "^4.1.0",
         "enhanced-resolve": "^5.7.0",
@@ -12974,9 +11328,8 @@
     },
     "node_modules/tsconfig-paths-webpack-plugin/node_modules/ansi-styles": {
       "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "color-convert": "^2.0.1"
       },
@@ -12989,9 +11342,8 @@
     },
     "node_modules/tsconfig-paths-webpack-plugin/node_modules/chalk": {
       "version": "4.1.2",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "ansi-styles": "^4.1.0",
         "supports-color": "^7.1.0"
@@ -13005,9 +11357,8 @@
     },
     "node_modules/tsconfig-paths-webpack-plugin/node_modules/color-convert": {
       "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "color-name": "~1.1.4"
       },
@@ -13017,24 +11368,21 @@
     },
     "node_modules/tsconfig-paths-webpack-plugin/node_modules/color-name": {
       "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/tsconfig-paths-webpack-plugin/node_modules/has-flag": {
       "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=8"
       }
     },
     "node_modules/tsconfig-paths-webpack-plugin/node_modules/supports-color": {
       "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "has-flag": "^4.0.0"
       },
@@ -13044,9 +11392,8 @@
     },
     "node_modules/tsconfig-paths-webpack-plugin/node_modules/tsconfig-paths": {
       "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/tsconfig-paths/-/tsconfig-paths-4.2.0.tgz",
-      "integrity": "sha512-NoZ4roiN7LnbKn9QqE1amc9DJfzvZXxF4xDavcOWt1BPkdx+m+0gJuPM+S0vCe7zTJMYUP0R8pO2XMr+Y8oLIg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "json5": "^2.2.2",
         "minimist": "^1.2.6",
@@ -13058,9 +11405,8 @@
     },
     "node_modules/tsconfig-paths/node_modules/json5": {
       "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/json5/-/json5-1.0.2.tgz",
-      "integrity": "sha512-g1MWMLBiz8FKi1e4w0UyVL3w+iJceWAFBAaBnnGKOpNa5f8TLktkbre1+s6oICydWAm+HRUGTmI+//xv2hvXYA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "minimist": "^1.2.0"
       },
@@ -13070,14 +11416,12 @@
     },
     "node_modules/tslib": {
       "version": "2.6.1",
-      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.1.tgz",
-      "integrity": "sha512-t0hLfiEKfMUoqhG+U1oid7Pva4bbDPHYfJNiB7BiIjRkj1pyC++4N3huJfqY6aRH6VTB0rvtzQwjM4K6qpfOig=="
+      "license": "0BSD"
     },
     "node_modules/tsutils": {
       "version": "3.21.0",
-      "resolved": "https://registry.npmjs.org/tsutils/-/tsutils-3.21.0.tgz",
-      "integrity": "sha512-mHKK3iUXL+3UF6xL5k0PEhKRUBKPBCv/+RkEOpjRWxxx27KKRBmmA60A9pgOUvMi8GKhRMPEmjBRPzs2W7O1OA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "tslib": "^1.8.1"
       },
@@ -13090,15 +11434,13 @@
     },
     "node_modules/tsutils/node_modules/tslib": {
       "version": "1.14.1",
-      "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz",
-      "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==",
-      "dev": true
+      "dev": true,
+      "license": "0BSD"
     },
     "node_modules/type-check": {
       "version": "0.4.0",
-      "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.4.0.tgz",
-      "integrity": "sha512-XleUoc9uwGXqjWwXaUTZAmzMcFZ5858QA2vvx1Ur5xIcixXIP+8LnFDgRplU30us6teqdlskFfu+ae4K79Ooew==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "prelude-ls": "^1.2.1"
       },
@@ -13108,18 +11450,16 @@
     },
     "node_modules/type-detect": {
       "version": "4.0.8",
-      "resolved": "https://registry.npmjs.org/type-detect/-/type-detect-4.0.8.tgz",
-      "integrity": "sha512-0fr/mIH1dlO+x7TlcMy+bIDqKPsw/70tVyeHW787goQjhmqaZe10uwLujubK9q9Lg6Fiho1KUKDYz0Z7k7g5/g==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=4"
       }
     },
     "node_modules/type-fest": {
       "version": "2.19.0",
-      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-2.19.0.tgz",
-      "integrity": "sha512-RAH822pAdBgcNMAfWnCBU3CFZcfZ/i1eZjwFU/dsLKumyuuP3niueg2UAukXYF0E2AAoc82ZSSf9J0WQBinzHA==",
       "dev": true,
+      "license": "(MIT OR CC0-1.0)",
       "engines": {
         "node": ">=12.20"
       },
@@ -13129,9 +11469,8 @@
     },
     "node_modules/type-is": {
       "version": "1.6.18",
-      "resolved": "https://registry.npmjs.org/type-is/-/type-is-1.6.18.tgz",
-      "integrity": "sha512-TkRKr9sUTxEH8MdfuCSP7VizJyzRNMjj2J2do2Jr3Kym598JVdEksuzPQCnlFPW4ky9Q+iA+ma9BGm06XQBy8g==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "media-typer": "0.3.0",
         "mime-types": "~2.1.24"
@@ -13142,9 +11481,8 @@
     },
     "node_modules/typed-array-buffer": {
       "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/typed-array-buffer/-/typed-array-buffer-1.0.0.tgz",
-      "integrity": "sha512-Y8KTSIglk9OZEr8zywiIHG/kmQ7KWyjseXs1CbSo8vC42w7hg2HgYTxSWwP0+is7bWDc1H+Fo026CpHFwm8tkw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "call-bind": "^1.0.2",
         "get-intrinsic": "^1.2.1",
@@ -13156,9 +11494,8 @@
     },
     "node_modules/typed-array-byte-length": {
       "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/typed-array-byte-length/-/typed-array-byte-length-1.0.0.tgz",
-      "integrity": "sha512-Or/+kvLxNpeQ9DtSydonMxCx+9ZXOswtwJn17SNLvhptaXYDJvkFFP5zbfU/uLmvnBJlI4yrnXRxpdWH/M5tNA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "call-bind": "^1.0.2",
         "for-each": "^0.3.3",
@@ -13174,9 +11511,8 @@
     },
     "node_modules/typed-array-byte-offset": {
       "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/typed-array-byte-offset/-/typed-array-byte-offset-1.0.0.tgz",
-      "integrity": "sha512-RD97prjEt9EL8YgAgpOkf3O4IF9lhJFr9g0htQkm0rchFp/Vx7LW5Q8fSXXub7BXAODyUQohRMyOc3faCPd0hg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "available-typed-arrays": "^1.0.5",
         "call-bind": "^1.0.2",
@@ -13193,9 +11529,8 @@
     },
     "node_modules/typed-array-length": {
       "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/typed-array-length/-/typed-array-length-1.0.4.tgz",
-      "integrity": "sha512-KjZypGq+I/H7HI5HlOoGHkWUUGq+Q0TPhQurLbyrVrvnKTBgzLhIJ7j6J/XTQOi0d1RjyZ0wdas8bKs2p0x3Ng==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "call-bind": "^1.0.2",
         "for-each": "^0.3.3",
@@ -13212,8 +11547,7 @@
     },
     "node_modules/typescript": {
       "version": "5.5.3",
-      "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.5.3.tgz",
-      "integrity": "sha512-/hreyEujaB0w76zKo6717l3L0o/qEUtRgdvUBvlkhoWeOVMjMuHNHk0BRBzikzuGDqNmPQbg5ifMEqsHLiIUcQ==",
+      "license": "Apache-2.0",
       "bin": {
         "tsc": "bin/tsc",
         "tsserver": "bin/tsserver"
@@ -13224,23 +11558,21 @@
     },
     "node_modules/typescript-plugin-styled-components": {
       "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/typescript-plugin-styled-components/-/typescript-plugin-styled-components-3.0.0.tgz",
-      "integrity": "sha512-QWlhTl6NqsFxtJyxn7pJjm3RhgzXSByUftZ3AoQClrMMpa4yAaHuJKTN1gFpH3Ti+Rwm56fNUfG9pXSBU+WW3A==",
       "dev": true,
+      "license": "MIT",
       "peerDependencies": {
         "typescript": "~4.8 || 5"
       }
     },
     "node_modules/ufo": {
       "version": "1.3.2",
-      "resolved": "https://registry.npmjs.org/ufo/-/ufo-1.3.2.tgz",
-      "integrity": "sha512-o+ORpgGwaYQXgqGDwd+hkS4PuZ3QnmqMMxRuajK/a38L6fTpcE5GPIfrf+L/KemFzfUpeUQc1rRS1iDBozvnFA==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/uglify-js": {
-      "version": "3.19.1",
-      "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.19.1.tgz",
-      "integrity": "sha512-y/2wiW+ceTYR2TSSptAhfnEtpLaQ4Ups5zrjB2d3kuVxHj16j/QJwPl5PvuGy9uARb39J0+iKxcRPvtpsx4A4A==",
+      "version": "3.19.2",
+      "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.19.2.tgz",
+      "integrity": "sha512-S8KA6DDI47nQXJSi2ctQ629YzwOVs+bQML6DAtvy0wgNdpi+0ySpQK0g2pxBq2xfF2z3YCscu7NNA8nXT9PlIQ==",
       "bin": {
         "uglifyjs": "bin/uglifyjs"
       },
@@ -13250,9 +11582,8 @@
     },
     "node_modules/unbox-primitive": {
       "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/unbox-primitive/-/unbox-primitive-1.0.2.tgz",
-      "integrity": "sha512-61pPlCD9h51VoreyJ0BReideM3MDKMKnh6+V9L08331ipq6Q8OFXZYiqP6n/tbHx4s5I9uRhcye6BrbkizkBDw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "call-bind": "^1.0.2",
         "has-bigints": "^1.0.2",
@@ -13265,31 +11596,27 @@
     },
     "node_modules/undici-types": {
       "version": "5.26.5",
-      "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-5.26.5.tgz",
-      "integrity": "sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA=="
+      "license": "MIT"
     },
     "node_modules/unescape-js": {
       "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/unescape-js/-/unescape-js-1.1.4.tgz",
-      "integrity": "sha512-42SD8NOQEhdYntEiUQdYq/1V/YHwr1HLwlHuTJB5InVVdOSbgI6xu8jK5q65yIzuFCfczzyDF/7hbGzVbyCw0g==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "string.fromcodepoint": "^0.2.1"
       }
     },
     "node_modules/universalify": {
       "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.1.tgz",
-      "integrity": "sha512-gptHNQghINnc/vTGIk0SOFGFNXw7JVrlRUtConJRlvaw6DuX0wO5Jeko9sWrMBhh+PsYAZ7oXAiOnf/UKogyiw==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">= 10.0.0"
       }
     },
     "node_modules/unload": {
       "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/unload/-/unload-2.2.0.tgz",
-      "integrity": "sha512-B60uB5TNBLtN6/LsgAf3udH9saB5p7gqJwcFfbOEZ8BcBHnGwCf6G/TGiEqkRAxX7zAFIUtzdrXQSdL3Q/wqNA==",
+      "license": "Apache-2.0",
       "dependencies": {
         "@babel/runtime": "^7.6.2",
         "detect-node": "^2.0.4"
@@ -13297,17 +11624,14 @@
     },
     "node_modules/unpipe": {
       "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/unpipe/-/unpipe-1.0.0.tgz",
-      "integrity": "sha512-pjy2bYhSsufwWlKwPc+l3cN7+wuJlK6uz0YdJEOlQDbl6jo/YlPi4mb8agUkVC8BF7V8NuzeyPNqRksA3hztKQ==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">= 0.8"
       }
     },
     "node_modules/update-browserslist-db": {
       "version": "1.0.13",
-      "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.0.13.tgz",
-      "integrity": "sha512-xebP81SNcPuNpPP3uzeW1NYXxI3rxyJzF3pD6sH4jE7o/IX+WtSpwnVU+qIsDPyk0d3hmFQ7mjqc6AtV604hbg==",
       "funding": [
         {
           "type": "opencollective",
@@ -13322,6 +11646,7 @@
           "url": "https://github.com/sponsors/ai"
         }
       ],
+      "license": "MIT",
       "dependencies": {
         "escalade": "^3.1.1",
         "picocolors": "^1.0.0"
@@ -13335,17 +11660,15 @@
     },
     "node_modules/uri-js": {
       "version": "4.4.1",
-      "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.4.1.tgz",
-      "integrity": "sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==",
       "dev": true,
+      "license": "BSD-2-Clause",
       "dependencies": {
         "punycode": "^2.1.0"
       }
     },
     "node_modules/use-sync-external-store": {
       "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/use-sync-external-store/-/use-sync-external-store-1.2.0.tgz",
-      "integrity": "sha512-eEgnFxGQ1Ife9bzYs6VLi8/4X6CObHMw9Qr9tPY43iKwsPw8xE8+EFsf/2cFZ5S3esXgpWgtSCtLNS41F+sKPA==",
+      "license": "MIT",
       "peerDependencies": {
         "react": "^16.8.0 || ^17.0.0 || ^18.0.0"
       }
@@ -13364,28 +11687,24 @@
     },
     "node_modules/util-deprecate": {
       "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
-      "integrity": "sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw=="
+      "license": "MIT"
     },
     "node_modules/utila": {
       "version": "0.4.0",
-      "resolved": "https://registry.npmjs.org/utila/-/utila-0.4.0.tgz",
-      "integrity": "sha512-Z0DbgELS9/L/75wZbro8xAnT50pBVFQZ+hUEueGDU5FN51YSCYM+jdxsfCiHjwNP/4LCDD0i/graKpeBnOXKRA==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/utils-merge": {
       "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.1.tgz",
-      "integrity": "sha512-pMZTvIkT1d+TFGvDOqodOclx0QWkkgi6Tdoa8gC8ffGAAqz9pzPTZWAybbsHHoED/ztMtkv/VoYTYyShUn81hA==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">= 0.4.0"
       }
     },
     "node_modules/uuid": {
       "version": "8.3.2",
-      "resolved": "https://registry.npmjs.org/uuid/-/uuid-8.3.2.tgz",
-      "integrity": "sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==",
+      "license": "MIT",
       "bin": {
         "uuid": "dist/bin/uuid"
       }
@@ -13401,36 +11720,30 @@
     },
     "node_modules/valibot": {
       "version": "0.33.2",
-      "resolved": "https://registry.npmjs.org/valibot/-/valibot-0.33.2.tgz",
-      "integrity": "sha512-ZpFWuI+bs5+PP66q4zVFn4e4t/s5jmMw5iPBZmGUoi8iQqXyU9YY/BLCAyk62Z/bNS8qdUNBEyx52952qdqW3w=="
+      "license": "MIT"
     },
     "node_modules/valid-url": {
-      "version": "1.0.9",
-      "resolved": "https://registry.npmjs.org/valid-url/-/valid-url-1.0.9.tgz",
-      "integrity": "sha512-QQDsV8OnSf5Uc30CKSwG9lnhMPe6exHtTXLRYX8uMwKENy640pU+2BgBL0LRbDh/eYRahNCS7aewCx0wf3NYVA=="
+      "version": "1.0.9"
     },
     "node_modules/varuint-bitcoin": {
       "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/varuint-bitcoin/-/varuint-bitcoin-1.1.2.tgz",
-      "integrity": "sha512-4EVb+w4rx+YfVM32HQX42AbbT7/1f5zwAYhIujKXKk8NQK+JfRVl3pqT3hjNn/L+RstigmGGKVwHA/P0wgITZw==",
+      "license": "MIT",
       "dependencies": {
         "safe-buffer": "^5.1.1"
       }
     },
     "node_modules/vary": {
       "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/vary/-/vary-1.1.2.tgz",
-      "integrity": "sha512-BNGbWLfd0eUPabhkXUVm0j8uuvREyTh5ovRa/dyow/BqAbZJyC+5fU+IzQOzmAKzYqYRAISoRhdQr3eIZ/PXqg==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">= 0.8"
       }
     },
     "node_modules/vite": {
       "version": "5.3.2",
-      "resolved": "https://registry.npmjs.org/vite/-/vite-5.3.2.tgz",
-      "integrity": "sha512-6lA7OBHBlXUxiJxbO5aAY2fsHHzDr1q7DvXYnyZycRs2Dz+dXBWuhpWHvmljTRTpQC2uvGmUFFkSHF2vGo90MA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "esbuild": "^0.21.3",
         "postcss": "^8.4.38",
@@ -13483,9 +11796,8 @@
     },
     "node_modules/vite-node": {
       "version": "0.34.6",
-      "resolved": "https://registry.npmjs.org/vite-node/-/vite-node-0.34.6.tgz",
-      "integrity": "sha512-nlBMJ9x6n7/Amaz6F3zJ97EBwR2FkzhBRxF5e+jE6LA3yi6Wtc2lyTij1OnDMIr34v5g/tVQtsVAzhT0jc5ygA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "cac": "^6.7.14",
         "debug": "^4.3.4",
@@ -13506,9 +11818,8 @@
     },
     "node_modules/vite-tsconfig-paths": {
       "version": "4.3.2",
-      "resolved": "https://registry.npmjs.org/vite-tsconfig-paths/-/vite-tsconfig-paths-4.3.2.tgz",
-      "integrity": "sha512-0Vd/a6po6Q+86rPlntHye7F31zA2URZMbH8M3saAZ/xR9QoGN/L21bxEGfXdWmFdNkqPpRdxFT7nmNe12e9/uA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "debug": "^4.1.1",
         "globrex": "^0.1.2",
@@ -13525,9 +11836,8 @@
     },
     "node_modules/vitest": {
       "version": "0.34.6",
-      "resolved": "https://registry.npmjs.org/vitest/-/vitest-0.34.6.tgz",
-      "integrity": "sha512-+5CALsOvbNKnS+ZHMXtuUC7nL8/7F1F2DnHGjSsszX8zCjWSSviphCb/NuS9Nzf4Q03KyyDRBAXhF/8lffME4Q==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@types/chai": "^4.3.5",
         "@types/chai-subset": "^1.3.3",
@@ -13602,31 +11912,27 @@
     },
     "node_modules/vlq": {
       "version": "0.2.3",
-      "resolved": "https://registry.npmjs.org/vlq/-/vlq-0.2.3.tgz",
-      "integrity": "sha512-DRibZL6DsNhIgYQ+wNdWDL2SL3bKPlVrRiBqV5yuMm++op8W4kGFtaQfCs4KEJn0wBZcHVHJ3eoywX8983k1ow==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/void-elements": {
       "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/void-elements/-/void-elements-3.1.0.tgz",
-      "integrity": "sha512-Dhxzh5HZuiHQhbvTW9AMetFfBHDMYpo23Uo9btPXgdYP+3T5S+p+jgNy7spra+veYhBP2dCSgxR/i2Y02h5/6w==",
+      "license": "MIT",
       "engines": {
         "node": ">=0.10.0"
       }
     },
     "node_modules/warning": {
       "version": "4.0.3",
-      "resolved": "https://registry.npmjs.org/warning/-/warning-4.0.3.tgz",
-      "integrity": "sha512-rpJyN222KWIvHJ/F53XSZv0Zl/accqHR8et1kpaMTD/fLCRxtV8iX8czMzY7sVZupTI3zcUTg8eycS2kNF9l6w==",
+      "license": "MIT",
       "dependencies": {
         "loose-envify": "^1.0.0"
       }
     },
     "node_modules/watchpack": {
       "version": "2.4.0",
-      "resolved": "https://registry.npmjs.org/watchpack/-/watchpack-2.4.0.tgz",
-      "integrity": "sha512-Lcvm7MGST/4fup+ifyKi2hjyIAwcdI4HRgtvTpIUxBRhB+RFtUh8XtDOxUfctVCnhVi+QQj49i91OyvzkJl6cg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "glob-to-regexp": "^0.4.1",
         "graceful-fs": "^4.1.2"
@@ -13637,18 +11943,16 @@
     },
     "node_modules/wbuf": {
       "version": "1.7.3",
-      "resolved": "https://registry.npmjs.org/wbuf/-/wbuf-1.7.3.tgz",
-      "integrity": "sha512-O84QOnr0icsbFGLS0O3bI5FswxzRr8/gHwWkDlQFskhSPryQXvrTMxjxGP4+iWYoauLoBvfDpkrOauZ+0iZpDA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "minimalistic-assert": "^1.0.0"
       }
     },
     "node_modules/wcwidth": {
       "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/wcwidth/-/wcwidth-1.0.1.tgz",
-      "integrity": "sha512-XHPEwS0q6TaxcvG85+8EYkbiCux2XtWG2mkc47Ng2A77BQu9+DqIOJldST4HgPkuea7dvKSj5VgX3P1d4rW8Tg==",
       "dev": true,
+      "license": "MIT",
       "optional": true,
       "dependencies": {
         "defaults": "^1.0.3"
@@ -13656,14 +11960,12 @@
     },
     "node_modules/webextension-polyfill": {
       "version": "0.10.0",
-      "resolved": "https://registry.npmjs.org/webextension-polyfill/-/webextension-polyfill-0.10.0.tgz",
-      "integrity": "sha512-c5s35LgVa5tFaHhrZDnr3FpQpjj1BB+RXhLTYUxGqBVN460HkbM8TBtEqdXWbpTKfzwCcjAZVF7zXCYSKtcp9g=="
+      "license": "MPL-2.0"
     },
     "node_modules/webpack": {
       "version": "5.89.0",
-      "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.89.0.tgz",
-      "integrity": "sha512-qyfIC10pOr70V+jkmud8tMfajraGCZMBWJtrmuBymQKCrLTRejBI8STDp1MCyZu/QTdZSeacCQYpYNQVOzX5kw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@types/eslint-scope": "^3.7.3",
         "@types/estree": "^1.0.0",
@@ -13708,9 +12010,8 @@
     },
     "node_modules/webpack-dev-middleware": {
       "version": "5.3.3",
-      "resolved": "https://registry.npmjs.org/webpack-dev-middleware/-/webpack-dev-middleware-5.3.3.tgz",
-      "integrity": "sha512-hj5CYrY0bZLB+eTO+x/j67Pkrquiy7kWepMHmUMoPsmcUaeEnQJqFzHJOyxgWlq746/wUuA64p9ta34Kyb01pA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "colorette": "^2.0.10",
         "memfs": "^3.4.3",
@@ -13731,9 +12032,8 @@
     },
     "node_modules/webpack-dev-middleware/node_modules/ajv": {
       "version": "8.12.0",
-      "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.12.0.tgz",
-      "integrity": "sha512-sRu1kpcO9yLtYxBKvqfTeh9KzZEwO3STyX1HT+4CaDzC6HpTGYhIhPIzj9XuKU7KYDwnaeh5hcOwjy1QuJzBPA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "fast-deep-equal": "^3.1.1",
         "json-schema-traverse": "^1.0.0",
@@ -13747,9 +12047,8 @@
     },
     "node_modules/webpack-dev-middleware/node_modules/ajv-keywords": {
       "version": "5.1.0",
-      "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-5.1.0.tgz",
-      "integrity": "sha512-YCS/JNFAUyr5vAuhk1DWm1CBxRHW9LbJ2ozWeemrIqpbsqKjHVxYPyi5GC0rjZIT5JxJ3virVTS8wk4i/Z+krw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "fast-deep-equal": "^3.1.3"
       },
@@ -13759,15 +12058,13 @@
     },
     "node_modules/webpack-dev-middleware/node_modules/json-schema-traverse": {
       "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz",
-      "integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/webpack-dev-middleware/node_modules/schema-utils": {
       "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-4.2.0.tgz",
-      "integrity": "sha512-L0jRsrPpjdckP3oPug3/VxNKt2trR8TcabrM6FOAAlvC/9Phcmm+cuAgTlxBqdBR1WJx7Naj9WHw+aOmheSVbw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@types/json-schema": "^7.0.9",
         "ajv": "^8.9.0",
@@ -13784,9 +12081,8 @@
     },
     "node_modules/webpack-dev-server": {
       "version": "4.15.1",
-      "resolved": "https://registry.npmjs.org/webpack-dev-server/-/webpack-dev-server-4.15.1.tgz",
-      "integrity": "sha512-5hbAst3h3C3L8w6W4P96L5vaV0PxSmJhxZvWKYIdgxOQm8pNZ5dEOmmSLBVpP85ReeyRt6AS1QJNyo/oFFPeVA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@types/bonjour": "^3.5.9",
         "@types/connect-history-api-fallback": "^1.3.5",
@@ -13843,9 +12139,8 @@
     },
     "node_modules/webpack-dev-server/node_modules/ajv": {
       "version": "8.12.0",
-      "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.12.0.tgz",
-      "integrity": "sha512-sRu1kpcO9yLtYxBKvqfTeh9KzZEwO3STyX1HT+4CaDzC6HpTGYhIhPIzj9XuKU7KYDwnaeh5hcOwjy1QuJzBPA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "fast-deep-equal": "^3.1.1",
         "json-schema-traverse": "^1.0.0",
@@ -13859,9 +12154,8 @@
     },
     "node_modules/webpack-dev-server/node_modules/ajv-keywords": {
       "version": "5.1.0",
-      "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-5.1.0.tgz",
-      "integrity": "sha512-YCS/JNFAUyr5vAuhk1DWm1CBxRHW9LbJ2ozWeemrIqpbsqKjHVxYPyi5GC0rjZIT5JxJ3virVTS8wk4i/Z+krw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "fast-deep-equal": "^3.1.3"
       },
@@ -13871,15 +12165,13 @@
     },
     "node_modules/webpack-dev-server/node_modules/json-schema-traverse": {
       "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz",
-      "integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/webpack-dev-server/node_modules/schema-utils": {
       "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-4.2.0.tgz",
-      "integrity": "sha512-L0jRsrPpjdckP3oPug3/VxNKt2trR8TcabrM6FOAAlvC/9Phcmm+cuAgTlxBqdBR1WJx7Naj9WHw+aOmheSVbw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@types/json-schema": "^7.0.9",
         "ajv": "^8.9.0",
@@ -13896,9 +12188,8 @@
     },
     "node_modules/webpack-dev-server/node_modules/ws": {
       "version": "8.13.0",
-      "resolved": "https://registry.npmjs.org/ws/-/ws-8.13.0.tgz",
-      "integrity": "sha512-x9vcZYTrFPC7aSIbj7sRCYo7L/Xb8Iy+pW0ng0wt2vCJv7M9HOMy0UoN3rr+IFC7hb7vXoqS+P9ktyLLLhO+LA==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=10.0.0"
       },
@@ -13917,18 +12208,16 @@
     },
     "node_modules/webpack-sources": {
       "version": "3.2.3",
-      "resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-3.2.3.tgz",
-      "integrity": "sha512-/DyMEOrDgLKKIG0fmvtz+4dUX/3Ghozwgm6iPp8KRhvn+eQf9+Q7GWxVNMk3+uCPWfdXYC4ExGBckIXdFEfH1w==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=10.13.0"
       }
     },
     "node_modules/websocket-driver": {
       "version": "0.7.4",
-      "resolved": "https://registry.npmjs.org/websocket-driver/-/websocket-driver-0.7.4.tgz",
-      "integrity": "sha512-b17KeDIQVjvb0ssuSDF2cYXSg2iztliJ4B9WdsuB6J952qCPKmnVq4DyW5motImXHDC1cBT/1UezrJVsKw5zjg==",
       "dev": true,
+      "license": "Apache-2.0",
       "dependencies": {
         "http-parser-js": ">=0.5.1",
         "safe-buffer": ">=5.1.0",
@@ -13940,18 +12229,16 @@
     },
     "node_modules/websocket-extensions": {
       "version": "0.1.4",
-      "resolved": "https://registry.npmjs.org/websocket-extensions/-/websocket-extensions-0.1.4.tgz",
-      "integrity": "sha512-OqedPIGOfsDlo31UNwYbCFMSaO9m9G/0faIHj5/dZFDMFqPTcx6UwqyOy3COEaEOg/9VsGIpdqn62W5KhoKSpg==",
       "dev": true,
+      "license": "Apache-2.0",
       "engines": {
         "node": ">=0.8.0"
       }
     },
     "node_modules/which": {
       "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",
-      "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==",
       "dev": true,
+      "license": "ISC",
       "dependencies": {
         "isexe": "^2.0.0"
       },
@@ -13964,9 +12251,8 @@
     },
     "node_modules/which-boxed-primitive": {
       "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/which-boxed-primitive/-/which-boxed-primitive-1.0.2.tgz",
-      "integrity": "sha512-bwZdv0AKLpplFY2KZRX6TvyuN7ojjr7lwkg6ml0roIy9YeuSr7JS372qlNW18UQYzgYK9ziGcerWqZOmEn9VNg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "is-bigint": "^1.0.1",
         "is-boolean-object": "^1.1.0",
@@ -13980,9 +12266,8 @@
     },
     "node_modules/which-collection": {
       "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/which-collection/-/which-collection-1.0.1.tgz",
-      "integrity": "sha512-W8xeTUwaln8i3K/cY1nGXzdnVZlidBcagyNFtBdD5kxnb4TvGKR7FfSIS3mYpwWS1QUCutfKz8IY8RjftB0+1A==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "is-map": "^2.0.1",
         "is-set": "^2.0.1",
@@ -13995,8 +12280,7 @@
     },
     "node_modules/which-typed-array": {
       "version": "1.1.11",
-      "resolved": "https://registry.npmjs.org/which-typed-array/-/which-typed-array-1.1.11.tgz",
-      "integrity": "sha512-qe9UWWpkeG5yzZ0tNYxDmd7vo58HDBc39mZ0xWWpolAGADdFOzkfamWLDxkOWcvHQKVmdTyQdLD4NOfjLWTKew==",
+      "license": "MIT",
       "dependencies": {
         "available-typed-arrays": "^1.0.5",
         "call-bind": "^1.0.2",
@@ -14013,9 +12297,8 @@
     },
     "node_modules/why-is-node-running": {
       "version": "2.2.2",
-      "resolved": "https://registry.npmjs.org/why-is-node-running/-/why-is-node-running-2.2.2.tgz",
-      "integrity": "sha512-6tSwToZxTOcotxHeA+qGCq1mVzKR3CwcJGmVcY+QE8SHy6TnpFnh8PAvPNHYr7EcuVeG0QSMxtYCuO1ta/G/oA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "siginfo": "^2.0.0",
         "stackback": "0.0.2"
@@ -14063,8 +12346,7 @@
     },
     "node_modules/wrap-ansi": {
       "version": "7.0.0",
-      "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz",
-      "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==",
+      "license": "MIT",
       "dependencies": {
         "ansi-styles": "^4.0.0",
         "string-width": "^4.1.0",
@@ -14079,8 +12361,7 @@
     },
     "node_modules/wrap-ansi/node_modules/ansi-styles": {
       "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+      "license": "MIT",
       "dependencies": {
         "color-convert": "^2.0.1"
       },
@@ -14093,8 +12374,7 @@
     },
     "node_modules/wrap-ansi/node_modules/color-convert": {
       "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+      "license": "MIT",
       "dependencies": {
         "color-name": "~1.1.4"
       },
@@ -14104,26 +12384,22 @@
     },
     "node_modules/wrap-ansi/node_modules/color-name": {
       "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="
+      "license": "MIT"
     },
     "node_modules/wrap-ansi/node_modules/emoji-regex": {
       "version": "8.0.0",
-      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
-      "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A=="
+      "license": "MIT"
     },
     "node_modules/wrap-ansi/node_modules/is-fullwidth-code-point": {
       "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
-      "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
+      "license": "MIT",
       "engines": {
         "node": ">=8"
       }
     },
     "node_modules/wrap-ansi/node_modules/string-width": {
       "version": "4.2.3",
-      "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
-      "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
+      "license": "MIT",
       "dependencies": {
         "emoji-regex": "^8.0.0",
         "is-fullwidth-code-point": "^3.0.0",
@@ -14135,36 +12411,31 @@
     },
     "node_modules/wrappy": {
       "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
-      "integrity": "sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ=="
+      "license": "ISC"
     },
     "node_modules/y18n": {
       "version": "5.0.8",
-      "resolved": "https://registry.npmjs.org/y18n/-/y18n-5.0.8.tgz",
-      "integrity": "sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==",
+      "license": "ISC",
       "engines": {
         "node": ">=10"
       }
     },
     "node_modules/yallist": {
       "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.1.1.tgz",
-      "integrity": "sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==",
+      "license": "ISC",
       "peer": true
     },
     "node_modules/yaml": {
       "version": "2.3.1",
-      "resolved": "https://registry.npmjs.org/yaml/-/yaml-2.3.1.tgz",
-      "integrity": "sha512-2eHWfjaoXgTBC2jNM1LRef62VQa0umtvRiDSk6HSzW7RvS5YtkabJrwYLLEKWBc8a5U2PTSCs+dJjUTJdlHsWQ==",
       "dev": true,
+      "license": "ISC",
       "engines": {
         "node": ">= 14"
       }
     },
     "node_modules/yargs": {
       "version": "17.7.2",
-      "resolved": "https://registry.npmjs.org/yargs/-/yargs-17.7.2.tgz",
-      "integrity": "sha512-7dSzzRQ++CKnNI/krKnYRV7JKKPUXMEh61soaHKg9mrWEhzFWhFnxPxGl+69cD1Ou63C13NUPCnmIcrvqCuM6w==",
+      "license": "MIT",
       "dependencies": {
         "cliui": "^8.0.1",
         "escalade": "^3.1.1",
@@ -14180,29 +12451,25 @@
     },
     "node_modules/yargs-parser": {
       "version": "21.1.1",
-      "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-21.1.1.tgz",
-      "integrity": "sha512-tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw==",
+      "license": "ISC",
       "engines": {
         "node": ">=12"
       }
     },
     "node_modules/yargs/node_modules/emoji-regex": {
       "version": "8.0.0",
-      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
-      "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A=="
+      "license": "MIT"
     },
     "node_modules/yargs/node_modules/is-fullwidth-code-point": {
       "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
-      "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
+      "license": "MIT",
       "engines": {
         "node": ">=8"
       }
     },
     "node_modules/yargs/node_modules/string-width": {
       "version": "4.2.3",
-      "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
-      "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
+      "license": "MIT",
       "dependencies": {
         "emoji-regex": "^8.0.0",
         "is-fullwidth-code-point": "^3.0.0",
@@ -14214,9 +12481,8 @@
     },
     "node_modules/yocto-queue": {
       "version": "0.1.0",
-      "resolved": "https://registry.npmjs.org/yocto-queue/-/yocto-queue-0.1.0.tgz",
-      "integrity": "sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=10"
       },
@@ -14226,22 +12492,19 @@
     },
     "node_modules/yqueue": {
       "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/yqueue/-/yqueue-1.0.1.tgz",
-      "integrity": "sha512-DBxJZBRafFLA/tCc5uO8ZTGFr+sQgn1FRJkZ4cVrIQIk6bv2bInraE3mbpLAJw9z93JGrLkqDoyTLrrZaCNq5w=="
+      "license": "MIT"
     },
     "node_modules/zod": {
       "version": "3.22.4",
-      "resolved": "https://registry.npmjs.org/zod/-/zod-3.22.4.tgz",
-      "integrity": "sha512-iC+8Io04lddc+mVqQ9AZ7OQ2MrUKGN+oIQyq1vemgt46jwCwLfhq7/pwnBnNXXXZb8VTVLKwp9EDkx+ryxIWmg==",
+      "license": "MIT",
       "funding": {
         "url": "https://github.com/sponsors/colinhacks"
       }
     },
     "node_modules/zod-validation-error": {
       "version": "3.3.0",
-      "resolved": "https://registry.npmjs.org/zod-validation-error/-/zod-validation-error-3.3.0.tgz",
-      "integrity": "sha512-Syib9oumw1NTqEv4LT0e6U83Td9aVRk9iTXPUQr1otyV1PuXQKOvOwhMNqZIq5hluzHP2pMgnOmHEo7kPdI2mw==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=18.0.0"
       },
@@ -14251,10395 +12514,14 @@
     },
     "node_modules/zone-file": {
       "version": "2.0.0-beta.3",
-      "resolved": "https://registry.npmjs.org/zone-file/-/zone-file-2.0.0-beta.3.tgz",
-      "integrity": "sha512-6tE3PSRcpN5lbTTLlkLez40WkNPc9vw/u1J2j6DBiy0jcVX48nCkWrx2EC+bWHqC2SLp069Xw4AdnYn/qp/W5g==",
+      "license": "ISC",
       "engines": {
         "node": ">=10"
       }
     },
     "node_modules/zxcvbn": {
       "version": "4.4.2",
-      "resolved": "https://registry.npmjs.org/zxcvbn/-/zxcvbn-4.4.2.tgz",
-      "integrity": "sha512-Bq0B+ixT/DMyG8kgX2xWcI5jUvCwqrMxSFam7m0lAf78nf04hv6lNCsyLYdyYTrCVMqNDY/206K7eExYCeSyUQ=="
-    }
-  },
-  "dependencies": {
-    "@aashutoshrathi/word-wrap": {
-      "version": "1.2.6",
-      "resolved": "https://registry.npmjs.org/@aashutoshrathi/word-wrap/-/word-wrap-1.2.6.tgz",
-      "integrity": "sha512-1Yjs2SvM8TflER/OD3cOjhWWOZb58A2t7wpE2S9XfBYTiIl+XFhQG2bjy4Pu1I+EAlCNUzRDYDdFwFYUKvXcIA==",
-      "dev": true
-    },
-    "@ampproject/remapping": {
-      "version": "2.2.1",
-      "resolved": "https://registry.npmjs.org/@ampproject/remapping/-/remapping-2.2.1.tgz",
-      "integrity": "sha512-lFMjJTrFL3j7L9yBxwYfCq2k6qqwHyzuUl/XBnif78PWTJYyL/dfowQHWE3sp6U6ZzqWiiIZnpTMO96zhkjwtg==",
-      "peer": true,
-      "requires": {
-        "@jridgewell/gen-mapping": "^0.3.0",
-        "@jridgewell/trace-mapping": "^0.3.9"
-      }
-    },
-    "@aryzing/superqs": {
-      "version": "0.0.6",
-      "resolved": "https://registry.npmjs.org/@aryzing/superqs/-/superqs-0.0.6.tgz",
-      "integrity": "sha512-MQR7BysZv1BqEmiFohs967UvMJMnWBipn2EFTG9AotyYXGgY67g7iofVOq8K83LAiOLVImr5kLhlzsmMTKLjFA==",
-      "requires": {
-        "superjson": "2.2.1"
-      }
-    },
-    "@babel/code-frame": {
-      "version": "7.23.4",
-      "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.23.4.tgz",
-      "integrity": "sha512-r1IONyb6Ia+jYR2vvIDhdWdlTGhqbBoFqLTQidzZ4kepUFH15ejXvFHxCVbtl7BOXIudsIubf4E81xeA3h3IXA==",
-      "requires": {
-        "@babel/highlight": "^7.23.4",
-        "chalk": "^2.4.2"
-      }
-    },
-    "@babel/compat-data": {
-      "version": "7.23.3",
-      "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.23.3.tgz",
-      "integrity": "sha512-BmR4bWbDIoFJmJ9z2cZ8Gmm2MXgEDgjdWgpKmKWUt54UGFJdlj31ECtbaDvCG/qVdG3AQ1SfpZEs01lUFbzLOQ==",
-      "peer": true
-    },
-    "@babel/core": {
-      "version": "7.23.3",
-      "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.23.3.tgz",
-      "integrity": "sha512-Jg+msLuNuCJDyBvFv5+OKOUjWMZgd85bKjbICd3zWrKAo+bJ49HJufi7CQE0q0uR8NGyO6xkCACScNqyjHSZew==",
-      "peer": true,
-      "requires": {
-        "@ampproject/remapping": "^2.2.0",
-        "@babel/code-frame": "^7.22.13",
-        "@babel/generator": "^7.23.3",
-        "@babel/helper-compilation-targets": "^7.22.15",
-        "@babel/helper-module-transforms": "^7.23.3",
-        "@babel/helpers": "^7.23.2",
-        "@babel/parser": "^7.23.3",
-        "@babel/template": "^7.22.15",
-        "@babel/traverse": "^7.23.3",
-        "@babel/types": "^7.23.3",
-        "convert-source-map": "^2.0.0",
-        "debug": "^4.1.0",
-        "gensync": "^1.0.0-beta.2",
-        "json5": "^2.2.3",
-        "semver": "^6.3.1"
-      },
-      "dependencies": {
-        "convert-source-map": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-2.0.0.tgz",
-          "integrity": "sha512-Kvp459HrV2FEJ1CAsi1Ku+MY3kasH19TFykTz2xWmMeq6bk2NU3XXvfJ+Q61m0xktWwt+1HSYf3JZsTms3aRJg==",
-          "peer": true
-        }
-      }
-    },
-    "@babel/generator": {
-      "version": "7.23.4",
-      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.23.4.tgz",
-      "integrity": "sha512-esuS49Cga3HcThFNebGhlgsrVLkvhqvYDTzgjfFFlHJcIfLe5jFmRRfCQ1KuBfc4Jrtn3ndLgKWAKjBE+IraYQ==",
-      "requires": {
-        "@babel/types": "^7.23.4",
-        "@jridgewell/gen-mapping": "^0.3.2",
-        "@jridgewell/trace-mapping": "^0.3.17",
-        "jsesc": "^2.5.1"
-      }
-    },
-    "@babel/helper-annotate-as-pure": {
-      "version": "7.22.5",
-      "resolved": "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.22.5.tgz",
-      "integrity": "sha512-LvBTxu8bQSQkcyKOU+a1btnNFQ1dMAd0R6PyW3arXes06F6QLWLIrd681bxRPIXlrMGR3XYnW9JyML7dP3qgxg==",
-      "requires": {
-        "@babel/types": "^7.22.5"
-      }
-    },
-    "@babel/helper-compilation-targets": {
-      "version": "7.22.15",
-      "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.22.15.tgz",
-      "integrity": "sha512-y6EEzULok0Qvz8yyLkCvVX+02ic+By2UdOhylwUOvOn9dvYc9mKICJuuU1n1XBI02YWsNsnrY1kc6DVbjcXbtw==",
-      "peer": true,
-      "requires": {
-        "@babel/compat-data": "^7.22.9",
-        "@babel/helper-validator-option": "^7.22.15",
-        "browserslist": "^4.21.9",
-        "lru-cache": "^5.1.1",
-        "semver": "^6.3.1"
-      }
-    },
-    "@babel/helper-environment-visitor": {
-      "version": "7.22.20",
-      "resolved": "https://registry.npmjs.org/@babel/helper-environment-visitor/-/helper-environment-visitor-7.22.20.tgz",
-      "integrity": "sha512-zfedSIzFhat/gFhWfHtgWvlec0nqB9YEIVrpuwjruLlXfUSnA8cJB0miHKwqDnQ7d32aKo2xt88/xZptwxbfhA=="
-    },
-    "@babel/helper-function-name": {
-      "version": "7.23.0",
-      "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.23.0.tgz",
-      "integrity": "sha512-OErEqsrxjZTJciZ4Oo+eoZqeW9UIiOcuYKRJA4ZAgV9myA+pOXhhmpfNCKjEH/auVfEYVFJ6y1Tc4r0eIApqiw==",
-      "requires": {
-        "@babel/template": "^7.22.15",
-        "@babel/types": "^7.23.0"
-      }
-    },
-    "@babel/helper-hoist-variables": {
-      "version": "7.22.5",
-      "resolved": "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.22.5.tgz",
-      "integrity": "sha512-wGjk9QZVzvknA6yKIUURb8zY3grXCcOZt+/7Wcy8O2uctxhplmUPkOdlgoNhmdVee2c92JXbf1xpMtVNbfoxRw==",
-      "requires": {
-        "@babel/types": "^7.22.5"
-      }
-    },
-    "@babel/helper-module-imports": {
-      "version": "7.22.15",
-      "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.22.15.tgz",
-      "integrity": "sha512-0pYVBnDKZO2fnSPCrgM/6WMc7eS20Fbok+0r88fp+YtWVLZrp4CkafFGIp+W0VKw4a22sgebPT99y+FDNMdP4w==",
-      "requires": {
-        "@babel/types": "^7.22.15"
-      }
-    },
-    "@babel/helper-module-transforms": {
-      "version": "7.23.3",
-      "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.23.3.tgz",
-      "integrity": "sha512-7bBs4ED9OmswdfDzpz4MpWgSrV7FXlc3zIagvLFjS5H+Mk7Snr21vQ6QwrsoCGMfNC4e4LQPdoULEt4ykz0SRQ==",
-      "peer": true,
-      "requires": {
-        "@babel/helper-environment-visitor": "^7.22.20",
-        "@babel/helper-module-imports": "^7.22.15",
-        "@babel/helper-simple-access": "^7.22.5",
-        "@babel/helper-split-export-declaration": "^7.22.6",
-        "@babel/helper-validator-identifier": "^7.22.20"
-      }
-    },
-    "@babel/helper-plugin-utils": {
-      "version": "7.22.5",
-      "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.22.5.tgz",
-      "integrity": "sha512-uLls06UVKgFG9QD4OeFYLEGteMIAa5kpTPcFL28yuCIIzsf6ZyKZMllKVOCZFhiZ5ptnwX4mtKdWCBE/uT4amg=="
-    },
-    "@babel/helper-simple-access": {
-      "version": "7.22.5",
-      "resolved": "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.22.5.tgz",
-      "integrity": "sha512-n0H99E/K+Bika3++WNL17POvo4rKWZ7lZEp1Q+fStVbUi8nxPQEBOlTmCOxW/0JsS56SKKQ+ojAe2pHKJHN35w==",
-      "peer": true,
-      "requires": {
-        "@babel/types": "^7.22.5"
-      }
-    },
-    "@babel/helper-split-export-declaration": {
-      "version": "7.22.6",
-      "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.22.6.tgz",
-      "integrity": "sha512-AsUnxuLhRYsisFiaJwvp1QF+I3KjD5FOxut14q/GzovUe6orHLesW2C7d754kRm53h5gqrz6sFl6sxc4BVtE/g==",
-      "requires": {
-        "@babel/types": "^7.22.5"
-      }
-    },
-    "@babel/helper-string-parser": {
-      "version": "7.23.4",
-      "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.23.4.tgz",
-      "integrity": "sha512-803gmbQdqwdf4olxrX4AJyFBV/RTr3rSmOj0rKwesmzlfhYNDEs+/iOcznzpNWlJlIlTJC2QfPFcHB6DlzdVLQ=="
-    },
-    "@babel/helper-validator-identifier": {
-      "version": "7.22.20",
-      "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.22.20.tgz",
-      "integrity": "sha512-Y4OZ+ytlatR8AI+8KZfKuL5urKp7qey08ha31L8b3BwewJAoJamTzyvxPR/5D+KkdJCGPq/+8TukHBlY10FX9A=="
-    },
-    "@babel/helper-validator-option": {
-      "version": "7.22.15",
-      "resolved": "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.22.15.tgz",
-      "integrity": "sha512-bMn7RmyFjY/mdECUbgn9eoSY4vqvacUnS9i9vGAGttgFWesO6B4CYWA7XlpbWgBt71iv/hfbPlynohStqnu5hA==",
-      "peer": true
-    },
-    "@babel/helpers": {
-      "version": "7.23.4",
-      "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.23.4.tgz",
-      "integrity": "sha512-HfcMizYz10cr3h29VqyfGL6ZWIjTwWfvYBMsBVGwpcbhNGe3wQ1ZXZRPzZoAHhd9OqHadHqjQ89iVKINXnbzuw==",
-      "peer": true,
-      "requires": {
-        "@babel/template": "^7.22.15",
-        "@babel/traverse": "^7.23.4",
-        "@babel/types": "^7.23.4"
-      }
-    },
-    "@babel/highlight": {
-      "version": "7.23.4",
-      "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.23.4.tgz",
-      "integrity": "sha512-acGdbYSfp2WheJoJm/EBBBLh/ID8KDc64ISZ9DYtBmC8/Q204PZJLHyzeB5qMzJ5trcOkybd78M4x2KWsUq++A==",
-      "requires": {
-        "@babel/helper-validator-identifier": "^7.22.20",
-        "chalk": "^2.4.2",
-        "js-tokens": "^4.0.0"
-      }
-    },
-    "@babel/parser": {
-      "version": "7.23.4",
-      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.23.4.tgz",
-      "integrity": "sha512-vf3Xna6UEprW+7t6EtOmFpHNAuxw3xqPZghy+brsnusscJRW5BMUzzHZc5ICjULee81WeUV2jjakG09MDglJXQ=="
-    },
-    "@babel/plugin-syntax-jsx": {
-      "version": "7.23.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.23.3.tgz",
-      "integrity": "sha512-EB2MELswq55OHUoRZLGg/zC7QWUKfNLpE57m/S2yr1uEneIgsTgrSzXP3NXEsMkVn76OlaVVnzN+ugObuYGwhg==",
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.22.5"
-      }
-    },
-    "@babel/runtime": {
-      "version": "7.22.6",
-      "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.22.6.tgz",
-      "integrity": "sha512-wDb5pWm4WDdF6LFUde3Jl8WzPA+3ZbxYqkC6xAXuD3irdEHN1k0NfTRrJD8ZD378SJ61miMLCqIOXYhd8x+AJQ==",
-      "requires": {
-        "regenerator-runtime": "^0.13.11"
-      }
-    },
-    "@babel/template": {
-      "version": "7.22.15",
-      "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.22.15.tgz",
-      "integrity": "sha512-QPErUVm4uyJa60rkI73qneDacvdvzxshT3kksGqlGWYdOTIUOwJ7RDUL8sGqslY1uXWSL6xMFKEXDS3ox2uF0w==",
-      "requires": {
-        "@babel/code-frame": "^7.22.13",
-        "@babel/parser": "^7.22.15",
-        "@babel/types": "^7.22.15"
-      }
-    },
-    "@babel/traverse": {
-      "version": "7.23.4",
-      "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.23.4.tgz",
-      "integrity": "sha512-IYM8wSUwunWTB6tFC2dkKZhxbIjHoWemdK+3f8/wq8aKhbUscxD5MX72ubd90fxvFknaLPeGw5ycU84V1obHJg==",
-      "requires": {
-        "@babel/code-frame": "^7.23.4",
-        "@babel/generator": "^7.23.4",
-        "@babel/helper-environment-visitor": "^7.22.20",
-        "@babel/helper-function-name": "^7.23.0",
-        "@babel/helper-hoist-variables": "^7.22.5",
-        "@babel/helper-split-export-declaration": "^7.22.6",
-        "@babel/parser": "^7.23.4",
-        "@babel/types": "^7.23.4",
-        "debug": "^4.1.0",
-        "globals": "^11.1.0"
-      }
-    },
-    "@babel/types": {
-      "version": "7.23.4",
-      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.23.4.tgz",
-      "integrity": "sha512-7uIFwVYpoplT5jp/kVv6EF93VaJ8H+Yn5IczYiaAi98ajzjfoZfslet/e0sLh+wVBjb2qqIut1b0S26VSafsSQ==",
-      "requires": {
-        "@babel/helper-string-parser": "^7.23.4",
-        "@babel/helper-validator-identifier": "^7.22.20",
-        "to-fast-properties": "^2.0.0"
-      }
-    },
-    "@bitcoinerlab/descriptors": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/@bitcoinerlab/descriptors/-/descriptors-1.1.1.tgz",
-      "integrity": "sha512-AMFkbBBg9T1iWtEmWB23oADk7zaOQix6wUPLXalhTyFDjhkFXDd6pCRfto/HAdaPg/ccM4GMTVgYLee9WdYFyQ==",
-      "requires": {
-        "@bitcoinerlab/miniscript": "^1.2.1",
-        "@bitcoinerlab/secp256k1": "^1.0.5",
-        "bip32": "^4.0.0",
-        "bitcoinjs-lib": "^6.1.3",
-        "ecpair": "^2.1.0"
-      }
-    },
-    "@bitcoinerlab/miniscript": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/@bitcoinerlab/miniscript/-/miniscript-1.4.0.tgz",
-      "integrity": "sha512-BsG3dmwQmgKHnRZecDgUsPjwcpnf1wgaZbolcMTByS10k1zYzIx97W51LzG7GvokRJ+wnzTX/GhC8Y3L2X0CQA==",
-      "requires": {
-        "bip68": "^1.0.4"
-      }
-    },
-    "@bitcoinerlab/secp256k1": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/@bitcoinerlab/secp256k1/-/secp256k1-1.1.1.tgz",
-      "integrity": "sha512-uhjW51WfVLpnHN7+G0saDcM/k9IqcyTbZ+bDgLF3AX8V/a3KXSE9vn7UPBrcdU72tp0J4YPR7BHp2m7MLAZ/1Q==",
-      "requires": {
-        "@noble/hashes": "^1.1.5",
-        "@noble/secp256k1": "^1.7.1"
-      }
-    },
-    "@emotion/is-prop-valid": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/@emotion/is-prop-valid/-/is-prop-valid-1.2.1.tgz",
-      "integrity": "sha512-61Mf7Ufx4aDxx1xlDeOm8aFFigGHE4z+0sKCa+IHCeZKiyP9RLD0Mmx7m8b9/Cf37f7NAvQOOJAbQQGVr5uERw==",
-      "requires": {
-        "@emotion/memoize": "^0.8.1"
-      }
-    },
-    "@emotion/memoize": {
-      "version": "0.8.1",
-      "resolved": "https://registry.npmjs.org/@emotion/memoize/-/memoize-0.8.1.tgz",
-      "integrity": "sha512-W2P2c/VRW1/1tLox0mVUalvnWXxavmv/Oum2aPsRcoDJuob75FC3Y8FbpfLwUegRcxINtGUMPq0tFCvYNTBXNA=="
-    },
-    "@emotion/stylis": {
-      "version": "0.8.5",
-      "resolved": "https://registry.npmjs.org/@emotion/stylis/-/stylis-0.8.5.tgz",
-      "integrity": "sha512-h6KtPihKFn3T9fuIrwvXXUOwlx3rfUvfZIcP5a6rh8Y7zjE3O06hT5Ss4S/YI1AYhuZ1kjaE/5EaOOI2NqSylQ=="
-    },
-    "@ericcornelissen/bash-parser": {
-      "version": "0.5.3",
-      "resolved": "https://registry.npmjs.org/@ericcornelissen/bash-parser/-/bash-parser-0.5.3.tgz",
-      "integrity": "sha512-9Z0sGuXqf6En19qmwB0Syi1Mc8TYl756dNuuaYal9mrypKa0Jq/IX6aJfh6Rk2S3z66KBisWTqloDo7weYj4zg==",
-      "dev": true,
-      "requires": {
-        "array-last": "^1.1.1",
-        "babylon": "^6.9.1",
-        "compose-function": "^3.0.3",
-        "filter-obj": "^1.1.0",
-        "has-own-property": "^0.1.0",
-        "identity-function": "^1.0.0",
-        "is-iterable": "^1.1.0",
-        "iterable-lookahead": "^1.0.0",
-        "lodash.curry": "^4.1.1",
-        "magic-string": "^0.16.0",
-        "map-obj": "^2.0.0",
-        "object-pairs": "^0.1.0",
-        "object-values": "^1.0.0",
-        "reverse-arguments": "^1.0.0",
-        "shell-quote-word": "^1.0.1",
-        "to-pascal-case": "^1.0.0",
-        "unescape-js": "^1.0.5"
-      },
-      "dependencies": {
-        "magic-string": {
-          "version": "0.16.0",
-          "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.16.0.tgz",
-          "integrity": "sha512-c4BEos3y6G2qO0B9X7K0FVLOPT9uGrjYwYRLFmDqyl5YMboUviyecnXWp94fJTSMwPw2/sf+CEYt5AGpmklkkQ==",
-          "dev": true,
-          "requires": {
-            "vlq": "^0.2.1"
-          }
-        }
-      }
-    },
-    "@esbuild/aix-ppc64": {
-      "version": "0.21.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/aix-ppc64/-/aix-ppc64-0.21.5.tgz",
-      "integrity": "sha512-1SDgH6ZSPTlggy1yI6+Dbkiz8xzpHJEVAlF/AM1tHPLsf5STom9rwtjE4hKAF20FfXXNTFqEYXyJNWh1GiZedQ==",
-      "dev": true,
-      "optional": true
-    },
-    "@esbuild/android-arm": {
-      "version": "0.21.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.21.5.tgz",
-      "integrity": "sha512-vCPvzSjpPHEi1siZdlvAlsPxXl7WbOVUBBAowWug4rJHb68Ox8KualB+1ocNvT5fjv6wpkX6o/iEpbDrf68zcg==",
-      "dev": true,
-      "optional": true
-    },
-    "@esbuild/android-arm64": {
-      "version": "0.21.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.21.5.tgz",
-      "integrity": "sha512-c0uX9VAUBQ7dTDCjq+wdyGLowMdtR/GoC2U5IYk/7D1H1JYC0qseD7+11iMP2mRLN9RcCMRcjC4YMclCzGwS/A==",
-      "dev": true,
-      "optional": true
-    },
-    "@esbuild/android-x64": {
-      "version": "0.21.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.21.5.tgz",
-      "integrity": "sha512-D7aPRUUNHRBwHxzxRvp856rjUHRFW1SdQATKXH2hqA0kAZb1hKmi02OpYRacl0TxIGz/ZmXWlbZgjwWYaCakTA==",
-      "dev": true,
-      "optional": true
-    },
-    "@esbuild/darwin-arm64": {
-      "version": "0.21.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.21.5.tgz",
-      "integrity": "sha512-DwqXqZyuk5AiWWf3UfLiRDJ5EDd49zg6O9wclZ7kUMv2WRFr4HKjXp/5t8JZ11QbQfUS6/cRCKGwYhtNAY88kQ==",
-      "dev": true,
-      "optional": true
-    },
-    "@esbuild/darwin-x64": {
-      "version": "0.21.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.21.5.tgz",
-      "integrity": "sha512-se/JjF8NlmKVG4kNIuyWMV/22ZaerB+qaSi5MdrXtd6R08kvs2qCN4C09miupktDitvh8jRFflwGFBQcxZRjbw==",
-      "dev": true,
-      "optional": true
-    },
-    "@esbuild/freebsd-arm64": {
-      "version": "0.21.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.21.5.tgz",
-      "integrity": "sha512-5JcRxxRDUJLX8JXp/wcBCy3pENnCgBR9bN6JsY4OmhfUtIHe3ZW0mawA7+RDAcMLrMIZaf03NlQiX9DGyB8h4g==",
-      "dev": true,
-      "optional": true
-    },
-    "@esbuild/freebsd-x64": {
-      "version": "0.21.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.21.5.tgz",
-      "integrity": "sha512-J95kNBj1zkbMXtHVH29bBriQygMXqoVQOQYA+ISs0/2l3T9/kj42ow2mpqerRBxDJnmkUDCaQT/dfNXWX/ZZCQ==",
-      "dev": true,
-      "optional": true
-    },
-    "@esbuild/linux-arm": {
-      "version": "0.21.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.21.5.tgz",
-      "integrity": "sha512-bPb5AHZtbeNGjCKVZ9UGqGwo8EUu4cLq68E95A53KlxAPRmUyYv2D6F0uUI65XisGOL1hBP5mTronbgo+0bFcA==",
-      "dev": true,
-      "optional": true
-    },
-    "@esbuild/linux-arm64": {
-      "version": "0.21.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.21.5.tgz",
-      "integrity": "sha512-ibKvmyYzKsBeX8d8I7MH/TMfWDXBF3db4qM6sy+7re0YXya+K1cem3on9XgdT2EQGMu4hQyZhan7TeQ8XkGp4Q==",
-      "dev": true,
-      "optional": true
-    },
-    "@esbuild/linux-ia32": {
-      "version": "0.21.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.21.5.tgz",
-      "integrity": "sha512-YvjXDqLRqPDl2dvRODYmmhz4rPeVKYvppfGYKSNGdyZkA01046pLWyRKKI3ax8fbJoK5QbxblURkwK/MWY18Tg==",
-      "dev": true,
-      "optional": true
-    },
-    "@esbuild/linux-loong64": {
-      "version": "0.21.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.21.5.tgz",
-      "integrity": "sha512-uHf1BmMG8qEvzdrzAqg2SIG/02+4/DHB6a9Kbya0XDvwDEKCoC8ZRWI5JJvNdUjtciBGFQ5PuBlpEOXQj+JQSg==",
-      "dev": true,
-      "optional": true
-    },
-    "@esbuild/linux-mips64el": {
-      "version": "0.21.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.21.5.tgz",
-      "integrity": "sha512-IajOmO+KJK23bj52dFSNCMsz1QP1DqM6cwLUv3W1QwyxkyIWecfafnI555fvSGqEKwjMXVLokcV5ygHW5b3Jbg==",
-      "dev": true,
-      "optional": true
-    },
-    "@esbuild/linux-ppc64": {
-      "version": "0.21.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.21.5.tgz",
-      "integrity": "sha512-1hHV/Z4OEfMwpLO8rp7CvlhBDnjsC3CttJXIhBi+5Aj5r+MBvy4egg7wCbe//hSsT+RvDAG7s81tAvpL2XAE4w==",
-      "dev": true,
-      "optional": true
-    },
-    "@esbuild/linux-riscv64": {
-      "version": "0.21.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.21.5.tgz",
-      "integrity": "sha512-2HdXDMd9GMgTGrPWnJzP2ALSokE/0O5HhTUvWIbD3YdjME8JwvSCnNGBnTThKGEB91OZhzrJ4qIIxk/SBmyDDA==",
-      "dev": true,
-      "optional": true
-    },
-    "@esbuild/linux-s390x": {
-      "version": "0.21.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.21.5.tgz",
-      "integrity": "sha512-zus5sxzqBJD3eXxwvjN1yQkRepANgxE9lgOW2qLnmr8ikMTphkjgXu1HR01K4FJg8h1kEEDAqDcZQtbrRnB41A==",
-      "dev": true,
-      "optional": true
-    },
-    "@esbuild/linux-x64": {
-      "version": "0.21.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.21.5.tgz",
-      "integrity": "sha512-1rYdTpyv03iycF1+BhzrzQJCdOuAOtaqHTWJZCWvijKD2N5Xu0TtVC8/+1faWqcP9iBCWOmjmhoH94dH82BxPQ==",
-      "dev": true,
-      "optional": true
-    },
-    "@esbuild/netbsd-x64": {
-      "version": "0.21.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.21.5.tgz",
-      "integrity": "sha512-Woi2MXzXjMULccIwMnLciyZH4nCIMpWQAs049KEeMvOcNADVxo0UBIQPfSmxB3CWKedngg7sWZdLvLczpe0tLg==",
-      "dev": true,
-      "optional": true
-    },
-    "@esbuild/openbsd-x64": {
-      "version": "0.21.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.21.5.tgz",
-      "integrity": "sha512-HLNNw99xsvx12lFBUwoT8EVCsSvRNDVxNpjZ7bPn947b8gJPzeHWyNVhFsaerc0n3TsbOINvRP2byTZ5LKezow==",
-      "dev": true,
-      "optional": true
-    },
-    "@esbuild/sunos-x64": {
-      "version": "0.21.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.21.5.tgz",
-      "integrity": "sha512-6+gjmFpfy0BHU5Tpptkuh8+uw3mnrvgs+dSPQXQOv3ekbordwnzTVEb4qnIvQcYXq6gzkyTnoZ9dZG+D4garKg==",
-      "dev": true,
-      "optional": true
-    },
-    "@esbuild/win32-arm64": {
-      "version": "0.21.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.21.5.tgz",
-      "integrity": "sha512-Z0gOTd75VvXqyq7nsl93zwahcTROgqvuAcYDUr+vOv8uHhNSKROyU961kgtCD1e95IqPKSQKH7tBTslnS3tA8A==",
-      "dev": true,
-      "optional": true
-    },
-    "@esbuild/win32-ia32": {
-      "version": "0.21.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.21.5.tgz",
-      "integrity": "sha512-SWXFF1CL2RVNMaVs+BBClwtfZSvDgtL//G/smwAc5oVK/UPu2Gu9tIaRgFmYFFKrmg3SyAjSrElf0TiJ1v8fYA==",
-      "dev": true,
-      "optional": true
-    },
-    "@esbuild/win32-x64": {
-      "version": "0.21.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.21.5.tgz",
-      "integrity": "sha512-tQd/1efJuzPC6rCFwEvLtci/xNFcTZknmXs98FYDfGE4wP9ClFV98nyKrzJKVPMhdDnjzLhdUyMX4PsQAPjwIw==",
-      "dev": true,
-      "optional": true
-    },
-    "@eslint-community/eslint-utils": {
-      "version": "4.4.0",
-      "resolved": "https://registry.npmjs.org/@eslint-community/eslint-utils/-/eslint-utils-4.4.0.tgz",
-      "integrity": "sha512-1/sA4dwrzBAyeUoQ6oxahHKmrZvsnLCg4RfxW3ZFGGmQkSNQPFNLV9CUEFQP1x9EYXHTo5p6xdhZM1Ne9p/AfA==",
-      "dev": true,
-      "requires": {
-        "eslint-visitor-keys": "^3.3.0"
-      }
-    },
-    "@eslint-community/regexpp": {
-      "version": "4.6.2",
-      "resolved": "https://registry.npmjs.org/@eslint-community/regexpp/-/regexpp-4.6.2.tgz",
-      "integrity": "sha512-pPTNuaAG3QMH+buKyBIGJs3g/S5y0caxw0ygM3YyE6yJFySwiGGSzA+mM3KJ8QQvzeLh3blwgSonkFjgQdxzMw==",
-      "dev": true
-    },
-    "@eslint/eslintrc": {
-      "version": "2.1.4",
-      "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-2.1.4.tgz",
-      "integrity": "sha512-269Z39MS6wVJtsoUl10L60WdkhJVdPG24Q4eZTH3nnF6lpvSShEK3wQjDX9JRWAUPvPh7COouPpU9IrqaZFvtQ==",
-      "dev": true,
-      "requires": {
-        "ajv": "^6.12.4",
-        "debug": "^4.3.2",
-        "espree": "^9.6.0",
-        "globals": "^13.19.0",
-        "ignore": "^5.2.0",
-        "import-fresh": "^3.2.1",
-        "js-yaml": "^4.1.0",
-        "minimatch": "^3.1.2",
-        "strip-json-comments": "^3.1.1"
-      },
-      "dependencies": {
-        "globals": {
-          "version": "13.24.0",
-          "resolved": "https://registry.npmjs.org/globals/-/globals-13.24.0.tgz",
-          "integrity": "sha512-AhO5QUcj8llrbG09iWhPU2B204J1xnPeL8kQmVorSsy+Sjj1sk8gIyh6cUocGmH4L0UuhAJy+hJMRA4mgA4mFQ==",
-          "dev": true,
-          "requires": {
-            "type-fest": "^0.20.2"
-          }
-        },
-        "type-fest": {
-          "version": "0.20.2",
-          "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.20.2.tgz",
-          "integrity": "sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==",
-          "dev": true
-        }
-      }
-    },
-    "@eslint/js": {
-      "version": "8.40.0",
-      "resolved": "https://registry.npmjs.org/@eslint/js/-/js-8.40.0.tgz",
-      "integrity": "sha512-ElyB54bJIhXQYVKjDSvCkPO1iU1tSAeVQJbllWJq1XQSmmA4dgFk8CbiBGpiOPxleE48vDogxCtmMYku4HSVLA==",
-      "dev": true
-    },
-    "@floating-ui/core": {
-      "version": "1.4.1",
-      "resolved": "https://registry.npmjs.org/@floating-ui/core/-/core-1.4.1.tgz",
-      "integrity": "sha512-jk3WqquEJRlcyu7997NtR5PibI+y5bi+LS3hPmguVClypenMsCY3CBa3LAQnozRCtCrYWSEtAdiskpamuJRFOQ==",
-      "requires": {
-        "@floating-ui/utils": "^0.1.1"
-      }
-    },
-    "@floating-ui/dom": {
-      "version": "1.5.1",
-      "resolved": "https://registry.npmjs.org/@floating-ui/dom/-/dom-1.5.1.tgz",
-      "integrity": "sha512-KwvVcPSXg6mQygvA1TjbN/gh///36kKtllIF8SUm0qpFj8+rvYrpvlYdL1JoA71SHpDqgSSdGOSoQ0Mp3uY5aw==",
-      "requires": {
-        "@floating-ui/core": "^1.4.1",
-        "@floating-ui/utils": "^0.1.1"
-      }
-    },
-    "@floating-ui/utils": {
-      "version": "0.1.1",
-      "resolved": "https://registry.npmjs.org/@floating-ui/utils/-/utils-0.1.1.tgz",
-      "integrity": "sha512-m0G6wlnhm/AX0H12IOWtK8gASEMffnX08RtKkCgTdHb9JpHKGloI7icFfLg9ZmQeavcvR0PKmzxClyuFPSjKWw=="
-    },
-    "@humanwhocodes/config-array": {
-      "version": "0.11.14",
-      "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.11.14.tgz",
-      "integrity": "sha512-3T8LkOmg45BV5FICb15QQMsyUSWrQ8AygVfC7ZG32zOalnqrilm018ZVCw0eapXux8FtA33q8PSRSstjee3jSg==",
-      "dev": true,
-      "requires": {
-        "@humanwhocodes/object-schema": "^2.0.2",
-        "debug": "^4.3.1",
-        "minimatch": "^3.0.5"
-      }
-    },
-    "@humanwhocodes/module-importer": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/@humanwhocodes/module-importer/-/module-importer-1.0.1.tgz",
-      "integrity": "sha512-bxveV4V8v5Yb4ncFTT3rPSgZBOpCkjfK0y4oVVVJwIuDVBRMDXrPyXRL988i5ap9m9bnyEEjWfm5WkBmtffLfA==",
-      "dev": true
-    },
-    "@humanwhocodes/object-schema": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/@humanwhocodes/object-schema/-/object-schema-2.0.2.tgz",
-      "integrity": "sha512-6EwiSjwWYP7pTckG6I5eyFANjPhmPjUX9JRLUSfNPC7FX7zK9gyZAfUEaECL6ALTpGX5AjnBq3C9XmVWPitNpw==",
-      "dev": true
-    },
-    "@jest/schemas": {
-      "version": "29.6.3",
-      "resolved": "https://registry.npmjs.org/@jest/schemas/-/schemas-29.6.3.tgz",
-      "integrity": "sha512-mo5j5X+jIZmJQveBKeS/clAueipV7KgiX1vMgCxam1RNYiqE1w62n0/tJJnHtjW8ZHcQco5gY85jA3mi0L+nSA==",
-      "dev": true,
-      "requires": {
-        "@sinclair/typebox": "^0.27.8"
-      }
-    },
-    "@jridgewell/gen-mapping": {
-      "version": "0.3.3",
-      "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.3.tgz",
-      "integrity": "sha512-HLhSWOLRi875zjjMG/r+Nv0oCW8umGb0BgEhyX3dDX3egwZtB8PqLnjz3yedt8R5StBrzcg4aBpnh8UA9D1BoQ==",
-      "requires": {
-        "@jridgewell/set-array": "^1.0.1",
-        "@jridgewell/sourcemap-codec": "^1.4.10",
-        "@jridgewell/trace-mapping": "^0.3.9"
-      }
-    },
-    "@jridgewell/resolve-uri": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.1.0.tgz",
-      "integrity": "sha512-F2msla3tad+Mfht5cJq7LSXcdudKTWCVYUgw6pLFOOHSTtZlj6SWNYAp+AhuqLmWdBO2X5hPrLcu8cVP8fy28w=="
-    },
-    "@jridgewell/set-array": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/@jridgewell/set-array/-/set-array-1.1.2.tgz",
-      "integrity": "sha512-xnkseuNADM0gt2bs+BvhO0p78Mk762YnZdsuzFV018NoG1Sj1SCQvpSqa7XUaTam5vAGasABV9qXASMKnFMwMw=="
-    },
-    "@jridgewell/source-map": {
-      "version": "0.3.5",
-      "resolved": "https://registry.npmjs.org/@jridgewell/source-map/-/source-map-0.3.5.tgz",
-      "integrity": "sha512-UTYAUj/wviwdsMfzoSJspJxbkH5o1snzwX0//0ENX1u/55kkZZkcTZP6u9bwKGkv+dkk9at4m1Cpt0uY80kcpQ==",
-      "dev": true,
-      "requires": {
-        "@jridgewell/gen-mapping": "^0.3.0",
-        "@jridgewell/trace-mapping": "^0.3.9"
-      }
-    },
-    "@jridgewell/sourcemap-codec": {
-      "version": "1.4.15",
-      "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.15.tgz",
-      "integrity": "sha512-eF2rxCRulEKXHTRiDrDy6erMYWqNw4LPdQ8UQA4huuxaQsVeRPFl2oM8oDGxMFhJUWZf9McpLtJasDDZb/Bpeg=="
-    },
-    "@jridgewell/trace-mapping": {
-      "version": "0.3.18",
-      "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.18.tgz",
-      "integrity": "sha512-w+niJYzMHdd7USdiH2U6869nqhD2nbfZXND5Yp93qIbEmnDNk7PD48o+YchRVpzMU7M6jVCbenTR7PA1FLQ9pA==",
-      "requires": {
-        "@jridgewell/resolve-uri": "3.1.0",
-        "@jridgewell/sourcemap-codec": "1.4.14"
-      },
-      "dependencies": {
-        "@jridgewell/sourcemap-codec": {
-          "version": "1.4.14",
-          "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.14.tgz",
-          "integrity": "sha512-XPSJHWmi394fuUuzDnGz1wiKqWfo1yXecHQMRf2l6hztTO+nPru658AyDngaBe7isIxEkRsPR3FZh+s7iVa4Uw=="
-        }
-      }
-    },
-    "@ledgerhq/devices": {
-      "version": "8.0.5",
-      "resolved": "https://registry.npmjs.org/@ledgerhq/devices/-/devices-8.0.5.tgz",
-      "integrity": "sha512-Cy4LOfcYhYGWLd2nRA/CY/AneJT+Q3RyNwzoRx28gqAN21vF3+IZtL0jqs1n78rZ2bTEHyBS1GMOX13s5Y+O4g==",
-      "requires": {
-        "@ledgerhq/errors": "^6.13.0",
-        "@ledgerhq/logs": "^6.10.1",
-        "rxjs": "6",
-        "semver": "^7.3.5"
-      },
-      "dependencies": {
-        "lru-cache": {
-          "version": "6.0.0",
-          "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
-          "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
-          "requires": {
-            "yallist": "^4.0.0"
-          }
-        },
-        "semver": {
-          "version": "7.5.4",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz",
-          "integrity": "sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==",
-          "requires": {
-            "lru-cache": "^6.0.0"
-          }
-        },
-        "yallist": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
-          "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A=="
-        }
-      }
-    },
-    "@ledgerhq/errors": {
-      "version": "6.13.0",
-      "resolved": "https://registry.npmjs.org/@ledgerhq/errors/-/errors-6.13.0.tgz",
-      "integrity": "sha512-cMFNX2AN6Gdj4RVIizI/7vWb+JYRu5na0rQSjybf7xGW5MSVdFVRcOg90VvqnDRsNfgFBbJzhpf7o4D7S3yFgg=="
-    },
-    "@ledgerhq/hw-transport": {
-      "version": "6.28.6",
-      "resolved": "https://registry.npmjs.org/@ledgerhq/hw-transport/-/hw-transport-6.28.6.tgz",
-      "integrity": "sha512-0VVB4jIG6ZTRtHusI5kO2jPcc1yFQ+iIcNKiTaaBHytsdGjTfhipje+W4vxo+nCdOKdrkOqB80GwykmKuNNXyA==",
-      "requires": {
-        "@ledgerhq/devices": "^8.0.5",
-        "@ledgerhq/errors": "^6.13.0",
-        "events": "^3.3.0"
-      }
-    },
-    "@ledgerhq/hw-transport-webusb": {
-      "version": "6.27.17",
-      "resolved": "https://registry.npmjs.org/@ledgerhq/hw-transport-webusb/-/hw-transport-webusb-6.27.17.tgz",
-      "integrity": "sha512-HRh3PWwAHqfuibAif15H2X5ZbH8nNisDX49IxBoexBz/fM5ivP95kZZQsXLxzPxey5ima49B7AjWY3LyGBytqA==",
-      "requires": {
-        "@ledgerhq/devices": "^8.0.5",
-        "@ledgerhq/errors": "^6.13.0",
-        "@ledgerhq/hw-transport": "^6.28.6",
-        "@ledgerhq/logs": "^6.10.1"
-      }
-    },
-    "@ledgerhq/logs": {
-      "version": "6.10.1",
-      "resolved": "https://registry.npmjs.org/@ledgerhq/logs/-/logs-6.10.1.tgz",
-      "integrity": "sha512-z+ILK8Q3y+nfUl43ctCPuR4Y2bIxk/ooCQFwZxhtci1EhAtMDzMAx2W25qx8G1PPL9UUOdnUax19+F0OjXoj4w=="
-    },
-    "@leichtgewicht/ip-codec": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/@leichtgewicht/ip-codec/-/ip-codec-2.0.4.tgz",
-      "integrity": "sha512-Hcv+nVC0kZnQ3tD9GVu5xSMR4VVYOteQIr/hwFPVEvPdlXqgGEuRjiheChHgdM+JyqdgNcmzZOX/tnl0JOiI7A==",
-      "dev": true
-    },
-    "@noble/curves": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/@noble/curves/-/curves-1.3.0.tgz",
-      "integrity": "sha512-t01iSXPuN+Eqzb4eBX0S5oubSqXbK/xXa1Ne18Hj8f9pStxztHCE2gfboSp/dZRLSqfuLpRK2nDXDK+W9puocA==",
-      "requires": {
-        "@noble/hashes": "1.3.3"
-      }
-    },
-    "@noble/hashes": {
-      "version": "1.3.3",
-      "resolved": "https://registry.npmjs.org/@noble/hashes/-/hashes-1.3.3.tgz",
-      "integrity": "sha512-V7/fPHgl+jsVPXqqeOzT8egNj2iBIVt+ECeMMG8TdcnTikP3oaBtUVqpT/gYCR68aEBJSF+XbYUxStjbFMqIIA=="
-    },
-    "@noble/secp256k1": {
-      "version": "1.7.1",
-      "resolved": "https://registry.npmjs.org/@noble/secp256k1/-/secp256k1-1.7.1.tgz",
-      "integrity": "sha512-hOUk6AyBFmqVrv7k5WAw/LpszxVbj9gGN4JRkIX52fdFAj1UA61KXmZDvqVEm+pOyec3+fIeZB02LYa/pWOArw=="
-    },
-    "@nodelib/fs.scandir": {
-      "version": "2.1.5",
-      "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz",
-      "integrity": "sha512-vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g==",
-      "dev": true,
-      "requires": {
-        "@nodelib/fs.stat": "2.0.5",
-        "run-parallel": "^1.1.9"
-      }
-    },
-    "@nodelib/fs.stat": {
-      "version": "2.0.5",
-      "resolved": "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz",
-      "integrity": "sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A==",
-      "dev": true
-    },
-    "@nodelib/fs.walk": {
-      "version": "1.2.8",
-      "resolved": "https://registry.npmjs.org/@nodelib/fs.walk/-/fs.walk-1.2.8.tgz",
-      "integrity": "sha512-oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg==",
-      "dev": true,
-      "requires": {
-        "@nodelib/fs.scandir": "2.1.5",
-        "fastq": "^1.6.0"
-      }
-    },
-    "@phosphor-icons/react": {
-      "version": "2.0.10",
-      "resolved": "https://registry.npmjs.org/@phosphor-icons/react/-/react-2.0.10.tgz",
-      "integrity": "sha512-q5ITPNFhmEiYZLZOvEhjo2phlfxoOmit7vE1tBYMxcMqnZX2vdbMw3deDE7wCegpBKM/q/p39BJmhhoPcjZyCg==",
-      "requires": {}
-    },
-    "@playwright/test": {
-      "version": "1.45.2",
-      "resolved": "https://registry.npmjs.org/@playwright/test/-/test-1.45.2.tgz",
-      "integrity": "sha512-JxG9eq92ET75EbVi3s+4sYbcG7q72ECeZNbdBlaMkGcNbiDQ4cAi8U2QP5oKkOx+1gpaiL1LDStmzCaEM1Z6fQ==",
-      "requires": {
-        "playwright": "1.45.2"
-      }
-    },
-    "@pmmmwh/react-refresh-webpack-plugin": {
-      "version": "0.5.10",
-      "resolved": "https://registry.npmjs.org/@pmmmwh/react-refresh-webpack-plugin/-/react-refresh-webpack-plugin-0.5.10.tgz",
-      "integrity": "sha512-j0Ya0hCFZPd4x40qLzbhGsh9TMtdb+CJQiso+WxLOPNasohq9cc5SNUcwsZaRH6++Xh91Xkm/xHCkuIiIu0LUA==",
-      "dev": true,
-      "requires": {
-        "ansi-html-community": "^0.0.8",
-        "common-path-prefix": "^3.0.0",
-        "core-js-pure": "^3.23.3",
-        "error-stack-parser": "^2.0.6",
-        "find-up": "^5.0.0",
-        "html-entities": "^2.1.0",
-        "loader-utils": "^2.0.4",
-        "schema-utils": "^3.0.0",
-        "source-map": "^0.7.3"
-      }
-    },
-    "@rc-component/portal": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/@rc-component/portal/-/portal-1.1.2.tgz",
-      "integrity": "sha512-6f813C0IsasTZms08kfA8kPAGxbbkYToa8ALaiDIGGECU4i9hj8Plgbx0sNJDrey3EtHO30hmdaxtT0138xZcg==",
-      "requires": {
-        "@babel/runtime": "^7.18.0",
-        "classnames": "^2.3.2",
-        "rc-util": "^5.24.4"
-      }
-    },
-    "@react-spring/animated": {
-      "version": "9.7.3",
-      "resolved": "https://registry.npmjs.org/@react-spring/animated/-/animated-9.7.3.tgz",
-      "integrity": "sha512-5CWeNJt9pNgyvuSzQH+uy2pvTg8Y4/OisoscZIR8/ZNLIOI+CatFBhGZpDGTF/OzdNFsAoGk3wiUYTwoJ0YIvw==",
-      "requires": {
-        "@react-spring/shared": "~9.7.3",
-        "@react-spring/types": "~9.7.3"
-      }
-    },
-    "@react-spring/core": {
-      "version": "9.7.3",
-      "resolved": "https://registry.npmjs.org/@react-spring/core/-/core-9.7.3.tgz",
-      "integrity": "sha512-IqFdPVf3ZOC1Cx7+M0cXf4odNLxDC+n7IN3MDcVCTIOSBfqEcBebSv+vlY5AhM0zw05PDbjKrNmBpzv/AqpjnQ==",
-      "requires": {
-        "@react-spring/animated": "~9.7.3",
-        "@react-spring/shared": "~9.7.3",
-        "@react-spring/types": "~9.7.3"
-      }
-    },
-    "@react-spring/shared": {
-      "version": "9.7.3",
-      "resolved": "https://registry.npmjs.org/@react-spring/shared/-/shared-9.7.3.tgz",
-      "integrity": "sha512-NEopD+9S5xYyQ0pGtioacLhL2luflh6HACSSDUZOwLHoxA5eku1UPuqcJqjwSD6luKjjLfiLOspxo43FUHKKSA==",
-      "requires": {
-        "@react-spring/types": "~9.7.3"
-      }
-    },
-    "@react-spring/types": {
-      "version": "9.7.3",
-      "resolved": "https://registry.npmjs.org/@react-spring/types/-/types-9.7.3.tgz",
-      "integrity": "sha512-Kpx/fQ/ZFX31OtlqVEFfgaD1ACzul4NksrvIgYfIFq9JpDHFwQkMVZ10tbo0FU/grje4rcL4EIrjekl3kYwgWw=="
-    },
-    "@react-spring/web": {
-      "version": "9.7.3",
-      "resolved": "https://registry.npmjs.org/@react-spring/web/-/web-9.7.3.tgz",
-      "integrity": "sha512-BXt6BpS9aJL/QdVqEIX9YoUy8CE6TJrU0mNCqSoxdXlIeNcEBWOfIyE6B14ENNsyQKS3wOWkiJfco0tCr/9tUg==",
-      "requires": {
-        "@react-spring/animated": "~9.7.3",
-        "@react-spring/core": "~9.7.3",
-        "@react-spring/shared": "~9.7.3",
-        "@react-spring/types": "~9.7.3"
-      }
-    },
-    "@remix-run/router": {
-      "version": "1.7.2",
-      "resolved": "https://registry.npmjs.org/@remix-run/router/-/router-1.7.2.tgz",
-      "integrity": "sha512-7Lcn7IqGMV+vizMPoEl5F0XDshcdDYtMI6uJLQdQz5CfZAwy3vvGKYSUk789qndt5dEC4HfSjviSYlSoHGL2+A=="
-    },
-    "@rollup/rollup-android-arm-eabi": {
-      "version": "4.18.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.18.0.tgz",
-      "integrity": "sha512-Tya6xypR10giZV1XzxmH5wr25VcZSncG0pZIjfePT0OVBvqNEurzValetGNarVrGiq66EBVAFn15iYX4w6FKgQ==",
-      "dev": true,
-      "optional": true
-    },
-    "@rollup/rollup-android-arm64": {
-      "version": "4.18.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.18.0.tgz",
-      "integrity": "sha512-avCea0RAP03lTsDhEyfy+hpfr85KfyTctMADqHVhLAF3MlIkq83CP8UfAHUssgXTYd+6er6PaAhx/QGv4L1EiA==",
-      "dev": true,
-      "optional": true
-    },
-    "@rollup/rollup-darwin-arm64": {
-      "version": "4.18.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.18.0.tgz",
-      "integrity": "sha512-IWfdwU7KDSm07Ty0PuA/W2JYoZ4iTj3TUQjkVsO/6U+4I1jN5lcR71ZEvRh52sDOERdnNhhHU57UITXz5jC1/w==",
-      "dev": true,
-      "optional": true
-    },
-    "@rollup/rollup-darwin-x64": {
-      "version": "4.18.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.18.0.tgz",
-      "integrity": "sha512-n2LMsUz7Ynu7DoQrSQkBf8iNrjOGyPLrdSg802vk6XT3FtsgX6JbE8IHRvposskFm9SNxzkLYGSq9QdpLYpRNA==",
-      "dev": true,
-      "optional": true
-    },
-    "@rollup/rollup-linux-arm-gnueabihf": {
-      "version": "4.18.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.18.0.tgz",
-      "integrity": "sha512-C/zbRYRXFjWvz9Z4haRxcTdnkPt1BtCkz+7RtBSuNmKzMzp3ZxdM28Mpccn6pt28/UWUCTXa+b0Mx1k3g6NOMA==",
-      "dev": true,
-      "optional": true
-    },
-    "@rollup/rollup-linux-arm-musleabihf": {
-      "version": "4.18.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-musleabihf/-/rollup-linux-arm-musleabihf-4.18.0.tgz",
-      "integrity": "sha512-l3m9ewPgjQSXrUMHg93vt0hYCGnrMOcUpTz6FLtbwljo2HluS4zTXFy2571YQbisTnfTKPZ01u/ukJdQTLGh9A==",
-      "dev": true,
-      "optional": true
-    },
-    "@rollup/rollup-linux-arm64-gnu": {
-      "version": "4.18.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.18.0.tgz",
-      "integrity": "sha512-rJ5D47d8WD7J+7STKdCUAgmQk49xuFrRi9pZkWoRD1UeSMakbcepWXPF8ycChBoAqs1pb2wzvbY6Q33WmN2ftw==",
-      "dev": true,
-      "optional": true
-    },
-    "@rollup/rollup-linux-arm64-musl": {
-      "version": "4.18.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.18.0.tgz",
-      "integrity": "sha512-be6Yx37b24ZwxQ+wOQXXLZqpq4jTckJhtGlWGZs68TgdKXJgw54lUUoFYrg6Zs/kjzAQwEwYbp8JxZVzZLRepQ==",
-      "dev": true,
-      "optional": true
-    },
-    "@rollup/rollup-linux-powerpc64le-gnu": {
-      "version": "4.18.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-powerpc64le-gnu/-/rollup-linux-powerpc64le-gnu-4.18.0.tgz",
-      "integrity": "sha512-hNVMQK+qrA9Todu9+wqrXOHxFiD5YmdEi3paj6vP02Kx1hjd2LLYR2eaN7DsEshg09+9uzWi2W18MJDlG0cxJA==",
-      "dev": true,
-      "optional": true
-    },
-    "@rollup/rollup-linux-riscv64-gnu": {
-      "version": "4.18.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-gnu/-/rollup-linux-riscv64-gnu-4.18.0.tgz",
-      "integrity": "sha512-ROCM7i+m1NfdrsmvwSzoxp9HFtmKGHEqu5NNDiZWQtXLA8S5HBCkVvKAxJ8U+CVctHwV2Gb5VUaK7UAkzhDjlg==",
-      "dev": true,
-      "optional": true
-    },
-    "@rollup/rollup-linux-s390x-gnu": {
-      "version": "4.18.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-s390x-gnu/-/rollup-linux-s390x-gnu-4.18.0.tgz",
-      "integrity": "sha512-0UyyRHyDN42QL+NbqevXIIUnKA47A+45WyasO+y2bGJ1mhQrfrtXUpTxCOrfxCR4esV3/RLYyucGVPiUsO8xjg==",
-      "dev": true,
-      "optional": true
-    },
-    "@rollup/rollup-linux-x64-gnu": {
-      "version": "4.18.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.18.0.tgz",
-      "integrity": "sha512-xuglR2rBVHA5UsI8h8UbX4VJ470PtGCf5Vpswh7p2ukaqBGFTnsfzxUBetoWBWymHMxbIG0Cmx7Y9qDZzr648w==",
-      "dev": true,
-      "optional": true
-    },
-    "@rollup/rollup-linux-x64-musl": {
-      "version": "4.18.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.18.0.tgz",
-      "integrity": "sha512-LKaqQL9osY/ir2geuLVvRRs+utWUNilzdE90TpyoX0eNqPzWjRm14oMEE+YLve4k/NAqCdPkGYDaDF5Sw+xBfg==",
-      "dev": true,
-      "optional": true
-    },
-    "@rollup/rollup-win32-arm64-msvc": {
-      "version": "4.18.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.18.0.tgz",
-      "integrity": "sha512-7J6TkZQFGo9qBKH0pk2cEVSRhJbL6MtfWxth7Y5YmZs57Pi+4x6c2dStAUvaQkHQLnEQv1jzBUW43GvZW8OFqA==",
-      "dev": true,
-      "optional": true
-    },
-    "@rollup/rollup-win32-ia32-msvc": {
-      "version": "4.18.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.18.0.tgz",
-      "integrity": "sha512-Txjh+IxBPbkUB9+SXZMpv+b/vnTEtFyfWZgJ6iyCmt2tdx0OF5WhFowLmnh8ENGNpfUlUZkdI//4IEmhwPieNg==",
-      "dev": true,
-      "optional": true
-    },
-    "@rollup/rollup-win32-x64-msvc": {
-      "version": "4.18.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.18.0.tgz",
-      "integrity": "sha512-UOo5FdvOL0+eIVTgS4tIdbW+TtnBLWg1YBCcU2KWM7nuNwRz9bksDX1bekJJCpu25N1DVWaCwnT39dVQxzqS8g==",
-      "dev": true,
-      "optional": true
-    },
-    "@sats-connect/core": {
-      "version": "0.2.1",
-      "resolved": "https://registry.npmjs.org/@sats-connect/core/-/core-0.2.1.tgz",
-      "integrity": "sha512-e7ARFqN4JE8kBiSUNOcEvBffiBK9v7k+/PlwgYY5lGyanmBOMj5twBn/f/4+52GBLZXkwhJtidIWZ8LgnBdlbw==",
-      "requires": {
-        "axios": "1.6.8",
-        "bitcoin-address-validation": "2.2.3",
-        "buffer": "6.0.3",
-        "jsontokens": "4.0.1",
-        "lodash.omit": "4.5.0"
-      },
-      "dependencies": {
-        "axios": {
-          "version": "1.6.8",
-          "resolved": "https://registry.npmjs.org/axios/-/axios-1.6.8.tgz",
-          "integrity": "sha512-v/ZHtJDU39mDpyBoFVkETcd/uNdxrWRrg3bKpOKzXFA6Bvqopts6ALSMU3y6ijYxbw2B+wPrIv46egTzJXCLGQ==",
-          "requires": {
-            "follow-redirects": "^1.15.6",
-            "form-data": "^4.0.0",
-            "proxy-from-env": "^1.1.0"
-          }
-        }
-      }
-    },
-    "@scure/base": {
-      "version": "1.1.7",
-      "resolved": "https://registry.npmjs.org/@scure/base/-/base-1.1.7.tgz",
-      "integrity": "sha512-PPNYBslrLNNUQ/Yad37MHYsNQtK67EhWb6WtSvNLLPo7SdVZgkUjD6Dg+5On7zNwmskf8OX7I7Nx5oN+MIWE0g=="
-    },
-    "@scure/bip32": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/@scure/bip32/-/bip32-1.4.0.tgz",
-      "integrity": "sha512-sVUpc0Vq3tXCkDGYVWGIZTRfnvu8LoTDaev7vbwh0omSvVORONr960MQWdKqJDCReIEmTj3PAr73O3aoxz7OPg==",
-      "requires": {
-        "@noble/curves": "~1.4.0",
-        "@noble/hashes": "~1.4.0",
-        "@scure/base": "~1.1.6"
-      },
-      "dependencies": {
-        "@noble/curves": {
-          "version": "1.4.2",
-          "resolved": "https://registry.npmjs.org/@noble/curves/-/curves-1.4.2.tgz",
-          "integrity": "sha512-TavHr8qycMChk8UwMld0ZDRvatedkzWfH8IiaeGCfymOP5i0hSCozz9vHOL0nkwk7HRMlFnAiKpS2jrUmSybcw==",
-          "requires": {
-            "@noble/hashes": "1.4.0"
-          }
-        },
-        "@noble/hashes": {
-          "version": "1.4.0",
-          "resolved": "https://registry.npmjs.org/@noble/hashes/-/hashes-1.4.0.tgz",
-          "integrity": "sha512-V1JJ1WTRUqHHrOSh597hURcMqVKVGL/ea3kv0gSnEdsEZ0/+VyPghM1lMNGc00z7CIQorSvbKpuJkxvuHbvdbg=="
-        }
-      }
-    },
-    "@scure/bip39": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/@scure/bip39/-/bip39-1.1.0.tgz",
-      "integrity": "sha512-pwrPOS16VeTKg98dYXQyIjJEcWfz7/1YJIwxUEPFfQPtc86Ym/1sVgQ2RLoD43AazMk2l/unK4ITySSpW2+82w==",
-      "requires": {
-        "@noble/hashes": "~1.1.1",
-        "@scure/base": "~1.1.0"
-      },
-      "dependencies": {
-        "@noble/hashes": {
-          "version": "1.1.5",
-          "resolved": "https://registry.npmjs.org/@noble/hashes/-/hashes-1.1.5.tgz",
-          "integrity": "sha512-LTMZiiLc+V4v1Yi16TD6aX2gmtKszNye0pQgbaLqkvhIqP7nVsSaJsWloGQjJfJ8offaoP5GtX3yY5swbcJxxQ=="
-        }
-      }
-    },
-    "@scure/btc-signer": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/@scure/btc-signer/-/btc-signer-1.2.1.tgz",
-      "integrity": "sha512-/Zle18/aWhYDBuBeXGDGJTdo0/LKpQhU8ETBJeWABCQkbk0QHCFCinidTiz9hdQFfh0HtasPGq5p6EodVCfEew==",
-      "requires": {
-        "@noble/curves": "~1.3.0",
-        "@noble/hashes": "~1.3.3",
-        "@scure/base": "~1.1.5",
-        "micro-packed": "~0.5.1"
-      }
-    },
-    "@secretkeylabs/xverse-core": {
-      "version": "18.7.0-49281c0",
-      "resolved": "https://npm.pkg.github.com/download/@secretkeylabs/xverse-core/18.7.0-49281c0/5edda6e48bb4c8ecb7b35a454358600b8a57e684",
-      "integrity": "sha512-PJSQZlWHMw8t+Y4+PTM2r67qSxYhAYFyNJ9potyH/PKK6NbfQ5bdB3FKE6nSelOAYJuiZPaTMbxqDidmvUkcrw==",
-      "requires": {
-        "@bitcoinerlab/secp256k1": "^1.0.2",
-        "@noble/curves": "^1.2.0",
-        "@noble/secp256k1": "^1.7.1",
-        "@scure/base": "^1.1.1",
-        "@scure/bip32": "^1.4.0",
-        "@scure/bip39": "^1.3.0",
-        "@scure/btc-signer": "1.2.1",
-        "@stacks/auth": "6.13.1",
-        "@stacks/connect": "7.7.1",
-        "@stacks/encryption": "6.13.1",
-        "@stacks/network": "6.13.0",
-        "@stacks/stacking": "6.13.2",
-        "@stacks/storage": "6.13.1",
-        "@stacks/transactions": "6.13.1",
-        "@stacks/wallet-sdk": "6.13.1",
-        "@tanstack/react-query": "^4.29.3",
-        "@zondax/ledger-stacks": "^1.0.4",
-        "async-mutex": "^0.4.0",
-        "axios": "1.7.0",
-        "base64url": "^3.0.1",
-        "bip32": "^4.0.0",
-        "bip39": "3.0.3",
-        "bitcoin-address-validation": "^2.2.1",
-        "bitcoinjs-lib": "^6.1.3",
-        "bitcoinjs-message": "^2.2.0",
-        "bn.js": "^5.1.3",
-        "bs58": "^5.0.0",
-        "bs58check": "^3.0.1",
-        "buffer": "6.0.3",
-        "c32check": "^2.0.0",
-        "ecdsa-sig-formatter": "^1.0.11",
-        "ecpair": "^2.1.0",
-        "json-bigint": "^1.0.0",
-        "jsontokens": "^4.0.1",
-        "ledger-bitcoin": "^0.2.1",
-        "process": "^0.11.10",
-        "util": "^0.12.4",
-        "uuidv4": "^6.2.13",
-        "varuint-bitcoin": "^1.1.2"
-      },
-      "dependencies": {
-        "@noble/hashes": {
-          "version": "1.4.0",
-          "resolved": "https://registry.npmjs.org/@noble/hashes/-/hashes-1.4.0.tgz",
-          "integrity": "sha512-V1JJ1WTRUqHHrOSh597hURcMqVKVGL/ea3kv0gSnEdsEZ0/+VyPghM1lMNGc00z7CIQorSvbKpuJkxvuHbvdbg=="
-        },
-        "@scure/bip39": {
-          "version": "1.3.0",
-          "resolved": "https://registry.npmjs.org/@scure/bip39/-/bip39-1.3.0.tgz",
-          "integrity": "sha512-disdg7gHuTDZtY+ZdkmLpPCk7fxZSu3gBiEGuoC1XYxv9cGx3Z6cpTggCgW6odSOOIXCiDjuGejW+aJKCY/pIQ==",
-          "requires": {
-            "@noble/hashes": "~1.4.0",
-            "@scure/base": "~1.1.6"
-          }
-        },
-        "@stacks/connect": {
-          "version": "7.7.1",
-          "resolved": "https://registry.npmjs.org/@stacks/connect/-/connect-7.7.1.tgz",
-          "integrity": "sha512-MwLRhgRLOGo0Y4IDC0qp9RUX2SZubgse1aI2TN/fz2abNIh1LgmOKUua3w17YiBEZxDD9nyQ4KW1c33bdnrOPw==",
-          "requires": {
-            "@stacks/auth": "^6.1.1",
-            "@stacks/connect-ui": "6.4.1",
-            "@stacks/network": "^6.1.1",
-            "@stacks/profile": "^6.1.1",
-            "@stacks/transactions": "^6.1.1",
-            "jsontokens": "^4.0.1"
-          }
-        },
-        "@stacks/connect-ui": {
-          "version": "6.4.1",
-          "resolved": "https://registry.npmjs.org/@stacks/connect-ui/-/connect-ui-6.4.1.tgz",
-          "integrity": "sha512-Y6Fp26MUsMQq08zFSWus40rS7RNHrHj6VDJrFUqM9VsksV3wftpsRcy7psQusUvW1DS7fPza67IlM1dcN4rvSg==",
-          "requires": {
-            "@stencil/core": "^2.17.1"
-          }
-        },
-        "@types/node": {
-          "version": "11.11.6",
-          "resolved": "https://registry.npmjs.org/@types/node/-/node-11.11.6.tgz",
-          "integrity": "sha512-Exw4yUWMBXM3X+8oqzJNRqZSwUAaS4+7NdvHqQuFi/d+synz++xmX3QIf+BFqneW8N31R8Ky+sikfZUXq07ggQ=="
-        },
-        "async-mutex": {
-          "version": "0.4.1",
-          "resolved": "https://registry.npmjs.org/async-mutex/-/async-mutex-0.4.1.tgz",
-          "integrity": "sha512-WfoBo4E/TbCX1G95XTjbWTE3X2XLG0m1Xbv2cwOtuPdyH9CZvnaA5nCt1ucjaKEgW2A5IF71hxrRhr83Je5xjA==",
-          "requires": {
-            "tslib": "^2.4.0"
-          }
-        },
-        "bip39": {
-          "version": "3.0.3",
-          "resolved": "https://registry.npmjs.org/bip39/-/bip39-3.0.3.tgz",
-          "integrity": "sha512-P0dKrz4g0V0BjXfx7d9QNkJ/Txcz/k+hM9TnjqjUaXtuOfAvxXSw2rJw8DX0e3ZPwnK/IgDxoRqf0bvoVCqbMg==",
-          "requires": {
-            "@types/node": "11.11.6",
-            "create-hash": "^1.1.0",
-            "pbkdf2": "^3.0.9",
-            "randombytes": "^2.0.1"
-          }
-        }
-      }
-    },
-    "@sinclair/typebox": {
-      "version": "0.27.8",
-      "resolved": "https://registry.npmjs.org/@sinclair/typebox/-/typebox-0.27.8.tgz",
-      "integrity": "sha512-+Fj43pSMwJs4KRrH/938Uf+uAELIgVBmQzg/q1YG10djyfA3TnrU8N8XzqCh/okZdszqBQTZf96idMfE5lnwTA==",
-      "dev": true
-    },
-    "@snyk/github-codeowners": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/@snyk/github-codeowners/-/github-codeowners-1.1.0.tgz",
-      "integrity": "sha512-lGFf08pbkEac0NYgVf4hdANpAgApRjNByLXB+WBip3qj1iendOIyAwP2GKkKbQMNVy2r1xxDf0ssfWscoiC+Vw==",
-      "dev": true,
-      "requires": {
-        "commander": "^4.1.1",
-        "ignore": "^5.1.8",
-        "p-map": "^4.0.0"
-      },
-      "dependencies": {
-        "commander": {
-          "version": "4.1.1",
-          "resolved": "https://registry.npmjs.org/commander/-/commander-4.1.1.tgz",
-          "integrity": "sha512-NOKm8xhkzAjzFx8B2v5OAHT+u5pRQc2UCa2Vq9jYL/31o2wi9mxBA7LIFs3sV5VSC49z6pEhfbMULvShKj26WA==",
-          "dev": true
-        },
-        "p-map": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/p-map/-/p-map-4.0.0.tgz",
-          "integrity": "sha512-/bjOqmgETBYB5BoEeGVea8dmvHb2m9GLy1E9W43yeyfP6QQCZGFNa+XRceJEuDB6zqr+gKpIAmlLebMpykw/MQ==",
-          "dev": true,
-          "requires": {
-            "aggregate-error": "^3.0.0"
-          }
-        }
-      }
-    },
-    "@stacks/auth": {
-      "version": "6.13.1",
-      "resolved": "https://registry.npmjs.org/@stacks/auth/-/auth-6.13.1.tgz",
-      "integrity": "sha512-nr5VeLIJBVI72eWYs/oQ7nrmuZxe89AlS5Lt/WxCcUDK9Z+oqQR1qsxBo86yVDlmrxoNWncHWD38LX54HsOEzA==",
-      "requires": {
-        "@stacks/common": "^6.13.0",
-        "@stacks/encryption": "^6.13.1",
-        "@stacks/network": "^6.13.0",
-        "@stacks/profile": "^6.13.1",
-        "cross-fetch": "^3.1.5",
-        "jsontokens": "^4.0.1"
-      }
-    },
-    "@stacks/common": {
-      "version": "6.13.0",
-      "resolved": "https://registry.npmjs.org/@stacks/common/-/common-6.13.0.tgz",
-      "integrity": "sha512-wwzyihjaSdmL6NxKvDeayy3dqM0L0Q2sawmdNtzJDi0FnXuJGm5PeapJj7bEfcI9XwI7Bw5jZoC6mCn9nc5YIw==",
-      "requires": {
-        "@types/bn.js": "^5.1.0",
-        "@types/node": "^18.0.4"
-      },
-      "dependencies": {
-        "@types/node": {
-          "version": "18.19.26",
-          "resolved": "https://registry.npmjs.org/@types/node/-/node-18.19.26.tgz",
-          "integrity": "sha512-+wiMJsIwLOYCvUqSdKTrfkS8mpTp+MPINe6+Np4TAGFWWRWiBQ5kSq9nZGCSPkzx9mvT+uEukzpX4MOSCydcvw==",
-          "requires": {
-            "undici-types": "~5.26.4"
-          }
-        }
-      }
-    },
-    "@stacks/connect": {
-      "version": "7.4.1",
-      "resolved": "https://registry.npmjs.org/@stacks/connect/-/connect-7.4.1.tgz",
-      "integrity": "sha512-kvF7Fnx8oMHNi/9At6UI6kThey+gYlYlbtsxhNL2VqflReXI8z3EndaMJ1WrD55ePIOoydAzV/Fx0rdNFjd4rQ==",
-      "requires": {
-        "@stacks/auth": "^6.1.1",
-        "@stacks/connect-ui": "6.1.2",
-        "@stacks/network": "^6.1.1",
-        "@stacks/profile": "^6.1.1",
-        "@stacks/transactions": "^6.1.1",
-        "jsontokens": "^4.0.1"
-      }
-    },
-    "@stacks/connect-ui": {
-      "version": "6.1.2",
-      "resolved": "https://registry.npmjs.org/@stacks/connect-ui/-/connect-ui-6.1.2.tgz",
-      "integrity": "sha512-V4gUINXRDB2MO6YHk/JZZeApSnANrMFvIRv9qLBaJPamKsgeiCOBkiC88T7ucLVCz+NvCmS93Ntg4wytDIqdOg==",
-      "requires": {
-        "@stencil/core": "^2.17.1"
-      }
-    },
-    "@stacks/encryption": {
-      "version": "6.13.1",
-      "resolved": "https://registry.npmjs.org/@stacks/encryption/-/encryption-6.13.1.tgz",
-      "integrity": "sha512-y5IFX3/nGI3fCk70gE0JwH70GpshD8RhUfvhMLcL96oNaec1cCdj1ZUiQupeicfYTHuraaVBYU9xLls4TRmypg==",
-      "requires": {
-        "@noble/hashes": "1.1.5",
-        "@noble/secp256k1": "1.7.1",
-        "@scure/bip39": "1.1.0",
-        "@stacks/common": "^6.13.0",
-        "@types/node": "^18.0.4",
-        "base64-js": "^1.5.1",
-        "bs58": "^5.0.0",
-        "ripemd160-min": "^0.0.6",
-        "varuint-bitcoin": "^1.1.2"
-      },
-      "dependencies": {
-        "@noble/hashes": {
-          "version": "1.1.5",
-          "resolved": "https://registry.npmjs.org/@noble/hashes/-/hashes-1.1.5.tgz",
-          "integrity": "sha512-LTMZiiLc+V4v1Yi16TD6aX2gmtKszNye0pQgbaLqkvhIqP7nVsSaJsWloGQjJfJ8offaoP5GtX3yY5swbcJxxQ=="
-        },
-        "@types/node": {
-          "version": "18.19.31",
-          "resolved": "https://registry.npmjs.org/@types/node/-/node-18.19.31.tgz",
-          "integrity": "sha512-ArgCD39YpyyrtFKIqMDvjz79jto5fcI/SVUs2HwB+f0dAzq68yqOdyaSivLiLugSziTpNXLQrVb7RZFmdZzbhA==",
-          "requires": {
-            "undici-types": "~5.26.4"
-          }
-        }
-      }
-    },
-    "@stacks/network": {
-      "version": "6.13.0",
-      "resolved": "https://registry.npmjs.org/@stacks/network/-/network-6.13.0.tgz",
-      "integrity": "sha512-Ss/Da4BNyPBBj1OieM981fJ7SkevKqLPkzoI1+Yo7cYR2df+0FipIN++Z4RfpJpc8ne60vgcx7nJZXQsiGhKBQ==",
-      "requires": {
-        "@stacks/common": "^6.13.0",
-        "cross-fetch": "^3.1.5"
-      }
-    },
-    "@stacks/profile": {
-      "version": "6.13.1",
-      "resolved": "https://registry.npmjs.org/@stacks/profile/-/profile-6.13.1.tgz",
-      "integrity": "sha512-GCDE13hwoUYZvZKTb5c0Tr74DcxIP/n4bffcYrKa5UabITPQ7JwsJIOyDoAwdtl3lu7fi9aBsKrdfHpBBUSQIQ==",
-      "requires": {
-        "@stacks/common": "^6.13.0",
-        "@stacks/network": "^6.13.0",
-        "@stacks/transactions": "^6.13.1",
-        "jsontokens": "^4.0.1",
-        "schema-inspector": "^2.0.2",
-        "zone-file": "^2.0.0-beta.3"
-      }
-    },
-    "@stacks/stacking": {
-      "version": "6.13.2",
-      "resolved": "https://registry.npmjs.org/@stacks/stacking/-/stacking-6.13.2.tgz",
-      "integrity": "sha512-4h1UQuL2+Xdra9zMqzUElvKG9X9fenuNE7hD9sIqyxyLFxeQ7gRqczmTYPsmaj4wY5004JNj+efzGJ0VmpOcAA==",
-      "requires": {
-        "@noble/hashes": "1.1.5",
-        "@scure/base": "1.1.1",
-        "@stacks/common": "^6.13.0",
-        "@stacks/encryption": "^6.13.1",
-        "@stacks/network": "^6.13.0",
-        "@stacks/stacks-blockchain-api-types": "^0.61.0",
-        "@stacks/transactions": "^6.13.1",
-        "bs58": "^5.0.0"
-      },
-      "dependencies": {
-        "@noble/hashes": {
-          "version": "1.1.5",
-          "resolved": "https://registry.npmjs.org/@noble/hashes/-/hashes-1.1.5.tgz",
-          "integrity": "sha512-LTMZiiLc+V4v1Yi16TD6aX2gmtKszNye0pQgbaLqkvhIqP7nVsSaJsWloGQjJfJ8offaoP5GtX3yY5swbcJxxQ=="
-        },
-        "@scure/base": {
-          "version": "1.1.1",
-          "resolved": "https://registry.npmjs.org/@scure/base/-/base-1.1.1.tgz",
-          "integrity": "sha512-ZxOhsSyxYwLJj3pLZCefNitxsj093tb2vq90mp2txoYeBqbcjDjqFhyM8eUjq/uFm6zJ+mUuqxlS2FkuSY1MTA=="
-        },
-        "@stacks/stacks-blockchain-api-types": {
-          "version": "0.61.0",
-          "resolved": "https://registry.npmjs.org/@stacks/stacks-blockchain-api-types/-/stacks-blockchain-api-types-0.61.0.tgz",
-          "integrity": "sha512-yPOfTUboo5eA9BZL/hqMcM71GstrFs9YWzOrJFPeP4cOO1wgYvAcckgBRbgiE3NqeX0A7SLZLDAXLZbATuRq9w=="
-        }
-      }
-    },
-    "@stacks/stacks-blockchain-api-types": {
-      "version": "6.1.1",
-      "resolved": "https://registry.npmjs.org/@stacks/stacks-blockchain-api-types/-/stacks-blockchain-api-types-6.1.1.tgz",
-      "integrity": "sha512-Mw5dBPx3DySPupwaq0iBdm1WdEVXIfhjUVaTjI2iSyzWz4Fgs3U7JCaAezLbgNu7Q69c/ZN4JUDWuo9FVjy7oA=="
-    },
-    "@stacks/storage": {
-      "version": "6.13.1",
-      "resolved": "https://registry.npmjs.org/@stacks/storage/-/storage-6.13.1.tgz",
-      "integrity": "sha512-XnzRAETDKW7Ij3cuUNllrrnLOCwctV/XrIHgVWnD04LNL5R9apkwp9IkzaFbyJZ+XrkUBKwtdCgVYype2XgT6w==",
-      "requires": {
-        "@stacks/auth": "^6.13.1",
-        "@stacks/common": "^6.13.0",
-        "@stacks/encryption": "^6.13.1",
-        "@stacks/network": "^6.13.0",
-        "base64-js": "^1.5.1",
-        "jsontokens": "^4.0.1"
-      }
-    },
-    "@stacks/transactions": {
-      "version": "6.13.1",
-      "resolved": "https://registry.npmjs.org/@stacks/transactions/-/transactions-6.13.1.tgz",
-      "integrity": "sha512-PWw2I+2Fj3CaFYQIoVcqQN6E2qGHNhFv03nuR0CxMq0sx8stPgYZbdzUlnlBcJQdsFiHrw3sPeqnXDZt+Hg5YQ==",
-      "requires": {
-        "@noble/hashes": "1.1.5",
-        "@noble/secp256k1": "1.7.1",
-        "@stacks/common": "^6.13.0",
-        "@stacks/network": "^6.13.0",
-        "c32check": "^2.0.0",
-        "lodash.clonedeep": "^4.5.0"
-      },
-      "dependencies": {
-        "@noble/hashes": {
-          "version": "1.1.5",
-          "resolved": "https://registry.npmjs.org/@noble/hashes/-/hashes-1.1.5.tgz",
-          "integrity": "sha512-LTMZiiLc+V4v1Yi16TD6aX2gmtKszNye0pQgbaLqkvhIqP7nVsSaJsWloGQjJfJ8offaoP5GtX3yY5swbcJxxQ=="
-        }
-      }
-    },
-    "@stacks/wallet-sdk": {
-      "version": "6.13.1",
-      "resolved": "https://registry.npmjs.org/@stacks/wallet-sdk/-/wallet-sdk-6.13.1.tgz",
-      "integrity": "sha512-262CYKAm1j8oVxfGUIJrHp867j9gm5NrqPM85s0TfCv2QhfLDkvme6nKgmvtL2TecAZkBa5tu8M5DQ7z92WvAQ==",
-      "requires": {
-        "@scure/bip32": "1.1.3",
-        "@scure/bip39": "1.1.0",
-        "@stacks/auth": "^6.13.1",
-        "@stacks/common": "^6.13.0",
-        "@stacks/encryption": "^6.13.1",
-        "@stacks/network": "^6.13.0",
-        "@stacks/profile": "^6.13.1",
-        "@stacks/storage": "^6.13.1",
-        "@stacks/transactions": "^6.13.1",
-        "buffer": "6.0.3",
-        "c32check": "^2.0.0",
-        "jsontokens": "^4.0.1",
-        "triplesec": "^4.0.3",
-        "zone-file": "^2.0.0-beta.3"
-      },
-      "dependencies": {
-        "@noble/hashes": {
-          "version": "1.1.5",
-          "resolved": "https://registry.npmjs.org/@noble/hashes/-/hashes-1.1.5.tgz",
-          "integrity": "sha512-LTMZiiLc+V4v1Yi16TD6aX2gmtKszNye0pQgbaLqkvhIqP7nVsSaJsWloGQjJfJ8offaoP5GtX3yY5swbcJxxQ=="
-        },
-        "@scure/bip32": {
-          "version": "1.1.3",
-          "resolved": "https://registry.npmjs.org/@scure/bip32/-/bip32-1.1.3.tgz",
-          "integrity": "sha512-dSH3+LCWONlSNQuF34xZrG6Xas7tp2jSSqHb/pMfXWM0vKE4JZOtK3uJfoWouUVW5IGlls75HkXmYLldZ8ySgQ==",
-          "requires": {
-            "@noble/hashes": "~1.1.3",
-            "@noble/secp256k1": "~1.7.0",
-            "@scure/base": "~1.1.0"
-          }
-        }
-      }
-    },
-    "@stencil/core": {
-      "version": "2.22.3",
-      "resolved": "https://registry.npmjs.org/@stencil/core/-/core-2.22.3.tgz",
-      "integrity": "sha512-kmVA0M/HojwsfkeHsifvHVIYe4l5tin7J5+DLgtl8h6WWfiMClND5K3ifCXXI2ETDNKiEk21p6jql3Fx9o2rng=="
-    },
-    "@tanstack/eslint-plugin-query": {
-      "version": "4.32.1",
-      "resolved": "https://registry.npmjs.org/@tanstack/eslint-plugin-query/-/eslint-plugin-query-4.32.1.tgz",
-      "integrity": "sha512-29oveq5n7momN+/d0SheNccnp1qws4JRG/PdeiPHwWAVQ9HxwtZTFxhFJxvMzVk7UsY3LsQB0keIajC+K9ZJ7w==",
-      "dev": true
-    },
-    "@tanstack/match-sorter-utils": {
-      "version": "8.8.4",
-      "resolved": "https://registry.npmjs.org/@tanstack/match-sorter-utils/-/match-sorter-utils-8.8.4.tgz",
-      "integrity": "sha512-rKH8LjZiszWEvmi01NR72QWZ8m4xmXre0OOwlRGnjU01Eqz/QnN+cqpty2PJ0efHblq09+KilvyR7lsbzmXVEw==",
-      "requires": {
-        "remove-accents": "0.4.2"
-      }
-    },
-    "@tanstack/query-core": {
-      "version": "4.32.1",
-      "resolved": "https://registry.npmjs.org/@tanstack/query-core/-/query-core-4.32.1.tgz",
-      "integrity": "sha512-VEAGHboOFWN/bvf/7cCoeLQfld0AA8n0V/kfc77W+FvxnnSwJufEh6gfjqpX5bRE/DEYfYDYdNtuL3KM+lIs8Q=="
-    },
-    "@tanstack/query-persist-client-core": {
-      "version": "4.32.1",
-      "resolved": "https://registry.npmjs.org/@tanstack/query-persist-client-core/-/query-persist-client-core-4.32.1.tgz",
-      "integrity": "sha512-KgnkNigmOMi2aikxdhCRe0MaAh1Dq94/nNjmcSxfflj9L3v4F9tEQAig/F7m2+jethP1AiIYBax5nN4aqm7NFg==",
-      "requires": {
-        "@tanstack/query-core": "4.32.1"
-      }
-    },
-    "@tanstack/query-sync-storage-persister": {
-      "version": "4.32.1",
-      "resolved": "https://registry.npmjs.org/@tanstack/query-sync-storage-persister/-/query-sync-storage-persister-4.32.1.tgz",
-      "integrity": "sha512-kqE+L0uSzVMuPpY8iKtnyZexsZ5IxsJbgiI4s+m+FB8Dzn+5go3snpZIYMQu36S+sWy0N90P2xNR57EOaFMlsg==",
-      "requires": {
-        "@tanstack/query-persist-client-core": "4.32.1"
-      }
-    },
-    "@tanstack/react-query": {
-      "version": "4.32.1",
-      "resolved": "https://registry.npmjs.org/@tanstack/react-query/-/react-query-4.32.1.tgz",
-      "integrity": "sha512-lPTfOq6bR6DorPaS018gTMd3zs8r06tlERiVY6BRP9SnDkkl4ckqeANava/jPLWrSZP+EA15loQUTmvZs6k2GA==",
-      "requires": {
-        "@tanstack/query-core": "4.32.1",
-        "use-sync-external-store": "^1.2.0"
-      }
-    },
-    "@tanstack/react-query-devtools": {
-      "version": "4.32.1",
-      "resolved": "https://registry.npmjs.org/@tanstack/react-query-devtools/-/react-query-devtools-4.32.1.tgz",
-      "integrity": "sha512-/ZgxCfGXLIXUvaIRzrNCP+C4iv1bIleNzXCjGKFZ4qKEifnv5A/SpWE2dG4SBjqXVlIkMAP82lesfoHcsOm+zg==",
-      "requires": {
-        "@tanstack/match-sorter-utils": "^8.7.0",
-        "superjson": "^1.10.0",
-        "use-sync-external-store": "^1.2.0"
-      },
-      "dependencies": {
-        "superjson": {
-          "version": "1.13.3",
-          "resolved": "https://registry.npmjs.org/superjson/-/superjson-1.13.3.tgz",
-          "integrity": "sha512-mJiVjfd2vokfDxsQPOwJ/PtanO87LhpYY88ubI5dUB1Ab58Txbyje3+jpm+/83R/fevaq/107NNhtYBLuoTrFg==",
-          "requires": {
-            "copy-anything": "^3.0.2"
-          }
-        }
-      }
-    },
-    "@tanstack/react-query-persist-client": {
-      "version": "4.32.1",
-      "resolved": "https://registry.npmjs.org/@tanstack/react-query-persist-client/-/react-query-persist-client-4.32.1.tgz",
-      "integrity": "sha512-HtfhSOyMSjdASpPXWBWv9JquUk5b8HjOwbFVmtA8xIDFQm9qS35PikXO2YbBXhuz/LEknRhct/M3PMI/XkRQSg==",
-      "requires": {
-        "@tanstack/query-persist-client-core": "4.32.1"
-      }
-    },
-    "@types/argon2-browser": {
-      "version": "1.18.1",
-      "resolved": "https://registry.npmjs.org/@types/argon2-browser/-/argon2-browser-1.18.1.tgz",
-      "integrity": "sha512-PZffP/CqH9m2kovDSRQMfMMxUC3V98I7i7/caa0RB0/nvsXzYbL9bKyqZpNMFmLFGZslROlG1R60ONt7abrwlA==",
-      "dev": true
-    },
-    "@types/bn.js": {
-      "version": "5.1.1",
-      "resolved": "https://registry.npmjs.org/@types/bn.js/-/bn.js-5.1.1.tgz",
-      "integrity": "sha512-qNrYbZqMx0uJAfKnKclPh+dTwK33KfLHYqtyODwd5HnXOjnkhc4qgn3BrK6RWyGZm5+sIFE7Q7Vz6QQtJB7w7g==",
-      "requires": {
-        "@types/node": "*"
-      }
-    },
-    "@types/body-parser": {
-      "version": "1.19.2",
-      "resolved": "https://registry.npmjs.org/@types/body-parser/-/body-parser-1.19.2.tgz",
-      "integrity": "sha512-ALYone6pm6QmwZoAgeyNksccT9Q4AWZQ6PvfwR37GT6r6FWUPguq6sUmNGSMV2Wr761oQoBxwGGa6DR5o1DC9g==",
-      "dev": true,
-      "requires": {
-        "@types/connect": "*",
-        "@types/node": "*"
-      }
-    },
-    "@types/bonjour": {
-      "version": "3.5.10",
-      "resolved": "https://registry.npmjs.org/@types/bonjour/-/bonjour-3.5.10.tgz",
-      "integrity": "sha512-p7ienRMiS41Nu2/igbJxxLDWrSZ0WxM8UQgCeO9KhoVF7cOVFkrKsiDr1EsJIla8vV3oEEjGcz11jc5yimhzZw==",
-      "dev": true,
-      "requires": {
-        "@types/node": "*"
-      }
-    },
-    "@types/chai": {
-      "version": "4.3.11",
-      "resolved": "https://registry.npmjs.org/@types/chai/-/chai-4.3.11.tgz",
-      "integrity": "sha512-qQR1dr2rGIHYlJulmr8Ioq3De0Le9E4MJ5AiaeAETJJpndT1uUNHsGFK3L/UIu+rbkQSdj8J/w2bCsBZc/Y5fQ==",
-      "dev": true
-    },
-    "@types/chai-subset": {
-      "version": "1.3.5",
-      "resolved": "https://registry.npmjs.org/@types/chai-subset/-/chai-subset-1.3.5.tgz",
-      "integrity": "sha512-c2mPnw+xHtXDoHmdtcCXGwyLMiauiAyxWMzhGpqHC4nqI/Y5G2XhTampslK2rb59kpcuHon03UH8W6iYUzw88A==",
-      "dev": true,
-      "requires": {
-        "@types/chai": "*"
-      }
-    },
-    "@types/chrome": {
-      "version": "0.0.237",
-      "resolved": "https://registry.npmjs.org/@types/chrome/-/chrome-0.0.237.tgz",
-      "integrity": "sha512-krsRmyfMlck5r+H1EapsrrucDRq6iRm0NAi5fapr93CgnpVMDdK+h2+z4x79GegdW7BNH9Vb//gkptORwwwVIQ==",
-      "dev": true,
-      "requires": {
-        "@types/filesystem": "*",
-        "@types/har-format": "*"
-      }
-    },
-    "@types/connect": {
-      "version": "3.4.35",
-      "resolved": "https://registry.npmjs.org/@types/connect/-/connect-3.4.35.tgz",
-      "integrity": "sha512-cdeYyv4KWoEgpBISTxWvqYsVy444DOqehiF3fM3ne10AmJ62RSyNkUnxMJXHQWRQQX2eR94m5y1IZyDwBjV9FQ==",
-      "dev": true,
-      "requires": {
-        "@types/node": "*"
-      }
-    },
-    "@types/connect-history-api-fallback": {
-      "version": "1.5.0",
-      "resolved": "https://registry.npmjs.org/@types/connect-history-api-fallback/-/connect-history-api-fallback-1.5.0.tgz",
-      "integrity": "sha512-4x5FkPpLipqwthjPsF7ZRbOv3uoLUFkTA9G9v583qi4pACvq0uTELrB8OLUzPWUI4IJIyvM85vzkV1nyiI2Lig==",
-      "dev": true,
-      "requires": {
-        "@types/express-serve-static-core": "*",
-        "@types/node": "*"
-      }
-    },
-    "@types/eslint": {
-      "version": "8.44.1",
-      "resolved": "https://registry.npmjs.org/@types/eslint/-/eslint-8.44.1.tgz",
-      "integrity": "sha512-XpNDc4Z5Tb4x+SW1MriMVeIsMoONHCkWFMkR/aPJbzEsxqHy+4Glu/BqTdPrApfDeMaXbtNh6bseNgl5KaWrSg==",
-      "dev": true,
-      "requires": {
-        "@types/estree": "*",
-        "@types/json-schema": "*"
-      }
-    },
-    "@types/eslint-scope": {
-      "version": "3.7.4",
-      "resolved": "https://registry.npmjs.org/@types/eslint-scope/-/eslint-scope-3.7.4.tgz",
-      "integrity": "sha512-9K4zoImiZc3HlIp6AVUDE4CWYx22a+lhSZMYNpbjW04+YF0KWj4pJXnEMjdnFTiQibFFmElcsasJXDbdI/EPhA==",
-      "dev": true,
-      "requires": {
-        "@types/eslint": "*",
-        "@types/estree": "*"
-      }
-    },
-    "@types/estree": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.5.tgz",
-      "integrity": "sha512-/kYRxGDLWzHOB7q+wtSUQlFrtcdUccpfy+X+9iMBpHK8QLLhx2wIPYuS5DYtR9Wa/YlZAbIovy7qVdB1Aq6Lyw==",
-      "dev": true
-    },
-    "@types/express": {
-      "version": "4.17.17",
-      "resolved": "https://registry.npmjs.org/@types/express/-/express-4.17.17.tgz",
-      "integrity": "sha512-Q4FmmuLGBG58btUnfS1c1r/NQdlp3DMfGDGig8WhfpA2YRUtEkxAjkZb0yvplJGYdF1fsQ81iMDcH24sSCNC/Q==",
-      "dev": true,
-      "requires": {
-        "@types/body-parser": "*",
-        "@types/express-serve-static-core": "^4.17.33",
-        "@types/qs": "*",
-        "@types/serve-static": "*"
-      }
-    },
-    "@types/express-serve-static-core": {
-      "version": "4.17.35",
-      "resolved": "https://registry.npmjs.org/@types/express-serve-static-core/-/express-serve-static-core-4.17.35.tgz",
-      "integrity": "sha512-wALWQwrgiB2AWTT91CB62b6Yt0sNHpznUXeZEcnPU3DRdlDIz74x8Qg1UUYKSVFi+va5vKOLYRBI1bRKiLLKIg==",
-      "dev": true,
-      "requires": {
-        "@types/node": "*",
-        "@types/qs": "*",
-        "@types/range-parser": "*",
-        "@types/send": "*"
-      }
-    },
-    "@types/filesystem": {
-      "version": "0.0.32",
-      "resolved": "https://registry.npmjs.org/@types/filesystem/-/filesystem-0.0.32.tgz",
-      "integrity": "sha512-Yuf4jR5YYMR2DVgwuCiP11s0xuVRyPKmz8vo6HBY3CGdeMj8af93CFZX+T82+VD1+UqHOxTq31lO7MI7lepBtQ==",
-      "dev": true,
-      "requires": {
-        "@types/filewriter": "*"
-      }
-    },
-    "@types/filewriter": {
-      "version": "0.0.29",
-      "resolved": "https://registry.npmjs.org/@types/filewriter/-/filewriter-0.0.29.tgz",
-      "integrity": "sha512-BsPXH/irW0ht0Ji6iw/jJaK8Lj3FJemon2gvEqHKpCdDCeemHa+rI3WBGq5z7cDMZgoLjY40oninGxqk+8NzNQ==",
-      "dev": true
-    },
-    "@types/glob": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/@types/glob/-/glob-7.2.0.tgz",
-      "integrity": "sha512-ZUxbzKl0IfJILTS6t7ip5fQQM/J3TJYubDm3nMbgubNNYS62eXeUpoLUC8/7fJNiFYHTrGPQn7hspDUzIHX3UA==",
-      "dev": true,
-      "requires": {
-        "@types/minimatch": "*",
-        "@types/node": "*"
-      }
-    },
-    "@types/har-format": {
-      "version": "1.2.11",
-      "resolved": "https://registry.npmjs.org/@types/har-format/-/har-format-1.2.11.tgz",
-      "integrity": "sha512-T232/TneofqK30AD1LRrrf8KnjLvzrjWDp7eWST5KoiSzrBfRsLrWDPk4STQPW4NZG6v2MltnduBVmakbZOBIQ==",
-      "dev": true
-    },
-    "@types/hoist-non-react-statics": {
-      "version": "3.3.1",
-      "resolved": "https://registry.npmjs.org/@types/hoist-non-react-statics/-/hoist-non-react-statics-3.3.1.tgz",
-      "integrity": "sha512-iMIqiko6ooLrTh1joXodJK5X9xeEALT1kM5G3ZLhD3hszxBdIEd5C75U834D9mLcINgD4OyZf5uQXjkuYydWvA==",
-      "requires": {
-        "@types/react": "*",
-        "hoist-non-react-statics": "^3.3.0"
-      }
-    },
-    "@types/html-minifier-terser": {
-      "version": "6.1.0",
-      "resolved": "https://registry.npmjs.org/@types/html-minifier-terser/-/html-minifier-terser-6.1.0.tgz",
-      "integrity": "sha512-oh/6byDPnL1zeNXFrDXFLyZjkr1MsBG667IM792caf1L2UPOOMf65NFzjUH/ltyfwjAGfs1rsX1eftK0jC/KIg==",
-      "dev": true
-    },
-    "@types/http-errors": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/@types/http-errors/-/http-errors-2.0.1.tgz",
-      "integrity": "sha512-/K3ds8TRAfBvi5vfjuz8y6+GiAYBZ0x4tXv1Av6CWBWn0IlADc+ZX9pMq7oU0fNQPnBwIZl3rmeLp6SBApbxSQ==",
-      "dev": true
-    },
-    "@types/http-proxy": {
-      "version": "1.17.11",
-      "resolved": "https://registry.npmjs.org/@types/http-proxy/-/http-proxy-1.17.11.tgz",
-      "integrity": "sha512-HC8G7c1WmaF2ekqpnFq626xd3Zz0uvaqFmBJNRZCGEZCXkvSdJoNFn/8Ygbd9fKNQj8UzLdCETaI0UWPAjK7IA==",
-      "dev": true,
-      "requires": {
-        "@types/node": "*"
-      }
-    },
-    "@types/json-schema": {
-      "version": "7.0.12",
-      "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.12.tgz",
-      "integrity": "sha512-Hr5Jfhc9eYOQNPYO5WLDq/n4jqijdHNlDXjuAQkkt+mWdQR+XJToOHrsD4cPaMXpn6KO7y2+wM8AZEs8VpBLVA==",
-      "dev": true
-    },
-    "@types/json5": {
-      "version": "0.0.29",
-      "resolved": "https://registry.npmjs.org/@types/json5/-/json5-0.0.29.tgz",
-      "integrity": "sha512-dRLjCWHYg4oaA77cxO64oO+7JwCwnIzkZPdrrC71jQmQtlhM556pwKo5bUzqvZndkVbeFLIIi+9TC40JNF5hNQ==",
-      "dev": true
-    },
-    "@types/mime": {
-      "version": "1.3.2",
-      "resolved": "https://registry.npmjs.org/@types/mime/-/mime-1.3.2.tgz",
-      "integrity": "sha512-YATxVxgRqNH6nHEIsvg6k2Boc1JHI9ZbH5iWFFv/MTkchz3b1ieGDa5T0a9RznNdI0KhVbdbWSN+KWWrQZRxTw==",
-      "dev": true
-    },
-    "@types/minimatch": {
-      "version": "5.1.2",
-      "resolved": "https://registry.npmjs.org/@types/minimatch/-/minimatch-5.1.2.tgz",
-      "integrity": "sha512-K0VQKziLUWkVKiRVrx4a40iPaxTUefQmjtkQofBkYRcoaaL/8rhwDWww9qWbrgicNOgnpIsMxyNIUM4+n6dUIA==",
-      "dev": true
-    },
-    "@types/mixpanel-browser": {
-      "version": "2.49.0",
-      "resolved": "https://registry.npmjs.org/@types/mixpanel-browser/-/mixpanel-browser-2.49.0.tgz",
-      "integrity": "sha512-StmgUnS58d44DmIAEX9Kk8qwisAYCl6E2qulIjYyHXUPuJCPOuyUMTTKBp+aU2F2do+kxAzCxiBtsB4fnBT9Fg==",
-      "dev": true
-    },
-    "@types/node": {
-      "version": "20.14.9",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-20.14.9.tgz",
-      "integrity": "sha512-06OCtnTXtWOZBJlRApleWndH4JsRVs1pDCc8dLSQp+7PpUpX3ePdHyeNSFTeSe7FtKyQkrlPvHwJOW3SLd8Oyg==",
-      "requires": {
-        "undici-types": "~5.26.4"
-      }
-    },
-    "@types/prop-types": {
-      "version": "15.7.5",
-      "resolved": "https://registry.npmjs.org/@types/prop-types/-/prop-types-15.7.5.tgz",
-      "integrity": "sha512-JCB8C6SnDoQf0cNycqd/35A7MjcnK+ZTqE7judS6o7utxUCg6imJg3QK2qzHKszlTjcj2cn+NwMB2i96ubpj7w=="
-    },
-    "@types/qs": {
-      "version": "6.9.7",
-      "resolved": "https://registry.npmjs.org/@types/qs/-/qs-6.9.7.tgz",
-      "integrity": "sha512-FGa1F62FT09qcrueBA6qYTrJPVDzah9a+493+o2PCXsesWHIn27G98TsSMs3WPNbZIEj4+VJf6saSFpvD+3Zsw==",
-      "dev": true
-    },
-    "@types/range-parser": {
-      "version": "1.2.4",
-      "resolved": "https://registry.npmjs.org/@types/range-parser/-/range-parser-1.2.4.tgz",
-      "integrity": "sha512-EEhsLsD6UsDM1yFhAvy0Cjr6VwmpMWqFBCb9w07wVugF7w9nfajxLuVmngTIpgS6svCnm6Vaw+MZhoDCKnOfsw==",
-      "dev": true
-    },
-    "@types/react": {
-      "version": "18.2.18",
-      "resolved": "https://registry.npmjs.org/@types/react/-/react-18.2.18.tgz",
-      "integrity": "sha512-da4NTSeBv/P34xoZPhtcLkmZuJ+oYaCxHmyHzwaDQo9RQPBeXV+06gEk2FpqEcsX9XrnNLvRpVh6bdavDSjtiQ==",
-      "requires": {
-        "@types/prop-types": "*",
-        "@types/scheduler": "*",
-        "csstype": "^3.0.2"
-      }
-    },
-    "@types/react-dom": {
-      "version": "18.2.7",
-      "resolved": "https://registry.npmjs.org/@types/react-dom/-/react-dom-18.2.7.tgz",
-      "integrity": "sha512-GRaAEriuT4zp9N4p1i8BDBYmEyfo+xQ3yHjJU4eiK5NDa1RmUZG+unZABUTK4/Ox/M+GaHwb6Ow8rUITrtjszA==",
-      "dev": true,
-      "requires": {
-        "@types/react": "*"
-      }
-    },
-    "@types/react-lottie": {
-      "version": "1.2.10",
-      "resolved": "https://registry.npmjs.org/@types/react-lottie/-/react-lottie-1.2.10.tgz",
-      "integrity": "sha512-rCd1p3US4ELKJlqwVnP0h5b24zt5p9OCvKUoNpYExLqwbFZMWEiJ6EGLMmH7nmq5V7KomBIbWO2X/XRFsL0vCA==",
-      "dev": true,
-      "requires": {
-        "@types/react": "*"
-      }
-    },
-    "@types/react-modal": {
-      "version": "3.16.0",
-      "resolved": "https://registry.npmjs.org/@types/react-modal/-/react-modal-3.16.0.tgz",
-      "integrity": "sha512-iphdqXAyUfByLbxJn5j6d+yh93dbMgshqGP0IuBeaKbZXx0aO+OXsvEkt6QctRdxjeM9/bR+Gp3h9F9djVWTQQ==",
-      "dev": true,
-      "requires": {
-        "@types/react": "*"
-      }
-    },
-    "@types/react-redux": {
-      "version": "7.1.25",
-      "resolved": "https://registry.npmjs.org/@types/react-redux/-/react-redux-7.1.25.tgz",
-      "integrity": "sha512-bAGh4e+w5D8dajd6InASVIyCo4pZLJ66oLb80F9OBLO1gKESbZcRCJpTT6uLXX+HAB57zw1WTdwJdAsewuTweg==",
-      "requires": {
-        "@types/hoist-non-react-statics": "^3.3.0",
-        "@types/react": "*",
-        "hoist-non-react-statics": "^3.3.0",
-        "redux": "^4.0.0"
-      }
-    },
-    "@types/redux-state-sync": {
-      "version": "3.1.5",
-      "resolved": "https://registry.npmjs.org/@types/redux-state-sync/-/redux-state-sync-3.1.5.tgz",
-      "integrity": "sha512-NtcV94bmZNFMmcjgYzjK9WHN/0NVHyH4OO/a4sAd4WG1ywcVZA5vdczjPQZLC1IVMRBi693b3FWsWB7wELL+tg==",
-      "dev": true,
-      "requires": {
-        "broadcast-channel": "^2.1.8",
-        "redux": "^4.0.1"
-      }
-    },
-    "@types/retry": {
-      "version": "0.12.0",
-      "resolved": "https://registry.npmjs.org/@types/retry/-/retry-0.12.0.tgz",
-      "integrity": "sha512-wWKOClTTiizcZhXnPY4wikVAwmdYHp8q6DmC+EJUzAMsycb7HB32Kh9RN4+0gExjmPmZSAQjgURXIGATPegAvA==",
-      "dev": true
-    },
-    "@types/scheduler": {
-      "version": "0.16.3",
-      "resolved": "https://registry.npmjs.org/@types/scheduler/-/scheduler-0.16.3.tgz",
-      "integrity": "sha512-5cJ8CB4yAx7BH1oMvdU0Jh9lrEXyPkar6F9G/ERswkCuvP4KQZfZkSjcMbAICCpQTN4OuZn8tz0HiKv9TGZgrQ=="
-    },
-    "@types/semver": {
-      "version": "7.5.0",
-      "resolved": "https://registry.npmjs.org/@types/semver/-/semver-7.5.0.tgz",
-      "integrity": "sha512-G8hZ6XJiHnuhQKR7ZmysCeJWE08o8T0AXtk5darsCaTVsYZhhgUrq53jizaR2FvsoeCwJhlmwTjkXBY5Pn/ZHw==",
-      "dev": true
-    },
-    "@types/send": {
-      "version": "0.17.1",
-      "resolved": "https://registry.npmjs.org/@types/send/-/send-0.17.1.tgz",
-      "integrity": "sha512-Cwo8LE/0rnvX7kIIa3QHCkcuF21c05Ayb0ZfxPiv0W8VRiZiNW/WuRupHKpqqGVGf7SUA44QSOUKaEd9lIrd/Q==",
-      "dev": true,
-      "requires": {
-        "@types/mime": "^1",
-        "@types/node": "*"
-      }
-    },
-    "@types/serve-index": {
-      "version": "1.9.1",
-      "resolved": "https://registry.npmjs.org/@types/serve-index/-/serve-index-1.9.1.tgz",
-      "integrity": "sha512-d/Hs3nWDxNL2xAczmOVZNj92YZCS6RGxfBPjKzuu/XirCgXdpKEb88dYNbrYGint6IVWLNP+yonwVAuRC0T2Dg==",
-      "dev": true,
-      "requires": {
-        "@types/express": "*"
-      }
-    },
-    "@types/serve-static": {
-      "version": "1.15.2",
-      "resolved": "https://registry.npmjs.org/@types/serve-static/-/serve-static-1.15.2.tgz",
-      "integrity": "sha512-J2LqtvFYCzaj8pVYKw8klQXrLLk7TBZmQ4ShlcdkELFKGwGMfevMLneMMRkMgZxotOD9wg497LpC7O8PcvAmfw==",
-      "dev": true,
-      "requires": {
-        "@types/http-errors": "*",
-        "@types/mime": "*",
-        "@types/node": "*"
-      }
-    },
-    "@types/sha.js": {
-      "version": "2.4.4",
-      "resolved": "https://registry.npmjs.org/@types/sha.js/-/sha.js-2.4.4.tgz",
-      "integrity": "sha512-Qukd+D6S2Hm0wLVt2Vh+/eWBIoUt+wF8jWjBsG4F8EFQRwKtYvtXCPcNl2OEUQ1R+eTr3xuSaBYUyM3WD1x/Qw==",
-      "requires": {
-        "@types/node": "*"
-      }
-    },
-    "@types/sockjs": {
-      "version": "0.3.33",
-      "resolved": "https://registry.npmjs.org/@types/sockjs/-/sockjs-0.3.33.tgz",
-      "integrity": "sha512-f0KEEe05NvUnat+boPTZ0dgaLZ4SfSouXUgv5noUiefG2ajgKjmETo9ZJyuqsl7dfl2aHlLJUiki6B4ZYldiiw==",
-      "dev": true,
-      "requires": {
-        "@types/node": "*"
-      }
-    },
-    "@types/styled-components": {
-      "version": "5.1.26",
-      "resolved": "https://registry.npmjs.org/@types/styled-components/-/styled-components-5.1.26.tgz",
-      "integrity": "sha512-KuKJ9Z6xb93uJiIyxo/+ksS7yLjS1KzG6iv5i78dhVg/X3u5t1H7juRWqVmodIdz6wGVaIApo1u01kmFRdJHVw==",
-      "dev": true,
-      "requires": {
-        "@types/hoist-non-react-statics": "*",
-        "@types/react": "*",
-        "csstype": "^3.0.2"
-      }
-    },
-    "@types/uuid": {
-      "version": "8.3.4",
-      "resolved": "https://registry.npmjs.org/@types/uuid/-/uuid-8.3.4.tgz",
-      "integrity": "sha512-c/I8ZRb51j+pYGAu5CrFMRxqZ2ke4y2grEBO5AUjgSkSk+qT2Ea+OdWElz/OiMf5MNpn2b17kuVBwZLQJXzihw=="
-    },
-    "@types/webextension-polyfill": {
-      "version": "0.9.2",
-      "resolved": "https://registry.npmjs.org/@types/webextension-polyfill/-/webextension-polyfill-0.9.2.tgz",
-      "integrity": "sha512-op8YeoK60K6/GIx3snWs3JowBZ+/aeSnZzZuuwynA7VARWfzr3st9aQNk9RWfoBx5xqlNZjAsh2QttPUZnabCw==",
-      "dev": true
-    },
-    "@types/ws": {
-      "version": "8.5.5",
-      "resolved": "https://registry.npmjs.org/@types/ws/-/ws-8.5.5.tgz",
-      "integrity": "sha512-lwhs8hktwxSjf9UaZ9tG5M03PGogvFaH8gUgLNbN9HKIg0dvv6q+gkSuJ8HN4/VbyxkuLzCjlN7GquQ0gUJfIg==",
-      "dev": true,
-      "requires": {
-        "@types/node": "*"
-      }
-    },
-    "@types/zxcvbn": {
-      "version": "4.4.1",
-      "resolved": "https://registry.npmjs.org/@types/zxcvbn/-/zxcvbn-4.4.1.tgz",
-      "integrity": "sha512-3NoqvZC2W5gAC5DZbTpCeJ251vGQmgcWIHQJGq2J240HY6ErQ9aWKkwfoKJlHLx+A83WPNTZ9+3cd2ILxbvr1w==",
-      "dev": true
-    },
-    "@typescript-eslint/eslint-plugin": {
-      "version": "5.62.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.62.0.tgz",
-      "integrity": "sha512-TiZzBSJja/LbhNPvk6yc0JrX9XqhQ0hdh6M2svYfsHGejaKFIAGd9MQ+ERIMzLGlN/kZoYIgdxFV0PuljTKXag==",
-      "dev": true,
-      "requires": {
-        "@eslint-community/regexpp": "^4.4.0",
-        "@typescript-eslint/scope-manager": "5.62.0",
-        "@typescript-eslint/type-utils": "5.62.0",
-        "@typescript-eslint/utils": "5.62.0",
-        "debug": "^4.3.4",
-        "graphemer": "^1.4.0",
-        "ignore": "^5.2.0",
-        "natural-compare-lite": "^1.4.0",
-        "semver": "^7.3.7",
-        "tsutils": "^3.21.0"
-      },
-      "dependencies": {
-        "lru-cache": {
-          "version": "6.0.0",
-          "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
-          "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
-          "dev": true,
-          "requires": {
-            "yallist": "^4.0.0"
-          }
-        },
-        "semver": {
-          "version": "7.5.4",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz",
-          "integrity": "sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==",
-          "dev": true,
-          "requires": {
-            "lru-cache": "^6.0.0"
-          }
-        },
-        "yallist": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
-          "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==",
-          "dev": true
-        }
-      }
-    },
-    "@typescript-eslint/parser": {
-      "version": "5.62.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-5.62.0.tgz",
-      "integrity": "sha512-VlJEV0fOQ7BExOsHYAGrgbEiZoi8D+Bl2+f6V2RrXerRSylnp+ZBHmPvaIa8cz0Ajx7WO7Z5RqfgYg7ED1nRhA==",
-      "dev": true,
-      "requires": {
-        "@typescript-eslint/scope-manager": "5.62.0",
-        "@typescript-eslint/types": "5.62.0",
-        "@typescript-eslint/typescript-estree": "5.62.0",
-        "debug": "^4.3.4"
-      }
-    },
-    "@typescript-eslint/scope-manager": {
-      "version": "5.62.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-5.62.0.tgz",
-      "integrity": "sha512-VXuvVvZeQCQb5Zgf4HAxc04q5j+WrNAtNh9OwCsCgpKqESMTu3tF/jhZ3xG6T4NZwWl65Bg8KuS2uEvhSfLl0w==",
-      "dev": true,
-      "requires": {
-        "@typescript-eslint/types": "5.62.0",
-        "@typescript-eslint/visitor-keys": "5.62.0"
-      }
-    },
-    "@typescript-eslint/type-utils": {
-      "version": "5.62.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-5.62.0.tgz",
-      "integrity": "sha512-xsSQreu+VnfbqQpW5vnCJdq1Z3Q0U31qiWmRhr98ONQmcp/yhiPJFPq8MXiJVLiksmOKSjIldZzkebzHuCGzew==",
-      "dev": true,
-      "requires": {
-        "@typescript-eslint/typescript-estree": "5.62.0",
-        "@typescript-eslint/utils": "5.62.0",
-        "debug": "^4.3.4",
-        "tsutils": "^3.21.0"
-      }
-    },
-    "@typescript-eslint/types": {
-      "version": "5.62.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-5.62.0.tgz",
-      "integrity": "sha512-87NVngcbVXUahrRTqIK27gD2t5Cu1yuCXxbLcFtCzZGlfyVWWh8mLHkoxzjsB6DDNnvdL+fW8MiwPEJyGJQDgQ==",
-      "dev": true
-    },
-    "@typescript-eslint/typescript-estree": {
-      "version": "5.62.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-5.62.0.tgz",
-      "integrity": "sha512-CmcQ6uY7b9y694lKdRB8FEel7JbU/40iSAPomu++SjLMntB+2Leay2LO6i8VnJk58MtE9/nQSFIH6jpyRWyYzA==",
-      "dev": true,
-      "requires": {
-        "@typescript-eslint/types": "5.62.0",
-        "@typescript-eslint/visitor-keys": "5.62.0",
-        "debug": "^4.3.4",
-        "globby": "^11.1.0",
-        "is-glob": "^4.0.3",
-        "semver": "^7.3.7",
-        "tsutils": "^3.21.0"
-      },
-      "dependencies": {
-        "lru-cache": {
-          "version": "6.0.0",
-          "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
-          "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
-          "dev": true,
-          "requires": {
-            "yallist": "^4.0.0"
-          }
-        },
-        "semver": {
-          "version": "7.5.4",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz",
-          "integrity": "sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==",
-          "dev": true,
-          "requires": {
-            "lru-cache": "^6.0.0"
-          }
-        },
-        "yallist": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
-          "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==",
-          "dev": true
-        }
-      }
-    },
-    "@typescript-eslint/utils": {
-      "version": "5.62.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-5.62.0.tgz",
-      "integrity": "sha512-n8oxjeb5aIbPFEtmQxQYOLI0i9n5ySBEY/ZEHHZqKQSFnxio1rv6dthascc9dLuwrL0RC5mPCxB7vnAVGAYWAQ==",
-      "dev": true,
-      "requires": {
-        "@eslint-community/eslint-utils": "^4.2.0",
-        "@types/json-schema": "^7.0.9",
-        "@types/semver": "^7.3.12",
-        "@typescript-eslint/scope-manager": "5.62.0",
-        "@typescript-eslint/types": "5.62.0",
-        "@typescript-eslint/typescript-estree": "5.62.0",
-        "eslint-scope": "^5.1.1",
-        "semver": "^7.3.7"
-      },
-      "dependencies": {
-        "lru-cache": {
-          "version": "6.0.0",
-          "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
-          "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
-          "dev": true,
-          "requires": {
-            "yallist": "^4.0.0"
-          }
-        },
-        "semver": {
-          "version": "7.5.4",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz",
-          "integrity": "sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==",
-          "dev": true,
-          "requires": {
-            "lru-cache": "^6.0.0"
-          }
-        },
-        "yallist": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
-          "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==",
-          "dev": true
-        }
-      }
-    },
-    "@typescript-eslint/visitor-keys": {
-      "version": "5.62.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-5.62.0.tgz",
-      "integrity": "sha512-07ny+LHRzQXepkGg6w0mFY41fVUNBrL2Roj/++7V1txKugfjm/Ci/qSND03r2RhlJhJYMcTn9AhhSSqQp0Ysyw==",
-      "dev": true,
-      "requires": {
-        "@typescript-eslint/types": "5.62.0",
-        "eslint-visitor-keys": "^3.3.0"
-      }
-    },
-    "@vitest/expect": {
-      "version": "0.34.6",
-      "resolved": "https://registry.npmjs.org/@vitest/expect/-/expect-0.34.6.tgz",
-      "integrity": "sha512-QUzKpUQRc1qC7qdGo7rMK3AkETI7w18gTCUrsNnyjjJKYiuUB9+TQK3QnR1unhCnWRC0AbKv2omLGQDF/mIjOw==",
-      "dev": true,
-      "requires": {
-        "@vitest/spy": "0.34.6",
-        "@vitest/utils": "0.34.6",
-        "chai": "^4.3.10"
-      }
-    },
-    "@vitest/runner": {
-      "version": "0.34.6",
-      "resolved": "https://registry.npmjs.org/@vitest/runner/-/runner-0.34.6.tgz",
-      "integrity": "sha512-1CUQgtJSLF47NnhN+F9X2ycxUP0kLHQ/JWvNHbeBfwW8CzEGgeskzNnHDyv1ieKTltuR6sdIHV+nmR6kPxQqzQ==",
-      "dev": true,
-      "requires": {
-        "@vitest/utils": "0.34.6",
-        "p-limit": "^4.0.0",
-        "pathe": "^1.1.1"
-      },
-      "dependencies": {
-        "p-limit": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-4.0.0.tgz",
-          "integrity": "sha512-5b0R4txpzjPWVw/cXXUResoD4hb6U/x9BH08L7nw+GN1sezDzPdxeRvpc9c433fZhBan/wusjbCsqwqm4EIBIQ==",
-          "dev": true,
-          "requires": {
-            "yocto-queue": "^1.0.0"
-          }
-        },
-        "yocto-queue": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/yocto-queue/-/yocto-queue-1.0.0.tgz",
-          "integrity": "sha512-9bnSc/HEW2uRy67wc+T8UwauLuPJVn28jb+GtJY16iiKWyvmYJRXVT4UamsAEGQfPohgr2q4Tq0sQbQlxTfi1g==",
-          "dev": true
-        }
-      }
-    },
-    "@vitest/snapshot": {
-      "version": "0.34.6",
-      "resolved": "https://registry.npmjs.org/@vitest/snapshot/-/snapshot-0.34.6.tgz",
-      "integrity": "sha512-B3OZqYn6k4VaN011D+ve+AA4whM4QkcwcrwaKwAbyyvS/NB1hCWjFIBQxAQQSQir9/RtyAAGuq+4RJmbn2dH4w==",
-      "dev": true,
-      "requires": {
-        "magic-string": "^0.30.1",
-        "pathe": "^1.1.1",
-        "pretty-format": "^29.5.0"
-      },
-      "dependencies": {
-        "ansi-styles": {
-          "version": "5.2.0",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-5.2.0.tgz",
-          "integrity": "sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==",
-          "dev": true
-        },
-        "pretty-format": {
-          "version": "29.7.0",
-          "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-29.7.0.tgz",
-          "integrity": "sha512-Pdlw/oPxN+aXdmM9R00JVC9WVFoCLTKJvDVLgmJ+qAffBMxsV85l/Lu7sNx4zSzPyoL2euImuEwHhOXdEgNFZQ==",
-          "dev": true,
-          "requires": {
-            "@jest/schemas": "^29.6.3",
-            "ansi-styles": "^5.0.0",
-            "react-is": "^18.0.0"
-          }
-        }
-      }
-    },
-    "@vitest/spy": {
-      "version": "0.34.6",
-      "resolved": "https://registry.npmjs.org/@vitest/spy/-/spy-0.34.6.tgz",
-      "integrity": "sha512-xaCvneSaeBw/cz8ySmF7ZwGvL0lBjfvqc1LpQ/vcdHEvpLn3Ff1vAvjw+CoGn0802l++5L/pxb7whwcWAw+DUQ==",
-      "dev": true,
-      "requires": {
-        "tinyspy": "^2.1.1"
-      }
-    },
-    "@vitest/utils": {
-      "version": "0.34.6",
-      "resolved": "https://registry.npmjs.org/@vitest/utils/-/utils-0.34.6.tgz",
-      "integrity": "sha512-IG5aDD8S6zlvloDsnzHw0Ut5xczlF+kv2BOTo+iXfPr54Yhi5qbVOgGB1hZaVq4iJ4C/MZ2J0y15IlsV/ZcI0A==",
-      "dev": true,
-      "requires": {
-        "diff-sequences": "^29.4.3",
-        "loupe": "^2.3.6",
-        "pretty-format": "^29.5.0"
-      },
-      "dependencies": {
-        "ansi-styles": {
-          "version": "5.2.0",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-5.2.0.tgz",
-          "integrity": "sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==",
-          "dev": true
-        },
-        "diff-sequences": {
-          "version": "29.6.3",
-          "resolved": "https://registry.npmjs.org/diff-sequences/-/diff-sequences-29.6.3.tgz",
-          "integrity": "sha512-EjePK1srD3P08o2j4f0ExnylqRs5B9tJjcp9t1krH2qRi8CCdsYfwe9JgSLurFBWwq4uOlipzfk5fHNvwFKr8Q==",
-          "dev": true
-        },
-        "pretty-format": {
-          "version": "29.7.0",
-          "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-29.7.0.tgz",
-          "integrity": "sha512-Pdlw/oPxN+aXdmM9R00JVC9WVFoCLTKJvDVLgmJ+qAffBMxsV85l/Lu7sNx4zSzPyoL2euImuEwHhOXdEgNFZQ==",
-          "dev": true,
-          "requires": {
-            "@jest/schemas": "^29.6.3",
-            "ansi-styles": "^5.0.0",
-            "react-is": "^18.0.0"
-          }
-        }
-      }
-    },
-    "@webassemblyjs/ast": {
-      "version": "1.11.6",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/ast/-/ast-1.11.6.tgz",
-      "integrity": "sha512-IN1xI7PwOvLPgjcf180gC1bqn3q/QaOCwYUahIOhbYUu8KA/3tw2RT/T0Gidi1l7Hhj5D/INhJxiICObqpMu4Q==",
-      "dev": true,
-      "requires": {
-        "@webassemblyjs/helper-numbers": "1.11.6",
-        "@webassemblyjs/helper-wasm-bytecode": "1.11.6"
-      }
-    },
-    "@webassemblyjs/floating-point-hex-parser": {
-      "version": "1.11.6",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.11.6.tgz",
-      "integrity": "sha512-ejAj9hfRJ2XMsNHk/v6Fu2dGS+i4UaXBXGemOfQ/JfQ6mdQg/WXtwleQRLLS4OvfDhv8rYnVwH27YJLMyYsxhw==",
-      "dev": true
-    },
-    "@webassemblyjs/helper-api-error": {
-      "version": "1.11.6",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-api-error/-/helper-api-error-1.11.6.tgz",
-      "integrity": "sha512-o0YkoP4pVu4rN8aTJgAyj9hC2Sv5UlkzCHhxqWj8butaLvnpdc2jOwh4ewE6CX0txSfLn/UYaV/pheS2Txg//Q==",
-      "dev": true
-    },
-    "@webassemblyjs/helper-buffer": {
-      "version": "1.11.6",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-buffer/-/helper-buffer-1.11.6.tgz",
-      "integrity": "sha512-z3nFzdcp1mb8nEOFFk8DrYLpHvhKC3grJD2ardfKOzmbmJvEf/tPIqCY+sNcwZIY8ZD7IkB2l7/pqhUhqm7hLA==",
-      "dev": true
-    },
-    "@webassemblyjs/helper-numbers": {
-      "version": "1.11.6",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-numbers/-/helper-numbers-1.11.6.tgz",
-      "integrity": "sha512-vUIhZ8LZoIWHBohiEObxVm6hwP034jwmc9kuq5GdHZH0wiLVLIPcMCdpJzG4C11cHoQ25TFIQj9kaVADVX7N3g==",
-      "dev": true,
-      "requires": {
-        "@webassemblyjs/floating-point-hex-parser": "1.11.6",
-        "@webassemblyjs/helper-api-error": "1.11.6",
-        "@xtuc/long": "4.2.2"
-      }
-    },
-    "@webassemblyjs/helper-wasm-bytecode": {
-      "version": "1.11.6",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.11.6.tgz",
-      "integrity": "sha512-sFFHKwcmBprO9e7Icf0+gddyWYDViL8bpPjJJl0WHxCdETktXdmtWLGVzoHbqUcY4Be1LkNfwTmXOJUFZYSJdA==",
-      "dev": true
-    },
-    "@webassemblyjs/helper-wasm-section": {
-      "version": "1.11.6",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.11.6.tgz",
-      "integrity": "sha512-LPpZbSOwTpEC2cgn4hTydySy1Ke+XEu+ETXuoyvuyezHO3Kjdu90KK95Sh9xTbmjrCsUwvWwCOQQNta37VrS9g==",
-      "dev": true,
-      "requires": {
-        "@webassemblyjs/ast": "1.11.6",
-        "@webassemblyjs/helper-buffer": "1.11.6",
-        "@webassemblyjs/helper-wasm-bytecode": "1.11.6",
-        "@webassemblyjs/wasm-gen": "1.11.6"
-      }
-    },
-    "@webassemblyjs/ieee754": {
-      "version": "1.11.6",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/ieee754/-/ieee754-1.11.6.tgz",
-      "integrity": "sha512-LM4p2csPNvbij6U1f19v6WR56QZ8JcHg3QIJTlSwzFcmx6WSORicYj6I63f9yU1kEUtrpG+kjkiIAkevHpDXrg==",
-      "dev": true,
-      "requires": {
-        "@xtuc/ieee754": "^1.2.0"
-      }
-    },
-    "@webassemblyjs/leb128": {
-      "version": "1.11.6",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/leb128/-/leb128-1.11.6.tgz",
-      "integrity": "sha512-m7a0FhE67DQXgouf1tbN5XQcdWoNgaAuoULHIfGFIEVKA6tu/edls6XnIlkmS6FrXAquJRPni3ZZKjw6FSPjPQ==",
-      "dev": true,
-      "requires": {
-        "@xtuc/long": "4.2.2"
-      }
-    },
-    "@webassemblyjs/utf8": {
-      "version": "1.11.6",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/utf8/-/utf8-1.11.6.tgz",
-      "integrity": "sha512-vtXf2wTQ3+up9Zsg8sa2yWiQpzSsMyXj0qViVP6xKGCUT8p8YJ6HqI7l5eCnWx1T/FYdsv07HQs2wTFbbof/RA==",
-      "dev": true
-    },
-    "@webassemblyjs/wasm-edit": {
-      "version": "1.11.6",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-edit/-/wasm-edit-1.11.6.tgz",
-      "integrity": "sha512-Ybn2I6fnfIGuCR+Faaz7YcvtBKxvoLV3Lebn1tM4o/IAJzmi9AWYIPWpyBfU8cC+JxAO57bk4+zdsTjJR+VTOw==",
-      "dev": true,
-      "requires": {
-        "@webassemblyjs/ast": "1.11.6",
-        "@webassemblyjs/helper-buffer": "1.11.6",
-        "@webassemblyjs/helper-wasm-bytecode": "1.11.6",
-        "@webassemblyjs/helper-wasm-section": "1.11.6",
-        "@webassemblyjs/wasm-gen": "1.11.6",
-        "@webassemblyjs/wasm-opt": "1.11.6",
-        "@webassemblyjs/wasm-parser": "1.11.6",
-        "@webassemblyjs/wast-printer": "1.11.6"
-      }
-    },
-    "@webassemblyjs/wasm-gen": {
-      "version": "1.11.6",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-gen/-/wasm-gen-1.11.6.tgz",
-      "integrity": "sha512-3XOqkZP/y6B4F0PBAXvI1/bky7GryoogUtfwExeP/v7Nzwo1QLcq5oQmpKlftZLbT+ERUOAZVQjuNVak6UXjPA==",
-      "dev": true,
-      "requires": {
-        "@webassemblyjs/ast": "1.11.6",
-        "@webassemblyjs/helper-wasm-bytecode": "1.11.6",
-        "@webassemblyjs/ieee754": "1.11.6",
-        "@webassemblyjs/leb128": "1.11.6",
-        "@webassemblyjs/utf8": "1.11.6"
-      }
-    },
-    "@webassemblyjs/wasm-opt": {
-      "version": "1.11.6",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-opt/-/wasm-opt-1.11.6.tgz",
-      "integrity": "sha512-cOrKuLRE7PCe6AsOVl7WasYf3wbSo4CeOk6PkrjS7g57MFfVUF9u6ysQBBODX0LdgSvQqRiGz3CXvIDKcPNy4g==",
-      "dev": true,
-      "requires": {
-        "@webassemblyjs/ast": "1.11.6",
-        "@webassemblyjs/helper-buffer": "1.11.6",
-        "@webassemblyjs/wasm-gen": "1.11.6",
-        "@webassemblyjs/wasm-parser": "1.11.6"
-      }
-    },
-    "@webassemblyjs/wasm-parser": {
-      "version": "1.11.6",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-parser/-/wasm-parser-1.11.6.tgz",
-      "integrity": "sha512-6ZwPeGzMJM3Dqp3hCsLgESxBGtT/OeCvCZ4TA1JUPYgmhAx38tTPR9JaKy0S5H3evQpO/h2uWs2j6Yc/fjkpTQ==",
-      "dev": true,
-      "requires": {
-        "@webassemblyjs/ast": "1.11.6",
-        "@webassemblyjs/helper-api-error": "1.11.6",
-        "@webassemblyjs/helper-wasm-bytecode": "1.11.6",
-        "@webassemblyjs/ieee754": "1.11.6",
-        "@webassemblyjs/leb128": "1.11.6",
-        "@webassemblyjs/utf8": "1.11.6"
-      }
-    },
-    "@webassemblyjs/wast-printer": {
-      "version": "1.11.6",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/wast-printer/-/wast-printer-1.11.6.tgz",
-      "integrity": "sha512-JM7AhRcE+yW2GWYaKeHL5vt4xqee5N2WcezptmgyhNS+ScggqcT1OtXykhAb13Sn5Yas0j2uv9tHgrjwvzAP4A==",
-      "dev": true,
-      "requires": {
-        "@webassemblyjs/ast": "1.11.6",
-        "@xtuc/long": "4.2.2"
-      }
-    },
-    "@xtuc/ieee754": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/@xtuc/ieee754/-/ieee754-1.2.0.tgz",
-      "integrity": "sha512-DX8nKgqcGwsc0eJSqYt5lwP4DH5FlHnmuWWBRy7X0NcaGR0ZtuyeESgMwTYVEtxmsNGY+qit4QYT/MIYTOTPeA==",
-      "dev": true
-    },
-    "@xtuc/long": {
-      "version": "4.2.2",
-      "resolved": "https://registry.npmjs.org/@xtuc/long/-/long-4.2.2.tgz",
-      "integrity": "sha512-NuHqBY1PB/D8xU6s/thBgOAiAP7HOYDQ32+BFZILJ8ivkUkAHQnWfn6WhL79Owj1qmUnoN/YPhktdIoucipkAQ==",
-      "dev": true
-    },
-    "@zondax/ledger-stacks": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/@zondax/ledger-stacks/-/ledger-stacks-1.0.4.tgz",
-      "integrity": "sha512-R8CB0CZ2poTzpcG0jhzzXZvXF7axIsmZFhp06aHCUjgz+1df63YbC4tUzyzmseekwqNWnaebWFejQKJ99WiHZA==",
-      "requires": {
-        "@babel/runtime": "^7.12.5",
-        "@ledgerhq/hw-transport": "^6.28.1",
-        "@stacks/transactions": "^4.1.0",
-        "varuint-bitcoin": "^1.1.2"
-      },
-      "dependencies": {
-        "@stacks/common": {
-          "version": "4.3.5",
-          "resolved": "https://registry.npmjs.org/@stacks/common/-/common-4.3.5.tgz",
-          "integrity": "sha512-UuViiQ7fn3vdtTe3739aRzbl+wbukekeQuXgqt8d7nB2HC2HodD7GcHhpUga165cO35CD6lQUtj3vXxJb5Ga+A==",
-          "requires": {
-            "@types/bn.js": "^5.1.0",
-            "@types/node": "^18.0.4",
-            "buffer": "6.0.3"
-          }
-        },
-        "@stacks/network": {
-          "version": "4.3.5",
-          "resolved": "https://registry.npmjs.org/@stacks/network/-/network-4.3.5.tgz",
-          "integrity": "sha512-TC4+AkuT6qi3MoEGxTftA+4BNp99QvGnI+qtKQkoA1m0KDr8b9hSBUhugJHRhQbWuo7D6q0+JagYEGxLID29Kw==",
-          "requires": {
-            "@stacks/common": "^4.3.5",
-            "cross-fetch": "^3.1.5"
-          }
-        },
-        "@stacks/transactions": {
-          "version": "4.3.8",
-          "resolved": "https://registry.npmjs.org/@stacks/transactions/-/transactions-4.3.8.tgz",
-          "integrity": "sha512-5xYYv2TdXXM9PVixB79Pr99symQ8fhbVATjempGUxtL23/XUiRiLvJZohDxIE4VQ2EzbB4g4j8Y7oqPjj0h09Q==",
-          "requires": {
-            "@noble/hashes": "^1.0.0",
-            "@noble/secp256k1": "^1.5.5",
-            "@stacks/common": "^4.3.5",
-            "@stacks/network": "^4.3.5",
-            "@types/node": "^18.0.4",
-            "@types/sha.js": "^2.4.0",
-            "c32check": "^1.1.3",
-            "lodash.clonedeep": "^4.5.0",
-            "ripemd160-min": "^0.0.6",
-            "sha.js": "^2.4.11",
-            "smart-buffer": "^4.1.0"
-          }
-        },
-        "@types/node": {
-          "version": "18.19.42",
-          "resolved": "https://registry.npmjs.org/@types/node/-/node-18.19.42.tgz",
-          "integrity": "sha512-d2ZFc/3lnK2YCYhos8iaNIYu9Vfhr92nHiyJHRltXWjXUBjEE+A4I58Tdbnw4VhggSW+2j5y5gTrLs4biNnubg==",
-          "requires": {
-            "undici-types": "~5.26.4"
-          }
-        },
-        "base-x": {
-          "version": "3.0.10",
-          "resolved": "https://registry.npmjs.org/base-x/-/base-x-3.0.10.tgz",
-          "integrity": "sha512-7d0s06rR9rYaIWHkpfLIFICM/tkSVdoPC9qYAQRpxn9DdKNWNsKC0uk++akckyLq16Tx2WIinnZ6WRriAt6njQ==",
-          "requires": {
-            "safe-buffer": "^5.0.1"
-          }
-        },
-        "c32check": {
-          "version": "1.1.3",
-          "resolved": "https://registry.npmjs.org/c32check/-/c32check-1.1.3.tgz",
-          "integrity": "sha512-ADADE/PjAbJRlwpG3ShaOMbBUlJJZO7xaYSRD5Tub6PixQlgR4s36y9cvMf/YRGpkqX+QOxIdMw216iC320q9A==",
-          "requires": {
-            "base-x": "^3.0.8",
-            "buffer": "6.0.3",
-            "cross-sha256": "^1.2.0"
-          }
-        }
-      }
-    },
-    "accepts": {
-      "version": "1.3.8",
-      "resolved": "https://registry.npmjs.org/accepts/-/accepts-1.3.8.tgz",
-      "integrity": "sha512-PYAthTa2m2VKxuvSD3DPC/Gy+U+sOA1LAuT8mkmRuvw+NACSaeXEQ+NHcVF7rONl6qcaxV3Uuemwawk+7+SJLw==",
-      "dev": true,
-      "requires": {
-        "mime-types": "~2.1.34",
-        "negotiator": "0.6.3"
-      }
-    },
-    "acorn": {
-      "version": "8.10.0",
-      "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.10.0.tgz",
-      "integrity": "sha512-F0SAmZ8iUtS//m8DmCTA0jlh6TDKkHQyK6xc6V4KDTyZKA9dnvX9/3sRTVQrWm79glUAZbnmmNcdYwUIHWVybw==",
-      "dev": true
-    },
-    "acorn-import-assertions": {
-      "version": "1.9.0",
-      "resolved": "https://registry.npmjs.org/acorn-import-assertions/-/acorn-import-assertions-1.9.0.tgz",
-      "integrity": "sha512-cmMwop9x+8KFhxvKrKfPYmN6/pKTYYHBqLa0DfvVZcKMJWNyWLnaqND7dx/qn66R7ewM1UX5XMaDVP5wlVTaVA==",
-      "dev": true,
-      "requires": {}
-    },
-    "acorn-jsx": {
-      "version": "5.3.2",
-      "resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.3.2.tgz",
-      "integrity": "sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==",
-      "dev": true,
-      "requires": {}
-    },
-    "acorn-walk": {
-      "version": "8.3.0",
-      "resolved": "https://registry.npmjs.org/acorn-walk/-/acorn-walk-8.3.0.tgz",
-      "integrity": "sha512-FS7hV565M5l1R08MXqo8odwMTB02C2UqzB17RVgu9EyuYFBqJZ3/ZY97sQD5FewVu1UyDFc1yztUDrAwT0EypA==",
-      "dev": true
-    },
-    "aggregate-error": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/aggregate-error/-/aggregate-error-3.1.0.tgz",
-      "integrity": "sha512-4I7Td01quW/RpocfNayFdFVk1qSuoh0E7JrbRJ16nH01HhKFQ88INq9Sd+nd72zqRySlr9BmDA8xlEJ6vJMrYA==",
-      "dev": true,
-      "requires": {
-        "clean-stack": "^2.0.0",
-        "indent-string": "^4.0.0"
-      }
-    },
-    "ajv": {
-      "version": "6.12.6",
-      "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
-      "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
-      "dev": true,
-      "requires": {
-        "fast-deep-equal": "^3.1.1",
-        "fast-json-stable-stringify": "^2.0.0",
-        "json-schema-traverse": "^0.4.1",
-        "uri-js": "^4.2.2"
-      }
-    },
-    "ajv-formats": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/ajv-formats/-/ajv-formats-2.1.1.tgz",
-      "integrity": "sha512-Wx0Kx52hxE7C18hkMEggYlEifqWZtYaRgouJor+WMdPnQyEK13vgEWyVNup7SoeeoLMsr4kf5h6dOW11I15MUA==",
-      "dev": true,
-      "requires": {
-        "ajv": "^8.0.0"
-      },
-      "dependencies": {
-        "ajv": {
-          "version": "8.12.0",
-          "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.12.0.tgz",
-          "integrity": "sha512-sRu1kpcO9yLtYxBKvqfTeh9KzZEwO3STyX1HT+4CaDzC6HpTGYhIhPIzj9XuKU7KYDwnaeh5hcOwjy1QuJzBPA==",
-          "dev": true,
-          "requires": {
-            "fast-deep-equal": "^3.1.1",
-            "json-schema-traverse": "^1.0.0",
-            "require-from-string": "^2.0.2",
-            "uri-js": "^4.2.2"
-          }
-        },
-        "json-schema-traverse": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz",
-          "integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==",
-          "dev": true
-        }
-      }
-    },
-    "ajv-keywords": {
-      "version": "3.5.2",
-      "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.5.2.tgz",
-      "integrity": "sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==",
-      "dev": true,
-      "requires": {}
-    },
-    "alex-sdk": {
-      "version": "0.1.26",
-      "resolved": "https://registry.npmjs.org/alex-sdk/-/alex-sdk-0.1.26.tgz",
-      "integrity": "sha512-uUjbONoAit6htxZGLOFev8v2h59kE31fM1X9efH0Yi1eLXYSSXojj+iFPTlQTQvIysyseXGxkX4VVTc9aQ13sg==",
-      "requires": {
-        "clarity-codegen": "^0.3.5"
-      }
-    },
-    "ansi-escapes": {
-      "version": "4.3.2",
-      "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-4.3.2.tgz",
-      "integrity": "sha512-gKXj5ALrKWQLsYG9jlTRmR/xKluxHV+Z9QEwNIgCfM1/uwPMCuzVVnh5mwTd+OuBZcwSIMbqssNWRm1lE51QaQ==",
-      "dev": true,
-      "requires": {
-        "type-fest": "^0.21.3"
-      },
-      "dependencies": {
-        "type-fest": {
-          "version": "0.21.3",
-          "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.21.3.tgz",
-          "integrity": "sha512-t0rzBq87m3fVcduHDUFhKmyyX+9eo6WQjZvf51Ea/M0Q7+T374Jp1aUiyUl0GKxp8M/OETVHSDvmkyPgvX+X2w==",
-          "dev": true
-        }
-      }
-    },
-    "ansi-html-community": {
-      "version": "0.0.8",
-      "resolved": "https://registry.npmjs.org/ansi-html-community/-/ansi-html-community-0.0.8.tgz",
-      "integrity": "sha512-1APHAyr3+PCamwNw3bXCPp4HFLONZt/yIH0sZp0/469KWNTEy+qN5jQ3GVX6DMZ1UXAi34yVwtTeaG/HpBuuzw==",
-      "dev": true
-    },
-    "ansi-regex": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
-      "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ=="
-    },
-    "ansi-styles": {
-      "version": "3.2.1",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
-      "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
-      "requires": {
-        "color-convert": "^1.9.0"
-      }
-    },
-    "anymatch": {
-      "version": "3.1.3",
-      "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.3.tgz",
-      "integrity": "sha512-KMReFUr0B4t+D+OBkjR3KYqvocp2XaSzO55UcB6mgQMd3KbcE+mWTyvVV7D/zsdEbNnV6acZUutkiHQXvTr1Rw==",
-      "dev": true,
-      "requires": {
-        "normalize-path": "^3.0.0",
-        "picomatch": "^2.0.4"
-      }
-    },
-    "argon2-browser": {
-      "version": "1.18.0",
-      "resolved": "https://registry.npmjs.org/argon2-browser/-/argon2-browser-1.18.0.tgz",
-      "integrity": "sha512-ImVAGIItnFnvET1exhsQB7apRztcoC5TnlSqernMJDUjbc/DLq3UEYeXFrLPrlaIl8cVfwnXb6wX2KpFf2zxHw=="
-    },
-    "argparse": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz",
-      "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==",
-      "dev": true
-    },
-    "aria-query": {
-      "version": "5.1.3",
-      "resolved": "https://registry.npmjs.org/aria-query/-/aria-query-5.1.3.tgz",
-      "integrity": "sha512-R5iJ5lkuHybztUfuOAznmboyjWq8O6sqNqtK7CLOqdydi54VNbORp49mb14KbWgG1QD3JFO9hJdZ+y4KutfdOQ==",
-      "dev": true,
-      "requires": {
-        "deep-equal": "^2.0.5"
-      }
-    },
-    "arity-n": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/arity-n/-/arity-n-1.0.4.tgz",
-      "integrity": "sha512-fExL2kFDC1Q2DUOx3whE/9KoN66IzkY4b4zUHUBFM1ojEYjZZYDcUW3bek/ufGionX9giIKDC5redH2IlGqcQQ==",
-      "dev": true
-    },
-    "array-buffer-byte-length": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/array-buffer-byte-length/-/array-buffer-byte-length-1.0.0.tgz",
-      "integrity": "sha512-LPuwb2P+NrQw3XhxGc36+XSvuBPopovXYTR9Ew++Du9Yb/bx5AzBfrIsBoj0EZUifjQU+sHL21sseZ3jerWO/A==",
-      "dev": true,
-      "requires": {
-        "call-bind": "^1.0.2",
-        "is-array-buffer": "^3.0.1"
-      }
-    },
-    "array-flatten": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/array-flatten/-/array-flatten-2.1.2.tgz",
-      "integrity": "sha512-hNfzcOV8W4NdualtqBFPyVO+54DSJuZGY9qT4pRroB6S9e3iiido2ISIC5h9R2sPJ8H3FHCIiEnsv1lPXO3KtQ==",
-      "dev": true
-    },
-    "array-includes": {
-      "version": "3.1.6",
-      "resolved": "https://registry.npmjs.org/array-includes/-/array-includes-3.1.6.tgz",
-      "integrity": "sha512-sgTbLvL6cNnw24FnbaDyjmvddQ2ML8arZsgaJhoABMoplz/4QRhtrYS+alr1BUM1Bwp6dhx8vVCBSLG+StwOFw==",
-      "dev": true,
-      "requires": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.1.4",
-        "es-abstract": "^1.20.4",
-        "get-intrinsic": "^1.1.3",
-        "is-string": "^1.0.7"
-      }
-    },
-    "array-last": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/array-last/-/array-last-1.3.0.tgz",
-      "integrity": "sha512-eOCut5rXlI6aCOS7Z7kCplKRKyiFQ6dHFBem4PwlwKeNFk2/XxTrhRh5T9PyaEWGy/NHTZWbY+nsZlNFJu9rYg==",
-      "dev": true,
-      "requires": {
-        "is-number": "^4.0.0"
-      },
-      "dependencies": {
-        "is-number": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/is-number/-/is-number-4.0.0.tgz",
-          "integrity": "sha512-rSklcAIlf1OmFdyAqbnWTLVelsQ58uvZ66S/ZyawjWqIviTWCjg2PzVGw8WUA+nNuPTqb4wgA+NszrJ+08LlgQ==",
-          "dev": true
-        }
-      }
-    },
-    "array-union": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/array-union/-/array-union-2.1.0.tgz",
-      "integrity": "sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw==",
-      "dev": true
-    },
-    "array-uniq": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/array-uniq/-/array-uniq-1.0.3.tgz",
-      "integrity": "sha512-MNha4BWQ6JbwhFhj03YK552f7cb3AzoE8SzeljgChvL1dl3IcvggXVz1DilzySZkCja+CXuZbdW7yATchWn8/Q==",
-      "dev": true
-    },
-    "array.prototype.findlastindex": {
-      "version": "1.2.2",
-      "resolved": "https://registry.npmjs.org/array.prototype.findlastindex/-/array.prototype.findlastindex-1.2.2.tgz",
-      "integrity": "sha512-tb5thFFlUcp7NdNF6/MpDk/1r/4awWG1FIz3YqDf+/zJSTezBb+/5WViH41obXULHVpDzoiCLpJ/ZO9YbJMsdw==",
-      "dev": true,
-      "requires": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.1.4",
-        "es-abstract": "^1.20.4",
-        "es-shim-unscopables": "^1.0.0",
-        "get-intrinsic": "^1.1.3"
-      }
-    },
-    "array.prototype.flat": {
-      "version": "1.3.1",
-      "resolved": "https://registry.npmjs.org/array.prototype.flat/-/array.prototype.flat-1.3.1.tgz",
-      "integrity": "sha512-roTU0KWIOmJ4DRLmwKd19Otg0/mT3qPNt0Qb3GWW8iObuZXxrjB/pzn0R3hqpRSWg4HCwqx+0vwOnWnvlOyeIA==",
-      "dev": true,
-      "requires": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.1.4",
-        "es-abstract": "^1.20.4",
-        "es-shim-unscopables": "^1.0.0"
-      }
-    },
-    "array.prototype.flatmap": {
-      "version": "1.3.1",
-      "resolved": "https://registry.npmjs.org/array.prototype.flatmap/-/array.prototype.flatmap-1.3.1.tgz",
-      "integrity": "sha512-8UGn9O1FDVvMNB0UlLv4voxRMze7+FpHyF5mSMRjWHUMlpoDViniy05870VlxhfgTnLbpuwTzvD76MTtWxB/mQ==",
-      "dev": true,
-      "requires": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.1.4",
-        "es-abstract": "^1.20.4",
-        "es-shim-unscopables": "^1.0.0"
-      }
-    },
-    "array.prototype.tosorted": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/array.prototype.tosorted/-/array.prototype.tosorted-1.1.1.tgz",
-      "integrity": "sha512-pZYPXPRl2PqWcsUs6LOMn+1f1532nEoPTYowBtqLwAW+W8vSVhkIGnmOX1t/UQjD6YGI0vcD2B1U7ZFGQH9jnQ==",
-      "dev": true,
-      "requires": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.1.4",
-        "es-abstract": "^1.20.4",
-        "es-shim-unscopables": "^1.0.0",
-        "get-intrinsic": "^1.1.3"
-      }
-    },
-    "arraybuffer.prototype.slice": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/arraybuffer.prototype.slice/-/arraybuffer.prototype.slice-1.0.1.tgz",
-      "integrity": "sha512-09x0ZWFEjj4WD8PDbykUwo3t9arLn8NIzmmYEJFpYekOAQjpkGSyrQhNoRTcwwcFRu+ycWF78QZ63oWTqSjBcw==",
-      "dev": true,
-      "requires": {
-        "array-buffer-byte-length": "^1.0.0",
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.2.0",
-        "get-intrinsic": "^1.2.1",
-        "is-array-buffer": "^3.0.2",
-        "is-shared-array-buffer": "^1.0.2"
-      }
-    },
-    "asn1.js": {
-      "version": "5.4.1",
-      "resolved": "https://registry.npmjs.org/asn1.js/-/asn1.js-5.4.1.tgz",
-      "integrity": "sha512-+I//4cYPccV8LdmBLiX8CYvf9Sp3vQsrqu2QNXRcrbiWvcx/UdlFiqUJJzxRQxgsZmvhXhn4cSKeSmoFjVdupA==",
-      "requires": {
-        "bn.js": "^4.0.0",
-        "inherits": "^2.0.1",
-        "minimalistic-assert": "^1.0.0",
-        "safer-buffer": "^2.1.0"
-      },
-      "dependencies": {
-        "bn.js": {
-          "version": "4.12.0",
-          "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.0.tgz",
-          "integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA=="
-        }
-      }
-    },
-    "assertion-error": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/assertion-error/-/assertion-error-1.1.0.tgz",
-      "integrity": "sha512-jgsaNduz+ndvGyFt3uSuWqvy4lCnIJiovtouQN5JZHOKCS2QuhEdbcQHFhVksz2N2U9hXJo8odG7ETyWlEeuDw==",
-      "dev": true
-    },
-    "ast-types-flow": {
-      "version": "0.0.7",
-      "resolved": "https://registry.npmjs.org/ast-types-flow/-/ast-types-flow-0.0.7.tgz",
-      "integrity": "sha512-eBvWn1lvIApYMhzQMsu9ciLfkBY499mFZlNqG+/9WR7PVlroQw0vG30cOQQbaKz3sCEc44TAOu2ykzqXSNnwag==",
-      "dev": true
-    },
-    "astral-regex": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/astral-regex/-/astral-regex-2.0.0.tgz",
-      "integrity": "sha512-Z7tMw1ytTXt5jqMcOP+OQteU1VuNK9Y02uuJtKQ1Sv69jXQKKg5cibLwGJow8yzZP+eAc18EmLGPal0bp36rvQ==",
-      "dev": true
-    },
-    "async": {
-      "version": "2.6.4",
-      "resolved": "https://registry.npmjs.org/async/-/async-2.6.4.tgz",
-      "integrity": "sha512-mzo5dfJYwAn29PeiJ0zvwTo04zj8HDJj0Mn8TD7sno7q12prdbnasKJHhkm2c1LgrhlJ0teaea8860oxi51mGA==",
-      "requires": {
-        "lodash": "^4.17.14"
-      }
-    },
-    "async-mutex": {
-      "version": "0.5.0",
-      "resolved": "https://registry.npmjs.org/async-mutex/-/async-mutex-0.5.0.tgz",
-      "integrity": "sha512-1A94B18jkJ3DYq284ohPxoXbfTA5HsQ7/Mf4DEhcyLx3Bz27Rh59iScbB6EPiP+B+joue6YCxcMXSbFC1tZKwA==",
-      "requires": {
-        "tslib": "^2.4.0"
-      }
-    },
-    "asynckit": {
-      "version": "0.4.0",
-      "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz",
-      "integrity": "sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q=="
-    },
-    "available-typed-arrays": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/available-typed-arrays/-/available-typed-arrays-1.0.5.tgz",
-      "integrity": "sha512-DMD0KiN46eipeziST1LPP/STfDU0sufISXmjSgvVsoU2tqxctQeASejWcfNtxYKqETM1UxQ8sp2OrSBWpHY6sw=="
-    },
-    "axe-core": {
-      "version": "4.7.2",
-      "resolved": "https://registry.npmjs.org/axe-core/-/axe-core-4.7.2.tgz",
-      "integrity": "sha512-zIURGIS1E1Q4pcrMjp+nnEh+16G56eG/MUllJH8yEvw7asDo7Ac9uhC9KIH5jzpITueEZolfYglnCGIuSBz39g==",
-      "dev": true
-    },
-    "axios": {
-      "version": "1.7.0",
-      "resolved": "https://registry.npmjs.org/axios/-/axios-1.7.0.tgz",
-      "integrity": "sha512-IiB0wQeKyPRdsFVhBgIo31FbzOyf2M6wYl7/NVutFwFBRMiAbjNiydJIHKeLmPugF4kJLfA1uWZ82Is2QzqqFA==",
-      "requires": {
-        "follow-redirects": "^1.15.6",
-        "form-data": "^4.0.0",
-        "proxy-from-env": "^1.1.0"
-      }
-    },
-    "axobject-query": {
-      "version": "3.2.1",
-      "resolved": "https://registry.npmjs.org/axobject-query/-/axobject-query-3.2.1.tgz",
-      "integrity": "sha512-jsyHu61e6N4Vbz/v18DHwWYKK0bSWLqn47eeDSKPB7m8tqMHF9YJ+mhIk2lVteyZrY8tnSj/jHOv4YiTCuCJgg==",
-      "dev": true,
-      "requires": {
-        "dequal": "^2.0.3"
-      }
-    },
-    "babel-plugin-styled-components": {
-      "version": "2.1.4",
-      "resolved": "https://registry.npmjs.org/babel-plugin-styled-components/-/babel-plugin-styled-components-2.1.4.tgz",
-      "integrity": "sha512-Xgp9g+A/cG47sUyRwwYxGM4bR/jDRg5N6it/8+HxCnbT5XNKSKDT9xm4oag/osgqjC2It/vH0yXsomOG6k558g==",
-      "requires": {
-        "@babel/helper-annotate-as-pure": "^7.22.5",
-        "@babel/helper-module-imports": "^7.22.5",
-        "@babel/plugin-syntax-jsx": "^7.22.5",
-        "lodash": "^4.17.21",
-        "picomatch": "^2.3.1"
-      }
-    },
-    "babel-runtime": {
-      "version": "6.26.0",
-      "resolved": "https://registry.npmjs.org/babel-runtime/-/babel-runtime-6.26.0.tgz",
-      "integrity": "sha512-ITKNuq2wKlW1fJg9sSW52eepoYgZBggvOAHC0u/CYu/qxQ9EVzThCgR69BnSXLHjy2f7SY5zaQ4yt7H9ZVxY2g==",
-      "requires": {
-        "core-js": "^2.4.0",
-        "regenerator-runtime": "^0.11.0"
-      },
-      "dependencies": {
-        "regenerator-runtime": {
-          "version": "0.11.1",
-          "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.11.1.tgz",
-          "integrity": "sha512-MguG95oij0fC3QV3URf4V2SDYGJhJnJGqvIIgdECeODCT98wSWDAJ94SSuVpYQUoTcGUIL6L4yNB7j1DFFHSBg=="
-        }
-      }
-    },
-    "babylon": {
-      "version": "6.18.0",
-      "resolved": "https://registry.npmjs.org/babylon/-/babylon-6.18.0.tgz",
-      "integrity": "sha512-q/UEjfGJ2Cm3oKV71DJz9d25TPnq5rhBVL2Q4fA5wcC3jcrdn7+SssEybFIxwAvvP+YCsCYNKughoF33GxgycQ==",
-      "dev": true
-    },
-    "balanced-match": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz",
-      "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw=="
-    },
-    "base-x": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/base-x/-/base-x-4.0.0.tgz",
-      "integrity": "sha512-FuwxlW4H5kh37X/oW59pwTzzTKRzfrrQwhmyspRM7swOEZcHtDZSCt45U6oKgtuFE+WYPblePMVIPR4RZrh/hw=="
-    },
-    "base58-js": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/base58-js/-/base58-js-1.0.5.tgz",
-      "integrity": "sha512-LkkAPP8Zu+c0SVNRTRVDyMfKVORThX+rCViget00xdgLRrKkClCTz1T7cIrpr69ShwV5XJuuoZvMvJ43yURwkA=="
-    },
-    "base64-js": {
-      "version": "1.5.1",
-      "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.5.1.tgz",
-      "integrity": "sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA=="
-    },
-    "base64-loader": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/base64-loader/-/base64-loader-1.0.0.tgz",
-      "integrity": "sha512-p32+F8dg+ANGx7s8QsZS74ZPHfIycmC2yZcoerzFgbersIYWitPbbF39G6SBx3gyvzyLH5nt1ooocxr0IHuWKA==",
-      "dev": true
-    },
-    "base64url": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/base64url/-/base64url-3.0.1.tgz",
-      "integrity": "sha512-ir1UPr3dkwexU7FdV8qBBbNDRUhMmIekYMFZfi+C/sLNnRESKPl23nB9b2pltqfOQNnGzsDdId90AEtG5tCx4A=="
-    },
-    "batch": {
-      "version": "0.6.1",
-      "resolved": "https://registry.npmjs.org/batch/-/batch-0.6.1.tgz",
-      "integrity": "sha512-x+VAiMRL6UPkx+kudNvxTl6hB2XNNCG2r+7wixVfIYwu/2HKRXimwQyaumLjMveWvT2Hkd/cAJw+QBMfJ/EKVw==",
-      "dev": true
-    },
-    "bech32": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/bech32/-/bech32-2.0.0.tgz",
-      "integrity": "sha512-LcknSilhIGatDAsY1ak2I8VtGaHNhgMSYVxFrGLXv+xLHytaKZKcaUJJUE7qmBr7h33o5YQwP55pMI0xmkpJwg=="
-    },
-    "big-integer": {
-      "version": "1.6.51",
-      "resolved": "https://registry.npmjs.org/big-integer/-/big-integer-1.6.51.tgz",
-      "integrity": "sha512-GPEid2Y9QU1Exl1rpO9B2IPJGHPSupF5GnVIP0blYvNOMer2bTvSWs1jGOUg04hTmu67nmLsQ9TBo1puaotBHg=="
-    },
-    "big.js": {
-      "version": "5.2.2",
-      "resolved": "https://registry.npmjs.org/big.js/-/big.js-5.2.2.tgz",
-      "integrity": "sha512-vyL2OymJxmarO8gxMr0mhChsO9QGwhynfuu4+MHTAW6czfq9humCB7rKpUjDd9YUiDPU4mzpyupFSvOClAwbmQ==",
-      "dev": true
-    },
-    "bignumber.js": {
-      "version": "9.1.1",
-      "resolved": "https://registry.npmjs.org/bignumber.js/-/bignumber.js-9.1.1.tgz",
-      "integrity": "sha512-pHm4LsMJ6lzgNGVfZHjMoO8sdoRhOzOH4MLmY65Jg70bpxCKu5iOHNJyfF6OyvYw7t8Fpf35RuzUyqnQsj8Vig=="
-    },
-    "binary-extensions": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.2.0.tgz",
-      "integrity": "sha512-jDctJ/IVQbZoJykoeHbhXpOlNBqGNcwXJKJog42E5HDPUwQTSdjCHdihjj0DlnheQ7blbT6dHOafNAiS8ooQKA==",
-      "dev": true
-    },
-    "bindings": {
-      "version": "1.5.0",
-      "resolved": "https://registry.npmjs.org/bindings/-/bindings-1.5.0.tgz",
-      "integrity": "sha512-p2q/t/mhvuOj/UeLlV6566GD/guowlr0hHxClI0W9m7MWYkL1F0hLo+0Aexs9HSPCtR1SXQ0TD3MMKrXZajbiQ==",
-      "requires": {
-        "file-uri-to-path": "1.0.0"
-      }
-    },
-    "bip174": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/bip174/-/bip174-2.1.1.tgz",
-      "integrity": "sha512-mdFV5+/v0XyNYXjBS6CQPLo9ekCx4gtKZFnJm5PMto7Fs9hTTDpkkzOB7/FtluRI6JbUUAu+snTYfJRgHLZbZQ=="
-    },
-    "bip32": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/bip32/-/bip32-4.0.0.tgz",
-      "integrity": "sha512-aOGy88DDlVUhspIXJN+dVEtclhIsfAUppD43V0j40cPTld3pv/0X/MlrZSZ6jowIaQQzFwP8M6rFU2z2mVYjDQ==",
-      "requires": {
-        "@noble/hashes": "^1.2.0",
-        "@scure/base": "^1.1.1",
-        "typeforce": "^1.11.5",
-        "wif": "^2.0.6"
-      }
-    },
-    "bip32-path": {
-      "version": "0.4.2",
-      "resolved": "https://registry.npmjs.org/bip32-path/-/bip32-path-0.4.2.tgz",
-      "integrity": "sha512-ZBMCELjJfcNMkz5bDuJ1WrYvjlhEF5k6mQ8vUr4N7MbVRsXei7ZOg8VhhwMfNiW68NWmLkgkc6WvTickrLGprQ=="
-    },
-    "bip39": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/bip39/-/bip39-3.1.0.tgz",
-      "integrity": "sha512-c9kiwdk45Do5GL0vJMe7tS95VjCii65mYAH7DfWl3uW8AVzXKQVUm64i3hzVybBDMp9r7j9iNxR85+ul8MdN/A==",
-      "requires": {
-        "@noble/hashes": "^1.2.0"
-      }
-    },
-    "bip66": {
-      "version": "1.1.5",
-      "resolved": "https://registry.npmjs.org/bip66/-/bip66-1.1.5.tgz",
-      "integrity": "sha512-nemMHz95EmS38a26XbbdxIYj5csHd3RMP3H5bwQknX0WYHF01qhpufP42mLOwVICuH2JmhIhXiWs89MfUGL7Xw==",
-      "requires": {
-        "safe-buffer": "^5.0.1"
-      }
-    },
-    "bip68": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/bip68/-/bip68-1.0.4.tgz",
-      "integrity": "sha512-O1htyufFTYy3EO0JkHg2CLykdXEtV2ssqw47Gq9A0WByp662xpJnMEB9m43LZjsSDjIAOozWRExlFQk2hlV1XQ=="
-    },
-    "bitcoin-address-validation": {
-      "version": "2.2.3",
-      "resolved": "https://registry.npmjs.org/bitcoin-address-validation/-/bitcoin-address-validation-2.2.3.tgz",
-      "integrity": "sha512-1uGCGl26Ye8JG5qcExtFLQfuib6qEZWNDo1ZlLlwp/z7ygUFby3IxolgEfgMGaC+LG9csbVASLcH8fRLv7DIOg==",
-      "requires": {
-        "base58-js": "^1.0.0",
-        "bech32": "^2.0.0",
-        "sha256-uint8array": "^0.10.3"
-      }
-    },
-    "bitcoinjs-lib": {
-      "version": "6.1.6",
-      "resolved": "https://registry.npmjs.org/bitcoinjs-lib/-/bitcoinjs-lib-6.1.6.tgz",
-      "integrity": "sha512-Fk8+Vc+e2rMoDU5gXkW9tD+313rhkm5h6N9HfZxXvYU9LedttVvmXKTgd9k5rsQJjkSfsv6XRM8uhJv94SrvcA==",
-      "requires": {
-        "@noble/hashes": "^1.2.0",
-        "bech32": "^2.0.0",
-        "bip174": "^2.1.1",
-        "bs58check": "^3.0.1",
-        "typeforce": "^1.11.3",
-        "varuint-bitcoin": "^1.1.2"
-      }
-    },
-    "bitcoinjs-message": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/bitcoinjs-message/-/bitcoinjs-message-2.2.0.tgz",
-      "integrity": "sha512-103Wy3xg8Y9o+pdhGP4M3/mtQQuUWs6sPuOp1mYphSUoSMHjHTlkj32K4zxU8qMH0Ckv23emfkGlFWtoWZ7YFA==",
-      "requires": {
-        "bech32": "^1.1.3",
-        "bs58check": "^2.1.2",
-        "buffer-equals": "^1.0.3",
-        "create-hash": "^1.1.2",
-        "secp256k1": "^3.0.1",
-        "varuint-bitcoin": "^1.0.1"
-      },
-      "dependencies": {
-        "base-x": {
-          "version": "3.0.10",
-          "resolved": "https://registry.npmjs.org/base-x/-/base-x-3.0.10.tgz",
-          "integrity": "sha512-7d0s06rR9rYaIWHkpfLIFICM/tkSVdoPC9qYAQRpxn9DdKNWNsKC0uk++akckyLq16Tx2WIinnZ6WRriAt6njQ==",
-          "requires": {
-            "safe-buffer": "^5.0.1"
-          }
-        },
-        "bech32": {
-          "version": "1.1.4",
-          "resolved": "https://registry.npmjs.org/bech32/-/bech32-1.1.4.tgz",
-          "integrity": "sha512-s0IrSOzLlbvX7yp4WBfPITzpAU8sqQcpsmwXDiKwrG4r491vwCO/XpejasRNl0piBMe/DvP4Tz0mIS/X1DPJBQ=="
-        },
-        "bs58": {
-          "version": "4.0.1",
-          "resolved": "https://registry.npmjs.org/bs58/-/bs58-4.0.1.tgz",
-          "integrity": "sha512-Ok3Wdf5vOIlBrgCvTq96gBkJw+JUEzdBgyaza5HLtPm7yTHkjRy8+JzNyHF7BHa0bNWOQIp3m5YF0nnFcOIKLw==",
-          "requires": {
-            "base-x": "^3.0.2"
-          }
-        },
-        "bs58check": {
-          "version": "2.1.2",
-          "resolved": "https://registry.npmjs.org/bs58check/-/bs58check-2.1.2.tgz",
-          "integrity": "sha512-0TS1jicxdU09dwJMNZtVAfzPi6Q6QeN0pM1Fkzrjn+XYHvzMKPU3pHVpva+769iNVSfIYWf7LJ6WR+BuuMf8cA==",
-          "requires": {
-            "bs58": "^4.0.0",
-            "create-hash": "^1.1.0",
-            "safe-buffer": "^5.1.2"
-          }
-        }
-      }
-    },
-    "bn.js": {
-      "version": "5.2.1",
-      "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-5.2.1.tgz",
-      "integrity": "sha512-eXRvHzWyYPBuB4NBy0cmYQjGitUrtqwbvlzP3G6VFnNRbsZQIxQ10PbKKHt8gZ/HW/D/747aDl+QkDqg3KQLMQ=="
-    },
-    "body-parser": {
-      "version": "1.20.1",
-      "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.20.1.tgz",
-      "integrity": "sha512-jWi7abTbYwajOytWCQc37VulmWiRae5RyTpaCyDcS5/lMdtwSz5lOpDE67srw/HYe35f1z3fDQw+3txg7gNtWw==",
-      "dev": true,
-      "requires": {
-        "bytes": "3.1.2",
-        "content-type": "~1.0.4",
-        "debug": "2.6.9",
-        "depd": "2.0.0",
-        "destroy": "1.2.0",
-        "http-errors": "2.0.0",
-        "iconv-lite": "0.4.24",
-        "on-finished": "2.4.1",
-        "qs": "6.11.0",
-        "raw-body": "2.5.1",
-        "type-is": "~1.6.18",
-        "unpipe": "1.0.0"
-      },
-      "dependencies": {
-        "bytes": {
-          "version": "3.1.2",
-          "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.1.2.tgz",
-          "integrity": "sha512-/Nf7TyzTx6S3yRJObOAV7956r8cr2+Oj8AC5dt8wSP3BQAoeX58NoHyCU8P8zGkNXStjTSi6fzO6F0pBdcYbEg==",
-          "dev": true
-        },
-        "debug": {
-          "version": "2.6.9",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-          "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
-          "dev": true,
-          "requires": {
-            "ms": "2.0.0"
-          }
-        },
-        "iconv-lite": {
-          "version": "0.4.24",
-          "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz",
-          "integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==",
-          "dev": true,
-          "requires": {
-            "safer-buffer": ">= 2.1.2 < 3"
-          }
-        },
-        "ms": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-          "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==",
-          "dev": true
-        },
-        "qs": {
-          "version": "6.11.0",
-          "resolved": "https://registry.npmjs.org/qs/-/qs-6.11.0.tgz",
-          "integrity": "sha512-MvjoMCJwEarSbUYk5O+nmoSzSutSsTwF85zcHPQ9OrlFoZOYIjaqBAJIqIXjptyD5vThxGq52Xu/MaJzRkIk4Q==",
-          "dev": true,
-          "requires": {
-            "side-channel": "^1.0.4"
-          }
-        }
-      }
-    },
-    "bonjour-service": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/bonjour-service/-/bonjour-service-1.1.1.tgz",
-      "integrity": "sha512-Z/5lQRMOG9k7W+FkeGTNjh7htqn/2LMnfOvBZ8pynNZCM9MwkQkI3zeI4oz09uWdcgmgHugVvBqxGg4VQJ5PCg==",
-      "dev": true,
-      "requires": {
-        "array-flatten": "^2.1.2",
-        "dns-equal": "^1.0.0",
-        "fast-deep-equal": "^3.1.3",
-        "multicast-dns": "^7.2.5"
-      }
-    },
-    "boolbase": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/boolbase/-/boolbase-1.0.0.tgz",
-      "integrity": "sha512-JZOSA7Mo9sNGB8+UjSgzdLtokWAky1zbztM3WRLCbZ70/3cTANmQmOdR7y2g+J0e2WXywy1yS468tY+IruqEww==",
-      "dev": true
-    },
-    "brace-expansion": {
-      "version": "1.1.11",
-      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
-      "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
-      "requires": {
-        "balanced-match": "^1.0.0",
-        "concat-map": "0.0.1"
-      }
-    },
-    "braces": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz",
-      "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==",
-      "dev": true,
-      "requires": {
-        "fill-range": "^7.0.1"
-      }
-    },
-    "broadcast-channel": {
-      "version": "2.3.4",
-      "resolved": "https://registry.npmjs.org/broadcast-channel/-/broadcast-channel-2.3.4.tgz",
-      "integrity": "sha512-cx1/dSb6KZ9HW1VtlqM/HLPjrdyzkKoteVmUpLXEpra00mDQW/F9ieDkoavuZMoh9/hC/6OplGzCERsZBfz/Wg==",
-      "dev": true,
-      "requires": {
-        "@babel/runtime": "^7.6.2",
-        "detect-node": "^2.0.4",
-        "js-sha3": "0.8.0",
-        "microseconds": "0.1.0",
-        "nano-time": "1.0.0",
-        "rimraf": "2.6.3",
-        "unload": "2.2.0"
-      },
-      "dependencies": {
-        "rimraf": {
-          "version": "2.6.3",
-          "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.6.3.tgz",
-          "integrity": "sha512-mwqeW5XsA2qAejG46gYdENaxXjx9onRNCfn7L0duuP4hCuTIi/QO7PDK07KJfp1d+izWPrzEJDcSqBa0OZQriA==",
-          "dev": true,
-          "requires": {
-            "glob": "^7.1.3"
-          }
-        }
-      }
-    },
-    "brorand": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/brorand/-/brorand-1.1.0.tgz",
-      "integrity": "sha512-cKV8tMCEpQs4hK/ik71d6LrPOnpkpGBR0wzxqr68g2m/LB2GxVYQroAjMJZRVM1Y4BCjCKc3vAamxSzOY2RP+w=="
-    },
-    "browserify-aes": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/browserify-aes/-/browserify-aes-1.2.0.tgz",
-      "integrity": "sha512-+7CHXqGuspUn/Sl5aO7Ea0xWGAtETPXNSAjHo48JfLdPWcMng33Xe4znFvQweqc/uzk5zSOI3H52CYnjCfb5hA==",
-      "requires": {
-        "buffer-xor": "^1.0.3",
-        "cipher-base": "^1.0.0",
-        "create-hash": "^1.1.0",
-        "evp_bytestokey": "^1.0.3",
-        "inherits": "^2.0.1",
-        "safe-buffer": "^5.0.1"
-      }
-    },
-    "browserify-cipher": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/browserify-cipher/-/browserify-cipher-1.0.1.tgz",
-      "integrity": "sha512-sPhkz0ARKbf4rRQt2hTpAHqn47X3llLkUGn+xEJzLjwY8LRs2p0v7ljvI5EyoRO/mexrNunNECisZs+gw2zz1w==",
-      "requires": {
-        "browserify-aes": "^1.0.4",
-        "browserify-des": "^1.0.0",
-        "evp_bytestokey": "^1.0.0"
-      }
-    },
-    "browserify-des": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/browserify-des/-/browserify-des-1.0.2.tgz",
-      "integrity": "sha512-BioO1xf3hFwz4kc6iBhI3ieDFompMhrMlnDFC4/0/vd5MokpuAc3R+LYbwTA9A5Yc9pq9UYPqffKpW2ObuwX5A==",
-      "requires": {
-        "cipher-base": "^1.0.1",
-        "des.js": "^1.0.0",
-        "inherits": "^2.0.1",
-        "safe-buffer": "^5.1.2"
-      }
-    },
-    "browserify-rsa": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/browserify-rsa/-/browserify-rsa-4.1.0.tgz",
-      "integrity": "sha512-AdEER0Hkspgno2aR97SAf6vi0y0k8NuOpGnVH3O99rcA5Q6sh8QxcngtHuJ6uXwnfAXNM4Gn1Gb7/MV1+Ymbog==",
-      "requires": {
-        "bn.js": "^5.0.0",
-        "randombytes": "^2.0.1"
-      }
-    },
-    "browserify-sign": {
-      "version": "4.2.2",
-      "resolved": "https://registry.npmjs.org/browserify-sign/-/browserify-sign-4.2.2.tgz",
-      "integrity": "sha512-1rudGyeYY42Dk6texmv7c4VcQ0EsvVbLwZkA+AQB7SxvXxmcD93jcHie8bzecJ+ChDlmAm2Qyu0+Ccg5uhZXCg==",
-      "requires": {
-        "bn.js": "^5.2.1",
-        "browserify-rsa": "^4.1.0",
-        "create-hash": "^1.2.0",
-        "create-hmac": "^1.1.7",
-        "elliptic": "^6.5.4",
-        "inherits": "^2.0.4",
-        "parse-asn1": "^5.1.6",
-        "readable-stream": "^3.6.2",
-        "safe-buffer": "^5.2.1"
-      }
-    },
-    "browserslist": {
-      "version": "4.22.1",
-      "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.22.1.tgz",
-      "integrity": "sha512-FEVc202+2iuClEhZhrWy6ZiAcRLvNMyYcxZ8raemul1DYVOVdFsbqckWLdsixQZCpJlwe77Z3UTalE7jsjnKfQ==",
-      "requires": {
-        "caniuse-lite": "^1.0.30001541",
-        "electron-to-chromium": "^1.4.535",
-        "node-releases": "^2.0.13",
-        "update-browserslist-db": "^1.0.13"
-      }
-    },
-    "bs58": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/bs58/-/bs58-5.0.0.tgz",
-      "integrity": "sha512-r+ihvQJvahgYT50JD05dyJNKlmmSlMoOGwn1lCcEzanPglg7TxYjioQUYehQ9mAR/+hOSd2jRc/Z2y5UxBymvQ==",
-      "requires": {
-        "base-x": "^4.0.0"
-      }
-    },
-    "bs58check": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/bs58check/-/bs58check-3.0.1.tgz",
-      "integrity": "sha512-hjuuJvoWEybo7Hn/0xOrczQKKEKD63WguEjlhLExYs2wUBcebDC1jDNK17eEAD2lYfw82d5ASC1d7K3SWszjaQ==",
-      "requires": {
-        "@noble/hashes": "^1.2.0",
-        "bs58": "^5.0.0"
-      }
-    },
-    "buffer": {
-      "version": "6.0.3",
-      "resolved": "https://registry.npmjs.org/buffer/-/buffer-6.0.3.tgz",
-      "integrity": "sha512-FTiCpNxtwiZZHEZbcbTIcZjERVICn9yq/pDFkTl95/AxzD1naBctN7YO68riM/gLSDY7sdrMby8hofADYuuqOA==",
-      "requires": {
-        "base64-js": "^1.3.1",
-        "ieee754": "^1.2.1"
-      }
-    },
-    "buffer-equals": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/buffer-equals/-/buffer-equals-1.0.4.tgz",
-      "integrity": "sha512-99MsCq0j5+RhubVEtKQgKaD6EM+UP3xJgIvQqwJ3SOLDUekzxMX1ylXBng+Wa2sh7mGT0W6RUly8ojjr1Tt6nA=="
-    },
-    "buffer-from": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.2.tgz",
-      "integrity": "sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ==",
-      "dev": true
-    },
-    "buffer-xor": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/buffer-xor/-/buffer-xor-1.0.3.tgz",
-      "integrity": "sha512-571s0T7nZWK6vB67HI5dyUF7wXiNcfaPPPTl6zYCNApANjIvYJTg7hlud/+cJpdAhS7dVzqMLmfhfHR3rAcOjQ=="
-    },
-    "bytes": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.0.0.tgz",
-      "integrity": "sha512-pMhOfFDPiv9t5jjIXkHosWmkSyQbvsgEVNkz0ERHbuLh2T/7j4Mqqpz523Fe8MVY89KC6Sh/QfS2sM+SjgFDcw==",
-      "dev": true
-    },
-    "c32check": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/c32check/-/c32check-2.0.0.tgz",
-      "integrity": "sha512-rpwfAcS/CMqo0oCqDf3r9eeLgScRE3l/xHDCXhM3UyrfvIn7PrLq63uHh7yYbv8NzaZn5MVsVhIRpQ+5GZ5HyA==",
-      "requires": {
-        "@noble/hashes": "^1.1.2",
-        "base-x": "^4.0.0"
-      }
-    },
-    "cac": {
-      "version": "6.7.14",
-      "resolved": "https://registry.npmjs.org/cac/-/cac-6.7.14.tgz",
-      "integrity": "sha512-b6Ilus+c3RrdDk+JhLKUAQfzzgLEPy6wcXqS7f/xe1EETvsDP6GORG7SFuOs6cID5YkqchW/LXZbX5bc8j7ZcQ==",
-      "dev": true
-    },
-    "call-bind": {
-      "version": "1.0.7",
-      "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.7.tgz",
-      "integrity": "sha512-GHTSNSYICQ7scH7sZ+M2rFopRoLh8t2bLSW6BbgrtLsahOIB5iyAVJf9GjWK3cYTDaMj4XdBpM1cA6pIS0Kv2w==",
-      "requires": {
-        "es-define-property": "^1.0.0",
-        "es-errors": "^1.3.0",
-        "function-bind": "^1.1.2",
-        "get-intrinsic": "^1.2.4",
-        "set-function-length": "^1.2.1"
-      }
-    },
-    "callsites": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz",
-      "integrity": "sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==",
-      "dev": true
-    },
-    "camel-case": {
-      "version": "4.1.2",
-      "resolved": "https://registry.npmjs.org/camel-case/-/camel-case-4.1.2.tgz",
-      "integrity": "sha512-gxGWBrTT1JuMx6R+o5PTXMmUnhnVzLQ9SNutD4YqKtI6ap897t3tKECYla6gCWEkplXnlNybEkZg9GEGxKFCgw==",
-      "dev": true,
-      "requires": {
-        "pascal-case": "^3.1.2",
-        "tslib": "^2.0.3"
-      }
-    },
-    "camelize": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/camelize/-/camelize-1.0.1.tgz",
-      "integrity": "sha512-dU+Tx2fsypxTgtLoE36npi3UqcjSSMNYfkqgmoEhtZrraP5VWq0K7FkWVTYa8eMPtnU/G2txVsfdCJTn9uzpuQ=="
-    },
-    "caniuse-lite": {
-      "version": "1.0.30001559",
-      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001559.tgz",
-      "integrity": "sha512-cPiMKZgqgkg5LY3/ntGeLFUpi6tzddBNS58A4tnTgQw1zON7u2sZMU7SzOeVH4tj20++9ggL+V6FDOFMTaFFYA=="
-    },
-    "chai": {
-      "version": "4.3.10",
-      "resolved": "https://registry.npmjs.org/chai/-/chai-4.3.10.tgz",
-      "integrity": "sha512-0UXG04VuVbruMUYbJ6JctvH0YnC/4q3/AkT18q4NaITo91CUm0liMS9VqzT9vZhVQ/1eqPanMWjBM+Juhfb/9g==",
-      "dev": true,
-      "requires": {
-        "assertion-error": "^1.1.0",
-        "check-error": "^1.0.3",
-        "deep-eql": "^4.1.3",
-        "get-func-name": "^2.0.2",
-        "loupe": "^2.3.6",
-        "pathval": "^1.1.1",
-        "type-detect": "^4.0.8"
-      }
-    },
-    "chalk": {
-      "version": "2.4.2",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
-      "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
-      "requires": {
-        "ansi-styles": "^3.2.1",
-        "escape-string-regexp": "^1.0.5",
-        "supports-color": "^5.3.0"
-      }
-    },
-    "check-error": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/check-error/-/check-error-1.0.3.tgz",
-      "integrity": "sha512-iKEoDYaRmd1mxM90a2OEfWhjsjPpYPuQ+lMYsoxB126+t8fw7ySEO48nmDg5COTjxDI65/Y2OWpeEHk3ZOe8zg==",
-      "dev": true,
-      "requires": {
-        "get-func-name": "^2.0.2"
-      }
-    },
-    "chokidar": {
-      "version": "3.5.3",
-      "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.5.3.tgz",
-      "integrity": "sha512-Dr3sfKRP6oTcjf2JmUmFJfeVMvXBdegxB0iVQ5eb2V10uFJUCAS8OByZdVAyVb8xXNz3GjjTgj9kLWsZTqE6kw==",
-      "dev": true,
-      "requires": {
-        "anymatch": "~3.1.2",
-        "braces": "~3.0.2",
-        "fsevents": "~2.3.2",
-        "glob-parent": "~5.1.2",
-        "is-binary-path": "~2.1.0",
-        "is-glob": "~4.0.1",
-        "normalize-path": "~3.0.0",
-        "readdirp": "~3.6.0"
-      },
-      "dependencies": {
-        "glob-parent": {
-          "version": "5.1.2",
-          "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz",
-          "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==",
-          "dev": true,
-          "requires": {
-            "is-glob": "^4.0.1"
-          }
-        }
-      }
-    },
-    "chrome-trace-event": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/chrome-trace-event/-/chrome-trace-event-1.0.3.tgz",
-      "integrity": "sha512-p3KULyQg4S7NIHixdwbGX+nFHkoBiA4YQmyWtjb8XngSKV124nJmRysgAeujbUVb15vh+RvFUfCPqU7rXk+hZg==",
-      "dev": true
-    },
-    "cipher-base": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/cipher-base/-/cipher-base-1.0.4.tgz",
-      "integrity": "sha512-Kkht5ye6ZGmwv40uUDZztayT2ThLQGfnj/T71N/XzeZeo3nf8foyW7zGTsPYkEya3m5f3cAypH+qe7YOrM1U2Q==",
-      "requires": {
-        "inherits": "^2.0.1",
-        "safe-buffer": "^5.0.1"
-      }
-    },
-    "clarity-codegen": {
-      "version": "0.3.6",
-      "resolved": "https://registry.npmjs.org/clarity-codegen/-/clarity-codegen-0.3.6.tgz",
-      "integrity": "sha512-Be1J8RFtPFGfWtQ/7enl3xkU1j2KkIS9W7RbuofIVYfKp11MCZSGQeNV+Gh0dQOQIs3O0WQLLg03ikyNaWtYzQ==",
-      "requires": {
-        "@stacks/stacks-blockchain-api-types": "^7.1.10",
-        "axios": "^1.5.0",
-        "lodash": "^4.17.21",
-        "yargs": "^17.7.2",
-        "yqueue": "^1.0.1"
-      },
-      "dependencies": {
-        "@stacks/stacks-blockchain-api-types": {
-          "version": "7.9.0",
-          "resolved": "https://registry.npmjs.org/@stacks/stacks-blockchain-api-types/-/stacks-blockchain-api-types-7.9.0.tgz",
-          "integrity": "sha512-29tcIOxEj0jIAVrMLH2hDuTM0wWtOT4z9EnNgOCEQvipEDPyvoaPjbYJmQUTxzvVjfoLjZAQsvTlJw7fnbkkrg=="
-        }
-      }
-    },
-    "classnames": {
-      "version": "2.3.2",
-      "resolved": "https://registry.npmjs.org/classnames/-/classnames-2.3.2.tgz",
-      "integrity": "sha512-CSbhY4cFEJRe6/GQzIk5qXZ4Jeg5pcsP7b5peFSDpffpe1cqjASH/n9UTjBwOp6XpMSTwQ8Za2K5V02ueA7Tmw=="
-    },
-    "clean-css": {
-      "version": "5.3.2",
-      "resolved": "https://registry.npmjs.org/clean-css/-/clean-css-5.3.2.tgz",
-      "integrity": "sha512-JVJbM+f3d3Q704rF4bqQ5UUyTtuJ0JRKNbTKVEeujCCBoMdkEi+V+e8oktO9qGQNSvHrFTM6JZRXrUvGR1czww==",
-      "dev": true,
-      "requires": {
-        "source-map": "~0.6.0"
-      },
-      "dependencies": {
-        "source-map": {
-          "version": "0.6.1",
-          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-          "dev": true
-        }
-      }
-    },
-    "clean-stack": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/clean-stack/-/clean-stack-2.2.0.tgz",
-      "integrity": "sha512-4diC9HaTE+KRAMWhDhrGOECgWZxoevMc5TlkObMqNSsVU62PYzXZ/SMTjzyGAFF1YusgxGcSWTEXBhp0CPwQ1A==",
-      "dev": true
-    },
-    "clean-webpack-plugin": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/clean-webpack-plugin/-/clean-webpack-plugin-4.0.0.tgz",
-      "integrity": "sha512-WuWE1nyTNAyW5T7oNyys2EN0cfP2fdRxhxnIQWiAp0bMabPdHhoGxM8A6YL2GhqwgrPnnaemVE7nv5XJ2Fhh2w==",
-      "dev": true,
-      "requires": {
-        "del": "^4.1.1"
-      }
-    },
-    "cli-cursor": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-3.1.0.tgz",
-      "integrity": "sha512-I/zHAwsKf9FqGoXM4WWRACob9+SNukZTd94DWF57E4toouRulbCxcUh6RKUEOQlYTHJnzkPMySvPNaaSLNfLZw==",
-      "dev": true,
-      "requires": {
-        "restore-cursor": "^3.1.0"
-      }
-    },
-    "cli-truncate": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/cli-truncate/-/cli-truncate-3.1.0.tgz",
-      "integrity": "sha512-wfOBkjXteqSnI59oPcJkcPl/ZmwvMMOj340qUIY1SKZCv0B9Cf4D4fAucRkIKQmsIuYK3x1rrgU7MeGRruiuiA==",
-      "dev": true,
-      "requires": {
-        "slice-ansi": "^5.0.0",
-        "string-width": "^5.0.0"
-      }
-    },
-    "cliui": {
-      "version": "8.0.1",
-      "resolved": "https://registry.npmjs.org/cliui/-/cliui-8.0.1.tgz",
-      "integrity": "sha512-BSeNnyus75C4//NQ9gQt1/csTXyo/8Sb+afLAkzAptFuMsod9HFokGNudZpi/oQV73hnVK+sR+5PVRMd+Dr7YQ==",
-      "requires": {
-        "string-width": "^4.2.0",
-        "strip-ansi": "^6.0.1",
-        "wrap-ansi": "^7.0.0"
-      },
-      "dependencies": {
-        "emoji-regex": {
-          "version": "8.0.0",
-          "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
-          "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A=="
-        },
-        "is-fullwidth-code-point": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
-          "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg=="
-        },
-        "string-width": {
-          "version": "4.2.3",
-          "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
-          "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
-          "requires": {
-            "emoji-regex": "^8.0.0",
-            "is-fullwidth-code-point": "^3.0.0",
-            "strip-ansi": "^6.0.1"
-          }
-        }
-      }
-    },
-    "clone": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/clone/-/clone-1.0.4.tgz",
-      "integrity": "sha512-JQHZ2QMW6l3aH/j6xCqQThY/9OH4D/9ls34cgkUBiEeocRTU04tHfKPBsUK1PqZCUQM7GiA0IIXJSuXHI64Kbg==",
-      "dev": true,
-      "optional": true
-    },
-    "clsx": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/clsx/-/clsx-2.0.0.tgz",
-      "integrity": "sha512-rQ1+kcj+ttHG0MKVGBUXwayCCF1oh39BF5COIpRzuCEv8Mwjv0XucrI2ExNTOn9IlLifGClWQcU9BrZORvtw6Q=="
-    },
-    "color-convert": {
-      "version": "1.9.3",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
-      "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
-      "requires": {
-        "color-name": "1.1.3"
-      }
-    },
-    "color-name": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
-      "integrity": "sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw=="
-    },
-    "colorette": {
-      "version": "2.0.20",
-      "resolved": "https://registry.npmjs.org/colorette/-/colorette-2.0.20.tgz",
-      "integrity": "sha512-IfEDxwoWIjkeXL1eXcDiow4UbKjhLdq6/EuSVR9GMN7KVH3r9gQ83e73hsz1Nd1T3ijd5xv1wcWRYO+D6kCI2w==",
-      "dev": true
-    },
-    "colornames": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/colornames/-/colornames-1.1.1.tgz",
-      "integrity": "sha512-/pyV40IrsdulWv+wFPmERh9k/mjsPZ64yUMDmWrtj/k1nmgrzzIENWKdaVKyBbvFdQWqkcaRxr+polCo3VMe7A=="
-    },
-    "combined-stream": {
-      "version": "1.0.8",
-      "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz",
-      "integrity": "sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==",
-      "requires": {
-        "delayed-stream": "~1.0.0"
-      }
-    },
-    "commander": {
-      "version": "10.0.1",
-      "resolved": "https://registry.npmjs.org/commander/-/commander-10.0.1.tgz",
-      "integrity": "sha512-y4Mg2tXshplEbSGzx7amzPwKKOCGuoSRP/CjEdwwk0FOGlUbq6lKuoyDZTNZkmxHdJtp54hdfY/JUrdL7Xfdug==",
-      "dev": true
-    },
-    "common-path-prefix": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/common-path-prefix/-/common-path-prefix-3.0.0.tgz",
-      "integrity": "sha512-QE33hToZseCH3jS0qN96O/bSh3kaw/h+Tq7ngyY9eWDUnTlTNUyqfqvCXioLe5Na5jFsL78ra/wuBU4iuEgd4w==",
-      "dev": true
-    },
-    "compose-function": {
-      "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/compose-function/-/compose-function-3.0.3.tgz",
-      "integrity": "sha512-xzhzTJ5eC+gmIzvZq+C3kCJHsp9os6tJkrigDRZclyGtOKINbZtE8n1Tzmeh32jW+BUDPbvZpibwvJHBLGMVwg==",
-      "dev": true,
-      "requires": {
-        "arity-n": "^1.0.4"
-      }
-    },
-    "compressible": {
-      "version": "2.0.18",
-      "resolved": "https://registry.npmjs.org/compressible/-/compressible-2.0.18.tgz",
-      "integrity": "sha512-AF3r7P5dWxL8MxyITRMlORQNaOA2IkAFaTr4k7BUumjPtRpGDTZpl0Pb1XCO6JeDCBdp126Cgs9sMxqSjgYyRg==",
-      "dev": true,
-      "requires": {
-        "mime-db": ">= 1.43.0 < 2"
-      }
-    },
-    "compression": {
-      "version": "1.7.4",
-      "resolved": "https://registry.npmjs.org/compression/-/compression-1.7.4.tgz",
-      "integrity": "sha512-jaSIDzP9pZVS4ZfQ+TzvtiWhdpFhE2RDHz8QJkpX9SIpLq88VueF5jJw6t+6CUQcAoA6t+x89MLrWAqpfDE8iQ==",
-      "dev": true,
-      "requires": {
-        "accepts": "~1.3.5",
-        "bytes": "3.0.0",
-        "compressible": "~2.0.16",
-        "debug": "2.6.9",
-        "on-headers": "~1.0.2",
-        "safe-buffer": "5.1.2",
-        "vary": "~1.1.2"
-      },
-      "dependencies": {
-        "debug": {
-          "version": "2.6.9",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-          "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
-          "dev": true,
-          "requires": {
-            "ms": "2.0.0"
-          }
-        },
-        "ms": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-          "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==",
-          "dev": true
-        },
-        "safe-buffer": {
-          "version": "5.1.2",
-          "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
-          "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==",
-          "dev": true
-        }
-      }
-    },
-    "concat-map": {
-      "version": "0.0.1",
-      "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
-      "integrity": "sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg=="
-    },
-    "confusing-browser-globals": {
-      "version": "1.0.11",
-      "resolved": "https://registry.npmjs.org/confusing-browser-globals/-/confusing-browser-globals-1.0.11.tgz",
-      "integrity": "sha512-JsPKdmh8ZkmnHxDk55FZ1TqVLvEQTvoByJZRN9jzI0UjxK/QgAmsphz7PGtqgPieQZ/CQcHWXCR7ATDNhGe+YA==",
-      "dev": true
-    },
-    "connect-history-api-fallback": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/connect-history-api-fallback/-/connect-history-api-fallback-2.0.0.tgz",
-      "integrity": "sha512-U73+6lQFmfiNPrYbXqr6kZ1i1wiRqXnp2nhMsINseWXO8lDau0LGEffJ8kQi4EjLZympVgRdvqjAgiZ1tgzDDA==",
-      "dev": true
-    },
-    "content-disposition": {
-      "version": "0.5.4",
-      "resolved": "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.4.tgz",
-      "integrity": "sha512-FveZTNuGw04cxlAiWbzi6zTAL/lhehaWbTtgluJh4/E95DqMwTmha3KZN1aAWA8cFIhHzMZUvLevkw5Rqk+tSQ==",
-      "dev": true,
-      "requires": {
-        "safe-buffer": "5.2.1"
-      }
-    },
-    "content-type": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/content-type/-/content-type-1.0.5.tgz",
-      "integrity": "sha512-nTjqfcBFEipKdXCv4YDQWCfmcLZKm81ldF0pAopTvyrFGVbcR6P/VAAd5G7N+0tTr8QqiU0tFadD6FK4NtJwOA==",
-      "dev": true
-    },
-    "cookie": {
-      "version": "0.5.0",
-      "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.5.0.tgz",
-      "integrity": "sha512-YZ3GUyn/o8gfKJlnlX7g7xq4gyO6OSuhGPKaaGssGB2qgDUS0gPgtTvoyZLTt9Ab6dC4hfc9dV5arkvc/OCmrw==",
-      "dev": true
-    },
-    "cookie-signature": {
-      "version": "1.0.6",
-      "resolved": "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.6.tgz",
-      "integrity": "sha512-QADzlaHc8icV8I7vbaJXJwod9HWYp8uCqf1xa4OfNu1T7JVxQIrUgOWtHdNDtPiywmFbiS12VjotIXLrKM3orQ==",
-      "dev": true
-    },
-    "copy-anything": {
-      "version": "3.0.5",
-      "resolved": "https://registry.npmjs.org/copy-anything/-/copy-anything-3.0.5.tgz",
-      "integrity": "sha512-yCEafptTtb4bk7GLEQoM8KVJpxAfdBJYaXyzQEgQQQgYrZiDp8SJmGKlYza6CYjEDNstAdNdKA3UuoULlEbS6w==",
-      "requires": {
-        "is-what": "^4.1.8"
-      }
-    },
-    "copy-webpack-plugin": {
-      "version": "11.0.0",
-      "resolved": "https://registry.npmjs.org/copy-webpack-plugin/-/copy-webpack-plugin-11.0.0.tgz",
-      "integrity": "sha512-fX2MWpamkW0hZxMEg0+mYnA40LTosOSa5TqZ9GYIBzyJa9C3QUaMPSE2xAi/buNr8u89SfD9wHSQVBzrRa/SOQ==",
-      "dev": true,
-      "requires": {
-        "fast-glob": "^3.2.11",
-        "glob-parent": "^6.0.1",
-        "globby": "^13.1.1",
-        "normalize-path": "^3.0.0",
-        "schema-utils": "^4.0.0",
-        "serialize-javascript": "^6.0.0"
-      },
-      "dependencies": {
-        "ajv": {
-          "version": "8.12.0",
-          "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.12.0.tgz",
-          "integrity": "sha512-sRu1kpcO9yLtYxBKvqfTeh9KzZEwO3STyX1HT+4CaDzC6HpTGYhIhPIzj9XuKU7KYDwnaeh5hcOwjy1QuJzBPA==",
-          "dev": true,
-          "requires": {
-            "fast-deep-equal": "^3.1.1",
-            "json-schema-traverse": "^1.0.0",
-            "require-from-string": "^2.0.2",
-            "uri-js": "^4.2.2"
-          }
-        },
-        "ajv-keywords": {
-          "version": "5.1.0",
-          "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-5.1.0.tgz",
-          "integrity": "sha512-YCS/JNFAUyr5vAuhk1DWm1CBxRHW9LbJ2ozWeemrIqpbsqKjHVxYPyi5GC0rjZIT5JxJ3virVTS8wk4i/Z+krw==",
-          "dev": true,
-          "requires": {
-            "fast-deep-equal": "^3.1.3"
-          }
-        },
-        "globby": {
-          "version": "13.2.2",
-          "resolved": "https://registry.npmjs.org/globby/-/globby-13.2.2.tgz",
-          "integrity": "sha512-Y1zNGV+pzQdh7H39l9zgB4PJqjRNqydvdYCDG4HFXM4XuvSaQQlEc91IU1yALL8gUTDomgBAfz3XJdmUS+oo0w==",
-          "dev": true,
-          "requires": {
-            "dir-glob": "^3.0.1",
-            "fast-glob": "^3.3.0",
-            "ignore": "^5.2.4",
-            "merge2": "^1.4.1",
-            "slash": "^4.0.0"
-          }
-        },
-        "json-schema-traverse": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz",
-          "integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==",
-          "dev": true
-        },
-        "schema-utils": {
-          "version": "4.2.0",
-          "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-4.2.0.tgz",
-          "integrity": "sha512-L0jRsrPpjdckP3oPug3/VxNKt2trR8TcabrM6FOAAlvC/9Phcmm+cuAgTlxBqdBR1WJx7Naj9WHw+aOmheSVbw==",
-          "dev": true,
-          "requires": {
-            "@types/json-schema": "^7.0.9",
-            "ajv": "^8.9.0",
-            "ajv-formats": "^2.1.1",
-            "ajv-keywords": "^5.1.0"
-          }
-        },
-        "slash": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/slash/-/slash-4.0.0.tgz",
-          "integrity": "sha512-3dOsAHXXUkQTpOYcoAxLIorMTp4gIQr5IW3iVb7A7lFIp0VHhnynm9izx6TssdrIcVIESAlVjtnO2K8bg+Coew==",
-          "dev": true
-        }
-      }
-    },
-    "core-js": {
-      "version": "2.6.12",
-      "resolved": "https://registry.npmjs.org/core-js/-/core-js-2.6.12.tgz",
-      "integrity": "sha512-Kb2wC0fvsWfQrgk8HU5lW6U/Lcs8+9aaYcy4ZFc6DDlo4nZ7n70dEgE5rtR0oG6ufKDUnrwfWL1mXR5ljDatrQ=="
-    },
-    "core-js-pure": {
-      "version": "3.32.0",
-      "resolved": "https://registry.npmjs.org/core-js-pure/-/core-js-pure-3.32.0.tgz",
-      "integrity": "sha512-qsev1H+dTNYpDUEURRuOXMvpdtAnNEvQWS/FMJ2Vb5AY8ZP4rAPQldkE27joykZPJTe0+IVgHZYh1P5Xu1/i1g==",
-      "dev": true
-    },
-    "core-util-is": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.3.tgz",
-      "integrity": "sha512-ZQBvi1DcpJ4GDqanjucZ2Hj3wEO5pZDS89BWbkcrvdxksJorwUDDZamX9ldFkp9aw2lmBDLgkObEA4DWNJ9FYQ==",
-      "dev": true
-    },
-    "create-ecdh": {
-      "version": "4.0.4",
-      "resolved": "https://registry.npmjs.org/create-ecdh/-/create-ecdh-4.0.4.tgz",
-      "integrity": "sha512-mf+TCx8wWc9VpuxfP2ht0iSISLZnt0JgWlrOKZiNqyUZWnjIaCIVNQArMHnCZKfEYRg6IM7A+NeJoN8gf/Ws0A==",
-      "requires": {
-        "bn.js": "^4.1.0",
-        "elliptic": "^6.5.3"
-      },
-      "dependencies": {
-        "bn.js": {
-          "version": "4.12.0",
-          "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.0.tgz",
-          "integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA=="
-        }
-      }
-    },
-    "create-hash": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/create-hash/-/create-hash-1.2.0.tgz",
-      "integrity": "sha512-z00bCGNHDG8mHAkP7CtT1qVu+bFQUPjYq/4Iv3C3kWjTFV10zIjfSoeqXo9Asws8gwSHDGj/hl2u4OGIjapeCg==",
-      "requires": {
-        "cipher-base": "^1.0.1",
-        "inherits": "^2.0.1",
-        "md5.js": "^1.3.4",
-        "ripemd160": "^2.0.1",
-        "sha.js": "^2.4.0"
-      }
-    },
-    "create-hmac": {
-      "version": "1.1.7",
-      "resolved": "https://registry.npmjs.org/create-hmac/-/create-hmac-1.1.7.tgz",
-      "integrity": "sha512-MJG9liiZ+ogc4TzUwuvbER1JRdgvUFSB5+VR/g5h82fGaIRWMWddtKBHi7/sVhfjQZ6SehlyhvQYrcYkaUIpLg==",
-      "requires": {
-        "cipher-base": "^1.0.3",
-        "create-hash": "^1.1.0",
-        "inherits": "^2.0.1",
-        "ripemd160": "^2.0.0",
-        "safe-buffer": "^5.0.1",
-        "sha.js": "^2.4.8"
-      }
-    },
-    "cross-fetch": {
-      "version": "3.1.8",
-      "resolved": "https://registry.npmjs.org/cross-fetch/-/cross-fetch-3.1.8.tgz",
-      "integrity": "sha512-cvA+JwZoU0Xq+h6WkMvAUqPEYy92Obet6UdKLfW60qn99ftItKjB5T+BkyWOFWe2pUyfQ+IJHmpOTznqk1M6Kg==",
-      "requires": {
-        "node-fetch": "^2.6.12"
-      }
-    },
-    "cross-sha256": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/cross-sha256/-/cross-sha256-1.2.0.tgz",
-      "integrity": "sha512-KViLNMDZKV7jwFqjFx+rNhG26amnFYYQ0S+VaFlVvpk8tM+2XbFia/don/SjGHg9WQxnFVi6z64CGPuF3T+nNw==",
-      "requires": {
-        "buffer": "6.0.3"
-      }
-    },
-    "cross-spawn": {
-      "version": "7.0.3",
-      "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz",
-      "integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==",
-      "dev": true,
-      "requires": {
-        "path-key": "^3.1.0",
-        "shebang-command": "^2.0.0",
-        "which": "^2.0.1"
-      }
-    },
-    "crypto-browserify": {
-      "version": "3.12.0",
-      "resolved": "https://registry.npmjs.org/crypto-browserify/-/crypto-browserify-3.12.0.tgz",
-      "integrity": "sha512-fz4spIh+znjO2VjL+IdhEpRJ3YN6sMzITSBijk6FK2UvTqruSQW+/cCZTSNsMiZNvUeq0CqurF+dAbyiGOY6Wg==",
-      "requires": {
-        "browserify-cipher": "^1.0.0",
-        "browserify-sign": "^4.0.0",
-        "create-ecdh": "^4.0.0",
-        "create-hash": "^1.1.0",
-        "create-hmac": "^1.1.0",
-        "diffie-hellman": "^5.0.0",
-        "inherits": "^2.0.1",
-        "pbkdf2": "^3.0.3",
-        "public-encrypt": "^4.0.0",
-        "randombytes": "^2.0.0",
-        "randomfill": "^1.0.3"
-      }
-    },
-    "css-color-keywords": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/css-color-keywords/-/css-color-keywords-1.0.0.tgz",
-      "integrity": "sha512-FyyrDHZKEjXDpNJYvVsV960FiqQyXc/LlYmsxl2BcdMb2WPx0OGRVgTg55rPSyLSNMqP52R9r8geSp7apN3Ofg=="
-    },
-    "css-loader": {
-      "version": "6.8.1",
-      "resolved": "https://registry.npmjs.org/css-loader/-/css-loader-6.8.1.tgz",
-      "integrity": "sha512-xDAXtEVGlD0gJ07iclwWVkLoZOpEvAWaSyf6W18S2pOC//K8+qUDIx8IIT3D+HjnmkJPQeesOPv5aiUaJsCM2g==",
-      "dev": true,
-      "requires": {
-        "icss-utils": "^5.1.0",
-        "postcss": "^8.4.21",
-        "postcss-modules-extract-imports": "^3.0.0",
-        "postcss-modules-local-by-default": "^4.0.3",
-        "postcss-modules-scope": "^3.0.0",
-        "postcss-modules-values": "^4.0.0",
-        "postcss-value-parser": "^4.2.0",
-        "semver": "^7.3.8"
-      },
-      "dependencies": {
-        "lru-cache": {
-          "version": "6.0.0",
-          "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
-          "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
-          "dev": true,
-          "requires": {
-            "yallist": "^4.0.0"
-          }
-        },
-        "semver": {
-          "version": "7.5.4",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz",
-          "integrity": "sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==",
-          "dev": true,
-          "requires": {
-            "lru-cache": "^6.0.0"
-          }
-        },
-        "yallist": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
-          "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==",
-          "dev": true
-        }
-      }
-    },
-    "css-select": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/css-select/-/css-select-4.3.0.tgz",
-      "integrity": "sha512-wPpOYtnsVontu2mODhA19JrqWxNsfdatRKd64kmpRbQgh1KtItko5sTnEpPdpSaJszTOhEMlF/RPz28qj4HqhQ==",
-      "dev": true,
-      "requires": {
-        "boolbase": "^1.0.0",
-        "css-what": "^6.0.1",
-        "domhandler": "^4.3.1",
-        "domutils": "^2.8.0",
-        "nth-check": "^2.0.1"
-      }
-    },
-    "css-to-react-native": {
-      "version": "3.2.0",
-      "resolved": "https://registry.npmjs.org/css-to-react-native/-/css-to-react-native-3.2.0.tgz",
-      "integrity": "sha512-e8RKaLXMOFii+02mOlqwjbD00KSEKqblnpO9e++1aXS1fPQOpS1YoqdVHBqPjHNoxeF2mimzVqawm2KCbEdtHQ==",
-      "requires": {
-        "camelize": "^1.0.0",
-        "css-color-keywords": "^1.0.0",
-        "postcss-value-parser": "^4.0.2"
-      }
-    },
-    "css-what": {
-      "version": "6.1.0",
-      "resolved": "https://registry.npmjs.org/css-what/-/css-what-6.1.0.tgz",
-      "integrity": "sha512-HTUrgRJ7r4dsZKU6GjmpfRK1O76h97Z8MfS1G0FozR+oF2kG6Vfe8JE6zwrkbxigziPHinCJ+gCPjA9EaBDtRw==",
-      "dev": true
-    },
-    "cssesc": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/cssesc/-/cssesc-3.0.0.tgz",
-      "integrity": "sha512-/Tb/JcjK111nNScGob5MNtsntNM1aCNUDipB/TkwZFhyDrrE47SOx/18wF2bbjgc3ZzCSKW1T5nt5EbFoAz/Vg==",
-      "dev": true
-    },
-    "csstype": {
-      "version": "3.1.2",
-      "resolved": "https://registry.npmjs.org/csstype/-/csstype-3.1.2.tgz",
-      "integrity": "sha512-I7K1Uu0MBPzaFKg4nI5Q7Vs2t+3gWWW648spaF+Rg7pI9ds18Ugn+lvg4SHczUdKlHI5LWBXyqfS8+DufyBsgQ=="
-    },
-    "damerau-levenshtein": {
-      "version": "1.0.8",
-      "resolved": "https://registry.npmjs.org/damerau-levenshtein/-/damerau-levenshtein-1.0.8.tgz",
-      "integrity": "sha512-sdQSFB7+llfUcQHUQO3+B8ERRj0Oa4w9POWMI/puGtuf7gFywGmkaLCElnudfTiKZV+NvHqL0ifzdrI8Ro7ESA==",
-      "dev": true
-    },
-    "date-fns": {
-      "version": "2.30.0",
-      "resolved": "https://registry.npmjs.org/date-fns/-/date-fns-2.30.0.tgz",
-      "integrity": "sha512-fnULvOpxnC5/Vg3NCiWelDsLiUc9bRwAPs/+LfTLNvetFCtCTN+yQz15C/fs4AwX1R9K5GLtLfn8QW+dWisaAw==",
-      "requires": {
-        "@babel/runtime": "^7.21.0"
-      }
-    },
-    "debug": {
-      "version": "4.3.4",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
-      "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==",
-      "requires": {
-        "ms": "2.1.2"
-      }
-    },
-    "deep-eql": {
-      "version": "4.1.3",
-      "resolved": "https://registry.npmjs.org/deep-eql/-/deep-eql-4.1.3.tgz",
-      "integrity": "sha512-WaEtAOpRA1MQ0eohqZjpGD8zdI0Ovsm8mmFhaDN8dvDZzyoUMcYDnf5Y6iu7HTXxf8JDS23qWa4a+hKCDyOPzw==",
-      "dev": true,
-      "requires": {
-        "type-detect": "^4.0.0"
-      }
-    },
-    "deep-equal": {
-      "version": "2.2.2",
-      "resolved": "https://registry.npmjs.org/deep-equal/-/deep-equal-2.2.2.tgz",
-      "integrity": "sha512-xjVyBf0w5vH0I42jdAZzOKVldmPgSulmiyPRywoyq7HXC9qdgo17kxJE+rdnif5Tz6+pIrpJI8dCpMNLIGkUiA==",
-      "dev": true,
-      "requires": {
-        "array-buffer-byte-length": "^1.0.0",
-        "call-bind": "^1.0.2",
-        "es-get-iterator": "^1.1.3",
-        "get-intrinsic": "^1.2.1",
-        "is-arguments": "^1.1.1",
-        "is-array-buffer": "^3.0.2",
-        "is-date-object": "^1.0.5",
-        "is-regex": "^1.1.4",
-        "is-shared-array-buffer": "^1.0.2",
-        "isarray": "^2.0.5",
-        "object-is": "^1.1.5",
-        "object-keys": "^1.1.1",
-        "object.assign": "^4.1.4",
-        "regexp.prototype.flags": "^1.5.0",
-        "side-channel": "^1.0.4",
-        "which-boxed-primitive": "^1.0.2",
-        "which-collection": "^1.0.1",
-        "which-typed-array": "^1.1.9"
-      }
-    },
-    "deep-is": {
-      "version": "0.1.4",
-      "resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.4.tgz",
-      "integrity": "sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ==",
-      "dev": true
-    },
-    "deepmerge": {
-      "version": "4.3.1",
-      "resolved": "https://registry.npmjs.org/deepmerge/-/deepmerge-4.3.1.tgz",
-      "integrity": "sha512-3sUqbMEc77XqpdNO7FRyRog+eW3ph+GYCbj+rK+uYyRMuwsVy0rMiVtPn+QJlKFvWP/1PYpapqYn0Me2knFn+A==",
-      "dev": true
-    },
-    "default-gateway": {
-      "version": "6.0.3",
-      "resolved": "https://registry.npmjs.org/default-gateway/-/default-gateway-6.0.3.tgz",
-      "integrity": "sha512-fwSOJsbbNzZ/CUFpqFBqYfYNLj1NbMPm8MMCIzHjC83iSJRBEGmDUxU+WP661BaBQImeC2yHwXtz+P/O9o+XEg==",
-      "dev": true,
-      "requires": {
-        "execa": "^5.0.0"
-      }
-    },
-    "defaults": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/defaults/-/defaults-1.0.4.tgz",
-      "integrity": "sha512-eFuaLoy/Rxalv2kr+lqMlUnrDWV+3j4pljOIJgLIhI058IQfWJ7vXhyEIHu+HtC738klGALYxOKDO0bQP3tg8A==",
-      "dev": true,
-      "optional": true,
-      "requires": {
-        "clone": "^1.0.2"
-      }
-    },
-    "define-data-property": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/define-data-property/-/define-data-property-1.1.4.tgz",
-      "integrity": "sha512-rBMvIzlpA8v6E+SJZoo++HAYqsLrkg7MSfIinMPFhmkorw7X+dOXVJQs+QT69zGkzMyfDnIMN2Wid1+NbL3T+A==",
-      "requires": {
-        "es-define-property": "^1.0.0",
-        "es-errors": "^1.3.0",
-        "gopd": "^1.0.1"
-      }
-    },
-    "define-lazy-prop": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/define-lazy-prop/-/define-lazy-prop-2.0.0.tgz",
-      "integrity": "sha512-Ds09qNh8yw3khSjiJjiUInaGX9xlqZDY7JVryGxdxV7NPeuqQfplOpQ66yJFZut3jLa5zOwkXw1g9EI2uKh4Og==",
-      "dev": true
-    },
-    "define-properties": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.2.0.tgz",
-      "integrity": "sha512-xvqAVKGfT1+UAvPwKTVw/njhdQ8ZhXK4lI0bCIuCMrp2up9nPnaDftrLtmpTazqd1o+UY4zgzU+avtMbDP+ldA==",
-      "dev": true,
-      "requires": {
-        "has-property-descriptors": "^1.0.0",
-        "object-keys": "^1.1.1"
-      }
-    },
-    "del": {
-      "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/del/-/del-4.1.1.tgz",
-      "integrity": "sha512-QwGuEUouP2kVwQenAsOof5Fv8K9t3D8Ca8NxcXKrIpEHjTXK5J2nXLdP+ALI1cgv8wj7KuwBhTwBkOZSJKM5XQ==",
-      "dev": true,
-      "requires": {
-        "@types/glob": "^7.1.1",
-        "globby": "^6.1.0",
-        "is-path-cwd": "^2.0.0",
-        "is-path-in-cwd": "^2.0.0",
-        "p-map": "^2.0.0",
-        "pify": "^4.0.1",
-        "rimraf": "^2.6.3"
-      },
-      "dependencies": {
-        "array-union": {
-          "version": "1.0.2",
-          "resolved": "https://registry.npmjs.org/array-union/-/array-union-1.0.2.tgz",
-          "integrity": "sha512-Dxr6QJj/RdU/hCaBjOfxW+q6lyuVE6JFWIrAUpuOOhoJJoQ99cUn3igRaHVB5P9WrgFVN0FfArM3x0cueOU8ng==",
-          "dev": true,
-          "requires": {
-            "array-uniq": "^1.0.1"
-          }
-        },
-        "globby": {
-          "version": "6.1.0",
-          "resolved": "https://registry.npmjs.org/globby/-/globby-6.1.0.tgz",
-          "integrity": "sha512-KVbFv2TQtbzCoxAnfD6JcHZTYCzyliEaaeM/gH8qQdkKr5s0OP9scEgvdcngyk7AVdY6YVW/TJHd+lQ/Df3Daw==",
-          "dev": true,
-          "requires": {
-            "array-union": "^1.0.1",
-            "glob": "^7.0.3",
-            "object-assign": "^4.0.1",
-            "pify": "^2.0.0",
-            "pinkie-promise": "^2.0.0"
-          },
-          "dependencies": {
-            "pify": {
-              "version": "2.3.0",
-              "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
-              "integrity": "sha512-udgsAY+fTnvv7kI7aaxbqwWNb0AHiB0qBO89PZKPkoTmGOgdbrHDKD+0B2X4uTfJ/FT1R09r9gTsjUjNJotuog==",
-              "dev": true
-            }
-          }
-        },
-        "rimraf": {
-          "version": "2.7.1",
-          "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz",
-          "integrity": "sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==",
-          "dev": true,
-          "requires": {
-            "glob": "^7.1.3"
-          }
-        }
-      }
-    },
-    "delayed-stream": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz",
-      "integrity": "sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ=="
-    },
-    "depd": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/depd/-/depd-2.0.0.tgz",
-      "integrity": "sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw==",
-      "dev": true
-    },
-    "dequal": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/dequal/-/dequal-2.0.3.tgz",
-      "integrity": "sha512-0je+qPKHEMohvfRTCEo3CrPG6cAzAYgmzKyxRiYSSDkS6eGJdyVJm7WaYA5ECaAD9wLB2T4EEeymA5aFVcYXCA==",
-      "dev": true
-    },
-    "des.js": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/des.js/-/des.js-1.1.0.tgz",
-      "integrity": "sha512-r17GxjhUCjSRy8aiJpr8/UadFIzMzJGexI3Nmz4ADi9LYSFx4gTBp80+NaX/YsXWWLhpZ7v/v/ubEc/bCNfKwg==",
-      "requires": {
-        "inherits": "^2.0.1",
-        "minimalistic-assert": "^1.0.0"
-      }
-    },
-    "destroy": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/destroy/-/destroy-1.2.0.tgz",
-      "integrity": "sha512-2sJGJTaXIIaR1w4iJSNoN0hnMY7Gpc/n8D4qSCJw8QqFWXf7cuAgnEHxBpweaVcPevC2l3KpjYCx3NypQQgaJg==",
-      "dev": true
-    },
-    "detect-node": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/detect-node/-/detect-node-2.1.0.tgz",
-      "integrity": "sha512-T0NIuQpnTvFDATNuHN5roPwSBG83rFsuO+MXXH9/3N1eFbn4wcPjttvjMLEPWJ0RGUYgQE7cGgS3tNxbqCGM7g=="
-    },
-    "diffie-hellman": {
-      "version": "5.0.3",
-      "resolved": "https://registry.npmjs.org/diffie-hellman/-/diffie-hellman-5.0.3.tgz",
-      "integrity": "sha512-kqag/Nl+f3GwyK25fhUMYj81BUOrZ9IuJsjIcDE5icNM9FJHAVm3VcUDxdLPoQtTuUylWm6ZIknYJwwaPxsUzg==",
-      "requires": {
-        "bn.js": "^4.1.0",
-        "miller-rabin": "^4.0.0",
-        "randombytes": "^2.0.0"
-      },
-      "dependencies": {
-        "bn.js": {
-          "version": "4.12.0",
-          "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.0.tgz",
-          "integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA=="
-        }
-      }
-    },
-    "dir-glob": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/dir-glob/-/dir-glob-3.0.1.tgz",
-      "integrity": "sha512-WkrWp9GR4KXfKGYzOLmTuGVi1UWFfws377n9cc55/tb6DuqyF6pcQ5AbiHEshaDpY9v6oaSr2XCDidGmMwdzIA==",
-      "dev": true,
-      "requires": {
-        "path-type": "^4.0.0"
-      }
-    },
-    "dns-equal": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/dns-equal/-/dns-equal-1.0.0.tgz",
-      "integrity": "sha512-z+paD6YUQsk+AbGCEM4PrOXSss5gd66QfcVBFTKR/HpFL9jCqikS94HYwKww6fQyO7IxrIIyUu+g0Ka9tUS2Cg==",
-      "dev": true
-    },
-    "dns-packet": {
-      "version": "5.6.0",
-      "resolved": "https://registry.npmjs.org/dns-packet/-/dns-packet-5.6.0.tgz",
-      "integrity": "sha512-rza3UH1LwdHh9qyPXp8lkwpjSNk/AMD3dPytUoRoqnypDUhY0xvbdmVhWOfxO68frEfV9BU8V12Ez7ZsHGZpCQ==",
-      "dev": true,
-      "requires": {
-        "@leichtgewicht/ip-codec": "^2.0.1"
-      }
-    },
-    "doctrine": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-3.0.0.tgz",
-      "integrity": "sha512-yS+Q5i3hBf7GBkd4KG8a7eBNNWNGLTaEwwYWUijIYM7zrlYDM0BFXHjjPWlWZ1Rg7UaddZeIDmi9jF3HmqiQ2w==",
-      "dev": true,
-      "requires": {
-        "esutils": "^2.0.2"
-      }
-    },
-    "dom-converter": {
-      "version": "0.2.0",
-      "resolved": "https://registry.npmjs.org/dom-converter/-/dom-converter-0.2.0.tgz",
-      "integrity": "sha512-gd3ypIPfOMr9h5jIKq8E3sHOTCjeirnl0WK5ZdS1AW0Odt0b1PaWaHdJ4Qk4klv+YB9aJBS7mESXjFoDQPu6DA==",
-      "dev": true,
-      "requires": {
-        "utila": "~0.4"
-      }
-    },
-    "dom-serializer": {
-      "version": "1.4.1",
-      "resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-1.4.1.tgz",
-      "integrity": "sha512-VHwB3KfrcOOkelEG2ZOfxqLZdfkil8PtJi4P8N2MMXucZq2yLp75ClViUlOVwyoHEDjYU433Aq+5zWP61+RGag==",
-      "dev": true,
-      "requires": {
-        "domelementtype": "^2.0.1",
-        "domhandler": "^4.2.0",
-        "entities": "^2.0.0"
-      },
-      "dependencies": {
-        "entities": {
-          "version": "2.2.0",
-          "resolved": "https://registry.npmjs.org/entities/-/entities-2.2.0.tgz",
-          "integrity": "sha512-p92if5Nz619I0w+akJrLZH0MX0Pb5DX39XOwQTtXSdQQOaYH03S1uIQp4mhOZtAXrxq4ViO67YTiLBo2638o9A==",
-          "dev": true
-        }
-      }
-    },
-    "domelementtype": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-2.3.0.tgz",
-      "integrity": "sha512-OLETBj6w0OsagBwdXnPdN0cnMfF9opN69co+7ZrbfPGrdpPVNBUj02spi6B1N7wChLQiPn4CSH/zJvXw56gmHw==",
-      "dev": true
-    },
-    "domhandler": {
-      "version": "4.3.1",
-      "resolved": "https://registry.npmjs.org/domhandler/-/domhandler-4.3.1.tgz",
-      "integrity": "sha512-GrwoxYN+uWlzO8uhUXRl0P+kHE4GtVPfYzVLcUxPL7KNdHKj66vvlhiweIHqYYXWlw+T8iLMp42Lm67ghw4WMQ==",
-      "dev": true,
-      "requires": {
-        "domelementtype": "^2.2.0"
-      }
-    },
-    "domutils": {
-      "version": "2.8.0",
-      "resolved": "https://registry.npmjs.org/domutils/-/domutils-2.8.0.tgz",
-      "integrity": "sha512-w96Cjofp72M5IIhpjgobBimYEfoPjx1Vx0BSX9P30WBdZW2WIKU0T1Bd0kz2eNZ9ikjKgHbEyKx8BB6H1L3h3A==",
-      "dev": true,
-      "requires": {
-        "dom-serializer": "^1.0.1",
-        "domelementtype": "^2.2.0",
-        "domhandler": "^4.2.0"
-      }
-    },
-    "dot-case": {
-      "version": "3.0.4",
-      "resolved": "https://registry.npmjs.org/dot-case/-/dot-case-3.0.4.tgz",
-      "integrity": "sha512-Kv5nKlh6yRrdrGvxeJ2e5y2eRUpkUosIW4A2AS38zwSz27zu7ufDwQPi5Jhs3XAlGNetl3bmnGhQsMtkKJnj3w==",
-      "dev": true,
-      "requires": {
-        "no-case": "^3.0.4",
-        "tslib": "^2.0.3"
-      }
-    },
-    "dotenv": {
-      "version": "16.4.5",
-      "resolved": "https://registry.npmjs.org/dotenv/-/dotenv-16.4.5.tgz",
-      "integrity": "sha512-ZmdL2rui+eB2YwhsWzjInR8LldtZHGDoQ1ugH85ppHKwpUHL7j7rN0Ti9NCnGiQbhaZ11FpR+7ao1dNsmduNUg=="
-    },
-    "dotenv-defaults": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/dotenv-defaults/-/dotenv-defaults-2.0.2.tgz",
-      "integrity": "sha512-iOIzovWfsUHU91L5i8bJce3NYK5JXeAwH50Jh6+ARUdLiiGlYWfGw6UkzsYqaXZH/hjE/eCd/PlfM/qqyK0AMg==",
-      "dev": true,
-      "requires": {
-        "dotenv": "^8.2.0"
-      },
-      "dependencies": {
-        "dotenv": {
-          "version": "8.6.0",
-          "resolved": "https://registry.npmjs.org/dotenv/-/dotenv-8.6.0.tgz",
-          "integrity": "sha512-IrPdXQsk2BbzvCBGBOTmmSH5SodmqZNt4ERAZDmW4CT+tL8VtvinqywuANaFu4bOMWki16nqf0e4oC0QIaDr/g==",
-          "dev": true
-        }
-      }
-    },
-    "dotenv-webpack": {
-      "version": "8.0.1",
-      "resolved": "https://registry.npmjs.org/dotenv-webpack/-/dotenv-webpack-8.0.1.tgz",
-      "integrity": "sha512-CdrgfhZOnx4uB18SgaoP9XHRN2v48BbjuXQsZY5ixs5A8579NxQkmMxRtI7aTwSiSQcM2ao12Fdu+L3ZS3bG4w==",
-      "dev": true,
-      "requires": {
-        "dotenv-defaults": "^2.0.2"
-      }
-    },
-    "drbg.js": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/drbg.js/-/drbg.js-1.0.1.tgz",
-      "integrity": "sha512-F4wZ06PvqxYLFEZKkFxTDcns9oFNk34hvmJSEwdzsxVQ8YI5YaxtACgQatkYgv2VI2CFkUd2Y+xosPQnHv809g==",
-      "requires": {
-        "browserify-aes": "^1.0.6",
-        "create-hash": "^1.1.2",
-        "create-hmac": "^1.1.4"
-      }
-    },
-    "eastasianwidth": {
-      "version": "0.2.0",
-      "resolved": "https://registry.npmjs.org/eastasianwidth/-/eastasianwidth-0.2.0.tgz",
-      "integrity": "sha512-I88TYZWc9XiYHRQ4/3c5rjjfgkjhLyW2luGIheGERbNQ6OY7yTybanSpDXZa8y7VUP9YmDcYa+eyq4ca7iLqWA==",
-      "dev": true
-    },
-    "easy-table": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/easy-table/-/easy-table-1.2.0.tgz",
-      "integrity": "sha512-OFzVOv03YpvtcWGe5AayU5G2hgybsg3iqA6drU8UaoZyB9jLGMTrz9+asnLp/E+6qPh88yEI1gvyZFZ41dmgww==",
-      "dev": true,
-      "requires": {
-        "ansi-regex": "^5.0.1",
-        "wcwidth": "^1.0.1"
-      }
-    },
-    "ecdsa-sig-formatter": {
-      "version": "1.0.11",
-      "resolved": "https://registry.npmjs.org/ecdsa-sig-formatter/-/ecdsa-sig-formatter-1.0.11.tgz",
-      "integrity": "sha512-nagl3RYrbNv6kQkeJIpt6NJZy8twLB/2vtz6yN9Z4vRKHN4/QZJIEbqohALSgwKdnksuY3k5Addp5lg8sVoVcQ==",
-      "requires": {
-        "safe-buffer": "^5.0.1"
-      }
-    },
-    "ecpair": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/ecpair/-/ecpair-2.1.0.tgz",
-      "integrity": "sha512-cL/mh3MtJutFOvFc27GPZE2pWL3a3k4YvzUWEOvilnfZVlH3Jwgx/7d6tlD7/75tNk8TG2m+7Kgtz0SI1tWcqw==",
-      "requires": {
-        "randombytes": "^2.1.0",
-        "typeforce": "^1.18.0",
-        "wif": "^2.0.6"
-      }
-    },
-    "ee-first": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz",
-      "integrity": "sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow==",
-      "dev": true
-    },
-    "electron-to-chromium": {
-      "version": "1.4.572",
-      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.572.tgz",
-      "integrity": "sha512-RlFobl4D3ieetbnR+2EpxdzFl9h0RAJkPK3pfiwMug2nhBin2ZCsGIAJWdpNniLz43sgXam/CgipOmvTA+rUiA=="
-    },
-    "elliptic": {
-      "version": "6.5.4",
-      "resolved": "https://registry.npmjs.org/elliptic/-/elliptic-6.5.4.tgz",
-      "integrity": "sha512-iLhC6ULemrljPZb+QutR5TQGB+pdW6KGD5RSegS+8sorOZT+rdQFbsQFJgvN3eRqNALqJer4oQ16YvJHlU8hzQ==",
-      "requires": {
-        "bn.js": "^4.11.9",
-        "brorand": "^1.1.0",
-        "hash.js": "^1.0.0",
-        "hmac-drbg": "^1.0.1",
-        "inherits": "^2.0.4",
-        "minimalistic-assert": "^1.0.1",
-        "minimalistic-crypto-utils": "^1.0.1"
-      },
-      "dependencies": {
-        "bn.js": {
-          "version": "4.12.0",
-          "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.0.tgz",
-          "integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA=="
-        }
-      }
-    },
-    "emoji-regex": {
-      "version": "9.2.2",
-      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-9.2.2.tgz",
-      "integrity": "sha512-L18DaJsXSUk2+42pv8mLs5jJT2hqFkFE4j21wOmgbUqsZ2hL72NsUU785g9RXgo3s0ZNgVl42TiHp3ZtOv/Vyg==",
-      "dev": true
-    },
-    "emojis-list": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/emojis-list/-/emojis-list-3.0.0.tgz",
-      "integrity": "sha512-/kyM18EfinwXZbno9FyUGeFh87KC8HRQBQGildHZbEuRyWFOmv1U10o9BBp8XVZDVNNuQKyIGIu5ZYAAXJ0V2Q==",
-      "dev": true
-    },
-    "encodeurl": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.2.tgz",
-      "integrity": "sha512-TPJXq8JqFaVYm2CWmPvnP2Iyo4ZSM7/QKcSmuMLDObfpH5fi7RUGmd/rTDf+rut/saiDiQEeVTNgAmJEdAOx0w==",
-      "dev": true
-    },
-    "enhanced-resolve": {
-      "version": "5.15.0",
-      "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.15.0.tgz",
-      "integrity": "sha512-LXYT42KJ7lpIKECr2mAXIaMldcNCh/7E0KBKOu4KSfkHmP+mZmSs+8V5gBAqisWBy0OO4W5Oyys0GO1Y8KtdKg==",
-      "dev": true,
-      "requires": {
-        "graceful-fs": "^4.2.4",
-        "tapable": "^2.2.0"
-      }
-    },
-    "entities": {
-      "version": "4.5.0",
-      "resolved": "https://registry.npmjs.org/entities/-/entities-4.5.0.tgz",
-      "integrity": "sha512-V0hjH4dGPh9Ao5p0MoRY6BVqtwCjhz6vI5LT8AJ55H+4g9/4vbHx1I54fS0XuclLhDHArPQCiMjDxjaL8fPxhw==",
-      "dev": true
-    },
-    "error-ex": {
-      "version": "1.3.2",
-      "resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.2.tgz",
-      "integrity": "sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==",
-      "dev": true,
-      "requires": {
-        "is-arrayish": "^0.2.1"
-      }
-    },
-    "error-stack-parser": {
-      "version": "2.1.4",
-      "resolved": "https://registry.npmjs.org/error-stack-parser/-/error-stack-parser-2.1.4.tgz",
-      "integrity": "sha512-Sk5V6wVazPhq5MhpO+AUxJn5x7XSXGl1R93Vn7i+zS15KDVxQijejNCrz8340/2bgLBjR9GtEG8ZVKONDjcqGQ==",
-      "dev": true,
-      "requires": {
-        "stackframe": "^1.3.4"
-      }
-    },
-    "es-abstract": {
-      "version": "1.22.1",
-      "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.22.1.tgz",
-      "integrity": "sha512-ioRRcXMO6OFyRpyzV3kE1IIBd4WG5/kltnzdxSCqoP8CMGs/Li+M1uF5o7lOkZVFjDs+NLesthnF66Pg/0q0Lw==",
-      "dev": true,
-      "requires": {
-        "array-buffer-byte-length": "^1.0.0",
-        "arraybuffer.prototype.slice": "^1.0.1",
-        "available-typed-arrays": "^1.0.5",
-        "call-bind": "^1.0.2",
-        "es-set-tostringtag": "^2.0.1",
-        "es-to-primitive": "^1.2.1",
-        "function.prototype.name": "^1.1.5",
-        "get-intrinsic": "^1.2.1",
-        "get-symbol-description": "^1.0.0",
-        "globalthis": "^1.0.3",
-        "gopd": "^1.0.1",
-        "has": "^1.0.3",
-        "has-property-descriptors": "^1.0.0",
-        "has-proto": "^1.0.1",
-        "has-symbols": "^1.0.3",
-        "internal-slot": "^1.0.5",
-        "is-array-buffer": "^3.0.2",
-        "is-callable": "^1.2.7",
-        "is-negative-zero": "^2.0.2",
-        "is-regex": "^1.1.4",
-        "is-shared-array-buffer": "^1.0.2",
-        "is-string": "^1.0.7",
-        "is-typed-array": "^1.1.10",
-        "is-weakref": "^1.0.2",
-        "object-inspect": "^1.12.3",
-        "object-keys": "^1.1.1",
-        "object.assign": "^4.1.4",
-        "regexp.prototype.flags": "^1.5.0",
-        "safe-array-concat": "^1.0.0",
-        "safe-regex-test": "^1.0.0",
-        "string.prototype.trim": "^1.2.7",
-        "string.prototype.trimend": "^1.0.6",
-        "string.prototype.trimstart": "^1.0.6",
-        "typed-array-buffer": "^1.0.0",
-        "typed-array-byte-length": "^1.0.0",
-        "typed-array-byte-offset": "^1.0.0",
-        "typed-array-length": "^1.0.4",
-        "unbox-primitive": "^1.0.2",
-        "which-typed-array": "^1.1.10"
-      }
-    },
-    "es-define-property": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/es-define-property/-/es-define-property-1.0.0.tgz",
-      "integrity": "sha512-jxayLKShrEqqzJ0eumQbVhTYQM27CfT1T35+gCgDFoL82JLsXqTJ76zv6A0YLOgEnLUMvLzsDsGIrl8NFpT2gQ==",
-      "requires": {
-        "get-intrinsic": "^1.2.4"
-      }
-    },
-    "es-errors": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/es-errors/-/es-errors-1.3.0.tgz",
-      "integrity": "sha512-Zf5H2Kxt2xjTvbJvP2ZWLEICxA6j+hAmMzIlypy4xcBg1vKVnx89Wy0GbS+kf5cwCVFFzdCFh2XSCFNULS6csw=="
-    },
-    "es-get-iterator": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/es-get-iterator/-/es-get-iterator-1.1.3.tgz",
-      "integrity": "sha512-sPZmqHBe6JIiTfN5q2pEi//TwxmAFHwj/XEuYjTuse78i8KxaqMTTzxPoFKuzRpDpTJ+0NAbpfenkmH2rePtuw==",
-      "dev": true,
-      "requires": {
-        "call-bind": "^1.0.2",
-        "get-intrinsic": "^1.1.3",
-        "has-symbols": "^1.0.3",
-        "is-arguments": "^1.1.1",
-        "is-map": "^2.0.2",
-        "is-set": "^2.0.2",
-        "is-string": "^1.0.7",
-        "isarray": "^2.0.5",
-        "stop-iteration-iterator": "^1.0.0"
-      }
-    },
-    "es-module-lexer": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/es-module-lexer/-/es-module-lexer-1.3.0.tgz",
-      "integrity": "sha512-vZK7T0N2CBmBOixhmjdqx2gWVbFZ4DXZ/NyRMZVlJXPa7CyFS+/a4QQsDGDQy9ZfEzxFuNEsMLeQJnKP2p5/JA==",
-      "dev": true
-    },
-    "es-set-tostringtag": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/es-set-tostringtag/-/es-set-tostringtag-2.0.1.tgz",
-      "integrity": "sha512-g3OMbtlwY3QewlqAiMLI47KywjWZoEytKr8pf6iTC8uJq5bIAH52Z9pnQ8pVL6whrCto53JZDuUIsifGeLorTg==",
-      "dev": true,
-      "requires": {
-        "get-intrinsic": "^1.1.3",
-        "has": "^1.0.3",
-        "has-tostringtag": "^1.0.0"
-      }
-    },
-    "es-shim-unscopables": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/es-shim-unscopables/-/es-shim-unscopables-1.0.0.tgz",
-      "integrity": "sha512-Jm6GPcCdC30eMLbZ2x8z2WuRwAws3zTBBKuusffYVUrNj/GVSUAZ+xKMaUpfNDR5IbyNA5LJbaecoUVbmUcB1w==",
-      "dev": true,
-      "requires": {
-        "has": "^1.0.3"
-      }
-    },
-    "es-to-primitive": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.2.1.tgz",
-      "integrity": "sha512-QCOllgZJtaUo9miYBcLChTUaHNjJF3PYs1VidD7AwiEj1kYxKeQTctLAezAOH5ZKRH0g2IgPn6KwB4IT8iRpvA==",
-      "dev": true,
-      "requires": {
-        "is-callable": "^1.1.4",
-        "is-date-object": "^1.0.1",
-        "is-symbol": "^1.0.2"
-      }
-    },
-    "esbuild": {
-      "version": "0.21.5",
-      "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.21.5.tgz",
-      "integrity": "sha512-mg3OPMV4hXywwpoDxu3Qda5xCKQi+vCTZq8S9J/EpkhB2HzKXq4SNFZE3+NK93JYxc8VMSep+lOUSC/RVKaBqw==",
-      "dev": true,
-      "requires": {
-        "@esbuild/aix-ppc64": "0.21.5",
-        "@esbuild/android-arm": "0.21.5",
-        "@esbuild/android-arm64": "0.21.5",
-        "@esbuild/android-x64": "0.21.5",
-        "@esbuild/darwin-arm64": "0.21.5",
-        "@esbuild/darwin-x64": "0.21.5",
-        "@esbuild/freebsd-arm64": "0.21.5",
-        "@esbuild/freebsd-x64": "0.21.5",
-        "@esbuild/linux-arm": "0.21.5",
-        "@esbuild/linux-arm64": "0.21.5",
-        "@esbuild/linux-ia32": "0.21.5",
-        "@esbuild/linux-loong64": "0.21.5",
-        "@esbuild/linux-mips64el": "0.21.5",
-        "@esbuild/linux-ppc64": "0.21.5",
-        "@esbuild/linux-riscv64": "0.21.5",
-        "@esbuild/linux-s390x": "0.21.5",
-        "@esbuild/linux-x64": "0.21.5",
-        "@esbuild/netbsd-x64": "0.21.5",
-        "@esbuild/openbsd-x64": "0.21.5",
-        "@esbuild/sunos-x64": "0.21.5",
-        "@esbuild/win32-arm64": "0.21.5",
-        "@esbuild/win32-ia32": "0.21.5",
-        "@esbuild/win32-x64": "0.21.5"
-      }
-    },
-    "escalade": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.1.tgz",
-      "integrity": "sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw=="
-    },
-    "escape-html": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.3.tgz",
-      "integrity": "sha512-NiSupZ4OeuGwr68lGIeym/ksIZMJodUGOSCZ/FSnTxcrekbvqrgdUxlJOMpijaKZVjAJrWrGs/6Jy8OMuyj9ow==",
-      "dev": true
-    },
-    "escape-string-regexp": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
-      "integrity": "sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg=="
-    },
-    "eslint": {
-      "version": "8.40.0",
-      "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.40.0.tgz",
-      "integrity": "sha512-bvR+TsP9EHL3TqNtj9sCNJVAFK3fBN8Q7g5waghxyRsPLIMwL73XSKnZFK0hk/O2ANC+iAoq6PWMQ+IfBAJIiQ==",
-      "dev": true,
-      "requires": {
-        "@eslint-community/eslint-utils": "^4.2.0",
-        "@eslint-community/regexpp": "^4.4.0",
-        "@eslint/eslintrc": "^2.0.3",
-        "@eslint/js": "8.40.0",
-        "@humanwhocodes/config-array": "^0.11.8",
-        "@humanwhocodes/module-importer": "^1.0.1",
-        "@nodelib/fs.walk": "^1.2.8",
-        "ajv": "^6.10.0",
-        "chalk": "^4.0.0",
-        "cross-spawn": "^7.0.2",
-        "debug": "^4.3.2",
-        "doctrine": "^3.0.0",
-        "escape-string-regexp": "^4.0.0",
-        "eslint-scope": "^7.2.0",
-        "eslint-visitor-keys": "^3.4.1",
-        "espree": "^9.5.2",
-        "esquery": "^1.4.2",
-        "esutils": "^2.0.2",
-        "fast-deep-equal": "^3.1.3",
-        "file-entry-cache": "^6.0.1",
-        "find-up": "^5.0.0",
-        "glob-parent": "^6.0.2",
-        "globals": "^13.19.0",
-        "grapheme-splitter": "^1.0.4",
-        "ignore": "^5.2.0",
-        "import-fresh": "^3.0.0",
-        "imurmurhash": "^0.1.4",
-        "is-glob": "^4.0.0",
-        "is-path-inside": "^3.0.3",
-        "js-sdsl": "^4.1.4",
-        "js-yaml": "^4.1.0",
-        "json-stable-stringify-without-jsonify": "^1.0.1",
-        "levn": "^0.4.1",
-        "lodash.merge": "^4.6.2",
-        "minimatch": "^3.1.2",
-        "natural-compare": "^1.4.0",
-        "optionator": "^0.9.1",
-        "strip-ansi": "^6.0.1",
-        "strip-json-comments": "^3.1.0",
-        "text-table": "^0.2.0"
-      },
-      "dependencies": {
-        "ansi-styles": {
-          "version": "4.3.0",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-          "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-          "dev": true,
-          "requires": {
-            "color-convert": "^2.0.1"
-          }
-        },
-        "chalk": {
-          "version": "4.1.2",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-          "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
-          "dev": true,
-          "requires": {
-            "ansi-styles": "^4.1.0",
-            "supports-color": "^7.1.0"
-          }
-        },
-        "color-convert": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-          "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-          "dev": true,
-          "requires": {
-            "color-name": "~1.1.4"
-          }
-        },
-        "color-name": {
-          "version": "1.1.4",
-          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-          "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-          "dev": true
-        },
-        "escape-string-regexp": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz",
-          "integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==",
-          "dev": true
-        },
-        "eslint-scope": {
-          "version": "7.2.2",
-          "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-7.2.2.tgz",
-          "integrity": "sha512-dOt21O7lTMhDM+X9mB4GX+DZrZtCUJPL/wlcTqxyrx5IvO0IYtILdtrQGQp+8n5S0gwSVmOf9NQrjMOgfQZlIg==",
-          "dev": true,
-          "requires": {
-            "esrecurse": "^4.3.0",
-            "estraverse": "^5.2.0"
-          }
-        },
-        "globals": {
-          "version": "13.20.0",
-          "resolved": "https://registry.npmjs.org/globals/-/globals-13.20.0.tgz",
-          "integrity": "sha512-Qg5QtVkCy/kv3FUSlu4ukeZDVf9ee0iXLAUYX13gbR17bnejFTzr4iS9bY7kwCf1NztRNm1t91fjOiyx4CSwPQ==",
-          "dev": true,
-          "requires": {
-            "type-fest": "^0.20.2"
-          }
-        },
-        "has-flag": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-          "dev": true
-        },
-        "is-path-inside": {
-          "version": "3.0.3",
-          "resolved": "https://registry.npmjs.org/is-path-inside/-/is-path-inside-3.0.3.tgz",
-          "integrity": "sha512-Fd4gABb+ycGAmKou8eMftCupSir5lRxqf4aD/vd0cD2qc4HL07OjCeuHMr8Ro4CoMaeCKDB0/ECBOVWjTwUvPQ==",
-          "dev": true
-        },
-        "supports-color": {
-          "version": "7.2.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-          "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-          "dev": true,
-          "requires": {
-            "has-flag": "^4.0.0"
-          }
-        },
-        "type-fest": {
-          "version": "0.20.2",
-          "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.20.2.tgz",
-          "integrity": "sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==",
-          "dev": true
-        }
-      }
-    },
-    "eslint-config-airbnb": {
-      "version": "19.0.4",
-      "resolved": "https://registry.npmjs.org/eslint-config-airbnb/-/eslint-config-airbnb-19.0.4.tgz",
-      "integrity": "sha512-T75QYQVQX57jiNgpF9r1KegMICE94VYwoFQyMGhrvc+lB8YF2E/M/PYDaQe1AJcWaEgqLE+ErXV1Og/+6Vyzew==",
-      "dev": true,
-      "requires": {
-        "eslint-config-airbnb-base": "^15.0.0",
-        "object.assign": "^4.1.2",
-        "object.entries": "^1.1.5"
-      }
-    },
-    "eslint-config-airbnb-base": {
-      "version": "15.0.0",
-      "resolved": "https://registry.npmjs.org/eslint-config-airbnb-base/-/eslint-config-airbnb-base-15.0.0.tgz",
-      "integrity": "sha512-xaX3z4ZZIcFLvh2oUNvcX5oEofXda7giYmuplVxoOg5A7EXJMrUyqRgR+mhDhPK8LZ4PttFOBvCYDbX3sUoUig==",
-      "dev": true,
-      "requires": {
-        "confusing-browser-globals": "^1.0.10",
-        "object.assign": "^4.1.2",
-        "object.entries": "^1.1.5",
-        "semver": "^6.3.0"
-      }
-    },
-    "eslint-config-airbnb-typescript": {
-      "version": "17.1.0",
-      "resolved": "https://registry.npmjs.org/eslint-config-airbnb-typescript/-/eslint-config-airbnb-typescript-17.1.0.tgz",
-      "integrity": "sha512-GPxI5URre6dDpJ0CtcthSZVBAfI+Uw7un5OYNVxP2EYi3H81Jw701yFP7AU+/vCE7xBtFmjge7kfhhk4+RAiig==",
-      "dev": true,
-      "requires": {
-        "eslint-config-airbnb-base": "^15.0.0"
-      }
-    },
-    "eslint-config-prettier": {
-      "version": "8.10.0",
-      "resolved": "https://registry.npmjs.org/eslint-config-prettier/-/eslint-config-prettier-8.10.0.tgz",
-      "integrity": "sha512-SM8AMJdeQqRYT9O9zguiruQZaN7+z+E4eAP9oiLNGKMtomwaB1E9dcgUD6ZAn/eQAb52USbvezbiljfZUhbJcg==",
-      "dev": true,
-      "requires": {}
-    },
-    "eslint-import-resolver-node": {
-      "version": "0.3.7",
-      "resolved": "https://registry.npmjs.org/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.7.tgz",
-      "integrity": "sha512-gozW2blMLJCeFpBwugLTGyvVjNoeo1knonXAcatC6bjPBZitotxdWf7Gimr25N4c0AAOo4eOUfaG82IJPDpqCA==",
-      "dev": true,
-      "requires": {
-        "debug": "^3.2.7",
-        "is-core-module": "^2.11.0",
-        "resolve": "^1.22.1"
-      },
-      "dependencies": {
-        "debug": {
-          "version": "3.2.7",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz",
-          "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==",
-          "dev": true,
-          "requires": {
-            "ms": "^2.1.1"
-          }
-        }
-      }
-    },
-    "eslint-module-utils": {
-      "version": "2.8.0",
-      "resolved": "https://registry.npmjs.org/eslint-module-utils/-/eslint-module-utils-2.8.0.tgz",
-      "integrity": "sha512-aWajIYfsqCKRDgUfjEXNN/JlrzauMuSEy5sbd7WXbtW3EH6A6MpwEh42c7qD+MqQo9QMJ6fWLAeIJynx0g6OAw==",
-      "dev": true,
-      "requires": {
-        "debug": "^3.2.7"
-      },
-      "dependencies": {
-        "debug": {
-          "version": "3.2.7",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz",
-          "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==",
-          "dev": true,
-          "requires": {
-            "ms": "^2.1.1"
-          }
-        }
-      }
-    },
-    "eslint-plugin-import": {
-      "version": "2.28.0",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-import/-/eslint-plugin-import-2.28.0.tgz",
-      "integrity": "sha512-B8s/n+ZluN7sxj9eUf7/pRFERX0r5bnFA2dCaLHy2ZeaQEAz0k+ZZkFWRFHJAqxfxQDx6KLv9LeIki7cFdwW+Q==",
-      "dev": true,
-      "requires": {
-        "array-includes": "^3.1.6",
-        "array.prototype.findlastindex": "^1.2.2",
-        "array.prototype.flat": "^1.3.1",
-        "array.prototype.flatmap": "^1.3.1",
-        "debug": "^3.2.7",
-        "doctrine": "^2.1.0",
-        "eslint-import-resolver-node": "^0.3.7",
-        "eslint-module-utils": "^2.8.0",
-        "has": "^1.0.3",
-        "is-core-module": "^2.12.1",
-        "is-glob": "^4.0.3",
-        "minimatch": "^3.1.2",
-        "object.fromentries": "^2.0.6",
-        "object.groupby": "^1.0.0",
-        "object.values": "^1.1.6",
-        "resolve": "^1.22.3",
-        "semver": "^6.3.1",
-        "tsconfig-paths": "^3.14.2"
-      },
-      "dependencies": {
-        "debug": {
-          "version": "3.2.7",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz",
-          "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==",
-          "dev": true,
-          "requires": {
-            "ms": "^2.1.1"
-          }
-        },
-        "doctrine": {
-          "version": "2.1.0",
-          "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-2.1.0.tgz",
-          "integrity": "sha512-35mSku4ZXK0vfCuHEDAwt55dg2jNajHZ1odvF+8SSr82EsZY4QmXfuWso8oEd8zRhVObSN18aM0CjSdoBX7zIw==",
-          "dev": true,
-          "requires": {
-            "esutils": "^2.0.2"
-          }
-        }
-      }
-    },
-    "eslint-plugin-jsx-a11y": {
-      "version": "6.7.1",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-jsx-a11y/-/eslint-plugin-jsx-a11y-6.7.1.tgz",
-      "integrity": "sha512-63Bog4iIethyo8smBklORknVjB0T2dwB8Mr/hIC+fBS0uyHdYYpzM/Ed+YC8VxTjlXHEWFOdmgwcDn1U2L9VCA==",
-      "dev": true,
-      "requires": {
-        "@babel/runtime": "^7.20.7",
-        "aria-query": "^5.1.3",
-        "array-includes": "^3.1.6",
-        "array.prototype.flatmap": "^1.3.1",
-        "ast-types-flow": "^0.0.7",
-        "axe-core": "^4.6.2",
-        "axobject-query": "^3.1.1",
-        "damerau-levenshtein": "^1.0.8",
-        "emoji-regex": "^9.2.2",
-        "has": "^1.0.3",
-        "jsx-ast-utils": "^3.3.3",
-        "language-tags": "=1.0.5",
-        "minimatch": "^3.1.2",
-        "object.entries": "^1.1.6",
-        "object.fromentries": "^2.0.6",
-        "semver": "^6.3.0"
-      }
-    },
-    "eslint-plugin-no-inline-styles": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-no-inline-styles/-/eslint-plugin-no-inline-styles-1.0.5.tgz",
-      "integrity": "sha512-nftOfHV/ag0P0vEPQ3p54HVpGCp6k/E+pHdYnRm2wDK8QhClfmMjrCw+POL5RH/SN1AmTifCTh5VzkeubLgMpA==",
-      "dev": true,
-      "requires": {
-        "lodash.get": "^4.4.2"
-      }
-    },
-    "eslint-plugin-playwright": {
-      "version": "1.6.0",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-playwright/-/eslint-plugin-playwright-1.6.0.tgz",
-      "integrity": "sha512-tI1E/EDbHT4Fx5KvukUG3RTIT0gk44gvTP8bNwxLCFsUXVM98ZJG5zWU6Om5JOzH9FrmN4AhMu/UKyEsu0ZoDA==",
-      "dev": true,
-      "requires": {
-        "globals": "^13.23.0"
-      },
-      "dependencies": {
-        "globals": {
-          "version": "13.24.0",
-          "resolved": "https://registry.npmjs.org/globals/-/globals-13.24.0.tgz",
-          "integrity": "sha512-AhO5QUcj8llrbG09iWhPU2B204J1xnPeL8kQmVorSsy+Sjj1sk8gIyh6cUocGmH4L0UuhAJy+hJMRA4mgA4mFQ==",
-          "dev": true,
-          "requires": {
-            "type-fest": "^0.20.2"
-          }
-        },
-        "type-fest": {
-          "version": "0.20.2",
-          "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.20.2.tgz",
-          "integrity": "sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==",
-          "dev": true
-        }
-      }
-    },
-    "eslint-plugin-prettier": {
-      "version": "4.2.1",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-prettier/-/eslint-plugin-prettier-4.2.1.tgz",
-      "integrity": "sha512-f/0rXLXUt0oFYs8ra4w49wYZBG5GKZpAYsJSm6rnYL5uVDjd+zowwMwVZHnAjf4edNrKpCDYfXDgmRE/Ak7QyQ==",
-      "dev": true,
-      "requires": {
-        "prettier-linter-helpers": "^1.0.0"
-      }
-    },
-    "eslint-plugin-react": {
-      "version": "7.33.1",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-react/-/eslint-plugin-react-7.33.1.tgz",
-      "integrity": "sha512-L093k0WAMvr6VhNwReB8VgOq5s2LesZmrpPdKz/kZElQDzqS7G7+DnKoqT+w4JwuiGeAhAvHO0fvy0Eyk4ejDA==",
-      "dev": true,
-      "requires": {
-        "array-includes": "^3.1.6",
-        "array.prototype.flatmap": "^1.3.1",
-        "array.prototype.tosorted": "^1.1.1",
-        "doctrine": "^2.1.0",
-        "estraverse": "^5.3.0",
-        "jsx-ast-utils": "^2.4.1 || ^3.0.0",
-        "minimatch": "^3.1.2",
-        "object.entries": "^1.1.6",
-        "object.fromentries": "^2.0.6",
-        "object.hasown": "^1.1.2",
-        "object.values": "^1.1.6",
-        "prop-types": "^15.8.1",
-        "resolve": "^2.0.0-next.4",
-        "semver": "^6.3.1",
-        "string.prototype.matchall": "^4.0.8"
-      },
-      "dependencies": {
-        "doctrine": {
-          "version": "2.1.0",
-          "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-2.1.0.tgz",
-          "integrity": "sha512-35mSku4ZXK0vfCuHEDAwt55dg2jNajHZ1odvF+8SSr82EsZY4QmXfuWso8oEd8zRhVObSN18aM0CjSdoBX7zIw==",
-          "dev": true,
-          "requires": {
-            "esutils": "^2.0.2"
-          }
-        },
-        "resolve": {
-          "version": "2.0.0-next.4",
-          "resolved": "https://registry.npmjs.org/resolve/-/resolve-2.0.0-next.4.tgz",
-          "integrity": "sha512-iMDbmAWtfU+MHpxt/I5iWI7cY6YVEZUQ3MBgPQ++XD1PELuJHIl82xBmObyP2KyQmkNB2dsqF7seoQQiAn5yDQ==",
-          "dev": true,
-          "requires": {
-            "is-core-module": "^2.9.0",
-            "path-parse": "^1.0.7",
-            "supports-preserve-symlinks-flag": "^1.0.0"
-          }
-        }
-      }
-    },
-    "eslint-plugin-react-hooks": {
-      "version": "4.6.0",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-react-hooks/-/eslint-plugin-react-hooks-4.6.0.tgz",
-      "integrity": "sha512-oFc7Itz9Qxh2x4gNHStv3BqJq54ExXmfC+a1NjAta66IAN87Wu0R/QArgIS9qKzX3dXKPI9H5crl9QchNMY9+g==",
-      "dev": true,
-      "requires": {}
-    },
-    "eslint-scope": {
-      "version": "5.1.1",
-      "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.1.1.tgz",
-      "integrity": "sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw==",
-      "dev": true,
-      "requires": {
-        "esrecurse": "^4.3.0",
-        "estraverse": "^4.1.1"
-      },
-      "dependencies": {
-        "estraverse": {
-          "version": "4.3.0",
-          "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.3.0.tgz",
-          "integrity": "sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==",
-          "dev": true
-        }
-      }
-    },
-    "eslint-visitor-keys": {
-      "version": "3.4.2",
-      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.4.2.tgz",
-      "integrity": "sha512-8drBzUEyZ2llkpCA67iYrgEssKDUu68V8ChqqOfFupIaG/LCVPUT+CoGJpT77zJprs4T/W7p07LP7zAIMuweVw==",
-      "dev": true
-    },
-    "espree": {
-      "version": "9.6.1",
-      "resolved": "https://registry.npmjs.org/espree/-/espree-9.6.1.tgz",
-      "integrity": "sha512-oruZaFkjorTpF32kDSI5/75ViwGeZginGGy2NoOSg3Q9bnwlnmDm4HLnkl0RE3n+njDXR037aY1+x58Z/zFdwQ==",
-      "dev": true,
-      "requires": {
-        "acorn": "^8.9.0",
-        "acorn-jsx": "^5.3.2",
-        "eslint-visitor-keys": "^3.4.1"
-      }
-    },
-    "esquery": {
-      "version": "1.5.0",
-      "resolved": "https://registry.npmjs.org/esquery/-/esquery-1.5.0.tgz",
-      "integrity": "sha512-YQLXUplAwJgCydQ78IMJywZCceoqk1oH01OERdSAJc/7U2AylwjhSCLDEtqwg811idIS/9fIU5GjG73IgjKMVg==",
-      "dev": true,
-      "requires": {
-        "estraverse": "^5.1.0"
-      }
-    },
-    "esrecurse": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/esrecurse/-/esrecurse-4.3.0.tgz",
-      "integrity": "sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag==",
-      "dev": true,
-      "requires": {
-        "estraverse": "^5.2.0"
-      }
-    },
-    "estraverse": {
-      "version": "5.3.0",
-      "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz",
-      "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==",
-      "dev": true
-    },
-    "esutils": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.3.tgz",
-      "integrity": "sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==",
-      "dev": true
-    },
-    "etag": {
-      "version": "1.8.1",
-      "resolved": "https://registry.npmjs.org/etag/-/etag-1.8.1.tgz",
-      "integrity": "sha512-aIL5Fx7mawVa300al2BnEE4iNvo1qETxLrPI/o05L7z6go7fCw1J6EQmbK4FmJ2AS7kgVF/KEZWufBfdClMcPg==",
-      "dev": true
-    },
-    "eventemitter3": {
-      "version": "4.0.7",
-      "resolved": "https://registry.npmjs.org/eventemitter3/-/eventemitter3-4.0.7.tgz",
-      "integrity": "sha512-8guHBZCwKnFhYdHr2ysuRWErTwhoN2X8XELRlrRwpmfeY2jjuUN4taQMsULKUVo1K4DvZl+0pgfyoysHxvmvEw=="
-    },
-    "events": {
-      "version": "3.3.0",
-      "resolved": "https://registry.npmjs.org/events/-/events-3.3.0.tgz",
-      "integrity": "sha512-mQw+2fkQbALzQ7V0MY0IqdnXNOeTtP4r0lN9z7AAawCXgqea7bDii20AYrIBrFd/Hx0M2Ocz6S111CaFkUcb0Q=="
-    },
-    "evp_bytestokey": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/evp_bytestokey/-/evp_bytestokey-1.0.3.tgz",
-      "integrity": "sha512-/f2Go4TognH/KvCISP7OUsHn85hT9nUkxxA9BEWxFn+Oj9o8ZNLm/40hdlgSLyuOimsrTKLUMEorQexp/aPQeA==",
-      "requires": {
-        "md5.js": "^1.3.4",
-        "safe-buffer": "^5.1.1"
-      }
-    },
-    "execa": {
-      "version": "5.1.1",
-      "resolved": "https://registry.npmjs.org/execa/-/execa-5.1.1.tgz",
-      "integrity": "sha512-8uSpZZocAZRBAPIEINJj3Lo9HyGitllczc27Eh5YYojjMFMn8yHMDMaUHE2Jqfq05D/wucwI4JGURyXt1vchyg==",
-      "dev": true,
-      "requires": {
-        "cross-spawn": "^7.0.3",
-        "get-stream": "^6.0.0",
-        "human-signals": "^2.1.0",
-        "is-stream": "^2.0.0",
-        "merge-stream": "^2.0.0",
-        "npm-run-path": "^4.0.1",
-        "onetime": "^5.1.2",
-        "signal-exit": "^3.0.3",
-        "strip-final-newline": "^2.0.0"
-      }
-    },
-    "exenv": {
-      "version": "1.2.2",
-      "resolved": "https://registry.npmjs.org/exenv/-/exenv-1.2.2.tgz",
-      "integrity": "sha512-Z+ktTxTwv9ILfgKCk32OX3n/doe+OcLTRtqK9pcL+JsP3J1/VW8Uvl4ZjLlKqeW4rzK4oesDOGMEMRIZqtP4Iw=="
-    },
-    "express": {
-      "version": "4.18.2",
-      "resolved": "https://registry.npmjs.org/express/-/express-4.18.2.tgz",
-      "integrity": "sha512-5/PsL6iGPdfQ/lKM1UuielYgv3BUoJfz1aUwU9vHZ+J7gyvwdQXFEBIEIaxeGf0GIcreATNyBExtalisDbuMqQ==",
-      "dev": true,
-      "requires": {
-        "accepts": "~1.3.8",
-        "array-flatten": "1.1.1",
-        "body-parser": "1.20.1",
-        "content-disposition": "0.5.4",
-        "content-type": "~1.0.4",
-        "cookie": "0.5.0",
-        "cookie-signature": "1.0.6",
-        "debug": "2.6.9",
-        "depd": "2.0.0",
-        "encodeurl": "~1.0.2",
-        "escape-html": "~1.0.3",
-        "etag": "~1.8.1",
-        "finalhandler": "1.2.0",
-        "fresh": "0.5.2",
-        "http-errors": "2.0.0",
-        "merge-descriptors": "1.0.1",
-        "methods": "~1.1.2",
-        "on-finished": "2.4.1",
-        "parseurl": "~1.3.3",
-        "path-to-regexp": "0.1.7",
-        "proxy-addr": "~2.0.7",
-        "qs": "6.11.0",
-        "range-parser": "~1.2.1",
-        "safe-buffer": "5.2.1",
-        "send": "0.18.0",
-        "serve-static": "1.15.0",
-        "setprototypeof": "1.2.0",
-        "statuses": "2.0.1",
-        "type-is": "~1.6.18",
-        "utils-merge": "1.0.1",
-        "vary": "~1.1.2"
-      },
-      "dependencies": {
-        "array-flatten": {
-          "version": "1.1.1",
-          "resolved": "https://registry.npmjs.org/array-flatten/-/array-flatten-1.1.1.tgz",
-          "integrity": "sha512-PCVAQswWemu6UdxsDFFX/+gVeYqKAod3D3UVm91jHwynguOwAvYPhx8nNlM++NqRcK6CxxpUafjmhIdKiHibqg==",
-          "dev": true
-        },
-        "debug": {
-          "version": "2.6.9",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-          "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
-          "dev": true,
-          "requires": {
-            "ms": "2.0.0"
-          }
-        },
-        "ms": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-          "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==",
-          "dev": true
-        },
-        "qs": {
-          "version": "6.11.0",
-          "resolved": "https://registry.npmjs.org/qs/-/qs-6.11.0.tgz",
-          "integrity": "sha512-MvjoMCJwEarSbUYk5O+nmoSzSutSsTwF85zcHPQ9OrlFoZOYIjaqBAJIqIXjptyD5vThxGq52Xu/MaJzRkIk4Q==",
-          "dev": true,
-          "requires": {
-            "side-channel": "^1.0.4"
-          }
-        }
-      }
-    },
-    "fast-deep-equal": {
-      "version": "3.1.3",
-      "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz",
-      "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==",
-      "dev": true
-    },
-    "fast-diff": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/fast-diff/-/fast-diff-1.3.0.tgz",
-      "integrity": "sha512-VxPP4NqbUjj6MaAOafWeUn2cXWLcCtljklUtZf0Ind4XQ+QPtmA0b18zZy0jIQx+ExRVCR/ZQpBmik5lXshNsw==",
-      "dev": true
-    },
-    "fast-glob": {
-      "version": "3.3.2",
-      "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.3.2.tgz",
-      "integrity": "sha512-oX2ruAFQwf/Orj8m737Y5adxDQO0LAB7/S5MnxCdTNDd4p6BsyIVsv9JQsATbTSq8KHRpLwIHbVlUNatxd+1Ow==",
-      "dev": true,
-      "requires": {
-        "@nodelib/fs.stat": "^2.0.2",
-        "@nodelib/fs.walk": "^1.2.3",
-        "glob-parent": "^5.1.2",
-        "merge2": "^1.3.0",
-        "micromatch": "^4.0.4"
-      },
-      "dependencies": {
-        "glob-parent": {
-          "version": "5.1.2",
-          "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz",
-          "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==",
-          "dev": true,
-          "requires": {
-            "is-glob": "^4.0.1"
-          }
-        }
-      }
-    },
-    "fast-json-stable-stringify": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz",
-      "integrity": "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==",
-      "dev": true
-    },
-    "fast-levenshtein": {
-      "version": "2.0.6",
-      "resolved": "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz",
-      "integrity": "sha512-DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw==",
-      "dev": true
-    },
-    "fastq": {
-      "version": "1.15.0",
-      "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.15.0.tgz",
-      "integrity": "sha512-wBrocU2LCXXa+lWBt8RoIRD89Fi8OdABODa/kEnyeyjS5aZO5/GNvI5sEINADqP/h8M29UHTHUb53sUu5Ihqdw==",
-      "dev": true,
-      "requires": {
-        "reusify": "^1.0.4"
-      }
-    },
-    "faye-websocket": {
-      "version": "0.11.4",
-      "resolved": "https://registry.npmjs.org/faye-websocket/-/faye-websocket-0.11.4.tgz",
-      "integrity": "sha512-CzbClwlXAuiRQAlUyfqPgvPoNKTckTPGfwZV4ZdAhVcP2lh9KUxJg2b5GkE7XbjKQ3YJnQ9z6D9ntLAlB+tP8g==",
-      "dev": true,
-      "requires": {
-        "websocket-driver": ">=0.5.1"
-      }
-    },
-    "file-entry-cache": {
-      "version": "6.0.1",
-      "resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-6.0.1.tgz",
-      "integrity": "sha512-7Gps/XWymbLk2QLYK4NzpMOrYjMhdIxXuIvy2QBsLE6ljuodKvdkWs/cpyJJ3CVIVpH0Oi1Hvg1ovbMzLdFBBg==",
-      "dev": true,
-      "requires": {
-        "flat-cache": "^3.0.4"
-      }
-    },
-    "file-uri-to-path": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/file-uri-to-path/-/file-uri-to-path-1.0.0.tgz",
-      "integrity": "sha512-0Zt+s3L7Vf1biwWZ29aARiVYLx7iMGnEUl9x33fbB/j3jR81u/O2LbqK+Bm1CDSNDKVtJ/YjwY7TUd5SkeLQLw=="
-    },
-    "fill-range": {
-      "version": "7.0.1",
-      "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz",
-      "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==",
-      "dev": true,
-      "requires": {
-        "to-regex-range": "^5.0.1"
-      }
-    },
-    "filter-obj": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/filter-obj/-/filter-obj-1.1.0.tgz",
-      "integrity": "sha512-8rXg1ZnX7xzy2NGDVkBVaAy+lSlPNwad13BtgSlLuxfIslyt5Vg64U7tFcCt4WS1R0hvtnQybT/IyCkGZ3DpXQ==",
-      "dev": true
-    },
-    "finalhandler": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.2.0.tgz",
-      "integrity": "sha512-5uXcUVftlQMFnWC9qu/svkWv3GTd2PfUhK/3PLkYNAe7FbqJMt3515HaxE6eRL74GdsriiwujiawdaB1BpEISg==",
-      "dev": true,
-      "requires": {
-        "debug": "2.6.9",
-        "encodeurl": "~1.0.2",
-        "escape-html": "~1.0.3",
-        "on-finished": "2.4.1",
-        "parseurl": "~1.3.3",
-        "statuses": "2.0.1",
-        "unpipe": "~1.0.0"
-      },
-      "dependencies": {
-        "debug": {
-          "version": "2.6.9",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-          "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
-          "dev": true,
-          "requires": {
-            "ms": "2.0.0"
-          }
-        },
-        "ms": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-          "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==",
-          "dev": true
-        }
-      }
-    },
-    "find-up": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/find-up/-/find-up-5.0.0.tgz",
-      "integrity": "sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng==",
-      "dev": true,
-      "requires": {
-        "locate-path": "^6.0.0",
-        "path-exists": "^4.0.0"
-      }
-    },
-    "flat-cache": {
-      "version": "3.0.4",
-      "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-3.0.4.tgz",
-      "integrity": "sha512-dm9s5Pw7Jc0GvMYbshN6zchCA9RgQlzzEZX3vylR9IqFfS8XciblUXOKfW6SiuJ0e13eDYZoZV5wdrev7P3Nwg==",
-      "dev": true,
-      "requires": {
-        "flatted": "^3.1.0",
-        "rimraf": "^3.0.2"
-      }
-    },
-    "flatted": {
-      "version": "3.2.7",
-      "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.2.7.tgz",
-      "integrity": "sha512-5nqDSxl8nn5BSNxyR3n4I6eDmbolI6WT+QqR547RwxQapgjQBmtktdP+HTBb/a/zLsbzERTONyUB5pefh5TtjQ==",
-      "dev": true
-    },
-    "follow-redirects": {
-      "version": "1.15.6",
-      "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.6.tgz",
-      "integrity": "sha512-wWN62YITEaOpSK584EZXJafH1AGpO8RVgElfkuXbTOrPX4fIfOyEpW/CsiNd8JdYrAoOvafRTOEnvsO++qCqFA=="
-    },
-    "for-each": {
-      "version": "0.3.3",
-      "resolved": "https://registry.npmjs.org/for-each/-/for-each-0.3.3.tgz",
-      "integrity": "sha512-jqYfLp7mo9vIyQf8ykW2v7A+2N4QjeCeI5+Dz9XraiO1ign81wjiH7Fb9vSOWvQfNtmSa4H2RoQTrrXivdUZmw==",
-      "requires": {
-        "is-callable": "^1.1.3"
-      }
-    },
-    "fork-ts-checker-webpack-plugin": {
-      "version": "9.0.2",
-      "resolved": "https://registry.npmjs.org/fork-ts-checker-webpack-plugin/-/fork-ts-checker-webpack-plugin-9.0.2.tgz",
-      "integrity": "sha512-Uochze2R8peoN1XqlSi/rGUkDQpRogtLFocP9+PGu68zk1BDAKXfdeCdyVZpgTk8V8WFVQXdEz426VKjXLO1Gg==",
-      "dev": true,
-      "requires": {
-        "@babel/code-frame": "^7.16.7",
-        "chalk": "^4.1.2",
-        "chokidar": "^3.5.3",
-        "cosmiconfig": "^8.2.0",
-        "deepmerge": "^4.2.2",
-        "fs-extra": "^10.0.0",
-        "memfs": "^3.4.1",
-        "minimatch": "^3.0.4",
-        "node-abort-controller": "^3.0.1",
-        "schema-utils": "^3.1.1",
-        "semver": "^7.3.5",
-        "tapable": "^2.2.1"
-      },
-      "dependencies": {
-        "ansi-styles": {
-          "version": "4.3.0",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-          "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-          "dev": true,
-          "requires": {
-            "color-convert": "^2.0.1"
-          }
-        },
-        "chalk": {
-          "version": "4.1.2",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-          "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
-          "dev": true,
-          "requires": {
-            "ansi-styles": "^4.1.0",
-            "supports-color": "^7.1.0"
-          }
-        },
-        "color-convert": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-          "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-          "dev": true,
-          "requires": {
-            "color-name": "~1.1.4"
-          }
-        },
-        "color-name": {
-          "version": "1.1.4",
-          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-          "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-          "dev": true
-        },
-        "cosmiconfig": {
-          "version": "8.3.6",
-          "resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-8.3.6.tgz",
-          "integrity": "sha512-kcZ6+W5QzcJ3P1Mt+83OUv/oHFqZHIx8DuxG6eZ5RGMERoLqp4BuGjhHLYGK+Kf5XVkQvqBSmAy/nGWN3qDgEA==",
-          "dev": true,
-          "requires": {
-            "import-fresh": "^3.3.0",
-            "js-yaml": "^4.1.0",
-            "parse-json": "^5.2.0",
-            "path-type": "^4.0.0"
-          }
-        },
-        "has-flag": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-          "dev": true
-        },
-        "lru-cache": {
-          "version": "6.0.0",
-          "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
-          "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
-          "dev": true,
-          "requires": {
-            "yallist": "^4.0.0"
-          }
-        },
-        "semver": {
-          "version": "7.5.4",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz",
-          "integrity": "sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==",
-          "dev": true,
-          "requires": {
-            "lru-cache": "^6.0.0"
-          }
-        },
-        "supports-color": {
-          "version": "7.2.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-          "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-          "dev": true,
-          "requires": {
-            "has-flag": "^4.0.0"
-          }
-        },
-        "yallist": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
-          "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==",
-          "dev": true
-        }
-      }
-    },
-    "form-data": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.0.tgz",
-      "integrity": "sha512-ETEklSGi5t0QMZuiXoA/Q6vcnxcLQP5vdugSpuAyi6SVGi2clPPp+xgEhuMaHC+zGgn31Kd235W35f7Hykkaww==",
-      "requires": {
-        "asynckit": "^0.4.0",
-        "combined-stream": "^1.0.8",
-        "mime-types": "^2.1.12"
-      }
-    },
-    "forwarded": {
-      "version": "0.2.0",
-      "resolved": "https://registry.npmjs.org/forwarded/-/forwarded-0.2.0.tgz",
-      "integrity": "sha512-buRG0fpBtRHSTCOASe6hD258tEubFoRLb4ZNA6NxMVHNw2gOcwHo9wyablzMzOA5z9xA9L1KNjk/Nt6MT9aYow==",
-      "dev": true
-    },
-    "fresh": {
-      "version": "0.5.2",
-      "resolved": "https://registry.npmjs.org/fresh/-/fresh-0.5.2.tgz",
-      "integrity": "sha512-zJ2mQYM18rEFOudeV4GShTGIQ7RbzA7ozbU9I/XBpm7kqgMywgmylMwXHxZJmkVoYkna9d2pVXVXPdYTP9ej8Q==",
-      "dev": true
-    },
-    "fs-extra": {
-      "version": "10.1.0",
-      "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-10.1.0.tgz",
-      "integrity": "sha512-oRXApq54ETRj4eMiFzGnHWGy+zo5raudjuxN0b8H7s/RU2oW0Wvsx9O0ACRN/kRq9E8Vu/ReskGB5o3ji+FzHQ==",
-      "dev": true,
-      "requires": {
-        "graceful-fs": "^4.2.0",
-        "jsonfile": "^6.0.1",
-        "universalify": "^2.0.0"
-      }
-    },
-    "fs-monkey": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/fs-monkey/-/fs-monkey-1.0.4.tgz",
-      "integrity": "sha512-INM/fWAxMICjttnD0DX1rBvinKskj5G1w+oy/pnm9u/tSlnBrzFonJMcalKJ30P8RRsPzKcCG7Q8l0jx5Fh9YQ==",
-      "dev": true
-    },
-    "fs.realpath": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
-      "integrity": "sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw=="
-    },
-    "fsevents": {
-      "version": "2.3.3",
-      "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.3.tgz",
-      "integrity": "sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==",
-      "dev": true,
-      "optional": true
-    },
-    "function-bind": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.2.tgz",
-      "integrity": "sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA=="
-    },
-    "function.prototype.name": {
-      "version": "1.1.5",
-      "resolved": "https://registry.npmjs.org/function.prototype.name/-/function.prototype.name-1.1.5.tgz",
-      "integrity": "sha512-uN7m/BzVKQnCUF/iW8jYea67v++2u7m5UgENbHRtdDVclOUP+FMPlCNdmk0h/ysGyo2tavMJEDqJAkJdRa1vMA==",
-      "dev": true,
-      "requires": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.1.3",
-        "es-abstract": "^1.19.0",
-        "functions-have-names": "^1.2.2"
-      }
-    },
-    "functions-have-names": {
-      "version": "1.2.3",
-      "resolved": "https://registry.npmjs.org/functions-have-names/-/functions-have-names-1.2.3.tgz",
-      "integrity": "sha512-xckBUXyTIqT97tq2x2AMb+g163b5JFysYk0x4qxNFwbfQkmNZoiRHb6sPzI9/QV33WeuvVYBUIiD4NzNIyqaRQ==",
-      "dev": true
-    },
-    "gensync": {
-      "version": "1.0.0-beta.2",
-      "resolved": "https://registry.npmjs.org/gensync/-/gensync-1.0.0-beta.2.tgz",
-      "integrity": "sha512-3hN7NaskYvMDLQY55gnW3NQ+mesEAepTqlg+VEbj7zzqEMBVNhzcGYYeqFo/TlYz6eQiFcp1HcsCZO+nGgS8zg==",
-      "peer": true
-    },
-    "get-caller-file": {
-      "version": "2.0.5",
-      "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz",
-      "integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg=="
-    },
-    "get-func-name": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/get-func-name/-/get-func-name-2.0.2.tgz",
-      "integrity": "sha512-8vXOvuE167CtIc3OyItco7N/dpRtBbYOsPsXCz7X/PMnlGjYjSGuZJgM1Y7mmew7BKf9BqvLX2tnOVy1BBUsxQ==",
-      "dev": true
-    },
-    "get-intrinsic": {
-      "version": "1.2.4",
-      "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.2.4.tgz",
-      "integrity": "sha512-5uYhsJH8VJBTv7oslg4BznJYhDoRI6waYCxMmCdnTrcCrHA/fCFKoTFz2JKKE0HdDFUF7/oQuhzumXJK7paBRQ==",
-      "requires": {
-        "es-errors": "^1.3.0",
-        "function-bind": "^1.1.2",
-        "has-proto": "^1.0.1",
-        "has-symbols": "^1.0.3",
-        "hasown": "^2.0.0"
-      }
-    },
-    "get-stream": {
-      "version": "6.0.1",
-      "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-6.0.1.tgz",
-      "integrity": "sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg==",
-      "dev": true
-    },
-    "get-symbol-description": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/get-symbol-description/-/get-symbol-description-1.0.0.tgz",
-      "integrity": "sha512-2EmdH1YvIQiZpltCNgkuiUnyukzxM/R6NDJX31Ke3BG1Nq5b0S2PhX59UKi9vZpPDQVdqn+1IcaAwnzTT5vCjw==",
-      "dev": true,
-      "requires": {
-        "call-bind": "^1.0.2",
-        "get-intrinsic": "^1.1.1"
-      }
-    },
-    "glob": {
-      "version": "7.2.3",
-      "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz",
-      "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==",
-      "requires": {
-        "fs.realpath": "^1.0.0",
-        "inflight": "^1.0.4",
-        "inherits": "2",
-        "minimatch": "^3.1.1",
-        "once": "^1.3.0",
-        "path-is-absolute": "^1.0.0"
-      }
-    },
-    "glob-parent": {
-      "version": "6.0.2",
-      "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-6.0.2.tgz",
-      "integrity": "sha512-XxwI8EOhVQgWp6iDL+3b0r86f4d6AX6zSU55HfB4ydCEuXLXc5FcYeOu+nnGftS4TEju/11rt4KJPTMgbfmv4A==",
-      "dev": true,
-      "requires": {
-        "is-glob": "^4.0.3"
-      }
-    },
-    "glob-to-regexp": {
-      "version": "0.4.1",
-      "resolved": "https://registry.npmjs.org/glob-to-regexp/-/glob-to-regexp-0.4.1.tgz",
-      "integrity": "sha512-lkX1HJXwyMcprw/5YUZc2s7DrpAiHB21/V+E1rHUrVNokkvB6bqMzT0VfV6/86ZNabt1k14YOIaT7nDvOX3Iiw==",
-      "dev": true
-    },
-    "globals": {
-      "version": "11.12.0",
-      "resolved": "https://registry.npmjs.org/globals/-/globals-11.12.0.tgz",
-      "integrity": "sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA=="
-    },
-    "globalthis": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/globalthis/-/globalthis-1.0.3.tgz",
-      "integrity": "sha512-sFdI5LyBiNTHjRd7cGPWapiHWMOXKyuBNX/cWJ3NfzrZQVa8GI/8cofCl74AOVqq9W5kNmguTIzJ/1s2gyI9wA==",
-      "dev": true,
-      "requires": {
-        "define-properties": "^1.1.3"
-      }
-    },
-    "globby": {
-      "version": "11.1.0",
-      "resolved": "https://registry.npmjs.org/globby/-/globby-11.1.0.tgz",
-      "integrity": "sha512-jhIXaOzy1sb8IyocaruWSn1TjmnBVs8Ayhcy83rmxNJ8q2uWKCAj3CnJY+KpGSXCueAPc0i05kVvVKtP1t9S3g==",
-      "dev": true,
-      "requires": {
-        "array-union": "^2.1.0",
-        "dir-glob": "^3.0.1",
-        "fast-glob": "^3.2.9",
-        "ignore": "^5.2.0",
-        "merge2": "^1.4.1",
-        "slash": "^3.0.0"
-      }
-    },
-    "globrex": {
-      "version": "0.1.2",
-      "resolved": "https://registry.npmjs.org/globrex/-/globrex-0.1.2.tgz",
-      "integrity": "sha512-uHJgbwAMwNFf5mLst7IWLNg14x1CkeqglJb/K3doi4dw6q2IvAAmM/Y81kevy83wP+Sst+nutFTYOGg3d1lsxg==",
-      "dev": true
-    },
-    "goober": {
-      "version": "2.1.13",
-      "resolved": "https://registry.npmjs.org/goober/-/goober-2.1.13.tgz",
-      "integrity": "sha512-jFj3BQeleOoy7t93E9rZ2de+ScC4lQICLwiAQmKMg9F6roKGaLSHoCDYKkWlSafg138jejvq/mTdvmnwDQgqoQ==",
-      "requires": {}
-    },
-    "gopd": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/gopd/-/gopd-1.0.1.tgz",
-      "integrity": "sha512-d65bNlIadxvpb/A2abVdlqKqV563juRnZ1Wtk6s1sIR8uNsXR70xqIzVqxVf1eTqDunwT2MkczEeaezCKTZhwA==",
-      "requires": {
-        "get-intrinsic": "^1.1.3"
-      }
-    },
-    "graceful-fs": {
-      "version": "4.2.11",
-      "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.11.tgz",
-      "integrity": "sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ==",
-      "dev": true
-    },
-    "grapheme-splitter": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/grapheme-splitter/-/grapheme-splitter-1.0.4.tgz",
-      "integrity": "sha512-bzh50DW9kTPM00T8y4o8vQg89Di9oLJVLW/KaOGIXJWP/iqCN6WKYkbNOF04vFLJhwcpYUh9ydh/+5vpOqV4YQ==",
-      "dev": true
-    },
-    "graphemer": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/graphemer/-/graphemer-1.4.0.tgz",
-      "integrity": "sha512-EtKwoO6kxCL9WO5xipiHTZlSzBm7WLT627TqC/uVRd0HKmq8NXyebnNYxDoBi7wt8eTWrUrKXCOVaFq9x1kgag==",
-      "dev": true
-    },
-    "handle-thing": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/handle-thing/-/handle-thing-2.0.1.tgz",
-      "integrity": "sha512-9Qn4yBxelxoh2Ow62nP+Ka/kMnOXRi8BXnRaUwezLNhqelnN49xKz4F/dPP8OYLxLxq6JDtZb2i9XznUQbNPTg==",
-      "dev": true
-    },
-    "has": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz",
-      "integrity": "sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==",
-      "dev": true,
-      "requires": {
-        "function-bind": "^1.1.1"
-      }
-    },
-    "has-bigints": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/has-bigints/-/has-bigints-1.0.2.tgz",
-      "integrity": "sha512-tSvCKtBr9lkF0Ex0aQiP9N+OpV4zi2r/Nee5VkRDbaqv35RLYMzbwQfFSZZH0kR+Rd6302UJZ2p/bJCEoR3VoQ==",
-      "dev": true
-    },
-    "has-flag": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
-      "integrity": "sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw=="
-    },
-    "has-own-property": {
-      "version": "0.1.0",
-      "resolved": "https://registry.npmjs.org/has-own-property/-/has-own-property-0.1.0.tgz",
-      "integrity": "sha512-14qdBKoonU99XDhWcFKZTShK+QV47qU97u8zzoVo9cL5TZ3BmBHXogItSt9qJjR0KUMFRhcCW8uGIGl8nkl7Aw==",
-      "dev": true
-    },
-    "has-property-descriptors": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/has-property-descriptors/-/has-property-descriptors-1.0.2.tgz",
-      "integrity": "sha512-55JNKuIW+vq4Ke1BjOTjM2YctQIvCT7GFzHwmfZPGo5wnrgkid0YQtnAleFSqumZm4az3n2BS+erby5ipJdgrg==",
-      "requires": {
-        "es-define-property": "^1.0.0"
-      }
-    },
-    "has-proto": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/has-proto/-/has-proto-1.0.1.tgz",
-      "integrity": "sha512-7qE+iP+O+bgF9clE5+UoBFzE65mlBiVj3tKCrlNQ0Ogwm0BjpT/gK4SlLYDMybDh5I3TCTKnPPa0oMG7JDYrhg=="
-    },
-    "has-symbols": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.3.tgz",
-      "integrity": "sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A=="
-    },
-    "has-tostringtag": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/has-tostringtag/-/has-tostringtag-1.0.0.tgz",
-      "integrity": "sha512-kFjcSNhnlGV1kyoGk7OXKSawH5JOb/LzUc5w9B02hOTO0dfFRjbHQKvg1d6cf3HbeUmtU9VbbV3qzZ2Teh97WQ==",
-      "requires": {
-        "has-symbols": "^1.0.2"
-      }
-    },
-    "hash-base": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/hash-base/-/hash-base-3.1.0.tgz",
-      "integrity": "sha512-1nmYp/rhMDiE7AYkDw+lLwlAzz0AntGIe51F3RfFfEqyQ3feY2eI/NcwC6umIQVOASPMsWJLJScWKSSvzL9IVA==",
-      "requires": {
-        "inherits": "^2.0.4",
-        "readable-stream": "^3.6.0",
-        "safe-buffer": "^5.2.0"
-      }
-    },
-    "hash.js": {
-      "version": "1.1.7",
-      "resolved": "https://registry.npmjs.org/hash.js/-/hash.js-1.1.7.tgz",
-      "integrity": "sha512-taOaskGt4z4SOANNseOviYDvjEJinIkRgmp7LbKP2YTTmVxWBl87s/uzK9r+44BclBSp2X7K1hqeNfz9JbBeXA==",
-      "requires": {
-        "inherits": "^2.0.3",
-        "minimalistic-assert": "^1.0.1"
-      }
-    },
-    "hasown": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/hasown/-/hasown-2.0.2.tgz",
-      "integrity": "sha512-0hJU9SCPvmMzIBdZFqNPXWa6dqh7WdH0cII9y+CyS8rG3nL48Bclra9HmKhVVUHyPWNH5Y7xDwAB7bfgSjkUMQ==",
-      "requires": {
-        "function-bind": "^1.1.2"
-      }
-    },
-    "he": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/he/-/he-1.2.0.tgz",
-      "integrity": "sha512-F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw==",
-      "dev": true
-    },
-    "hex-rgb": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/hex-rgb/-/hex-rgb-4.3.0.tgz",
-      "integrity": "sha512-Ox1pJVrDCyGHMG9CFg1tmrRUMRPRsAWYc/PinY0XzJU4K7y7vjNoLKIQ7BR5UJMCxNN8EM1MNDmHWA/B3aZUuw=="
-    },
-    "hmac-drbg": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/hmac-drbg/-/hmac-drbg-1.0.1.tgz",
-      "integrity": "sha512-Tti3gMqLdZfhOQY1Mzf/AanLiqh1WTiJgEj26ZuYQ9fbkLomzGchCws4FyrSd4VkpBfiNhaE1On+lOz894jvXg==",
-      "requires": {
-        "hash.js": "^1.0.3",
-        "minimalistic-assert": "^1.0.0",
-        "minimalistic-crypto-utils": "^1.0.1"
-      }
-    },
-    "hoist-non-react-statics": {
-      "version": "3.3.2",
-      "resolved": "https://registry.npmjs.org/hoist-non-react-statics/-/hoist-non-react-statics-3.3.2.tgz",
-      "integrity": "sha512-/gGivxi8JPKWNm/W0jSmzcMPpfpPLc3dY/6GxhX2hQ9iGj3aDfklV4ET7NjKpSinLpJ5vafa9iiGIEZg10SfBw==",
-      "requires": {
-        "react-is": "^16.7.0"
-      },
-      "dependencies": {
-        "react-is": {
-          "version": "16.13.1",
-          "resolved": "https://registry.npmjs.org/react-is/-/react-is-16.13.1.tgz",
-          "integrity": "sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ=="
-        }
-      }
-    },
-    "hpack.js": {
-      "version": "2.1.6",
-      "resolved": "https://registry.npmjs.org/hpack.js/-/hpack.js-2.1.6.tgz",
-      "integrity": "sha512-zJxVehUdMGIKsRaNt7apO2Gqp0BdqW5yaiGHXXmbpvxgBYVZnAql+BJb4RO5ad2MgpbZKn5G6nMnegrH1FcNYQ==",
-      "dev": true,
-      "requires": {
-        "inherits": "^2.0.1",
-        "obuf": "^1.0.0",
-        "readable-stream": "^2.0.1",
-        "wbuf": "^1.1.0"
-      },
-      "dependencies": {
-        "isarray": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
-          "integrity": "sha512-VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ==",
-          "dev": true
-        },
-        "readable-stream": {
-          "version": "2.3.8",
-          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.8.tgz",
-          "integrity": "sha512-8p0AUk4XODgIewSi0l8Epjs+EVnWiK7NoDIEGU0HhE7+ZyY8D1IMY7odu5lRrFXGg71L15KG8QrPmum45RTtdA==",
-          "dev": true,
-          "requires": {
-            "core-util-is": "~1.0.0",
-            "inherits": "~2.0.3",
-            "isarray": "~1.0.0",
-            "process-nextick-args": "~2.0.0",
-            "safe-buffer": "~5.1.1",
-            "string_decoder": "~1.1.1",
-            "util-deprecate": "~1.0.1"
-          }
-        },
-        "safe-buffer": {
-          "version": "5.1.2",
-          "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
-          "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==",
-          "dev": true
-        },
-        "string_decoder": {
-          "version": "1.1.1",
-          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
-          "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
-          "dev": true,
-          "requires": {
-            "safe-buffer": "~5.1.0"
-          }
-        }
-      }
-    },
-    "html-entities": {
-      "version": "2.4.0",
-      "resolved": "https://registry.npmjs.org/html-entities/-/html-entities-2.4.0.tgz",
-      "integrity": "sha512-igBTJcNNNhvZFRtm8uA6xMY6xYleeDwn3PeBCkDz7tHttv4F2hsDI2aPgNERWzvRcNYHNT3ymRaQzllmXj4YsQ==",
-      "dev": true
-    },
-    "html-loader": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/html-loader/-/html-loader-4.2.0.tgz",
-      "integrity": "sha512-OxCHD3yt+qwqng2vvcaPApCEvbx+nXWu+v69TYHx1FO8bffHn/JjHtE3TTQZmHjwvnJe4xxzuecetDVBrQR1Zg==",
-      "dev": true,
-      "requires": {
-        "html-minifier-terser": "^7.0.0",
-        "parse5": "^7.0.0"
-      }
-    },
-    "html-minifier-terser": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/html-minifier-terser/-/html-minifier-terser-7.2.0.tgz",
-      "integrity": "sha512-tXgn3QfqPIpGl9o+K5tpcj3/MN4SfLtsx2GWwBC3SSd0tXQGyF3gsSqad8loJgKZGM3ZxbYDd5yhiBIdWpmvLA==",
-      "dev": true,
-      "requires": {
-        "camel-case": "^4.1.2",
-        "clean-css": "~5.3.2",
-        "commander": "^10.0.0",
-        "entities": "^4.4.0",
-        "param-case": "^3.0.4",
-        "relateurl": "^0.2.7",
-        "terser": "^5.15.1"
-      }
-    },
-    "html-parse-stringify": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/html-parse-stringify/-/html-parse-stringify-3.0.1.tgz",
-      "integrity": "sha512-KknJ50kTInJ7qIScF3jeaFRpMpE8/lfiTdzf/twXyPBLAGrLRTmkz3AdTnKeh40X8k9L2fdYwEp/42WGXIRGcg==",
-      "requires": {
-        "void-elements": "3.1.0"
-      }
-    },
-    "html-webpack-plugin": {
-      "version": "5.5.3",
-      "resolved": "https://registry.npmjs.org/html-webpack-plugin/-/html-webpack-plugin-5.5.3.tgz",
-      "integrity": "sha512-6YrDKTuqaP/TquFH7h4srYWsZx+x6k6+FbsTm0ziCwGHDP78Unr1r9F/H4+sGmMbX08GQcJ+K64x55b+7VM/jg==",
-      "dev": true,
-      "requires": {
-        "@types/html-minifier-terser": "^6.0.0",
-        "html-minifier-terser": "^6.0.2",
-        "lodash": "^4.17.21",
-        "pretty-error": "^4.0.0",
-        "tapable": "^2.0.0"
-      },
-      "dependencies": {
-        "commander": {
-          "version": "8.3.0",
-          "resolved": "https://registry.npmjs.org/commander/-/commander-8.3.0.tgz",
-          "integrity": "sha512-OkTL9umf+He2DZkUq8f8J9of7yL6RJKI24dVITBmNfZBmri9zYZQrKkuXiKhyfPSu8tUhnVBB1iKXevvnlR4Ww==",
-          "dev": true
-        },
-        "html-minifier-terser": {
-          "version": "6.1.0",
-          "resolved": "https://registry.npmjs.org/html-minifier-terser/-/html-minifier-terser-6.1.0.tgz",
-          "integrity": "sha512-YXxSlJBZTP7RS3tWnQw74ooKa6L9b9i9QYXY21eUEvhZ3u9XLfv6OnFsQq6RxkhHygsaUMvYsZRV5rU/OVNZxw==",
-          "dev": true,
-          "requires": {
-            "camel-case": "^4.1.2",
-            "clean-css": "^5.2.2",
-            "commander": "^8.3.0",
-            "he": "^1.2.0",
-            "param-case": "^3.0.4",
-            "relateurl": "^0.2.7",
-            "terser": "^5.10.0"
-          }
-        }
-      }
-    },
-    "htmlparser2": {
-      "version": "6.1.0",
-      "resolved": "https://registry.npmjs.org/htmlparser2/-/htmlparser2-6.1.0.tgz",
-      "integrity": "sha512-gyyPk6rgonLFEDGoeRgQNaEUvdJ4ktTmmUh/h2t7s+M8oPpIPxgNACWa+6ESR57kXstwqPiCut0V8NRpcwgU7A==",
-      "dev": true,
-      "requires": {
-        "domelementtype": "^2.0.1",
-        "domhandler": "^4.0.0",
-        "domutils": "^2.5.2",
-        "entities": "^2.0.0"
-      },
-      "dependencies": {
-        "entities": {
-          "version": "2.2.0",
-          "resolved": "https://registry.npmjs.org/entities/-/entities-2.2.0.tgz",
-          "integrity": "sha512-p92if5Nz619I0w+akJrLZH0MX0Pb5DX39XOwQTtXSdQQOaYH03S1uIQp4mhOZtAXrxq4ViO67YTiLBo2638o9A==",
-          "dev": true
-        }
-      }
-    },
-    "http-deceiver": {
-      "version": "1.2.7",
-      "resolved": "https://registry.npmjs.org/http-deceiver/-/http-deceiver-1.2.7.tgz",
-      "integrity": "sha512-LmpOGxTfbpgtGVxJrj5k7asXHCgNZp5nLfp+hWc8QQRqtb7fUy6kRY3BO1h9ddF6yIPYUARgxGOwB42DnxIaNw==",
-      "dev": true
-    },
-    "http-errors": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-2.0.0.tgz",
-      "integrity": "sha512-FtwrG/euBzaEjYeRqOgly7G0qviiXoJWnvEH2Z1plBdXgbyjv34pHTSb9zoeHMyDy33+DWy5Wt9Wo+TURtOYSQ==",
-      "dev": true,
-      "requires": {
-        "depd": "2.0.0",
-        "inherits": "2.0.4",
-        "setprototypeof": "1.2.0",
-        "statuses": "2.0.1",
-        "toidentifier": "1.0.1"
-      }
-    },
-    "http-parser-js": {
-      "version": "0.5.8",
-      "resolved": "https://registry.npmjs.org/http-parser-js/-/http-parser-js-0.5.8.tgz",
-      "integrity": "sha512-SGeBX54F94Wgu5RH3X5jsDtf4eHyRogWX1XGT3b4HuW3tQPM4AaBzoUji/4AAJNXCEOWZ5O0DgZmJw1947gD5Q==",
-      "dev": true
-    },
-    "http-proxy": {
-      "version": "1.18.1",
-      "resolved": "https://registry.npmjs.org/http-proxy/-/http-proxy-1.18.1.tgz",
-      "integrity": "sha512-7mz/721AbnJwIVbnaSv1Cz3Am0ZLT/UBwkC92VlxhXv/k/BBQfM2fXElQNC27BVGr0uwUpplYPQM9LnaBMR5NQ==",
-      "dev": true,
-      "requires": {
-        "eventemitter3": "^4.0.0",
-        "follow-redirects": "^1.0.0",
-        "requires-port": "^1.0.0"
-      }
-    },
-    "http-proxy-middleware": {
-      "version": "2.0.6",
-      "resolved": "https://registry.npmjs.org/http-proxy-middleware/-/http-proxy-middleware-2.0.6.tgz",
-      "integrity": "sha512-ya/UeJ6HVBYxrgYotAZo1KvPWlgB48kUJLDePFeneHsVujFaW5WNj2NgWCAE//B1Dl02BIfYlpNgBy8Kf8Rjmw==",
-      "dev": true,
-      "requires": {
-        "@types/http-proxy": "^1.17.8",
-        "http-proxy": "^1.18.1",
-        "is-glob": "^4.0.1",
-        "is-plain-obj": "^3.0.0",
-        "micromatch": "^4.0.2"
-      }
-    },
-    "human-signals": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/human-signals/-/human-signals-2.1.0.tgz",
-      "integrity": "sha512-B4FFZ6q/T2jhhksgkbEW3HBvWIfDW85snkQgawt07S7J5QXTk6BkNV+0yAeZrM5QpMAdYlocGoljn0sJ/WQkFw==",
-      "dev": true
-    },
-    "husky": {
-      "version": "8.0.3",
-      "resolved": "https://registry.npmjs.org/husky/-/husky-8.0.3.tgz",
-      "integrity": "sha512-+dQSyqPh4x1hlO1swXBiNb2HzTDN1I2IGLQx1GrBuiqFJfoMrnZWwVmatvSiO+Iz8fBUnf+lekwNo4c2LlXItg==",
-      "dev": true
-    },
-    "i18next": {
-      "version": "21.10.0",
-      "resolved": "https://registry.npmjs.org/i18next/-/i18next-21.10.0.tgz",
-      "integrity": "sha512-YeuIBmFsGjUfO3qBmMOc0rQaun4mIpGKET5WDwvu8lU7gvwpcariZLNtL0Fzj+zazcHUrlXHiptcFhBMFaxzfg==",
-      "requires": {
-        "@babel/runtime": "^7.17.2"
-      }
-    },
-    "iced-error": {
-      "version": "0.0.13",
-      "resolved": "https://registry.npmjs.org/iced-error/-/iced-error-0.0.13.tgz",
-      "integrity": "sha512-yEEaG8QfyyRL0SsbNNDw3rVgTyqwHFMCuV6jDvD43f/2shmdaFXkqvFLGhDlsYNSolzYHwVLM/CrXt9GygYopA=="
-    },
-    "iced-lock": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/iced-lock/-/iced-lock-1.1.0.tgz",
-      "integrity": "sha512-J9UMVitgTMYrkUil5EB9/Q4BPWiMpFH156yjDlmMoMRKs3s3PnXj/6G0UlzIOGnNi5JVNk/zVYLXVnuo+1QnqQ==",
-      "requires": {
-        "iced-runtime": "^1.0.0"
-      }
-    },
-    "iced-runtime": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/iced-runtime/-/iced-runtime-1.0.4.tgz",
-      "integrity": "sha512-rgiJXNF6ZgF2Clh/TKUlBDW3q51YPDJUXmxGQXx1b8tbZpVpTn+1RX9q1sjNkujXIIaVxZByQzPHHORg7KV51g=="
-    },
-    "icss-utils": {
-      "version": "5.1.0",
-      "resolved": "https://registry.npmjs.org/icss-utils/-/icss-utils-5.1.0.tgz",
-      "integrity": "sha512-soFhflCVWLfRNOPU3iv5Z9VUdT44xFRbzjLsEzSr5AQmgqPMTHdU3PMT1Cf1ssx8fLNJDA1juftYl+PUcv3MqA==",
-      "dev": true,
-      "requires": {}
-    },
-    "identity-function": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/identity-function/-/identity-function-1.0.0.tgz",
-      "integrity": "sha512-kNrgUK0qI+9qLTBidsH85HjDLpZfrrS0ElquKKe/fJFdB3D7VeKdXXEvOPDUHSHOzdZKCAAaQIWWyp0l2yq6pw==",
-      "dev": true
-    },
-    "ieee754": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.2.1.tgz",
-      "integrity": "sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA=="
-    },
-    "ignore": {
-      "version": "5.2.4",
-      "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.2.4.tgz",
-      "integrity": "sha512-MAb38BcSbH0eHNBxn7ql2NH/kX33OkB3lZ1BNdh7ENeRChHTYsTvWrMubiIAMNS2llXEEgZ1MUOBtXChP3kaFQ==",
-      "dev": true
-    },
-    "import-fresh": {
-      "version": "3.3.0",
-      "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.3.0.tgz",
-      "integrity": "sha512-veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw==",
-      "dev": true,
-      "requires": {
-        "parent-module": "^1.0.0",
-        "resolve-from": "^4.0.0"
-      }
-    },
-    "imurmurhash": {
-      "version": "0.1.4",
-      "resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz",
-      "integrity": "sha512-JmXMZ6wuvDmLiHEml9ykzqO6lwFbof0GG4IkcGaENdCRDDmMVnny7s5HsIgHCbaq0w2MyPhDqkhTUgS2LU2PHA==",
-      "dev": true
-    },
-    "indent-string": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/indent-string/-/indent-string-4.0.0.tgz",
-      "integrity": "sha512-EdDDZu4A2OyIK7Lr/2zG+w5jmbuk1DVBnEwREQvBzspBJkCEbRa8GxU1lghYcaGJCnRWibjDXlq779X1/y5xwg==",
-      "dev": true
-    },
-    "inflight": {
-      "version": "1.0.6",
-      "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
-      "integrity": "sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA==",
-      "requires": {
-        "once": "^1.3.0",
-        "wrappy": "1"
-      }
-    },
-    "inherits": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz",
-      "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ=="
-    },
-    "internal-slot": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/internal-slot/-/internal-slot-1.0.5.tgz",
-      "integrity": "sha512-Y+R5hJrzs52QCG2laLn4udYVnxsfny9CpOhNhUvk/SSSVyF6T27FzRbF0sroPidSu3X8oEAkOn2K804mjpt6UQ==",
-      "dev": true,
-      "requires": {
-        "get-intrinsic": "^1.2.0",
-        "has": "^1.0.3",
-        "side-channel": "^1.0.4"
-      }
-    },
-    "ipaddr.js": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-2.1.0.tgz",
-      "integrity": "sha512-LlbxQ7xKzfBusov6UMi4MFpEg0m+mAm9xyNGEduwXMEDuf4WfzB/RZwMVYEd7IKGvh4IUkEXYxtAVu9T3OelJQ==",
-      "dev": true
-    },
-    "is-arguments": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/is-arguments/-/is-arguments-1.1.1.tgz",
-      "integrity": "sha512-8Q7EARjzEnKpt/PCD7e1cgUS0a6X8u5tdSiMqXhojOdoV9TsMsiO+9VLC5vAmO8N7/GmXn7yjR8qnA6bVAEzfA==",
-      "requires": {
-        "call-bind": "^1.0.2",
-        "has-tostringtag": "^1.0.0"
-      }
-    },
-    "is-array-buffer": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/is-array-buffer/-/is-array-buffer-3.0.2.tgz",
-      "integrity": "sha512-y+FyyR/w8vfIRq4eQcM1EYgSTnmHXPqaF+IgzgraytCFq5Xh8lllDVmAZolPJiZttZLeFSINPYMaEJ7/vWUa1w==",
-      "dev": true,
-      "requires": {
-        "call-bind": "^1.0.2",
-        "get-intrinsic": "^1.2.0",
-        "is-typed-array": "^1.1.10"
-      }
-    },
-    "is-arrayish": {
-      "version": "0.2.1",
-      "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz",
-      "integrity": "sha512-zz06S8t0ozoDXMG+ube26zeCTNXcKIPJZJi8hBrF4idCLms4CG9QtK7qBl1boi5ODzFpjswb5JPmHCbMpjaYzg==",
-      "dev": true
-    },
-    "is-bigint": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/is-bigint/-/is-bigint-1.0.4.tgz",
-      "integrity": "sha512-zB9CruMamjym81i2JZ3UMn54PKGsQzsJeo6xvN3HJJ4CAsQNB6iRutp2To77OfCNuoxspsIhzaPoO1zyCEhFOg==",
-      "dev": true,
-      "requires": {
-        "has-bigints": "^1.0.1"
-      }
-    },
-    "is-binary-path": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-2.1.0.tgz",
-      "integrity": "sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==",
-      "dev": true,
-      "requires": {
-        "binary-extensions": "^2.0.0"
-      }
-    },
-    "is-boolean-object": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/is-boolean-object/-/is-boolean-object-1.1.2.tgz",
-      "integrity": "sha512-gDYaKHJmnj4aWxyj6YHyXVpdQawtVLHU5cb+eztPGczf6cjuTdwve5ZIEfgXqH4e57An1D1AKf8CZ3kYrQRqYA==",
-      "dev": true,
-      "requires": {
-        "call-bind": "^1.0.2",
-        "has-tostringtag": "^1.0.0"
-      }
-    },
-    "is-callable": {
-      "version": "1.2.7",
-      "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.7.tgz",
-      "integrity": "sha512-1BC0BVFhS/p0qtw6enp8e+8OD0UrK0oFLztSjNzhcKA3WDuJxxAPXzPuPtKkjEY9UUoEWlX/8fgKeu2S8i9JTA=="
-    },
-    "is-core-module": {
-      "version": "2.14.0",
-      "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.14.0.tgz",
-      "integrity": "sha512-a5dFJih5ZLYlRtDc0dZWP7RiKr6xIKzmn/oAYCDvdLThadVgyJwlaoQPmRtMSpz+rk0OGAgIu+TcM9HUF0fk1A==",
-      "dev": true,
-      "requires": {
-        "hasown": "^2.0.2"
-      }
-    },
-    "is-date-object": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/is-date-object/-/is-date-object-1.0.5.tgz",
-      "integrity": "sha512-9YQaSxsAiSwcvS33MBk3wTCVnWK+HhF8VZR2jRxehM16QcVOdHqPn4VPHmRK4lSr38n9JriurInLcP90xsYNfQ==",
-      "dev": true,
-      "requires": {
-        "has-tostringtag": "^1.0.0"
-      }
-    },
-    "is-docker": {
-      "version": "2.2.1",
-      "resolved": "https://registry.npmjs.org/is-docker/-/is-docker-2.2.1.tgz",
-      "integrity": "sha512-F+i2BKsFrH66iaUFc0woD8sLy8getkwTwtOBjvs56Cx4CgJDeKQeqfz8wAYiSb8JOprWhHH5p77PbmYCvvUuXQ==",
-      "dev": true
-    },
-    "is-extglob": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz",
-      "integrity": "sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==",
-      "dev": true
-    },
-    "is-fullwidth-code-point": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-4.0.0.tgz",
-      "integrity": "sha512-O4L094N2/dZ7xqVdrXhh9r1KODPJpFms8B5sGdJLPy664AgvXsreZUyCQQNItZRDlYug4xStLjNp/sz3HvBowQ==",
-      "dev": true
-    },
-    "is-generator-function": {
-      "version": "1.0.10",
-      "resolved": "https://registry.npmjs.org/is-generator-function/-/is-generator-function-1.0.10.tgz",
-      "integrity": "sha512-jsEjy9l3yiXEQ+PsXdmBwEPcOxaXWLspKdplFUVI9vq1iZgIekeC0L167qeu86czQaxed3q/Uzuw0swL0irL8A==",
-      "requires": {
-        "has-tostringtag": "^1.0.0"
-      }
-    },
-    "is-glob": {
-      "version": "4.0.3",
-      "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz",
-      "integrity": "sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==",
-      "dev": true,
-      "requires": {
-        "is-extglob": "^2.1.1"
-      }
-    },
-    "is-iterable": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/is-iterable/-/is-iterable-1.1.1.tgz",
-      "integrity": "sha512-EdOZCr0NsGE00Pot+x1ZFx9MJK3C6wy91geZpXwvwexDLJvA4nzYyZf7r+EIwSeVsOLDdBz7ATg9NqKTzuNYuQ==",
-      "dev": true
-    },
-    "is-map": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/is-map/-/is-map-2.0.2.tgz",
-      "integrity": "sha512-cOZFQQozTha1f4MxLFzlgKYPTyj26picdZTx82hbc/Xf4K/tZOOXSCkMvU4pKioRXGDLJRn0GM7Upe7kR721yg==",
-      "dev": true
-    },
-    "is-negative-zero": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/is-negative-zero/-/is-negative-zero-2.0.2.tgz",
-      "integrity": "sha512-dqJvarLawXsFbNDeJW7zAz8ItJ9cd28YufuuFzh0G8pNHjJMnY08Dv7sYX2uF5UpQOwieAeOExEYAWWfu7ZZUA==",
-      "dev": true
-    },
-    "is-number": {
-      "version": "7.0.0",
-      "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz",
-      "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==",
-      "dev": true
-    },
-    "is-number-object": {
-      "version": "1.0.7",
-      "resolved": "https://registry.npmjs.org/is-number-object/-/is-number-object-1.0.7.tgz",
-      "integrity": "sha512-k1U0IRzLMo7ZlYIfzRu23Oh6MiIFasgpb9X76eqfFZAqwH44UI4KTBvBYIZ1dSL9ZzChTB9ShHfLkR4pdW5krQ==",
-      "dev": true,
-      "requires": {
-        "has-tostringtag": "^1.0.0"
-      }
-    },
-    "is-path-cwd": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/is-path-cwd/-/is-path-cwd-2.2.0.tgz",
-      "integrity": "sha512-w942bTcih8fdJPJmQHFzkS76NEP8Kzzvmw92cXsazb8intwLqPibPPdXf4ANdKV3rYMuuQYGIWtvz9JilB3NFQ==",
-      "dev": true
-    },
-    "is-path-in-cwd": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/is-path-in-cwd/-/is-path-in-cwd-2.1.0.tgz",
-      "integrity": "sha512-rNocXHgipO+rvnP6dk3zI20RpOtrAM/kzbB258Uw5BWr3TpXi861yzjo16Dn4hUox07iw5AyeMLHWsujkjzvRQ==",
-      "dev": true,
-      "requires": {
-        "is-path-inside": "^2.1.0"
-      }
-    },
-    "is-path-inside": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/is-path-inside/-/is-path-inside-2.1.0.tgz",
-      "integrity": "sha512-wiyhTzfDWsvwAW53OBWF5zuvaOGlZ6PwYxAbPVDhpm+gM09xKQGjBq/8uYN12aDvMxnAnq3dxTyoSoRNmg5YFg==",
-      "dev": true,
-      "requires": {
-        "path-is-inside": "^1.0.2"
-      }
-    },
-    "is-plain-obj": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-3.0.0.tgz",
-      "integrity": "sha512-gwsOE28k+23GP1B6vFl1oVh/WOzmawBrKwo5Ev6wMKzPkaXaCDIQKzLnvsA42DRlbVTWorkgTKIviAKCWkfUwA==",
-      "dev": true
-    },
-    "is-regex": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.1.4.tgz",
-      "integrity": "sha512-kvRdxDsxZjhzUX07ZnLydzS1TU/TJlTUHHY4YLL87e37oUA49DfkLqgy+VjFocowy29cKvcSiu+kIv728jTTVg==",
-      "dev": true,
-      "requires": {
-        "call-bind": "^1.0.2",
-        "has-tostringtag": "^1.0.0"
-      }
-    },
-    "is-set": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/is-set/-/is-set-2.0.2.tgz",
-      "integrity": "sha512-+2cnTEZeY5z/iXGbLhPrOAaK/Mau5k5eXq9j14CpRTftq0pAJu2MwVRSZhyZWBzx3o6X795Lz6Bpb6R0GKf37g==",
-      "dev": true
-    },
-    "is-shared-array-buffer": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/is-shared-array-buffer/-/is-shared-array-buffer-1.0.2.tgz",
-      "integrity": "sha512-sqN2UDu1/0y6uvXyStCOzyhAjCSlHceFoMKJW8W9EU9cvic/QdsZ0kEU93HEy3IUEFZIiH/3w+AH/UQbPHNdhA==",
-      "dev": true,
-      "requires": {
-        "call-bind": "^1.0.2"
-      }
-    },
-    "is-stream": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-2.0.1.tgz",
-      "integrity": "sha512-hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg==",
-      "dev": true
-    },
-    "is-string": {
-      "version": "1.0.7",
-      "resolved": "https://registry.npmjs.org/is-string/-/is-string-1.0.7.tgz",
-      "integrity": "sha512-tE2UXzivje6ofPW7l23cjDOMa09gb7xlAqG6jG5ej6uPV32TlWP3NKPigtaGeHNu9fohccRYvIiZMfOOnOYUtg==",
-      "dev": true,
-      "requires": {
-        "has-tostringtag": "^1.0.0"
-      }
-    },
-    "is-symbol": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/is-symbol/-/is-symbol-1.0.4.tgz",
-      "integrity": "sha512-C/CPBqKWnvdcxqIARxyOh4v1UUEOCHpgDa0WYgpKDFMszcrPcffg5uhwSgPCLD2WWxmq6isisz87tzT01tuGhg==",
-      "dev": true,
-      "requires": {
-        "has-symbols": "^1.0.2"
-      }
-    },
-    "is-typed-array": {
-      "version": "1.1.12",
-      "resolved": "https://registry.npmjs.org/is-typed-array/-/is-typed-array-1.1.12.tgz",
-      "integrity": "sha512-Z14TF2JNG8Lss5/HMqt0//T9JeHXttXy5pH/DBU4vi98ozO2btxzq9MwYDZYnKwU8nRsz/+GVFVRDq3DkVuSPg==",
-      "requires": {
-        "which-typed-array": "^1.1.11"
-      }
-    },
-    "is-weakmap": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/is-weakmap/-/is-weakmap-2.0.1.tgz",
-      "integrity": "sha512-NSBR4kH5oVj1Uwvv970ruUkCV7O1mzgVFO4/rev2cLRda9Tm9HrL70ZPut4rOHgY0FNrUu9BCbXA2sdQ+x0chA==",
-      "dev": true
-    },
-    "is-weakref": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/is-weakref/-/is-weakref-1.0.2.tgz",
-      "integrity": "sha512-qctsuLZmIQ0+vSSMfoVvyFe2+GSEvnmZ2ezTup1SBse9+twCCeial6EEi3Nc2KFcf6+qz2FBPnjXsk8xhKSaPQ==",
-      "dev": true,
-      "requires": {
-        "call-bind": "^1.0.2"
-      }
-    },
-    "is-weakset": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/is-weakset/-/is-weakset-2.0.2.tgz",
-      "integrity": "sha512-t2yVvttHkQktwnNNmBQ98AhENLdPUTDTE21uPqAQ0ARwQfGeQKRVS0NNurH7bTf7RrvcVn1OOge45CnBeHCSmg==",
-      "dev": true,
-      "requires": {
-        "call-bind": "^1.0.2",
-        "get-intrinsic": "^1.1.1"
-      }
-    },
-    "is-what": {
-      "version": "4.1.15",
-      "resolved": "https://registry.npmjs.org/is-what/-/is-what-4.1.15.tgz",
-      "integrity": "sha512-uKua1wfy3Yt+YqsD6mTUEa2zSi3G1oPlqTflgaPJ7z63vUGN5pxFpnQfeSLMFnJDEsdvOtkp1rUWkYjB4YfhgA=="
-    },
-    "is-wsl": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/is-wsl/-/is-wsl-2.2.0.tgz",
-      "integrity": "sha512-fKzAra0rGJUUBwGBgNkHZuToZcn+TtXHpeCgmkMJMMYx1sQDYaCSyjJBSCa2nH1DGm7s3n1oBnohoVTBaN7Lww==",
-      "dev": true,
-      "requires": {
-        "is-docker": "^2.0.0"
-      }
-    },
-    "isarray": {
-      "version": "2.0.5",
-      "resolved": "https://registry.npmjs.org/isarray/-/isarray-2.0.5.tgz",
-      "integrity": "sha512-xHjhDr3cNBK0BzdUJSPXZntQUx/mwMS5Rw4A7lPJ90XGAO6ISP/ePDNuo0vhqOZU+UD5JoodwCAAoZQd3FeAKw==",
-      "dev": true
-    },
-    "isexe": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz",
-      "integrity": "sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==",
-      "dev": true
-    },
-    "iterable-lookahead": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/iterable-lookahead/-/iterable-lookahead-1.0.0.tgz",
-      "integrity": "sha512-hJnEP2Xk4+44DDwJqUQGdXal5VbyeWLaPyDl2AQc242Zr7iqz4DgpQOrEzglWVMGHMDCkguLHEKxd1+rOsmgSQ==",
-      "dev": true
-    },
-    "jest-worker": {
-      "version": "27.5.1",
-      "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-27.5.1.tgz",
-      "integrity": "sha512-7vuh85V5cdDofPyxn58nrPjBktZo0u9x1g8WtjQol+jZDaE+fhN+cIvTj11GndBnMnyfrUOG1sZQxCdjKh+DKg==",
-      "dev": true,
-      "requires": {
-        "@types/node": "*",
-        "merge-stream": "^2.0.0",
-        "supports-color": "^8.0.0"
-      },
-      "dependencies": {
-        "has-flag": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-          "dev": true
-        },
-        "supports-color": {
-          "version": "8.1.1",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz",
-          "integrity": "sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==",
-          "dev": true,
-          "requires": {
-            "has-flag": "^4.0.0"
-          }
-        }
-      }
-    },
-    "jiti": {
-      "version": "1.21.6",
-      "resolved": "https://registry.npmjs.org/jiti/-/jiti-1.21.6.tgz",
-      "integrity": "sha512-2yTgeWTWzMWkHu6Jp9NKgePDaYHbntiwvYuuJLbbN9vl7DC9DvXKOB2BC3ZZ92D3cvV/aflH0osDfwpHepQ53w==",
-      "dev": true
-    },
-    "js-sdsl": {
-      "version": "4.4.2",
-      "resolved": "https://registry.npmjs.org/js-sdsl/-/js-sdsl-4.4.2.tgz",
-      "integrity": "sha512-dwXFwByc/ajSV6m5bcKAPwe4yDDF6D614pxmIi5odytzxRlwqF6nwoiCek80Ixc7Cvma5awClxrzFtxCQvcM8w==",
-      "dev": true
-    },
-    "js-sha256": {
-      "version": "0.10.1",
-      "resolved": "https://registry.npmjs.org/js-sha256/-/js-sha256-0.10.1.tgz",
-      "integrity": "sha512-5obBtsz9301ULlsgggLg542s/jqtddfOpV5KJc4hajc9JV8GeY2gZHSVpYBn4nWqAUTJ9v+xwtbJ1mIBgIH5Vw=="
-    },
-    "js-sha3": {
-      "version": "0.8.0",
-      "resolved": "https://registry.npmjs.org/js-sha3/-/js-sha3-0.8.0.tgz",
-      "integrity": "sha512-gF1cRrHhIzNfToc802P800N8PpXS+evLLXfsVpowqmAFR9uwbi89WvXg2QspOmXL8QL86J4T1EpFu+yUkwJY3Q=="
-    },
-    "js-tokens": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz",
-      "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ=="
-    },
-    "js-yaml": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz",
-      "integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==",
-      "dev": true,
-      "requires": {
-        "argparse": "^2.0.1"
-      }
-    },
-    "jsesc": {
-      "version": "2.5.2",
-      "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-2.5.2.tgz",
-      "integrity": "sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA=="
-    },
-    "json-bigint": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/json-bigint/-/json-bigint-1.0.0.tgz",
-      "integrity": "sha512-SiPv/8VpZuWbvLSMtTDU8hEfrZWg/mH/nV/b4o0CYbSxu1UIQPLdwKOCIyLQX+VIPO5vrLX3i8qtqFyhdPSUSQ==",
-      "requires": {
-        "bignumber.js": "^9.0.0"
-      }
-    },
-    "json-parse-even-better-errors": {
-      "version": "2.3.1",
-      "resolved": "https://registry.npmjs.org/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz",
-      "integrity": "sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w==",
-      "dev": true
-    },
-    "json-schema-traverse": {
-      "version": "0.4.1",
-      "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
-      "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==",
-      "dev": true
-    },
-    "json-stable-stringify-without-jsonify": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz",
-      "integrity": "sha512-Bdboy+l7tA3OGW6FjyFHWkP5LuByj1Tk33Ljyq0axyzdk9//JSi2u3fP1QSmd1KNwq6VOKYGlAu87CisVir6Pw==",
-      "dev": true
-    },
-    "json5": {
-      "version": "2.2.3",
-      "resolved": "https://registry.npmjs.org/json5/-/json5-2.2.3.tgz",
-      "integrity": "sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg=="
-    },
-    "jsonc-parser": {
-      "version": "3.2.0",
-      "resolved": "https://registry.npmjs.org/jsonc-parser/-/jsonc-parser-3.2.0.tgz",
-      "integrity": "sha512-gfFQZrcTc8CnKXp6Y4/CBT3fTc0OVuDofpre4aEeEpSBPV5X5v4+Vmx+8snU7RLPrNHPKSgLxGo9YuQzz20o+w==",
-      "dev": true
-    },
-    "jsonfile": {
-      "version": "6.1.0",
-      "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.1.0.tgz",
-      "integrity": "sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ==",
-      "dev": true,
-      "requires": {
-        "graceful-fs": "^4.1.6",
-        "universalify": "^2.0.0"
-      }
-    },
-    "jsontokens": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/jsontokens/-/jsontokens-4.0.1.tgz",
-      "integrity": "sha512-+MO415LEN6M+3FGsRz4wU20g7N2JA+2j9d9+pGaNJHviG4L8N0qzavGyENw6fJqsq9CcrHOIL6iWX5yeTZ86+Q==",
-      "requires": {
-        "@noble/hashes": "^1.1.2",
-        "@noble/secp256k1": "^1.6.3",
-        "base64-js": "^1.5.1"
-      }
-    },
-    "jsx-ast-utils": {
-      "version": "3.3.5",
-      "resolved": "https://registry.npmjs.org/jsx-ast-utils/-/jsx-ast-utils-3.3.5.tgz",
-      "integrity": "sha512-ZZow9HBI5O6EPgSJLUb8n2NKgmVWTwCvHGwFuJlMjvLFqlGG6pjirPhtdsseaLZjSibD8eegzmYpUZwoIlj2cQ==",
-      "dev": true,
-      "requires": {
-        "array-includes": "^3.1.6",
-        "array.prototype.flat": "^1.3.1",
-        "object.assign": "^4.1.4",
-        "object.values": "^1.1.6"
-      }
-    },
-    "knip": {
-      "version": "5.23.3",
-      "resolved": "https://registry.npmjs.org/knip/-/knip-5.23.3.tgz",
-      "integrity": "sha512-i0vFlpe3D9AZmp3Hlq3ZncjJQB2x21LeVrIV+9rnBavaKpTLhV/sLmE4iqTjEWedLtpfJsax68S68aqZzcXpsQ==",
-      "dev": true,
-      "requires": {
-        "@ericcornelissen/bash-parser": "0.5.3",
-        "@nodelib/fs.walk": "2.0.0",
-        "@snyk/github-codeowners": "1.1.0",
-        "easy-table": "1.2.0",
-        "fast-glob": "^3.3.2",
-        "jiti": "^1.21.6",
-        "js-yaml": "^4.1.0",
-        "minimist": "^1.2.8",
-        "picocolors": "^1.0.0",
-        "picomatch": "^4.0.1",
-        "pretty-ms": "^9.0.0",
-        "resolve": "^1.22.8",
-        "smol-toml": "^1.1.4",
-        "strip-json-comments": "5.0.1",
-        "summary": "2.1.0",
-        "tsconfig-paths": "^4.2.0",
-        "zod": "^3.22.4",
-        "zod-validation-error": "^3.0.3"
-      },
-      "dependencies": {
-        "@nodelib/fs.scandir": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-3.0.0.tgz",
-          "integrity": "sha512-ktI9+PxfHYtKjF3cLTUAh2N+b8MijCRPNwKJNqTVdL0gB0QxLU2rIRaZ1t71oEa3YBDE6bukH1sR0+CDnpp/Mg==",
-          "dev": true,
-          "requires": {
-            "@nodelib/fs.stat": "3.0.0",
-            "run-parallel": "^1.2.0"
-          }
-        },
-        "@nodelib/fs.stat": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-3.0.0.tgz",
-          "integrity": "sha512-2tQOI38s19P9i7X/Drt0v8iMA+KMsgdhB/dyPER+e+2Y8L1Z7QvnuRdW/uLuf5YRFUYmnj4bMA6qCuZHFI1GDQ==",
-          "dev": true
-        },
-        "@nodelib/fs.walk": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/@nodelib/fs.walk/-/fs.walk-2.0.0.tgz",
-          "integrity": "sha512-54voNDBobGdMl3BUXSu7UaDh1P85PGHWlJ5e0XhPugo1JulOyCtp2I+5ri4wplGDJ8QGwPEQW7/x3yTLU7yF1A==",
-          "dev": true,
-          "requires": {
-            "@nodelib/fs.scandir": "3.0.0",
-            "fastq": "^1.15.0"
-          }
-        },
-        "picomatch": {
-          "version": "4.0.2",
-          "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.2.tgz",
-          "integrity": "sha512-M7BAV6Rlcy5u+m6oPhAPFgJTzAioX/6B0DxyvDlo9l8+T3nLKbrczg2WLUyzd45L8RqfUMyGPzekbMvX2Ldkwg==",
-          "dev": true
-        },
-        "strip-json-comments": {
-          "version": "5.0.1",
-          "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-5.0.1.tgz",
-          "integrity": "sha512-0fk9zBqO67Nq5M/m45qHCJxylV/DhBlIOVExqgOMiCCrzrhU6tCibRXNqE3jwJLftzE9SNuZtYbpzcO+i9FiKw==",
-          "dev": true
-        },
-        "tsconfig-paths": {
-          "version": "4.2.0",
-          "resolved": "https://registry.npmjs.org/tsconfig-paths/-/tsconfig-paths-4.2.0.tgz",
-          "integrity": "sha512-NoZ4roiN7LnbKn9QqE1amc9DJfzvZXxF4xDavcOWt1BPkdx+m+0gJuPM+S0vCe7zTJMYUP0R8pO2XMr+Y8oLIg==",
-          "dev": true,
-          "requires": {
-            "json5": "^2.2.2",
-            "minimist": "^1.2.6",
-            "strip-bom": "^3.0.0"
-          }
-        }
-      }
-    },
-    "language-subtag-registry": {
-      "version": "0.3.22",
-      "resolved": "https://registry.npmjs.org/language-subtag-registry/-/language-subtag-registry-0.3.22.tgz",
-      "integrity": "sha512-tN0MCzyWnoz/4nHS6uxdlFWoUZT7ABptwKPQ52Ea7URk6vll88bWBVhodtnlfEuCcKWNGoc+uGbw1cwa9IKh/w==",
-      "dev": true
-    },
-    "language-tags": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/language-tags/-/language-tags-1.0.5.tgz",
-      "integrity": "sha512-qJhlO9cGXi6hBGKoxEG/sKZDAHD5Hnu9Hs4WbOY3pCWXDhw0N8x1NenNzm2EnNLkLkk7J2SdxAkDSbb6ftT+UQ==",
-      "dev": true,
-      "requires": {
-        "language-subtag-registry": "~0.3.2"
-      }
-    },
-    "launch-editor": {
-      "version": "2.6.0",
-      "resolved": "https://registry.npmjs.org/launch-editor/-/launch-editor-2.6.0.tgz",
-      "integrity": "sha512-JpDCcQnyAAzZZaZ7vEiSqL690w7dAEyLao+KC96zBplnYbJS7TYNjvM3M7y3dGz+v7aIsJk3hllWuc0kWAjyRQ==",
-      "dev": true,
-      "requires": {
-        "picocolors": "^1.0.0",
-        "shell-quote": "^1.7.3"
-      }
-    },
-    "ledger-bitcoin": {
-      "version": "0.2.3",
-      "resolved": "https://registry.npmjs.org/ledger-bitcoin/-/ledger-bitcoin-0.2.3.tgz",
-      "integrity": "sha512-sWdvMTR5CkebNlM0Mam9ROdpsD7Y4087kj4cbIaCCq8IXShCQ44vE3j0wTmt+sHp13eETgY63OWN1rkuIfMfuQ==",
-      "requires": {
-        "@bitcoinerlab/descriptors": "^1.0.2",
-        "@bitcoinerlab/secp256k1": "^1.0.5",
-        "@ledgerhq/hw-transport": "^6.20.0",
-        "bip32-path": "^0.4.2",
-        "bitcoinjs-lib": "^6.1.3"
-      }
-    },
-    "levn": {
-      "version": "0.4.1",
-      "resolved": "https://registry.npmjs.org/levn/-/levn-0.4.1.tgz",
-      "integrity": "sha512-+bT2uH4E5LGE7h/n3evcS/sQlJXCpIp6ym8OWJ5eV6+67Dsql/LaaT7qJBAt2rzfoa/5QBGBhxDix1dMt2kQKQ==",
-      "dev": true,
-      "requires": {
-        "prelude-ls": "^1.2.1",
-        "type-check": "~0.4.0"
-      }
-    },
-    "lilconfig": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/lilconfig/-/lilconfig-2.1.0.tgz",
-      "integrity": "sha512-utWOt/GHzuUxnLKxB6dk81RoOeoNeHgbrXiuGk4yyF5qlRz+iIVWu56E2fqGHFrXz0QNUhLB/8nKqvRH66JKGQ==",
-      "dev": true
-    },
-    "lines-and-columns": {
-      "version": "1.2.4",
-      "resolved": "https://registry.npmjs.org/lines-and-columns/-/lines-and-columns-1.2.4.tgz",
-      "integrity": "sha512-7ylylesZQ/PV29jhEDl3Ufjo6ZX7gCqJr5F7PKrqc93v7fzSymt1BpwEU8nAUXs8qzzvqhbjhK5QZg6Mt/HkBg==",
-      "dev": true
-    },
-    "lint-staged": {
-      "version": "13.2.3",
-      "resolved": "https://registry.npmjs.org/lint-staged/-/lint-staged-13.2.3.tgz",
-      "integrity": "sha512-zVVEXLuQIhr1Y7R7YAWx4TZLdvuzk7DnmrsTNL0fax6Z3jrpFcas+vKbzxhhvp6TA55m1SQuWkpzI1qbfDZbAg==",
-      "dev": true,
-      "requires": {
-        "chalk": "5.2.0",
-        "cli-truncate": "^3.1.0",
-        "commander": "^10.0.0",
-        "debug": "^4.3.4",
-        "execa": "^7.0.0",
-        "lilconfig": "2.1.0",
-        "listr2": "^5.0.7",
-        "micromatch": "^4.0.5",
-        "normalize-path": "^3.0.0",
-        "object-inspect": "^1.12.3",
-        "pidtree": "^0.6.0",
-        "string-argv": "^0.3.1",
-        "yaml": "^2.2.2"
-      },
-      "dependencies": {
-        "chalk": {
-          "version": "5.2.0",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-5.2.0.tgz",
-          "integrity": "sha512-ree3Gqw/nazQAPuJJEy+avdl7QfZMcUvmHIKgEZkGL+xOBzRvup5Hxo6LHuMceSxOabuJLJm5Yp/92R9eMmMvA==",
-          "dev": true
-        },
-        "execa": {
-          "version": "7.2.0",
-          "resolved": "https://registry.npmjs.org/execa/-/execa-7.2.0.tgz",
-          "integrity": "sha512-UduyVP7TLB5IcAQl+OzLyLcS/l32W/GLg+AhHJ+ow40FOk2U3SAllPwR44v4vmdFwIWqpdwxxpQbF1n5ta9seA==",
-          "dev": true,
-          "requires": {
-            "cross-spawn": "^7.0.3",
-            "get-stream": "^6.0.1",
-            "human-signals": "^4.3.0",
-            "is-stream": "^3.0.0",
-            "merge-stream": "^2.0.0",
-            "npm-run-path": "^5.1.0",
-            "onetime": "^6.0.0",
-            "signal-exit": "^3.0.7",
-            "strip-final-newline": "^3.0.0"
-          }
-        },
-        "human-signals": {
-          "version": "4.3.1",
-          "resolved": "https://registry.npmjs.org/human-signals/-/human-signals-4.3.1.tgz",
-          "integrity": "sha512-nZXjEF2nbo7lIw3mgYjItAfgQXog3OjJogSbKa2CQIIvSGWcKgeJnQlNXip6NglNzYH45nSRiEVimMvYL8DDqQ==",
-          "dev": true
-        },
-        "is-stream": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-3.0.0.tgz",
-          "integrity": "sha512-LnQR4bZ9IADDRSkvpqMGvt/tEJWclzklNgSw48V5EAaAeDd6qGvN8ei6k5p0tvxSR171VmGyHuTiAOfxAbr8kA==",
-          "dev": true
-        },
-        "mimic-fn": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-4.0.0.tgz",
-          "integrity": "sha512-vqiC06CuhBTUdZH+RYl8sFrL096vA45Ok5ISO6sE/Mr1jRbGH4Csnhi8f3wKVl7x8mO4Au7Ir9D3Oyv1VYMFJw==",
-          "dev": true
-        },
-        "npm-run-path": {
-          "version": "5.1.0",
-          "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-5.1.0.tgz",
-          "integrity": "sha512-sJOdmRGrY2sjNTRMbSvluQqg+8X7ZK61yvzBEIDhz4f8z1TZFYABsqjjCBd/0PUNE9M6QDgHJXQkGUEm7Q+l9Q==",
-          "dev": true,
-          "requires": {
-            "path-key": "^4.0.0"
-          }
-        },
-        "onetime": {
-          "version": "6.0.0",
-          "resolved": "https://registry.npmjs.org/onetime/-/onetime-6.0.0.tgz",
-          "integrity": "sha512-1FlR+gjXK7X+AsAHso35MnyN5KqGwJRi/31ft6x0M194ht7S+rWAvd7PHss9xSKMzE0asv1pyIHaJYq+BbacAQ==",
-          "dev": true,
-          "requires": {
-            "mimic-fn": "^4.0.0"
-          }
-        },
-        "path-key": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/path-key/-/path-key-4.0.0.tgz",
-          "integrity": "sha512-haREypq7xkM7ErfgIyA0z+Bj4AGKlMSdlQE2jvJo6huWD1EdkKYV+G/T4nq0YEF2vgTT8kqMFKo1uHn950r4SQ==",
-          "dev": true
-        },
-        "strip-final-newline": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/strip-final-newline/-/strip-final-newline-3.0.0.tgz",
-          "integrity": "sha512-dOESqjYr96iWYylGObzd39EuNTa5VJxyvVAEm5Jnh7KGo75V43Hk1odPQkNDyXNmUR6k+gEiDVXnjB8HJ3crXw==",
-          "dev": true
-        }
-      }
-    },
-    "listr2": {
-      "version": "5.0.8",
-      "resolved": "https://registry.npmjs.org/listr2/-/listr2-5.0.8.tgz",
-      "integrity": "sha512-mC73LitKHj9w6v30nLNGPetZIlfpUniNSsxxrbaPcWOjDb92SHPzJPi/t+v1YC/lxKz/AJ9egOjww0qUuFxBpA==",
-      "dev": true,
-      "requires": {
-        "cli-truncate": "^2.1.0",
-        "colorette": "^2.0.19",
-        "log-update": "^4.0.0",
-        "p-map": "^4.0.0",
-        "rfdc": "^1.3.0",
-        "rxjs": "^7.8.0",
-        "through": "^2.3.8",
-        "wrap-ansi": "^7.0.0"
-      },
-      "dependencies": {
-        "ansi-styles": {
-          "version": "4.3.0",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-          "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-          "dev": true,
-          "requires": {
-            "color-convert": "^2.0.1"
-          }
-        },
-        "cli-truncate": {
-          "version": "2.1.0",
-          "resolved": "https://registry.npmjs.org/cli-truncate/-/cli-truncate-2.1.0.tgz",
-          "integrity": "sha512-n8fOixwDD6b/ObinzTrp1ZKFzbgvKZvuz/TvejnLn1aQfC6r52XEx85FmuC+3HI+JM7coBRXUvNqEU2PHVrHpg==",
-          "dev": true,
-          "requires": {
-            "slice-ansi": "^3.0.0",
-            "string-width": "^4.2.0"
-          }
-        },
-        "color-convert": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-          "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-          "dev": true,
-          "requires": {
-            "color-name": "~1.1.4"
-          }
-        },
-        "color-name": {
-          "version": "1.1.4",
-          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-          "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-          "dev": true
-        },
-        "emoji-regex": {
-          "version": "8.0.0",
-          "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
-          "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
-          "dev": true
-        },
-        "is-fullwidth-code-point": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
-          "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
-          "dev": true
-        },
-        "p-map": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/p-map/-/p-map-4.0.0.tgz",
-          "integrity": "sha512-/bjOqmgETBYB5BoEeGVea8dmvHb2m9GLy1E9W43yeyfP6QQCZGFNa+XRceJEuDB6zqr+gKpIAmlLebMpykw/MQ==",
-          "dev": true,
-          "requires": {
-            "aggregate-error": "^3.0.0"
-          }
-        },
-        "rxjs": {
-          "version": "7.8.1",
-          "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-7.8.1.tgz",
-          "integrity": "sha512-AA3TVj+0A2iuIoQkWEK/tqFjBq2j+6PO6Y0zJcvzLAFhEFIO3HL0vls9hWLncZbAAbK0mar7oZ4V079I/qPMxg==",
-          "dev": true,
-          "requires": {
-            "tslib": "^2.1.0"
-          }
-        },
-        "slice-ansi": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-3.0.0.tgz",
-          "integrity": "sha512-pSyv7bSTC7ig9Dcgbw9AuRNUb5k5V6oDudjZoMBSr13qpLBG7tB+zgCkARjq7xIUgdz5P1Qe8u+rSGdouOOIyQ==",
-          "dev": true,
-          "requires": {
-            "ansi-styles": "^4.0.0",
-            "astral-regex": "^2.0.0",
-            "is-fullwidth-code-point": "^3.0.0"
-          }
-        },
-        "string-width": {
-          "version": "4.2.3",
-          "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
-          "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
-          "dev": true,
-          "requires": {
-            "emoji-regex": "^8.0.0",
-            "is-fullwidth-code-point": "^3.0.0",
-            "strip-ansi": "^6.0.1"
-          }
-        }
-      }
-    },
-    "loader-runner": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/loader-runner/-/loader-runner-4.3.0.tgz",
-      "integrity": "sha512-3R/1M+yS3j5ou80Me59j7F9IMs4PXs3VqRrm0TU3AbKPxlmpoY1TNscJV/oGJXo8qCatFGTfDbY6W6ipGOYXfg==",
-      "dev": true
-    },
-    "loader-utils": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.4.tgz",
-      "integrity": "sha512-xXqpXoINfFhgua9xiqD8fPFHgkoq1mmmpE92WlDbm9rNRd/EbRb+Gqf908T2DMfuHjjJlksiK2RbHVOdD/MqSw==",
-      "dev": true,
-      "requires": {
-        "big.js": "^5.2.2",
-        "emojis-list": "^3.0.0",
-        "json5": "^2.1.2"
-      }
-    },
-    "local-pkg": {
-      "version": "0.4.3",
-      "resolved": "https://registry.npmjs.org/local-pkg/-/local-pkg-0.4.3.tgz",
-      "integrity": "sha512-SFppqq5p42fe2qcZQqqEOiVRXl+WCP1MdT6k7BDEW1j++sp5fIY+/fdRQitvKgB5BrBcmrs5m/L0v2FrU5MY1g==",
-      "dev": true
-    },
-    "locate-path": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-6.0.0.tgz",
-      "integrity": "sha512-iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw==",
-      "dev": true,
-      "requires": {
-        "p-locate": "^5.0.0"
-      }
-    },
-    "lodash": {
-      "version": "4.17.21",
-      "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz",
-      "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg=="
-    },
-    "lodash.clonedeep": {
-      "version": "4.5.0",
-      "resolved": "https://registry.npmjs.org/lodash.clonedeep/-/lodash.clonedeep-4.5.0.tgz",
-      "integrity": "sha512-H5ZhCF25riFd9uB5UCkVKo61m3S/xZk1x4wA6yp/L3RFP6Z/eHH1ymQcGLo7J3GMPfm0V/7m1tryHuGVxpqEBQ=="
-    },
-    "lodash.curry": {
-      "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/lodash.curry/-/lodash.curry-4.1.1.tgz",
-      "integrity": "sha512-/u14pXGviLaweY5JI0IUzgzF2J6Ne8INyzAZjImcryjgkZ+ebruBxy2/JaOOkTqScddcYtakjhSaeemV8lR0tA==",
-      "dev": true
-    },
-    "lodash.get": {
-      "version": "4.4.2",
-      "resolved": "https://registry.npmjs.org/lodash.get/-/lodash.get-4.4.2.tgz",
-      "integrity": "sha512-z+Uw/vLuy6gQe8cfaFWD7p0wVv8fJl3mbzXh33RS+0oW2wvUqiRXiQ69gLWSLpgB5/6sU+r6BlQR0MBILadqTQ==",
-      "dev": true
-    },
-    "lodash.merge": {
-      "version": "4.6.2",
-      "resolved": "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.2.tgz",
-      "integrity": "sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==",
-      "dev": true
-    },
-    "lodash.omit": {
-      "version": "4.5.0",
-      "resolved": "https://registry.npmjs.org/lodash.omit/-/lodash.omit-4.5.0.tgz",
-      "integrity": "sha512-XeqSp49hNGmlkj2EJlfrQFIzQ6lXdNro9sddtQzcJY8QaoC2GO0DT7xaIokHeyM+mIT0mPMlPvkYzg2xCuHdZg=="
-    },
-    "lodash.padend": {
-      "version": "4.6.1",
-      "resolved": "https://registry.npmjs.org/lodash.padend/-/lodash.padend-4.6.1.tgz",
-      "integrity": "sha512-sOQs2aqGpbl27tmCS1QNZA09Uqp01ZzWfDUoD+xzTii0E7dSQfRKcRetFwa+uXaxaqL+TKm7CgD2JdKP7aZBSw=="
-    },
-    "lodash.trimstart": {
-      "version": "4.5.1",
-      "resolved": "https://registry.npmjs.org/lodash.trimstart/-/lodash.trimstart-4.5.1.tgz",
-      "integrity": "sha512-b/+D6La8tU76L/61/aN0jULWHkT0EeJCmVstPBn/K9MtD2qBW83AsBNrr63dKuWYwVMO7ucv13QNO/Ek/2RKaQ=="
-    },
-    "lodash.words": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/lodash.words/-/lodash.words-4.2.0.tgz",
-      "integrity": "sha512-mXxqd8Yx9BGPij3lZKFSdOsjOTbL4krbCCp9slEozaN4EMppA2dFmK/f8HeohodprY6W0vOdiQ5WFgPaTI75xQ=="
-    },
-    "log-update": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/log-update/-/log-update-4.0.0.tgz",
-      "integrity": "sha512-9fkkDevMefjg0mmzWFBW8YkFP91OrizzkW3diF7CpG+S2EYdy4+TVfGwz1zeF8x7hCx1ovSPTOE9Ngib74qqUg==",
-      "dev": true,
-      "requires": {
-        "ansi-escapes": "^4.3.0",
-        "cli-cursor": "^3.1.0",
-        "slice-ansi": "^4.0.0",
-        "wrap-ansi": "^6.2.0"
-      },
-      "dependencies": {
-        "ansi-styles": {
-          "version": "4.3.0",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-          "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-          "dev": true,
-          "requires": {
-            "color-convert": "^2.0.1"
-          }
-        },
-        "color-convert": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-          "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-          "dev": true,
-          "requires": {
-            "color-name": "~1.1.4"
-          }
-        },
-        "color-name": {
-          "version": "1.1.4",
-          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-          "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-          "dev": true
-        },
-        "emoji-regex": {
-          "version": "8.0.0",
-          "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
-          "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
-          "dev": true
-        },
-        "is-fullwidth-code-point": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
-          "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
-          "dev": true
-        },
-        "slice-ansi": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-4.0.0.tgz",
-          "integrity": "sha512-qMCMfhY040cVHT43K9BFygqYbUPFZKHOg7K73mtTWJRb8pyP3fzf4Ixd5SzdEJQ6MRUg/WBnOLxghZtKKurENQ==",
-          "dev": true,
-          "requires": {
-            "ansi-styles": "^4.0.0",
-            "astral-regex": "^2.0.0",
-            "is-fullwidth-code-point": "^3.0.0"
-          }
-        },
-        "string-width": {
-          "version": "4.2.3",
-          "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
-          "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
-          "dev": true,
-          "requires": {
-            "emoji-regex": "^8.0.0",
-            "is-fullwidth-code-point": "^3.0.0",
-            "strip-ansi": "^6.0.1"
-          }
-        },
-        "wrap-ansi": {
-          "version": "6.2.0",
-          "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-6.2.0.tgz",
-          "integrity": "sha512-r6lPcBGxZXlIcymEu7InxDMhdW0KDxpLgoFLcguasxCaJ/SOIZwINatK9KY/tf+ZrlywOKU0UDj3ATXUBfxJXA==",
-          "dev": true,
-          "requires": {
-            "ansi-styles": "^4.0.0",
-            "string-width": "^4.1.0",
-            "strip-ansi": "^6.0.0"
-          }
-        }
-      }
-    },
-    "loose-envify": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/loose-envify/-/loose-envify-1.4.0.tgz",
-      "integrity": "sha512-lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q==",
-      "requires": {
-        "js-tokens": "^3.0.0 || ^4.0.0"
-      }
-    },
-    "lottie-web": {
-      "version": "5.12.2",
-      "resolved": "https://registry.npmjs.org/lottie-web/-/lottie-web-5.12.2.tgz",
-      "integrity": "sha512-uvhvYPC8kGPjXT3MyKMrL3JitEAmDMp30lVkuq/590Mw9ok6pWcFCwXJveo0t5uqYw1UREQHofD+jVpdjBv8wg=="
-    },
-    "loupe": {
-      "version": "2.3.7",
-      "resolved": "https://registry.npmjs.org/loupe/-/loupe-2.3.7.tgz",
-      "integrity": "sha512-zSMINGVYkdpYSOBmLi0D1Uo7JU9nVdQKrHxC8eYlV+9YKK9WePqAlL7lSlorG/U2Fw1w0hTBmaa/jrQ3UbPHtA==",
-      "dev": true,
-      "requires": {
-        "get-func-name": "^2.0.1"
-      }
-    },
-    "lower-case": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/lower-case/-/lower-case-2.0.2.tgz",
-      "integrity": "sha512-7fm3l3NAF9WfN6W3JOmf5drwpVqX78JtoGJ3A6W0a6ZnldM41w2fV5D490psKFTpMds8TJse/eHLFFsNHHjHgg==",
-      "dev": true,
-      "requires": {
-        "tslib": "^2.0.3"
-      }
-    },
-    "lru-cache": {
-      "version": "5.1.1",
-      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-5.1.1.tgz",
-      "integrity": "sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==",
-      "peer": true,
-      "requires": {
-        "yallist": "^3.0.2"
-      }
-    },
-    "magic-string": {
-      "version": "0.30.5",
-      "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.30.5.tgz",
-      "integrity": "sha512-7xlpfBaQaP/T6Vh8MO/EqXSW5En6INHEvEXQiuff7Gku0PWjU3uf6w/j9o7O+SpB5fOAkrI5HeoNgwjEO0pFsA==",
-      "dev": true,
-      "requires": {
-        "@jridgewell/sourcemap-codec": "^1.4.15"
-      }
-    },
-    "map-obj": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/map-obj/-/map-obj-2.0.0.tgz",
-      "integrity": "sha512-TzQSV2DiMYgoF5RycneKVUzIa9bQsj/B3tTgsE3dOGqlzHnGIDaC7XBE7grnA+8kZPnfqSGFe95VHc2oc0VFUQ==",
-      "dev": true
-    },
-    "md5.js": {
-      "version": "1.3.5",
-      "resolved": "https://registry.npmjs.org/md5.js/-/md5.js-1.3.5.tgz",
-      "integrity": "sha512-xitP+WxNPcTTOgnTJcrhM0xvdPepipPSf3I8EIpGKeFLjt3PlJLIDG3u8EX53ZIubkb+5U2+3rELYpEhHhzdkg==",
-      "requires": {
-        "hash-base": "^3.0.0",
-        "inherits": "^2.0.1",
-        "safe-buffer": "^5.1.2"
-      }
-    },
-    "media-typer": {
-      "version": "0.3.0",
-      "resolved": "https://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz",
-      "integrity": "sha512-dq+qelQ9akHpcOl/gUVRTxVIOkAJ1wR3QAvb4RsVjS8oVoFjDGTc679wJYmUmknUF5HwMLOgb5O+a3KxfWapPQ==",
-      "dev": true
-    },
-    "memfs": {
-      "version": "3.5.3",
-      "resolved": "https://registry.npmjs.org/memfs/-/memfs-3.5.3.tgz",
-      "integrity": "sha512-UERzLsxzllchadvbPs5aolHh65ISpKpM+ccLbOJ8/vvpBKmAWf+la7dXFy7Mr0ySHbdHrFv5kGFCUHHe6GFEmw==",
-      "dev": true,
-      "requires": {
-        "fs-monkey": "^1.0.4"
-      }
-    },
-    "merge-descriptors": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.1.tgz",
-      "integrity": "sha512-cCi6g3/Zr1iqQi6ySbseM1Xvooa98N0w31jzUYrXPX2xqObmFGHJ0tQ5u74H3mVh7wLouTseZyYIq39g8cNp1w==",
-      "dev": true
-    },
-    "merge-stream": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/merge-stream/-/merge-stream-2.0.0.tgz",
-      "integrity": "sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w==",
-      "dev": true
-    },
-    "merge2": {
-      "version": "1.4.1",
-      "resolved": "https://registry.npmjs.org/merge2/-/merge2-1.4.1.tgz",
-      "integrity": "sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==",
-      "dev": true
-    },
-    "methods": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/methods/-/methods-1.1.2.tgz",
-      "integrity": "sha512-iclAHeNqNm68zFtnZ0e+1L2yUIdvzNoauKU4WBA3VvH/vPFieF7qfRlwUZU+DA9P9bPXIS90ulxoUoCH23sV2w==",
-      "dev": true
-    },
-    "micro-packed": {
-      "version": "0.5.1",
-      "resolved": "https://registry.npmjs.org/micro-packed/-/micro-packed-0.5.1.tgz",
-      "integrity": "sha512-VjBHcsMAVfivjCZPnqAEEkcihPBbNd39KLEMH76ksL3ORKSZE04gkrtsAmXtaTor67PmTO5h0Rq9+j3PA4zNrw==",
-      "requires": {
-        "@scure/base": "~1.1.5"
-      }
-    },
-    "micromatch": {
-      "version": "4.0.5",
-      "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.5.tgz",
-      "integrity": "sha512-DMy+ERcEW2q8Z2Po+WNXuw3c5YaUSFjAO5GsJqfEl7UjvtIuFKO6ZrKvcItdy98dwFI2N1tg3zNIdKaQT+aNdA==",
-      "dev": true,
-      "requires": {
-        "braces": "^3.0.2",
-        "picomatch": "^2.3.1"
-      }
-    },
-    "microseconds": {
-      "version": "0.1.0",
-      "resolved": "https://registry.npmjs.org/microseconds/-/microseconds-0.1.0.tgz",
-      "integrity": "sha512-yF2K4aHXKxO4OGhW7Ek2KLgKEAFbSblBLKlF6KzwQUhjK7+uAzatRr6fZ82bftdnuDQrkBHAJp5s8quj1ME3wA==",
-      "dev": true
-    },
-    "miller-rabin": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/miller-rabin/-/miller-rabin-4.0.1.tgz",
-      "integrity": "sha512-115fLhvZVqWwHPbClyntxEVfVDfl9DLLTuJvq3g2O/Oxi8AiNouAHvDSzHS0viUJc+V5vm3eq91Xwqn9dp4jRA==",
-      "requires": {
-        "bn.js": "^4.0.0",
-        "brorand": "^1.0.1"
-      },
-      "dependencies": {
-        "bn.js": {
-          "version": "4.12.0",
-          "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.0.tgz",
-          "integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA=="
-        }
-      }
-    },
-    "mime": {
-      "version": "1.6.0",
-      "resolved": "https://registry.npmjs.org/mime/-/mime-1.6.0.tgz",
-      "integrity": "sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg==",
-      "dev": true
-    },
-    "mime-db": {
-      "version": "1.52.0",
-      "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.52.0.tgz",
-      "integrity": "sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg=="
-    },
-    "mime-types": {
-      "version": "2.1.35",
-      "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.35.tgz",
-      "integrity": "sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==",
-      "requires": {
-        "mime-db": "1.52.0"
-      }
-    },
-    "mimic-fn": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-2.1.0.tgz",
-      "integrity": "sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==",
-      "dev": true
-    },
-    "minimalistic-assert": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/minimalistic-assert/-/minimalistic-assert-1.0.1.tgz",
-      "integrity": "sha512-UtJcAD4yEaGtjPezWuO9wC4nwUnVH/8/Im3yEHQP4b67cXlD/Qr9hdITCU1xDbSEXg2XKNaP8jsReV7vQd00/A=="
-    },
-    "minimalistic-crypto-utils": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/minimalistic-crypto-utils/-/minimalistic-crypto-utils-1.0.1.tgz",
-      "integrity": "sha512-JIYlbt6g8i5jKfJ3xz7rF0LXmv2TkDxBLUkiBeZ7bAx4GnnNMr8xFpGnOxn6GhTEHx3SjRrZEoU+j04prX1ktg=="
-    },
-    "minimatch": {
-      "version": "3.1.2",
-      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
-      "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
-      "requires": {
-        "brace-expansion": "^1.1.7"
-      }
-    },
-    "minimist": {
-      "version": "1.2.8",
-      "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.8.tgz",
-      "integrity": "sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA==",
-      "dev": true
-    },
-    "mixpanel-browser": {
-      "version": "2.47.0",
-      "resolved": "https://registry.npmjs.org/mixpanel-browser/-/mixpanel-browser-2.47.0.tgz",
-      "integrity": "sha512-Ldrva0fRBEIFWmEibBQO1PulfpJVF3pf28Guk09lDirDaSQqqU/xs9zQLwN2rL5VwVtsP1aD3JaCgaa98EjojQ=="
-    },
-    "mlly": {
-      "version": "1.4.2",
-      "resolved": "https://registry.npmjs.org/mlly/-/mlly-1.4.2.tgz",
-      "integrity": "sha512-i/Ykufi2t1EZ6NaPLdfnZk2AX8cs0d+mTzVKuPfqPKPatxLApaBoxJQ9x1/uckXtrS/U5oisPMDkNs0yQTaBRg==",
-      "dev": true,
-      "requires": {
-        "acorn": "^8.10.0",
-        "pathe": "^1.1.1",
-        "pkg-types": "^1.0.3",
-        "ufo": "^1.3.0"
-      }
-    },
-    "more-entropy": {
-      "version": "0.0.7",
-      "resolved": "https://registry.npmjs.org/more-entropy/-/more-entropy-0.0.7.tgz",
-      "integrity": "sha512-e0TxQtU1F6/ZA8WnEA2JLQwwDqBTtZFLJSW7rWgUsQou35wx1IOL0g2O7q7oGoMgIJto+jHMnNGHLfSiylHRrw==",
-      "requires": {
-        "iced-runtime": ">=0.0.1"
-      }
-    },
-    "ms": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w=="
-    },
-    "multicast-dns": {
-      "version": "7.2.5",
-      "resolved": "https://registry.npmjs.org/multicast-dns/-/multicast-dns-7.2.5.tgz",
-      "integrity": "sha512-2eznPJP8z2BFLX50tf0LuODrpINqP1RVIm/CObbTcBRITQgmC/TjcREF1NeTBzIcR5XO/ukWo+YHOjBbFwIupg==",
-      "dev": true,
-      "requires": {
-        "dns-packet": "^5.2.2",
-        "thunky": "^1.0.2"
-      }
-    },
-    "nan": {
-      "version": "2.20.0",
-      "resolved": "https://registry.npmjs.org/nan/-/nan-2.20.0.tgz",
-      "integrity": "sha512-bk3gXBZDGILuuo/6sKtr0DQmSThYHLtNCdSdXk9YkxD/jK6X2vmCyyXBBxyqZ4XcnzTyYEAThfX3DCEnLf6igw=="
-    },
-    "nano-time": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/nano-time/-/nano-time-1.0.0.tgz",
-      "integrity": "sha512-flnngywOoQ0lLQOTRNexn2gGSNuM9bKj9RZAWSzhQ+UJYaAFG9bac4DW9VHjUAzrOaIcajHybCTHe/bkvozQqA==",
-      "requires": {
-        "big-integer": "^1.6.16"
-      }
-    },
-    "nanoid": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-4.0.2.tgz",
-      "integrity": "sha512-7ZtY5KTCNheRGfEFxnedV5zFiORN1+Y1N6zvPTnHQd8ENUvfaDBeuJDZb2bN/oXwXxu3qkTXDzy57W5vAmDTBw=="
-    },
-    "natural-compare": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz",
-      "integrity": "sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw==",
-      "dev": true
-    },
-    "natural-compare-lite": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/natural-compare-lite/-/natural-compare-lite-1.4.0.tgz",
-      "integrity": "sha512-Tj+HTDSJJKaZnfiuw+iaF9skdPpTo2GtEly5JHnWV/hfv2Qj/9RKsGISQtLh2ox3l5EAGw487hnBee0sIJ6v2g==",
-      "dev": true
-    },
-    "negotiator": {
-      "version": "0.6.3",
-      "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.3.tgz",
-      "integrity": "sha512-+EUsqGPLsM+j/zdChZjsnX51g4XrHFOIXwfnCVPGlQk/k5giakcKsuxCObBRu6DSm9opw/O6slWbJdghQM4bBg==",
-      "dev": true
-    },
-    "neo-async": {
-      "version": "2.6.2",
-      "resolved": "https://registry.npmjs.org/neo-async/-/neo-async-2.6.2.tgz",
-      "integrity": "sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==",
-      "dev": true
-    },
-    "no-case": {
-      "version": "3.0.4",
-      "resolved": "https://registry.npmjs.org/no-case/-/no-case-3.0.4.tgz",
-      "integrity": "sha512-fgAN3jGAh+RoxUGZHTSOLJIqUc2wmoBwGR4tbpNAKmmovFoWq0OdRkb0VkldReO2a2iBT/OEulG9XSUc10r3zg==",
-      "dev": true,
-      "requires": {
-        "lower-case": "^2.0.2",
-        "tslib": "^2.0.3"
-      }
-    },
-    "node-abort-controller": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/node-abort-controller/-/node-abort-controller-3.1.1.tgz",
-      "integrity": "sha512-AGK2yQKIjRuqnc6VkX2Xj5d+QW8xZ87pa1UK6yA6ouUyuxfHuMP6umE5QK7UmTeOAymo+Zx1Fxiuw9rVx8taHQ==",
-      "dev": true
-    },
-    "node-fetch": {
-      "version": "2.6.12",
-      "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.12.tgz",
-      "integrity": "sha512-C/fGU2E8ToujUivIO0H+tpQ6HWo4eEmchoPIoXtxCrVghxdKq+QOHqEZW7tuP3KlV3bC8FRMO5nMCC7Zm1VP6g==",
-      "requires": {
-        "whatwg-url": "^5.0.0"
-      },
-      "dependencies": {
-        "tr46": {
-          "version": "0.0.3",
-          "resolved": "https://registry.npmjs.org/tr46/-/tr46-0.0.3.tgz",
-          "integrity": "sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw=="
-        },
-        "webidl-conversions": {
-          "version": "3.0.1",
-          "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-3.0.1.tgz",
-          "integrity": "sha512-2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ=="
-        },
-        "whatwg-url": {
-          "version": "5.0.0",
-          "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-5.0.0.tgz",
-          "integrity": "sha512-saE57nupxk6v3HY35+jzBwYa0rKSy0XR8JSxZPwgLr7ys0IBzhGviA1/TUGJLmSVqs8pb9AnvICXEuOHLprYTw==",
-          "requires": {
-            "tr46": "~0.0.3",
-            "webidl-conversions": "^3.0.0"
-          }
-        }
-      }
-    },
-    "node-forge": {
-      "version": "1.3.1",
-      "resolved": "https://registry.npmjs.org/node-forge/-/node-forge-1.3.1.tgz",
-      "integrity": "sha512-dPEtOeMvF9VMcYV/1Wb8CPoVAXtp6MKMlcbAt4ddqmGqUJ6fQZFXkNZNkNlfevtNkGtaSoXf/vNNNSvgrdXwtA==",
-      "dev": true
-    },
-    "node-releases": {
-      "version": "2.0.13",
-      "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.13.tgz",
-      "integrity": "sha512-uYr7J37ae/ORWdZeQ1xxMJe3NtdmqMC/JZK+geofDrkLUApKRHPd18/TxtBOJ4A0/+uUIliorNrfYV6s1b02eQ=="
-    },
-    "normalize-path": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz",
-      "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==",
-      "dev": true
-    },
-    "npm-run-path": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-4.0.1.tgz",
-      "integrity": "sha512-S48WzZW777zhNIrn7gxOlISNAqi9ZC/uQFnRdbeIHhZhCA6UqpkOT8T1G7BvfdgP4Er8gF4sUbaS0i7QvIfCWw==",
-      "dev": true,
-      "requires": {
-        "path-key": "^3.0.0"
-      }
-    },
-    "nth-check": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/nth-check/-/nth-check-2.1.1.tgz",
-      "integrity": "sha512-lqjrjmaOoAnWfMmBPL+XNnynZh2+swxiX3WUE0s4yEHI6m+AwrK2UZOimIRl3X/4QctVqS8AiZjFqyOGrMXb/w==",
-      "dev": true,
-      "requires": {
-        "boolbase": "^1.0.0"
-      }
-    },
-    "object-assign": {
-      "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
-      "integrity": "sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg=="
-    },
-    "object-inspect": {
-      "version": "1.12.3",
-      "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.12.3.tgz",
-      "integrity": "sha512-geUvdk7c+eizMNUDkRpW1wJwgfOiOeHbxBR/hLXK1aT6zmVSO0jsQcs7fj6MGw89jC/cjGfLcNOrtMYtGqm81g==",
-      "dev": true
-    },
-    "object-is": {
-      "version": "1.1.5",
-      "resolved": "https://registry.npmjs.org/object-is/-/object-is-1.1.5.tgz",
-      "integrity": "sha512-3cyDsyHgtmi7I7DfSSI2LDp6SK2lwvtbg0p0R1e0RvTqF5ceGx+K2dfSjm1bKDMVCFEDAQvy+o8c6a7VujOddw==",
-      "dev": true,
-      "requires": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.1.3"
-      }
-    },
-    "object-keys": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.1.1.tgz",
-      "integrity": "sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==",
-      "dev": true
-    },
-    "object-pairs": {
-      "version": "0.1.0",
-      "resolved": "https://registry.npmjs.org/object-pairs/-/object-pairs-0.1.0.tgz",
-      "integrity": "sha512-3ECr6K831I4xX/Mduxr9UC+HPOz/d6WKKYj9p4cmC8Lg8p7g8gitzsxNX5IWlSIgFWN/a4JgrJaoAMKn20oKwA==",
-      "dev": true
-    },
-    "object-values": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/object-values/-/object-values-1.0.0.tgz",
-      "integrity": "sha512-+8hwcz/JnQ9EpLIXzN0Rs7DLsBpJNT/xYehtB/jU93tHYr5BFEO8E+JGQNOSqE7opVzz5cGksKFHt7uUJVLSjQ==",
-      "dev": true
-    },
-    "object.assign": {
-      "version": "4.1.4",
-      "resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.4.tgz",
-      "integrity": "sha512-1mxKf0e58bvyjSCtKYY4sRe9itRk3PJpquJOjeIkz885CczcI4IvJJDLPS72oowuSh+pBxUFROpX+TU++hxhZQ==",
-      "dev": true,
-      "requires": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.1.4",
-        "has-symbols": "^1.0.3",
-        "object-keys": "^1.1.1"
-      }
-    },
-    "object.entries": {
-      "version": "1.1.6",
-      "resolved": "https://registry.npmjs.org/object.entries/-/object.entries-1.1.6.tgz",
-      "integrity": "sha512-leTPzo4Zvg3pmbQ3rDK69Rl8GQvIqMWubrkxONG9/ojtFE2rD9fjMKfSI5BxW3osRH1m6VdzmqK8oAY9aT4x5w==",
-      "dev": true,
-      "requires": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.1.4",
-        "es-abstract": "^1.20.4"
-      }
-    },
-    "object.fromentries": {
-      "version": "2.0.6",
-      "resolved": "https://registry.npmjs.org/object.fromentries/-/object.fromentries-2.0.6.tgz",
-      "integrity": "sha512-VciD13dswC4j1Xt5394WR4MzmAQmlgN72phd/riNp9vtD7tp4QQWJ0R4wvclXcafgcYK8veHRed2W6XeGBvcfg==",
-      "dev": true,
-      "requires": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.1.4",
-        "es-abstract": "^1.20.4"
-      }
-    },
-    "object.groupby": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/object.groupby/-/object.groupby-1.0.0.tgz",
-      "integrity": "sha512-70MWG6NfRH9GnbZOikuhPPYzpUpof9iW2J9E4dW7FXTqPNb6rllE6u39SKwwiNh8lCwX3DDb5OgcKGiEBrTTyw==",
-      "dev": true,
-      "requires": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.2.0",
-        "es-abstract": "^1.21.2",
-        "get-intrinsic": "^1.2.1"
-      }
-    },
-    "object.hasown": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/object.hasown/-/object.hasown-1.1.2.tgz",
-      "integrity": "sha512-B5UIT3J1W+WuWIU55h0mjlwaqxiE5vYENJXIXZ4VFe05pNYrkKuK0U/6aFcb0pKywYJh7IhfoqUfKVmrJJHZHw==",
-      "dev": true,
-      "requires": {
-        "define-properties": "^1.1.4",
-        "es-abstract": "^1.20.4"
-      }
-    },
-    "object.values": {
-      "version": "1.1.6",
-      "resolved": "https://registry.npmjs.org/object.values/-/object.values-1.1.6.tgz",
-      "integrity": "sha512-FVVTkD1vENCsAcwNs9k6jea2uHC/X0+JcjG8YA60FN5CMaJmG95wT9jek/xX9nornqGRrBkKtzuAu2wuHpKqvw==",
-      "dev": true,
-      "requires": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.1.4",
-        "es-abstract": "^1.20.4"
-      }
-    },
-    "oblivious-set": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/oblivious-set/-/oblivious-set-1.0.0.tgz",
-      "integrity": "sha512-z+pI07qxo4c2CulUHCDf9lcqDlMSo72N/4rLUpRXf6fu+q8vjt8y0xS+Tlf8NTJDdTXHbdeO1n3MlbctwEoXZw=="
-    },
-    "obuf": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/obuf/-/obuf-1.1.2.tgz",
-      "integrity": "sha512-PX1wu0AmAdPqOL1mWhqmlOd8kOIZQwGZw6rh7uby9fTc5lhaOWFLX3I6R1hrF9k3zUY40e6igsLGkDXK92LJNg==",
-      "dev": true
-    },
-    "on-finished": {
-      "version": "2.4.1",
-      "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.4.1.tgz",
-      "integrity": "sha512-oVlzkg3ENAhCk2zdv7IJwd/QUD4z2RxRwpkcGY8psCVcCYZNq4wYnVWALHM+brtuJjePWiYF/ClmuDr8Ch5+kg==",
-      "dev": true,
-      "requires": {
-        "ee-first": "1.1.1"
-      }
-    },
-    "on-headers": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/on-headers/-/on-headers-1.0.2.tgz",
-      "integrity": "sha512-pZAE+FJLoyITytdqK0U5s+FIpjN0JP3OzFi/u8Rx+EV5/W+JTWGXG8xFzevE7AjBfDqHv/8vL8qQsIhHnqRkrA==",
-      "dev": true
-    },
-    "once": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
-      "integrity": "sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==",
-      "requires": {
-        "wrappy": "1"
-      }
-    },
-    "onetime": {
-      "version": "5.1.2",
-      "resolved": "https://registry.npmjs.org/onetime/-/onetime-5.1.2.tgz",
-      "integrity": "sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg==",
-      "dev": true,
-      "requires": {
-        "mimic-fn": "^2.1.0"
-      }
-    },
-    "open": {
-      "version": "8.4.2",
-      "resolved": "https://registry.npmjs.org/open/-/open-8.4.2.tgz",
-      "integrity": "sha512-7x81NCL719oNbsq/3mh+hVrAWmFuEYUqrq/Iw3kUzH8ReypT9QQ0BLoJS7/G9k6N81XjW4qHWtjWwe/9eLy1EQ==",
-      "dev": true,
-      "requires": {
-        "define-lazy-prop": "^2.0.0",
-        "is-docker": "^2.1.1",
-        "is-wsl": "^2.2.0"
-      }
-    },
-    "optionator": {
-      "version": "0.9.3",
-      "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.9.3.tgz",
-      "integrity": "sha512-JjCoypp+jKn1ttEFExxhetCKeJt9zhAgAve5FXHixTvFDW/5aEktX9bufBKLRRMdU7bNtpLfcGu94B3cdEJgjg==",
-      "dev": true,
-      "requires": {
-        "@aashutoshrathi/word-wrap": "^1.2.3",
-        "deep-is": "^0.1.3",
-        "fast-levenshtein": "^2.0.6",
-        "levn": "^0.4.1",
-        "prelude-ls": "^1.2.1",
-        "type-check": "^0.4.0"
-      }
-    },
-    "p-limit": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz",
-      "integrity": "sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==",
-      "dev": true,
-      "requires": {
-        "yocto-queue": "^0.1.0"
-      }
-    },
-    "p-locate": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-5.0.0.tgz",
-      "integrity": "sha512-LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw==",
-      "dev": true,
-      "requires": {
-        "p-limit": "^3.0.2"
-      }
-    },
-    "p-map": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/p-map/-/p-map-2.1.0.tgz",
-      "integrity": "sha512-y3b8Kpd8OAN444hxfBbFfj1FY/RjtTd8tzYwhUqNYXx0fXx2iX4maP4Qr6qhIKbQXI02wTLAda4fYUbDagTUFw==",
-      "dev": true
-    },
-    "p-queue": {
-      "version": "7.3.4",
-      "resolved": "https://registry.npmjs.org/p-queue/-/p-queue-7.3.4.tgz",
-      "integrity": "sha512-esox8CWt0j9EZECFvkFl2WNPat8LN4t7WWeXq73D9ha0V96qPRufApZi4ZhPwXAln1uVVal429HVVKPa2X0yQg==",
-      "requires": {
-        "eventemitter3": "^4.0.7",
-        "p-timeout": "^5.0.2"
-      }
-    },
-    "p-retry": {
-      "version": "4.6.2",
-      "resolved": "https://registry.npmjs.org/p-retry/-/p-retry-4.6.2.tgz",
-      "integrity": "sha512-312Id396EbJdvRONlngUx0NydfrIQ5lsYu0znKVUzVvArzEIt08V1qhtyESbGVd1FGX7UKtiFp5uwKZdM8wIuQ==",
-      "dev": true,
-      "requires": {
-        "@types/retry": "0.12.0",
-        "retry": "^0.13.1"
-      }
-    },
-    "p-timeout": {
-      "version": "5.1.0",
-      "resolved": "https://registry.npmjs.org/p-timeout/-/p-timeout-5.1.0.tgz",
-      "integrity": "sha512-auFDyzzzGZZZdHz3BtET9VEz0SE/uMEAx7uWfGPucfzEwwe/xH0iVeZibQmANYE/hp9T2+UUZT5m+BKyrDp3Ew=="
-    },
-    "param-case": {
-      "version": "3.0.4",
-      "resolved": "https://registry.npmjs.org/param-case/-/param-case-3.0.4.tgz",
-      "integrity": "sha512-RXlj7zCYokReqWpOPH9oYivUzLYZ5vAPIfEmCTNViosC78F8F0H9y7T7gG2M39ymgutxF5gcFEsyZQSph9Bp3A==",
-      "dev": true,
-      "requires": {
-        "dot-case": "^3.0.4",
-        "tslib": "^2.0.3"
-      }
-    },
-    "parent-module": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/parent-module/-/parent-module-1.0.1.tgz",
-      "integrity": "sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g==",
-      "dev": true,
-      "requires": {
-        "callsites": "^3.0.0"
-      }
-    },
-    "parse-asn1": {
-      "version": "5.1.6",
-      "resolved": "https://registry.npmjs.org/parse-asn1/-/parse-asn1-5.1.6.tgz",
-      "integrity": "sha512-RnZRo1EPU6JBnra2vGHj0yhp6ebyjBZpmUCLHWiFhxlzvBCCpAuZ7elsBp1PVAbQN0/04VD/19rfzlBSwLstMw==",
-      "requires": {
-        "asn1.js": "^5.2.0",
-        "browserify-aes": "^1.0.0",
-        "evp_bytestokey": "^1.0.0",
-        "pbkdf2": "^3.0.3",
-        "safe-buffer": "^5.1.1"
-      }
-    },
-    "parse-json": {
-      "version": "5.2.0",
-      "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-5.2.0.tgz",
-      "integrity": "sha512-ayCKvm/phCGxOkYRSCM82iDwct8/EonSEgCSxWxD7ve6jHggsFl4fZVQBPRNgQoKiuV/odhFrGzQXZwbifC8Rg==",
-      "dev": true,
-      "requires": {
-        "@babel/code-frame": "^7.0.0",
-        "error-ex": "^1.3.1",
-        "json-parse-even-better-errors": "^2.3.0",
-        "lines-and-columns": "^1.1.6"
-      }
-    },
-    "parse-ms": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/parse-ms/-/parse-ms-4.0.0.tgz",
-      "integrity": "sha512-TXfryirbmq34y8QBwgqCVLi+8oA3oWx2eAnSn62ITyEhEYaWRlVZ2DvMM9eZbMs/RfxPu/PK/aBLyGj4IrqMHw==",
-      "dev": true
-    },
-    "parse5": {
-      "version": "7.1.2",
-      "resolved": "https://registry.npmjs.org/parse5/-/parse5-7.1.2.tgz",
-      "integrity": "sha512-Czj1WaSVpaoj0wbhMzLmWD69anp2WH7FXMB9n1Sy8/ZFF9jolSQVMu1Ij5WIyGmcBmhk7EOndpO4mIpihVqAXw==",
-      "dev": true,
-      "requires": {
-        "entities": "^4.4.0"
-      }
-    },
-    "parseurl": {
-      "version": "1.3.3",
-      "resolved": "https://registry.npmjs.org/parseurl/-/parseurl-1.3.3.tgz",
-      "integrity": "sha512-CiyeOxFT/JZyN5m0z9PfXw4SCBJ6Sygz1Dpl0wqjlhDEGGBP1GnsUVEL0p63hoG1fcj3fHynXi9NYO4nWOL+qQ==",
-      "dev": true
-    },
-    "pascal-case": {
-      "version": "3.1.2",
-      "resolved": "https://registry.npmjs.org/pascal-case/-/pascal-case-3.1.2.tgz",
-      "integrity": "sha512-uWlGT3YSnK9x3BQJaOdcZwrnV6hPpd8jFH1/ucpiLRPh/2zCVJKS19E4GvYHvaCcACn3foXZ0cLB9Wrx1KGe5g==",
-      "dev": true,
-      "requires": {
-        "no-case": "^3.0.4",
-        "tslib": "^2.0.3"
-      }
-    },
-    "path": {
-      "version": "0.12.7",
-      "resolved": "https://registry.npmjs.org/path/-/path-0.12.7.tgz",
-      "integrity": "sha512-aXXC6s+1w7otVF9UletFkFcDsJeO7lSZBPUQhtb5O0xJe8LtYhj/GxldoL09bBj9+ZmE2hNoHqQSFMN5fikh4Q==",
-      "requires": {
-        "process": "^0.11.1",
-        "util": "^0.10.3"
-      },
-      "dependencies": {
-        "inherits": {
-          "version": "2.0.3",
-          "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
-          "integrity": "sha512-x00IRNXNy63jwGkJmzPigoySHbaqpNuzKbBOmzK+g2OdZpQ9w+sxCN+VSB3ja7IAge2OP2qpfxTjeNcyjmW1uw=="
-        },
-        "util": {
-          "version": "0.10.4",
-          "resolved": "https://registry.npmjs.org/util/-/util-0.10.4.tgz",
-          "integrity": "sha512-0Pm9hTQ3se5ll1XihRic3FDIku70C+iHUdT/W926rSgHV5QgXsYbKZN8MSC3tJtSkhuROzvsQjAaFENRXr+19A==",
-          "requires": {
-            "inherits": "2.0.3"
-          }
-        }
-      }
-    },
-    "path-exists": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz",
-      "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==",
-      "dev": true
-    },
-    "path-is-absolute": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
-      "integrity": "sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg=="
-    },
-    "path-is-inside": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/path-is-inside/-/path-is-inside-1.0.2.tgz",
-      "integrity": "sha512-DUWJr3+ULp4zXmol/SZkFf3JGsS9/SIv+Y3Rt93/UjPpDpklB5f1er4O3POIbUuUJ3FXgqte2Q7SrU6zAqwk8w==",
-      "dev": true
-    },
-    "path-key": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz",
-      "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==",
-      "dev": true
-    },
-    "path-parse": {
-      "version": "1.0.7",
-      "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.7.tgz",
-      "integrity": "sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==",
-      "dev": true
-    },
-    "path-to-regexp": {
-      "version": "0.1.7",
-      "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.7.tgz",
-      "integrity": "sha512-5DFkuoqlv1uYQKxy8omFBeJPQcdoE07Kv2sferDCrAq1ohOU+MSDswDIbnx3YAM60qIOnYa53wBhXW0EbMonrQ==",
-      "dev": true
-    },
-    "path-type": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/path-type/-/path-type-4.0.0.tgz",
-      "integrity": "sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==",
-      "dev": true
-    },
-    "pathe": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/pathe/-/pathe-1.1.1.tgz",
-      "integrity": "sha512-d+RQGp0MAYTIaDBIMmOfMwz3E+LOZnxx1HZd5R18mmCZY0QBlK0LDZfPc8FW8Ed2DlvsuE6PRjroDY+wg4+j/Q==",
-      "dev": true
-    },
-    "pathval": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/pathval/-/pathval-1.1.1.tgz",
-      "integrity": "sha512-Dp6zGqpTdETdR63lehJYPeIOqpiNBNtc7BpWSLrOje7UaIsE5aY92r/AunQA7rsXvet3lrJ3JnZX29UPTKXyKQ==",
-      "dev": true
-    },
-    "pbkdf2": {
-      "version": "3.1.2",
-      "resolved": "https://registry.npmjs.org/pbkdf2/-/pbkdf2-3.1.2.tgz",
-      "integrity": "sha512-iuh7L6jA7JEGu2WxDwtQP1ddOpaJNC4KlDEFfdQajSGgGPNi4OyDc2R7QnbY2bR9QjBVGwgvTdNJZoE7RaxUMA==",
-      "requires": {
-        "create-hash": "^1.1.2",
-        "create-hmac": "^1.1.4",
-        "ripemd160": "^2.0.1",
-        "safe-buffer": "^5.0.1",
-        "sha.js": "^2.4.8"
-      }
-    },
-    "picocolors": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.0.1.tgz",
-      "integrity": "sha512-anP1Z8qwhkbmu7MFP5iTt+wQKXgwzf7zTyGlcdzabySa9vd0Xt392U0rVmz9poOaBj0uHJKyyo9/upk0HrEQew=="
-    },
-    "picomatch": {
-      "version": "2.3.1",
-      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz",
-      "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA=="
-    },
-    "pidtree": {
-      "version": "0.6.0",
-      "resolved": "https://registry.npmjs.org/pidtree/-/pidtree-0.6.0.tgz",
-      "integrity": "sha512-eG2dWTVw5bzqGRztnHExczNxt5VGsE6OwTeCG3fdUf9KBsZzO3R5OIIIzWR+iZA0NtZ+RDVdaoE2dK1cn6jH4g==",
-      "dev": true
-    },
-    "pify": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/pify/-/pify-4.0.1.tgz",
-      "integrity": "sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g==",
-      "dev": true
-    },
-    "pinkie": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/pinkie/-/pinkie-2.0.4.tgz",
-      "integrity": "sha512-MnUuEycAemtSaeFSjXKW/aroV7akBbY+Sv+RkyqFjgAe73F+MR0TBWKBRDkmfWq/HiFmdavfZ1G7h4SPZXaCSg==",
-      "dev": true
-    },
-    "pinkie-promise": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/pinkie-promise/-/pinkie-promise-2.0.1.tgz",
-      "integrity": "sha512-0Gni6D4UcLTbv9c57DfxDGdr41XfgUjqWZu492f0cIGr16zDU06BWP/RAEvOuo7CQ0CNjHaLlM59YJJFm3NWlw==",
-      "dev": true,
-      "requires": {
-        "pinkie": "^2.0.0"
-      }
-    },
-    "pkg-types": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/pkg-types/-/pkg-types-1.0.3.tgz",
-      "integrity": "sha512-nN7pYi0AQqJnoLPC9eHFQ8AcyaixBUOwvqc5TDnIKCMEE6I0y8P7OKA7fPexsXGCGxQDl/cmrLAp26LhcwxZ4A==",
-      "dev": true,
-      "requires": {
-        "jsonc-parser": "^3.2.0",
-        "mlly": "^1.2.0",
-        "pathe": "^1.1.0"
-      }
-    },
-    "playwright": {
-      "version": "1.45.2",
-      "resolved": "https://registry.npmjs.org/playwright/-/playwright-1.45.2.tgz",
-      "integrity": "sha512-ReywF2t/0teRvNBpfIgh5e4wnrI/8Su8ssdo5XsQKpjxJj+jspm00jSoz9BTg91TT0c9HRjXO7LBNVrgYj9X0g==",
-      "requires": {
-        "fsevents": "2.3.2",
-        "playwright-core": "1.45.2"
-      },
-      "dependencies": {
-        "fsevents": {
-          "version": "2.3.2",
-          "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.2.tgz",
-          "integrity": "sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==",
-          "optional": true
-        }
-      }
-    },
-    "playwright-core": {
-      "version": "1.45.2",
-      "resolved": "https://registry.npmjs.org/playwright-core/-/playwright-core-1.45.2.tgz",
-      "integrity": "sha512-ha175tAWb0dTK0X4orvBIqi3jGEt701SMxMhyujxNrgd8K0Uy5wMSwwcQHtyB4om7INUkfndx02XnQ2p6dvLDw=="
-    },
-    "postcss": {
-      "version": "8.4.39",
-      "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.39.tgz",
-      "integrity": "sha512-0vzE+lAiG7hZl1/9I8yzKLx3aR9Xbof3fBHKunvMfOCYAtMhrsnccJY2iTURb9EZd5+pLuiNV9/c/GZJOHsgIw==",
-      "dev": true,
-      "requires": {
-        "nanoid": "^3.3.7",
-        "picocolors": "^1.0.1",
-        "source-map-js": "^1.2.0"
-      },
-      "dependencies": {
-        "nanoid": {
-          "version": "3.3.7",
-          "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.7.tgz",
-          "integrity": "sha512-eSRppjcPIatRIMC1U6UngP8XFcz8MQWGQdt1MTBQ7NaAmvXDfvNxbvWV3x2y6CdEUciCSsDHDQZbhYaB8QEo2g==",
-          "dev": true
-        }
-      }
-    },
-    "postcss-modules-extract-imports": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/postcss-modules-extract-imports/-/postcss-modules-extract-imports-3.0.0.tgz",
-      "integrity": "sha512-bdHleFnP3kZ4NYDhuGlVK+CMrQ/pqUm8bx/oGL93K6gVwiclvX5x0n76fYMKuIGKzlABOy13zsvqjb0f92TEXw==",
-      "dev": true,
-      "requires": {}
-    },
-    "postcss-modules-local-by-default": {
-      "version": "4.0.3",
-      "resolved": "https://registry.npmjs.org/postcss-modules-local-by-default/-/postcss-modules-local-by-default-4.0.3.tgz",
-      "integrity": "sha512-2/u2zraspoACtrbFRnTijMiQtb4GW4BvatjaG/bCjYQo8kLTdevCUlwuBHx2sCnSyrI3x3qj4ZK1j5LQBgzmwA==",
-      "dev": true,
-      "requires": {
-        "icss-utils": "^5.0.0",
-        "postcss-selector-parser": "^6.0.2",
-        "postcss-value-parser": "^4.1.0"
-      }
-    },
-    "postcss-modules-scope": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/postcss-modules-scope/-/postcss-modules-scope-3.0.0.tgz",
-      "integrity": "sha512-hncihwFA2yPath8oZ15PZqvWGkWf+XUfQgUGamS4LqoP1anQLOsOJw0vr7J7IwLpoY9fatA2qiGUGmuZL0Iqlg==",
-      "dev": true,
-      "requires": {
-        "postcss-selector-parser": "^6.0.4"
-      }
-    },
-    "postcss-modules-values": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/postcss-modules-values/-/postcss-modules-values-4.0.0.tgz",
-      "integrity": "sha512-RDxHkAiEGI78gS2ofyvCsu7iycRv7oqw5xMWn9iMoR0N/7mf9D50ecQqUo5BZ9Zh2vH4bCUR/ktCqbB9m8vJjQ==",
-      "dev": true,
-      "requires": {
-        "icss-utils": "^5.0.0"
-      }
-    },
-    "postcss-selector-parser": {
-      "version": "6.0.13",
-      "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.0.13.tgz",
-      "integrity": "sha512-EaV1Gl4mUEV4ddhDnv/xtj7sxwrwxdetHdWUGnT4VJQf+4d05v6lHYZr8N573k5Z0BViss7BDhfWtKS3+sfAqQ==",
-      "dev": true,
-      "requires": {
-        "cssesc": "^3.0.0",
-        "util-deprecate": "^1.0.2"
-      }
-    },
-    "postcss-value-parser": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.2.0.tgz",
-      "integrity": "sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ=="
-    },
-    "prelude-ls": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.2.1.tgz",
-      "integrity": "sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==",
-      "dev": true
-    },
-    "prettier": {
-      "version": "2.8.8",
-      "resolved": "https://registry.npmjs.org/prettier/-/prettier-2.8.8.tgz",
-      "integrity": "sha512-tdN8qQGvNjw4CHbY+XXk0JgCXn9QiF21a55rBe5LJAU+kDyC4WQn4+awm2Xfk2lQMk5fKup9XgzTZtGkjBdP9Q==",
-      "dev": true
-    },
-    "prettier-linter-helpers": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/prettier-linter-helpers/-/prettier-linter-helpers-1.0.0.tgz",
-      "integrity": "sha512-GbK2cP9nraSSUF9N2XwUwqfzlAFlMNYYl+ShE/V+H8a9uNl/oUqB1w2EL54Jh0OlyRSd8RfWYJ3coVS4TROP2w==",
-      "dev": true,
-      "requires": {
-        "fast-diff": "^1.1.2"
-      }
-    },
-    "prettier-plugin-organize-imports": {
-      "version": "3.2.3",
-      "resolved": "https://registry.npmjs.org/prettier-plugin-organize-imports/-/prettier-plugin-organize-imports-3.2.3.tgz",
-      "integrity": "sha512-KFvk8C/zGyvUaE3RvxN2MhCLwzV6OBbFSkwZ2OamCrs9ZY4i5L77jQ/w4UmUr+lqX8qbaqVq6bZZkApn+IgJSg==",
-      "dev": true,
-      "requires": {}
-    },
-    "pretty-error": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/pretty-error/-/pretty-error-4.0.0.tgz",
-      "integrity": "sha512-AoJ5YMAcXKYxKhuJGdcvse+Voc6v1RgnsR3nWcYU7q4t6z0Q6T86sv5Zq8VIRbOWWFpvdGE83LtdSMNd+6Y0xw==",
-      "dev": true,
-      "requires": {
-        "lodash": "^4.17.20",
-        "renderkid": "^3.0.0"
-      }
-    },
-    "pretty-ms": {
-      "version": "9.0.0",
-      "resolved": "https://registry.npmjs.org/pretty-ms/-/pretty-ms-9.0.0.tgz",
-      "integrity": "sha512-E9e9HJ9R9NasGOgPaPE8VMeiPKAyWR5jcFpNnwIejslIhWqdqOrb2wShBsncMPUb+BcCd2OPYfh7p2W6oemTng==",
-      "dev": true,
-      "requires": {
-        "parse-ms": "^4.0.0"
-      }
-    },
-    "process": {
-      "version": "0.11.10",
-      "resolved": "https://registry.npmjs.org/process/-/process-0.11.10.tgz",
-      "integrity": "sha512-cdGef/drWFoydD1JsMzuFf8100nZl+GT+yacc2bEced5f9Rjk4z+WtFUTBu9PhOi9j/jfmBPu0mMEY4wIdAF8A=="
-    },
-    "process-nextick-args": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.1.tgz",
-      "integrity": "sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag==",
-      "dev": true
-    },
-    "progress": {
-      "version": "1.1.8",
-      "resolved": "https://registry.npmjs.org/progress/-/progress-1.1.8.tgz",
-      "integrity": "sha512-UdA8mJ4weIkUBO224tIarHzuHs4HuYiJvsuGT7j/SPQiUJVjYvNDBIPa0hAorduOfjGohB/qHWRa/lrrWX/mXw=="
-    },
-    "prop-types": {
-      "version": "15.8.1",
-      "resolved": "https://registry.npmjs.org/prop-types/-/prop-types-15.8.1.tgz",
-      "integrity": "sha512-oj87CgZICdulUohogVAR7AjlC0327U4el4L6eAvOqCeudMDVU0NThNaV+b9Df4dXgSP1gXMTnPdhfe/2qDH5cg==",
-      "requires": {
-        "loose-envify": "^1.4.0",
-        "object-assign": "^4.1.1",
-        "react-is": "^16.13.1"
-      },
-      "dependencies": {
-        "react-is": {
-          "version": "16.13.1",
-          "resolved": "https://registry.npmjs.org/react-is/-/react-is-16.13.1.tgz",
-          "integrity": "sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ=="
-        }
-      }
-    },
-    "proxy-addr": {
-      "version": "2.0.7",
-      "resolved": "https://registry.npmjs.org/proxy-addr/-/proxy-addr-2.0.7.tgz",
-      "integrity": "sha512-llQsMLSUDUPT44jdrU/O37qlnifitDP+ZwrmmZcoSKyLKvtZxpyV0n2/bD/N4tBAAZ/gJEdZU7KMraoK1+XYAg==",
-      "dev": true,
-      "requires": {
-        "forwarded": "0.2.0",
-        "ipaddr.js": "1.9.1"
-      },
-      "dependencies": {
-        "ipaddr.js": {
-          "version": "1.9.1",
-          "resolved": "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.9.1.tgz",
-          "integrity": "sha512-0KI/607xoxSToH7GjN1FfSbLoU0+btTicjsQSWQlh/hZykN8KpmMf7uYwPW3R+akZ6R/w18ZlXSHBYXiYUPO3g==",
-          "dev": true
-        }
-      }
-    },
-    "proxy-from-env": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/proxy-from-env/-/proxy-from-env-1.1.0.tgz",
-      "integrity": "sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg=="
-    },
-    "public-encrypt": {
-      "version": "4.0.3",
-      "resolved": "https://registry.npmjs.org/public-encrypt/-/public-encrypt-4.0.3.tgz",
-      "integrity": "sha512-zVpa8oKZSz5bTMTFClc1fQOnyyEzpl5ozpi1B5YcvBrdohMjH2rfsBtyXcuNuwjsDIXmBYlF2N5FlJYhR29t8Q==",
-      "requires": {
-        "bn.js": "^4.1.0",
-        "browserify-rsa": "^4.0.0",
-        "create-hash": "^1.1.0",
-        "parse-asn1": "^5.0.0",
-        "randombytes": "^2.0.1",
-        "safe-buffer": "^5.1.2"
-      },
-      "dependencies": {
-        "bn.js": {
-          "version": "4.12.0",
-          "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.0.tgz",
-          "integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA=="
-        }
-      }
-    },
-    "punycode": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.3.0.tgz",
-      "integrity": "sha512-rRV+zQD8tVFys26lAGR9WUuS4iUAngJScM+ZRSKtvl5tKeZ2t5bvdNFdNHBW9FWR4guGHlgmsZ1G7BSm2wTbuA==",
-      "dev": true
-    },
-    "qr-code-styling": {
-      "version": "1.5.0",
-      "resolved": "https://registry.npmjs.org/qr-code-styling/-/qr-code-styling-1.5.0.tgz",
-      "integrity": "sha512-7C+1cZGsZWH0BIRtv24faKZJwkxdYlynXktP9dDxKNSik2bqaUZck3B3MpQod/wqm9i3l4q7QsPGkRGKvcuqZw==",
-      "requires": {
-        "qrcode-generator": "^1.4.3"
-      }
-    },
-    "qr.js": {
-      "version": "0.0.0",
-      "resolved": "https://registry.npmjs.org/qr.js/-/qr.js-0.0.0.tgz",
-      "integrity": "sha512-c4iYnWb+k2E+vYpRimHqSu575b1/wKl4XFeJGpFmrJQz5I88v9aY2czh7s0w36srfCM1sXgC/xpoJz5dJfq+OQ=="
-    },
-    "qrcode-generator": {
-      "version": "1.4.4",
-      "resolved": "https://registry.npmjs.org/qrcode-generator/-/qrcode-generator-1.4.4.tgz",
-      "integrity": "sha512-HM7yY8O2ilqhmULxGMpcHSF1EhJJ9yBj8gvDEuZ6M+KGJ0YY2hKpnXvRD+hZPLrDVck3ExIGhmPtSdcjC+guuw=="
-    },
-    "queue-microtask": {
-      "version": "1.2.3",
-      "resolved": "https://registry.npmjs.org/queue-microtask/-/queue-microtask-1.2.3.tgz",
-      "integrity": "sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A==",
-      "dev": true
-    },
-    "randombytes": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/randombytes/-/randombytes-2.1.0.tgz",
-      "integrity": "sha512-vYl3iOX+4CKUWuxGi9Ukhie6fsqXqS9FE2Zaic4tNFD2N2QQaXOMFbuKK4QmDHC0JO6B1Zp41J0LpT0oR68amQ==",
-      "requires": {
-        "safe-buffer": "^5.1.0"
-      }
-    },
-    "randomfill": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/randomfill/-/randomfill-1.0.4.tgz",
-      "integrity": "sha512-87lcbR8+MhcWcUiQ+9e+Rwx8MyR2P7qnt15ynUlbm3TU/fjbgz4GsvfSUDTemtCCtVCqb4ZcEFlyPNTh9bBTLw==",
-      "requires": {
-        "randombytes": "^2.0.5",
-        "safe-buffer": "^5.1.0"
-      }
-    },
-    "range-parser": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/range-parser/-/range-parser-1.2.1.tgz",
-      "integrity": "sha512-Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg==",
-      "dev": true
-    },
-    "raw-body": {
-      "version": "2.5.1",
-      "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.5.1.tgz",
-      "integrity": "sha512-qqJBtEyVgS0ZmPGdCFPWJ3FreoqvG4MVQln/kCgF7Olq95IbOp0/BWyMwbdtn4VTvkM8Y7khCQ2Xgk/tcrCXig==",
-      "dev": true,
-      "requires": {
-        "bytes": "3.1.2",
-        "http-errors": "2.0.0",
-        "iconv-lite": "0.4.24",
-        "unpipe": "1.0.0"
-      },
-      "dependencies": {
-        "bytes": {
-          "version": "3.1.2",
-          "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.1.2.tgz",
-          "integrity": "sha512-/Nf7TyzTx6S3yRJObOAV7956r8cr2+Oj8AC5dt8wSP3BQAoeX58NoHyCU8P8zGkNXStjTSi6fzO6F0pBdcYbEg==",
-          "dev": true
-        },
-        "iconv-lite": {
-          "version": "0.4.24",
-          "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz",
-          "integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==",
-          "dev": true,
-          "requires": {
-            "safer-buffer": ">= 2.1.2 < 3"
-          }
-        }
-      }
-    },
-    "rc-dialog": {
-      "version": "9.1.0",
-      "resolved": "https://registry.npmjs.org/rc-dialog/-/rc-dialog-9.1.0.tgz",
-      "integrity": "sha512-5ry+JABAWEbaKyYsmITtrJbZbJys8CtMyzV8Xn4LYuXMeUx5XVHNyJRoqLFE4AzBuXXzOWeaC49cg+XkxK6kHA==",
-      "requires": {
-        "@babel/runtime": "^7.10.1",
-        "@rc-component/portal": "^1.0.0-8",
-        "classnames": "^2.2.6",
-        "rc-motion": "^2.3.0",
-        "rc-util": "^5.21.0"
-      }
-    },
-    "rc-image": {
-      "version": "5.18.1",
-      "resolved": "https://registry.npmjs.org/rc-image/-/rc-image-5.18.1.tgz",
-      "integrity": "sha512-xdr5zHpSJ6sGdV5oIkHWbttc21LlGKZZjWXVXxSS0sNmqSn97WzOKQBNrTA85UP7oBPPThZAGGGNmGnTkx2qYQ==",
-      "requires": {
-        "@babel/runtime": "^7.11.2",
-        "@rc-component/portal": "^1.0.2",
-        "classnames": "^2.2.6",
-        "rc-dialog": "~9.1.0",
-        "rc-motion": "^2.6.2",
-        "rc-util": "^5.0.6"
-      }
-    },
-    "rc-motion": {
-      "version": "2.7.3",
-      "resolved": "https://registry.npmjs.org/rc-motion/-/rc-motion-2.7.3.tgz",
-      "integrity": "sha512-2xUvo8yGHdOHeQbdI8BtBsCIrWKchEmFEIskf0nmHtJsou+meLd/JE+vnvSX2JxcBrJtXY2LuBpxAOxrbY/wMQ==",
-      "requires": {
-        "@babel/runtime": "^7.11.1",
-        "classnames": "^2.2.1",
-        "rc-util": "^5.21.0"
-      }
-    },
-    "rc-util": {
-      "version": "5.35.0",
-      "resolved": "https://registry.npmjs.org/rc-util/-/rc-util-5.35.0.tgz",
-      "integrity": "sha512-MTXlixb3EoSTEchsOc7XWsVyoUQqoCsh2Z1a2IptwNgqleMF6ZgQeY52UzUbNj5CcVBg9YljOWjuOV07jSSm4Q==",
-      "requires": {
-        "@babel/runtime": "^7.18.3",
-        "react-is": "^16.12.0"
-      },
-      "dependencies": {
-        "react-is": {
-          "version": "16.13.1",
-          "resolved": "https://registry.npmjs.org/react-is/-/react-is-16.13.1.tgz",
-          "integrity": "sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ=="
-        }
-      }
-    },
-    "react": {
-      "version": "18.2.0",
-      "resolved": "https://registry.npmjs.org/react/-/react-18.2.0.tgz",
-      "integrity": "sha512-/3IjMdb2L9QbBdWiW5e3P2/npwMBaU9mHCSCUzNln0ZCYbcfTsGbTJrU/kGemdH2IWmB2ioZ+zkxtmq6g09fGQ==",
-      "requires": {
-        "loose-envify": "^1.1.0"
-      }
-    },
-    "react-content-loader": {
-      "version": "6.2.1",
-      "resolved": "https://registry.npmjs.org/react-content-loader/-/react-content-loader-6.2.1.tgz",
-      "integrity": "sha512-6ONbFX+Hi3SHuP66JB8CPvJn372pj+qwltJV0J8z/8MFrq98I1cbFdZuhDWeQXu3CFxiiDTXJn7DFxx2ZvrO7g==",
-      "requires": {}
-    },
-    "react-dom": {
-      "version": "18.2.0",
-      "resolved": "https://registry.npmjs.org/react-dom/-/react-dom-18.2.0.tgz",
-      "integrity": "sha512-6IMTriUmvsjHUjNtEDudZfuDQUoWXVxKHhlEGSk81n4YFS+r/Kl99wXiwlVXtPBtJenozv2P+hxDsw9eA7Xo6g==",
-      "requires": {
-        "loose-envify": "^1.1.0",
-        "scheduler": "^0.23.0"
-      }
-    },
-    "react-hot-toast": {
-      "version": "2.4.1",
-      "resolved": "https://registry.npmjs.org/react-hot-toast/-/react-hot-toast-2.4.1.tgz",
-      "integrity": "sha512-j8z+cQbWIM5LY37pR6uZR6D4LfseplqnuAO4co4u8917hBUvXlEqyP1ZzqVLcqoyUesZZv/ImreoCeHVDpE5pQ==",
-      "requires": {
-        "goober": "^2.1.10"
-      }
-    },
-    "react-i18next": {
-      "version": "11.18.6",
-      "resolved": "https://registry.npmjs.org/react-i18next/-/react-i18next-11.18.6.tgz",
-      "integrity": "sha512-yHb2F9BiT0lqoQDt8loZ5gWP331GwctHz9tYQ8A2EIEUu+CcEdjBLQWli1USG3RdWQt3W+jqQLg/d4rrQR96LA==",
-      "requires": {
-        "@babel/runtime": "^7.14.5",
-        "html-parse-stringify": "^3.0.1"
-      }
-    },
-    "react-is": {
-      "version": "18.2.0",
-      "resolved": "https://registry.npmjs.org/react-is/-/react-is-18.2.0.tgz",
-      "integrity": "sha512-xWGDIW6x921xtzPkhiULtthJHoJvBbF3q26fzloPCK0hsvxtPVelvftw3zjbHWSkR2km9Z+4uxbDDK/6Zw9B8w=="
-    },
-    "react-is-visible": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/react-is-visible/-/react-is-visible-1.2.0.tgz",
-      "integrity": "sha512-052RH7aHdKrABOBH12wvS2zTAzJ8MnaswPvX2AQGq5wxvD8BnQ5vcnf0cA0cj2g4bjH0+qXz1AIkEL9ZlnN23A==",
-      "requires": {
-        "@babel/runtime": "^7.12.5",
-        "hoist-non-react-statics": "3.3.2"
-      }
-    },
-    "react-lifecycles-compat": {
-      "version": "3.0.4",
-      "resolved": "https://registry.npmjs.org/react-lifecycles-compat/-/react-lifecycles-compat-3.0.4.tgz",
-      "integrity": "sha512-fBASbA6LnOU9dOU2eW7aQ8xmYBSXUIWr+UmF9b1efZBazGNO+rcXT/icdKnYm2pTwcRylVUYwW7H1PHfLekVzA=="
-    },
-    "react-lottie": {
-      "version": "1.2.4",
-      "resolved": "https://registry.npmjs.org/react-lottie/-/react-lottie-1.2.4.tgz",
-      "integrity": "sha512-kBGxI+MIZGBf4wZhNCWwHkMcVP+kbpmrLWH/SkO0qCKc7D7eSPcxQbfpsmsCo8v2KCBYjuGSou+xTqK44D/jMg==",
-      "requires": {
-        "babel-runtime": "^6.26.0",
-        "lottie-web": "^5.1.3"
-      }
-    },
-    "react-modal": {
-      "version": "3.16.1",
-      "resolved": "https://registry.npmjs.org/react-modal/-/react-modal-3.16.1.tgz",
-      "integrity": "sha512-VStHgI3BVcGo7OXczvnJN7yT2TWHJPDXZWyI/a0ssFNhGZWsPmB8cF0z33ewDXq4VfYMO1vXgiv/g8Nj9NDyWg==",
-      "requires": {
-        "exenv": "^1.2.0",
-        "prop-types": "^15.7.2",
-        "react-lifecycles-compat": "^3.0.0",
-        "warning": "^4.0.3"
-      }
-    },
-    "react-number-format": {
-      "version": "5.2.2",
-      "resolved": "https://registry.npmjs.org/react-number-format/-/react-number-format-5.2.2.tgz",
-      "integrity": "sha512-wCh64Z1HCwXcO2dbgkeYIaB+Rmp/fcsH8kAeRtUkc46dv1pIrgDjie2WkOqKBw8YqyqhwNdYgNFNQuuY+iGJ/g==",
-      "requires": {
-        "prop-types": "^15.7.2"
-      }
-    },
-    "react-qr-code": {
-      "version": "2.0.11",
-      "resolved": "https://registry.npmjs.org/react-qr-code/-/react-qr-code-2.0.11.tgz",
-      "integrity": "sha512-P7mvVM5vk9NjGdHMt4Z0KWeeJYwRAtonHTghZT2r+AASinLUUKQ9wfsGH2lPKsT++gps7hXmaiMGRvwTDEL9OA==",
-      "requires": {
-        "prop-types": "^15.8.1",
-        "qr.js": "0.0.0"
-      }
-    },
-    "react-redux": {
-      "version": "7.2.9",
-      "resolved": "https://registry.npmjs.org/react-redux/-/react-redux-7.2.9.tgz",
-      "integrity": "sha512-Gx4L3uM182jEEayZfRbI/G11ZpYdNAnBs70lFVMNdHJI76XYtR+7m0MN+eAs7UHBPhWXcnFPaS+9owSCJQHNpQ==",
-      "requires": {
-        "@babel/runtime": "^7.15.4",
-        "@types/react-redux": "^7.1.20",
-        "hoist-non-react-statics": "^3.3.2",
-        "loose-envify": "^1.4.0",
-        "prop-types": "^15.7.2",
-        "react-is": "^17.0.2"
-      },
-      "dependencies": {
-        "react-is": {
-          "version": "17.0.2",
-          "resolved": "https://registry.npmjs.org/react-is/-/react-is-17.0.2.tgz",
-          "integrity": "sha512-w2GsyukL62IJnlaff/nRegPQR94C/XXamvMWmSHRJ4y7Ts/4ocGRmTHvOs8PSE6pB3dWOrD/nueuU5sduBsQ4w=="
-        }
-      }
-    },
-    "react-refresh": {
-      "version": "0.14.0",
-      "resolved": "https://registry.npmjs.org/react-refresh/-/react-refresh-0.14.0.tgz",
-      "integrity": "sha512-wViHqhAd8OHeLS/IRMJjTSDHF3U9eWi62F/MledQGPdJGDhodXJ9PBLNGr6WWL7qlH12Mt3TyTpbS+hGXMjCzQ==",
-      "dev": true
-    },
-    "react-refresh-typescript": {
-      "version": "2.0.9",
-      "resolved": "https://registry.npmjs.org/react-refresh-typescript/-/react-refresh-typescript-2.0.9.tgz",
-      "integrity": "sha512-chAnOO4vpxm/3WkgOVmti+eN8yUtkJzeGkOigV6UA9eDFz12W34e/SsYe2H5+RwYJ3+sfSZkVbiXcG1chEBxlg==",
-      "dev": true,
-      "requires": {}
-    },
-    "react-router": {
-      "version": "6.14.2",
-      "resolved": "https://registry.npmjs.org/react-router/-/react-router-6.14.2.tgz",
-      "integrity": "sha512-09Zss2dE2z+T1D03IheqAFtK4UzQyX8nFPWx6jkwdYzGLXd5ie06A6ezS2fO6zJfEb/SpG6UocN2O1hfD+2urQ==",
-      "requires": {
-        "@remix-run/router": "1.7.2"
-      }
-    },
-    "react-router-dom": {
-      "version": "6.14.2",
-      "resolved": "https://registry.npmjs.org/react-router-dom/-/react-router-dom-6.14.2.tgz",
-      "integrity": "sha512-5pWX0jdKR48XFZBuJqHosX3AAHjRAzygouMTyimnBPOLdY3WjzUSKhus2FVMihUFWzeLebDgr4r8UeQFAct7Bg==",
-      "requires": {
-        "@remix-run/router": "1.7.2",
-        "react-router": "6.14.2"
-      }
-    },
-    "react-switch": {
-      "version": "7.0.0",
-      "resolved": "https://registry.npmjs.org/react-switch/-/react-switch-7.0.0.tgz",
-      "integrity": "sha512-KkDeW+cozZXI6knDPyUt3KBN1rmhoVYgAdCJqAh7st7tk8YE6N0iR89zjCWO8T8dUTeJGTR0KU+5CHCRMRffiA==",
-      "requires": {
-        "prop-types": "^15.7.2"
-      }
-    },
-    "react-tabs": {
-      "version": "6.0.2",
-      "resolved": "https://registry.npmjs.org/react-tabs/-/react-tabs-6.0.2.tgz",
-      "integrity": "sha512-aQXTKolnM28k3KguGDBSAbJvcowOQr23A+CUJdzJtOSDOtTwzEaJA+1U4KwhNL9+Obe+jFS7geuvA7ICQPXOnQ==",
-      "requires": {
-        "clsx": "^2.0.0",
-        "prop-types": "^15.5.0"
-      }
-    },
-    "react-tooltip": {
-      "version": "5.19.0",
-      "resolved": "https://registry.npmjs.org/react-tooltip/-/react-tooltip-5.19.0.tgz",
-      "integrity": "sha512-NSUk77GMpxYKHFKJVNHL++QQXRuH2QW1qDrXPtJnp2s/MJvUnU73N5TTADwDyrO2+xGlr0xHhjvQphkF60cMEA==",
-      "requires": {
-        "@floating-ui/dom": "^1.0.0",
-        "classnames": "^2.3.0"
-      }
-    },
-    "readable-stream": {
-      "version": "3.6.2",
-      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.2.tgz",
-      "integrity": "sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA==",
-      "requires": {
-        "inherits": "^2.0.3",
-        "string_decoder": "^1.1.1",
-        "util-deprecate": "^1.0.1"
-      }
-    },
-    "readdirp": {
-      "version": "3.6.0",
-      "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.6.0.tgz",
-      "integrity": "sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA==",
-      "dev": true,
-      "requires": {
-        "picomatch": "^2.2.1"
-      }
-    },
-    "redux": {
-      "version": "4.2.1",
-      "resolved": "https://registry.npmjs.org/redux/-/redux-4.2.1.tgz",
-      "integrity": "sha512-LAUYz4lc+Do8/g7aeRa8JkyDErK6ekstQaqWQrNRW//MY1TvCEpMtpTWvlQ+FPbWCx+Xixu/6SHt5N0HR+SB4w==",
-      "requires": {
-        "@babel/runtime": "^7.9.2"
-      }
-    },
-    "redux-persist": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/redux-persist/-/redux-persist-6.0.0.tgz",
-      "integrity": "sha512-71LLMbUq2r02ng2We9S215LtPu3fY0KgaGE0k8WRgl6RkqxtGfl7HUozz1Dftwsb0D/5mZ8dwAaPbtnzfvbEwQ==",
-      "requires": {}
-    },
-    "redux-state-sync": {
-      "version": "3.1.4",
-      "resolved": "https://registry.npmjs.org/redux-state-sync/-/redux-state-sync-3.1.4.tgz",
-      "integrity": "sha512-nhJBzaXVXPXvUhQJ7m0LdoXBnrcw+cTYQ8bzW9DeJKdq6UNYynXwQWAlVUvsbT/hDV+vB6BC4DMLXkUVGpF2yQ==",
-      "requires": {
-        "broadcast-channel": "^3.1.0"
-      },
-      "dependencies": {
-        "broadcast-channel": {
-          "version": "3.7.0",
-          "resolved": "https://registry.npmjs.org/broadcast-channel/-/broadcast-channel-3.7.0.tgz",
-          "integrity": "sha512-cIAKJXAxGJceNZGTZSBzMxzyOn72cVgPnKx4dc6LRjQgbaJUQqhy5rzL3zbMxkMWsGKkv2hSFkPRMEXfoMZ2Mg==",
-          "requires": {
-            "@babel/runtime": "^7.7.2",
-            "detect-node": "^2.1.0",
-            "js-sha3": "0.8.0",
-            "microseconds": "0.2.0",
-            "nano-time": "1.0.0",
-            "oblivious-set": "1.0.0",
-            "rimraf": "3.0.2",
-            "unload": "2.2.0"
-          }
-        },
-        "microseconds": {
-          "version": "0.2.0",
-          "resolved": "https://registry.npmjs.org/microseconds/-/microseconds-0.2.0.tgz",
-          "integrity": "sha512-n7DHHMjR1avBbSpsTBj6fmMGh2AGrifVV4e+WYc3Q9lO+xnSZ3NyhcBND3vzzatt05LFhoKFRxrIyklmLlUtyA=="
-        }
-      }
-    },
-    "regenerator-runtime": {
-      "version": "0.13.11",
-      "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.11.tgz",
-      "integrity": "sha512-kY1AZVr2Ra+t+piVaJ4gxaFaReZVH40AKNo7UCX6W+dEwBo/2oZJzqfuN1qLq1oL45o56cPaTXELwrTh8Fpggg=="
-    },
-    "regexp.prototype.flags": {
-      "version": "1.5.0",
-      "resolved": "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.5.0.tgz",
-      "integrity": "sha512-0SutC3pNudRKgquxGoRGIz946MZVHqbNfPjBdxeOhBrdgDKlRoXmYLQN9xRbrR09ZXWeGAdPuif7egofn6v5LA==",
-      "dev": true,
-      "requires": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.2.0",
-        "functions-have-names": "^1.2.3"
-      }
-    },
-    "relateurl": {
-      "version": "0.2.7",
-      "resolved": "https://registry.npmjs.org/relateurl/-/relateurl-0.2.7.tgz",
-      "integrity": "sha512-G08Dxvm4iDN3MLM0EsP62EDV9IuhXPR6blNz6Utcp7zyV3tr4HVNINt6MpaRWbxoOHT3Q7YN2P+jaHX8vUbgog==",
-      "dev": true
-    },
-    "remove-accents": {
-      "version": "0.4.2",
-      "resolved": "https://registry.npmjs.org/remove-accents/-/remove-accents-0.4.2.tgz",
-      "integrity": "sha512-7pXIJqJOq5tFgG1A2Zxti3Ht8jJF337m4sowbuHsW30ZnkQFnDzy9qBNhgzX8ZLW4+UBcXiiR7SwR6pokHsxiA=="
-    },
-    "renderkid": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/renderkid/-/renderkid-3.0.0.tgz",
-      "integrity": "sha512-q/7VIQA8lmM1hF+jn+sFSPWGlMkSAeNYcPLmDQx2zzuiDfaLrOmumR8iaUKlenFgh0XRPIUeSPlH3A+AW3Z5pg==",
-      "dev": true,
-      "requires": {
-        "css-select": "^4.1.3",
-        "dom-converter": "^0.2.0",
-        "htmlparser2": "^6.1.0",
-        "lodash": "^4.17.21",
-        "strip-ansi": "^6.0.1"
-      }
-    },
-    "require-directory": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz",
-      "integrity": "sha512-fGxEI7+wsG9xrvdjsrlmL22OMTTiHRwAMroiEeMgq8gzoLC/PQr7RsRDSTLUg/bZAZtF+TVIkHc6/4RIKrui+Q=="
-    },
-    "require-from-string": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/require-from-string/-/require-from-string-2.0.2.tgz",
-      "integrity": "sha512-Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw==",
-      "dev": true
-    },
-    "requires-port": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/requires-port/-/requires-port-1.0.0.tgz",
-      "integrity": "sha512-KigOCHcocU3XODJxsu8i/j8T9tzT4adHiecwORRQ0ZZFcp7ahwXuRU1m+yuO90C5ZUyGeGfocHDI14M3L3yDAQ==",
-      "dev": true
-    },
-    "resolve": {
-      "version": "1.22.8",
-      "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.8.tgz",
-      "integrity": "sha512-oKWePCxqpd6FlLvGV1VU0x7bkPmmCNolxzjMf4NczoDnQcIWrAF+cPtZn5i6n+RfD2d9i0tzpKnG6Yk168yIyw==",
-      "dev": true,
-      "requires": {
-        "is-core-module": "^2.13.0",
-        "path-parse": "^1.0.7",
-        "supports-preserve-symlinks-flag": "^1.0.0"
-      }
-    },
-    "resolve-from": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz",
-      "integrity": "sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==",
-      "dev": true
-    },
-    "restore-cursor": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-3.1.0.tgz",
-      "integrity": "sha512-l+sSefzHpj5qimhFSE5a8nufZYAM3sBSVMAPtYkmC+4EH2anSGaEMXSD0izRQbu9nfyQ9y5JrVmp7E8oZrUjvA==",
-      "dev": true,
-      "requires": {
-        "onetime": "^5.1.0",
-        "signal-exit": "^3.0.2"
-      }
-    },
-    "retry": {
-      "version": "0.13.1",
-      "resolved": "https://registry.npmjs.org/retry/-/retry-0.13.1.tgz",
-      "integrity": "sha512-XQBQ3I8W1Cge0Seh+6gjj03LbmRFWuoszgK9ooCpwYIrhhoO80pfq4cUkU5DkknwfOfFteRwlZ56PYOGYyFWdg==",
-      "dev": true
-    },
-    "reusify": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/reusify/-/reusify-1.0.4.tgz",
-      "integrity": "sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw==",
-      "dev": true
-    },
-    "reverse-arguments": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/reverse-arguments/-/reverse-arguments-1.0.0.tgz",
-      "integrity": "sha512-/x8uIPdTafBqakK0TmPNJzgkLP+3H+yxpUJhCQHsLBg1rYEVNR2D8BRYNWQhVBjyOd7oo1dZRVzIkwMY2oqfYQ==",
-      "dev": true
-    },
-    "rfdc": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/rfdc/-/rfdc-1.3.0.tgz",
-      "integrity": "sha512-V2hovdzFbOi77/WajaSMXk2OLm+xNIeQdMMuB7icj7bk6zi2F8GGAxigcnDFpJHbNyNcgyJDiP+8nOrY5cZGrA==",
-      "dev": true
-    },
-    "rgb-hex": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/rgb-hex/-/rgb-hex-3.0.0.tgz",
-      "integrity": "sha512-8h7ZcwxCBDKvchSWbWngJuSCqJGQ6nDuLLg+QcRyQDbX9jMWt+PpPeXAhSla0GOooEomk3lCprUpGkMdsLjKyg=="
-    },
-    "rimraf": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz",
-      "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==",
-      "requires": {
-        "glob": "^7.1.3"
-      }
-    },
-    "ripemd160": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/ripemd160/-/ripemd160-2.0.2.tgz",
-      "integrity": "sha512-ii4iagi25WusVoiC4B4lq7pbXfAp3D9v5CwfkY33vffw2+pkDjY1D8GaN7spsxvCSx8dkPqOZCEZyfxcmJG2IA==",
-      "requires": {
-        "hash-base": "^3.0.0",
-        "inherits": "^2.0.1"
-      }
-    },
-    "ripemd160-min": {
-      "version": "0.0.6",
-      "resolved": "https://registry.npmjs.org/ripemd160-min/-/ripemd160-min-0.0.6.tgz",
-      "integrity": "sha512-+GcJgQivhs6S9qvLogusiTcS9kQUfgR75whKuy5jIhuiOfQuJ8fjqxV6EGD5duH1Y/FawFUMtMhyeq3Fbnib8A=="
-    },
-    "rollup": {
-      "version": "4.18.0",
-      "resolved": "https://registry.npmjs.org/rollup/-/rollup-4.18.0.tgz",
-      "integrity": "sha512-QmJz14PX3rzbJCN1SG4Xe/bAAX2a6NpCP8ab2vfu2GiUr8AQcr2nCV/oEO3yneFarB67zk8ShlIyWb2LGTb3Sg==",
-      "dev": true,
-      "requires": {
-        "@rollup/rollup-android-arm-eabi": "4.18.0",
-        "@rollup/rollup-android-arm64": "4.18.0",
-        "@rollup/rollup-darwin-arm64": "4.18.0",
-        "@rollup/rollup-darwin-x64": "4.18.0",
-        "@rollup/rollup-linux-arm-gnueabihf": "4.18.0",
-        "@rollup/rollup-linux-arm-musleabihf": "4.18.0",
-        "@rollup/rollup-linux-arm64-gnu": "4.18.0",
-        "@rollup/rollup-linux-arm64-musl": "4.18.0",
-        "@rollup/rollup-linux-powerpc64le-gnu": "4.18.0",
-        "@rollup/rollup-linux-riscv64-gnu": "4.18.0",
-        "@rollup/rollup-linux-s390x-gnu": "4.18.0",
-        "@rollup/rollup-linux-x64-gnu": "4.18.0",
-        "@rollup/rollup-linux-x64-musl": "4.18.0",
-        "@rollup/rollup-win32-arm64-msvc": "4.18.0",
-        "@rollup/rollup-win32-ia32-msvc": "4.18.0",
-        "@rollup/rollup-win32-x64-msvc": "4.18.0",
-        "@types/estree": "1.0.5",
-        "fsevents": "~2.3.2"
-      }
-    },
-    "run-parallel": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/run-parallel/-/run-parallel-1.2.0.tgz",
-      "integrity": "sha512-5l4VyZR86LZ/lDxZTR6jqL8AFE2S0IFLMP26AbjsLVADxHdhB/c0GUsH+y39UfCi3dzz8OlQuPmnaJOMoDHQBA==",
-      "dev": true,
-      "requires": {
-        "queue-microtask": "^1.2.2"
-      }
-    },
-    "rxjs": {
-      "version": "6.6.7",
-      "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.6.7.tgz",
-      "integrity": "sha512-hTdwr+7yYNIT5n4AMYp85KA6yw2Va0FLa3Rguvbpa4W3I5xynaBZo41cM3XM+4Q6fRMj3sBYIR1VAmZMXYJvRQ==",
-      "requires": {
-        "tslib": "^1.9.0"
-      },
-      "dependencies": {
-        "tslib": {
-          "version": "1.14.1",
-          "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz",
-          "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg=="
-        }
-      }
-    },
-    "safe-array-concat": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/safe-array-concat/-/safe-array-concat-1.0.0.tgz",
-      "integrity": "sha512-9dVEFruWIsnie89yym+xWTAYASdpw3CJV7Li/6zBewGf9z2i1j31rP6jnY0pHEO4QZh6N0K11bFjWmdR8UGdPQ==",
-      "dev": true,
-      "requires": {
-        "call-bind": "^1.0.2",
-        "get-intrinsic": "^1.2.0",
-        "has-symbols": "^1.0.3",
-        "isarray": "^2.0.5"
-      }
-    },
-    "safe-buffer": {
-      "version": "5.2.1",
-      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz",
-      "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ=="
-    },
-    "safe-regex-test": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/safe-regex-test/-/safe-regex-test-1.0.0.tgz",
-      "integrity": "sha512-JBUUzyOgEwXQY1NuPtvcj/qcBDbDmEvWufhlnXZIm75DEHp+afM1r1ujJpJsV/gSM4t59tpDyPi1sd6ZaPFfsA==",
-      "dev": true,
-      "requires": {
-        "call-bind": "^1.0.2",
-        "get-intrinsic": "^1.1.3",
-        "is-regex": "^1.1.4"
-      }
-    },
-    "safer-buffer": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz",
-      "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg=="
-    },
-    "scheduler": {
-      "version": "0.23.0",
-      "resolved": "https://registry.npmjs.org/scheduler/-/scheduler-0.23.0.tgz",
-      "integrity": "sha512-CtuThmgHNg7zIZWAXi3AsyIzA3n4xx7aNyjwC2VJldO2LMVDhFK+63xGqq6CsJH4rTAt6/M+N4GhZiDYPx9eUw==",
-      "requires": {
-        "loose-envify": "^1.1.0"
-      }
-    },
-    "schema-inspector": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/schema-inspector/-/schema-inspector-2.1.0.tgz",
-      "integrity": "sha512-3bmQVhbA01/EW8cZin4vIpqlpNU2SIy4BhKCfCgogJ3T/L76dLx3QAE+++4o+dNT33sa+SN9vOJL7iHiHFjiNg==",
-      "requires": {
-        "async": "~2.6.3"
-      }
-    },
-    "schema-utils": {
-      "version": "3.3.0",
-      "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.3.0.tgz",
-      "integrity": "sha512-pN/yOAvcC+5rQ5nERGuwrjLlYvLTbCibnZ1I7B1LaiAz9BRBlE9GMgE/eqV30P7aJQUf7Ddimy/RsbYO/GrVGg==",
-      "dev": true,
-      "requires": {
-        "@types/json-schema": "^7.0.8",
-        "ajv": "^6.12.5",
-        "ajv-keywords": "^3.5.2"
-      }
-    },
-    "secp256k1": {
-      "version": "3.8.0",
-      "resolved": "https://registry.npmjs.org/secp256k1/-/secp256k1-3.8.0.tgz",
-      "integrity": "sha512-k5ke5avRZbtl9Tqx/SA7CbY3NF6Ro+Sj9cZxezFzuBlLDmyqPiL8hJJ+EmzD8Ig4LUDByHJ3/iPOVoRixs/hmw==",
-      "requires": {
-        "bindings": "^1.5.0",
-        "bip66": "^1.1.5",
-        "bn.js": "^4.11.8",
-        "create-hash": "^1.2.0",
-        "drbg.js": "^1.0.1",
-        "elliptic": "^6.5.2",
-        "nan": "^2.14.0",
-        "safe-buffer": "^5.1.2"
-      },
-      "dependencies": {
-        "bn.js": {
-          "version": "4.12.0",
-          "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.0.tgz",
-          "integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA=="
-        }
-      }
-    },
-    "select-hose": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/select-hose/-/select-hose-2.0.0.tgz",
-      "integrity": "sha512-mEugaLK+YfkijB4fx0e6kImuJdCIt2LxCRcbEYPqRGCs4F2ogyfZU5IAZRdjCP8JPq2AtdNoC/Dux63d9Kiryg==",
-      "dev": true
-    },
-    "selfsigned": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/selfsigned/-/selfsigned-2.1.1.tgz",
-      "integrity": "sha512-GSL3aowiF7wa/WtSFwnUrludWFoNhftq8bUkH9pkzjpN2XSPOAYEgg6e0sS9s0rZwgJzJiQRPU18A6clnoW5wQ==",
-      "dev": true,
-      "requires": {
-        "node-forge": "^1"
-      }
-    },
-    "semver": {
-      "version": "6.3.1",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
-      "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA=="
-    },
-    "send": {
-      "version": "0.18.0",
-      "resolved": "https://registry.npmjs.org/send/-/send-0.18.0.tgz",
-      "integrity": "sha512-qqWzuOjSFOuqPjFe4NOsMLafToQQwBSOEpS+FwEt3A2V3vKubTquT3vmLTQpFgMXp8AlFWFuP1qKaJZOtPpVXg==",
-      "dev": true,
-      "requires": {
-        "debug": "2.6.9",
-        "depd": "2.0.0",
-        "destroy": "1.2.0",
-        "encodeurl": "~1.0.2",
-        "escape-html": "~1.0.3",
-        "etag": "~1.8.1",
-        "fresh": "0.5.2",
-        "http-errors": "2.0.0",
-        "mime": "1.6.0",
-        "ms": "2.1.3",
-        "on-finished": "2.4.1",
-        "range-parser": "~1.2.1",
-        "statuses": "2.0.1"
-      },
-      "dependencies": {
-        "debug": {
-          "version": "2.6.9",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-          "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
-          "dev": true,
-          "requires": {
-            "ms": "2.0.0"
-          },
-          "dependencies": {
-            "ms": {
-              "version": "2.0.0",
-              "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-              "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==",
-              "dev": true
-            }
-          }
-        },
-        "ms": {
-          "version": "2.1.3",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz",
-          "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==",
-          "dev": true
-        }
-      }
-    },
-    "serialize-javascript": {
-      "version": "6.0.1",
-      "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-6.0.1.tgz",
-      "integrity": "sha512-owoXEFjWRllis8/M1Q+Cw5k8ZH40e3zhp/ovX+Xr/vi1qj6QesbyXXViFbpNvWvPNAD62SutwEXavefrLJWj7w==",
-      "dev": true,
-      "requires": {
-        "randombytes": "^2.1.0"
-      }
-    },
-    "serve-index": {
-      "version": "1.9.1",
-      "resolved": "https://registry.npmjs.org/serve-index/-/serve-index-1.9.1.tgz",
-      "integrity": "sha512-pXHfKNP4qujrtteMrSBb0rc8HJ9Ms/GrXwcUtUtD5s4ewDJI8bT3Cz2zTVRMKtri49pLx2e0Ya8ziP5Ya2pZZw==",
-      "dev": true,
-      "requires": {
-        "accepts": "~1.3.4",
-        "batch": "0.6.1",
-        "debug": "2.6.9",
-        "escape-html": "~1.0.3",
-        "http-errors": "~1.6.2",
-        "mime-types": "~2.1.17",
-        "parseurl": "~1.3.2"
-      },
-      "dependencies": {
-        "debug": {
-          "version": "2.6.9",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-          "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
-          "dev": true,
-          "requires": {
-            "ms": "2.0.0"
-          }
-        },
-        "depd": {
-          "version": "1.1.2",
-          "resolved": "https://registry.npmjs.org/depd/-/depd-1.1.2.tgz",
-          "integrity": "sha512-7emPTl6Dpo6JRXOXjLRxck+FlLRX5847cLKEn00PLAgc3g2hTZZgr+e4c2v6QpSmLeFP3n5yUo7ft6avBK/5jQ==",
-          "dev": true
-        },
-        "http-errors": {
-          "version": "1.6.3",
-          "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.6.3.tgz",
-          "integrity": "sha512-lks+lVC8dgGyh97jxvxeYTWQFvh4uw4yC12gVl63Cg30sjPX4wuGcdkICVXDAESr6OJGjqGA8Iz5mkeN6zlD7A==",
-          "dev": true,
-          "requires": {
-            "depd": "~1.1.2",
-            "inherits": "2.0.3",
-            "setprototypeof": "1.1.0",
-            "statuses": ">= 1.4.0 < 2"
-          }
-        },
-        "inherits": {
-          "version": "2.0.3",
-          "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
-          "integrity": "sha512-x00IRNXNy63jwGkJmzPigoySHbaqpNuzKbBOmzK+g2OdZpQ9w+sxCN+VSB3ja7IAge2OP2qpfxTjeNcyjmW1uw==",
-          "dev": true
-        },
-        "ms": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-          "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==",
-          "dev": true
-        },
-        "setprototypeof": {
-          "version": "1.1.0",
-          "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.1.0.tgz",
-          "integrity": "sha512-BvE/TwpZX4FXExxOxZyRGQQv651MSwmWKZGqvmPcRIjDqWub67kTKuIMx43cZZrS/cBBzwBcNDWoFxt2XEFIpQ==",
-          "dev": true
-        },
-        "statuses": {
-          "version": "1.5.0",
-          "resolved": "https://registry.npmjs.org/statuses/-/statuses-1.5.0.tgz",
-          "integrity": "sha512-OpZ3zP+jT1PI7I8nemJX4AKmAX070ZkYPVWV/AaKTJl+tXCTGyVdC1a4SL8RUQYEwk/f34ZX8UTykN68FwrqAA==",
-          "dev": true
-        }
-      }
-    },
-    "serve-static": {
-      "version": "1.15.0",
-      "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.15.0.tgz",
-      "integrity": "sha512-XGuRDNjXUijsUL0vl6nSD7cwURuzEgglbOaFuZM9g3kwDXOWVTck0jLzjPzGD+TazWbboZYu52/9/XPdUgne9g==",
-      "dev": true,
-      "requires": {
-        "encodeurl": "~1.0.2",
-        "escape-html": "~1.0.3",
-        "parseurl": "~1.3.3",
-        "send": "0.18.0"
-      }
-    },
-    "set-function-length": {
-      "version": "1.2.2",
-      "resolved": "https://registry.npmjs.org/set-function-length/-/set-function-length-1.2.2.tgz",
-      "integrity": "sha512-pgRc4hJ4/sNjWCSS9AmnS40x3bNMDTknHgL5UaMBTMyJnU90EgWh1Rz+MC9eFu4BuN/UwZjKQuY/1v3rM7HMfg==",
-      "requires": {
-        "define-data-property": "^1.1.4",
-        "es-errors": "^1.3.0",
-        "function-bind": "^1.1.2",
-        "get-intrinsic": "^1.2.4",
-        "gopd": "^1.0.1",
-        "has-property-descriptors": "^1.0.2"
-      }
-    },
-    "setprototypeof": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.2.0.tgz",
-      "integrity": "sha512-E5LDX7Wrp85Kil5bhZv46j8jOeboKq5JMmYM3gVGdGH8xFpPWXUMsNrlODCrkoxMEeNi/XZIwuRvY4XNwYMJpw==",
-      "dev": true
-    },
-    "sha.js": {
-      "version": "2.4.11",
-      "resolved": "https://registry.npmjs.org/sha.js/-/sha.js-2.4.11.tgz",
-      "integrity": "sha512-QMEp5B7cftE7APOjk5Y6xgrbWu+WkLVQwk8JNjZ8nKRciZaByEW6MubieAiToS7+dwvrjGhH8jRXz3MVd0AYqQ==",
-      "requires": {
-        "inherits": "^2.0.1",
-        "safe-buffer": "^5.0.1"
-      }
-    },
-    "sha256-uint8array": {
-      "version": "0.10.7",
-      "resolved": "https://registry.npmjs.org/sha256-uint8array/-/sha256-uint8array-0.10.7.tgz",
-      "integrity": "sha512-1Q6JQU4tX9NqsDGodej6pkrUVQVNapLZnvkwIhddH/JqzBZF1fSaxSWNY6sziXBE8aEa2twtGkXUrwzGeZCMpQ=="
-    },
-    "shallowequal": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/shallowequal/-/shallowequal-1.1.0.tgz",
-      "integrity": "sha512-y0m1JoUZSlPAjXVtPPW70aZWfIL/dSP7AFkRnniLCrK/8MDKog3TySTBmckD+RObVxH0v4Tox67+F14PdED2oQ=="
-    },
-    "shebang-command": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz",
-      "integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==",
-      "dev": true,
-      "requires": {
-        "shebang-regex": "^3.0.0"
-      }
-    },
-    "shebang-regex": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz",
-      "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==",
-      "dev": true
-    },
-    "shell-quote": {
-      "version": "1.8.1",
-      "resolved": "https://registry.npmjs.org/shell-quote/-/shell-quote-1.8.1.tgz",
-      "integrity": "sha512-6j1W9l1iAs/4xYBI1SYOVZyFcCis9b4KCLQ8fgAGG07QvzaRLVVRQvAy85yNmmZSjYjg4MWh4gNvlPujU/5LpA==",
-      "dev": true
-    },
-    "shell-quote-word": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/shell-quote-word/-/shell-quote-word-1.0.1.tgz",
-      "integrity": "sha512-lT297f1WLAdq0A4O+AknIFRP6kkiI3s8C913eJ0XqBxJbZPGWUNkRQk2u8zk4bEAjUJ5i+fSLwB6z1HzeT+DEg==",
-      "dev": true
-    },
-    "side-channel": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.0.4.tgz",
-      "integrity": "sha512-q5XPytqFEIKHkGdiMIrY10mvLRvnQh42/+GoBlFW3b2LXLE2xxJpZFdm94we0BaoV3RwJyGqg5wS7epxTv0Zvw==",
-      "dev": true,
-      "requires": {
-        "call-bind": "^1.0.0",
-        "get-intrinsic": "^1.0.2",
-        "object-inspect": "^1.9.0"
-      }
-    },
-    "siginfo": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/siginfo/-/siginfo-2.0.0.tgz",
-      "integrity": "sha512-ybx0WO1/8bSBLEWXZvEd7gMW3Sn3JFlW3TvX1nREbDLRNQNaeNN8WK0meBwPdAaOI7TtRRRJn/Es1zhrrCHu7g==",
-      "dev": true
-    },
-    "signal-exit": {
-      "version": "3.0.7",
-      "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.7.tgz",
-      "integrity": "sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==",
-      "dev": true
-    },
-    "slash": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz",
-      "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==",
-      "dev": true
-    },
-    "slice-ansi": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-5.0.0.tgz",
-      "integrity": "sha512-FC+lgizVPfie0kkhqUScwRu1O/lF6NOgJmlCgK+/LYxDCTk8sGelYaHDhFcDN+Sn3Cv+3VSa4Byeo+IMCzpMgQ==",
-      "dev": true,
-      "requires": {
-        "ansi-styles": "^6.0.0",
-        "is-fullwidth-code-point": "^4.0.0"
-      },
-      "dependencies": {
-        "ansi-styles": {
-          "version": "6.2.1",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-6.2.1.tgz",
-          "integrity": "sha512-bN798gFfQX+viw3R7yrGWRqnrN2oRkEkUjjl4JNn4E8GxxbjtG3FbrEIIY3l8/hrwUwIeCZvi4QuOTP4MErVug==",
-          "dev": true
-        }
-      }
-    },
-    "smart-buffer": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/smart-buffer/-/smart-buffer-4.2.0.tgz",
-      "integrity": "sha512-94hK0Hh8rPqQl2xXc3HsaBoOXKV20MToPkcXvwbISWLEs+64sBq5kFgn2kJDHb1Pry9yrP0dxrCI9RRci7RXKg=="
-    },
-    "smol-toml": {
-      "version": "1.2.2",
-      "resolved": "https://registry.npmjs.org/smol-toml/-/smol-toml-1.2.2.tgz",
-      "integrity": "sha512-fVEjX2ybKdJKzFL46VshQbj9PuA4IUKivalgp48/3zwS9vXzyykzQ6AX92UxHSvWJagziMRLeHMgEzoGO7A8hQ==",
-      "dev": true
-    },
-    "sockjs": {
-      "version": "0.3.24",
-      "resolved": "https://registry.npmjs.org/sockjs/-/sockjs-0.3.24.tgz",
-      "integrity": "sha512-GJgLTZ7vYb/JtPSSZ10hsOYIvEYsjbNU+zPdIHcUaWVNUEPivzxku31865sSSud0Da0W4lEeOPlmw93zLQchuQ==",
-      "dev": true,
-      "requires": {
-        "faye-websocket": "^0.11.3",
-        "uuid": "^8.3.2",
-        "websocket-driver": "^0.7.4"
-      }
-    },
-    "source-map": {
-      "version": "0.7.4",
-      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.7.4.tgz",
-      "integrity": "sha512-l3BikUxvPOcn5E74dZiq5BGsTb5yEwhaTSzccU6t4sDOH8NWJCstKO5QT2CvtFoK6F0saL7p9xHAqHOlCPJygA==",
-      "dev": true
-    },
-    "source-map-js": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.2.0.tgz",
-      "integrity": "sha512-itJW8lvSA0TXEphiRoawsCksnlf8SyvmFzIhltqAHluXd88pkCd+cXJVHTDwdCr0IzwptSm035IHQktUu1QUMg==",
-      "dev": true
-    },
-    "spdy": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/spdy/-/spdy-4.0.2.tgz",
-      "integrity": "sha512-r46gZQZQV+Kl9oItvl1JZZqJKGr+oEkB08A6BzkiR7593/7IbtuncXHd2YoYeTsG4157ZssMu9KYvUHLcjcDoA==",
-      "dev": true,
-      "requires": {
-        "debug": "^4.1.0",
-        "handle-thing": "^2.0.0",
-        "http-deceiver": "^1.2.7",
-        "select-hose": "^2.0.0",
-        "spdy-transport": "^3.0.0"
-      }
-    },
-    "spdy-transport": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/spdy-transport/-/spdy-transport-3.0.0.tgz",
-      "integrity": "sha512-hsLVFE5SjA6TCisWeJXFKniGGOpBgMLmerfO2aCyCU5s7nJ/rpAepqmFifv/GCbSbueEeAJJnmSQ2rKC/g8Fcw==",
-      "dev": true,
-      "requires": {
-        "debug": "^4.1.0",
-        "detect-node": "^2.0.4",
-        "hpack.js": "^2.1.6",
-        "obuf": "^1.1.2",
-        "readable-stream": "^3.0.6",
-        "wbuf": "^1.7.3"
-      }
-    },
-    "stackback": {
-      "version": "0.0.2",
-      "resolved": "https://registry.npmjs.org/stackback/-/stackback-0.0.2.tgz",
-      "integrity": "sha512-1XMJE5fQo1jGH6Y/7ebnwPOBEkIEnT4QF32d5R1+VXdXveM0IBMJt8zfaxX1P3QhVwrYe+576+jkANtSS2mBbw==",
-      "dev": true
-    },
-    "stackframe": {
-      "version": "1.3.4",
-      "resolved": "https://registry.npmjs.org/stackframe/-/stackframe-1.3.4.tgz",
-      "integrity": "sha512-oeVtt7eWQS+Na6F//S4kJ2K2VbRlS9D43mAlMyVpVWovy9o+jfgH8O9agzANzaiLjclA0oYzUXEM4PurhSUChw==",
-      "dev": true
-    },
-    "statuses": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/statuses/-/statuses-2.0.1.tgz",
-      "integrity": "sha512-RwNA9Z/7PrK06rYLIzFMlaF+l73iwpzsqRIFgbMLbTcLD6cOao82TaWefPXQvB2fOC4AjuYSEndS7N/mTCbkdQ==",
-      "dev": true
-    },
-    "std-env": {
-      "version": "3.5.0",
-      "resolved": "https://registry.npmjs.org/std-env/-/std-env-3.5.0.tgz",
-      "integrity": "sha512-JGUEaALvL0Mf6JCfYnJOTcobY+Nc7sG/TemDRBqCA0wEr4DER7zDchaaixTlmOxAjG1uRJmX82EQcxwTQTkqVA==",
-      "dev": true
-    },
-    "stop-iteration-iterator": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/stop-iteration-iterator/-/stop-iteration-iterator-1.0.0.tgz",
-      "integrity": "sha512-iCGQj+0l0HOdZ2AEeBADlsRC+vsnDsZsbdSiH1yNSjcfKM7fdpCMfqAL/dwF5BLiw/XhRft/Wax6zQbhq2BcjQ==",
-      "dev": true,
-      "requires": {
-        "internal-slot": "^1.0.4"
-      }
-    },
-    "stream-browserify": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/stream-browserify/-/stream-browserify-3.0.0.tgz",
-      "integrity": "sha512-H73RAHsVBapbim0tU2JwwOiXUj+fikfiaoYAKHF3VJfA0pe2BCzkhAHBlLG6REzE+2WNZcxOXjK7lkso+9euLA==",
-      "requires": {
-        "inherits": "~2.0.4",
-        "readable-stream": "^3.5.0"
-      }
-    },
-    "string_decoder": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.3.0.tgz",
-      "integrity": "sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==",
-      "requires": {
-        "safe-buffer": "~5.2.0"
-      }
-    },
-    "string-argv": {
-      "version": "0.3.2",
-      "resolved": "https://registry.npmjs.org/string-argv/-/string-argv-0.3.2.tgz",
-      "integrity": "sha512-aqD2Q0144Z+/RqG52NeHEkZauTAUWJO8c6yTftGJKO3Tja5tUgIfmIl6kExvhtxSDP7fXB6DvzkfMpCd/F3G+Q==",
-      "dev": true
-    },
-    "string-to-color": {
-      "version": "2.2.2",
-      "resolved": "https://registry.npmjs.org/string-to-color/-/string-to-color-2.2.2.tgz",
-      "integrity": "sha512-XeA2goP7PNsSlz8RRn6KhYswnMf5Tl+38ajfy8n4oZJyMGC4qqKgHNHsZ/3qwvr42NRIjf9eSr721SyetDeMkA==",
-      "requires": {
-        "colornames": "^1.1.1",
-        "hex-rgb": "^4.1.0",
-        "lodash.padend": "^4.6.1",
-        "lodash.trimstart": "^4.5.1",
-        "lodash.words": "^4.2.0",
-        "rgb-hex": "^3.0.0"
-      }
-    },
-    "string-width": {
-      "version": "5.1.2",
-      "resolved": "https://registry.npmjs.org/string-width/-/string-width-5.1.2.tgz",
-      "integrity": "sha512-HnLOCR3vjcY8beoNLtcjZ5/nxn2afmME6lhrDrebokqMap+XbeW8n9TXpPDOqdGK5qcI3oT0GKTW6wC7EMiVqA==",
-      "dev": true,
-      "requires": {
-        "eastasianwidth": "^0.2.0",
-        "emoji-regex": "^9.2.2",
-        "strip-ansi": "^7.0.1"
-      },
-      "dependencies": {
-        "ansi-regex": {
-          "version": "6.0.1",
-          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.0.1.tgz",
-          "integrity": "sha512-n5M855fKb2SsfMIiFFoVrABHJC8QtHwVx+mHWP3QcEqBHYienj5dHSgjbxtC0WEZXYt4wcD6zrQElDPhFuZgfA==",
-          "dev": true
-        },
-        "strip-ansi": {
-          "version": "7.1.0",
-          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.1.0.tgz",
-          "integrity": "sha512-iq6eVVI64nQQTRYq2KtEg2d2uU7LElhTJwsH4YzIHZshxlgZms/wIc4VoDQTlG/IvVIrBKG06CrZnp0qv7hkcQ==",
-          "dev": true,
-          "requires": {
-            "ansi-regex": "^6.0.1"
-          }
-        }
-      }
-    },
-    "string.fromcodepoint": {
-      "version": "0.2.1",
-      "resolved": "https://registry.npmjs.org/string.fromcodepoint/-/string.fromcodepoint-0.2.1.tgz",
-      "integrity": "sha512-n69H31OnxSGSZyZbgBlvYIXlrMhJQ0dQAX1js1QDhpaUH6zmU3QYlj07bCwCNlPOu3oRXIubGPl2gDGnHsiCqg==",
-      "dev": true
-    },
-    "string.prototype.matchall": {
-      "version": "4.0.8",
-      "resolved": "https://registry.npmjs.org/string.prototype.matchall/-/string.prototype.matchall-4.0.8.tgz",
-      "integrity": "sha512-6zOCOcJ+RJAQshcTvXPHoxoQGONa3e/Lqx90wUA+wEzX78sg5Bo+1tQo4N0pohS0erG9qtCqJDjNCQBjeWVxyg==",
-      "dev": true,
-      "requires": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.1.4",
-        "es-abstract": "^1.20.4",
-        "get-intrinsic": "^1.1.3",
-        "has-symbols": "^1.0.3",
-        "internal-slot": "^1.0.3",
-        "regexp.prototype.flags": "^1.4.3",
-        "side-channel": "^1.0.4"
-      }
-    },
-    "string.prototype.trim": {
-      "version": "1.2.7",
-      "resolved": "https://registry.npmjs.org/string.prototype.trim/-/string.prototype.trim-1.2.7.tgz",
-      "integrity": "sha512-p6TmeT1T3411M8Cgg9wBTMRtY2q9+PNy9EV1i2lIXUN/btt763oIfxwN3RR8VU6wHX8j/1CFy0L+YuThm6bgOg==",
-      "dev": true,
-      "requires": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.1.4",
-        "es-abstract": "^1.20.4"
-      }
-    },
-    "string.prototype.trimend": {
-      "version": "1.0.6",
-      "resolved": "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.6.tgz",
-      "integrity": "sha512-JySq+4mrPf9EsDBEDYMOb/lM7XQLulwg5R/m1r0PXEFqrV0qHvl58sdTilSXtKOflCsK2E8jxf+GKC0T07RWwQ==",
-      "dev": true,
-      "requires": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.1.4",
-        "es-abstract": "^1.20.4"
-      }
-    },
-    "string.prototype.trimstart": {
-      "version": "1.0.6",
-      "resolved": "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.6.tgz",
-      "integrity": "sha512-omqjMDaY92pbn5HOX7f9IccLA+U1tA9GvtU4JrodiXFfYB7jPzzHpRzpglLAjtUV6bB557zwClJezTqnAiYnQA==",
-      "dev": true,
-      "requires": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.1.4",
-        "es-abstract": "^1.20.4"
-      }
-    },
-    "strip-ansi": {
-      "version": "6.0.1",
-      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
-      "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
-      "requires": {
-        "ansi-regex": "^5.0.1"
-      }
-    },
-    "strip-bom": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz",
-      "integrity": "sha512-vavAMRXOgBVNF6nyEEmL3DBK19iRpDcoIwW+swQ+CbGiu7lju6t+JklA1MHweoWtadgt4ISVUsXLyDq34ddcwA==",
-      "dev": true
-    },
-    "strip-final-newline": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/strip-final-newline/-/strip-final-newline-2.0.0.tgz",
-      "integrity": "sha512-BrpvfNAE3dcvq7ll3xVumzjKjZQ5tI1sEUIKr3Uoks0XUl45St3FlatVqef9prk4jRDzhW6WZg+3bk93y6pLjA==",
-      "dev": true
-    },
-    "strip-json-comments": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz",
-      "integrity": "sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==",
-      "dev": true
-    },
-    "strip-literal": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/strip-literal/-/strip-literal-1.3.0.tgz",
-      "integrity": "sha512-PugKzOsyXpArk0yWmUwqOZecSO0GH0bPoctLcqNDH9J04pVW3lflYE0ujElBGTloevcxF5MofAOZ7C5l2b+wLg==",
-      "dev": true,
-      "requires": {
-        "acorn": "^8.10.0"
-      }
-    },
-    "style-loader": {
-      "version": "3.3.3",
-      "resolved": "https://registry.npmjs.org/style-loader/-/style-loader-3.3.3.tgz",
-      "integrity": "sha512-53BiGLXAcll9maCYtZi2RCQZKa8NQQai5C4horqKyRmHj9H7QmcUyucrH+4KW/gBQbXM2AsB0axoEcFZPlfPcw==",
-      "dev": true,
-      "requires": {}
-    },
-    "styled-components": {
-      "version": "5.3.11",
-      "resolved": "https://registry.npmjs.org/styled-components/-/styled-components-5.3.11.tgz",
-      "integrity": "sha512-uuzIIfnVkagcVHv9nE0VPlHPSCmXIUGKfJ42LNjxCCTDTL5sgnJ8Z7GZBq0EnLYGln77tPpEpExt2+qa+cZqSw==",
-      "requires": {
-        "@babel/helper-module-imports": "^7.0.0",
-        "@babel/traverse": "^7.4.5",
-        "@emotion/is-prop-valid": "^1.1.0",
-        "@emotion/stylis": "^0.8.4",
-        "@emotion/unitless": "^0.7.4",
-        "babel-plugin-styled-components": ">= 1.12.0",
-        "css-to-react-native": "^3.0.0",
-        "hoist-non-react-statics": "^3.0.0",
-        "shallowequal": "^1.1.0",
-        "supports-color": "^5.5.0"
-      },
-      "dependencies": {
-        "@emotion/unitless": {
-          "version": "0.7.5",
-          "resolved": "https://registry.npmjs.org/@emotion/unitless/-/unitless-0.7.5.tgz",
-          "integrity": "sha512-OWORNpfjMsSSUBVrRBVGECkhWcULOAJz9ZW8uK9qgxD+87M7jHRcvh/A96XXNhXTLmKcoYSQtBEX7lHMO7YRwg=="
-        }
-      }
-    },
-    "summary": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/summary/-/summary-2.1.0.tgz",
-      "integrity": "sha512-nMIjMrd5Z2nuB2RZCKJfFMjgS3fygbeyGk9PxPPaJR1RIcyN9yn4A63Isovzm3ZtQuEkLBVgMdPup8UeLH7aQw==",
-      "dev": true
-    },
-    "superjson": {
-      "version": "2.2.1",
-      "resolved": "https://registry.npmjs.org/superjson/-/superjson-2.2.1.tgz",
-      "integrity": "sha512-8iGv75BYOa0xRJHK5vRLEjE2H/i4lulTjzpUXic3Eg8akftYjkmQDa8JARQ42rlczXyFR3IeRoeFCc7RxHsYZA==",
-      "requires": {
-        "copy-anything": "^3.0.2"
-      }
-    },
-    "supports-color": {
-      "version": "5.5.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
-      "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
-      "requires": {
-        "has-flag": "^3.0.0"
-      }
-    },
-    "supports-preserve-symlinks-flag": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz",
-      "integrity": "sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w==",
-      "dev": true
-    },
-    "swiper": {
-      "version": "11.0.6",
-      "resolved": "https://registry.npmjs.org/swiper/-/swiper-11.0.6.tgz",
-      "integrity": "sha512-W/Me7MQl5rNgdM5x9i3Gll76WsyVpnHn91GhBOyL7RCFUeg62aVnflzlVfIpXzZ/87FtJOfAoDH79ZH2Yq76zA=="
-    },
-    "tapable": {
-      "version": "2.2.1",
-      "resolved": "https://registry.npmjs.org/tapable/-/tapable-2.2.1.tgz",
-      "integrity": "sha512-GNzQvQTOIP6RyTfE2Qxb8ZVlNmw0n88vp1szwWRimP02mnTsx3Wtn5qRdqY9w2XduFNUgvOwhNnQsjwCp+kqaQ==",
-      "dev": true
-    },
-    "terser": {
-      "version": "5.19.2",
-      "resolved": "https://registry.npmjs.org/terser/-/terser-5.19.2.tgz",
-      "integrity": "sha512-qC5+dmecKJA4cpYxRa5aVkKehYsQKc+AHeKl0Oe62aYjBL8ZA33tTljktDHJSaxxMnbI5ZYw+o/S2DxxLu8OfA==",
-      "dev": true,
-      "requires": {
-        "@jridgewell/source-map": "^0.3.3",
-        "acorn": "^8.8.2",
-        "commander": "^2.20.0",
-        "source-map-support": "~0.5.20"
-      },
-      "dependencies": {
-        "commander": {
-          "version": "2.20.3",
-          "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz",
-          "integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==",
-          "dev": true
-        },
-        "source-map": {
-          "version": "0.6.1",
-          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-          "dev": true
-        },
-        "source-map-support": {
-          "version": "0.5.21",
-          "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.21.tgz",
-          "integrity": "sha512-uBHU3L3czsIyYXKX88fdrGovxdSCoTGDRZ6SYXtSRxLZUzHg5P/66Ht6uoUlHu9EZod+inXhKo3qQgwXUT/y1w==",
-          "dev": true,
-          "requires": {
-            "buffer-from": "^1.0.0",
-            "source-map": "^0.6.0"
-          }
-        }
-      }
-    },
-    "terser-webpack-plugin": {
-      "version": "5.3.9",
-      "resolved": "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-5.3.9.tgz",
-      "integrity": "sha512-ZuXsqE07EcggTWQjXUj+Aot/OMcD0bMKGgF63f7UxYcu5/AJF53aIpK1YoP5xR9l6s/Hy2b+t1AM0bLNPRuhwA==",
-      "dev": true,
-      "requires": {
-        "@jridgewell/trace-mapping": "^0.3.17",
-        "jest-worker": "^27.4.5",
-        "schema-utils": "^3.1.1",
-        "serialize-javascript": "^6.0.1",
-        "terser": "^5.16.8"
-      }
-    },
-    "text-table": {
-      "version": "0.2.0",
-      "resolved": "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz",
-      "integrity": "sha512-N+8UisAXDGk8PFXP4HAzVR9nbfmVJ3zYLAWiTIoqC5v5isinhr+r5uaO8+7r3BMfuNIufIsA7RdpVgacC2cSpw==",
-      "dev": true
-    },
-    "through": {
-      "version": "2.3.8",
-      "resolved": "https://registry.npmjs.org/through/-/through-2.3.8.tgz",
-      "integrity": "sha512-w89qg7PI8wAdvX60bMDP+bFoD5Dvhm9oLheFp5O4a2QF0cSBGsBX4qZmadPMvVqlLJBBci+WqGGOAPvcDeNSVg==",
-      "dev": true
-    },
-    "thunky": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/thunky/-/thunky-1.1.0.tgz",
-      "integrity": "sha512-eHY7nBftgThBqOyHGVN+l8gF0BucP09fMo0oO/Lb0w1OF80dJv+lDVpXG60WMQvkcxAkNybKsrEIE3ZtKGmPrA==",
-      "dev": true
-    },
-    "tinybench": {
-      "version": "2.5.1",
-      "resolved": "https://registry.npmjs.org/tinybench/-/tinybench-2.5.1.tgz",
-      "integrity": "sha512-65NKvSuAVDP/n4CqH+a9w2kTlLReS9vhsAP06MWx+/89nMinJyB2icyl58RIcqCmIggpojIGeuJGhjU1aGMBSg==",
-      "dev": true
-    },
-    "tinypool": {
-      "version": "0.7.0",
-      "resolved": "https://registry.npmjs.org/tinypool/-/tinypool-0.7.0.tgz",
-      "integrity": "sha512-zSYNUlYSMhJ6Zdou4cJwo/p7w5nmAH17GRfU/ui3ctvjXFErXXkruT4MWW6poDeXgCaIBlGLrfU6TbTXxyGMww==",
-      "dev": true
-    },
-    "tinyspy": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/tinyspy/-/tinyspy-2.2.0.tgz",
-      "integrity": "sha512-d2eda04AN/cPOR89F7Xv5bK/jrQEhmcLFe6HFldoeO9AJtps+fqEnh486vnT/8y4bw38pSyxDcTCAq+Ks2aJTg==",
-      "dev": true
-    },
-    "to-fast-properties": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-2.0.0.tgz",
-      "integrity": "sha512-/OaKK0xYrs3DmxRYqL/yDc+FxFUVYhDlXMhRmv3z915w2HF1tnN1omB354j8VUGO/hbRzyD6Y3sA7v7GS/ceog=="
-    },
-    "to-no-case": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/to-no-case/-/to-no-case-1.0.2.tgz",
-      "integrity": "sha512-Z3g735FxuZY8rodxV4gH7LxClE4H0hTIyHNIHdk+vpQxjLm0cwnKXq/OFVZ76SOQmto7txVcwSCwkU5kqp+FKg==",
-      "dev": true
-    },
-    "to-pascal-case": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/to-pascal-case/-/to-pascal-case-1.0.0.tgz",
-      "integrity": "sha512-QGMWHqM6xPrcQW57S23c5/3BbYb0Tbe9p+ur98ckRnGDwD4wbbtDiYI38CfmMKNB5Iv0REjs5SNDntTwvDxzZA==",
-      "dev": true,
-      "requires": {
-        "to-space-case": "^1.0.0"
-      }
-    },
-    "to-regex-range": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz",
-      "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==",
-      "dev": true,
-      "requires": {
-        "is-number": "^7.0.0"
-      }
-    },
-    "to-space-case": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/to-space-case/-/to-space-case-1.0.0.tgz",
-      "integrity": "sha512-rLdvwXZ39VOn1IxGL3V6ZstoTbwLRckQmn/U8ZDLuWwIXNpuZDhQ3AiRUlhTbOXFVE9C+dR51wM0CBDhk31VcA==",
-      "dev": true,
-      "requires": {
-        "to-no-case": "^1.0.0"
-      }
-    },
-    "toidentifier": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/toidentifier/-/toidentifier-1.0.1.tgz",
-      "integrity": "sha512-o5sSPKEkg/DIQNmH43V0/uerLrpzVedkUh8tGNvaeXpfpuwjKenlSox/2O/BTlZUtEe+JG7s5YhEz608PlAHRA==",
-      "dev": true
-    },
-    "triplesec": {
-      "version": "4.0.3",
-      "resolved": "https://registry.npmjs.org/triplesec/-/triplesec-4.0.3.tgz",
-      "integrity": "sha512-fug70e1nJoCMxsXQJlETisAALohm84vl++IiTTHEqM7Lgqwz62jrlwqOC/gJEAJjO/ByN127sEcioB56HW3wIw==",
-      "requires": {
-        "iced-error": ">=0.0.9",
-        "iced-lock": "^1.0.1",
-        "iced-runtime": "^1.0.2",
-        "more-entropy": ">=0.0.7",
-        "progress": "~1.1.2",
-        "uglify-js": "^3.1.9"
-      }
-    },
-    "ts-loader": {
-      "version": "9.5.1",
-      "resolved": "https://registry.npmjs.org/ts-loader/-/ts-loader-9.5.1.tgz",
-      "integrity": "sha512-rNH3sK9kGZcH9dYzC7CewQm4NtxJTjSEVRJ2DyBZR7f8/wcta+iV44UPCXc5+nzDzivKtlzV6c9P4e+oFhDLYg==",
-      "dev": true,
-      "requires": {
-        "chalk": "^4.1.0",
-        "enhanced-resolve": "^5.0.0",
-        "micromatch": "^4.0.0",
-        "semver": "^7.3.4",
-        "source-map": "^0.7.4"
-      },
-      "dependencies": {
-        "ansi-styles": {
-          "version": "4.3.0",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-          "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-          "dev": true,
-          "requires": {
-            "color-convert": "^2.0.1"
-          }
-        },
-        "chalk": {
-          "version": "4.1.2",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-          "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
-          "dev": true,
-          "requires": {
-            "ansi-styles": "^4.1.0",
-            "supports-color": "^7.1.0"
-          }
-        },
-        "color-convert": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-          "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-          "dev": true,
-          "requires": {
-            "color-name": "~1.1.4"
-          }
-        },
-        "color-name": {
-          "version": "1.1.4",
-          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-          "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-          "dev": true
-        },
-        "has-flag": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-          "dev": true
-        },
-        "lru-cache": {
-          "version": "6.0.0",
-          "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
-          "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
-          "dev": true,
-          "requires": {
-            "yallist": "^4.0.0"
-          }
-        },
-        "semver": {
-          "version": "7.5.4",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz",
-          "integrity": "sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==",
-          "dev": true,
-          "requires": {
-            "lru-cache": "^6.0.0"
-          }
-        },
-        "supports-color": {
-          "version": "7.2.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-          "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-          "dev": true,
-          "requires": {
-            "has-flag": "^4.0.0"
-          }
-        },
-        "yallist": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
-          "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==",
-          "dev": true
-        }
-      }
-    },
-    "ts-transformer-keys": {
-      "version": "0.4.4",
-      "resolved": "https://registry.npmjs.org/ts-transformer-keys/-/ts-transformer-keys-0.4.4.tgz",
-      "integrity": "sha512-LrqgvaFvar01/5mbunRyeLTSIkqoC2xfcpL/90aDY6vR07DGyH+UaYGdIEsUudnlAw2Sr0pxFgdZvE0QIyI4qA==",
-      "requires": {}
-    },
-    "tsc-files": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/tsc-files/-/tsc-files-1.1.4.tgz",
-      "integrity": "sha512-RePsRsOLru3BPpnf237y1Xe1oCGta8rmSYzM76kYo5tLGsv5R2r3s64yapYorGTPuuLyfS9NVbh9ydzmvNie2w==",
-      "dev": true,
-      "requires": {}
-    },
-    "tsconfck": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/tsconfck/-/tsconfck-3.1.0.tgz",
-      "integrity": "sha512-CMjc5zMnyAjcS9sPLytrbFmj89st2g+JYtY/c02ug4Q+CZaAtCgbyviI0n1YvjZE/pzoc6FbNsINS13DOL1B9w==",
-      "dev": true,
-      "requires": {}
-    },
-    "tsconfig-paths": {
-      "version": "3.14.2",
-      "resolved": "https://registry.npmjs.org/tsconfig-paths/-/tsconfig-paths-3.14.2.tgz",
-      "integrity": "sha512-o/9iXgCYc5L/JxCHPe3Hvh8Q/2xm5Z+p18PESBU6Ff33695QnCHBEjcytY2q19ua7Mbl/DavtBOLq+oG0RCL+g==",
-      "dev": true,
-      "requires": {
-        "@types/json5": "^0.0.29",
-        "json5": "^1.0.2",
-        "minimist": "^1.2.6",
-        "strip-bom": "^3.0.0"
-      },
-      "dependencies": {
-        "json5": {
-          "version": "1.0.2",
-          "resolved": "https://registry.npmjs.org/json5/-/json5-1.0.2.tgz",
-          "integrity": "sha512-g1MWMLBiz8FKi1e4w0UyVL3w+iJceWAFBAaBnnGKOpNa5f8TLktkbre1+s6oICydWAm+HRUGTmI+//xv2hvXYA==",
-          "dev": true,
-          "requires": {
-            "minimist": "^1.2.0"
-          }
-        }
-      }
-    },
-    "tsconfig-paths-webpack-plugin": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/tsconfig-paths-webpack-plugin/-/tsconfig-paths-webpack-plugin-4.1.0.tgz",
-      "integrity": "sha512-xWFISjviPydmtmgeUAuXp4N1fky+VCtfhOkDUFIv5ea7p4wuTomI4QTrXvFBX2S4jZsmyTSrStQl+E+4w+RzxA==",
-      "dev": true,
-      "requires": {
-        "chalk": "^4.1.0",
-        "enhanced-resolve": "^5.7.0",
-        "tsconfig-paths": "^4.1.2"
-      },
-      "dependencies": {
-        "ansi-styles": {
-          "version": "4.3.0",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-          "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-          "dev": true,
-          "requires": {
-            "color-convert": "^2.0.1"
-          }
-        },
-        "chalk": {
-          "version": "4.1.2",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-          "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
-          "dev": true,
-          "requires": {
-            "ansi-styles": "^4.1.0",
-            "supports-color": "^7.1.0"
-          }
-        },
-        "color-convert": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-          "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-          "dev": true,
-          "requires": {
-            "color-name": "~1.1.4"
-          }
-        },
-        "color-name": {
-          "version": "1.1.4",
-          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-          "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-          "dev": true
-        },
-        "has-flag": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-          "dev": true
-        },
-        "supports-color": {
-          "version": "7.2.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-          "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-          "dev": true,
-          "requires": {
-            "has-flag": "^4.0.0"
-          }
-        },
-        "tsconfig-paths": {
-          "version": "4.2.0",
-          "resolved": "https://registry.npmjs.org/tsconfig-paths/-/tsconfig-paths-4.2.0.tgz",
-          "integrity": "sha512-NoZ4roiN7LnbKn9QqE1amc9DJfzvZXxF4xDavcOWt1BPkdx+m+0gJuPM+S0vCe7zTJMYUP0R8pO2XMr+Y8oLIg==",
-          "dev": true,
-          "requires": {
-            "json5": "^2.2.2",
-            "minimist": "^1.2.6",
-            "strip-bom": "^3.0.0"
-          }
-        }
-      }
-    },
-    "tslib": {
-      "version": "2.6.1",
-      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.1.tgz",
-      "integrity": "sha512-t0hLfiEKfMUoqhG+U1oid7Pva4bbDPHYfJNiB7BiIjRkj1pyC++4N3huJfqY6aRH6VTB0rvtzQwjM4K6qpfOig=="
-    },
-    "tsutils": {
-      "version": "3.21.0",
-      "resolved": "https://registry.npmjs.org/tsutils/-/tsutils-3.21.0.tgz",
-      "integrity": "sha512-mHKK3iUXL+3UF6xL5k0PEhKRUBKPBCv/+RkEOpjRWxxx27KKRBmmA60A9pgOUvMi8GKhRMPEmjBRPzs2W7O1OA==",
-      "dev": true,
-      "requires": {
-        "tslib": "^1.8.1"
-      },
-      "dependencies": {
-        "tslib": {
-          "version": "1.14.1",
-          "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz",
-          "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==",
-          "dev": true
-        }
-      }
-    },
-    "type-check": {
-      "version": "0.4.0",
-      "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.4.0.tgz",
-      "integrity": "sha512-XleUoc9uwGXqjWwXaUTZAmzMcFZ5858QA2vvx1Ur5xIcixXIP+8LnFDgRplU30us6teqdlskFfu+ae4K79Ooew==",
-      "dev": true,
-      "requires": {
-        "prelude-ls": "^1.2.1"
-      }
-    },
-    "type-detect": {
-      "version": "4.0.8",
-      "resolved": "https://registry.npmjs.org/type-detect/-/type-detect-4.0.8.tgz",
-      "integrity": "sha512-0fr/mIH1dlO+x7TlcMy+bIDqKPsw/70tVyeHW787goQjhmqaZe10uwLujubK9q9Lg6Fiho1KUKDYz0Z7k7g5/g==",
-      "dev": true
-    },
-    "type-fest": {
-      "version": "2.19.0",
-      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-2.19.0.tgz",
-      "integrity": "sha512-RAH822pAdBgcNMAfWnCBU3CFZcfZ/i1eZjwFU/dsLKumyuuP3niueg2UAukXYF0E2AAoc82ZSSf9J0WQBinzHA==",
-      "dev": true
-    },
-    "type-is": {
-      "version": "1.6.18",
-      "resolved": "https://registry.npmjs.org/type-is/-/type-is-1.6.18.tgz",
-      "integrity": "sha512-TkRKr9sUTxEH8MdfuCSP7VizJyzRNMjj2J2do2Jr3Kym598JVdEksuzPQCnlFPW4ky9Q+iA+ma9BGm06XQBy8g==",
-      "dev": true,
-      "requires": {
-        "media-typer": "0.3.0",
-        "mime-types": "~2.1.24"
-      }
-    },
-    "typed-array-buffer": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/typed-array-buffer/-/typed-array-buffer-1.0.0.tgz",
-      "integrity": "sha512-Y8KTSIglk9OZEr8zywiIHG/kmQ7KWyjseXs1CbSo8vC42w7hg2HgYTxSWwP0+is7bWDc1H+Fo026CpHFwm8tkw==",
-      "dev": true,
-      "requires": {
-        "call-bind": "^1.0.2",
-        "get-intrinsic": "^1.2.1",
-        "is-typed-array": "^1.1.10"
-      }
-    },
-    "typed-array-byte-length": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/typed-array-byte-length/-/typed-array-byte-length-1.0.0.tgz",
-      "integrity": "sha512-Or/+kvLxNpeQ9DtSydonMxCx+9ZXOswtwJn17SNLvhptaXYDJvkFFP5zbfU/uLmvnBJlI4yrnXRxpdWH/M5tNA==",
-      "dev": true,
-      "requires": {
-        "call-bind": "^1.0.2",
-        "for-each": "^0.3.3",
-        "has-proto": "^1.0.1",
-        "is-typed-array": "^1.1.10"
-      }
-    },
-    "typed-array-byte-offset": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/typed-array-byte-offset/-/typed-array-byte-offset-1.0.0.tgz",
-      "integrity": "sha512-RD97prjEt9EL8YgAgpOkf3O4IF9lhJFr9g0htQkm0rchFp/Vx7LW5Q8fSXXub7BXAODyUQohRMyOc3faCPd0hg==",
-      "dev": true,
-      "requires": {
-        "available-typed-arrays": "^1.0.5",
-        "call-bind": "^1.0.2",
-        "for-each": "^0.3.3",
-        "has-proto": "^1.0.1",
-        "is-typed-array": "^1.1.10"
-      }
-    },
-    "typed-array-length": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/typed-array-length/-/typed-array-length-1.0.4.tgz",
-      "integrity": "sha512-KjZypGq+I/H7HI5HlOoGHkWUUGq+Q0TPhQurLbyrVrvnKTBgzLhIJ7j6J/XTQOi0d1RjyZ0wdas8bKs2p0x3Ng==",
-      "dev": true,
-      "requires": {
-        "call-bind": "^1.0.2",
-        "for-each": "^0.3.3",
-        "is-typed-array": "^1.1.9"
-      }
-    },
-    "typeforce": {
-      "version": "1.18.0",
-      "resolved": "https://registry.npmjs.org/typeforce/-/typeforce-1.18.0.tgz",
-      "integrity": "sha512-7uc1O8h1M1g0rArakJdf0uLRSSgFcYexrVoKo+bzJd32gd4gDy2L/Z+8/FjPnU9ydY3pEnVPtr9FyscYY60K1g=="
-    },
-    "typescript": {
-      "version": "5.5.3",
-      "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.5.3.tgz",
-      "integrity": "sha512-/hreyEujaB0w76zKo6717l3L0o/qEUtRgdvUBvlkhoWeOVMjMuHNHk0BRBzikzuGDqNmPQbg5ifMEqsHLiIUcQ=="
-    },
-    "typescript-plugin-styled-components": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/typescript-plugin-styled-components/-/typescript-plugin-styled-components-3.0.0.tgz",
-      "integrity": "sha512-QWlhTl6NqsFxtJyxn7pJjm3RhgzXSByUftZ3AoQClrMMpa4yAaHuJKTN1gFpH3Ti+Rwm56fNUfG9pXSBU+WW3A==",
-      "dev": true,
-      "requires": {}
-    },
-    "ufo": {
-      "version": "1.3.2",
-      "resolved": "https://registry.npmjs.org/ufo/-/ufo-1.3.2.tgz",
-      "integrity": "sha512-o+ORpgGwaYQXgqGDwd+hkS4PuZ3QnmqMMxRuajK/a38L6fTpcE5GPIfrf+L/KemFzfUpeUQc1rRS1iDBozvnFA==",
-      "dev": true
-    },
-    "uglify-js": {
-      "version": "3.19.1",
-      "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.19.1.tgz",
-      "integrity": "sha512-y/2wiW+ceTYR2TSSptAhfnEtpLaQ4Ups5zrjB2d3kuVxHj16j/QJwPl5PvuGy9uARb39J0+iKxcRPvtpsx4A4A=="
-    },
-    "unbox-primitive": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/unbox-primitive/-/unbox-primitive-1.0.2.tgz",
-      "integrity": "sha512-61pPlCD9h51VoreyJ0BReideM3MDKMKnh6+V9L08331ipq6Q8OFXZYiqP6n/tbHx4s5I9uRhcye6BrbkizkBDw==",
-      "dev": true,
-      "requires": {
-        "call-bind": "^1.0.2",
-        "has-bigints": "^1.0.2",
-        "has-symbols": "^1.0.3",
-        "which-boxed-primitive": "^1.0.2"
-      }
-    },
-    "undici-types": {
-      "version": "5.26.5",
-      "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-5.26.5.tgz",
-      "integrity": "sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA=="
-    },
-    "unescape-js": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/unescape-js/-/unescape-js-1.1.4.tgz",
-      "integrity": "sha512-42SD8NOQEhdYntEiUQdYq/1V/YHwr1HLwlHuTJB5InVVdOSbgI6xu8jK5q65yIzuFCfczzyDF/7hbGzVbyCw0g==",
-      "dev": true,
-      "requires": {
-        "string.fromcodepoint": "^0.2.1"
-      }
-    },
-    "universalify": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.1.tgz",
-      "integrity": "sha512-gptHNQghINnc/vTGIk0SOFGFNXw7JVrlRUtConJRlvaw6DuX0wO5Jeko9sWrMBhh+PsYAZ7oXAiOnf/UKogyiw==",
-      "dev": true
-    },
-    "unload": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/unload/-/unload-2.2.0.tgz",
-      "integrity": "sha512-B60uB5TNBLtN6/LsgAf3udH9saB5p7gqJwcFfbOEZ8BcBHnGwCf6G/TGiEqkRAxX7zAFIUtzdrXQSdL3Q/wqNA==",
-      "requires": {
-        "@babel/runtime": "^7.6.2",
-        "detect-node": "^2.0.4"
-      }
-    },
-    "unpipe": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/unpipe/-/unpipe-1.0.0.tgz",
-      "integrity": "sha512-pjy2bYhSsufwWlKwPc+l3cN7+wuJlK6uz0YdJEOlQDbl6jo/YlPi4mb8agUkVC8BF7V8NuzeyPNqRksA3hztKQ==",
-      "dev": true
-    },
-    "update-browserslist-db": {
-      "version": "1.0.13",
-      "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.0.13.tgz",
-      "integrity": "sha512-xebP81SNcPuNpPP3uzeW1NYXxI3rxyJzF3pD6sH4jE7o/IX+WtSpwnVU+qIsDPyk0d3hmFQ7mjqc6AtV604hbg==",
-      "requires": {
-        "escalade": "^3.1.1",
-        "picocolors": "^1.0.0"
-      }
-    },
-    "uri-js": {
-      "version": "4.4.1",
-      "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.4.1.tgz",
-      "integrity": "sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==",
-      "dev": true,
-      "requires": {
-        "punycode": "^2.1.0"
-      }
-    },
-    "use-sync-external-store": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/use-sync-external-store/-/use-sync-external-store-1.2.0.tgz",
-      "integrity": "sha512-eEgnFxGQ1Ife9bzYs6VLi8/4X6CObHMw9Qr9tPY43iKwsPw8xE8+EFsf/2cFZ5S3esXgpWgtSCtLNS41F+sKPA==",
-      "requires": {}
-    },
-    "util": {
-      "version": "0.12.5",
-      "resolved": "https://registry.npmjs.org/util/-/util-0.12.5.tgz",
-      "integrity": "sha512-kZf/K6hEIrWHI6XqOFUiiMa+79wE/D8Q+NCNAWclkyg3b4d2k7s0QGepNjiABc+aR3N1PAyHL7p6UcLY6LmrnA==",
-      "requires": {
-        "inherits": "^2.0.3",
-        "is-arguments": "^1.0.4",
-        "is-generator-function": "^1.0.7",
-        "is-typed-array": "^1.1.3",
-        "which-typed-array": "^1.1.2"
-      }
-    },
-    "util-deprecate": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
-      "integrity": "sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw=="
-    },
-    "utila": {
-      "version": "0.4.0",
-      "resolved": "https://registry.npmjs.org/utila/-/utila-0.4.0.tgz",
-      "integrity": "sha512-Z0DbgELS9/L/75wZbro8xAnT50pBVFQZ+hUEueGDU5FN51YSCYM+jdxsfCiHjwNP/4LCDD0i/graKpeBnOXKRA==",
-      "dev": true
-    },
-    "utils-merge": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.1.tgz",
-      "integrity": "sha512-pMZTvIkT1d+TFGvDOqodOclx0QWkkgi6Tdoa8gC8ffGAAqz9pzPTZWAybbsHHoED/ztMtkv/VoYTYyShUn81hA==",
-      "dev": true
-    },
-    "uuid": {
-      "version": "8.3.2",
-      "resolved": "https://registry.npmjs.org/uuid/-/uuid-8.3.2.tgz",
-      "integrity": "sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg=="
-    },
-    "uuidv4": {
-      "version": "6.2.13",
-      "resolved": "https://registry.npmjs.org/uuidv4/-/uuidv4-6.2.13.tgz",
-      "integrity": "sha512-AXyzMjazYB3ovL3q051VLH06Ixj//Knx7QnUSi1T//Ie3io6CpsPu9nVMOx5MoLWh6xV0B9J0hIaxungxXUbPQ==",
-      "requires": {
-        "@types/uuid": "8.3.4",
-        "uuid": "8.3.2"
-      }
-    },
-    "valibot": {
-      "version": "0.33.2",
-      "resolved": "https://registry.npmjs.org/valibot/-/valibot-0.33.2.tgz",
-      "integrity": "sha512-ZpFWuI+bs5+PP66q4zVFn4e4t/s5jmMw5iPBZmGUoi8iQqXyU9YY/BLCAyk62Z/bNS8qdUNBEyx52952qdqW3w=="
-    },
-    "valid-url": {
-      "version": "1.0.9",
-      "resolved": "https://registry.npmjs.org/valid-url/-/valid-url-1.0.9.tgz",
-      "integrity": "sha512-QQDsV8OnSf5Uc30CKSwG9lnhMPe6exHtTXLRYX8uMwKENy640pU+2BgBL0LRbDh/eYRahNCS7aewCx0wf3NYVA=="
-    },
-    "varuint-bitcoin": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/varuint-bitcoin/-/varuint-bitcoin-1.1.2.tgz",
-      "integrity": "sha512-4EVb+w4rx+YfVM32HQX42AbbT7/1f5zwAYhIujKXKk8NQK+JfRVl3pqT3hjNn/L+RstigmGGKVwHA/P0wgITZw==",
-      "requires": {
-        "safe-buffer": "^5.1.1"
-      }
-    },
-    "vary": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/vary/-/vary-1.1.2.tgz",
-      "integrity": "sha512-BNGbWLfd0eUPabhkXUVm0j8uuvREyTh5ovRa/dyow/BqAbZJyC+5fU+IzQOzmAKzYqYRAISoRhdQr3eIZ/PXqg==",
-      "dev": true
-    },
-    "vite": {
-      "version": "5.3.2",
-      "resolved": "https://registry.npmjs.org/vite/-/vite-5.3.2.tgz",
-      "integrity": "sha512-6lA7OBHBlXUxiJxbO5aAY2fsHHzDr1q7DvXYnyZycRs2Dz+dXBWuhpWHvmljTRTpQC2uvGmUFFkSHF2vGo90MA==",
-      "dev": true,
-      "requires": {
-        "esbuild": "^0.21.3",
-        "fsevents": "~2.3.3",
-        "postcss": "^8.4.38",
-        "rollup": "^4.13.0"
-      }
-    },
-    "vite-node": {
-      "version": "0.34.6",
-      "resolved": "https://registry.npmjs.org/vite-node/-/vite-node-0.34.6.tgz",
-      "integrity": "sha512-nlBMJ9x6n7/Amaz6F3zJ97EBwR2FkzhBRxF5e+jE6LA3yi6Wtc2lyTij1OnDMIr34v5g/tVQtsVAzhT0jc5ygA==",
-      "dev": true,
-      "requires": {
-        "cac": "^6.7.14",
-        "debug": "^4.3.4",
-        "mlly": "^1.4.0",
-        "pathe": "^1.1.1",
-        "picocolors": "^1.0.0",
-        "vite": "^3.0.0 || ^4.0.0 || ^5.0.0-0"
-      }
-    },
-    "vite-tsconfig-paths": {
-      "version": "4.3.2",
-      "resolved": "https://registry.npmjs.org/vite-tsconfig-paths/-/vite-tsconfig-paths-4.3.2.tgz",
-      "integrity": "sha512-0Vd/a6po6Q+86rPlntHye7F31zA2URZMbH8M3saAZ/xR9QoGN/L21bxEGfXdWmFdNkqPpRdxFT7nmNe12e9/uA==",
-      "dev": true,
-      "requires": {
-        "debug": "^4.1.1",
-        "globrex": "^0.1.2",
-        "tsconfck": "^3.0.3"
-      }
-    },
-    "vitest": {
-      "version": "0.34.6",
-      "resolved": "https://registry.npmjs.org/vitest/-/vitest-0.34.6.tgz",
-      "integrity": "sha512-+5CALsOvbNKnS+ZHMXtuUC7nL8/7F1F2DnHGjSsszX8zCjWSSviphCb/NuS9Nzf4Q03KyyDRBAXhF/8lffME4Q==",
-      "dev": true,
-      "requires": {
-        "@types/chai": "^4.3.5",
-        "@types/chai-subset": "^1.3.3",
-        "@types/node": "*",
-        "@vitest/expect": "0.34.6",
-        "@vitest/runner": "0.34.6",
-        "@vitest/snapshot": "0.34.6",
-        "@vitest/spy": "0.34.6",
-        "@vitest/utils": "0.34.6",
-        "acorn": "^8.9.0",
-        "acorn-walk": "^8.2.0",
-        "cac": "^6.7.14",
-        "chai": "^4.3.10",
-        "debug": "^4.3.4",
-        "local-pkg": "^0.4.3",
-        "magic-string": "^0.30.1",
-        "pathe": "^1.1.1",
-        "picocolors": "^1.0.0",
-        "std-env": "^3.3.3",
-        "strip-literal": "^1.0.1",
-        "tinybench": "^2.5.0",
-        "tinypool": "^0.7.0",
-        "vite": "^3.1.0 || ^4.0.0 || ^5.0.0-0",
-        "vite-node": "0.34.6",
-        "why-is-node-running": "^2.2.2"
-      }
-    },
-    "vlq": {
-      "version": "0.2.3",
-      "resolved": "https://registry.npmjs.org/vlq/-/vlq-0.2.3.tgz",
-      "integrity": "sha512-DRibZL6DsNhIgYQ+wNdWDL2SL3bKPlVrRiBqV5yuMm++op8W4kGFtaQfCs4KEJn0wBZcHVHJ3eoywX8983k1ow==",
-      "dev": true
-    },
-    "void-elements": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/void-elements/-/void-elements-3.1.0.tgz",
-      "integrity": "sha512-Dhxzh5HZuiHQhbvTW9AMetFfBHDMYpo23Uo9btPXgdYP+3T5S+p+jgNy7spra+veYhBP2dCSgxR/i2Y02h5/6w=="
-    },
-    "warning": {
-      "version": "4.0.3",
-      "resolved": "https://registry.npmjs.org/warning/-/warning-4.0.3.tgz",
-      "integrity": "sha512-rpJyN222KWIvHJ/F53XSZv0Zl/accqHR8et1kpaMTD/fLCRxtV8iX8czMzY7sVZupTI3zcUTg8eycS2kNF9l6w==",
-      "requires": {
-        "loose-envify": "^1.0.0"
-      }
-    },
-    "watchpack": {
-      "version": "2.4.0",
-      "resolved": "https://registry.npmjs.org/watchpack/-/watchpack-2.4.0.tgz",
-      "integrity": "sha512-Lcvm7MGST/4fup+ifyKi2hjyIAwcdI4HRgtvTpIUxBRhB+RFtUh8XtDOxUfctVCnhVi+QQj49i91OyvzkJl6cg==",
-      "dev": true,
-      "requires": {
-        "glob-to-regexp": "^0.4.1",
-        "graceful-fs": "^4.1.2"
-      }
-    },
-    "wbuf": {
-      "version": "1.7.3",
-      "resolved": "https://registry.npmjs.org/wbuf/-/wbuf-1.7.3.tgz",
-      "integrity": "sha512-O84QOnr0icsbFGLS0O3bI5FswxzRr8/gHwWkDlQFskhSPryQXvrTMxjxGP4+iWYoauLoBvfDpkrOauZ+0iZpDA==",
-      "dev": true,
-      "requires": {
-        "minimalistic-assert": "^1.0.0"
-      }
-    },
-    "wcwidth": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/wcwidth/-/wcwidth-1.0.1.tgz",
-      "integrity": "sha512-XHPEwS0q6TaxcvG85+8EYkbiCux2XtWG2mkc47Ng2A77BQu9+DqIOJldST4HgPkuea7dvKSj5VgX3P1d4rW8Tg==",
-      "dev": true,
-      "optional": true,
-      "requires": {
-        "defaults": "^1.0.3"
-      }
-    },
-    "webextension-polyfill": {
-      "version": "0.10.0",
-      "resolved": "https://registry.npmjs.org/webextension-polyfill/-/webextension-polyfill-0.10.0.tgz",
-      "integrity": "sha512-c5s35LgVa5tFaHhrZDnr3FpQpjj1BB+RXhLTYUxGqBVN460HkbM8TBtEqdXWbpTKfzwCcjAZVF7zXCYSKtcp9g=="
-    },
-    "webpack": {
-      "version": "5.89.0",
-      "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.89.0.tgz",
-      "integrity": "sha512-qyfIC10pOr70V+jkmud8tMfajraGCZMBWJtrmuBymQKCrLTRejBI8STDp1MCyZu/QTdZSeacCQYpYNQVOzX5kw==",
-      "dev": true,
-      "requires": {
-        "@types/eslint-scope": "^3.7.3",
-        "@types/estree": "^1.0.0",
-        "@webassemblyjs/ast": "^1.11.5",
-        "@webassemblyjs/wasm-edit": "^1.11.5",
-        "@webassemblyjs/wasm-parser": "^1.11.5",
-        "acorn": "^8.7.1",
-        "acorn-import-assertions": "^1.9.0",
-        "browserslist": "^4.14.5",
-        "chrome-trace-event": "^1.0.2",
-        "enhanced-resolve": "^5.15.0",
-        "es-module-lexer": "^1.2.1",
-        "eslint-scope": "5.1.1",
-        "events": "^3.2.0",
-        "glob-to-regexp": "^0.4.1",
-        "graceful-fs": "^4.2.9",
-        "json-parse-even-better-errors": "^2.3.1",
-        "loader-runner": "^4.2.0",
-        "mime-types": "^2.1.27",
-        "neo-async": "^2.6.2",
-        "schema-utils": "^3.2.0",
-        "tapable": "^2.1.1",
-        "terser-webpack-plugin": "^5.3.7",
-        "watchpack": "^2.4.0",
-        "webpack-sources": "^3.2.3"
-      }
-    },
-    "webpack-dev-middleware": {
-      "version": "5.3.3",
-      "resolved": "https://registry.npmjs.org/webpack-dev-middleware/-/webpack-dev-middleware-5.3.3.tgz",
-      "integrity": "sha512-hj5CYrY0bZLB+eTO+x/j67Pkrquiy7kWepMHmUMoPsmcUaeEnQJqFzHJOyxgWlq746/wUuA64p9ta34Kyb01pA==",
-      "dev": true,
-      "requires": {
-        "colorette": "^2.0.10",
-        "memfs": "^3.4.3",
-        "mime-types": "^2.1.31",
-        "range-parser": "^1.2.1",
-        "schema-utils": "^4.0.0"
-      },
-      "dependencies": {
-        "ajv": {
-          "version": "8.12.0",
-          "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.12.0.tgz",
-          "integrity": "sha512-sRu1kpcO9yLtYxBKvqfTeh9KzZEwO3STyX1HT+4CaDzC6HpTGYhIhPIzj9XuKU7KYDwnaeh5hcOwjy1QuJzBPA==",
-          "dev": true,
-          "requires": {
-            "fast-deep-equal": "^3.1.1",
-            "json-schema-traverse": "^1.0.0",
-            "require-from-string": "^2.0.2",
-            "uri-js": "^4.2.2"
-          }
-        },
-        "ajv-keywords": {
-          "version": "5.1.0",
-          "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-5.1.0.tgz",
-          "integrity": "sha512-YCS/JNFAUyr5vAuhk1DWm1CBxRHW9LbJ2ozWeemrIqpbsqKjHVxYPyi5GC0rjZIT5JxJ3virVTS8wk4i/Z+krw==",
-          "dev": true,
-          "requires": {
-            "fast-deep-equal": "^3.1.3"
-          }
-        },
-        "json-schema-traverse": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz",
-          "integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==",
-          "dev": true
-        },
-        "schema-utils": {
-          "version": "4.2.0",
-          "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-4.2.0.tgz",
-          "integrity": "sha512-L0jRsrPpjdckP3oPug3/VxNKt2trR8TcabrM6FOAAlvC/9Phcmm+cuAgTlxBqdBR1WJx7Naj9WHw+aOmheSVbw==",
-          "dev": true,
-          "requires": {
-            "@types/json-schema": "^7.0.9",
-            "ajv": "^8.9.0",
-            "ajv-formats": "^2.1.1",
-            "ajv-keywords": "^5.1.0"
-          }
-        }
-      }
-    },
-    "webpack-dev-server": {
-      "version": "4.15.1",
-      "resolved": "https://registry.npmjs.org/webpack-dev-server/-/webpack-dev-server-4.15.1.tgz",
-      "integrity": "sha512-5hbAst3h3C3L8w6W4P96L5vaV0PxSmJhxZvWKYIdgxOQm8pNZ5dEOmmSLBVpP85ReeyRt6AS1QJNyo/oFFPeVA==",
-      "dev": true,
-      "requires": {
-        "@types/bonjour": "^3.5.9",
-        "@types/connect-history-api-fallback": "^1.3.5",
-        "@types/express": "^4.17.13",
-        "@types/serve-index": "^1.9.1",
-        "@types/serve-static": "^1.13.10",
-        "@types/sockjs": "^0.3.33",
-        "@types/ws": "^8.5.5",
-        "ansi-html-community": "^0.0.8",
-        "bonjour-service": "^1.0.11",
-        "chokidar": "^3.5.3",
-        "colorette": "^2.0.10",
-        "compression": "^1.7.4",
-        "connect-history-api-fallback": "^2.0.0",
-        "default-gateway": "^6.0.3",
-        "express": "^4.17.3",
-        "graceful-fs": "^4.2.6",
-        "html-entities": "^2.3.2",
-        "http-proxy-middleware": "^2.0.3",
-        "ipaddr.js": "^2.0.1",
-        "launch-editor": "^2.6.0",
-        "open": "^8.0.9",
-        "p-retry": "^4.5.0",
-        "rimraf": "^3.0.2",
-        "schema-utils": "^4.0.0",
-        "selfsigned": "^2.1.1",
-        "serve-index": "^1.9.1",
-        "sockjs": "^0.3.24",
-        "spdy": "^4.0.2",
-        "webpack-dev-middleware": "^5.3.1",
-        "ws": "^8.13.0"
-      },
-      "dependencies": {
-        "ajv": {
-          "version": "8.12.0",
-          "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.12.0.tgz",
-          "integrity": "sha512-sRu1kpcO9yLtYxBKvqfTeh9KzZEwO3STyX1HT+4CaDzC6HpTGYhIhPIzj9XuKU7KYDwnaeh5hcOwjy1QuJzBPA==",
-          "dev": true,
-          "requires": {
-            "fast-deep-equal": "^3.1.1",
-            "json-schema-traverse": "^1.0.0",
-            "require-from-string": "^2.0.2",
-            "uri-js": "^4.2.2"
-          }
-        },
-        "ajv-keywords": {
-          "version": "5.1.0",
-          "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-5.1.0.tgz",
-          "integrity": "sha512-YCS/JNFAUyr5vAuhk1DWm1CBxRHW9LbJ2ozWeemrIqpbsqKjHVxYPyi5GC0rjZIT5JxJ3virVTS8wk4i/Z+krw==",
-          "dev": true,
-          "requires": {
-            "fast-deep-equal": "^3.1.3"
-          }
-        },
-        "json-schema-traverse": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz",
-          "integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==",
-          "dev": true
-        },
-        "schema-utils": {
-          "version": "4.2.0",
-          "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-4.2.0.tgz",
-          "integrity": "sha512-L0jRsrPpjdckP3oPug3/VxNKt2trR8TcabrM6FOAAlvC/9Phcmm+cuAgTlxBqdBR1WJx7Naj9WHw+aOmheSVbw==",
-          "dev": true,
-          "requires": {
-            "@types/json-schema": "^7.0.9",
-            "ajv": "^8.9.0",
-            "ajv-formats": "^2.1.1",
-            "ajv-keywords": "^5.1.0"
-          }
-        },
-        "ws": {
-          "version": "8.13.0",
-          "resolved": "https://registry.npmjs.org/ws/-/ws-8.13.0.tgz",
-          "integrity": "sha512-x9vcZYTrFPC7aSIbj7sRCYo7L/Xb8Iy+pW0ng0wt2vCJv7M9HOMy0UoN3rr+IFC7hb7vXoqS+P9ktyLLLhO+LA==",
-          "dev": true,
-          "requires": {}
-        }
-      }
-    },
-    "webpack-sources": {
-      "version": "3.2.3",
-      "resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-3.2.3.tgz",
-      "integrity": "sha512-/DyMEOrDgLKKIG0fmvtz+4dUX/3Ghozwgm6iPp8KRhvn+eQf9+Q7GWxVNMk3+uCPWfdXYC4ExGBckIXdFEfH1w==",
-      "dev": true
-    },
-    "websocket-driver": {
-      "version": "0.7.4",
-      "resolved": "https://registry.npmjs.org/websocket-driver/-/websocket-driver-0.7.4.tgz",
-      "integrity": "sha512-b17KeDIQVjvb0ssuSDF2cYXSg2iztliJ4B9WdsuB6J952qCPKmnVq4DyW5motImXHDC1cBT/1UezrJVsKw5zjg==",
-      "dev": true,
-      "requires": {
-        "http-parser-js": ">=0.5.1",
-        "safe-buffer": ">=5.1.0",
-        "websocket-extensions": ">=0.1.1"
-      }
-    },
-    "websocket-extensions": {
-      "version": "0.1.4",
-      "resolved": "https://registry.npmjs.org/websocket-extensions/-/websocket-extensions-0.1.4.tgz",
-      "integrity": "sha512-OqedPIGOfsDlo31UNwYbCFMSaO9m9G/0faIHj5/dZFDMFqPTcx6UwqyOy3COEaEOg/9VsGIpdqn62W5KhoKSpg==",
-      "dev": true
-    },
-    "which": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",
-      "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==",
-      "dev": true,
-      "requires": {
-        "isexe": "^2.0.0"
-      }
-    },
-    "which-boxed-primitive": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/which-boxed-primitive/-/which-boxed-primitive-1.0.2.tgz",
-      "integrity": "sha512-bwZdv0AKLpplFY2KZRX6TvyuN7ojjr7lwkg6ml0roIy9YeuSr7JS372qlNW18UQYzgYK9ziGcerWqZOmEn9VNg==",
-      "dev": true,
-      "requires": {
-        "is-bigint": "^1.0.1",
-        "is-boolean-object": "^1.1.0",
-        "is-number-object": "^1.0.4",
-        "is-string": "^1.0.5",
-        "is-symbol": "^1.0.3"
-      }
-    },
-    "which-collection": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/which-collection/-/which-collection-1.0.1.tgz",
-      "integrity": "sha512-W8xeTUwaln8i3K/cY1nGXzdnVZlidBcagyNFtBdD5kxnb4TvGKR7FfSIS3mYpwWS1QUCutfKz8IY8RjftB0+1A==",
-      "dev": true,
-      "requires": {
-        "is-map": "^2.0.1",
-        "is-set": "^2.0.1",
-        "is-weakmap": "^2.0.1",
-        "is-weakset": "^2.0.1"
-      }
-    },
-    "which-typed-array": {
-      "version": "1.1.11",
-      "resolved": "https://registry.npmjs.org/which-typed-array/-/which-typed-array-1.1.11.tgz",
-      "integrity": "sha512-qe9UWWpkeG5yzZ0tNYxDmd7vo58HDBc39mZ0xWWpolAGADdFOzkfamWLDxkOWcvHQKVmdTyQdLD4NOfjLWTKew==",
-      "requires": {
-        "available-typed-arrays": "^1.0.5",
-        "call-bind": "^1.0.2",
-        "for-each": "^0.3.3",
-        "gopd": "^1.0.1",
-        "has-tostringtag": "^1.0.0"
-      }
-    },
-    "why-is-node-running": {
-      "version": "2.2.2",
-      "resolved": "https://registry.npmjs.org/why-is-node-running/-/why-is-node-running-2.2.2.tgz",
-      "integrity": "sha512-6tSwToZxTOcotxHeA+qGCq1mVzKR3CwcJGmVcY+QE8SHy6TnpFnh8PAvPNHYr7EcuVeG0QSMxtYCuO1ta/G/oA==",
-      "dev": true,
-      "requires": {
-        "siginfo": "^2.0.0",
-        "stackback": "0.0.2"
-      }
-    },
-    "wif": {
-      "version": "2.0.6",
-      "resolved": "https://registry.npmjs.org/wif/-/wif-2.0.6.tgz",
-      "integrity": "sha512-HIanZn1zmduSF+BQhkE+YXIbEiH0xPr1012QbFEGB0xsKqJii0/SqJjyn8dFv6y36kOznMgMB+LGcbZTJ1xACQ==",
-      "requires": {
-        "bs58check": "<3.0.0"
-      },
-      "dependencies": {
-        "base-x": {
-          "version": "3.0.10",
-          "resolved": "https://registry.npmjs.org/base-x/-/base-x-3.0.10.tgz",
-          "integrity": "sha512-7d0s06rR9rYaIWHkpfLIFICM/tkSVdoPC9qYAQRpxn9DdKNWNsKC0uk++akckyLq16Tx2WIinnZ6WRriAt6njQ==",
-          "requires": {
-            "safe-buffer": "^5.0.1"
-          }
-        },
-        "bs58": {
-          "version": "4.0.1",
-          "resolved": "https://registry.npmjs.org/bs58/-/bs58-4.0.1.tgz",
-          "integrity": "sha512-Ok3Wdf5vOIlBrgCvTq96gBkJw+JUEzdBgyaza5HLtPm7yTHkjRy8+JzNyHF7BHa0bNWOQIp3m5YF0nnFcOIKLw==",
-          "requires": {
-            "base-x": "^3.0.2"
-          }
-        },
-        "bs58check": {
-          "version": "2.1.2",
-          "resolved": "https://registry.npmjs.org/bs58check/-/bs58check-2.1.2.tgz",
-          "integrity": "sha512-0TS1jicxdU09dwJMNZtVAfzPi6Q6QeN0pM1Fkzrjn+XYHvzMKPU3pHVpva+769iNVSfIYWf7LJ6WR+BuuMf8cA==",
-          "requires": {
-            "bs58": "^4.0.0",
-            "create-hash": "^1.1.0",
-            "safe-buffer": "^5.1.2"
-          }
-        }
-      }
-    },
-    "wrap-ansi": {
-      "version": "7.0.0",
-      "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz",
-      "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==",
-      "requires": {
-        "ansi-styles": "^4.0.0",
-        "string-width": "^4.1.0",
-        "strip-ansi": "^6.0.0"
-      },
-      "dependencies": {
-        "ansi-styles": {
-          "version": "4.3.0",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-          "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-          "requires": {
-            "color-convert": "^2.0.1"
-          }
-        },
-        "color-convert": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-          "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-          "requires": {
-            "color-name": "~1.1.4"
-          }
-        },
-        "color-name": {
-          "version": "1.1.4",
-          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-          "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="
-        },
-        "emoji-regex": {
-          "version": "8.0.0",
-          "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
-          "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A=="
-        },
-        "is-fullwidth-code-point": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
-          "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg=="
-        },
-        "string-width": {
-          "version": "4.2.3",
-          "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
-          "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
-          "requires": {
-            "emoji-regex": "^8.0.0",
-            "is-fullwidth-code-point": "^3.0.0",
-            "strip-ansi": "^6.0.1"
-          }
-        }
-      }
-    },
-    "wrappy": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
-      "integrity": "sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ=="
-    },
-    "y18n": {
-      "version": "5.0.8",
-      "resolved": "https://registry.npmjs.org/y18n/-/y18n-5.0.8.tgz",
-      "integrity": "sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA=="
-    },
-    "yallist": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.1.1.tgz",
-      "integrity": "sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==",
-      "peer": true
-    },
-    "yaml": {
-      "version": "2.3.1",
-      "resolved": "https://registry.npmjs.org/yaml/-/yaml-2.3.1.tgz",
-      "integrity": "sha512-2eHWfjaoXgTBC2jNM1LRef62VQa0umtvRiDSk6HSzW7RvS5YtkabJrwYLLEKWBc8a5U2PTSCs+dJjUTJdlHsWQ==",
-      "dev": true
-    },
-    "yargs": {
-      "version": "17.7.2",
-      "resolved": "https://registry.npmjs.org/yargs/-/yargs-17.7.2.tgz",
-      "integrity": "sha512-7dSzzRQ++CKnNI/krKnYRV7JKKPUXMEh61soaHKg9mrWEhzFWhFnxPxGl+69cD1Ou63C13NUPCnmIcrvqCuM6w==",
-      "requires": {
-        "cliui": "^8.0.1",
-        "escalade": "^3.1.1",
-        "get-caller-file": "^2.0.5",
-        "require-directory": "^2.1.1",
-        "string-width": "^4.2.3",
-        "y18n": "^5.0.5",
-        "yargs-parser": "^21.1.1"
-      },
-      "dependencies": {
-        "emoji-regex": {
-          "version": "8.0.0",
-          "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
-          "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A=="
-        },
-        "is-fullwidth-code-point": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
-          "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg=="
-        },
-        "string-width": {
-          "version": "4.2.3",
-          "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
-          "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
-          "requires": {
-            "emoji-regex": "^8.0.0",
-            "is-fullwidth-code-point": "^3.0.0",
-            "strip-ansi": "^6.0.1"
-          }
-        }
-      }
-    },
-    "yargs-parser": {
-      "version": "21.1.1",
-      "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-21.1.1.tgz",
-      "integrity": "sha512-tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw=="
-    },
-    "yocto-queue": {
-      "version": "0.1.0",
-      "resolved": "https://registry.npmjs.org/yocto-queue/-/yocto-queue-0.1.0.tgz",
-      "integrity": "sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==",
-      "dev": true
-    },
-    "yqueue": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/yqueue/-/yqueue-1.0.1.tgz",
-      "integrity": "sha512-DBxJZBRafFLA/tCc5uO8ZTGFr+sQgn1FRJkZ4cVrIQIk6bv2bInraE3mbpLAJw9z93JGrLkqDoyTLrrZaCNq5w=="
-    },
-    "zod": {
-      "version": "3.22.4",
-      "resolved": "https://registry.npmjs.org/zod/-/zod-3.22.4.tgz",
-      "integrity": "sha512-iC+8Io04lddc+mVqQ9AZ7OQ2MrUKGN+oIQyq1vemgt46jwCwLfhq7/pwnBnNXXXZb8VTVLKwp9EDkx+ryxIWmg=="
-    },
-    "zod-validation-error": {
-      "version": "3.3.0",
-      "resolved": "https://registry.npmjs.org/zod-validation-error/-/zod-validation-error-3.3.0.tgz",
-      "integrity": "sha512-Syib9oumw1NTqEv4LT0e6U83Td9aVRk9iTXPUQr1otyV1PuXQKOvOwhMNqZIq5hluzHP2pMgnOmHEo7kPdI2mw==",
-      "dev": true,
-      "requires": {}
-    },
-    "zone-file": {
-      "version": "2.0.0-beta.3",
-      "resolved": "https://registry.npmjs.org/zone-file/-/zone-file-2.0.0-beta.3.tgz",
-      "integrity": "sha512-6tE3PSRcpN5lbTTLlkLez40WkNPc9vw/u1J2j6DBiy0jcVX48nCkWrx2EC+bWHqC2SLp069Xw4AdnYn/qp/W5g=="
-    },
-    "zxcvbn": {
-      "version": "4.4.2",
-      "resolved": "https://registry.npmjs.org/zxcvbn/-/zxcvbn-4.4.2.tgz",
-      "integrity": "sha512-Bq0B+ixT/DMyG8kgX2xWcI5jUvCwqrMxSFam7m0lAf78nf04hv6lNCsyLYdyYTrCVMqNDY/206K7eExYCeSyUQ=="
+      "license": "MIT"
     }
   }
 }
diff --git a/package.json b/package.json
index 648b128c8..638ab2c96 100644
--- a/package.json
+++ b/package.json
@@ -44,7 +44,7 @@
     "@react-spring/web": "^9.6.1",
     "@sats-connect/core": "0.2.1",
     "@scure/btc-signer": "1.2.1",
-    "@secretkeylabs/xverse-core": "18.7.0-49281c0",
+    "@secretkeylabs/xverse-core": "18.7.2",
     "@stacks/connect": "7.4.1",
     "@stacks/stacks-blockchain-api-types": "6.1.1",
     "@stacks/transactions": "6.13.1",

From d44546115d2144284ee2c43e18a6526a198cf2c3 Mon Sep 17 00:00:00 2001
From: jordankzf <jordan@secretkeylabs.com>
Date: Fri, 23 Aug 2024 17:27:54 +0800
Subject: [PATCH 016/227] Revert before final merge

---
 package.json                   | 2 +-
 src/app/hooks/useHasFeature.ts | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 638ab2c96..f30898e89 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "xverse-web-extension",
   "description": "A Bitcoin wallet for Web3",
-  "version": "0.40.0",
+  "version": "0.41.0",
   "private": true,
   "engines": {
     "node": "^18.18.2"
diff --git a/src/app/hooks/useHasFeature.ts b/src/app/hooks/useHasFeature.ts
index 9435a0198..298ace532 100644
--- a/src/app/hooks/useHasFeature.ts
+++ b/src/app/hooks/useHasFeature.ts
@@ -17,5 +17,9 @@ const useAppFeatures = () => {
 
 export default function useHasFeature(feature: FeatureId): boolean {
   const { data } = useAppFeatures();
+
+  // Remove before merging
+  if (feature === FeatureId.STACKS_SWAPS) return true;
+
   return data?.[feature]?.enabled ?? false;
 }

From 6b8eb292b319fa7bfdc1923a5b4d083997f9256c Mon Sep 17 00:00:00 2001
From: Mahmoud Aboelenein <mahmoud@secretkeylabs.com>
Date: Fri, 23 Aug 2024 14:30:37 +0300
Subject: [PATCH 017/227] use selected network instance url

---
 package-lock.json                          | 14 +++++++-------
 package.json                               |  2 +-
 src/app/hooks/queries/useAccountBalance.ts |  5 +----
 src/app/utils/transactions/transactions.ts |  5 +----
 4 files changed, 10 insertions(+), 16 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index adadede5e..cbfcf2739 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -15,7 +15,7 @@
         "@react-spring/web": "^9.6.1",
         "@sats-connect/core": "0.2.1",
         "@scure/btc-signer": "1.2.1",
-        "@secretkeylabs/xverse-core": "18.7.0",
+        "@secretkeylabs/xverse-core": "18.7.1-0c4c676",
         "@stacks/connect": "7.4.1",
         "@stacks/stacks-blockchain-api-types": "6.1.1",
         "@stacks/transactions": "6.13.1",
@@ -1862,9 +1862,9 @@
       }
     },
     "node_modules/@secretkeylabs/xverse-core": {
-      "version": "18.7.0",
-      "resolved": "https://npm.pkg.github.com/download/@secretkeylabs/xverse-core/18.7.0/e3ab51151b17b6c49fade2a104bb3122f76a1e17",
-      "integrity": "sha512-hoNCtY7LNBL908Hmh8Yxpo0IPLGg6wnrUYsdVkxyvhn9+IsXZE2GtrafVn5bAibw02wbQdTUX0OUckyd1/ZW+Q==",
+      "version": "18.7.1-0c4c676",
+      "resolved": "https://npm.pkg.github.com/download/@secretkeylabs/xverse-core/18.7.1-0c4c676/8f5d618f3b1acffd30f36e87a9f8cf82dac3443c",
+      "integrity": "sha512-xbzCGqcEx2bg0Nk7MA2CdmB0eVoJniCn/4U4SvS8sUqJxqY0oo0vzaNUnoOyHs8GNeFhUZaPJmnu7PU7k+9veA==",
       "license": "ISC",
       "dependencies": {
         "@bitcoinerlab/secp256k1": "^1.0.2",
@@ -15328,9 +15328,9 @@
       }
     },
     "@secretkeylabs/xverse-core": {
-      "version": "18.7.0",
-      "resolved": "https://npm.pkg.github.com/download/@secretkeylabs/xverse-core/18.7.0/e3ab51151b17b6c49fade2a104bb3122f76a1e17",
-      "integrity": "sha512-hoNCtY7LNBL908Hmh8Yxpo0IPLGg6wnrUYsdVkxyvhn9+IsXZE2GtrafVn5bAibw02wbQdTUX0OUckyd1/ZW+Q==",
+      "version": "18.7.1-0c4c676",
+      "resolved": "https://npm.pkg.github.com/download/@secretkeylabs/xverse-core/18.7.1-0c4c676/8f5d618f3b1acffd30f36e87a9f8cf82dac3443c",
+      "integrity": "sha512-xbzCGqcEx2bg0Nk7MA2CdmB0eVoJniCn/4U4SvS8sUqJxqY0oo0vzaNUnoOyHs8GNeFhUZaPJmnu7PU7k+9veA==",
       "requires": {
         "@bitcoinerlab/secp256k1": "^1.0.2",
         "@noble/curves": "^1.2.0",
diff --git a/package.json b/package.json
index 1b9d671ad..6373279ee 100644
--- a/package.json
+++ b/package.json
@@ -44,7 +44,7 @@
     "@react-spring/web": "^9.6.1",
     "@sats-connect/core": "0.2.1",
     "@scure/btc-signer": "1.2.1",
-    "@secretkeylabs/xverse-core": "18.7.0",
+    "@secretkeylabs/xverse-core": "18.7.1-0c4c676",
     "@stacks/connect": "7.4.1",
     "@stacks/stacks-blockchain-api-types": "6.1.1",
     "@stacks/transactions": "6.13.1",
diff --git a/src/app/hooks/queries/useAccountBalance.ts b/src/app/hooks/queries/useAccountBalance.ts
index 77639c372..93231e953 100644
--- a/src/app/hooks/queries/useAccountBalance.ts
+++ b/src/app/hooks/queries/useAccountBalance.ts
@@ -5,7 +5,6 @@ import useNetworkSelector from '@hooks/useNetwork';
 import useWalletSelector from '@hooks/useWalletSelector';
 import {
   API_TIMEOUT_MILLI,
-  getNetworkURL,
   type Account,
   type BtcAddressData,
   type FungibleToken,
@@ -73,9 +72,7 @@ const useAccountBalance = () => {
         });
       }
       if (account.stxAddress) {
-        const apiUrl = `${getNetworkURL(stacksNetwork)}/extended/v1/address/${
-          account.stxAddress
-        }/balances`;
+        const apiUrl = `${stacksNetwork.coreApiUrl}/extended/v1/address/${account.stxAddress}/balances`;
 
         const response = await axios.get<TokensResponse>(apiUrl, {
           timeout: API_TIMEOUT_MILLI,
diff --git a/src/app/utils/transactions/transactions.ts b/src/app/utils/transactions/transactions.ts
index b0a0cb8c1..e93d7b32f 100644
--- a/src/app/utils/transactions/transactions.ts
+++ b/src/app/utils/transactions/transactions.ts
@@ -1,7 +1,6 @@
 import {
   API_TIMEOUT_MILLI,
   StacksNetwork,
-  getNetworkURL,
   type APIGetRunesActivityForAddressResponse,
   type AppInfo,
   type Brc20HistoryTransactionData,
@@ -31,9 +30,7 @@ async function getTransferTransactions(reqParams: {
   offset: number;
 }): Promise<AddressTransactionWithTransfers[]> {
   const { stxAddress, limit, network, offset } = reqParams;
-  const apiUrl = `${getNetworkURL(
-    network,
-  )}/extended/v1/address/${stxAddress}/transactions_with_transfers`;
+  const apiUrl = `${network.coreApiUrl}/extended/v1/address/${stxAddress}/transactions_with_transfers`;
   const response = await axios.get<PaginatedResults<AddressTransactionWithTransfers>>(apiUrl, {
     params: {
       limit,

From 51560b540221d3f3feaeb526f9a137fcf9dbb6dd Mon Sep 17 00:00:00 2001
From: jordankzf <jordan@secretkeylabs.com>
Date: Mon, 26 Aug 2024 14:30:09 +0800
Subject: [PATCH 018/227] ENG-5011 return to previous screen upon cancel

---
 .../components/transactionsRequests/ContractCallRequest.tsx    | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/app/components/transactionsRequests/ContractCallRequest.tsx b/src/app/components/transactionsRequests/ContractCallRequest.tsx
index 8d06e861e..93e4cfa8a 100644
--- a/src/app/components/transactionsRequests/ContractCallRequest.tsx
+++ b/src/app/components/transactionsRequests/ContractCallRequest.tsx
@@ -342,6 +342,9 @@ export default function ContractCallRequest({
     }
   };
   const cancelCallback = () => {
+    if (messageId === 'velar') {
+      return navigate(-1);
+    }
     if (tabId && messageId) {
       sendUserRejectionMessage({ tabId, messageId });
     } else {

From 65360f0c08c05150b7c2ce1afa7de758459fa401 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Eduard=20Bardaj=C3=AD=20Puig?= <ebardaji@gmail.com>
Date: Fri, 23 Aug 2024 17:10:29 +0200
Subject: [PATCH 019/227] Update perms handling in service worker

---
 package-lock.json                             | 15 +--
 package.json                                  |  2 +-
 .../components/permissionsManager/README.md   |  2 +-
 .../components/permissionsManager/index.tsx   | 39 +-------
 .../components/permissionsManager/schemas.ts  |  2 +-
 .../components/permissionsManager/types.ts    |  4 +-
 .../components/permissionsManager/utils.ts    | 72 ++++++++++++--
 src/background/background.ts                  | 66 ++++++++-----
 .../extensionToContentScript/utils/index.ts   |  8 +-
 .../rpc/btc/getAddresses/getAddresses.ts      | 82 +++++++++-------
 src/common/utils/rpc/btc/getBalance.ts        | 44 ++++-----
 src/common/utils/rpc/helpers.ts               | 12 +--
 .../utils/rpc/ordinals/getInscriptions.ts     |  8 +-
 .../utils/rpc/responseMessages/errors.ts      |  8 +-
 src/common/utils/rpc/runes/getBalance.ts      |  8 +-
 .../utils/rpc/stx/getAddresses/index.ts       | 96 +++++++++++--------
 src/common/utils/rpc/wallet/getWalletType.ts  | 38 +++-----
 .../utils/rpc/wallet/renouncePermissions.ts   | 18 ++--
 src/common/utils/safe.ts                      | 43 +++++++--
 19 files changed, 316 insertions(+), 251 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index adadede5e..001bc8050 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -122,7 +122,7 @@
         "tsc-files": "^1.1.4",
         "tsconfig-paths-webpack-plugin": "^4.0.0",
         "type-fest": "^2.19.0",
-        "typescript": "^5.5.3",
+        "typescript": "^5.5.4",
         "typescript-plugin-styled-components": "^3.0.0",
         "vite": "5.3.2",
         "vite-tsconfig-paths": "4.3.2",
@@ -13211,9 +13211,10 @@
       "integrity": "sha512-7uc1O8h1M1g0rArakJdf0uLRSSgFcYexrVoKo+bzJd32gd4gDy2L/Z+8/FjPnU9ydY3pEnVPtr9FyscYY60K1g=="
     },
     "node_modules/typescript": {
-      "version": "5.5.3",
-      "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.5.3.tgz",
-      "integrity": "sha512-/hreyEujaB0w76zKo6717l3L0o/qEUtRgdvUBvlkhoWeOVMjMuHNHk0BRBzikzuGDqNmPQbg5ifMEqsHLiIUcQ==",
+      "version": "5.5.4",
+      "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.5.4.tgz",
+      "integrity": "sha512-Mtq29sKDAEYP7aljRgtPOpTvOfbwRWlS6dPRzwjdE+C0R4brX/GUyhHSecbHMFLNBLcJIPt9nl9yG5TZ1weH+Q==",
+      "license": "Apache-2.0",
       "bin": {
         "tsc": "bin/tsc",
         "tsserver": "bin/tsserver"
@@ -23923,9 +23924,9 @@
       "integrity": "sha512-7uc1O8h1M1g0rArakJdf0uLRSSgFcYexrVoKo+bzJd32gd4gDy2L/Z+8/FjPnU9ydY3pEnVPtr9FyscYY60K1g=="
     },
     "typescript": {
-      "version": "5.5.3",
-      "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.5.3.tgz",
-      "integrity": "sha512-/hreyEujaB0w76zKo6717l3L0o/qEUtRgdvUBvlkhoWeOVMjMuHNHk0BRBzikzuGDqNmPQbg5ifMEqsHLiIUcQ=="
+      "version": "5.5.4",
+      "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.5.4.tgz",
+      "integrity": "sha512-Mtq29sKDAEYP7aljRgtPOpTvOfbwRWlS6dPRzwjdE+C0R4brX/GUyhHSecbHMFLNBLcJIPt9nl9yG5TZ1weH+Q=="
     },
     "typescript-plugin-styled-components": {
       "version": "3.0.0",
diff --git a/package.json b/package.json
index 1b9d671ad..621c4d5a8 100644
--- a/package.json
+++ b/package.json
@@ -151,7 +151,7 @@
     "tsc-files": "^1.1.4",
     "tsconfig-paths-webpack-plugin": "^4.0.0",
     "type-fest": "^2.19.0",
-    "typescript": "^5.5.3",
+    "typescript": "^5.5.4",
     "typescript-plugin-styled-components": "^3.0.0",
     "vite": "5.3.2",
     "vite-tsconfig-paths": "4.3.2",
diff --git a/src/app/components/permissionsManager/README.md b/src/app/components/permissionsManager/README.md
index 975d53de1..b7357d766 100644
--- a/src/app/components/permissionsManager/README.md
+++ b/src/app/components/permissionsManager/README.md
@@ -10,6 +10,6 @@ Permissions are granted per-account. A permissions request is processed in the c
 
 Permissions store: an object containing a version, and the relationships between clients, resources and permissions. Contains "store" in the name because this object is stored as a whole with `chrome.storage.local`
 
-A mutex is provided for environments where race-conditions could occur when mutating the permissions store.
+A mutex is provided for environments where race-conditions could occur when mutating the permissions store. Note that the mutex will only be valid within the code environment it is being used in, i.e., it won't prevent the background service worker and the extension popup from performing mutations at the same time. Given it is extremely improbable for a user to simultaneously trigger two mutation operations in separate environments, this is acceptable for now, and can be revisited if this changes.
 
 The exports available from [`utils.ts`](./utils.ts) can be used to perform all necessary permissions operations. When using them within a reactive context such as a React application, it is necessary to construct reactive helpers to ensure the app is using the latest store data available.
diff --git a/src/app/components/permissionsManager/index.tsx b/src/app/components/permissionsManager/index.tsx
index c96063fe2..997b105ed 100644
--- a/src/app/components/permissionsManager/index.tsx
+++ b/src/app/components/permissionsManager/index.tsx
@@ -6,13 +6,6 @@ import { permissionsStoreSchema, type Client, type Permission, type Resource } f
 import type { TPermissionsStoreContext, TPermissionsUtilsContext } from './types';
 import * as utils from './utils';
 
-function isStoreOutdatedError(error: Error): boolean {
-  return v.is(
-    v.array(v.object({ path: v.array(v.object({ key: v.literal('version') })) })),
-    error.cause,
-  );
-}
-
 const PermissionsStoreContext = createContext<TPermissionsStoreContext>({
   isLoading: true,
   error: undefined,
@@ -27,26 +20,9 @@ function PermissionsStoreProvider({ children }: { children: React.ReactNode }) {
 
   useEffect(() => {
     utils.permissionsStoreMutex.runExclusive(async () => {
-      const [e, loadedStore] = await utils.loadPermissionsStore();
+      const [e, store] = await utils.initPermissionsStore();
 
       if (e) {
-        if (isStoreOutdatedError(e)) {
-          // The store is outdated, we need to migrate it. For now we recreate a
-          // brand new store and overwrite the previous one. As the store
-          // becomes more complex, a more comprehensive migration may be
-          // required.
-          const newStore = utils.makePermissionsStore();
-          await utils.savePermissionsStore(newStore);
-          setValue({
-            isLoading: false,
-            error: undefined,
-            store: newStore,
-          });
-          return;
-        }
-
-        // For all other errors not related to an outdated store, we log the
-        // error and set the store to undefined.
         setValue({
           isLoading: false,
           error: e,
@@ -57,21 +33,10 @@ function PermissionsStoreProvider({ children }: { children: React.ReactNode }) {
         return;
       }
 
-      if (!loadedStore) {
-        const newStore = utils.makePermissionsStore();
-        await utils.savePermissionsStore(newStore);
-        setValue({
-          isLoading: false,
-          error: undefined,
-          store: newStore,
-        });
-        return;
-      }
-
       setValue({
         isLoading: false,
         error: undefined,
-        store: loadedStore,
+        store,
       });
     });
   }, []);
diff --git a/src/app/components/permissionsManager/schemas.ts b/src/app/components/permissionsManager/schemas.ts
index 070363150..5728b4fc2 100644
--- a/src/app/components/permissionsManager/schemas.ts
+++ b/src/app/components/permissionsManager/schemas.ts
@@ -105,4 +105,4 @@ export const permissionsStoreSchema = v.object({
 /**
  * @public
  */
-export type PermissionsStoreV1 = v.InferOutput<typeof permissionsStoreSchema>;
+export type PermissionsStore = v.InferOutput<typeof permissionsStoreSchema>;
diff --git a/src/app/components/permissionsManager/types.ts b/src/app/components/permissionsManager/types.ts
index e47c9c88e..72eb87c51 100644
--- a/src/app/components/permissionsManager/types.ts
+++ b/src/app/components/permissionsManager/types.ts
@@ -1,4 +1,4 @@
-import type { Client, Permission, PermissionsStoreV1, Resource } from './schemas';
+import type { Client, Permission, PermissionsStore, Resource } from './schemas';
 
 export type TPermissionsStoreContext<TError = unknown> =
   | {
@@ -7,7 +7,7 @@ export type TPermissionsStoreContext<TError = unknown> =
       store: undefined;
     }
   | { isLoading: false; error: TError; store: undefined }
-  | { isLoading: false; error: undefined; store: PermissionsStoreV1 };
+  | { isLoading: false; error: undefined; store: PermissionsStore };
 
 export type TPermissionsUtilsContext = {
   // Queries
diff --git a/src/app/components/permissionsManager/utils.ts b/src/app/components/permissionsManager/utils.ts
index a1c1d64e5..523c21ac3 100644
--- a/src/app/components/permissionsManager/utils.ts
+++ b/src/app/components/permissionsManager/utils.ts
@@ -1,4 +1,4 @@
-import { safePromise, type Result } from '@common/utils/safe';
+import { error, safePromise, success, type Result, type SafeError } from '@common/utils/safe';
 import storage from '@utils/chromeStorage';
 import { Mutex } from 'async-mutex';
 import { parse, stringify } from 'superjson';
@@ -9,7 +9,7 @@ import {
   type Client,
   type ClientsTable,
   type Permission,
-  type PermissionsStoreV1 as PermissionsStore,
+  type PermissionsStore,
   type PermissionsTable,
   type Resource,
   type ResourcesTable,
@@ -30,26 +30,39 @@ export function getClientPermission(
 ) {
   return [...permissions].find((p) => p.clientId === clientId && p.resourceId === resourceId);
 }
-export async function loadPermissionsStore(): Promise<Result<PermissionsStore | null>> {
-  const [error, persistedData] = await safePromise(
+export async function getPermissionsStore(): Promise<
+  Result<PermissionsStore, SafeError<'StorageRetrievalError' | 'StoreNotFoundError' | 'ParseError'>>
+> {
+  const [getItemError, persistedData] = await safePromise(
     storage.local.getItem(permissionsPersistantStoreKeyName),
   );
 
-  if (error) {
-    return [error, null];
+  if (getItemError) {
+    return error({
+      name: 'StorageRetrievalError',
+      message: 'Failed to retrieve permissions store from storage.',
+      data: getItemError,
+    });
   }
 
   if (!persistedData) {
-    return [null, null];
+    return error({
+      name: 'StoreNotFoundError',
+      message: 'Permissions store not found in storage.',
+    });
   }
 
   const hydrated = parse(persistedData);
   const parseResult = v.safeParse(permissionsStoreSchema, hydrated);
   if (!parseResult.success) {
-    return [new Error('Failed to parse permissions store.', { cause: parseResult.issues }), null];
+    return error({
+      name: 'ParseError',
+      message: 'Failed to parse permissions store.',
+      data: parseResult.issues,
+    });
   }
 
-  return [null, parseResult.output];
+  return success(parseResult.output);
 }
 
 /**
@@ -147,7 +160,7 @@ function makeResourcesTable() {
 function makePermissionsTable() {
   return new Set<Permission>();
 }
-export function makePermissionsStore(): PermissionsStore {
+function makePermissionsStore(): PermissionsStore {
   return {
     version: 2,
     clients: makeClientsTable(),
@@ -155,4 +168,43 @@ export function makePermissionsStore(): PermissionsStore {
     permissions: makePermissionsTable(),
   };
 }
+
+/**
+ * Loads the permissions store, and creates or migrates it to the latest version
+ * if necessary. Since this operation may result in the store being mutated, it
+ * should be called within a mutex.
+ */
+export async function initPermissionsStore(): Promise<Result<PermissionsStore>> {
+  const [getStoreError, store] = await getPermissionsStore();
+
+  if (getStoreError) {
+    if (getStoreError.name === 'ParseError') {
+      // The store is outdated and needs to be migrated. For now, the store is
+      // migrated by creating a new store using the current schema and
+      // overwriting the previous one. As the store becomes more complex, a more
+      // comprehensive migration may be required.
+      const newStore = makePermissionsStore();
+      await savePermissionsStore(newStore);
+      return success(newStore);
+    }
+
+    if (getStoreError.name === 'StoreNotFoundError') {
+      // The store doesn't exist yet, so we create a new one.
+      const newStore = makePermissionsStore();
+      await savePermissionsStore(newStore);
+      return success(newStore);
+    }
+
+    return error({
+      name: 'InitError',
+      message: 'Failed to initialize permissions store.',
+      data: getStoreError,
+    });
+  }
+
+  return success(store);
+}
+/**
+ * This mutex is intended to be used when mutating the permissions store.
+ */
 export const permissionsStoreMutex = new Mutex();
diff --git a/src/background/background.ts b/src/background/background.ts
index 74b9a13ca..4db6eec8b 100755
--- a/src/background/background.ts
+++ b/src/background/background.ts
@@ -3,39 +3,53 @@ import { CONTENT_SCRIPT_PORT } from '@common/types/message-types';
 import { handleLegacyExternalMethodFormat } from '@common/utils/legacy-external-message-handler';
 import internalBackgroundMessageHandler from '@common/utils/messageHandlers';
 import handleRPCRequest from '@common/utils/rpc';
+import { initPermissionsStore, permissionsStoreMutex } from '@components/permissionsManager/utils';
 import { rpcRequestMessageSchema } from '@sats-connect/core';
 import * as v from 'valibot';
 
-// Listen for connection to the content-script - port for two-way communication
-chrome.runtime.onConnect.addListener((port) => {
-  if (port.name !== CONTENT_SCRIPT_PORT) return;
-  port.onMessage.addListener((message, messagingPort) => {
-    const parseResult = v.safeParse(rpcRequestMessageSchema, message);
+async function init() {
+  const [error] = await permissionsStoreMutex.runExclusive(initPermissionsStore);
+  if (error) {
+    // eslint-disable-next-line no-console
+    console.error('Failed to load permissions store:', error);
+  }
 
-    if (!parseResult.success) {
-      // Assume it's a legacy message when parsing fails.
-      handleLegacyExternalMethodFormat(message, messagingPort);
-      return;
-    }
+  // Listen for connection to the content-script - port for two-way communication
+  chrome.runtime.onConnect.addListener((port) => {
+    if (port.name !== CONTENT_SCRIPT_PORT) return;
+    port.onMessage.addListener((message, messagingPort) => {
+      const parseResult = v.safeParse(rpcRequestMessageSchema, message);
 
-    handleRPCRequest(parseResult.output, port);
+      if (!parseResult.success) {
+        // Assume it's a legacy message when parsing fails.
+        handleLegacyExternalMethodFormat(message, messagingPort);
+        return;
+      }
+
+      handleRPCRequest(parseResult.output, port);
+    });
   });
-});
 
-chrome.runtime.onMessage.addListener((message, sender, sendResponse) => {
-  void internalBackgroundMessageHandler(message, sender, sendResponse);
-  // Listener fn must return `true` to indicate the response will be async
-  return true;
-});
+  chrome.runtime.onMessage.addListener((message, sender, sendResponse) => {
+    void internalBackgroundMessageHandler(message, sender, sendResponse);
+    // Listener fn must return `true` to indicate the response will be async
+    return true;
+  });
 
-chrome.runtime.onInstalled.addListener((details) => {
-  if (details.reason === 'install') {
-    chrome.tabs.create({ url: chrome.runtime.getURL('options.html#/landing') });
-  }
-});
+  chrome.runtime.onInstalled.addListener((details) => {
+    if (details.reason === 'install') {
+      chrome.tabs.create({ url: chrome.runtime.getURL('options.html#/landing') });
+    }
+  });
 
-if (process.env.WALLET_LABEL) {
-  chrome.action.setBadgeText({ text: process.env.WALLET_LABEL });
-} else if (process.env.NODE_ENV === 'development') {
-  chrome.action.setBadgeText({ text: 'DEV' });
+  if (process.env.WALLET_LABEL) {
+    chrome.action.setBadgeText({ text: process.env.WALLET_LABEL });
+  } else if (process.env.NODE_ENV === 'development') {
+    chrome.action.setBadgeText({ text: 'DEV' });
+  }
 }
+
+await init().catch((e) => {
+  // eslint-disable-next-line no-console
+  console.error('Failed to initialize background script:', e);
+});
diff --git a/src/common/utils/messages/extensionToContentScript/utils/index.ts b/src/common/utils/messages/extensionToContentScript/utils/index.ts
index 13e6205c6..aa258fda1 100644
--- a/src/common/utils/messages/extensionToContentScript/utils/index.ts
+++ b/src/common/utils/messages/extensionToContentScript/utils/index.ts
@@ -1,5 +1,5 @@
 import type { Permission } from '@components/permissionsManager/schemas';
-import { loadPermissionsStore } from '@components/permissionsManager/utils';
+import { getPermissionsStore } from '@components/permissionsManager/utils';
 import { type ContentScriptMessage } from '../schemas';
 
 /**
@@ -37,7 +37,7 @@ function clientOriginToUrlMatchPattern(tabOrigin: string) {
  * @public
  */
 export async function sendMessageConnectedClient(id: string, message: ContentScriptMessage) {
-  const [error, store] = await loadPermissionsStore();
+  const [error, store] = await getPermissionsStore();
   if (error) {
     // eslint-disable-next-line no-console
     console.error('Failed to load permissions store:', error);
@@ -76,7 +76,7 @@ export async function sendMessageConnectedClient(id: string, message: ContentScr
  * @public
  */
 export async function sendMessageConnectedClients(message: ContentScriptMessage) {
-  const [error, store] = await loadPermissionsStore();
+  const [error, store] = await getPermissionsStore();
   if (error) {
     // eslint-disable-next-line no-console
     console.error('Failed to load permissions store:', error);
@@ -111,7 +111,7 @@ export async function sendMessageAuthorizedConnectedClients(
   permission: Omit<Permission, 'clientId'>,
   message: ContentScriptMessage,
 ) {
-  const [error, store] = await loadPermissionsStore();
+  const [error, store] = await getPermissionsStore();
   if (error) {
     // eslint-disable-next-line no-console
     console.error('Failed to load permissions store:', error);
diff --git a/src/common/utils/rpc/btc/getAddresses/getAddresses.ts b/src/common/utils/rpc/btc/getAddresses/getAddresses.ts
index 7ccb8e375..95df6e2f1 100644
--- a/src/common/utils/rpc/btc/getAddresses/getAddresses.ts
+++ b/src/common/utils/rpc/btc/getAddresses/getAddresses.ts
@@ -2,59 +2,73 @@
 import { getTabIdFromPort } from '@common/utils';
 import getSelectedAccount from '@common/utils/getSelectedAccount';
 import { makeContext, openPopup } from '@common/utils/popup';
+import * as utils from '@components/permissionsManager/utils';
 import { getAddressesRequestMessageSchema, type RpcRequestMessage } from '@sats-connect/core';
 import rootStore from '@stores/index';
 import * as v from 'valibot';
 import RequestsRoutes from '../../../route-urls';
 import { handleInvalidMessage } from '../../handle-invalid-message';
-import { hasPermissions, makeSendPopupClosedUserRejectionMessage } from '../../helpers';
+import { hasAccountReadPermissions, makeSendPopupClosedUserRejectionMessage } from '../../helpers';
 import { sendGetAddressesSuccessResponseMessage } from '../../responseMessages/bitcoin';
+import { sendInternalErrorMessage } from '../../responseMessages/errors';
 import { accountPurposeAddresses } from './utils';
 
 export const handleGetAddresses = async (message: RpcRequestMessage, port: chrome.runtime.Port) => {
   const parseResult = v.safeParse(getAddressesRequestMessageSchema, message);
-
   if (!parseResult.success) {
     handleInvalidMessage(message, getTabIdFromPort(port), parseResult.issues);
     return;
   }
 
   const { origin, tabId } = makeContext(port);
-  if (await hasPermissions(origin)) {
-    const {
-      selectedAccountIndex,
-      selectedAccountType,
-      accountsList: softwareAccountsList,
-      ledgerAccountsList,
-    } = rootStore.store.getState().walletState;
-
-    const account = getSelectedAccount({
-      selectedAccountIndex,
-      selectedAccountType,
-      softwareAccountsList,
-      ledgerAccountsList,
+
+  const [error, store] = await utils.getPermissionsStore();
+  if (error) {
+    sendInternalErrorMessage({
+      tabId,
+      messageId: parseResult.output.id,
+      message: 'Error loading permissions store.',
     });
+    return;
+  }
 
-    if (account) {
-      const addresses = accountPurposeAddresses(account, parseResult.output.params.purposes);
-      sendGetAddressesSuccessResponseMessage({
-        tabId,
-        messageId: message.id,
-        result: {
-          addresses,
-        },
-      });
-      return;
-    }
+  if (!hasAccountReadPermissions(origin, store)) {
+    await openPopup({
+      path: RequestsRoutes.AddressRequest,
+      data: parseResult.output,
+      context: makeContext(port),
+      onClose: makeSendPopupClosedUserRejectionMessage({
+        tabId: getTabIdFromPort(port),
+        messageId: parseResult.output.id,
+      }),
+    });
   }
 
-  await openPopup({
-    path: RequestsRoutes.AddressRequest,
-    data: parseResult.output,
-    context: makeContext(port),
-    onClose: makeSendPopupClosedUserRejectionMessage({
-      tabId: getTabIdFromPort(port),
-      messageId: parseResult.output.id,
-    }),
+  const {
+    selectedAccountIndex,
+    selectedAccountType,
+    accountsList: softwareAccountsList,
+    ledgerAccountsList,
+  } = rootStore.store.getState().walletState;
+
+  const account = getSelectedAccount({
+    selectedAccountIndex,
+    selectedAccountType,
+    softwareAccountsList,
+    ledgerAccountsList,
+  });
+
+  if (!account) {
+    sendInternalErrorMessage({ tabId, messageId: parseResult.output.id });
+    return;
+  }
+
+  const addresses = accountPurposeAddresses(account, parseResult.output.params.purposes);
+  sendGetAddressesSuccessResponseMessage({
+    tabId,
+    messageId: message.id,
+    result: {
+      addresses,
+    },
   });
 };
diff --git a/src/common/utils/rpc/btc/getBalance.ts b/src/common/utils/rpc/btc/getBalance.ts
index 305f39768..55e8d3b75 100644
--- a/src/common/utils/rpc/btc/getBalance.ts
+++ b/src/common/utils/rpc/btc/getBalance.ts
@@ -2,13 +2,13 @@ import { getTabIdFromPort } from '@common/utils';
 import getSelectedAccount from '@common/utils/getSelectedAccount';
 import { makeContext } from '@common/utils/popup';
 import { safePromise, type Result } from '@common/utils/safe';
-import { makeAccountResourceId } from '@components/permissionsManager/resources';
 import * as utils from '@components/permissionsManager/utils';
 import { getBalanceRequestMessageSchema, type RpcRequestMessage } from '@sats-connect/core';
 import { BitcoinEsploraApiProvider, type NetworkType } from '@secretkeylabs/xverse-core';
 import rootStore from '@stores/index';
 import * as v from 'valibot';
 import { handleInvalidMessage } from '../handle-invalid-message';
+import { hasAccountReadPermissions } from '../helpers';
 import { sendGetBalanceSuccessResponseMessage } from '../responseMessages/bitcoin';
 import {
   sendAccessDeniedResponseMessage,
@@ -47,21 +47,24 @@ async function getBalance(
 
 const handleGetBalance = async (message: RpcRequestMessage, port: chrome.runtime.Port) => {
   const parseResult = v.safeParse(getBalanceRequestMessageSchema, message);
-
   if (!parseResult.success) {
     handleInvalidMessage(message, getTabIdFromPort(port), parseResult.issues);
     return;
   }
 
   const { origin, tabId } = makeContext(port);
-  const [error, store] = await utils.loadPermissionsStore();
 
+  const [error, store] = await utils.getPermissionsStore();
   if (error) {
-    sendInternalErrorMessage({ tabId, messageId: parseResult.output.id });
+    sendInternalErrorMessage({
+      tabId,
+      messageId: parseResult.output.id,
+      message: 'Error loading permissions store.',
+    });
     return;
   }
 
-  if (!store) {
+  if (!hasAccountReadPermissions(origin, store)) {
     sendAccessDeniedResponseMessage({ tabId, messageId: parseResult.output.id });
     return;
   }
@@ -74,41 +77,26 @@ const handleGetBalance = async (message: RpcRequestMessage, port: chrome.runtime
     network,
   } = rootStore.store.getState().walletState;
 
-  const existingAccount = getSelectedAccount({
+  const account = getSelectedAccount({
     selectedAccountIndex,
     selectedAccountType,
     softwareAccountsList,
     ledgerAccountsList,
   });
 
-  if (!existingAccount) {
+  if (!account) {
     sendInternalErrorMessage({ tabId, messageId: parseResult.output.id });
     return;
   }
 
-  const permission = utils.getClientPermission(
-    store.permissions,
-    origin,
-    makeAccountResourceId({
-      accountId: selectedAccountIndex,
-      networkType: network.type,
-      masterPubKey: existingAccount.masterPubKey,
-    }),
-  );
-  if (!permission) {
-    sendAccessDeniedResponseMessage({ tabId, messageId: parseResult.output.id });
-    return;
-  }
-
-  if (!permission.actions.has('read')) {
-    sendAccessDeniedResponseMessage({ tabId, messageId: parseResult.output.id });
-    return;
-  }
-
-  const address = existingAccount.btcAddress;
+  const address = account.btcAddress;
   const [getBalanceError, balances] = await getBalance(address, network.type);
   if (getBalanceError) {
-    sendInternalErrorMessage({ tabId, messageId: parseResult.output.id });
+    sendInternalErrorMessage({
+      tabId,
+      messageId: parseResult.output.id,
+      message: 'Error retrieving balance.',
+    });
     return;
   }
 
diff --git a/src/common/utils/rpc/helpers.ts b/src/common/utils/rpc/helpers.ts
index 425c7bc67..a602590e2 100644
--- a/src/common/utils/rpc/helpers.ts
+++ b/src/common/utils/rpc/helpers.ts
@@ -1,5 +1,6 @@
 import { MESSAGE_SOURCE } from '@common/types/message-types';
 import { makeAccountResourceId } from '@components/permissionsManager/resources';
+import type { PermissionsStore } from '@components/permissionsManager/schemas';
 import * as utils from '@components/permissionsManager/utils';
 import {
   RpcErrorCode,
@@ -55,16 +56,7 @@ export function makeSendPopupClosedUserRejectionMessage({
   };
 }
 
-export async function hasPermissions(origin: string): Promise<boolean> {
-  const [error, store] = await utils.loadPermissionsStore();
-  if (error) {
-    return false;
-  }
-
-  if (!store) {
-    return false;
-  }
-
+export function hasAccountReadPermissions(origin: string, store: PermissionsStore): boolean {
   const {
     selectedAccountIndex,
     selectedAccountType,
diff --git a/src/common/utils/rpc/ordinals/getInscriptions.ts b/src/common/utils/rpc/ordinals/getInscriptions.ts
index ba4c1d10e..924ff7222 100644
--- a/src/common/utils/rpc/ordinals/getInscriptions.ts
+++ b/src/common/utils/rpc/ordinals/getInscriptions.ts
@@ -22,10 +22,14 @@ const handleGetInscriptions = async (message: RpcRequestMessage, port: chrome.ru
     return;
   }
   const { origin, tabId } = makeContext(port);
-  const [loadError, store] = await utils.loadPermissionsStore();
+  const [loadError, store] = await utils.getPermissionsStore();
 
   if (loadError) {
-    sendInternalErrorMessage({ tabId, messageId: message.id });
+    sendInternalErrorMessage({
+      tabId,
+      messageId: message.id,
+      message: 'Error loading permissions store.',
+    });
     return;
   }
 
diff --git a/src/common/utils/rpc/responseMessages/errors.ts b/src/common/utils/rpc/responseMessages/errors.ts
index b57b002c1..0095fc746 100644
--- a/src/common/utils/rpc/responseMessages/errors.ts
+++ b/src/common/utils/rpc/responseMessages/errors.ts
@@ -61,12 +61,16 @@ export function sendAddressMismatchMessage({ tabId, messageId }: BaseArgs) {
   );
 }
 
-export function sendInternalErrorMessage({ tabId, messageId }: BaseArgs) {
+export function sendInternalErrorMessage({
+  tabId,
+  messageId,
+  message,
+}: BaseArgs & { message?: string }) {
   sendRpcResponse(
     tabId,
     makeRPCError(messageId, {
       code: RpcErrorCode.INTERNAL_ERROR,
-      message: 'Internal error.',
+      message: message ?? 'Internal error.',
     }),
   );
 }
diff --git a/src/common/utils/rpc/runes/getBalance.ts b/src/common/utils/rpc/runes/getBalance.ts
index a867aa862..cef30dcb0 100644
--- a/src/common/utils/rpc/runes/getBalance.ts
+++ b/src/common/utils/rpc/runes/getBalance.ts
@@ -26,10 +26,14 @@ const handleGetRunesBalance = async (message: RpcRequestMessage, port: chrome.ru
     return;
   }
   const { origin, tabId } = makeContext(port);
-  const [loadError, store] = await utils.loadPermissionsStore();
+  const [loadError, store] = await utils.getPermissionsStore();
 
   if (loadError) {
-    sendInternalErrorMessage({ tabId, messageId: message.id });
+    sendInternalErrorMessage({
+      tabId,
+      messageId: message.id,
+      message: 'Error loading permissions store.',
+    });
     return;
   }
 
diff --git a/src/common/utils/rpc/stx/getAddresses/index.ts b/src/common/utils/rpc/stx/getAddresses/index.ts
index 258f6f49d..e5cc12b68 100644
--- a/src/common/utils/rpc/stx/getAddresses/index.ts
+++ b/src/common/utils/rpc/stx/getAddresses/index.ts
@@ -1,6 +1,7 @@
 import { type WebBtcMessage } from '@common/types/message-types';
 import getSelectedAccount from '@common/utils/getSelectedAccount';
 import { makeContext } from '@common/utils/popup';
+import * as utils from '@components/permissionsManager/utils';
 import { AddressPurpose, AddressType, RpcErrorCode } from '@sats-connect/core';
 import rootStore from '@stores/index';
 import {
@@ -9,7 +10,11 @@ import {
   triggerRequestWindowOpen,
 } from '../../../legacy-external-message-handler';
 import RequestsRoutes from '../../../route-urls';
-import { hasPermissions, makeRPCError } from '../../helpers';
+import { hasAccountReadPermissions, makeRPCError } from '../../helpers';
+import {
+  sendAccessDeniedResponseMessage,
+  sendInternalErrorMessage,
+} from '../../responseMessages/errors';
 import { sendGetAddressesSuccessResponseMessage } from '../../responseMessages/stacks';
 
 const handleGetStxAddresses = async (
@@ -20,52 +25,65 @@ const handleGetStxAddresses = async (
     messageId: String(message.id),
     rpcMethod: 'stx_getAddresses',
   };
-
   const { origin, tabId } = makeContext(port);
-  if (await hasPermissions(origin)) {
-    const {
-      selectedAccountIndex,
-      selectedAccountType,
-      accountsList: softwareAccountsList,
-      ledgerAccountsList,
-    } = rootStore.store.getState().walletState;
 
-    const account = getSelectedAccount({
-      selectedAccountIndex,
-      selectedAccountType,
-      softwareAccountsList,
-      ledgerAccountsList,
+  const [error, store] = await utils.getPermissionsStore();
+  if (error) {
+    sendInternalErrorMessage({
+      tabId,
+      messageId: message.id,
+      message: 'Error loading permissions store.',
     });
+    return;
+  }
 
-    if (account) {
-      sendGetAddressesSuccessResponseMessage({
-        tabId,
-        messageId: message.id,
-        result: {
-          addresses: [
-            {
-              address: account.stxAddress,
-              publicKey: account.stxPublicKey,
-              addressType: AddressType.stacks,
-              purpose: AddressPurpose.Stacks,
-            },
-          ],
-        },
-      });
-      return;
-    }
+  if (!hasAccountReadPermissions(origin, store)) {
+    sendAccessDeniedResponseMessage({ tabId, messageId: message.id });
+    return;
   }
 
-  const { urlParams } = makeSearchParamsWithDefaults(port, popupParams);
+  const {
+    selectedAccountIndex,
+    selectedAccountType,
+    accountsList: softwareAccountsList,
+    ledgerAccountsList,
+  } = rootStore.store.getState().walletState;
+
+  const account = getSelectedAccount({
+    selectedAccountIndex,
+    selectedAccountType,
+    softwareAccountsList,
+    ledgerAccountsList,
+  });
 
-  const { id } = await triggerRequestWindowOpen(RequestsRoutes.StxAddressRequest, urlParams);
-  listenForPopupClose({
+  if (!account) {
+    const { urlParams } = makeSearchParamsWithDefaults(port, popupParams);
+
+    const { id } = await triggerRequestWindowOpen(RequestsRoutes.StxAddressRequest, urlParams);
+    listenForPopupClose({
+      tabId,
+      id,
+      response: makeRPCError(message.id, {
+        code: RpcErrorCode.USER_REJECTION,
+        message: 'User rejected request to get addresses',
+      }),
+    });
+    return;
+  }
+
+  sendGetAddressesSuccessResponseMessage({
     tabId,
-    id,
-    response: makeRPCError(message.id, {
-      code: RpcErrorCode.USER_REJECTION,
-      message: 'User rejected request to get addresses',
-    }),
+    messageId: message.id,
+    result: {
+      addresses: [
+        {
+          address: account.stxAddress,
+          publicKey: account.stxPublicKey,
+          addressType: AddressType.stacks,
+          purpose: AddressPurpose.Stacks,
+        },
+      ],
+    },
   });
 };
 
diff --git a/src/common/utils/rpc/wallet/getWalletType.ts b/src/common/utils/rpc/wallet/getWalletType.ts
index 56801e62e..a8a3fb9af 100644
--- a/src/common/utils/rpc/wallet/getWalletType.ts
+++ b/src/common/utils/rpc/wallet/getWalletType.ts
@@ -2,12 +2,12 @@
 import { getTabIdFromPort } from '@common/utils';
 import getSelectedAccount from '@common/utils/getSelectedAccount';
 import { makeContext } from '@common/utils/popup';
-import { makeAccountResourceId } from '@components/permissionsManager/resources';
 import * as utils from '@components/permissionsManager/utils';
 import { getWalletTypeRequestMessageSchema, type RpcRequestMessage } from '@sats-connect/core';
 import rootStore from '@stores/index';
 import * as v from 'valibot';
 import { handleInvalidMessage } from '../handle-invalid-message';
+import { hasAccountReadPermissions } from '../helpers';
 import {
   sendAccessDeniedResponseMessage,
   sendInternalErrorMessage,
@@ -19,21 +19,24 @@ export const handleGetWalletType = async (
   port: chrome.runtime.Port,
 ) => {
   const parseResult = v.safeParse(getWalletTypeRequestMessageSchema, message);
-
   if (!parseResult.success) {
     handleInvalidMessage(message, getTabIdFromPort(port), parseResult.issues);
     return;
   }
 
   const { origin, tabId } = makeContext(port);
-  const [error, store] = await utils.loadPermissionsStore();
 
+  const [error, store] = await utils.getPermissionsStore();
   if (error) {
-    sendInternalErrorMessage({ tabId, messageId: parseResult.output.id });
+    sendInternalErrorMessage({
+      tabId,
+      messageId: parseResult.output.id,
+      message: 'Error loading permissions store.',
+    });
     return;
   }
 
-  if (!store) {
+  if (!hasAccountReadPermissions(origin, store)) {
     sendAccessDeniedResponseMessage({ tabId, messageId: parseResult.output.id });
     return;
   }
@@ -43,42 +46,23 @@ export const handleGetWalletType = async (
     selectedAccountType,
     accountsList: softwareAccountsList,
     ledgerAccountsList,
-    network,
   } = rootStore.store.getState().walletState;
 
-  const existingAccount = getSelectedAccount({
+  const account = getSelectedAccount({
     selectedAccountIndex,
     selectedAccountType,
     softwareAccountsList,
     ledgerAccountsList,
   });
 
-  if (!existingAccount) {
+  if (!account) {
     sendInternalErrorMessage({ tabId, messageId: parseResult.output.id });
     return;
   }
 
-  const permission = utils.getClientPermission(
-    store.permissions,
-    origin,
-    makeAccountResourceId({
-      accountId: selectedAccountIndex,
-      networkType: network.type,
-      masterPubKey: existingAccount.masterPubKey,
-    }),
-  );
-  if (!permission) {
-    sendAccessDeniedResponseMessage({ tabId, messageId: parseResult.output.id });
-    return;
-  }
-
-  if (!permission.actions.has('read')) {
-    sendAccessDeniedResponseMessage({ tabId, messageId: parseResult.output.id });
-  }
-
   sendGetWalletTypeSuccessResponseMessage({
     tabId,
     messageId: parseResult.output.id,
-    result: existingAccount.accountType ?? 'software',
+    result: account.accountType ?? 'software',
   });
 };
diff --git a/src/common/utils/rpc/wallet/renouncePermissions.ts b/src/common/utils/rpc/wallet/renouncePermissions.ts
index 1e4881ce6..33a5e683b 100644
--- a/src/common/utils/rpc/wallet/renouncePermissions.ts
+++ b/src/common/utils/rpc/wallet/renouncePermissions.ts
@@ -8,10 +8,7 @@ import {
 } from '@sats-connect/core';
 import * as v from 'valibot';
 import { handleInvalidMessage } from '../handle-invalid-message';
-import {
-  sendAccessDeniedResponseMessage,
-  sendInternalErrorMessage,
-} from '../responseMessages/errors';
+import { sendInternalErrorMessage } from '../responseMessages/errors';
 import { sendRenouncePermissionsSuccessResponseMessage } from '../responseMessages/wallet';
 
 export const handleRenouncePermissions = async (
@@ -26,15 +23,14 @@ export const handleRenouncePermissions = async (
   }
 
   const { origin, tabId } = makeContext(port);
-  const [error, store] = await utils.loadPermissionsStore();
+  const [error, store] = await utils.getPermissionsStore();
 
   if (error) {
-    sendInternalErrorMessage({ tabId, messageId: parseResult.output.id });
-    return;
-  }
-
-  if (!store) {
-    sendAccessDeniedResponseMessage({ tabId, messageId: parseResult.output.id });
+    sendInternalErrorMessage({
+      tabId,
+      messageId: parseResult.output.id,
+      message: 'Error loading permissions store.',
+    });
     return;
   }
 
diff --git a/src/common/utils/safe.ts b/src/common/utils/safe.ts
index 18296a156..5a03be77b 100644
--- a/src/common/utils/safe.ts
+++ b/src/common/utils/safe.ts
@@ -1,11 +1,40 @@
-type SuccessResult<T> = [null, T];
-type ErrorResult<E = Error> = [E, null];
-export type Result<T, E = Error> = SuccessResult<T> | ErrorResult<E>;
+/* eslint-disable @typescript-eslint/no-shadow */
 
-export async function safePromise<T>(promise: Promise<T>): Promise<Result<T, Error>> {
+// NOTE: The above rule is disabled due to the currently used version not
+// detecting modern Typescript syntax.
+
+export type SafeError<TName extends string = string, TData = unknown> = {
+  readonly name: TName;
+  readonly message: string;
+  readonly data?: TData;
+};
+
+type SuccessResult<Data = unknown> = [null, Data];
+type ErrorResult<Error extends SafeError = SafeError> = [Error, null];
+export type Result<Data = unknown, Error extends SafeError = SafeError> =
+  | SuccessResult<Data>
+  | ErrorResult<Error>;
+
+/**
+ * @public
+ */
+export function success<Data>(data: Data): Result<Data, never> {
+  return [null, data];
+}
+
+/**
+ * @public
+ */
+export function error<const E extends SafeError>(error: E): Result<never, E> {
+  return [error, null];
+}
+
+export async function safePromise<T>(
+  promise: Promise<T>,
+): Promise<Result<T, SafeError<'SafeError'>>> {
   try {
-    return [null, await promise];
-  } catch (error) {
-    return [new Error('Safe promise rejected.', { cause: error }), null];
+    return success(await promise);
+  } catch (e) {
+    return error({ name: 'SafeError', message: 'Promise rejected.', data: e });
   }
 }

From fe8ec2b603480f9fc377fadce9ea0c3c06b267ea Mon Sep 17 00:00:00 2001
From: GitHub Actions Bot <>
Date: Mon, 26 Aug 2024 14:33:38 +0000
Subject: [PATCH 020/227] release: v0.40.1

---
 package-lock.json | 4 ++--
 package.json      | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 001bc8050..142c5bdb1 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "xverse-web-extension",
-  "version": "0.40.0",
+  "version": "0.40.1",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "xverse-web-extension",
-      "version": "0.40.0",
+      "version": "0.40.1",
       "dependencies": {
         "@aryzing/superqs": "0.0.6",
         "@ledgerhq/hw-transport-webusb": "^6.27.13",
diff --git a/package.json b/package.json
index 621c4d5a8..f71f44a8e 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "xverse-web-extension",
   "description": "A Bitcoin wallet for Web3",
-  "version": "0.40.0",
+  "version": "0.40.1",
   "private": true,
   "engines": {
     "node": "^18.18.2"

From 33c5ff946fc4ada112f45a5697372a60cf9d052a Mon Sep 17 00:00:00 2001
From: jordankzf <jordan@secretkeylabs.com>
Date: Tue, 27 Aug 2024 09:29:20 +0800
Subject: [PATCH 021/227] Check for isStacksSwapsEnabled when currency is STX

---
 src/app/screens/coinDashboard/coinHeader.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/app/screens/coinDashboard/coinHeader.tsx b/src/app/screens/coinDashboard/coinHeader.tsx
index 7b69cfdfd..a523f9f35 100644
--- a/src/app/screens/coinDashboard/coinHeader.tsx
+++ b/src/app/screens/coinDashboard/coinHeader.tsx
@@ -174,7 +174,7 @@ export default function CoinHeader({ currency, fungibleToken }: Props) {
       (fungibleToken?.protocol === 'runes' ||
         (isStacksSwapsEnabled && fungibleToken?.protocol === 'stacks'))) ||
     currency === 'BTC' ||
-    currency === 'STX';
+    (currency === 'STX' && isStacksSwapsEnabled);
   const showSwaps = isCrossChainSwapsEnabled && isSwapEligibleCurrency;
 
   const navigateToSwaps = () => {

From 2f56a5aa91fc9d8afee49156091e31d47e6fc2ea Mon Sep 17 00:00:00 2001
From: jordankzf <jordan@secretkeylabs.com>
Date: Tue, 27 Aug 2024 09:29:34 +0800
Subject: [PATCH 022/227] Regenerate package-lock.json

---
 package-lock.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 56ea1036d..80a493dd7 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -2628,9 +2628,9 @@
       }
     },
     "node_modules/@zondax/ledger-stacks/node_modules/@types/node": {
-      "version": "18.19.45",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-18.19.45.tgz",
-      "integrity": "sha512-VZxPKNNhjKmaC1SUYowuXSRSMGyQGmQjvvA1xE4QZ0xce2kLtEhPDS+kqpCPBZYgqblCLQ2DAjSzmgCM5auvhA==",
+      "version": "18.19.46",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-18.19.46.tgz",
+      "integrity": "sha512-vnRgMS7W6cKa1/0G3/DTtQYpVrZ8c0Xm6UkLaVFrb9jtcVC3okokW09Ki1Qdrj9ISokszD69nY4WDLRlvHlhAA==",
       "dependencies": {
         "undici-types": "~5.26.4"
       }

From 1fee1b98f1a42ed99681dac41d9b506ac5e5462a Mon Sep 17 00:00:00 2001
From: jordankzf <jordan@secretkeylabs.com>
Date: Tue, 27 Aug 2024 09:29:46 +0800
Subject: [PATCH 023/227] Remove SwapStacksScreen

---
 src/app/routes/index.tsx                      |   5 -
 .../advanceSettings/index.tsx                 |  77 --------
 .../feesBlock/index.tsx                       |  37 ----
 .../functionBlock/index.tsx                   |  30 ---
 .../swap/swapStacksConfirmation/index.tsx     | 116 -----------
 .../routeBlock/index.tsx                      |  72 -------
 .../stxInfoBlock/index.tsx                    | 183 ------------------
 .../swapStacksConfirmation/useConfirmSwap.tsx | 130 -------------
 8 files changed, 650 deletions(-)
 delete mode 100644 src/app/screens/swap/swapStacksConfirmation/advanceSettings/index.tsx
 delete mode 100644 src/app/screens/swap/swapStacksConfirmation/feesBlock/index.tsx
 delete mode 100644 src/app/screens/swap/swapStacksConfirmation/functionBlock/index.tsx
 delete mode 100644 src/app/screens/swap/swapStacksConfirmation/index.tsx
 delete mode 100644 src/app/screens/swap/swapStacksConfirmation/routeBlock/index.tsx
 delete mode 100644 src/app/screens/swap/swapStacksConfirmation/stxInfoBlock/index.tsx
 delete mode 100644 src/app/screens/swap/swapStacksConfirmation/useConfirmSwap.tsx

diff --git a/src/app/routes/index.tsx b/src/app/routes/index.tsx
index ab5c39a67..7afaf70f3 100644
--- a/src/app/routes/index.tsx
+++ b/src/app/routes/index.tsx
@@ -76,7 +76,6 @@ import SignatureRequest from '@screens/signatureRequest';
 import SpeedUpTransactionScreen from '@screens/speedUpTransaction';
 import Stacking from '@screens/stacking';
 import SwapScreen from '@screens/swap';
-import SwapStacksConfirmation from '@screens/swap/swapStacksConfirmation';
 import TransactionRequest from '@screens/transactionRequest';
 import TransactionStatus from '@screens/transactionStatus';
 import TransferRunesRequest from '@screens/transferRunesRequest';
@@ -153,10 +152,6 @@ const router = createHashRouter([
         path: 'swap',
         element: <SwapScreen />,
       },
-      {
-        path: 'swap-stacks-confirm',
-        element: <SwapStacksConfirmation />,
-      },
       {
         path: RoutePaths.ConfirmStacksTransaction,
         element: <ConfirmStxTransaction />,
diff --git a/src/app/screens/swap/swapStacksConfirmation/advanceSettings/index.tsx b/src/app/screens/swap/swapStacksConfirmation/advanceSettings/index.tsx
deleted file mode 100644
index 06d2ecb2a..000000000
--- a/src/app/screens/swap/swapStacksConfirmation/advanceSettings/index.tsx
+++ /dev/null
@@ -1,77 +0,0 @@
-/* eslint-disable import/prefer-default-export */
-import SettingIcon from '@assets/img/dashboard/faders_horizontal.svg';
-import TransactionSettingAlert from '@components/transactionSetting';
-import { type SwapConfirmationOutput } from '@screens/swap/swapStacksConfirmation/useConfirmSwap';
-import { microstacksToStx, stxToMicrostacks } from '@secretkeylabs/xverse-core';
-import BigNumber from 'bignumber.js';
-import { useCallback, useState } from 'react';
-import { useTranslation } from 'react-i18next';
-import styled from 'styled-components';
-
-const Button = styled.button((props) => ({
-  display: 'flex',
-  flexDirection: 'row',
-  alignItems: 'center',
-  borderRadius: props.theme.radius(1),
-  backgroundColor: 'transparent',
-  width: '100%',
-  marginTop: props.theme.spacing(10),
-}));
-
-const ButtonText = styled.div((props) => ({
-  ...props.theme.body_medium_m,
-  color: props.theme.colors.white_0,
-  textAlign: 'center',
-}));
-
-const ButtonImage = styled.img((props) => ({
-  marginRight: props.theme.spacing(3),
-  alignSelf: 'center',
-  transform: 'all',
-}));
-
-type Props = {
-  swap: SwapConfirmationOutput;
-};
-
-export function AdvanceSettings({ swap }: Props) {
-  const [showModal, setShowModal] = useState(false);
-  const [showFeeSettings, setShowFeeSettings] = useState(false);
-
-  const onApplyClick = useCallback(({ fee, nonce }: { fee: string; nonce?: string }) => {
-    const settingFee = BigInt(stxToMicrostacks(new BigNumber(fee) as any).toString());
-    swap.onFeeUpdate(settingFee);
-    if (nonce != null) {
-      swap.unsignedTx.setNonce(BigInt(nonce));
-    }
-    setShowModal(false);
-  }, []);
-  const { t } = useTranslation('translation', { keyPrefix: 'SWAP_CONFIRM_SCREEN' });
-  return (
-    <>
-      <Button onClick={() => setShowModal(true)}>
-        <>
-          <ButtonImage src={SettingIcon} />
-          <ButtonText>{t('ADVANCED_SETTING')}</ButtonText>
-        </>
-      </Button>
-      <TransactionSettingAlert
-        visible={showModal}
-        fee={microstacksToStx(
-          new BigNumber(
-            (swap.unsignedTx.auth?.spendingCondition?.fee ?? BigInt(0)).toString(),
-          ) as any,
-        ).toString()}
-        type="STX"
-        nonce={(swap.unsignedTx.auth?.spendingCondition?.nonce ?? BigInt(0)).toString()}
-        onCrossClick={() => {
-          setShowModal(false);
-          setShowFeeSettings(false);
-        }}
-        onApplyClick={onApplyClick}
-        showFeeSettings={showFeeSettings}
-        setShowFeeSettings={setShowFeeSettings}
-      />
-    </>
-  );
-}
diff --git a/src/app/screens/swap/swapStacksConfirmation/feesBlock/index.tsx b/src/app/screens/swap/swapStacksConfirmation/feesBlock/index.tsx
deleted file mode 100644
index a424bbf01..000000000
--- a/src/app/screens/swap/swapStacksConfirmation/feesBlock/index.tsx
+++ /dev/null
@@ -1,37 +0,0 @@
-import useWalletSelector from '@hooks/useWalletSelector';
-import { Container, TitleText } from '@screens/swap/swapStacksConfirmation/stxInfoBlock';
-import { EstimateUSDText } from '@screens/swap/swapTokenBlock';
-import { currencySymbolMap } from '@secretkeylabs/xverse-core';
-import { useTranslation } from 'react-i18next';
-import styled from 'styled-components';
-
-const RowContainer = styled.div({
-  display: 'flex',
-  alignItems: 'center',
-  justifyContent: 'space-between',
-});
-
-const FeeText = styled.p((props) => ({
-  ...props.theme.body_m,
-  fontSize: 14,
-  fontWeight: 500,
-}));
-
-interface FeeTextProps {
-  txFee: number;
-  txFeeFiatAmount?: number;
-}
-
-export default function FeesBlock({ txFee, txFeeFiatAmount }: FeeTextProps) {
-  const { t } = useTranslation('translation', { keyPrefix: 'SWAP_CONFIRM_SCREEN' });
-  const { fiatCurrency } = useWalletSelector();
-  return (
-    <Container>
-      <RowContainer>
-        <TitleText>{t('FEES')}</TitleText>
-        <FeeText>{`${txFee.toFixed(6)} STX`}</FeeText>
-      </RowContainer>
-      <EstimateUSDText>{` ~ ${currencySymbolMap[fiatCurrency]} ${txFeeFiatAmount} ${fiatCurrency}`}</EstimateUSDText>
-    </Container>
-  );
-}
diff --git a/src/app/screens/swap/swapStacksConfirmation/functionBlock/index.tsx b/src/app/screens/swap/swapStacksConfirmation/functionBlock/index.tsx
deleted file mode 100644
index 48f9e441a..000000000
--- a/src/app/screens/swap/swapStacksConfirmation/functionBlock/index.tsx
+++ /dev/null
@@ -1,30 +0,0 @@
-import {
-  Container,
-  TitleContainer,
-  TitleText,
-} from '@screens/swap/swapStacksConfirmation/stxInfoBlock';
-import { useTranslation } from 'react-i18next';
-import styled from 'styled-components';
-
-const FunctionName = styled.div((props) => ({
-  ...props.theme.body_medium_m,
-  marginLeft: 10,
-  color: props.theme.colors.white_0,
-  textAlign: 'right',
-}));
-
-interface FunctionBlockProps {
-  name: string;
-}
-
-export default function FunctionBlock({ name }: FunctionBlockProps) {
-  const { t } = useTranslation('translation', { keyPrefix: 'SWAP_CONFIRM_SCREEN' });
-  return (
-    <Container>
-      <TitleContainer>
-        <TitleText>{t('FUNCTION')}</TitleText>
-        <FunctionName>{name}</FunctionName>
-      </TitleContainer>
-    </Container>
-  );
-}
diff --git a/src/app/screens/swap/swapStacksConfirmation/index.tsx b/src/app/screens/swap/swapStacksConfirmation/index.tsx
deleted file mode 100644
index bf3a003f1..000000000
--- a/src/app/screens/swap/swapStacksConfirmation/index.tsx
+++ /dev/null
@@ -1,116 +0,0 @@
-import SponsoredTransactionIcon from '@assets/img/transactions/CircleWavyCheck.svg';
-import InfoContainer from '@components/infoContainer';
-import BottomBar from '@components/tabBar';
-import TopRow from '@components/topRow';
-import { Container } from '@screens/home/index.styled';
-import { AdvanceSettings } from '@screens/swap/swapStacksConfirmation/advanceSettings';
-import FeesBlock from '@screens/swap/swapStacksConfirmation/feesBlock';
-import FunctionBlock from '@screens/swap/swapStacksConfirmation/functionBlock';
-import RouteBlock from '@screens/swap/swapStacksConfirmation/routeBlock';
-import StxInfoBlock from '@screens/swap/swapStacksConfirmation/stxInfoBlock';
-import { useConfirmSwap } from '@screens/swap/swapStacksConfirmation/useConfirmSwap';
-import Button from '@ui-library/button';
-import { SUPPORT_URL_TAB_TARGET, SWAP_SPONSOR_DISABLED_SUPPORT_URL } from '@utils/constants';
-import { useCallback, useState } from 'react';
-import { useTranslation } from 'react-i18next';
-import { useLocation, useNavigate } from 'react-router-dom';
-import styled from 'styled-components';
-
-const TitleText = styled.div((props) => ({
-  fontSize: 21,
-  fontWeight: 700,
-  color: props.theme.colors.white_0,
-  marginBottom: props.theme.spacing(12),
-  marginTop: props.theme.spacing(12),
-}));
-
-const ButtonContainer = styled.div((props) => ({
-  display: 'flex',
-  flexDirection: 'row',
-  columnGap: props.theme.space.s,
-  marginTop: props.theme.space.m,
-  position: 'sticky',
-  bottom: 0,
-  background: props.theme.colors.elevation0,
-  padding: `${props.theme.space.s} 0`,
-}));
-
-const SponsoredTransactionText = styled.div((props) => ({
-  ...props.theme.typography.body_m,
-  color: props.theme.colors.white_200,
-  marginTop: props.theme.spacing(10),
-  display: 'flex',
-  gap: props.theme.spacing(4),
-}));
-
-const Icon = styled.img((props) => ({
-  marginTop: props.theme.spacing(1),
-  width: 24,
-  height: 24,
-}));
-
-const StyledInfoContainer = styled.div((props) => ({
-  marginBottom: props.theme.spacing(4),
-}));
-
-export default function SwapStacksConfirmation() {
-  const { t } = useTranslation('translation', { keyPrefix: 'SWAP_CONFIRM_SCREEN' });
-  const location = useLocation();
-  const navigate = useNavigate();
-  const swap = useConfirmSwap(location.state);
-
-  const handleGoBack = () => {
-    navigate(-1);
-  };
-
-  const [confirming, setConfirming] = useState(false);
-  const onConfirm = useCallback(() => {
-    setConfirming(true);
-    swap.onConfirm().finally(() => {
-      setConfirming(false);
-    });
-  }, [swap]);
-
-  const handleClickLearnMore = () => {
-    window.open(SWAP_SPONSOR_DISABLED_SUPPORT_URL, SUPPORT_URL_TAB_TARGET, 'noreferrer noopener');
-  };
-
-  return (
-    <>
-      <TopRow onClick={() => navigate(-1)} />
-      <Container>
-        <TitleText>{t('TOKEN_SWAP')}</TitleText>
-        {swap.isSponsorDisabled && (
-          <StyledInfoContainer>
-            <InfoContainer
-              bodyText={t('SWAP_TRANSACTION_CANNOT_BE_SPONSORED')}
-              type="Info"
-              redirectText={t('LEARN_MORE')}
-              onClick={handleClickLearnMore}
-            />
-          </StyledInfoContainer>
-        )}
-        <StxInfoBlock type="transfer" swap={swap} />
-        <StxInfoBlock type="receive" swap={swap} />
-        <FunctionBlock name={swap.functionName} />
-        <RouteBlock swap={swap} />
-        {!swap.isSponsored && (
-          <FeesBlock txFee={swap.txFeeAmount} txFeeFiatAmount={swap.txFeeFiatAmount} />
-        )}
-        {swap.isSponsored ? (
-          <SponsoredTransactionText>
-            <Icon src={SponsoredTransactionIcon} />
-            {t('THIS_IS_A_SPONSORED_TRANSACTION')}
-          </SponsoredTransactionText>
-        ) : (
-          <AdvanceSettings swap={swap} />
-        )}
-        <ButtonContainer>
-          <Button title={t('CANCEL')} variant="secondary" onClick={handleGoBack} />
-          <Button title={t('CONFIRM')} loading={confirming} onClick={onConfirm} />
-        </ButtonContainer>
-      </Container>
-      <BottomBar tab="dashboard" />
-    </>
-  );
-}
diff --git a/src/app/screens/swap/swapStacksConfirmation/routeBlock/index.tsx b/src/app/screens/swap/swapStacksConfirmation/routeBlock/index.tsx
deleted file mode 100644
index c0c40117f..000000000
--- a/src/app/screens/swap/swapStacksConfirmation/routeBlock/index.tsx
+++ /dev/null
@@ -1,72 +0,0 @@
-import TokenImage from '@components/tokenImage';
-import {
-  Container,
-  FoldButton,
-  TitleContainer,
-  TitleText,
-} from '@screens/swap/swapStacksConfirmation/stxInfoBlock';
-import type { SwapConfirmationOutput } from '@screens/swap/swapStacksConfirmation/useConfirmSwap';
-import { useState } from 'react';
-import { useTranslation } from 'react-i18next';
-import styled from 'styled-components';
-
-const RouteProgress = styled.div((props) => ({
-  position: 'relative',
-  display: 'flex',
-  alignItems: 'center',
-  justifyContent: 'space-between',
-  flex: 1,
-  marginTop: props.theme.spacing(8),
-  marginLeft: -props.theme.spacing(3.5),
-  marginRight: -props.theme.spacing(3.5),
-}));
-
-const DashLine = styled.div((props) => ({
-  borderTop: `1.5px dashed ${props.theme.colors.white_800}`,
-  width: '100%',
-  position: 'absolute',
-  left: 0,
-  top: 12,
-}));
-
-const ProgressItem = styled.div((props) => ({
-  display: 'flex',
-  flexDirection: 'column',
-  alignItems: 'center',
-  position: 'relative',
-  paddingRight: props.theme.spacing(3.5),
-  paddingLeft: props.theme.spacing(3.5),
-  background: props.theme.colors.elevation1,
-}));
-
-const ProgressItemText = styled.p((props) => ({
-  ...props.theme.body_m,
-  fontWeight: 400,
-  color: props.theme.colors.white_0,
-  marginTop: props.theme.spacing(4),
-}));
-
-export default function RouteBlock({ swap }: { swap: SwapConfirmationOutput }) {
-  const { t } = useTranslation('translation', { keyPrefix: 'SWAP_CONFIRM_SCREEN' });
-  const [isFold, setIsFold] = useState(false);
-  return (
-    <Container>
-      <TitleContainer>
-        <TitleText>{t('ROUTE')}</TitleText>
-        <FoldButton isFold={isFold} onSwitch={() => setIsFold((prev) => !prev)} />
-      </TitleContainer>
-      {isFold ? null : (
-        <RouteProgress>
-          <DashLine />
-          {swap.routers.map(({ name, image }) => (
-            <ProgressItem key={name}>
-              {/* eslint-disable-next-line react/jsx-props-no-spreading */}
-              <TokenImage {...image} size={24} />
-              <ProgressItemText>{name}</ProgressItemText>
-            </ProgressItem>
-          ))}
-        </RouteProgress>
-      )}
-    </Container>
-  );
-}
diff --git a/src/app/screens/swap/swapStacksConfirmation/stxInfoBlock/index.tsx b/src/app/screens/swap/swapStacksConfirmation/stxInfoBlock/index.tsx
deleted file mode 100644
index c92e086c7..000000000
--- a/src/app/screens/swap/swapStacksConfirmation/stxInfoBlock/index.tsx
+++ /dev/null
@@ -1,183 +0,0 @@
-import AddressIcon from '@assets/img/swap/address.svg';
-import CopyIcon from '@assets/img/swap/copy.svg';
-import FoldDownIcon from '@assets/img/swap/fold_arrow_down.svg';
-import FoldIconUp from '@assets/img/swap/fold_arrow_up.svg';
-import TokenImage from '@components/tokenImage';
-import type { SwapConfirmationOutput } from '@screens/swap/swapStacksConfirmation/useConfirmSwap';
-import { EstimateUSDText } from '@screens/swap/swapTokenBlock';
-import { getTruncatedAddress } from '@utils/helper';
-import { useCallback, useState } from 'react';
-import { useTranslation } from 'react-i18next';
-import { Tooltip } from 'react-tooltip';
-import styled from 'styled-components';
-
-export const Container = styled.div((props) => ({
-  display: 'flex',
-  flexDirection: 'column',
-  padding: props.theme.spacing(10),
-  marginBottom: props.theme.spacing(6),
-  background: props.theme.colors.elevation1,
-  borderRadius: 12,
-}));
-
-export const TitleContainer = styled.div(() => ({
-  display: 'flex',
-  flex: '1',
-  alignItems: 'center',
-  justifyContent: 'space-between',
-}));
-
-export const TitleText = styled.h3((props) => ({
-  ...props.theme.typography.body_medium_m,
-  color: props.theme.colors.white_200,
-  fontSize: 14,
-  fontWeight: 500,
-}));
-
-const FoldArrow = styled.img(() => ({
-  width: 14,
-  height: 14,
-  cursor: 'pointer',
-}));
-
-const DescriptionText = styled.h3((props) => ({
-  ...props.theme.typography.body_medium_m,
-  color: props.theme.colors.white_400,
-  fontSize: 14,
-  fontWeight: 500,
-  marginTop: props.theme.spacing(8),
-  marginBottom: props.theme.spacing(4),
-}));
-
-const AmountContainer = styled.div(() => ({
-  display: 'flex',
-  alignItems: 'center',
-  'flex-direction': 'column',
-}));
-
-const AmountLabel = styled.p((props) => ({
-  ...props.theme.typography.body_medium_m,
-  color: props.theme.colors.white_200,
-  fontSize: 14,
-  fontWeight: 500,
-  marginLeft: props.theme.spacing(5),
-}));
-
-const SpaceBetweenContainer = styled.div(() => ({
-  display: 'flex',
-  alignItems: 'center',
-  justifyContent: 'space-between',
-  width: '100%',
-}));
-
-const AddressImg = styled.img(() => ({
-  width: 32,
-  height: 32,
-}));
-
-const ItemsCenterContainer = styled.div(() => ({
-  display: 'flex',
-  alignItems: 'center',
-}));
-
-const AddressLabelText = styled.h3((props) => ({
-  ...props.theme.typography.body_medium_m,
-  color: props.theme.colors.white_200,
-  marginLeft: props.theme.spacing(5),
-}));
-
-const CopyButton = styled.div(() => ({
-  display: 'flex',
-  alignItems: 'center',
-  cursor: 'pointer',
-}));
-
-const CopyImg = styled.img(() => ({
-  width: 20,
-  height: 20,
-}));
-
-const AddressText = styled.p((props) => ({
-  ...props.theme.typography.body_medium_m,
-  marginRight: props.theme.spacing(4),
-}));
-
-const CurrencyText = styled.p((props) => ({
-  ...props.theme.typography.body_medium_m,
-  marginLeft: props.theme.spacing(4),
-}));
-
-const StyledTooltip = styled(Tooltip)`
-  background-color: ${(props) => props.theme.colors.white_0};
-  color: #12151e;
-  border-radius: 8px;
-  padding: 7px;
-`;
-
-interface StxInfoCardProps {
-  type: 'transfer' | 'receive';
-  swap: SwapConfirmationOutput;
-}
-
-export function FoldButton({ isFold, onSwitch }: { isFold: boolean; onSwitch: () => void }) {
-  return <FoldArrow src={isFold ? FoldDownIcon : FoldIconUp} onClick={() => onSwitch()} />;
-}
-
-export default function StxInfoBlock({ type, swap }: StxInfoCardProps) {
-  const { t } = useTranslation('translation', { keyPrefix: 'SWAP_CONFIRM_SCREEN' });
-  const [isCopied, setIsCopied] = useState(false);
-  const [isFold, setIsFold] = useState(false);
-  const copyId = `address-${type}`;
-  const onCopy = useCallback(async () => {
-    await navigator.clipboard.writeText(swap.address);
-    setIsCopied(true);
-  }, []);
-  const token = type === 'transfer' ? swap.fromToken : swap.toToken;
-  return (
-    <Container>
-      <TitleContainer>
-        <TitleText>
-          {type === 'transfer' ? t('YOU_WILL_TRANSFER') : t('YOU_WILL_RECEIVE')}
-        </TitleText>
-        <FoldButton isFold={isFold} onSwitch={() => setIsFold((prev) => !prev)} />
-      </TitleContainer>
-      {isFold ? null : (
-        <>
-          <DescriptionText>{t('LESS_THAN_OR_EQUAL_TO')}</DescriptionText>
-          <AmountContainer>
-            <SpaceBetweenContainer>
-              <ItemsCenterContainer>
-                {/* eslint-disable-next-line react/jsx-props-no-spreading */}
-                <TokenImage {...token.image} showProtocolIcon={false} />
-                <AmountLabel>{token.name}</AmountLabel>
-              </ItemsCenterContainer>
-              <ItemsCenterContainer>
-                <CurrencyText>{token.amount}</CurrencyText>
-                <CurrencyText>{token.name}</CurrencyText>
-              </ItemsCenterContainer>
-            </SpaceBetweenContainer>
-            <EstimateUSDText>{` ~ $${token.fiatAmount} USD`}</EstimateUSDText>
-          </AmountContainer>
-          <DescriptionText>{type === 'transfer' ? t('FROM') : t('TO')}</DescriptionText>
-          <SpaceBetweenContainer>
-            <ItemsCenterContainer>
-              <AddressImg src={AddressIcon} />
-              <AddressLabelText>{t('YOUR_ADDRESS')}</AddressLabelText>
-            </ItemsCenterContainer>
-            <CopyButton id={copyId} onClick={onCopy}>
-              <AddressText>{getTruncatedAddress(swap.address)}</AddressText>
-              <CopyImg src={CopyIcon} />
-            </CopyButton>
-            <StyledTooltip
-              anchorId={copyId}
-              variant="light"
-              content={isCopied ? t('COPIED') : t('COPY_YOUR_ADDRESS')}
-              events={['hover']}
-              place="top"
-            />
-          </SpaceBetweenContainer>
-        </>
-      )}
-    </Container>
-  );
-}
diff --git a/src/app/screens/swap/swapStacksConfirmation/useConfirmSwap.tsx b/src/app/screens/swap/swapStacksConfirmation/useConfirmSwap.tsx
deleted file mode 100644
index 61ab489f5..000000000
--- a/src/app/screens/swap/swapStacksConfirmation/useConfirmSwap.tsx
+++ /dev/null
@@ -1,130 +0,0 @@
-import { type TokenImageProps } from '@components/tokenImage';
-import useNetworkSelector from '@hooks/useNetwork';
-import useSeedVault from '@hooks/useSeedVault';
-import useSelectedAccount from '@hooks/useSelectedAccount';
-import { type SwapToken } from '@screens/swap/types';
-import {
-  ApiResponseError,
-  broadcastSignedTransaction,
-  microstacksToStx,
-  signTransaction,
-  type StacksTransaction,
-} from '@secretkeylabs/xverse-core';
-import { deserializeTransaction } from '@stacks/transactions';
-import { Currency, SponsoredTxError, SponsoredTxErrorCode } from 'alex-sdk';
-import BigNumber from 'bignumber.js';
-import { useState } from 'react';
-import { useNavigate } from 'react-router-dom';
-import { useAlexSponsoredTransaction } from '../useAlexSponsoredTransaction';
-import { useStxCurrencyConversion } from '../useStxCurrencyConversion';
-
-export type SwapConfirmationInput = {
-  from: Currency;
-  to: Currency;
-  fromToken: SwapToken;
-  toToken: SwapToken;
-  fromAmount: number;
-  minToAmount: number;
-  txFeeAmount: number;
-  txFeeFiatAmount?: number;
-  address: string;
-  routers: { image: TokenImageProps; name: string }[];
-  unsignedTx: string; // serialized hex StacksTransaction
-  functionName: string;
-  userOverrideSponsorValue: boolean;
-};
-
-export type SwapConfirmationOutput = Omit<SwapConfirmationInput, 'unsignedTx'> & {
-  onConfirm: () => Promise<void>;
-  onFeeUpdate: (settingFee: bigint) => void;
-  unsignedTx: StacksTransaction; // deserialized StacksTransaction
-  isSponsored: boolean;
-  isSponsorDisabled: boolean;
-};
-
-export function useConfirmSwap(input: SwapConfirmationInput): SwapConfirmationOutput {
-  const selectedAccount = useSelectedAccount();
-  const selectedNetwork = useNetworkSelector();
-  const { isSponsored, sponsorTransaction, isSponsorDisabled } = useAlexSponsoredTransaction(
-    input.userOverrideSponsorValue,
-  );
-  const { currencyToToken } = useStxCurrencyConversion();
-  const { getSeed } = useSeedVault();
-  const navigate = useNavigate();
-  const [unsignedTx, setUnsignedTx] = useState<StacksTransaction>(
-    deserializeTransaction(input.unsignedTx),
-  );
-  const [feeAmount, setFeeAmount] = useState(input.txFeeAmount);
-  const [feeFiatAmount, setFeeFiatAmount] = useState(input.txFeeFiatAmount);
-
-  return {
-    ...input,
-    txFeeAmount: feeAmount,
-    txFeeFiatAmount: feeFiatAmount,
-    unsignedTx,
-    userOverrideSponsorValue: input.userOverrideSponsorValue,
-    onFeeUpdate: (settingFee: bigint) => {
-      const fee = microstacksToStx(new BigNumber(settingFee.toString()));
-      unsignedTx.setFee(settingFee);
-      setUnsignedTx(unsignedTx);
-      setFeeAmount(Number(fee));
-      setFeeFiatAmount(currencyToToken(Currency.STX, Number(fee))?.fiatAmount);
-    },
-    isSponsored,
-    isSponsorDisabled,
-    onConfirm: async () => {
-      const seedPhrase = await getSeed();
-      const signed = await signTransaction(
-        unsignedTx,
-        seedPhrase,
-        selectedAccount?.id ?? 0,
-        selectedNetwork,
-      );
-      try {
-        let broadcastResult: string;
-        if (isSponsored) {
-          broadcastResult = await sponsorTransaction(signed);
-        } else {
-          broadcastResult = await broadcastSignedTransaction(signed, selectedNetwork);
-        }
-        if (broadcastResult) {
-          navigate('/tx-status', {
-            state: {
-              txid: broadcastResult,
-              currency: 'STX',
-              error: '',
-              sponsored: isSponsored,
-              browserTx: false,
-            },
-          });
-        }
-      } catch (e) {
-        if (e instanceof SponsoredTxError) {
-          navigate('/tx-status', {
-            state: {
-              txid: '',
-              currency: 'STX',
-              error:
-                e.code !== SponsoredTxErrorCode.unknown_error ? e.message : 'Unknown sponsor error',
-              sponsored: isSponsored,
-              browserTx: false,
-              isSponsorServiceError: true,
-              isSwapTransaction: true,
-            },
-          });
-        } else if (e instanceof Error) {
-          navigate('/tx-status', {
-            state: {
-              txid: '',
-              currency: 'STX',
-              error: e instanceof ApiResponseError ? (e.data as any).message : e.message,
-              sponsored: isSponsored,
-              browserTx: false,
-              isSwapTransaction: true,
-            },
-          });
-        }
-      }
-    },
-  };
-}

From 876e6e8e3116b6681250cfbac1d917dfbad96e30 Mon Sep 17 00:00:00 2001
From: jordankzf <jordan@secretkeylabs.com>
Date: Tue, 27 Aug 2024 09:37:47 +0800
Subject: [PATCH 024/227] Fix resetFrom

---
 src/app/screens/swap/components/tokenToBottomSheet/index.tsx | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/app/screens/swap/components/tokenToBottomSheet/index.tsx b/src/app/screens/swap/components/tokenToBottomSheet/index.tsx
index 0c0f8ddda..4d914d140 100644
--- a/src/app/screens/swap/components/tokenToBottomSheet/index.tsx
+++ b/src/app/screens/swap/components/tokenToBottomSheet/index.tsx
@@ -106,7 +106,7 @@ export default function TokenToBottomSheet({
     if (from) {
       setSelectedProtocol(mapFTMotherProtocolToSwapProtocol(from));
     }
-  }, [from]);
+  }, [from, visible]);
 
   const { t } = useTranslation('translation', { keyPrefix: 'SWAP_SCREEN' });
   const search = useDebounce(query, 500);
@@ -122,7 +122,7 @@ export default function TokenToBottomSheet({
     if (selectedProtocol === protocol) {
       return;
     }
-    // resetFrom();
+    resetFrom();
     setQuery('');
     setSelectedProtocol(protocol);
   };

From 2c68122b6094357ebaaf5a47aafb825a8d661674 Mon Sep 17 00:00:00 2001
From: jordankzf <jordan@secretkeylabs.com>
Date: Tue, 27 Aug 2024 09:40:18 +0800
Subject: [PATCH 025/227] Improve readability

---
 src/app/screens/swap/quoteSummary/index.tsx | 73 +++++++++++----------
 1 file changed, 40 insertions(+), 33 deletions(-)

diff --git a/src/app/screens/swap/quoteSummary/index.tsx b/src/app/screens/swap/quoteSummary/index.tsx
index bc0960abd..3401561c0 100644
--- a/src/app/screens/swap/quoteSummary/index.tsx
+++ b/src/app/screens/swap/quoteSummary/index.tsx
@@ -323,39 +323,46 @@ export default function QuoteSummary({
     quote.slippageSupported && quote.slippageThreshold && slippage > quote.slippageThreshold,
   );
 
-  const fromTokenFiatValue =
-    fromToken?.principal === 'BTC'
-      ? getBtcFiatEquivalent(new BigNumber(amount), new BigNumber(btcFiatRate)).toFixed(2)
-      : fromToken?.principal === 'STX'
-      ? getStxFiatEquivalent(
-          stxToMicrostacks(new BigNumber(amount)),
-          new BigNumber(stxBtcRate),
-          new BigNumber(btcFiatRate),
-        ).toFixed(2)
-      : new BigNumber(fromToken?.tokenFiatRate ?? 0).multipliedBy(amount).toFixed(2);
-
-  const toTokenFiatValue =
-    toToken?.protocol === 'btc'
-      ? getBtcFiatEquivalent(
-          new BigNumber(quote.receiveAmount),
-          new BigNumber(btcFiatRate),
-        ).toFixed(2)
-      : toToken?.protocol === 'runes'
-      ? getBtcFiatEquivalent(
-          new BigNumber(runeFloorPrice ?? 0).multipliedBy(quote.receiveAmount),
-          new BigNumber(btcFiatRate),
-        ).toFixed(2)
-      : toToken?.protocol === 'stx'
-      ? getStxFiatEquivalent(
-          stxToMicrostacks(new BigNumber(quote.receiveAmount)),
-          new BigNumber(stxBtcRate),
-          new BigNumber(btcFiatRate),
-        ).toFixed(2)
-      : new BigNumber(
-          sip10CoinsList?.find((s) => s.principal === toToken?.ticker)?.tokenFiatRate ?? 0,
-        )
-          .multipliedBy(quote.receiveAmount)
-          .toFixed(2);
+  const fromTokenFiatValue = (() => {
+    if (fromToken?.principal === 'BTC') {
+      return getBtcFiatEquivalent(new BigNumber(amount), new BigNumber(btcFiatRate)).toFixed(2);
+    }
+    if (fromToken?.principal === 'STX') {
+      return getStxFiatEquivalent(
+        stxToMicrostacks(new BigNumber(amount)),
+        new BigNumber(stxBtcRate),
+        new BigNumber(btcFiatRate),
+      ).toFixed(2);
+    }
+    return new BigNumber(fromToken?.tokenFiatRate ?? 0).multipliedBy(amount).toFixed(2);
+  })();
+
+  const toTokenFiatValue = (() => {
+    if (toToken?.protocol === 'btc') {
+      return getBtcFiatEquivalent(
+        new BigNumber(quote.receiveAmount),
+        new BigNumber(btcFiatRate),
+      ).toFixed(2);
+    }
+    if (toToken?.protocol === 'runes') {
+      return getBtcFiatEquivalent(
+        new BigNumber(runeFloorPrice ?? 0).multipliedBy(quote.receiveAmount),
+        new BigNumber(btcFiatRate),
+      ).toFixed(2);
+    }
+    if (toToken?.protocol === 'stx') {
+      return getStxFiatEquivalent(
+        stxToMicrostacks(new BigNumber(quote.receiveAmount)),
+        new BigNumber(stxBtcRate),
+        new BigNumber(btcFiatRate),
+      ).toFixed(2);
+    }
+    return new BigNumber(
+      sip10CoinsList?.find((s) => s.principal === toToken?.ticker)?.tokenFiatRate ?? 0,
+    )
+      .multipliedBy(quote.receiveAmount)
+      .toFixed(2);
+  })();
 
   const showBadQuoteWarning =
     quote.slippageSupported &&

From f1f80e2b7ed91f6de5b225b1104f3fc371fc9c10 Mon Sep 17 00:00:00 2001
From: jordankzf <jordan@secretkeylabs.com>
Date: Tue, 27 Aug 2024 09:41:53 +0800
Subject: [PATCH 026/227] Fix STX from fiat value

---
 src/app/screens/swap/index.tsx | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/src/app/screens/swap/index.tsx b/src/app/screens/swap/index.tsx
index 9bce1af86..8b989afc1 100644
--- a/src/app/screens/swap/index.tsx
+++ b/src/app/screens/swap/index.tsx
@@ -15,7 +15,9 @@ import {
   AnalyticsEvents,
   btcToSats,
   getBtcFiatEquivalent,
+  getStxFiatEquivalent,
   microstacksToStx,
+  stxToMicrostacks,
   type FungibleToken,
   type GetUtxosRequest,
   type MarketUtxo,
@@ -129,7 +131,7 @@ export default function SwapScreen() {
   const { data: btcBalance } = useBtcWalletData();
   const { data: stxData } = useStxWalletData();
 
-  const { btcFiatRate, btcUsdRate } = useCoinRates();
+  const { btcFiatRate, btcUsdRate, stxBtcRate } = useCoinRates();
   const navigate = useNavigate();
   const { t } = useTranslation('translation');
   const location = useLocation();
@@ -290,6 +292,15 @@ export default function SwapScreen() {
       return getBtcFiatEquivalent(amountInSats, new BigNumber(btcFiatRate)).toFixed(2);
     }
 
+    if (fromToken?.principal === 'STX') {
+      const amountInMicroStx = stxToMicrostacks(new BigNumber(balance));
+      return getStxFiatEquivalent(
+        amountInMicroStx,
+        new BigNumber(stxBtcRate),
+        new BigNumber(btcFiatRate),
+      ).toFixed(2);
+    }
+
     if (!fromToken?.tokenFiatRate || !fromToken.decimals) {
       return '0.00';
     }

From d315f08900e979248d2f9b0c33a66814351c89e7 Mon Sep 17 00:00:00 2001
From: jordankzf <jordan@secretkeylabs.com>
Date: Tue, 27 Aug 2024 10:19:36 +0800
Subject: [PATCH 027/227] Improve useMasterCoinsList and
 useVisibleMasterCoinsList hooks

---
 src/app/screens/swap/useMasterCoinsList.tsx        |  2 +-
 src/app/screens/swap/useVisibleMasterCoinsList.tsx | 13 +++++++++++--
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/src/app/screens/swap/useMasterCoinsList.tsx b/src/app/screens/swap/useMasterCoinsList.tsx
index 4081dafa5..891046ff6 100644
--- a/src/app/screens/swap/useMasterCoinsList.tsx
+++ b/src/app/screens/swap/useMasterCoinsList.tsx
@@ -42,7 +42,7 @@ const useMasterCoinsList = () => {
         btcFt,
         ...(!hideStx && isStacksSwapsEnabled ? [stxFt, ...sip10FtList] : []),
       ] ?? [],
-    [sip10FtList, runesFtList],
+    [runesFtList, hideStx, isStacksSwapsEnabled, sip10FtList],
   );
 
   return coinsMasterList;
diff --git a/src/app/screens/swap/useVisibleMasterCoinsList.tsx b/src/app/screens/swap/useVisibleMasterCoinsList.tsx
index 65ac42291..c50669170 100644
--- a/src/app/screens/swap/useVisibleMasterCoinsList.tsx
+++ b/src/app/screens/swap/useVisibleMasterCoinsList.tsx
@@ -1,18 +1,27 @@
 import { useVisibleRuneFungibleTokens } from '@hooks/queries/runes/useRuneFungibleTokensQuery';
 import { useVisibleSip10FungibleTokens } from '@hooks/queries/stx/useGetSip10FungibleTokens';
+import useHasFeature from '@hooks/useHasFeature';
 import useWalletSelector from '@hooks/useWalletSelector';
+import { FeatureId } from '@secretkeylabs/xverse-core';
 import { useMemo } from 'react';
 import { btcFt, stxFt } from './useMasterCoinsList';
 
 const useVisibleMasterCoinsList = () => {
   const { visible: sip10FtList } = useVisibleSip10FungibleTokens();
   const { visible: runesFtList } = useVisibleRuneFungibleTokens();
+  const isStacksSwapsEnabled = useHasFeature(FeatureId.STACKS_SWAPS);
 
   const { hideStx } = useWalletSelector();
 
   const coinsMasterList = useMemo(
-    () => [...sip10FtList, ...runesFtList, btcFt, ...(hideStx ? [] : [stxFt])] ?? [],
-    [sip10FtList, runesFtList],
+    () =>
+      [
+        ...sip10FtList,
+        ...runesFtList,
+        btcFt,
+        ...(!hideStx && isStacksSwapsEnabled ? [stxFt] : []),
+      ] ?? [],
+    [sip10FtList, runesFtList, hideStx, isStacksSwapsEnabled],
   );
 
   return coinsMasterList;

From 96d045e7a2fad490ac4d137188eca3b092b14272 Mon Sep 17 00:00:00 2001
From: jordankzf <jordan@secretkeylabs.com>
Date: Tue, 27 Aug 2024 10:27:43 +0800
Subject: [PATCH 028/227] Remove comment

---
 src/app/screens/swap/quotesModal/index.tsx | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/app/screens/swap/quotesModal/index.tsx b/src/app/screens/swap/quotesModal/index.tsx
index c358d1521..ec256e0f5 100644
--- a/src/app/screens/swap/quotesModal/index.tsx
+++ b/src/app/screens/swap/quotesModal/index.tsx
@@ -114,7 +114,6 @@ function QuotesModal({
               {t('EXCHANGE')}
             </Heading>
           ))}
-        {/* todo: get fiat rates of rune from API */}
         {ammProviders.map((amm) => (
           <QuoteTile
             key={amm.provider.name}

From a672d9143b7890cd5f4604a9aa33fdac4481d3cd Mon Sep 17 00:00:00 2001
From: jordankzf <jordan@secretkeylabs.com>
Date: Tue, 27 Aug 2024 10:27:54 +0800
Subject: [PATCH 029/227] Recursive token definition

---
 src/app/screens/swap/utils.ts | 19 +++++--------------
 1 file changed, 5 insertions(+), 14 deletions(-)

diff --git a/src/app/screens/swap/utils.ts b/src/app/screens/swap/utils.ts
index 1bb74ba29..21e82cbba 100644
--- a/src/app/screens/swap/utils.ts
+++ b/src/app/screens/swap/utils.ts
@@ -6,6 +6,7 @@ import type {
   TokenBasic,
 } from '@secretkeylabs/xverse-core';
 import type { CurrencyTypes } from '@utils/constants';
+import { btcFt, stxFt } from './useMasterCoinsList';
 
 export const mapFtToCurrencyType = (ft?: FungibleToken): CurrencyTypes => {
   const principalToCurrencyTypeMap: Record<string, CurrencyTypes> = {
@@ -86,21 +87,11 @@ export const mapFTNativeSwapTokenToTokenBasic = (token: FungibleToken | Token):
 };
 
 export const mapFtToSwapToken = (st: FungibleToken): Token => {
-  if (st.principal === 'BTC') {
-    return {
-      ticker: 'BTC',
-      name: 'Bitcoin',
-      protocol: 'btc',
-      divisibility: 8,
-    };
+  if (st.principal === 'BTC' && st !== btcFt) {
+    return mapFtToSwapToken(btcFt);
   }
-  if (st.principal === 'STX') {
-    return {
-      ticker: 'STX',
-      name: 'Stacks',
-      protocol: 'stx',
-      divisibility: 6,
-    };
+  if (st.principal === 'STX' && st !== stxFt) {
+    return mapFtToSwapToken(stxFt);
   }
 
   return {

From 24a9184ff2d5ba43e3277ff1c7d11b35a0eb0134 Mon Sep 17 00:00:00 2001
From: jordankzf <jordan@secretkeylabs.com>
Date: Tue, 27 Aug 2024 10:30:30 +0800
Subject: [PATCH 030/227] Remvoe unused

---
 src/app/screens/swap/index.tsx                |   2 -
 src/app/screens/swap/swapTokenBlock/index.tsx | 166 ------------------
 src/app/utils/helper.ts                       |   9 -
 3 files changed, 177 deletions(-)
 delete mode 100644 src/app/screens/swap/swapTokenBlock/index.tsx

diff --git a/src/app/screens/swap/index.tsx b/src/app/screens/swap/index.tsx
index 8b989afc1..3f414893c 100644
--- a/src/app/screens/swap/index.tsx
+++ b/src/app/screens/swap/index.tsx
@@ -3,7 +3,6 @@ import RequestsRoutes from '@common/utils/route-urls';
 import BottomBar from '@components/tabBar';
 import TopRow from '@components/topRow';
 import useRuneFloorPriceQuery from '@hooks/queries/runes/useRuneFloorPriceQuery';
-import { useGetSip10FungibleTokens } from '@hooks/queries/stx/useGetSip10FungibleTokens';
 import useGetQuotes from '@hooks/queries/swaps/useGetQuotes';
 import useBtcWalletData from '@hooks/queries/useBtcWalletData';
 import useCoinRates from '@hooks/queries/useCoinRates';
@@ -108,7 +107,6 @@ export default function SwapScreen() {
   const [quote, setQuote] = useState<Quote>();
   const [selectedUtxoProvider, setSelectedUtxoProvider] = useState<UtxoQuote>();
   const [errorMessage, setErrorMessage] = useState('');
-  const { data: sip10CoinsList } = useGetSip10FungibleTokens();
 
   const [getQuotesModalVisible, setGetQuotesModalVisible] = useState(false);
   const [tokenSelectionBottomSheet, setTokenSelectionBottomSheet] = useState<'from' | 'to' | null>(
diff --git a/src/app/screens/swap/swapTokenBlock/index.tsx b/src/app/screens/swap/swapTokenBlock/index.tsx
deleted file mode 100644
index 21c219645..000000000
--- a/src/app/screens/swap/swapTokenBlock/index.tsx
+++ /dev/null
@@ -1,166 +0,0 @@
-import ChevronIcon from '@assets/img/swap/chevron.svg';
-import TokenImage from '@components/tokenImage';
-import useWalletSelector from '@hooks/useWalletSelector';
-import { type SwapToken } from '@screens/swap/types';
-import { currencySymbolMap } from '@secretkeylabs/xverse-core';
-import { EMPTY_LABEL } from '@utils/constants';
-import { useTranslation } from 'react-i18next';
-import { NumericFormat } from 'react-number-format';
-import styled from 'styled-components';
-
-const Container = styled.div((props) => ({
-  display: 'flex',
-  flexDirection: 'column',
-  rowGap: props.theme.spacing(4),
-}));
-
-const RowContainer = styled.div({
-  display: 'flex',
-  flexDirection: 'row',
-  alignItems: 'center',
-});
-
-const TitleText = styled.h3((props) => ({
-  ...props.theme.body_medium_m,
-  flex: 1,
-  display: 'flex',
-}));
-
-const Text = styled.p((props) => ({
-  ...props.theme.body_medium_m,
-}));
-
-const BalanceText = styled.label((props) => ({
-  ...props.theme.body_medium_m,
-  color: props.theme.colors.white_400,
-  marginRight: props.theme.spacing(2),
-}));
-
-const CardContainer = styled.div<{ error?: boolean }>((props) => ({
-  display: 'flex',
-  flexDirection: 'column',
-  rowGap: props.theme.spacing(3),
-  background: props.theme.colors.elevation_n1,
-  border: '1px solid',
-  'border-color': props.error
-    ? props.theme.colors.feedback.error_700
-    : props.theme.colors.elevation2,
-  borderRadius: 8,
-  padding: props.theme.spacing(8),
-  ':focus-within': {
-    border: '1px solid',
-    'border-color': props.error
-      ? props.theme.colors.feedback.error_700
-      : props.theme.colors.elevation6,
-  },
-}));
-
-const CoinButtonContainer = styled.button((props) => ({
-  display: 'flex',
-  flexDirection: 'row',
-  columnGap: props.theme.spacing(2),
-  background: 'transparent',
-  alignItems: 'center',
-  minHeight: '28px', // same as icon height
-}));
-
-const CoinButtonArrow = styled.img({
-  width: 12,
-  height: 12,
-});
-
-const NumberInput = styled.input`
-  ::-webkit-inner-spin-button {
-    -webkit-appearance: none;
-    margin: 0;
-  }
-  ::-webkit-outer-spin-button {
-    -webkit-appearance: none;
-    margin: 0;
-  }
-`;
-const AmountInput = styled(NumberInput)<{ error?: boolean }>((props) => ({
-  ...props.theme.body_bold_l,
-  flex: 1,
-  color: props.error ? props.theme.colors.feedback.error : props.theme.colors.white_0,
-  marginLeft: props.theme.spacing(2),
-  textAlign: 'right',
-  backgroundColor: 'transparent',
-  border: 'transparent',
-  width: '100%',
-}));
-
-const CoinText = styled.div((props) => ({
-  ...props.theme.body_medium_m,
-  color: props.theme.colors.white_0,
-}));
-
-export const EstimateUSDText = styled.p((props) => ({
-  ...props.theme.body_medium_m,
-  color: props.theme.colors.white_400,
-  marginLeft: 'auto',
-}));
-
-type SwapTokenBlockProps = {
-  title: string;
-  selectedCoin?: SwapToken;
-  amount?: string;
-  onAmountChange?: (amount: string) => void;
-  onSelectCoin?: () => void;
-  error?: boolean;
-};
-
-function SwapTokenBlock({
-  title,
-  selectedCoin,
-  amount,
-  onAmountChange,
-  onSelectCoin,
-  error,
-}: SwapTokenBlockProps) {
-  const { t } = useTranslation('translation', { keyPrefix: 'SWAP_SCREEN' });
-  const { fiatCurrency } = useWalletSelector();
-
-  return (
-    <Container>
-      <RowContainer>
-        <TitleText>{title}</TitleText>
-        <BalanceText>{t('BALANCE')}:</BalanceText>
-        <Text data-testid="swap-token-balance">{selectedCoin?.balance ?? EMPTY_LABEL}</Text>
-      </RowContainer>
-      <CardContainer error={error}>
-        <RowContainer>
-          <CoinButtonContainer data-testid="select-coin-button" onClick={onSelectCoin}>
-            {/* eslint-disable-next-line react/jsx-props-no-spreading */}
-            {selectedCoin && <TokenImage {...selectedCoin?.image} showProtocolIcon={false} />}
-            <CoinText data-testid="coin-text">{selectedCoin?.name ?? t('SELECT_COIN')}</CoinText>
-            <CoinButtonArrow src={ChevronIcon} />
-          </CoinButtonContainer>
-          <AmountInput
-            data-testid="swap-amount"
-            error={error}
-            placeholder="0"
-            disabled={onAmountChange == null}
-            value={amount ?? selectedCoin?.amount?.toString() ?? ''}
-            onChange={(e) => onAmountChange?.(e.target.value)}
-            type="number"
-          />
-        </RowContainer>
-        <RowContainer>
-          <NumericFormat
-            value={selectedCoin?.fiatAmount ?? EMPTY_LABEL}
-            displayType="text"
-            thousandSeparator
-            prefix={`${currencySymbolMap[fiatCurrency]}`}
-            suffix={` ${fiatCurrency}`}
-            renderText={(value) => (
-              <EstimateUSDText data-testid="usd-text">{value}</EstimateUSDText>
-            )}
-          />
-        </RowContainer>
-      </CardContainer>
-    </Container>
-  );
-}
-
-export default SwapTokenBlock;
diff --git a/src/app/utils/helper.ts b/src/app/utils/helper.ts
index b6eee0a4d..2aac0b67d 100644
--- a/src/app/utils/helper.ts
+++ b/src/app/utils/helper.ts
@@ -325,15 +325,6 @@ export const getLockCountdownLabel = (
   return t('LOCK_COUNTDOWN_HS', { count: hours });
 };
 
-export const isFungibleToken = (token: any): token is FungibleToken =>
-  token &&
-  typeof token === 'object' &&
-  'balance' in token &&
-  'total_sent' in token &&
-  'total_received' in token &&
-  'principal' in token &&
-  'assetName' in token;
-
 export const satsToBtcString = (num: BigNumber) =>
   satsToBtc(num)
     .toFixed(8)

From 10597f248b33b525c2a3ba828daac6ba9fe7826d Mon Sep 17 00:00:00 2001
From: jordankzf <jordan@secretkeylabs.com>
Date: Tue, 27 Aug 2024 10:49:46 +0800
Subject: [PATCH 031/227] Remove useAlexSponsoredTransaction

---
 .../swap/useAlexSponsoredTransaction.ts       | 51 -------------------
 1 file changed, 51 deletions(-)
 delete mode 100644 src/app/screens/swap/useAlexSponsoredTransaction.ts

diff --git a/src/app/screens/swap/useAlexSponsoredTransaction.ts b/src/app/screens/swap/useAlexSponsoredTransaction.ts
deleted file mode 100644
index 42e6db94c..000000000
--- a/src/app/screens/swap/useAlexSponsoredTransaction.ts
+++ /dev/null
@@ -1,51 +0,0 @@
-/* eslint-disable import/prefer-default-export */
-import useStxPendingTxData from '@hooks/queries/useStxPendingTxData';
-import useStxWalletData from '@hooks/queries/useStxWalletData';
-import { buf2hex } from '@secretkeylabs/xverse-core';
-import { StacksTransaction } from '@stacks/transactions';
-import { useQuery } from '@tanstack/react-query';
-import { AlexSDK } from 'alex-sdk';
-import { useEffect, useRef, useState } from 'react';
-
-const useAlexSponsorSwapEnabledQuery = (alexSDK: AlexSDK) =>
-  useQuery({
-    queryKey: ['alexSponsoredSwapEnabled'],
-    queryFn: alexSDK.isSponsoredSwapEnabled,
-  });
-
-export const useAlexSponsoredTransaction = (userOverrideSponsorValue: boolean) => {
-  const alexSDK = useRef(new AlexSDK()).current;
-  const [isServiceRunning, setIsServiceRunning] = useState(false);
-  const { error, data: isEnabled, isLoading } = useAlexSponsorSwapEnabledQuery(alexSDK);
-  const { data: stxData } = useStxWalletData();
-
-  useEffect(() => {
-    if (!isLoading && !error) {
-      setIsServiceRunning(!!isEnabled);
-    }
-  }, [isEnabled, error, isLoading]);
-
-  const sponsorTransaction = async (signed: StacksTransaction) =>
-    alexSDK.broadcastSponsoredTx(buf2hex(signed.serialize()));
-
-  const { data: stxPendingTxData } = useStxPendingTxData();
-  const upcomingPendingTransactionNonce =
-    (stxPendingTxData?.pendingTransactions ?? []).reduce(
-      (maxNonce, transaction) => Math.max(maxNonce, transaction?.nonce ?? 0),
-      0,
-    ) + 1;
-
-  let hasPendingTransactions: boolean;
-  // ignore pending transactions if account nonce has advanced pass the nonce in pending transactions
-  if ((stxData?.nonce ?? 0) > upcomingPendingTransactionNonce) {
-    hasPendingTransactions = false;
-  } else {
-    hasPendingTransactions = (stxPendingTxData?.pendingTransactions?.length ?? 0) > 0;
-  }
-  return {
-    isSponsored: userOverrideSponsorValue && isServiceRunning && !hasPendingTransactions,
-    isServiceRunning,
-    sponsorTransaction,
-    isSponsorDisabled: hasPendingTransactions,
-  };
-};

From 1802d119613b72b33e126e4d5e0f3fe920512734 Mon Sep 17 00:00:00 2001
From: jordankzf <jordan@secretkeylabs.com>
Date: Tue, 27 Aug 2024 10:58:02 +0800
Subject: [PATCH 032/227] Reduce hardcoding in anticipation of alex

---
 .../transactionsRequests/ContractCallRequest.tsx           | 7 ++++---
 src/app/screens/swap/index.tsx                             | 4 ++--
 src/app/screens/swap/quoteSummary/index.tsx                | 2 +-
 .../transactionRequest/useStxTransactionRequest/index.ts   | 4 ++--
 4 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/src/app/components/transactionsRequests/ContractCallRequest.tsx b/src/app/components/transactionsRequests/ContractCallRequest.tsx
index 93e4cfa8a..697a4c44f 100644
--- a/src/app/components/transactionsRequests/ContractCallRequest.tsx
+++ b/src/app/components/transactionsRequests/ContractCallRequest.tsx
@@ -114,6 +114,7 @@ export default function ContractCallRequest({
   const [fee, setFee] = useState<BigNumber | undefined>(undefined);
   const { executeStxOrder } = useExecuteOrder();
   const [isLoading, setIsLoading] = useState(false);
+  const isStxSwap = messageId === 'velar' || messageId === 'alex';
 
   // SignTransaction Params
   const isMultiSigTx = isMultiSig(unsignedTx);
@@ -267,9 +268,9 @@ export default function ContractCallRequest({
   };
 
   const confirmCallback = async (transactions: StacksTransaction[]) => {
-    if (messageId === 'velar') {
+    if (isStxSwap) {
       const order: ExecuteStxOrderRequest = {
-        providerCode: 'velar',
+        providerCode: messageId,
         signedTransaction: buf2hex(transactions[0].serialize()),
       };
       setIsLoading(true);
@@ -342,7 +343,7 @@ export default function ContractCallRequest({
     }
   };
   const cancelCallback = () => {
-    if (messageId === 'velar') {
+    if (isStxSwap) {
       return navigate(-1);
     }
     if (tabId && messageId) {
diff --git a/src/app/screens/swap/index.tsx b/src/app/screens/swap/index.tsx
index 3f414893c..da798e577 100644
--- a/src/app/screens/swap/index.tsx
+++ b/src/app/screens/swap/index.tsx
@@ -429,7 +429,7 @@ export default function SwapScreen() {
 
   const unsignedTransactionHexString = stxOrderInfo?.order.unsignedTransaction;
 
-  if (unsignedTransactionHexString) {
+  if (unsignedTransactionHexString && quote) {
     const dataStxSignTransactionOverride: DataStxSignTransaction = {
       context: {
         origin: 'extension',
@@ -442,7 +442,7 @@ export default function SwapScreen() {
           pubkey: stxPublicKey,
           broadcast: true,
         },
-        id: 'velar',
+        id: quote?.provider.code,
         jsonrpc: '2.0',
       },
     };
diff --git a/src/app/screens/swap/quoteSummary/index.tsx b/src/app/screens/swap/quoteSummary/index.tsx
index 3401561c0..e9f8c522c 100644
--- a/src/app/screens/swap/quoteSummary/index.tsx
+++ b/src/app/screens/swap/quoteSummary/index.tsx
@@ -239,7 +239,7 @@ export default function QuoteSummary({
   const isSip10Swap = fromToken?.protocol === 'stacks' || toToken?.protocol === 'sip10';
 
   const [showSlippageModal, setShowSlippageModal] = useState(false);
-  const DEFAULT_SLIPPAGE = quote.provider.code === 'velar' ? 0.04 : 0.05;
+  const DEFAULT_SLIPPAGE = quote.slippageThreshold ?? 0.05;
   const [slippage, setSlippage] = useSearchParamsState('slippage', DEFAULT_SLIPPAGE);
 
   const handleSwap = async () => {
diff --git a/src/app/screens/transactionRequest/useStxTransactionRequest/index.ts b/src/app/screens/transactionRequest/useStxTransactionRequest/index.ts
index 081a3f897..21ad8d4e4 100644
--- a/src/app/screens/transactionRequest/useStxTransactionRequest/index.ts
+++ b/src/app/screens/transactionRequest/useStxTransactionRequest/index.ts
@@ -24,8 +24,8 @@ export type DataStxSignTransaction = {
     method: 'stx_signTransaction';
     params: {
       transaction: string;
-      pubkey?: string | undefined;
-      broadcast?: boolean | undefined;
+      pubkey?: string;
+      broadcast?: boolean;
     };
     id: string;
     jsonrpc: '2.0';

From 5875558d69dc0e18375be2a462cc1ad0deeeedd5 Mon Sep 17 00:00:00 2001
From: jordankzf <jordan@secretkeylabs.com>
Date: Tue, 27 Aug 2024 11:04:08 +0800
Subject: [PATCH 033/227] Springcleaning

---
 src/app/screens/swap/index.tsx |  6 ++----
 src/app/screens/swap/types.ts  | 35 ----------------------------------
 src/app/utils/constants.ts     |  4 ----
 3 files changed, 2 insertions(+), 43 deletions(-)

diff --git a/src/app/screens/swap/index.tsx b/src/app/screens/swap/index.tsx
index da798e577..cafe50622 100644
--- a/src/app/screens/swap/index.tsx
+++ b/src/app/screens/swap/index.tsx
@@ -44,7 +44,7 @@ import TokenToBottomSheet from './components/tokenToBottomSheet';
 import trackSwapMixPanel from './mixpanel';
 import QuoteSummary from './quoteSummary';
 import QuotesModal from './quotesModal';
-import type { OrderInfo, StxOrderInfo } from './types';
+import type { OrderInfo, Side, StxOrderInfo } from './types';
 import useMasterCoinsList from './useMasterCoinsList';
 import {
   mapFTNativeSwapTokenToTokenBasic,
@@ -109,9 +109,7 @@ export default function SwapScreen() {
   const [errorMessage, setErrorMessage] = useState('');
 
   const [getQuotesModalVisible, setGetQuotesModalVisible] = useState(false);
-  const [tokenSelectionBottomSheet, setTokenSelectionBottomSheet] = useState<'from' | 'to' | null>(
-    null,
-  );
+  const [tokenSelectionBottomSheet, setTokenSelectionBottomSheet] = useState<Side | null>(null);
   const [fromToken, setFromToken] = useState<FungibleToken | undefined>();
   const [toToken, setToToken] = useState<Token | undefined>();
   const [utxosRequest, setUtxosRequest] = useState<GetUtxosRequest | null>(null);
diff --git a/src/app/screens/swap/types.ts b/src/app/screens/swap/types.ts
index 9a6cc21ec..4096ac6ab 100644
--- a/src/app/screens/swap/types.ts
+++ b/src/app/screens/swap/types.ts
@@ -8,7 +8,6 @@ import {
 } from '@secretkeylabs/xverse-core';
 import { Currency } from 'alex-sdk';
 
-export type STXOrFungibleToken = 'STX' | FungibleToken;
 export type Side = 'from' | 'to';
 
 export type SwapToken = {
@@ -19,40 +18,6 @@ export type SwapToken = {
   fiatAmount?: number;
 };
 
-export type UseSwap = {
-  coinsList: FungibleToken[];
-  isLoadingWalletData: boolean;
-  selectedFromToken?: SwapToken;
-  selectedToToken?: SwapToken;
-  onSelectToken: (token: STXOrFungibleToken, side: Side) => void;
-  inputAmount: string;
-  inputAmountInvalid?: boolean;
-  onInputAmountChanged: (amount: string) => void;
-  handleClickDownArrow: (event: React.MouseEvent<HTMLButtonElement>) => void;
-  submitError?: string;
-  swapInfo?: {
-    exchangeRate?: string;
-    lpFee?: string;
-    route?: string;
-  };
-  slippage: number;
-  onSlippageChanged: (slippage: number) => void;
-  minReceived?: string;
-  onSwap?: () => Promise<void>;
-  isSponsored: boolean;
-  isServiceRunning: boolean;
-  handleChangeUserOverrideSponsorValue: (checked: boolean) => void;
-  isSponsorDisabled: boolean;
-  isLoadingRates: boolean;
-};
-
-export type SelectedCurrencyState = {
-  to?: Currency;
-  from?: Currency;
-  prevTo?: Currency;
-  prevFrom?: Currency;
-};
-
 type BaseOrderInfo = {
   providerCode: ExecuteOrderRequest['providerCode'];
 };
diff --git a/src/app/utils/constants.ts b/src/app/utils/constants.ts
index 9d683a9a4..971e2eff7 100644
--- a/src/app/utils/constants.ts
+++ b/src/app/utils/constants.ts
@@ -53,10 +53,6 @@ export const PAGINATION_LIMIT = 50;
 export const SEND_MANY_TOKEN_TRANSFER_CONTRACT_PRINCIPAL =
   'SP3FBR2AGK5H9QBDH3EEN6DF8EK8JY7RX8QJ5SVTE.send-many-memo';
 
-export const SWAP_SPONSOR_DISABLED_SUPPORT_URL =
-  'https://support.xverse.app/hc/en-us/articles/18319388355981';
-export const SUPPORT_URL_TAB_TARGET = 'SupportURLTabTarget';
-
 export const DEFAULT_TRANSITION_OPTIONS = {
   from: {
     x: 24,

From 34da1e12a04cf535d29d657360a2a2a09959ba93 Mon Sep 17 00:00:00 2001
From: Terence Ng <ngtere@live.com.sg>
Date: Tue, 27 Aug 2024 13:48:14 +0800
Subject: [PATCH 034/227] quick wins (#524)

---
 src/app/screens/listRune/index.tsx            |  2 +-
 src/app/screens/listRune/setRunePriceItem.tsx | 21 ++++++++++++-------
 src/app/utils/tokens.ts                       |  5 ++++-
 src/locales/en.json                           |  5 +++--
 tests/specs/runesList.spec.ts                 |  4 ++--
 5 files changed, 24 insertions(+), 13 deletions(-)

diff --git a/src/app/screens/listRune/index.tsx b/src/app/screens/listRune/index.tsx
index d719c99f0..cbfa4fe0f 100644
--- a/src/app/screens/listRune/index.tsx
+++ b/src/app/screens/listRune/index.tsx
@@ -540,7 +540,7 @@ export default function ListRuneScreen() {
                 <SetCustomPriceModal
                   runeSymbol={selectedRune?.runeSymbol ?? ''}
                   visible={toggleCustomPriceModal}
-                  title={t('SET_PRICES')}
+                  title={t('EDIT_PRICE')}
                   floorPriceSats={runeFloorPrice}
                   minPriceSats={
                     individualCustomItem
diff --git a/src/app/screens/listRune/setRunePriceItem.tsx b/src/app/screens/listRune/setRunePriceItem.tsx
index 34e94c65f..ac47aaaca 100644
--- a/src/app/screens/listRune/setRunePriceItem.tsx
+++ b/src/app/screens/listRune/setRunePriceItem.tsx
@@ -61,6 +61,11 @@ const InfoRowContainer = styled.div`
   gap: ${(props) => props.theme.space.xs};
 `;
 
+const RightAlignContainer = styled.div(() => ({
+  display: 'flex',
+  justifyContent: 'end',
+}));
+
 type Props = {
   runeAmount: number;
   runeSymbol: string;
@@ -150,13 +155,15 @@ function SetRunePriceItem({
           </InfoRowContainer>
         </InfoContainer>
       </ItemContainer>
-      <FloorComparisonLabel
-        floorPriceSats={floorPriceSats}
-        priceSats={satPrice}
-        lowError={satPrice * runeAmount < 10000}
-        highError={satPrice * runeAmount > 1000000000}
-        typography="body_medium_s"
-      />
+      <RightAlignContainer>
+        <FloorComparisonLabel
+          floorPriceSats={floorPriceSats}
+          priceSats={satPrice}
+          lowError={satPrice * runeAmount < 10000}
+          highError={satPrice * runeAmount > 1000000000}
+          typography="body_medium_s"
+        />
+      </RightAlignContainer>
     </>
   );
 }
diff --git a/src/app/utils/tokens.ts b/src/app/utils/tokens.ts
index c0c68d77f..e02ed01d9 100644
--- a/src/app/utils/tokens.ts
+++ b/src/app/utils/tokens.ts
@@ -9,7 +9,10 @@ import type { CurrencyTypes } from '@utils/constants';
 import BigNumber from 'bignumber.js';
 import { ftDecimals, getTicker } from './helper';
 
-export function getFtTicker(ft: FungibleToken) {
+export function getFtTicker(ft: FungibleToken): string {
+  if (ft?.protocol === 'runes') {
+    return ft.runeSymbol ?? ft.ticker ?? '';
+  }
   if (ft?.ticker) {
     return ft.protocol === 'brc-20' ? ft.ticker.toUpperCase() : ft.ticker;
   }
diff --git a/src/locales/en.json b/src/locales/en.json
index 62d463952..328ccb63b 100644
--- a/src/locales/en.json
+++ b/src/locales/en.json
@@ -927,7 +927,8 @@
     "SELECT_ALL": "Select all",
     "DESELECT_ALL": "Deselect all",
     "SET_PRICES": "Set price",
-    "MAGIC_EDEN_FLOOR_PRICE": "The Magic Eden floor price is currently {{sats}} Sats/{{symbol}}",
+    "EDIT_PRICE": "Edit price",
+    "MAGIC_EDEN_FLOOR_PRICE": "The Magic Eden floor price is currently {{sats}} sats/{{symbol}}",
     "NO_FLOOR_PRICE": "There is no floor price for {{symbol}}",
     "TOTAL_LISTED": "Total listed",
     "TOTAL_RECEIVED_IF_SOLD": "Total received if sold",
@@ -937,7 +938,7 @@
     "BELOW_FLOOR_PRICE_LABEL": "This listing is {{percentage}}% below floor price",
     "ABOVE_FLOOR_PRICE_LABEL": "This listing is {{percentage}}% above floor price",
     "LISTING_PRICE_TOO_LOW": "Bundle price must be > 10000 sats",
-    "LISTING_PRICE_TOO_HIGH": "Your bundle price price must be < 10 BTC",
+    "LISTING_PRICE_TOO_HIGH": "Bundle price must be < 10 BTC",
     "EDIT": "Edit",
     "MIN_PRICE_LABEL": "The listing price per {{symbol}} must be at least {{price}} sats",
     "NO_LISTED_ITEMS": "There're no listed items for this rune.",
diff --git a/tests/specs/runesList.spec.ts b/tests/specs/runesList.spec.ts
index 2d5ac3cab..7ce3a5970 100644
--- a/tests/specs/runesList.spec.ts
+++ b/tests/specs/runesList.spec.ts
@@ -59,7 +59,7 @@ test.describe('List runes', () => {
     // Select custom
     await wallet.buttonCustomPrice.click();
 
-    // Ste price modal appears
+    // Set price modal appears
     await expect(wallet.buttonApply).toBeVisible();
     await expect(wallet.buttonApply).toBeDisabled();
     await expect(wallet.inputListingPrice).toBeVisible();
@@ -176,7 +176,7 @@ test.describe('List runes', () => {
     // click on the first UTXO
     await wallet.runeItemCheckbox.first().click();
 
-    // Click on set price
+    // Click on edit price
     await expect(wallet.buttonSetPrice).toBeEnabled();
     await wallet.buttonSetPrice.click();
 

From 95b0c226b1211c8c53f10a8c1fcb9904d751ba9f Mon Sep 17 00:00:00 2001
From: Terence Ng <ngtere@live.com.sg>
Date: Tue, 27 Aug 2024 15:09:08 +0800
Subject: [PATCH 035/227] commit fix

---
 .../confirmStxTransactionComponent/index.tsx  |  10 ++
 .../components/recipientComponent/index.tsx   | 127 +++++++++---------
 .../transactionDetailComponent/index.tsx      |  34 +++--
 3 files changed, 97 insertions(+), 74 deletions(-)

diff --git a/src/app/components/confirmStxTransactionComponent/index.tsx b/src/app/components/confirmStxTransactionComponent/index.tsx
index 07a021414..e1c4c6531 100644
--- a/src/app/components/confirmStxTransactionComponent/index.tsx
+++ b/src/app/components/confirmStxTransactionComponent/index.tsx
@@ -32,6 +32,7 @@ import { modifyRecommendedStxFees } from '@utils/transactions/transactions';
 import BigNumber from 'bignumber.js';
 import { useEffect, useState, type ReactNode } from 'react';
 import { useTranslation } from 'react-i18next';
+import styled from 'styled-components';
 import Theme from 'theme';
 import {
   ButtonsContainer,
@@ -46,6 +47,13 @@ import {
   WarningWrapper,
 } from './index.styled';
 
+const Subtitle = styled.p`
+  ${(props) => props.theme.typography.body_medium_m};
+  color: ${(props) => props.theme.colors.white_200};
+  margin-top: ${(props) => props.theme.space.s};
+  margin-bottom: ${(props) => props.theme.space.xs};
+`;
+
 // todo: make fee non option - that'll require change in all components using it
 type Props = {
   initialStxTransactions: StacksTransaction[];
@@ -352,6 +360,8 @@ function ConfirmStxTransactionComponent({
         )}
 
         {children}
+
+        <Subtitle>{t('FEES')}</Subtitle>
         <FeeRateContainer>
           <SelectFeeRate
             fee={fee}
diff --git a/src/app/components/recipientComponent/index.tsx b/src/app/components/recipientComponent/index.tsx
index f0424c984..65c101640 100644
--- a/src/app/components/recipientComponent/index.tsx
+++ b/src/app/components/recipientComponent/index.tsx
@@ -10,7 +10,7 @@ import { CubeTransparent } from '@phosphor-icons/react';
 import { type FungibleToken, getFiatEquivalent } from '@secretkeylabs/xverse-core';
 import { StyledP } from '@ui-library/common.styled';
 import type { CurrencyTypes } from '@utils/constants';
-import { getTicker } from '@utils/helper';
+import { getFtTicker } from '@utils/tokens';
 import BigNumber from 'bignumber.js';
 import { useEffect, useState } from 'react';
 import { useTranslation } from 'react-i18next';
@@ -115,6 +115,13 @@ const FiatText = styled(StyledFiatAmountText)((props) => ({
   marginTop: props.theme.space.xxxs,
 }));
 
+const Title = styled.p`
+  ${(props) => props.theme.typography.body_medium_m};
+  color: ${(props) => props.theme.colors.white_200};
+  margin-top: ${(props) => props.theme.space.s};
+  margin-bottom: ${(props) => props.theme.space.xs};
+`;
+
 type Props = {
   address?: string;
   value: string;
@@ -162,16 +169,6 @@ function RecipientComponent({
     );
   }, [value]);
 
-  const getFtTicker = () => {
-    if (fungibleToken?.ticker) {
-      return fungibleToken?.ticker.toUpperCase();
-    }
-    if (fungibleToken?.name) {
-      return getTicker(fungibleToken.name).toUpperCase();
-    }
-    return '';
-  };
-
   const renderIcon = () => {
     if (currencyType === 'RareSat') {
       return (
@@ -180,11 +177,9 @@ function RecipientComponent({
         </IconContainer>
       );
     }
-
     if (icon) {
       return <Icon src={icon} />;
     }
-
     return (
       <TokenContainer>
         <TokenImage
@@ -198,57 +193,63 @@ function RecipientComponent({
   };
 
   return (
-    <Container>
-      {address && (
-        <div>
-          {showSenderAddress ? (
-            <MultipleAddressContainer>
-              <TransferDetailView icon={WalletIcon} title={t('FROM')} address={ordinalsAddress} />
-              <DownArrowIcon src={ArrowIcon} />
-              <TransferDetailView icon={WalletIcon} title={t('TO')} address={address} />
-            </MultipleAddressContainer>
-          ) : (
-            <TransferDetailView
-              title={t('TO')}
-              address={address}
-              hideCopyButton
-              titleColor="white_400"
-            />
-          )}
-        </div>
-      )}
-
-      {heading && <RecipientTitleText>{heading}</RecipientTitleText>}
-      {value && (
-        <RowContainer>
-          <TitleContainer>
-            {renderIcon()}
-            <div>
-              <TitleText>{title}</TitleText>
-              {currencyType === 'BTC' && <Subtitle typography="body_medium_s">Bitcoin</Subtitle>}
-              {currencyType === 'STX' && <Subtitle typography="body_medium_s">Stacks</Subtitle>}
-            </div>
-          </TitleContainer>
-          {currencyType === 'NFT' || currencyType === 'Ordinal' || currencyType === 'RareSat' ? (
-            <ColumnContainer>
-              <ValueText data-testid={dataTestID}>{value}</ValueText>
-              {valueDetail && <SubValueText>{valueDetail}</SubValueText>}
-            </ColumnContainer>
-          ) : (
-            <ColumnContainer>
-              <NumericFormat
-                value={Number(value)}
-                displayType="text"
-                thousandSeparator
-                suffix={currencyType === 'FT' ? ` ${getFtTicker()} ` : ` ${currencyType}`}
-                renderText={(amount) => <ValueText data-testid={dataTestID}>{amount}</ValueText>}
+    <>
+      <Title>{t('YOU_WILL_SEND')}</Title>
+      <Container>
+        {address && (
+          <div>
+            {showSenderAddress ? (
+              <MultipleAddressContainer>
+                <TransferDetailView icon={WalletIcon} title={t('FROM')} address={ordinalsAddress} />
+                <DownArrowIcon src={ArrowIcon} />
+                <TransferDetailView icon={WalletIcon} title={t('TO')} address={address} />
+              </MultipleAddressContainer>
+            ) : (
+              <TransferDetailView
+                title={t('TO')}
+                address={address}
+                hideCopyButton
+                titleColor="white_400"
               />
-              <FiatText fiatAmount={BigNumber(fiatAmount!)} fiatCurrency={fiatCurrency} />
-            </ColumnContainer>
-          )}
-        </RowContainer>
-      )}
-    </Container>
+            )}
+          </div>
+        )}
+        {heading && <RecipientTitleText>{heading}</RecipientTitleText>}
+        {value && (
+          <RowContainer>
+            <TitleContainer>
+              {renderIcon()}
+              <div>
+                <TitleText>{title}</TitleText>
+                {currencyType === 'BTC' && <Subtitle typography="body_medium_s">Bitcoin</Subtitle>}
+                {currencyType === 'STX' && <Subtitle typography="body_medium_s">Stacks</Subtitle>}
+              </div>
+            </TitleContainer>
+            {currencyType === 'NFT' || currencyType === 'Ordinal' || currencyType === 'RareSat' ? (
+              <ColumnContainer>
+                <ValueText data-testid={dataTestID}>{value}</ValueText>
+                {valueDetail && <SubValueText>{valueDetail}</SubValueText>}
+              </ColumnContainer>
+            ) : (
+              <ColumnContainer>
+                <NumericFormat
+                  value={Number(value)}
+                  displayType="text"
+                  thousandSeparator
+                  suffix={
+                    currencyType === 'FT' && fungibleToken
+                      ? ` ${getFtTicker(fungibleToken).toUpperCase()} `
+                      : ` ${currencyType}`
+                  }
+                  renderText={(amount) => <ValueText data-testid={dataTestID}>{amount}</ValueText>}
+                />
+                <FiatText fiatAmount={BigNumber(fiatAmount!)} fiatCurrency={fiatCurrency} />
+              </ColumnContainer>
+            )}
+          </RowContainer>
+        )}
+      </Container>
+    </>
   );
 }
 
diff --git a/src/app/components/transactionDetailComponent/index.tsx b/src/app/components/transactionDetailComponent/index.tsx
index 4e4ed3017..5dc1c7d6f 100644
--- a/src/app/components/transactionDetailComponent/index.tsx
+++ b/src/app/components/transactionDetailComponent/index.tsx
@@ -1,6 +1,7 @@
 import { StyledFiatAmountText } from '@components/fiatAmountText';
 import useWalletSelector from '@hooks/useWalletSelector';
 import BigNumber from 'bignumber.js';
+import { useTranslation } from 'react-i18next';
 import styled from 'styled-components';
 
 const Container = styled.div((props) => ({
@@ -47,6 +48,13 @@ const FiatText = styled(StyledFiatAmountText)((props) => ({
   marginTop: props.theme.space.xxxs,
 }));
 
+const Subtitle = styled.p`
+  ${(props) => props.theme.typography.body_medium_m};
+  color: ${(props) => props.theme.colors.white_200};
+  margin-top: ${(props) => props.theme.space.s};
+  margin-bottom: ${(props) => props.theme.space.xs};
+`;
+
 type Props = {
   title: string;
   subTitle?: string;
@@ -65,19 +73,23 @@ function TransactionDetailComponent({
   titleColor,
 }: Props) {
   const { fiatCurrency } = useWalletSelector();
+  const { t } = useTranslation('translation', { keyPrefix: 'CONFIRM_TRANSACTION' });
 
   return (
-    <Container>
-      <TitleContainer>
-        <TitleText $color={titleColor}>{title}</TitleText>
-        {subTitle && <SubValueText>{subTitle}</SubValueText>}
-      </TitleContainer>
-      <ColumnContainer>
-        {value && <ValueText>{value}</ValueText>}
-        {description && <SubValueText>{description}</SubValueText>}
-        {subValue && <FiatText fiatAmount={subValue} fiatCurrency={fiatCurrency} />}
-      </ColumnContainer>
-    </Container>
+    <>
+      <Subtitle>{t('TRANSACTION_DETAILS')}</Subtitle>
+      <Container>
+        <TitleContainer>
+          <TitleText $color={titleColor}>{title}</TitleText>
+          {subTitle && <SubValueText>{subTitle}</SubValueText>}
+        </TitleContainer>
+        <ColumnContainer>
+          {value && <ValueText>{value}</ValueText>}
+          {description && <SubValueText>{description}</SubValueText>}
+          {subValue && <FiatText fiatAmount={subValue} fiatCurrency={fiatCurrency} />}
+        </ColumnContainer>
+      </Container>
+    </>
   );
 }
 

From 89a4df6312ed25df30ad654b05a5cd5289497ebd Mon Sep 17 00:00:00 2001
From: Terence Ng <ngtere@live.com.sg>
Date: Tue, 27 Aug 2024 15:51:23 +0800
Subject: [PATCH 036/227] commit fix (#527)

---
 .../confirmStxTransactionComponent/index.tsx  |  10 ++
 .../components/recipientComponent/index.tsx   | 127 +++++++++---------
 .../transactionDetailComponent/index.tsx      |  34 +++--
 3 files changed, 97 insertions(+), 74 deletions(-)

diff --git a/src/app/components/confirmStxTransactionComponent/index.tsx b/src/app/components/confirmStxTransactionComponent/index.tsx
index 07a021414..e1c4c6531 100644
--- a/src/app/components/confirmStxTransactionComponent/index.tsx
+++ b/src/app/components/confirmStxTransactionComponent/index.tsx
@@ -32,6 +32,7 @@ import { modifyRecommendedStxFees } from '@utils/transactions/transactions';
 import BigNumber from 'bignumber.js';
 import { useEffect, useState, type ReactNode } from 'react';
 import { useTranslation } from 'react-i18next';
+import styled from 'styled-components';
 import Theme from 'theme';
 import {
   ButtonsContainer,
@@ -46,6 +47,13 @@ import {
   WarningWrapper,
 } from './index.styled';
 
+const Subtitle = styled.p`
+  ${(props) => props.theme.typography.body_medium_m};
+  color: ${(props) => props.theme.colors.white_200};
+  margin-top: ${(props) => props.theme.space.s};
+  margin-bottom: ${(props) => props.theme.space.xs};
+`;
+
 // todo: make fee non option - that'll require change in all components using it
 type Props = {
   initialStxTransactions: StacksTransaction[];
@@ -352,6 +360,8 @@ function ConfirmStxTransactionComponent({
         )}
 
         {children}
+
+        <Subtitle>{t('FEES')}</Subtitle>
         <FeeRateContainer>
           <SelectFeeRate
             fee={fee}
diff --git a/src/app/components/recipientComponent/index.tsx b/src/app/components/recipientComponent/index.tsx
index f0424c984..65c101640 100644
--- a/src/app/components/recipientComponent/index.tsx
+++ b/src/app/components/recipientComponent/index.tsx
@@ -10,7 +10,7 @@ import { CubeTransparent } from '@phosphor-icons/react';
 import { type FungibleToken, getFiatEquivalent } from '@secretkeylabs/xverse-core';
 import { StyledP } from '@ui-library/common.styled';
 import type { CurrencyTypes } from '@utils/constants';
-import { getTicker } from '@utils/helper';
+import { getFtTicker } from '@utils/tokens';
 import BigNumber from 'bignumber.js';
 import { useEffect, useState } from 'react';
 import { useTranslation } from 'react-i18next';
@@ -115,6 +115,13 @@ const FiatText = styled(StyledFiatAmountText)((props) => ({
   marginTop: props.theme.space.xxxs,
 }));
 
+const Title = styled.p`
+  ${(props) => props.theme.typography.body_medium_m};
+  color: ${(props) => props.theme.colors.white_200};
+  margin-top: ${(props) => props.theme.space.s};
+  margin-bottom: ${(props) => props.theme.space.xs};
+`;
+
 type Props = {
   address?: string;
   value: string;
@@ -162,16 +169,6 @@ function RecipientComponent({
     );
   }, [value]);
 
-  const getFtTicker = () => {
-    if (fungibleToken?.ticker) {
-      return fungibleToken?.ticker.toUpperCase();
-    }
-    if (fungibleToken?.name) {
-      return getTicker(fungibleToken.name).toUpperCase();
-    }
-    return '';
-  };
-
   const renderIcon = () => {
     if (currencyType === 'RareSat') {
       return (
@@ -180,11 +177,9 @@ function RecipientComponent({
         </IconContainer>
       );
     }
-
     if (icon) {
       return <Icon src={icon} />;
     }
-
     return (
       <TokenContainer>
         <TokenImage
@@ -198,57 +193,63 @@ function RecipientComponent({
   };
 
   return (
-    <Container>
-      {address && (
-        <div>
-          {showSenderAddress ? (
-            <MultipleAddressContainer>
-              <TransferDetailView icon={WalletIcon} title={t('FROM')} address={ordinalsAddress} />
-              <DownArrowIcon src={ArrowIcon} />
-              <TransferDetailView icon={WalletIcon} title={t('TO')} address={address} />
-            </MultipleAddressContainer>
-          ) : (
-            <TransferDetailView
-              title={t('TO')}
-              address={address}
-              hideCopyButton
-              titleColor="white_400"
-            />
-          )}
-        </div>
-      )}
-
-      {heading && <RecipientTitleText>{heading}</RecipientTitleText>}
-      {value && (
-        <RowContainer>
-          <TitleContainer>
-            {renderIcon()}
-            <div>
-              <TitleText>{title}</TitleText>
-              {currencyType === 'BTC' && <Subtitle typography="body_medium_s">Bitcoin</Subtitle>}
-              {currencyType === 'STX' && <Subtitle typography="body_medium_s">Stacks</Subtitle>}
-            </div>
-          </TitleContainer>
-          {currencyType === 'NFT' || currencyType === 'Ordinal' || currencyType === 'RareSat' ? (
-            <ColumnContainer>
-              <ValueText data-testid={dataTestID}>{value}</ValueText>
-              {valueDetail && <SubValueText>{valueDetail}</SubValueText>}
-            </ColumnContainer>
-          ) : (
-            <ColumnContainer>
-              <NumericFormat
-                value={Number(value)}
-                displayType="text"
-                thousandSeparator
-                suffix={currencyType === 'FT' ? ` ${getFtTicker()} ` : ` ${currencyType}`}
-                renderText={(amount) => <ValueText data-testid={dataTestID}>{amount}</ValueText>}
+    <>
+      <Title>{t('YOU_WILL_SEND')}</Title>
+      <Container>
+        {address && (
+          <div>
+            {showSenderAddress ? (
+              <MultipleAddressContainer>
+                <TransferDetailView icon={WalletIcon} title={t('FROM')} address={ordinalsAddress} />
+                <DownArrowIcon src={ArrowIcon} />
+                <TransferDetailView icon={WalletIcon} title={t('TO')} address={address} />
+              </MultipleAddressContainer>
+            ) : (
+              <TransferDetailView
+                title={t('TO')}
+                address={address}
+                hideCopyButton
+                titleColor="white_400"
               />
-              <FiatText fiatAmount={BigNumber(fiatAmount!)} fiatCurrency={fiatCurrency} />
-            </ColumnContainer>
-          )}
-        </RowContainer>
-      )}
-    </Container>
+            )}
+          </div>
+        )}
+        {heading && <RecipientTitleText>{heading}</RecipientTitleText>}
+        {value && (
+          <RowContainer>
+            <TitleContainer>
+              {renderIcon()}
+              <div>
+                <TitleText>{title}</TitleText>
+                {currencyType === 'BTC' && <Subtitle typography="body_medium_s">Bitcoin</Subtitle>}
+                {currencyType === 'STX' && <Subtitle typography="body_medium_s">Stacks</Subtitle>}
+              </div>
+            </TitleContainer>
+            {currencyType === 'NFT' || currencyType === 'Ordinal' || currencyType === 'RareSat' ? (
+              <ColumnContainer>
+                <ValueText data-testid={dataTestID}>{value}</ValueText>
+                {valueDetail && <SubValueText>{valueDetail}</SubValueText>}
+              </ColumnContainer>
+            ) : (
+              <ColumnContainer>
+                <NumericFormat
+                  value={Number(value)}
+                  displayType="text"
+                  thousandSeparator
+                  suffix={
+                    currencyType === 'FT' && fungibleToken
+                      ? ` ${getFtTicker(fungibleToken).toUpperCase()} `
+                      : ` ${currencyType}`
+                  }
+                  renderText={(amount) => <ValueText data-testid={dataTestID}>{amount}</ValueText>}
+                />
+                <FiatText fiatAmount={BigNumber(fiatAmount!)} fiatCurrency={fiatCurrency} />
+              </ColumnContainer>
+            )}
+          </RowContainer>
+        )}
+      </Container>
+    </>
   );
 }
 
diff --git a/src/app/components/transactionDetailComponent/index.tsx b/src/app/components/transactionDetailComponent/index.tsx
index 4e4ed3017..5dc1c7d6f 100644
--- a/src/app/components/transactionDetailComponent/index.tsx
+++ b/src/app/components/transactionDetailComponent/index.tsx
@@ -1,6 +1,7 @@
 import { StyledFiatAmountText } from '@components/fiatAmountText';
 import useWalletSelector from '@hooks/useWalletSelector';
 import BigNumber from 'bignumber.js';
+import { useTranslation } from 'react-i18next';
 import styled from 'styled-components';
 
 const Container = styled.div((props) => ({
@@ -47,6 +48,13 @@ const FiatText = styled(StyledFiatAmountText)((props) => ({
   marginTop: props.theme.space.xxxs,
 }));
 
+const Subtitle = styled.p`
+  ${(props) => props.theme.typography.body_medium_m};
+  color: ${(props) => props.theme.colors.white_200};
+  margin-top: ${(props) => props.theme.space.s};
+  margin-bottom: ${(props) => props.theme.space.xs};
+`;
+
 type Props = {
   title: string;
   subTitle?: string;
@@ -65,19 +73,23 @@ function TransactionDetailComponent({
   titleColor,
 }: Props) {
   const { fiatCurrency } = useWalletSelector();
+  const { t } = useTranslation('translation', { keyPrefix: 'CONFIRM_TRANSACTION' });
 
   return (
-    <Container>
-      <TitleContainer>
-        <TitleText $color={titleColor}>{title}</TitleText>
-        {subTitle && <SubValueText>{subTitle}</SubValueText>}
-      </TitleContainer>
-      <ColumnContainer>
-        {value && <ValueText>{value}</ValueText>}
-        {description && <SubValueText>{description}</SubValueText>}
-        {subValue && <FiatText fiatAmount={subValue} fiatCurrency={fiatCurrency} />}
-      </ColumnContainer>
-    </Container>
+    <>
+      <Subtitle>{t('TRANSACTION_DETAILS')}</Subtitle>
+      <Container>
+        <TitleContainer>
+          <TitleText $color={titleColor}>{title}</TitleText>
+          {subTitle && <SubValueText>{subTitle}</SubValueText>}
+        </TitleContainer>
+        <ColumnContainer>
+          {value && <ValueText>{value}</ValueText>}
+          {description && <SubValueText>{description}</SubValueText>}
+          {subValue && <FiatText fiatAmount={subValue} fiatCurrency={fiatCurrency} />}
+        </ColumnContainer>
+      </Container>
+    </>
   );
 }
 

From 21bfc99b6008fe12797df7fdc961fe8c944ee7b0 Mon Sep 17 00:00:00 2001
From: Terence Ng <ngtere@live.com.sg>
Date: Tue, 27 Aug 2024 17:13:07 +0800
Subject: [PATCH 037/227] remove duplicate tx-detail subtitle (#528)

* commit fix

* remove duplicate

* fix
---
 .../transactionSummary.tsx                    |  2 --
 .../transactionDetailComponent/index.tsx      | 35 ++++++-------------
 .../screens/confirmStxTransaction/index.tsx   |  8 +++++
 3 files changed, 19 insertions(+), 26 deletions(-)

diff --git a/src/app/components/confirmBtcTransaction/transactionSummary.tsx b/src/app/components/confirmBtcTransaction/transactionSummary.tsx
index e54e7c2fb..2bd9dcf01 100644
--- a/src/app/components/confirmBtcTransaction/transactionSummary.tsx
+++ b/src/app/components/confirmBtcTransaction/transactionSummary.tsx
@@ -113,9 +113,7 @@ function TransactionSummary({ isSubmitting, getFeeForFeeRate, onFeeRateSet, feeR
       {!hasRuneDelegation && <BurnSection burns={runeSummary?.burns} />}
       <MintSection mints={[runeSummary?.mint]} />
       <EtchSection etch={(runeSummary as RuneSummaryActions)?.etch} />
-
       <Subtitle>{t('TRANSACTION_DETAILS')}</Subtitle>
-
       <TransactionDetailComponent title={t('NETWORK')} value={network.type} />
       <TxInOutput />
       {hasOutputScript && !runeSummary && <WarningCallout bodyText={t('SCRIPT_OUTPUT_TX')} />}
diff --git a/src/app/components/transactionDetailComponent/index.tsx b/src/app/components/transactionDetailComponent/index.tsx
index 5dc1c7d6f..94acf8027 100644
--- a/src/app/components/transactionDetailComponent/index.tsx
+++ b/src/app/components/transactionDetailComponent/index.tsx
@@ -1,7 +1,6 @@
 import { StyledFiatAmountText } from '@components/fiatAmountText';
 import useWalletSelector from '@hooks/useWalletSelector';
 import BigNumber from 'bignumber.js';
-import { useTranslation } from 'react-i18next';
 import styled from 'styled-components';
 
 const Container = styled.div((props) => ({
@@ -48,13 +47,6 @@ const FiatText = styled(StyledFiatAmountText)((props) => ({
   marginTop: props.theme.space.xxxs,
 }));
 
-const Subtitle = styled.p`
-  ${(props) => props.theme.typography.body_medium_m};
-  color: ${(props) => props.theme.colors.white_200};
-  margin-top: ${(props) => props.theme.space.s};
-  margin-bottom: ${(props) => props.theme.space.xs};
-`;
-
 type Props = {
   title: string;
   subTitle?: string;
@@ -73,23 +65,18 @@ function TransactionDetailComponent({
   titleColor,
 }: Props) {
   const { fiatCurrency } = useWalletSelector();
-  const { t } = useTranslation('translation', { keyPrefix: 'CONFIRM_TRANSACTION' });
-
   return (
-    <>
-      <Subtitle>{t('TRANSACTION_DETAILS')}</Subtitle>
-      <Container>
-        <TitleContainer>
-          <TitleText $color={titleColor}>{title}</TitleText>
-          {subTitle && <SubValueText>{subTitle}</SubValueText>}
-        </TitleContainer>
-        <ColumnContainer>
-          {value && <ValueText>{value}</ValueText>}
-          {description && <SubValueText>{description}</SubValueText>}
-          {subValue && <FiatText fiatAmount={subValue} fiatCurrency={fiatCurrency} />}
-        </ColumnContainer>
-      </Container>
-    </>
+    <Container>
+      <TitleContainer>
+        <TitleText $color={titleColor}>{title}</TitleText>
+        {subTitle && <SubValueText>{subTitle}</SubValueText>}
+      </TitleContainer>
+      <ColumnContainer>
+        {value && <ValueText>{value}</ValueText>}
+        {description && <SubValueText>{description}</SubValueText>}
+        {subValue && <FiatText fiatAmount={subValue} fiatCurrency={fiatCurrency} />}
+      </ColumnContainer>
+    </Container>
   );
 }
 
diff --git a/src/app/screens/confirmStxTransaction/index.tsx b/src/app/screens/confirmStxTransaction/index.tsx
index 92efa41af..0bbc4d6de 100644
--- a/src/app/screens/confirmStxTransaction/index.tsx
+++ b/src/app/screens/confirmStxTransaction/index.tsx
@@ -55,6 +55,13 @@ const SpendDelegatedStxWarning = styled(Callout)((props) => ({
   marginBottom: props.theme.space.m,
 }));
 
+const Subtitle = styled.p`
+  ${(props) => props.theme.typography.body_medium_m};
+  color: ${(props) => props.theme.colors.white_200};
+  margin-top: ${(props) => props.theme.space.s};
+  margin-bottom: ${(props) => props.theme.space.xs};
+`;
+
 function ConfirmStxTransaction() {
   const { t } = useTranslation('translation');
   const [hasTabClosed, setHasTabClosed] = useState(false);
@@ -350,6 +357,7 @@ function ConfirmStxTransaction() {
           currencyType="STX"
           title={t('CONFIRM_TRANSACTION.AMOUNT')}
         />
+        <Subtitle>{t('CONFIRM_TRANSACTION.TRANSACTION_DETAILS')}</Subtitle>
         <TransactionDetailComponent title={t('CONFIRM_TRANSACTION.NETWORK')} value={network.type} />
         {memo && <TransferMemoView memo={memo} />}
         {hasTabClosed && (

From 97b2b483ebf51e0f592689950f320ecf9455602b Mon Sep 17 00:00:00 2001
From: jordankzf <jordan@secretkeylabs.com>
Date: Tue, 27 Aug 2024 17:45:59 +0800
Subject: [PATCH 038/227] Fix package-lock.json

---
 package-lock.json | 30096 +++++++++++++++++++++++++++++++-------------
 1 file changed, 21107 insertions(+), 8989 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 2f47eb2c8..3dd490583 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,7 +1,7 @@
 {
   "name": "xverse-web-extension",
   "version": "0.41.0",
-  "lockfileVersion": 3,
+  "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
@@ -134,17 +134,98 @@
         "node": "^18.18.2"
       }
     },
+    "../xverse-core": {
+      "name": "@secretkeylabs/xverse-core",
+      "version": "12.0.1",
+      "extraneous": true,
+      "license": "ISC",
+      "dependencies": {
+        "@bitcoinerlab/secp256k1": "^1.0.2",
+        "@noble/curves": "^1.2.0",
+        "@noble/secp256k1": "^1.7.1",
+        "@scure/base": "^1.1.1",
+        "@scure/btc-signer": "1.2.1",
+        "@stacks/auth": "^6.9.0",
+        "@stacks/connect": "^7.4.1",
+        "@stacks/encryption": "6.9.0",
+        "@stacks/network": "6.8.1",
+        "@stacks/stacking": "^6.12.0",
+        "@stacks/storage": "^6.9.0",
+        "@stacks/transactions": "6.9.0",
+        "@stacks/wallet-sdk": "^6.9.0",
+        "@tanstack/react-query": "^4.29.3",
+        "@zondax/ledger-stacks": "^1.0.4",
+        "async-mutex": "^0.4.0",
+        "axios": "1.6.2",
+        "base64url": "^3.0.1",
+        "bip32": "^4.0.0",
+        "bip39": "3.0.3",
+        "bitcoin-address-validation": "^2.2.1",
+        "bitcoinjs-lib": "^6.1.3",
+        "bitcoinjs-message": "^2.2.0",
+        "bn.js": "^5.1.3",
+        "bs58": "^5.0.0",
+        "bs58check": "^3.0.1",
+        "buffer": "6.0.3",
+        "c32check": "^2.0.0",
+        "ecdsa-sig-formatter": "^1.0.11",
+        "ecpair": "^2.1.0",
+        "json-bigint": "^1.0.0",
+        "jsontokens": "^4.0.1",
+        "ledger-bitcoin": "^0.2.1",
+        "process": "^0.11.10",
+        "util": "^0.12.4",
+        "uuidv4": "^6.2.13",
+        "varuint-bitcoin": "^1.1.2"
+      },
+      "devDependencies": {
+        "@types/json-bigint": "^1.0.4",
+        "@types/react": "^18.2.18",
+        "@typescript-eslint/eslint-plugin": "^5.58.0",
+        "@typescript-eslint/parser": "^5.58.0",
+        "@vitest/coverage-c8": "^0.31.1",
+        "airbnb": "^0.0.2",
+        "axios-mock-adapter": "^1.22.0",
+        "bip322-js": "^1.1.0",
+        "eslint": "^8.38.0",
+        "eslint-config-airbnb-base": "^15.0.0",
+        "eslint-config-airbnb-typescript": "^17.0.0",
+        "eslint-config-prettier": "^8.8.0",
+        "eslint-plugin-import": "^2.27.5",
+        "eslint-plugin-prettier": "^4.2.1",
+        "husky": "^8.0.3",
+        "lint-staged": "^13.2.3",
+        "mockdate": "^3.0.5",
+        "prettier": "^2.8.7",
+        "rimraf": "^3.0.2",
+        "ts-loader": "^9.4.1",
+        "typescript": "^4.8.3",
+        "vitest": "^0.31.1",
+        "webpack": "^5.74.0",
+        "webpack-cli": "^4.10.0"
+      },
+      "engines": {
+        "node": "^18.18.2"
+      },
+      "peerDependencies": {
+        "bignumber.js": "^9.0.0",
+        "react": ">18.0.0",
+        "react-dom": ">18.0.0"
+      }
+    },
     "node_modules/@aashutoshrathi/word-wrap": {
       "version": "1.2.6",
+      "resolved": "https://registry.npmjs.org/@aashutoshrathi/word-wrap/-/word-wrap-1.2.6.tgz",
+      "integrity": "sha512-1Yjs2SvM8TflER/OD3cOjhWWOZb58A2t7wpE2S9XfBYTiIl+XFhQG2bjy4Pu1I+EAlCNUzRDYDdFwFYUKvXcIA==",
       "dev": true,
-      "license": "MIT",
       "engines": {
         "node": ">=0.10.0"
       }
     },
     "node_modules/@ampproject/remapping": {
       "version": "2.2.1",
-      "license": "Apache-2.0",
+      "resolved": "https://registry.npmjs.org/@ampproject/remapping/-/remapping-2.2.1.tgz",
+      "integrity": "sha512-lFMjJTrFL3j7L9yBxwYfCq2k6qqwHyzuUl/XBnif78PWTJYyL/dfowQHWE3sp6U6ZzqWiiIZnpTMO96zhkjwtg==",
       "peer": true,
       "dependencies": {
         "@jridgewell/gen-mapping": "^0.3.0",
@@ -156,14 +237,16 @@
     },
     "node_modules/@aryzing/superqs": {
       "version": "0.0.6",
-      "license": "MIT",
+      "resolved": "https://registry.npmjs.org/@aryzing/superqs/-/superqs-0.0.6.tgz",
+      "integrity": "sha512-MQR7BysZv1BqEmiFohs967UvMJMnWBipn2EFTG9AotyYXGgY67g7iofVOq8K83LAiOLVImr5kLhlzsmMTKLjFA==",
       "dependencies": {
         "superjson": "2.2.1"
       }
     },
     "node_modules/@babel/code-frame": {
       "version": "7.23.4",
-      "license": "MIT",
+      "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.23.4.tgz",
+      "integrity": "sha512-r1IONyb6Ia+jYR2vvIDhdWdlTGhqbBoFqLTQidzZ4kepUFH15ejXvFHxCVbtl7BOXIudsIubf4E81xeA3h3IXA==",
       "dependencies": {
         "@babel/highlight": "^7.23.4",
         "chalk": "^2.4.2"
@@ -174,7 +257,8 @@
     },
     "node_modules/@babel/compat-data": {
       "version": "7.23.3",
-      "license": "MIT",
+      "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.23.3.tgz",
+      "integrity": "sha512-BmR4bWbDIoFJmJ9z2cZ8Gmm2MXgEDgjdWgpKmKWUt54UGFJdlj31ECtbaDvCG/qVdG3AQ1SfpZEs01lUFbzLOQ==",
       "peer": true,
       "engines": {
         "node": ">=6.9.0"
@@ -182,7 +266,8 @@
     },
     "node_modules/@babel/core": {
       "version": "7.23.3",
-      "license": "MIT",
+      "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.23.3.tgz",
+      "integrity": "sha512-Jg+msLuNuCJDyBvFv5+OKOUjWMZgd85bKjbICd3zWrKAo+bJ49HJufi7CQE0q0uR8NGyO6xkCACScNqyjHSZew==",
       "peer": true,
       "dependencies": {
         "@ampproject/remapping": "^2.2.0",
@@ -211,12 +296,14 @@
     },
     "node_modules/@babel/core/node_modules/convert-source-map": {
       "version": "2.0.0",
-      "license": "MIT",
+      "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-2.0.0.tgz",
+      "integrity": "sha512-Kvp459HrV2FEJ1CAsi1Ku+MY3kasH19TFykTz2xWmMeq6bk2NU3XXvfJ+Q61m0xktWwt+1HSYf3JZsTms3aRJg==",
       "peer": true
     },
     "node_modules/@babel/generator": {
       "version": "7.23.4",
-      "license": "MIT",
+      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.23.4.tgz",
+      "integrity": "sha512-esuS49Cga3HcThFNebGhlgsrVLkvhqvYDTzgjfFFlHJcIfLe5jFmRRfCQ1KuBfc4Jrtn3ndLgKWAKjBE+IraYQ==",
       "dependencies": {
         "@babel/types": "^7.23.4",
         "@jridgewell/gen-mapping": "^0.3.2",
@@ -229,7 +316,8 @@
     },
     "node_modules/@babel/helper-annotate-as-pure": {
       "version": "7.22.5",
-      "license": "MIT",
+      "resolved": "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.22.5.tgz",
+      "integrity": "sha512-LvBTxu8bQSQkcyKOU+a1btnNFQ1dMAd0R6PyW3arXes06F6QLWLIrd681bxRPIXlrMGR3XYnW9JyML7dP3qgxg==",
       "dependencies": {
         "@babel/types": "^7.22.5"
       },
@@ -239,7 +327,8 @@
     },
     "node_modules/@babel/helper-compilation-targets": {
       "version": "7.22.15",
-      "license": "MIT",
+      "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.22.15.tgz",
+      "integrity": "sha512-y6EEzULok0Qvz8yyLkCvVX+02ic+By2UdOhylwUOvOn9dvYc9mKICJuuU1n1XBI02YWsNsnrY1kc6DVbjcXbtw==",
       "peer": true,
       "dependencies": {
         "@babel/compat-data": "^7.22.9",
@@ -254,14 +343,16 @@
     },
     "node_modules/@babel/helper-environment-visitor": {
       "version": "7.22.20",
-      "license": "MIT",
+      "resolved": "https://registry.npmjs.org/@babel/helper-environment-visitor/-/helper-environment-visitor-7.22.20.tgz",
+      "integrity": "sha512-zfedSIzFhat/gFhWfHtgWvlec0nqB9YEIVrpuwjruLlXfUSnA8cJB0miHKwqDnQ7d32aKo2xt88/xZptwxbfhA==",
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/helper-function-name": {
       "version": "7.23.0",
-      "license": "MIT",
+      "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.23.0.tgz",
+      "integrity": "sha512-OErEqsrxjZTJciZ4Oo+eoZqeW9UIiOcuYKRJA4ZAgV9myA+pOXhhmpfNCKjEH/auVfEYVFJ6y1Tc4r0eIApqiw==",
       "dependencies": {
         "@babel/template": "^7.22.15",
         "@babel/types": "^7.23.0"
@@ -272,7 +363,8 @@
     },
     "node_modules/@babel/helper-hoist-variables": {
       "version": "7.22.5",
-      "license": "MIT",
+      "resolved": "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.22.5.tgz",
+      "integrity": "sha512-wGjk9QZVzvknA6yKIUURb8zY3grXCcOZt+/7Wcy8O2uctxhplmUPkOdlgoNhmdVee2c92JXbf1xpMtVNbfoxRw==",
       "dependencies": {
         "@babel/types": "^7.22.5"
       },
@@ -282,7 +374,8 @@
     },
     "node_modules/@babel/helper-module-imports": {
       "version": "7.22.15",
-      "license": "MIT",
+      "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.22.15.tgz",
+      "integrity": "sha512-0pYVBnDKZO2fnSPCrgM/6WMc7eS20Fbok+0r88fp+YtWVLZrp4CkafFGIp+W0VKw4a22sgebPT99y+FDNMdP4w==",
       "dependencies": {
         "@babel/types": "^7.22.15"
       },
@@ -292,7 +385,8 @@
     },
     "node_modules/@babel/helper-module-transforms": {
       "version": "7.23.3",
-      "license": "MIT",
+      "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.23.3.tgz",
+      "integrity": "sha512-7bBs4ED9OmswdfDzpz4MpWgSrV7FXlc3zIagvLFjS5H+Mk7Snr21vQ6QwrsoCGMfNC4e4LQPdoULEt4ykz0SRQ==",
       "peer": true,
       "dependencies": {
         "@babel/helper-environment-visitor": "^7.22.20",
@@ -310,14 +404,16 @@
     },
     "node_modules/@babel/helper-plugin-utils": {
       "version": "7.22.5",
-      "license": "MIT",
+      "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.22.5.tgz",
+      "integrity": "sha512-uLls06UVKgFG9QD4OeFYLEGteMIAa5kpTPcFL28yuCIIzsf6ZyKZMllKVOCZFhiZ5ptnwX4mtKdWCBE/uT4amg==",
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/helper-simple-access": {
       "version": "7.22.5",
-      "license": "MIT",
+      "resolved": "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.22.5.tgz",
+      "integrity": "sha512-n0H99E/K+Bika3++WNL17POvo4rKWZ7lZEp1Q+fStVbUi8nxPQEBOlTmCOxW/0JsS56SKKQ+ojAe2pHKJHN35w==",
       "peer": true,
       "dependencies": {
         "@babel/types": "^7.22.5"
@@ -328,7 +424,8 @@
     },
     "node_modules/@babel/helper-split-export-declaration": {
       "version": "7.22.6",
-      "license": "MIT",
+      "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.22.6.tgz",
+      "integrity": "sha512-AsUnxuLhRYsisFiaJwvp1QF+I3KjD5FOxut14q/GzovUe6orHLesW2C7d754kRm53h5gqrz6sFl6sxc4BVtE/g==",
       "dependencies": {
         "@babel/types": "^7.22.5"
       },
@@ -338,21 +435,24 @@
     },
     "node_modules/@babel/helper-string-parser": {
       "version": "7.23.4",
-      "license": "MIT",
+      "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.23.4.tgz",
+      "integrity": "sha512-803gmbQdqwdf4olxrX4AJyFBV/RTr3rSmOj0rKwesmzlfhYNDEs+/iOcznzpNWlJlIlTJC2QfPFcHB6DlzdVLQ==",
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/helper-validator-identifier": {
       "version": "7.22.20",
-      "license": "MIT",
+      "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.22.20.tgz",
+      "integrity": "sha512-Y4OZ+ytlatR8AI+8KZfKuL5urKp7qey08ha31L8b3BwewJAoJamTzyvxPR/5D+KkdJCGPq/+8TukHBlY10FX9A==",
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/helper-validator-option": {
       "version": "7.22.15",
-      "license": "MIT",
+      "resolved": "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.22.15.tgz",
+      "integrity": "sha512-bMn7RmyFjY/mdECUbgn9eoSY4vqvacUnS9i9vGAGttgFWesO6B4CYWA7XlpbWgBt71iv/hfbPlynohStqnu5hA==",
       "peer": true,
       "engines": {
         "node": ">=6.9.0"
@@ -360,7 +460,8 @@
     },
     "node_modules/@babel/helpers": {
       "version": "7.23.4",
-      "license": "MIT",
+      "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.23.4.tgz",
+      "integrity": "sha512-HfcMizYz10cr3h29VqyfGL6ZWIjTwWfvYBMsBVGwpcbhNGe3wQ1ZXZRPzZoAHhd9OqHadHqjQ89iVKINXnbzuw==",
       "peer": true,
       "dependencies": {
         "@babel/template": "^7.22.15",
@@ -373,7 +474,8 @@
     },
     "node_modules/@babel/highlight": {
       "version": "7.23.4",
-      "license": "MIT",
+      "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.23.4.tgz",
+      "integrity": "sha512-acGdbYSfp2WheJoJm/EBBBLh/ID8KDc64ISZ9DYtBmC8/Q204PZJLHyzeB5qMzJ5trcOkybd78M4x2KWsUq++A==",
       "dependencies": {
         "@babel/helper-validator-identifier": "^7.22.20",
         "chalk": "^2.4.2",
@@ -385,7 +487,8 @@
     },
     "node_modules/@babel/parser": {
       "version": "7.23.4",
-      "license": "MIT",
+      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.23.4.tgz",
+      "integrity": "sha512-vf3Xna6UEprW+7t6EtOmFpHNAuxw3xqPZghy+brsnusscJRW5BMUzzHZc5ICjULee81WeUV2jjakG09MDglJXQ==",
       "bin": {
         "parser": "bin/babel-parser.js"
       },
@@ -395,7 +498,8 @@
     },
     "node_modules/@babel/plugin-syntax-jsx": {
       "version": "7.23.3",
-      "license": "MIT",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.23.3.tgz",
+      "integrity": "sha512-EB2MELswq55OHUoRZLGg/zC7QWUKfNLpE57m/S2yr1uEneIgsTgrSzXP3NXEsMkVn76OlaVVnzN+ugObuYGwhg==",
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.22.5"
       },
@@ -408,7 +512,8 @@
     },
     "node_modules/@babel/runtime": {
       "version": "7.22.6",
-      "license": "MIT",
+      "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.22.6.tgz",
+      "integrity": "sha512-wDb5pWm4WDdF6LFUde3Jl8WzPA+3ZbxYqkC6xAXuD3irdEHN1k0NfTRrJD8ZD378SJ61miMLCqIOXYhd8x+AJQ==",
       "dependencies": {
         "regenerator-runtime": "^0.13.11"
       },
@@ -418,7 +523,8 @@
     },
     "node_modules/@babel/template": {
       "version": "7.22.15",
-      "license": "MIT",
+      "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.22.15.tgz",
+      "integrity": "sha512-QPErUVm4uyJa60rkI73qneDacvdvzxshT3kksGqlGWYdOTIUOwJ7RDUL8sGqslY1uXWSL6xMFKEXDS3ox2uF0w==",
       "dependencies": {
         "@babel/code-frame": "^7.22.13",
         "@babel/parser": "^7.22.15",
@@ -430,7 +536,8 @@
     },
     "node_modules/@babel/traverse": {
       "version": "7.23.4",
-      "license": "MIT",
+      "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.23.4.tgz",
+      "integrity": "sha512-IYM8wSUwunWTB6tFC2dkKZhxbIjHoWemdK+3f8/wq8aKhbUscxD5MX72ubd90fxvFknaLPeGw5ycU84V1obHJg==",
       "dependencies": {
         "@babel/code-frame": "^7.23.4",
         "@babel/generator": "^7.23.4",
@@ -449,7 +556,8 @@
     },
     "node_modules/@babel/types": {
       "version": "7.23.4",
-      "license": "MIT",
+      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.23.4.tgz",
+      "integrity": "sha512-7uIFwVYpoplT5jp/kVv6EF93VaJ8H+Yn5IczYiaAi98ajzjfoZfslet/e0sLh+wVBjb2qqIut1b0S26VSafsSQ==",
       "dependencies": {
         "@babel/helper-string-parser": "^7.23.4",
         "@babel/helper-validator-identifier": "^7.22.20",
@@ -498,23 +606,27 @@
     },
     "node_modules/@emotion/is-prop-valid": {
       "version": "1.2.1",
-      "license": "MIT",
+      "resolved": "https://registry.npmjs.org/@emotion/is-prop-valid/-/is-prop-valid-1.2.1.tgz",
+      "integrity": "sha512-61Mf7Ufx4aDxx1xlDeOm8aFFigGHE4z+0sKCa+IHCeZKiyP9RLD0Mmx7m8b9/Cf37f7NAvQOOJAbQQGVr5uERw==",
       "dependencies": {
         "@emotion/memoize": "^0.8.1"
       }
     },
     "node_modules/@emotion/memoize": {
       "version": "0.8.1",
-      "license": "MIT"
+      "resolved": "https://registry.npmjs.org/@emotion/memoize/-/memoize-0.8.1.tgz",
+      "integrity": "sha512-W2P2c/VRW1/1tLox0mVUalvnWXxavmv/Oum2aPsRcoDJuob75FC3Y8FbpfLwUegRcxINtGUMPq0tFCvYNTBXNA=="
     },
     "node_modules/@emotion/stylis": {
       "version": "0.8.5",
-      "license": "MIT"
+      "resolved": "https://registry.npmjs.org/@emotion/stylis/-/stylis-0.8.5.tgz",
+      "integrity": "sha512-h6KtPihKFn3T9fuIrwvXXUOwlx3rfUvfZIcP5a6rh8Y7zjE3O06hT5Ss4S/YI1AYhuZ1kjaE/5EaOOI2NqSylQ=="
     },
     "node_modules/@ericcornelissen/bash-parser": {
       "version": "0.5.3",
+      "resolved": "https://registry.npmjs.org/@ericcornelissen/bash-parser/-/bash-parser-0.5.3.tgz",
+      "integrity": "sha512-9Z0sGuXqf6En19qmwB0Syi1Mc8TYl756dNuuaYal9mrypKa0Jq/IX6aJfh6Rk2S3z66KBisWTqloDo7weYj4zg==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "array-last": "^1.1.1",
         "babylon": "^6.9.1",
@@ -540,3073 +652,3413 @@
     },
     "node_modules/@ericcornelissen/bash-parser/node_modules/magic-string": {
       "version": "0.16.0",
+      "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.16.0.tgz",
+      "integrity": "sha512-c4BEos3y6G2qO0B9X7K0FVLOPT9uGrjYwYRLFmDqyl5YMboUviyecnXWp94fJTSMwPw2/sf+CEYt5AGpmklkkQ==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "vlq": "^0.2.1"
       }
     },
-    "node_modules/@esbuild/darwin-arm64": {
+    "node_modules/@esbuild/aix-ppc64": {
       "version": "0.21.5",
+      "resolved": "https://registry.npmjs.org/@esbuild/aix-ppc64/-/aix-ppc64-0.21.5.tgz",
+      "integrity": "sha512-1SDgH6ZSPTlggy1yI6+Dbkiz8xzpHJEVAlF/AM1tHPLsf5STom9rwtjE4hKAF20FfXXNTFqEYXyJNWh1GiZedQ==",
       "cpu": [
-        "arm64"
+        "ppc64"
       ],
       "dev": true,
-      "license": "MIT",
       "optional": true,
       "os": [
-        "darwin"
+        "aix"
       ],
       "engines": {
         "node": ">=12"
       }
     },
-    "node_modules/@eslint-community/eslint-utils": {
-      "version": "4.4.0",
+    "node_modules/@esbuild/android-arm": {
+      "version": "0.21.5",
+      "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.21.5.tgz",
+      "integrity": "sha512-vCPvzSjpPHEi1siZdlvAlsPxXl7WbOVUBBAowWug4rJHb68Ox8KualB+1ocNvT5fjv6wpkX6o/iEpbDrf68zcg==",
+      "cpu": [
+        "arm"
+      ],
       "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "eslint-visitor-keys": "^3.3.0"
-      },
+      "optional": true,
+      "os": [
+        "android"
+      ],
       "engines": {
-        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
-      },
-      "peerDependencies": {
-        "eslint": "^6.0.0 || ^7.0.0 || >=8.0.0"
+        "node": ">=12"
       }
     },
-    "node_modules/@eslint-community/regexpp": {
-      "version": "4.6.2",
+    "node_modules/@esbuild/android-arm64": {
+      "version": "0.21.5",
+      "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.21.5.tgz",
+      "integrity": "sha512-c0uX9VAUBQ7dTDCjq+wdyGLowMdtR/GoC2U5IYk/7D1H1JYC0qseD7+11iMP2mRLN9RcCMRcjC4YMclCzGwS/A==",
+      "cpu": [
+        "arm64"
+      ],
       "dev": true,
-      "license": "MIT",
+      "optional": true,
+      "os": [
+        "android"
+      ],
       "engines": {
-        "node": "^12.0.0 || ^14.0.0 || >=16.0.0"
+        "node": ">=12"
       }
     },
-    "node_modules/@eslint/eslintrc": {
-      "version": "2.1.4",
+    "node_modules/@esbuild/android-x64": {
+      "version": "0.21.5",
+      "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.21.5.tgz",
+      "integrity": "sha512-D7aPRUUNHRBwHxzxRvp856rjUHRFW1SdQATKXH2hqA0kAZb1hKmi02OpYRacl0TxIGz/ZmXWlbZgjwWYaCakTA==",
+      "cpu": [
+        "x64"
+      ],
       "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "ajv": "^6.12.4",
-        "debug": "^4.3.2",
-        "espree": "^9.6.0",
-        "globals": "^13.19.0",
-        "ignore": "^5.2.0",
-        "import-fresh": "^3.2.1",
-        "js-yaml": "^4.1.0",
-        "minimatch": "^3.1.2",
-        "strip-json-comments": "^3.1.1"
-      },
+      "optional": true,
+      "os": [
+        "android"
+      ],
       "engines": {
-        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
-      },
-      "funding": {
-        "url": "https://opencollective.com/eslint"
+        "node": ">=12"
       }
     },
-    "node_modules/@eslint/eslintrc/node_modules/globals": {
-      "version": "13.24.0",
+    "node_modules/@esbuild/darwin-arm64": {
+      "version": "0.21.5",
+      "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.21.5.tgz",
+      "integrity": "sha512-DwqXqZyuk5AiWWf3UfLiRDJ5EDd49zg6O9wclZ7kUMv2WRFr4HKjXp/5t8JZ11QbQfUS6/cRCKGwYhtNAY88kQ==",
+      "cpu": [
+        "arm64"
+      ],
       "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "type-fest": "^0.20.2"
-      },
+      "optional": true,
+      "os": [
+        "darwin"
+      ],
       "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
+        "node": ">=12"
       }
     },
-    "node_modules/@eslint/eslintrc/node_modules/type-fest": {
-      "version": "0.20.2",
+    "node_modules/@esbuild/darwin-x64": {
+      "version": "0.21.5",
+      "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.21.5.tgz",
+      "integrity": "sha512-se/JjF8NlmKVG4kNIuyWMV/22ZaerB+qaSi5MdrXtd6R08kvs2qCN4C09miupktDitvh8jRFflwGFBQcxZRjbw==",
+      "cpu": [
+        "x64"
+      ],
       "dev": true,
-      "license": "(MIT OR CC0-1.0)",
+      "optional": true,
+      "os": [
+        "darwin"
+      ],
       "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
+        "node": ">=12"
       }
     },
-    "node_modules/@eslint/js": {
-      "version": "8.40.0",
+    "node_modules/@esbuild/freebsd-arm64": {
+      "version": "0.21.5",
+      "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.21.5.tgz",
+      "integrity": "sha512-5JcRxxRDUJLX8JXp/wcBCy3pENnCgBR9bN6JsY4OmhfUtIHe3ZW0mawA7+RDAcMLrMIZaf03NlQiX9DGyB8h4g==",
+      "cpu": [
+        "arm64"
+      ],
       "dev": true,
-      "license": "MIT",
+      "optional": true,
+      "os": [
+        "freebsd"
+      ],
       "engines": {
-        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
-      }
-    },
-    "node_modules/@floating-ui/core": {
-      "version": "1.4.1",
-      "license": "MIT",
-      "dependencies": {
-        "@floating-ui/utils": "^0.1.1"
-      }
-    },
-    "node_modules/@floating-ui/dom": {
-      "version": "1.5.1",
-      "license": "MIT",
-      "dependencies": {
-        "@floating-ui/core": "^1.4.1",
-        "@floating-ui/utils": "^0.1.1"
+        "node": ">=12"
       }
     },
-    "node_modules/@floating-ui/utils": {
-      "version": "0.1.1",
-      "license": "MIT"
-    },
-    "node_modules/@humanwhocodes/config-array": {
-      "version": "0.11.14",
+    "node_modules/@esbuild/freebsd-x64": {
+      "version": "0.21.5",
+      "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.21.5.tgz",
+      "integrity": "sha512-J95kNBj1zkbMXtHVH29bBriQygMXqoVQOQYA+ISs0/2l3T9/kj42ow2mpqerRBxDJnmkUDCaQT/dfNXWX/ZZCQ==",
+      "cpu": [
+        "x64"
+      ],
       "dev": true,
-      "license": "Apache-2.0",
-      "dependencies": {
-        "@humanwhocodes/object-schema": "^2.0.2",
-        "debug": "^4.3.1",
-        "minimatch": "^3.0.5"
-      },
+      "optional": true,
+      "os": [
+        "freebsd"
+      ],
       "engines": {
-        "node": ">=10.10.0"
+        "node": ">=12"
       }
     },
-    "node_modules/@humanwhocodes/module-importer": {
-      "version": "1.0.1",
+    "node_modules/@esbuild/linux-arm": {
+      "version": "0.21.5",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.21.5.tgz",
+      "integrity": "sha512-bPb5AHZtbeNGjCKVZ9UGqGwo8EUu4cLq68E95A53KlxAPRmUyYv2D6F0uUI65XisGOL1hBP5mTronbgo+0bFcA==",
+      "cpu": [
+        "arm"
+      ],
       "dev": true,
-      "license": "Apache-2.0",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
       "engines": {
-        "node": ">=12.22"
-      },
-      "funding": {
-        "type": "github",
-        "url": "https://github.com/sponsors/nzakas"
+        "node": ">=12"
       }
     },
-    "node_modules/@humanwhocodes/object-schema": {
-      "version": "2.0.2",
-      "dev": true,
-      "license": "BSD-3-Clause"
-    },
-    "node_modules/@jest/schemas": {
-      "version": "29.6.3",
+    "node_modules/@esbuild/linux-arm64": {
+      "version": "0.21.5",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.21.5.tgz",
+      "integrity": "sha512-ibKvmyYzKsBeX8d8I7MH/TMfWDXBF3db4qM6sy+7re0YXya+K1cem3on9XgdT2EQGMu4hQyZhan7TeQ8XkGp4Q==",
+      "cpu": [
+        "arm64"
+      ],
       "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "@sinclair/typebox": "^0.27.8"
-      },
+      "optional": true,
+      "os": [
+        "linux"
+      ],
       "engines": {
-        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+        "node": ">=12"
       }
     },
-    "node_modules/@jridgewell/gen-mapping": {
-      "version": "0.3.3",
-      "license": "MIT",
-      "dependencies": {
-        "@jridgewell/set-array": "^1.0.1",
-        "@jridgewell/sourcemap-codec": "^1.4.10",
-        "@jridgewell/trace-mapping": "^0.3.9"
-      },
+    "node_modules/@esbuild/linux-ia32": {
+      "version": "0.21.5",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.21.5.tgz",
+      "integrity": "sha512-YvjXDqLRqPDl2dvRODYmmhz4rPeVKYvppfGYKSNGdyZkA01046pLWyRKKI3ax8fbJoK5QbxblURkwK/MWY18Tg==",
+      "cpu": [
+        "ia32"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "linux"
+      ],
       "engines": {
-        "node": ">=6.0.0"
+        "node": ">=12"
       }
     },
-    "node_modules/@jridgewell/resolve-uri": {
-      "version": "3.1.0",
-      "license": "MIT",
+    "node_modules/@esbuild/linux-loong64": {
+      "version": "0.21.5",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.21.5.tgz",
+      "integrity": "sha512-uHf1BmMG8qEvzdrzAqg2SIG/02+4/DHB6a9Kbya0XDvwDEKCoC8ZRWI5JJvNdUjtciBGFQ5PuBlpEOXQj+JQSg==",
+      "cpu": [
+        "loong64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "linux"
+      ],
       "engines": {
-        "node": ">=6.0.0"
+        "node": ">=12"
       }
     },
-    "node_modules/@jridgewell/set-array": {
-      "version": "1.1.2",
-      "license": "MIT",
+    "node_modules/@esbuild/linux-mips64el": {
+      "version": "0.21.5",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.21.5.tgz",
+      "integrity": "sha512-IajOmO+KJK23bj52dFSNCMsz1QP1DqM6cwLUv3W1QwyxkyIWecfafnI555fvSGqEKwjMXVLokcV5ygHW5b3Jbg==",
+      "cpu": [
+        "mips64el"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "linux"
+      ],
       "engines": {
-        "node": ">=6.0.0"
+        "node": ">=12"
       }
     },
-    "node_modules/@jridgewell/source-map": {
-      "version": "0.3.5",
+    "node_modules/@esbuild/linux-ppc64": {
+      "version": "0.21.5",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.21.5.tgz",
+      "integrity": "sha512-1hHV/Z4OEfMwpLO8rp7CvlhBDnjsC3CttJXIhBi+5Aj5r+MBvy4egg7wCbe//hSsT+RvDAG7s81tAvpL2XAE4w==",
+      "cpu": [
+        "ppc64"
+      ],
       "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "@jridgewell/gen-mapping": "^0.3.0",
-        "@jridgewell/trace-mapping": "^0.3.9"
-      }
-    },
-    "node_modules/@jridgewell/sourcemap-codec": {
-      "version": "1.4.15",
-      "license": "MIT"
-    },
-    "node_modules/@jridgewell/trace-mapping": {
-      "version": "0.3.18",
-      "license": "MIT",
-      "dependencies": {
-        "@jridgewell/resolve-uri": "3.1.0",
-        "@jridgewell/sourcemap-codec": "1.4.14"
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=12"
       }
     },
-    "node_modules/@jridgewell/trace-mapping/node_modules/@jridgewell/sourcemap-codec": {
-      "version": "1.4.14",
-      "license": "MIT"
-    },
-    "node_modules/@ledgerhq/devices": {
-      "version": "8.0.5",
-      "license": "Apache-2.0",
-      "dependencies": {
-        "@ledgerhq/errors": "^6.13.0",
-        "@ledgerhq/logs": "^6.10.1",
-        "rxjs": "6",
-        "semver": "^7.3.5"
+    "node_modules/@esbuild/linux-riscv64": {
+      "version": "0.21.5",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.21.5.tgz",
+      "integrity": "sha512-2HdXDMd9GMgTGrPWnJzP2ALSokE/0O5HhTUvWIbD3YdjME8JwvSCnNGBnTThKGEB91OZhzrJ4qIIxk/SBmyDDA==",
+      "cpu": [
+        "riscv64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=12"
       }
     },
-    "node_modules/@ledgerhq/devices/node_modules/lru-cache": {
-      "version": "6.0.0",
-      "license": "ISC",
-      "dependencies": {
-        "yallist": "^4.0.0"
-      },
+    "node_modules/@esbuild/linux-s390x": {
+      "version": "0.21.5",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.21.5.tgz",
+      "integrity": "sha512-zus5sxzqBJD3eXxwvjN1yQkRepANgxE9lgOW2qLnmr8ikMTphkjgXu1HR01K4FJg8h1kEEDAqDcZQtbrRnB41A==",
+      "cpu": [
+        "s390x"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "linux"
+      ],
       "engines": {
-        "node": ">=10"
+        "node": ">=12"
       }
     },
-    "node_modules/@ledgerhq/devices/node_modules/semver": {
-      "version": "7.5.4",
-      "license": "ISC",
-      "dependencies": {
-        "lru-cache": "^6.0.0"
-      },
-      "bin": {
-        "semver": "bin/semver.js"
-      },
+    "node_modules/@esbuild/linux-x64": {
+      "version": "0.21.5",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.21.5.tgz",
+      "integrity": "sha512-1rYdTpyv03iycF1+BhzrzQJCdOuAOtaqHTWJZCWvijKD2N5Xu0TtVC8/+1faWqcP9iBCWOmjmhoH94dH82BxPQ==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "linux"
+      ],
       "engines": {
-        "node": ">=10"
+        "node": ">=12"
       }
     },
-    "node_modules/@ledgerhq/devices/node_modules/yallist": {
-      "version": "4.0.0",
-      "license": "ISC"
-    },
-    "node_modules/@ledgerhq/errors": {
-      "version": "6.13.0",
-      "license": "Apache-2.0"
-    },
-    "node_modules/@ledgerhq/hw-transport": {
-      "version": "6.28.6",
-      "license": "Apache-2.0",
-      "dependencies": {
-        "@ledgerhq/devices": "^8.0.5",
-        "@ledgerhq/errors": "^6.13.0",
-        "events": "^3.3.0"
+    "node_modules/@esbuild/netbsd-x64": {
+      "version": "0.21.5",
+      "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.21.5.tgz",
+      "integrity": "sha512-Woi2MXzXjMULccIwMnLciyZH4nCIMpWQAs049KEeMvOcNADVxo0UBIQPfSmxB3CWKedngg7sWZdLvLczpe0tLg==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "netbsd"
+      ],
+      "engines": {
+        "node": ">=12"
       }
     },
-    "node_modules/@ledgerhq/hw-transport-webusb": {
-      "version": "6.27.17",
-      "license": "Apache-2.0",
-      "dependencies": {
-        "@ledgerhq/devices": "^8.0.5",
-        "@ledgerhq/errors": "^6.13.0",
-        "@ledgerhq/hw-transport": "^6.28.6",
-        "@ledgerhq/logs": "^6.10.1"
+    "node_modules/@esbuild/openbsd-x64": {
+      "version": "0.21.5",
+      "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.21.5.tgz",
+      "integrity": "sha512-HLNNw99xsvx12lFBUwoT8EVCsSvRNDVxNpjZ7bPn947b8gJPzeHWyNVhFsaerc0n3TsbOINvRP2byTZ5LKezow==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "openbsd"
+      ],
+      "engines": {
+        "node": ">=12"
       }
     },
-    "node_modules/@ledgerhq/logs": {
-      "version": "6.10.1",
-      "license": "Apache-2.0"
-    },
-    "node_modules/@leichtgewicht/ip-codec": {
-      "version": "2.0.4",
+    "node_modules/@esbuild/sunos-x64": {
+      "version": "0.21.5",
+      "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.21.5.tgz",
+      "integrity": "sha512-6+gjmFpfy0BHU5Tpptkuh8+uw3mnrvgs+dSPQXQOv3ekbordwnzTVEb4qnIvQcYXq6gzkyTnoZ9dZG+D4garKg==",
+      "cpu": [
+        "x64"
+      ],
       "dev": true,
-      "license": "MIT"
-    },
-    "node_modules/@noble/curves": {
-      "version": "1.3.0",
-      "license": "MIT",
-      "dependencies": {
-        "@noble/hashes": "1.3.3"
-      },
-      "funding": {
-        "url": "https://paulmillr.com/funding/"
+      "optional": true,
+      "os": [
+        "sunos"
+      ],
+      "engines": {
+        "node": ">=12"
       }
     },
-    "node_modules/@noble/hashes": {
-      "version": "1.3.3",
-      "license": "MIT",
+    "node_modules/@esbuild/win32-arm64": {
+      "version": "0.21.5",
+      "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.21.5.tgz",
+      "integrity": "sha512-Z0gOTd75VvXqyq7nsl93zwahcTROgqvuAcYDUr+vOv8uHhNSKROyU961kgtCD1e95IqPKSQKH7tBTslnS3tA8A==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "win32"
+      ],
       "engines": {
-        "node": ">= 16"
-      },
-      "funding": {
-        "url": "https://paulmillr.com/funding/"
+        "node": ">=12"
       }
     },
-    "node_modules/@noble/secp256k1": {
-      "version": "1.7.1",
-      "funding": [
-        {
-          "type": "individual",
-          "url": "https://paulmillr.com/funding/"
-        }
+    "node_modules/@esbuild/win32-ia32": {
+      "version": "0.21.5",
+      "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.21.5.tgz",
+      "integrity": "sha512-SWXFF1CL2RVNMaVs+BBClwtfZSvDgtL//G/smwAc5oVK/UPu2Gu9tIaRgFmYFFKrmg3SyAjSrElf0TiJ1v8fYA==",
+      "cpu": [
+        "ia32"
       ],
-      "license": "MIT"
-    },
-    "node_modules/@nodelib/fs.scandir": {
-      "version": "2.1.5",
       "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "@nodelib/fs.stat": "2.0.5",
-        "run-parallel": "^1.1.9"
-      },
+      "optional": true,
+      "os": [
+        "win32"
+      ],
       "engines": {
-        "node": ">= 8"
+        "node": ">=12"
       }
     },
-    "node_modules/@nodelib/fs.stat": {
-      "version": "2.0.5",
+    "node_modules/@esbuild/win32-x64": {
+      "version": "0.21.5",
+      "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.21.5.tgz",
+      "integrity": "sha512-tQd/1efJuzPC6rCFwEvLtci/xNFcTZknmXs98FYDfGE4wP9ClFV98nyKrzJKVPMhdDnjzLhdUyMX4PsQAPjwIw==",
+      "cpu": [
+        "x64"
+      ],
       "dev": true,
-      "license": "MIT",
+      "optional": true,
+      "os": [
+        "win32"
+      ],
       "engines": {
-        "node": ">= 8"
+        "node": ">=12"
       }
     },
-    "node_modules/@nodelib/fs.walk": {
-      "version": "1.2.8",
+    "node_modules/@eslint-community/eslint-utils": {
+      "version": "4.4.0",
+      "resolved": "https://registry.npmjs.org/@eslint-community/eslint-utils/-/eslint-utils-4.4.0.tgz",
+      "integrity": "sha512-1/sA4dwrzBAyeUoQ6oxahHKmrZvsnLCg4RfxW3ZFGGmQkSNQPFNLV9CUEFQP1x9EYXHTo5p6xdhZM1Ne9p/AfA==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "@nodelib/fs.scandir": "2.1.5",
-        "fastq": "^1.6.0"
+        "eslint-visitor-keys": "^3.3.0"
       },
       "engines": {
-        "node": ">= 8"
-      }
-    },
-    "node_modules/@phosphor-icons/react": {
-      "version": "2.0.10",
-      "license": "MIT",
-      "engines": {
-        "node": ">=10"
+        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
       },
       "peerDependencies": {
-        "react": ">= 16.8",
-        "react-dom": ">= 16.8"
+        "eslint": "^6.0.0 || ^7.0.0 || >=8.0.0"
       }
     },
-    "node_modules/@playwright/test": {
-      "version": "1.45.2",
-      "license": "Apache-2.0",
-      "dependencies": {
-        "playwright": "1.45.2"
-      },
-      "bin": {
-        "playwright": "cli.js"
-      },
+    "node_modules/@eslint-community/regexpp": {
+      "version": "4.6.2",
+      "resolved": "https://registry.npmjs.org/@eslint-community/regexpp/-/regexpp-4.6.2.tgz",
+      "integrity": "sha512-pPTNuaAG3QMH+buKyBIGJs3g/S5y0caxw0ygM3YyE6yJFySwiGGSzA+mM3KJ8QQvzeLh3blwgSonkFjgQdxzMw==",
+      "dev": true,
       "engines": {
-        "node": ">=18"
+        "node": "^12.0.0 || ^14.0.0 || >=16.0.0"
       }
     },
-    "node_modules/@pmmmwh/react-refresh-webpack-plugin": {
-      "version": "0.5.10",
+    "node_modules/@eslint/eslintrc": {
+      "version": "2.1.4",
+      "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-2.1.4.tgz",
+      "integrity": "sha512-269Z39MS6wVJtsoUl10L60WdkhJVdPG24Q4eZTH3nnF6lpvSShEK3wQjDX9JRWAUPvPh7COouPpU9IrqaZFvtQ==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "ansi-html-community": "^0.0.8",
-        "common-path-prefix": "^3.0.0",
-        "core-js-pure": "^3.23.3",
-        "error-stack-parser": "^2.0.6",
-        "find-up": "^5.0.0",
-        "html-entities": "^2.1.0",
-        "loader-utils": "^2.0.4",
-        "schema-utils": "^3.0.0",
-        "source-map": "^0.7.3"
+        "ajv": "^6.12.4",
+        "debug": "^4.3.2",
+        "espree": "^9.6.0",
+        "globals": "^13.19.0",
+        "ignore": "^5.2.0",
+        "import-fresh": "^3.2.1",
+        "js-yaml": "^4.1.0",
+        "minimatch": "^3.1.2",
+        "strip-json-comments": "^3.1.1"
       },
       "engines": {
-        "node": ">= 10.13"
-      },
-      "peerDependencies": {
-        "@types/webpack": "4.x || 5.x",
-        "react-refresh": ">=0.10.0 <1.0.0",
-        "sockjs-client": "^1.4.0",
-        "type-fest": ">=0.17.0 <4.0.0",
-        "webpack": ">=4.43.0 <6.0.0",
-        "webpack-dev-server": "3.x || 4.x",
-        "webpack-hot-middleware": "2.x",
-        "webpack-plugin-serve": "0.x || 1.x"
+        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
       },
-      "peerDependenciesMeta": {
-        "@types/webpack": {
-          "optional": true
-        },
-        "sockjs-client": {
-          "optional": true
-        },
-        "type-fest": {
-          "optional": true
-        },
-        "webpack-dev-server": {
-          "optional": true
-        },
-        "webpack-hot-middleware": {
-          "optional": true
-        },
-        "webpack-plugin-serve": {
-          "optional": true
-        }
+      "funding": {
+        "url": "https://opencollective.com/eslint"
       }
     },
-    "node_modules/@rc-component/portal": {
-      "version": "1.1.2",
-      "license": "MIT",
+    "node_modules/@eslint/eslintrc/node_modules/globals": {
+      "version": "13.24.0",
+      "resolved": "https://registry.npmjs.org/globals/-/globals-13.24.0.tgz",
+      "integrity": "sha512-AhO5QUcj8llrbG09iWhPU2B204J1xnPeL8kQmVorSsy+Sjj1sk8gIyh6cUocGmH4L0UuhAJy+hJMRA4mgA4mFQ==",
+      "dev": true,
       "dependencies": {
-        "@babel/runtime": "^7.18.0",
-        "classnames": "^2.3.2",
-        "rc-util": "^5.24.4"
+        "type-fest": "^0.20.2"
       },
       "engines": {
-        "node": ">=8.x"
+        "node": ">=8"
       },
-      "peerDependencies": {
-        "react": ">=16.9.0",
-        "react-dom": ">=16.9.0"
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/@react-spring/animated": {
-      "version": "9.7.3",
-      "license": "MIT",
-      "dependencies": {
-        "@react-spring/shared": "~9.7.3",
-        "@react-spring/types": "~9.7.3"
+    "node_modules/@eslint/eslintrc/node_modules/type-fest": {
+      "version": "0.20.2",
+      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.20.2.tgz",
+      "integrity": "sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=10"
       },
-      "peerDependencies": {
-        "react": "^16.8.0 || ^17.0.0 || ^18.0.0"
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/@react-spring/core": {
-      "version": "9.7.3",
-      "license": "MIT",
+    "node_modules/@eslint/js": {
+      "version": "8.40.0",
+      "resolved": "https://registry.npmjs.org/@eslint/js/-/js-8.40.0.tgz",
+      "integrity": "sha512-ElyB54bJIhXQYVKjDSvCkPO1iU1tSAeVQJbllWJq1XQSmmA4dgFk8CbiBGpiOPxleE48vDogxCtmMYku4HSVLA==",
+      "dev": true,
+      "engines": {
+        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+      }
+    },
+    "node_modules/@floating-ui/core": {
+      "version": "1.4.1",
+      "resolved": "https://registry.npmjs.org/@floating-ui/core/-/core-1.4.1.tgz",
+      "integrity": "sha512-jk3WqquEJRlcyu7997NtR5PibI+y5bi+LS3hPmguVClypenMsCY3CBa3LAQnozRCtCrYWSEtAdiskpamuJRFOQ==",
       "dependencies": {
-        "@react-spring/animated": "~9.7.3",
-        "@react-spring/shared": "~9.7.3",
-        "@react-spring/types": "~9.7.3"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/react-spring/donate"
-      },
-      "peerDependencies": {
-        "react": "^16.8.0 || ^17.0.0 || ^18.0.0"
+        "@floating-ui/utils": "^0.1.1"
       }
     },
-    "node_modules/@react-spring/shared": {
-      "version": "9.7.3",
-      "license": "MIT",
+    "node_modules/@floating-ui/dom": {
+      "version": "1.5.1",
+      "resolved": "https://registry.npmjs.org/@floating-ui/dom/-/dom-1.5.1.tgz",
+      "integrity": "sha512-KwvVcPSXg6mQygvA1TjbN/gh///36kKtllIF8SUm0qpFj8+rvYrpvlYdL1JoA71SHpDqgSSdGOSoQ0Mp3uY5aw==",
       "dependencies": {
-        "@react-spring/types": "~9.7.3"
-      },
-      "peerDependencies": {
-        "react": "^16.8.0 || ^17.0.0 || ^18.0.0"
+        "@floating-ui/core": "^1.4.1",
+        "@floating-ui/utils": "^0.1.1"
       }
     },
-    "node_modules/@react-spring/types": {
-      "version": "9.7.3",
-      "license": "MIT"
+    "node_modules/@floating-ui/utils": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/@floating-ui/utils/-/utils-0.1.1.tgz",
+      "integrity": "sha512-m0G6wlnhm/AX0H12IOWtK8gASEMffnX08RtKkCgTdHb9JpHKGloI7icFfLg9ZmQeavcvR0PKmzxClyuFPSjKWw=="
     },
-    "node_modules/@react-spring/web": {
-      "version": "9.7.3",
-      "license": "MIT",
+    "node_modules/@humanwhocodes/config-array": {
+      "version": "0.11.14",
+      "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.11.14.tgz",
+      "integrity": "sha512-3T8LkOmg45BV5FICb15QQMsyUSWrQ8AygVfC7ZG32zOalnqrilm018ZVCw0eapXux8FtA33q8PSRSstjee3jSg==",
+      "dev": true,
       "dependencies": {
-        "@react-spring/animated": "~9.7.3",
-        "@react-spring/core": "~9.7.3",
-        "@react-spring/shared": "~9.7.3",
-        "@react-spring/types": "~9.7.3"
+        "@humanwhocodes/object-schema": "^2.0.2",
+        "debug": "^4.3.1",
+        "minimatch": "^3.0.5"
       },
-      "peerDependencies": {
-        "react": "^16.8.0 || ^17.0.0 || ^18.0.0",
-        "react-dom": "^16.8.0 || ^17.0.0 || ^18.0.0"
+      "engines": {
+        "node": ">=10.10.0"
       }
     },
-    "node_modules/@remix-run/router": {
-      "version": "1.7.2",
-      "license": "MIT",
+    "node_modules/@humanwhocodes/module-importer": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/@humanwhocodes/module-importer/-/module-importer-1.0.1.tgz",
+      "integrity": "sha512-bxveV4V8v5Yb4ncFTT3rPSgZBOpCkjfK0y4oVVVJwIuDVBRMDXrPyXRL988i5ap9m9bnyEEjWfm5WkBmtffLfA==",
+      "dev": true,
       "engines": {
-        "node": ">=14"
+        "node": ">=12.22"
+      },
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/nzakas"
       }
     },
-    "node_modules/@rollup/rollup-darwin-arm64": {
-      "version": "4.18.0",
-      "cpu": [
-        "arm64"
-      ],
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "darwin"
-      ]
+    "node_modules/@humanwhocodes/object-schema": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/@humanwhocodes/object-schema/-/object-schema-2.0.2.tgz",
+      "integrity": "sha512-6EwiSjwWYP7pTckG6I5eyFANjPhmPjUX9JRLUSfNPC7FX7zK9gyZAfUEaECL6ALTpGX5AjnBq3C9XmVWPitNpw==",
+      "dev": true
     },
-    "node_modules/@sats-connect/core": {
-      "version": "0.2.1",
-      "license": "ISC",
+    "node_modules/@jest/schemas": {
+      "version": "29.6.3",
+      "resolved": "https://registry.npmjs.org/@jest/schemas/-/schemas-29.6.3.tgz",
+      "integrity": "sha512-mo5j5X+jIZmJQveBKeS/clAueipV7KgiX1vMgCxam1RNYiqE1w62n0/tJJnHtjW8ZHcQco5gY85jA3mi0L+nSA==",
+      "dev": true,
       "dependencies": {
-        "axios": "1.6.8",
-        "bitcoin-address-validation": "2.2.3",
-        "buffer": "6.0.3",
-        "jsontokens": "4.0.1",
-        "lodash.omit": "4.5.0"
+        "@sinclair/typebox": "^0.27.8"
       },
-      "peerDependencies": {
-        "valibot": "0.33.2"
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
       }
     },
-    "node_modules/@sats-connect/core/node_modules/axios": {
-      "version": "1.6.8",
-      "license": "MIT",
+    "node_modules/@jridgewell/gen-mapping": {
+      "version": "0.3.3",
+      "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.3.tgz",
+      "integrity": "sha512-HLhSWOLRi875zjjMG/r+Nv0oCW8umGb0BgEhyX3dDX3egwZtB8PqLnjz3yedt8R5StBrzcg4aBpnh8UA9D1BoQ==",
       "dependencies": {
-        "follow-redirects": "^1.15.6",
-        "form-data": "^4.0.0",
-        "proxy-from-env": "^1.1.0"
+        "@jridgewell/set-array": "^1.0.1",
+        "@jridgewell/sourcemap-codec": "^1.4.10",
+        "@jridgewell/trace-mapping": "^0.3.9"
+      },
+      "engines": {
+        "node": ">=6.0.0"
       }
     },
-    "node_modules/@scure/base": {
-      "version": "1.1.7",
-      "license": "MIT",
-      "funding": {
-        "url": "https://paulmillr.com/funding/"
+    "node_modules/@jridgewell/resolve-uri": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.1.0.tgz",
+      "integrity": "sha512-F2msla3tad+Mfht5cJq7LSXcdudKTWCVYUgw6pLFOOHSTtZlj6SWNYAp+AhuqLmWdBO2X5hPrLcu8cVP8fy28w==",
+      "engines": {
+        "node": ">=6.0.0"
       }
     },
-    "node_modules/@scure/bip32": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/@scure/bip32/-/bip32-1.4.0.tgz",
-      "integrity": "sha512-sVUpc0Vq3tXCkDGYVWGIZTRfnvu8LoTDaev7vbwh0omSvVORONr960MQWdKqJDCReIEmTj3PAr73O3aoxz7OPg==",
-      "dependencies": {
-        "@noble/curves": "~1.4.0",
-        "@noble/hashes": "~1.4.0",
-        "@scure/base": "~1.1.6"
-      },
-      "funding": {
-        "url": "https://paulmillr.com/funding/"
+    "node_modules/@jridgewell/set-array": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/@jridgewell/set-array/-/set-array-1.1.2.tgz",
+      "integrity": "sha512-xnkseuNADM0gt2bs+BvhO0p78Mk762YnZdsuzFV018NoG1Sj1SCQvpSqa7XUaTam5vAGasABV9qXASMKnFMwMw==",
+      "engines": {
+        "node": ">=6.0.0"
       }
     },
-    "node_modules/@scure/bip32/node_modules/@noble/curves": {
-      "version": "1.4.2",
-      "resolved": "https://registry.npmjs.org/@noble/curves/-/curves-1.4.2.tgz",
-      "integrity": "sha512-TavHr8qycMChk8UwMld0ZDRvatedkzWfH8IiaeGCfymOP5i0hSCozz9vHOL0nkwk7HRMlFnAiKpS2jrUmSybcw==",
+    "node_modules/@jridgewell/source-map": {
+      "version": "0.3.5",
+      "resolved": "https://registry.npmjs.org/@jridgewell/source-map/-/source-map-0.3.5.tgz",
+      "integrity": "sha512-UTYAUj/wviwdsMfzoSJspJxbkH5o1snzwX0//0ENX1u/55kkZZkcTZP6u9bwKGkv+dkk9at4m1Cpt0uY80kcpQ==",
+      "dev": true,
       "dependencies": {
-        "@noble/hashes": "1.4.0"
-      },
-      "funding": {
-        "url": "https://paulmillr.com/funding/"
+        "@jridgewell/gen-mapping": "^0.3.0",
+        "@jridgewell/trace-mapping": "^0.3.9"
       }
     },
-    "node_modules/@scure/bip32/node_modules/@noble/hashes": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/@noble/hashes/-/hashes-1.4.0.tgz",
-      "integrity": "sha512-V1JJ1WTRUqHHrOSh597hURcMqVKVGL/ea3kv0gSnEdsEZ0/+VyPghM1lMNGc00z7CIQorSvbKpuJkxvuHbvdbg==",
-      "engines": {
-        "node": ">= 16"
-      },
-      "funding": {
-        "url": "https://paulmillr.com/funding/"
-      }
+    "node_modules/@jridgewell/sourcemap-codec": {
+      "version": "1.4.15",
+      "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.15.tgz",
+      "integrity": "sha512-eF2rxCRulEKXHTRiDrDy6erMYWqNw4LPdQ8UQA4huuxaQsVeRPFl2oM8oDGxMFhJUWZf9McpLtJasDDZb/Bpeg=="
     },
-    "node_modules/@scure/bip39": {
-      "version": "1.1.0",
-      "funding": [
-        {
-          "type": "individual",
-          "url": "https://paulmillr.com/funding/"
-        }
-      ],
-      "license": "MIT",
+    "node_modules/@jridgewell/trace-mapping": {
+      "version": "0.3.18",
+      "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.18.tgz",
+      "integrity": "sha512-w+niJYzMHdd7USdiH2U6869nqhD2nbfZXND5Yp93qIbEmnDNk7PD48o+YchRVpzMU7M6jVCbenTR7PA1FLQ9pA==",
       "dependencies": {
-        "@noble/hashes": "~1.1.1",
-        "@scure/base": "~1.1.0"
+        "@jridgewell/resolve-uri": "3.1.0",
+        "@jridgewell/sourcemap-codec": "1.4.14"
       }
     },
-    "node_modules/@scure/bip39/node_modules/@noble/hashes": {
-      "version": "1.1.5",
-      "funding": [
-        {
-          "type": "individual",
-          "url": "https://paulmillr.com/funding/"
-        }
-      ],
-      "license": "MIT"
+    "node_modules/@jridgewell/trace-mapping/node_modules/@jridgewell/sourcemap-codec": {
+      "version": "1.4.14",
+      "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.14.tgz",
+      "integrity": "sha512-XPSJHWmi394fuUuzDnGz1wiKqWfo1yXecHQMRf2l6hztTO+nPru658AyDngaBe7isIxEkRsPR3FZh+s7iVa4Uw=="
     },
-    "node_modules/@scure/btc-signer": {
-      "version": "1.2.1",
-      "license": "MIT",
+    "node_modules/@ledgerhq/devices": {
+      "version": "8.0.5",
+      "resolved": "https://registry.npmjs.org/@ledgerhq/devices/-/devices-8.0.5.tgz",
+      "integrity": "sha512-Cy4LOfcYhYGWLd2nRA/CY/AneJT+Q3RyNwzoRx28gqAN21vF3+IZtL0jqs1n78rZ2bTEHyBS1GMOX13s5Y+O4g==",
       "dependencies": {
-        "@noble/curves": "~1.3.0",
-        "@noble/hashes": "~1.3.3",
-        "@scure/base": "~1.1.5",
-        "micro-packed": "~0.5.1"
-      },
-      "funding": {
-        "url": "https://paulmillr.com/funding/"
+        "@ledgerhq/errors": "^6.13.0",
+        "@ledgerhq/logs": "^6.10.1",
+        "rxjs": "6",
+        "semver": "^7.3.5"
       }
     },
-    "node_modules/@secretkeylabs/xverse-core": {
-      "version": "18.7.2",
-      "resolved": "https://npm.pkg.github.com/download/@secretkeylabs/xverse-core/18.7.2/0dc4ba04ad9b58f27031a976faf112a6648ea945",
-      "integrity": "sha512-B07GqC77UFeelKAjnpW0ZNjv7jc/m12PdVJJhRJdB7PRhsl+KHD8Z33JMHazdR6P3VbNlzUeEZ5R8WX+eBQWaA==",
-      "license": "ISC",
+    "node_modules/@ledgerhq/devices/node_modules/lru-cache": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
+      "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
       "dependencies": {
-        "@bitcoinerlab/secp256k1": "^1.0.2",
-        "@noble/curves": "^1.2.0",
-        "@noble/secp256k1": "^1.7.1",
-        "@scure/base": "^1.1.1",
-        "@scure/bip32": "^1.4.0",
-        "@scure/bip39": "^1.3.0",
-        "@scure/btc-signer": "1.2.1",
-        "@stacks/auth": "6.13.1",
-        "@stacks/connect": "7.7.1",
-        "@stacks/encryption": "6.13.1",
-        "@stacks/network": "6.13.0",
-        "@stacks/stacking": "6.13.2",
-        "@stacks/storage": "6.13.1",
-        "@stacks/transactions": "6.13.1",
-        "@stacks/wallet-sdk": "6.13.1",
-        "@tanstack/react-query": "^4.29.3",
-        "@zondax/ledger-stacks": "^1.0.4",
-        "async-mutex": "^0.4.0",
-        "axios": "1.7.0",
-        "base64url": "^3.0.1",
-        "bip32": "^4.0.0",
-        "bip39": "3.0.3",
-        "bitcoin-address-validation": "^2.2.1",
-        "bitcoinjs-lib": "^6.1.3",
-        "bitcoinjs-message": "^2.2.0",
-        "bn.js": "^5.1.3",
-        "bs58": "^5.0.0",
-        "bs58check": "^3.0.1",
-        "buffer": "6.0.3",
-        "c32check": "^2.0.0",
-        "ecdsa-sig-formatter": "^1.0.11",
-        "ecpair": "^2.1.0",
-        "json-bigint": "^1.0.0",
-        "jsontokens": "^4.0.1",
-        "ledger-bitcoin": "^0.2.1",
-        "process": "^0.11.10",
-        "util": "^0.12.4",
-        "uuidv4": "^6.2.13",
-        "varuint-bitcoin": "^1.1.2"
-      },
-      "engines": {
-        "node": "^18.18.2"
+        "yallist": "^4.0.0"
       },
-      "peerDependencies": {
-        "bignumber.js": "^9.0.0",
-        "micro-packed": ">0.5.0",
-        "react": ">18.0.0",
-        "react-dom": ">18.0.0"
-      }
-    },
-    "node_modules/@secretkeylabs/xverse-core/node_modules/@noble/hashes": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/@noble/hashes/-/hashes-1.4.0.tgz",
-      "integrity": "sha512-V1JJ1WTRUqHHrOSh597hURcMqVKVGL/ea3kv0gSnEdsEZ0/+VyPghM1lMNGc00z7CIQorSvbKpuJkxvuHbvdbg==",
       "engines": {
-        "node": ">= 16"
-      },
-      "funding": {
-        "url": "https://paulmillr.com/funding/"
+        "node": ">=10"
       }
     },
-    "node_modules/@secretkeylabs/xverse-core/node_modules/@scure/bip39": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/@scure/bip39/-/bip39-1.3.0.tgz",
-      "integrity": "sha512-disdg7gHuTDZtY+ZdkmLpPCk7fxZSu3gBiEGuoC1XYxv9cGx3Z6cpTggCgW6odSOOIXCiDjuGejW+aJKCY/pIQ==",
+    "node_modules/@ledgerhq/devices/node_modules/semver": {
+      "version": "7.5.4",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz",
+      "integrity": "sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==",
       "dependencies": {
-        "@noble/hashes": "~1.4.0",
-        "@scure/base": "~1.1.6"
+        "lru-cache": "^6.0.0"
       },
-      "funding": {
-        "url": "https://paulmillr.com/funding/"
+      "bin": {
+        "semver": "bin/semver.js"
+      },
+      "engines": {
+        "node": ">=10"
       }
     },
-    "node_modules/@secretkeylabs/xverse-core/node_modules/@stacks/connect": {
-      "version": "7.7.1",
-      "resolved": "https://registry.npmjs.org/@stacks/connect/-/connect-7.7.1.tgz",
-      "integrity": "sha512-MwLRhgRLOGo0Y4IDC0qp9RUX2SZubgse1aI2TN/fz2abNIh1LgmOKUua3w17YiBEZxDD9nyQ4KW1c33bdnrOPw==",
+    "node_modules/@ledgerhq/devices/node_modules/yallist": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
+      "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A=="
+    },
+    "node_modules/@ledgerhq/errors": {
+      "version": "6.13.0",
+      "resolved": "https://registry.npmjs.org/@ledgerhq/errors/-/errors-6.13.0.tgz",
+      "integrity": "sha512-cMFNX2AN6Gdj4RVIizI/7vWb+JYRu5na0rQSjybf7xGW5MSVdFVRcOg90VvqnDRsNfgFBbJzhpf7o4D7S3yFgg=="
+    },
+    "node_modules/@ledgerhq/hw-transport": {
+      "version": "6.28.6",
+      "resolved": "https://registry.npmjs.org/@ledgerhq/hw-transport/-/hw-transport-6.28.6.tgz",
+      "integrity": "sha512-0VVB4jIG6ZTRtHusI5kO2jPcc1yFQ+iIcNKiTaaBHytsdGjTfhipje+W4vxo+nCdOKdrkOqB80GwykmKuNNXyA==",
       "dependencies": {
-        "@stacks/auth": "^6.1.1",
-        "@stacks/connect-ui": "6.4.1",
-        "@stacks/network": "^6.1.1",
-        "@stacks/profile": "^6.1.1",
-        "@stacks/transactions": "^6.1.1",
-        "jsontokens": "^4.0.1"
+        "@ledgerhq/devices": "^8.0.5",
+        "@ledgerhq/errors": "^6.13.0",
+        "events": "^3.3.0"
       }
     },
-    "node_modules/@secretkeylabs/xverse-core/node_modules/@stacks/connect-ui": {
-      "version": "6.4.1",
-      "resolved": "https://registry.npmjs.org/@stacks/connect-ui/-/connect-ui-6.4.1.tgz",
-      "integrity": "sha512-Y6Fp26MUsMQq08zFSWus40rS7RNHrHj6VDJrFUqM9VsksV3wftpsRcy7psQusUvW1DS7fPza67IlM1dcN4rvSg==",
+    "node_modules/@ledgerhq/hw-transport-webusb": {
+      "version": "6.27.17",
+      "resolved": "https://registry.npmjs.org/@ledgerhq/hw-transport-webusb/-/hw-transport-webusb-6.27.17.tgz",
+      "integrity": "sha512-HRh3PWwAHqfuibAif15H2X5ZbH8nNisDX49IxBoexBz/fM5ivP95kZZQsXLxzPxey5ima49B7AjWY3LyGBytqA==",
       "dependencies": {
-        "@stencil/core": "^2.17.1"
+        "@ledgerhq/devices": "^8.0.5",
+        "@ledgerhq/errors": "^6.13.0",
+        "@ledgerhq/hw-transport": "^6.28.6",
+        "@ledgerhq/logs": "^6.10.1"
       }
     },
-    "node_modules/@secretkeylabs/xverse-core/node_modules/@types/node": {
-      "version": "11.11.6",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-11.11.6.tgz",
-      "integrity": "sha512-Exw4yUWMBXM3X+8oqzJNRqZSwUAaS4+7NdvHqQuFi/d+synz++xmX3QIf+BFqneW8N31R8Ky+sikfZUXq07ggQ=="
+    "node_modules/@ledgerhq/logs": {
+      "version": "6.10.1",
+      "resolved": "https://registry.npmjs.org/@ledgerhq/logs/-/logs-6.10.1.tgz",
+      "integrity": "sha512-z+ILK8Q3y+nfUl43ctCPuR4Y2bIxk/ooCQFwZxhtci1EhAtMDzMAx2W25qx8G1PPL9UUOdnUax19+F0OjXoj4w=="
     },
-    "node_modules/@secretkeylabs/xverse-core/node_modules/async-mutex": {
-      "version": "0.4.1",
-      "resolved": "https://registry.npmjs.org/async-mutex/-/async-mutex-0.4.1.tgz",
-      "integrity": "sha512-WfoBo4E/TbCX1G95XTjbWTE3X2XLG0m1Xbv2cwOtuPdyH9CZvnaA5nCt1ucjaKEgW2A5IF71hxrRhr83Je5xjA==",
+    "node_modules/@leichtgewicht/ip-codec": {
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/@leichtgewicht/ip-codec/-/ip-codec-2.0.4.tgz",
+      "integrity": "sha512-Hcv+nVC0kZnQ3tD9GVu5xSMR4VVYOteQIr/hwFPVEvPdlXqgGEuRjiheChHgdM+JyqdgNcmzZOX/tnl0JOiI7A==",
+      "dev": true
+    },
+    "node_modules/@noble/curves": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/@noble/curves/-/curves-1.3.0.tgz",
+      "integrity": "sha512-t01iSXPuN+Eqzb4eBX0S5oubSqXbK/xXa1Ne18Hj8f9pStxztHCE2gfboSp/dZRLSqfuLpRK2nDXDK+W9puocA==",
       "dependencies": {
-        "tslib": "^2.4.0"
+        "@noble/hashes": "1.3.3"
+      },
+      "funding": {
+        "url": "https://paulmillr.com/funding/"
       }
     },
-    "node_modules/@secretkeylabs/xverse-core/node_modules/bip39": {
-      "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/bip39/-/bip39-3.0.3.tgz",
-      "integrity": "sha512-P0dKrz4g0V0BjXfx7d9QNkJ/Txcz/k+hM9TnjqjUaXtuOfAvxXSw2rJw8DX0e3ZPwnK/IgDxoRqf0bvoVCqbMg==",
-      "dependencies": {
-        "@types/node": "11.11.6",
-        "create-hash": "^1.1.0",
-        "pbkdf2": "^3.0.9",
-        "randombytes": "^2.0.1"
+    "node_modules/@noble/hashes": {
+      "version": "1.3.3",
+      "resolved": "https://registry.npmjs.org/@noble/hashes/-/hashes-1.3.3.tgz",
+      "integrity": "sha512-V7/fPHgl+jsVPXqqeOzT8egNj2iBIVt+ECeMMG8TdcnTikP3oaBtUVqpT/gYCR68aEBJSF+XbYUxStjbFMqIIA==",
+      "engines": {
+        "node": ">= 16"
+      },
+      "funding": {
+        "url": "https://paulmillr.com/funding/"
       }
     },
-    "node_modules/@sinclair/typebox": {
-      "version": "0.27.8",
-      "dev": true,
-      "license": "MIT"
+    "node_modules/@noble/secp256k1": {
+      "version": "1.7.1",
+      "resolved": "https://registry.npmjs.org/@noble/secp256k1/-/secp256k1-1.7.1.tgz",
+      "integrity": "sha512-hOUk6AyBFmqVrv7k5WAw/LpszxVbj9gGN4JRkIX52fdFAj1UA61KXmZDvqVEm+pOyec3+fIeZB02LYa/pWOArw==",
+      "funding": [
+        {
+          "type": "individual",
+          "url": "https://paulmillr.com/funding/"
+        }
+      ]
     },
-    "node_modules/@snyk/github-codeowners": {
-      "version": "1.1.0",
+    "node_modules/@nodelib/fs.scandir": {
+      "version": "2.1.5",
+      "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz",
+      "integrity": "sha512-vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "commander": "^4.1.1",
-        "ignore": "^5.1.8",
-        "p-map": "^4.0.0"
-      },
-      "bin": {
-        "github-codeowners": "dist/cli.js"
+        "@nodelib/fs.stat": "2.0.5",
+        "run-parallel": "^1.1.9"
       },
       "engines": {
-        "node": ">=8.10"
+        "node": ">= 8"
       }
     },
-    "node_modules/@snyk/github-codeowners/node_modules/commander": {
-      "version": "4.1.1",
+    "node_modules/@nodelib/fs.stat": {
+      "version": "2.0.5",
+      "resolved": "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz",
+      "integrity": "sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A==",
       "dev": true,
-      "license": "MIT",
       "engines": {
-        "node": ">= 6"
+        "node": ">= 8"
       }
     },
-    "node_modules/@snyk/github-codeowners/node_modules/p-map": {
-      "version": "4.0.0",
+    "node_modules/@nodelib/fs.walk": {
+      "version": "1.2.8",
+      "resolved": "https://registry.npmjs.org/@nodelib/fs.walk/-/fs.walk-1.2.8.tgz",
+      "integrity": "sha512-oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "aggregate-error": "^3.0.0"
+        "@nodelib/fs.scandir": "2.1.5",
+        "fastq": "^1.6.0"
       },
+      "engines": {
+        "node": ">= 8"
+      }
+    },
+    "node_modules/@phosphor-icons/react": {
+      "version": "2.0.10",
+      "resolved": "https://registry.npmjs.org/@phosphor-icons/react/-/react-2.0.10.tgz",
+      "integrity": "sha512-q5ITPNFhmEiYZLZOvEhjo2phlfxoOmit7vE1tBYMxcMqnZX2vdbMw3deDE7wCegpBKM/q/p39BJmhhoPcjZyCg==",
       "engines": {
         "node": ">=10"
       },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
+      "peerDependencies": {
+        "react": ">= 16.8",
+        "react-dom": ">= 16.8"
       }
     },
-    "node_modules/@stacks/auth": {
-      "version": "6.13.1",
-      "license": "MIT",
-      "dependencies": {
-        "@stacks/common": "^6.13.0",
-        "@stacks/encryption": "^6.13.1",
-        "@stacks/network": "^6.13.0",
-        "@stacks/profile": "^6.13.1",
-        "cross-fetch": "^3.1.5",
-        "jsontokens": "^4.0.1"
-      }
-    },
-    "node_modules/@stacks/common": {
-      "version": "6.13.0",
-      "license": "MIT",
+    "node_modules/@playwright/test": {
+      "version": "1.45.2",
+      "resolved": "https://registry.npmjs.org/@playwright/test/-/test-1.45.2.tgz",
+      "integrity": "sha512-JxG9eq92ET75EbVi3s+4sYbcG7q72ECeZNbdBlaMkGcNbiDQ4cAi8U2QP5oKkOx+1gpaiL1LDStmzCaEM1Z6fQ==",
+      "license": "Apache-2.0",
       "dependencies": {
-        "@types/bn.js": "^5.1.0",
-        "@types/node": "^18.0.4"
+        "playwright": "1.45.2"
+      },
+      "bin": {
+        "playwright": "cli.js"
+      },
+      "engines": {
+        "node": ">=18"
       }
     },
-    "node_modules/@stacks/common/node_modules/@types/node": {
-      "version": "18.19.26",
-      "license": "MIT",
+    "node_modules/@pmmmwh/react-refresh-webpack-plugin": {
+      "version": "0.5.10",
+      "resolved": "https://registry.npmjs.org/@pmmmwh/react-refresh-webpack-plugin/-/react-refresh-webpack-plugin-0.5.10.tgz",
+      "integrity": "sha512-j0Ya0hCFZPd4x40qLzbhGsh9TMtdb+CJQiso+WxLOPNasohq9cc5SNUcwsZaRH6++Xh91Xkm/xHCkuIiIu0LUA==",
+      "dev": true,
       "dependencies": {
-        "undici-types": "~5.26.4"
+        "ansi-html-community": "^0.0.8",
+        "common-path-prefix": "^3.0.0",
+        "core-js-pure": "^3.23.3",
+        "error-stack-parser": "^2.0.6",
+        "find-up": "^5.0.0",
+        "html-entities": "^2.1.0",
+        "loader-utils": "^2.0.4",
+        "schema-utils": "^3.0.0",
+        "source-map": "^0.7.3"
+      },
+      "engines": {
+        "node": ">= 10.13"
+      },
+      "peerDependencies": {
+        "@types/webpack": "4.x || 5.x",
+        "react-refresh": ">=0.10.0 <1.0.0",
+        "sockjs-client": "^1.4.0",
+        "type-fest": ">=0.17.0 <4.0.0",
+        "webpack": ">=4.43.0 <6.0.0",
+        "webpack-dev-server": "3.x || 4.x",
+        "webpack-hot-middleware": "2.x",
+        "webpack-plugin-serve": "0.x || 1.x"
+      },
+      "peerDependenciesMeta": {
+        "@types/webpack": {
+          "optional": true
+        },
+        "sockjs-client": {
+          "optional": true
+        },
+        "type-fest": {
+          "optional": true
+        },
+        "webpack-dev-server": {
+          "optional": true
+        },
+        "webpack-hot-middleware": {
+          "optional": true
+        },
+        "webpack-plugin-serve": {
+          "optional": true
+        }
       }
     },
-    "node_modules/@stacks/connect": {
-      "version": "7.4.1",
-      "license": "MIT",
+    "node_modules/@rc-component/portal": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/@rc-component/portal/-/portal-1.1.2.tgz",
+      "integrity": "sha512-6f813C0IsasTZms08kfA8kPAGxbbkYToa8ALaiDIGGECU4i9hj8Plgbx0sNJDrey3EtHO30hmdaxtT0138xZcg==",
       "dependencies": {
-        "@stacks/auth": "^6.1.1",
-        "@stacks/connect-ui": "6.1.2",
-        "@stacks/network": "^6.1.1",
-        "@stacks/profile": "^6.1.1",
-        "@stacks/transactions": "^6.1.1",
-        "jsontokens": "^4.0.1"
+        "@babel/runtime": "^7.18.0",
+        "classnames": "^2.3.2",
+        "rc-util": "^5.24.4"
+      },
+      "engines": {
+        "node": ">=8.x"
+      },
+      "peerDependencies": {
+        "react": ">=16.9.0",
+        "react-dom": ">=16.9.0"
       }
     },
-    "node_modules/@stacks/connect-ui": {
-      "version": "6.1.2",
-      "license": "MIT",
+    "node_modules/@react-spring/animated": {
+      "version": "9.7.3",
+      "resolved": "https://registry.npmjs.org/@react-spring/animated/-/animated-9.7.3.tgz",
+      "integrity": "sha512-5CWeNJt9pNgyvuSzQH+uy2pvTg8Y4/OisoscZIR8/ZNLIOI+CatFBhGZpDGTF/OzdNFsAoGk3wiUYTwoJ0YIvw==",
       "dependencies": {
-        "@stencil/core": "^2.17.1"
+        "@react-spring/shared": "~9.7.3",
+        "@react-spring/types": "~9.7.3"
+      },
+      "peerDependencies": {
+        "react": "^16.8.0 || ^17.0.0 || ^18.0.0"
       }
     },
-    "node_modules/@stacks/encryption": {
-      "version": "6.13.1",
-      "license": "MIT",
+    "node_modules/@react-spring/core": {
+      "version": "9.7.3",
+      "resolved": "https://registry.npmjs.org/@react-spring/core/-/core-9.7.3.tgz",
+      "integrity": "sha512-IqFdPVf3ZOC1Cx7+M0cXf4odNLxDC+n7IN3MDcVCTIOSBfqEcBebSv+vlY5AhM0zw05PDbjKrNmBpzv/AqpjnQ==",
       "dependencies": {
-        "@noble/hashes": "1.1.5",
-        "@noble/secp256k1": "1.7.1",
-        "@scure/bip39": "1.1.0",
-        "@stacks/common": "^6.13.0",
-        "@types/node": "^18.0.4",
-        "base64-js": "^1.5.1",
-        "bs58": "^5.0.0",
-        "ripemd160-min": "^0.0.6",
-        "varuint-bitcoin": "^1.1.2"
+        "@react-spring/animated": "~9.7.3",
+        "@react-spring/shared": "~9.7.3",
+        "@react-spring/types": "~9.7.3"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/react-spring/donate"
+      },
+      "peerDependencies": {
+        "react": "^16.8.0 || ^17.0.0 || ^18.0.0"
       }
     },
-    "node_modules/@stacks/encryption/node_modules/@noble/hashes": {
-      "version": "1.1.5",
-      "funding": [
-        {
-          "type": "individual",
-          "url": "https://paulmillr.com/funding/"
-        }
-      ],
-      "license": "MIT"
-    },
-    "node_modules/@stacks/encryption/node_modules/@types/node": {
-      "version": "18.19.31",
-      "license": "MIT",
+    "node_modules/@react-spring/shared": {
+      "version": "9.7.3",
+      "resolved": "https://registry.npmjs.org/@react-spring/shared/-/shared-9.7.3.tgz",
+      "integrity": "sha512-NEopD+9S5xYyQ0pGtioacLhL2luflh6HACSSDUZOwLHoxA5eku1UPuqcJqjwSD6luKjjLfiLOspxo43FUHKKSA==",
       "dependencies": {
-        "undici-types": "~5.26.4"
+        "@react-spring/types": "~9.7.3"
+      },
+      "peerDependencies": {
+        "react": "^16.8.0 || ^17.0.0 || ^18.0.0"
       }
     },
-    "node_modules/@stacks/network": {
-      "version": "6.13.0",
-      "license": "MIT",
-      "dependencies": {
-        "@stacks/common": "^6.13.0",
-        "cross-fetch": "^3.1.5"
-      }
+    "node_modules/@react-spring/types": {
+      "version": "9.7.3",
+      "resolved": "https://registry.npmjs.org/@react-spring/types/-/types-9.7.3.tgz",
+      "integrity": "sha512-Kpx/fQ/ZFX31OtlqVEFfgaD1ACzul4NksrvIgYfIFq9JpDHFwQkMVZ10tbo0FU/grje4rcL4EIrjekl3kYwgWw=="
     },
-    "node_modules/@stacks/profile": {
-      "version": "6.13.1",
-      "license": "MIT",
+    "node_modules/@react-spring/web": {
+      "version": "9.7.3",
+      "resolved": "https://registry.npmjs.org/@react-spring/web/-/web-9.7.3.tgz",
+      "integrity": "sha512-BXt6BpS9aJL/QdVqEIX9YoUy8CE6TJrU0mNCqSoxdXlIeNcEBWOfIyE6B14ENNsyQKS3wOWkiJfco0tCr/9tUg==",
       "dependencies": {
-        "@stacks/common": "^6.13.0",
-        "@stacks/network": "^6.13.0",
-        "@stacks/transactions": "^6.13.1",
-        "jsontokens": "^4.0.1",
-        "schema-inspector": "^2.0.2",
-        "zone-file": "^2.0.0-beta.3"
+        "@react-spring/animated": "~9.7.3",
+        "@react-spring/core": "~9.7.3",
+        "@react-spring/shared": "~9.7.3",
+        "@react-spring/types": "~9.7.3"
+      },
+      "peerDependencies": {
+        "react": "^16.8.0 || ^17.0.0 || ^18.0.0",
+        "react-dom": "^16.8.0 || ^17.0.0 || ^18.0.0"
       }
     },
-    "node_modules/@stacks/stacking": {
-      "version": "6.13.2",
-      "resolved": "https://registry.npmjs.org/@stacks/stacking/-/stacking-6.13.2.tgz",
-      "integrity": "sha512-4h1UQuL2+Xdra9zMqzUElvKG9X9fenuNE7hD9sIqyxyLFxeQ7gRqczmTYPsmaj4wY5004JNj+efzGJ0VmpOcAA==",
-      "dependencies": {
-        "@noble/hashes": "1.1.5",
-        "@scure/base": "1.1.1",
-        "@stacks/common": "^6.13.0",
-        "@stacks/encryption": "^6.13.1",
-        "@stacks/network": "^6.13.0",
-        "@stacks/stacks-blockchain-api-types": "^0.61.0",
-        "@stacks/transactions": "^6.13.1",
-        "bs58": "^5.0.0"
+    "node_modules/@remix-run/router": {
+      "version": "1.7.2",
+      "resolved": "https://registry.npmjs.org/@remix-run/router/-/router-1.7.2.tgz",
+      "integrity": "sha512-7Lcn7IqGMV+vizMPoEl5F0XDshcdDYtMI6uJLQdQz5CfZAwy3vvGKYSUk789qndt5dEC4HfSjviSYlSoHGL2+A==",
+      "engines": {
+        "node": ">=14"
       }
     },
-    "node_modules/@stacks/stacking/node_modules/@noble/hashes": {
-      "version": "1.1.5",
-      "resolved": "https://registry.npmjs.org/@noble/hashes/-/hashes-1.1.5.tgz",
-      "integrity": "sha512-LTMZiiLc+V4v1Yi16TD6aX2gmtKszNye0pQgbaLqkvhIqP7nVsSaJsWloGQjJfJ8offaoP5GtX3yY5swbcJxxQ==",
-      "funding": [
-        {
-          "type": "individual",
-          "url": "https://paulmillr.com/funding/"
-        }
+    "node_modules/@rollup/rollup-android-arm-eabi": {
+      "version": "4.18.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.18.0.tgz",
+      "integrity": "sha512-Tya6xypR10giZV1XzxmH5wr25VcZSncG0pZIjfePT0OVBvqNEurzValetGNarVrGiq66EBVAFn15iYX4w6FKgQ==",
+      "cpu": [
+        "arm"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "android"
       ]
     },
-    "node_modules/@stacks/stacking/node_modules/@scure/base": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/@scure/base/-/base-1.1.1.tgz",
-      "integrity": "sha512-ZxOhsSyxYwLJj3pLZCefNitxsj093tb2vq90mp2txoYeBqbcjDjqFhyM8eUjq/uFm6zJ+mUuqxlS2FkuSY1MTA==",
-      "funding": [
-        {
-          "type": "individual",
-          "url": "https://paulmillr.com/funding/"
-        }
+    "node_modules/@rollup/rollup-android-arm64": {
+      "version": "4.18.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.18.0.tgz",
+      "integrity": "sha512-avCea0RAP03lTsDhEyfy+hpfr85KfyTctMADqHVhLAF3MlIkq83CP8UfAHUssgXTYd+6er6PaAhx/QGv4L1EiA==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "android"
       ]
     },
-    "node_modules/@stacks/stacking/node_modules/@stacks/stacks-blockchain-api-types": {
-      "version": "0.61.0",
-      "resolved": "https://registry.npmjs.org/@stacks/stacks-blockchain-api-types/-/stacks-blockchain-api-types-0.61.0.tgz",
-      "integrity": "sha512-yPOfTUboo5eA9BZL/hqMcM71GstrFs9YWzOrJFPeP4cOO1wgYvAcckgBRbgiE3NqeX0A7SLZLDAXLZbATuRq9w=="
+    "node_modules/@rollup/rollup-darwin-arm64": {
+      "version": "4.18.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.18.0.tgz",
+      "integrity": "sha512-IWfdwU7KDSm07Ty0PuA/W2JYoZ4iTj3TUQjkVsO/6U+4I1jN5lcR71ZEvRh52sDOERdnNhhHU57UITXz5jC1/w==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "darwin"
+      ]
     },
-    "node_modules/@stacks/stacks-blockchain-api-types": {
-      "version": "6.1.1",
-      "license": "ISC"
+    "node_modules/@rollup/rollup-darwin-x64": {
+      "version": "4.18.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.18.0.tgz",
+      "integrity": "sha512-n2LMsUz7Ynu7DoQrSQkBf8iNrjOGyPLrdSg802vk6XT3FtsgX6JbE8IHRvposskFm9SNxzkLYGSq9QdpLYpRNA==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "darwin"
+      ]
     },
-    "node_modules/@stacks/storage": {
-      "version": "6.13.1",
-      "resolved": "https://registry.npmjs.org/@stacks/storage/-/storage-6.13.1.tgz",
-      "integrity": "sha512-XnzRAETDKW7Ij3cuUNllrrnLOCwctV/XrIHgVWnD04LNL5R9apkwp9IkzaFbyJZ+XrkUBKwtdCgVYype2XgT6w==",
-      "dependencies": {
-        "@stacks/auth": "^6.13.1",
-        "@stacks/common": "^6.13.0",
-        "@stacks/encryption": "^6.13.1",
-        "@stacks/network": "^6.13.0",
-        "base64-js": "^1.5.1",
-        "jsontokens": "^4.0.1"
-      }
+    "node_modules/@rollup/rollup-linux-arm-gnueabihf": {
+      "version": "4.18.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.18.0.tgz",
+      "integrity": "sha512-C/zbRYRXFjWvz9Z4haRxcTdnkPt1BtCkz+7RtBSuNmKzMzp3ZxdM28Mpccn6pt28/UWUCTXa+b0Mx1k3g6NOMA==",
+      "cpu": [
+        "arm"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "linux"
+      ]
     },
-    "node_modules/@stacks/transactions": {
-      "version": "6.13.1",
-      "license": "MIT",
-      "dependencies": {
-        "@noble/hashes": "1.1.5",
-        "@noble/secp256k1": "1.7.1",
-        "@stacks/common": "^6.13.0",
-        "@stacks/network": "^6.13.0",
-        "c32check": "^2.0.0",
-        "lodash.clonedeep": "^4.5.0"
-      }
+    "node_modules/@rollup/rollup-linux-arm-musleabihf": {
+      "version": "4.18.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-musleabihf/-/rollup-linux-arm-musleabihf-4.18.0.tgz",
+      "integrity": "sha512-l3m9ewPgjQSXrUMHg93vt0hYCGnrMOcUpTz6FLtbwljo2HluS4zTXFy2571YQbisTnfTKPZ01u/ukJdQTLGh9A==",
+      "cpu": [
+        "arm"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "linux"
+      ]
     },
-    "node_modules/@stacks/transactions/node_modules/@noble/hashes": {
-      "version": "1.1.5",
-      "funding": [
-        {
-          "type": "individual",
-          "url": "https://paulmillr.com/funding/"
-        }
+    "node_modules/@rollup/rollup-linux-arm64-gnu": {
+      "version": "4.18.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.18.0.tgz",
+      "integrity": "sha512-rJ5D47d8WD7J+7STKdCUAgmQk49xuFrRi9pZkWoRD1UeSMakbcepWXPF8ycChBoAqs1pb2wzvbY6Q33WmN2ftw==",
+      "cpu": [
+        "arm64"
       ],
-      "license": "MIT"
+      "dev": true,
+      "optional": true,
+      "os": [
+        "linux"
+      ]
     },
-    "node_modules/@stacks/wallet-sdk": {
-      "version": "6.13.1",
-      "resolved": "https://registry.npmjs.org/@stacks/wallet-sdk/-/wallet-sdk-6.13.1.tgz",
-      "integrity": "sha512-262CYKAm1j8oVxfGUIJrHp867j9gm5NrqPM85s0TfCv2QhfLDkvme6nKgmvtL2TecAZkBa5tu8M5DQ7z92WvAQ==",
-      "dependencies": {
-        "@scure/bip32": "1.1.3",
-        "@scure/bip39": "1.1.0",
-        "@stacks/auth": "^6.13.1",
-        "@stacks/common": "^6.13.0",
-        "@stacks/encryption": "^6.13.1",
-        "@stacks/network": "^6.13.0",
-        "@stacks/profile": "^6.13.1",
-        "@stacks/storage": "^6.13.1",
-        "@stacks/transactions": "^6.13.1",
-        "buffer": "^6.0.3",
-        "c32check": "^2.0.0",
-        "jsontokens": "^4.0.1",
-        "triplesec": "^4.0.3",
-        "zone-file": "^2.0.0-beta.3"
-      }
+    "node_modules/@rollup/rollup-linux-arm64-musl": {
+      "version": "4.18.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.18.0.tgz",
+      "integrity": "sha512-be6Yx37b24ZwxQ+wOQXXLZqpq4jTckJhtGlWGZs68TgdKXJgw54lUUoFYrg6Zs/kjzAQwEwYbp8JxZVzZLRepQ==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "linux"
+      ]
     },
-    "node_modules/@stacks/wallet-sdk/node_modules/@noble/hashes": {
-      "version": "1.1.5",
-      "resolved": "https://registry.npmjs.org/@noble/hashes/-/hashes-1.1.5.tgz",
-      "integrity": "sha512-LTMZiiLc+V4v1Yi16TD6aX2gmtKszNye0pQgbaLqkvhIqP7nVsSaJsWloGQjJfJ8offaoP5GtX3yY5swbcJxxQ==",
-      "funding": [
-        {
-          "type": "individual",
-          "url": "https://paulmillr.com/funding/"
-        }
+    "node_modules/@rollup/rollup-linux-powerpc64le-gnu": {
+      "version": "4.18.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-powerpc64le-gnu/-/rollup-linux-powerpc64le-gnu-4.18.0.tgz",
+      "integrity": "sha512-hNVMQK+qrA9Todu9+wqrXOHxFiD5YmdEi3paj6vP02Kx1hjd2LLYR2eaN7DsEshg09+9uzWi2W18MJDlG0cxJA==",
+      "cpu": [
+        "ppc64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "linux"
       ]
     },
-    "node_modules/@stacks/wallet-sdk/node_modules/@scure/bip32": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/@scure/bip32/-/bip32-1.1.3.tgz",
-      "integrity": "sha512-dSH3+LCWONlSNQuF34xZrG6Xas7tp2jSSqHb/pMfXWM0vKE4JZOtK3uJfoWouUVW5IGlls75HkXmYLldZ8ySgQ==",
-      "funding": [
-        {
-          "type": "individual",
-          "url": "https://paulmillr.com/funding/"
-        }
+    "node_modules/@rollup/rollup-linux-riscv64-gnu": {
+      "version": "4.18.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-gnu/-/rollup-linux-riscv64-gnu-4.18.0.tgz",
+      "integrity": "sha512-ROCM7i+m1NfdrsmvwSzoxp9HFtmKGHEqu5NNDiZWQtXLA8S5HBCkVvKAxJ8U+CVctHwV2Gb5VUaK7UAkzhDjlg==",
+      "cpu": [
+        "riscv64"
       ],
-      "dependencies": {
-        "@noble/hashes": "~1.1.3",
-        "@noble/secp256k1": "~1.7.0",
-        "@scure/base": "~1.1.0"
-      }
+      "dev": true,
+      "optional": true,
+      "os": [
+        "linux"
+      ]
     },
-    "node_modules/@stencil/core": {
-      "version": "2.22.3",
-      "license": "MIT",
-      "bin": {
-        "stencil": "bin/stencil"
-      },
-      "engines": {
-        "node": ">=12.10.0",
-        "npm": ">=6.0.0"
-      }
+    "node_modules/@rollup/rollup-linux-s390x-gnu": {
+      "version": "4.18.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-s390x-gnu/-/rollup-linux-s390x-gnu-4.18.0.tgz",
+      "integrity": "sha512-0UyyRHyDN42QL+NbqevXIIUnKA47A+45WyasO+y2bGJ1mhQrfrtXUpTxCOrfxCR4esV3/RLYyucGVPiUsO8xjg==",
+      "cpu": [
+        "s390x"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "linux"
+      ]
     },
-    "node_modules/@tanstack/eslint-plugin-query": {
-      "version": "4.32.1",
+    "node_modules/@rollup/rollup-linux-x64-gnu": {
+      "version": "4.18.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.18.0.tgz",
+      "integrity": "sha512-xuglR2rBVHA5UsI8h8UbX4VJ470PtGCf5Vpswh7p2ukaqBGFTnsfzxUBetoWBWymHMxbIG0Cmx7Y9qDZzr648w==",
+      "cpu": [
+        "x64"
+      ],
       "dev": true,
-      "license": "MIT",
-      "funding": {
-        "type": "github",
-        "url": "https://github.com/sponsors/tannerlinsley"
-      }
+      "optional": true,
+      "os": [
+        "linux"
+      ]
     },
-    "node_modules/@tanstack/match-sorter-utils": {
-      "version": "8.8.4",
-      "license": "MIT",
+    "node_modules/@rollup/rollup-linux-x64-musl": {
+      "version": "4.18.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.18.0.tgz",
+      "integrity": "sha512-LKaqQL9osY/ir2geuLVvRRs+utWUNilzdE90TpyoX0eNqPzWjRm14oMEE+YLve4k/NAqCdPkGYDaDF5Sw+xBfg==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "linux"
+      ]
+    },
+    "node_modules/@rollup/rollup-win32-arm64-msvc": {
+      "version": "4.18.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.18.0.tgz",
+      "integrity": "sha512-7J6TkZQFGo9qBKH0pk2cEVSRhJbL6MtfWxth7Y5YmZs57Pi+4x6c2dStAUvaQkHQLnEQv1jzBUW43GvZW8OFqA==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "win32"
+      ]
+    },
+    "node_modules/@rollup/rollup-win32-ia32-msvc": {
+      "version": "4.18.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.18.0.tgz",
+      "integrity": "sha512-Txjh+IxBPbkUB9+SXZMpv+b/vnTEtFyfWZgJ6iyCmt2tdx0OF5WhFowLmnh8ENGNpfUlUZkdI//4IEmhwPieNg==",
+      "cpu": [
+        "ia32"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "win32"
+      ]
+    },
+    "node_modules/@rollup/rollup-win32-x64-msvc": {
+      "version": "4.18.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.18.0.tgz",
+      "integrity": "sha512-UOo5FdvOL0+eIVTgS4tIdbW+TtnBLWg1YBCcU2KWM7nuNwRz9bksDX1bekJJCpu25N1DVWaCwnT39dVQxzqS8g==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "win32"
+      ]
+    },
+    "node_modules/@sats-connect/core": {
+      "version": "0.2.1",
+      "resolved": "https://registry.npmjs.org/@sats-connect/core/-/core-0.2.1.tgz",
+      "integrity": "sha512-e7ARFqN4JE8kBiSUNOcEvBffiBK9v7k+/PlwgYY5lGyanmBOMj5twBn/f/4+52GBLZXkwhJtidIWZ8LgnBdlbw==",
+      "license": "ISC",
       "dependencies": {
-        "remove-accents": "0.4.2"
-      },
-      "engines": {
-        "node": ">=12"
+        "axios": "1.6.8",
+        "bitcoin-address-validation": "2.2.3",
+        "buffer": "6.0.3",
+        "jsontokens": "4.0.1",
+        "lodash.omit": "4.5.0"
       },
-      "funding": {
-        "type": "github",
-        "url": "https://github.com/sponsors/kentcdodds"
+      "peerDependencies": {
+        "valibot": "0.33.2"
       }
     },
-    "node_modules/@tanstack/query-core": {
-      "version": "4.32.1",
+    "node_modules/@sats-connect/core/node_modules/axios": {
+      "version": "1.6.8",
+      "resolved": "https://registry.npmjs.org/axios/-/axios-1.6.8.tgz",
+      "integrity": "sha512-v/ZHtJDU39mDpyBoFVkETcd/uNdxrWRrg3bKpOKzXFA6Bvqopts6ALSMU3y6ijYxbw2B+wPrIv46egTzJXCLGQ==",
       "license": "MIT",
-      "funding": {
-        "type": "github",
-        "url": "https://github.com/sponsors/tannerlinsley"
+      "dependencies": {
+        "follow-redirects": "^1.15.6",
+        "form-data": "^4.0.0",
+        "proxy-from-env": "^1.1.0"
       }
     },
-    "node_modules/@tanstack/query-persist-client-core": {
-      "version": "4.32.1",
-      "license": "MIT",
-      "dependencies": {
-        "@tanstack/query-core": "4.32.1"
-      },
+    "node_modules/@scure/base": {
+      "version": "1.1.7",
+      "resolved": "https://registry.npmjs.org/@scure/base/-/base-1.1.7.tgz",
+      "integrity": "sha512-PPNYBslrLNNUQ/Yad37MHYsNQtK67EhWb6WtSvNLLPo7SdVZgkUjD6Dg+5On7zNwmskf8OX7I7Nx5oN+MIWE0g==",
       "funding": {
-        "type": "github",
-        "url": "https://github.com/sponsors/tannerlinsley"
+        "url": "https://paulmillr.com/funding/"
       }
     },
-    "node_modules/@tanstack/query-sync-storage-persister": {
-      "version": "4.32.1",
-      "license": "MIT",
+    "node_modules/@scure/bip32": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/@scure/bip32/-/bip32-1.4.0.tgz",
+      "integrity": "sha512-sVUpc0Vq3tXCkDGYVWGIZTRfnvu8LoTDaev7vbwh0omSvVORONr960MQWdKqJDCReIEmTj3PAr73O3aoxz7OPg==",
       "dependencies": {
-        "@tanstack/query-persist-client-core": "4.32.1"
+        "@noble/curves": "~1.4.0",
+        "@noble/hashes": "~1.4.0",
+        "@scure/base": "~1.1.6"
       },
       "funding": {
-        "type": "github",
-        "url": "https://github.com/sponsors/tannerlinsley"
+        "url": "https://paulmillr.com/funding/"
       }
     },
-    "node_modules/@tanstack/react-query": {
-      "version": "4.32.1",
-      "license": "MIT",
+    "node_modules/@scure/bip32/node_modules/@noble/curves": {
+      "version": "1.4.2",
+      "resolved": "https://registry.npmjs.org/@noble/curves/-/curves-1.4.2.tgz",
+      "integrity": "sha512-TavHr8qycMChk8UwMld0ZDRvatedkzWfH8IiaeGCfymOP5i0hSCozz9vHOL0nkwk7HRMlFnAiKpS2jrUmSybcw==",
       "dependencies": {
-        "@tanstack/query-core": "4.32.1",
-        "use-sync-external-store": "^1.2.0"
+        "@noble/hashes": "1.4.0"
       },
       "funding": {
-        "type": "github",
-        "url": "https://github.com/sponsors/tannerlinsley"
-      },
-      "peerDependencies": {
-        "react": "^16.8.0 || ^17.0.0 || ^18.0.0",
-        "react-dom": "^16.8.0 || ^17.0.0 || ^18.0.0",
-        "react-native": "*"
-      },
-      "peerDependenciesMeta": {
-        "react-dom": {
-          "optional": true
-        },
-        "react-native": {
-          "optional": true
-        }
+        "url": "https://paulmillr.com/funding/"
       }
     },
-    "node_modules/@tanstack/react-query-devtools": {
-      "version": "4.32.1",
-      "license": "MIT",
-      "dependencies": {
-        "@tanstack/match-sorter-utils": "^8.7.0",
-        "superjson": "^1.10.0",
-        "use-sync-external-store": "^1.2.0"
+    "node_modules/@scure/bip32/node_modules/@noble/hashes": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/@noble/hashes/-/hashes-1.4.0.tgz",
+      "integrity": "sha512-V1JJ1WTRUqHHrOSh597hURcMqVKVGL/ea3kv0gSnEdsEZ0/+VyPghM1lMNGc00z7CIQorSvbKpuJkxvuHbvdbg==",
+      "engines": {
+        "node": ">= 16"
       },
       "funding": {
-        "type": "github",
-        "url": "https://github.com/sponsors/tannerlinsley"
-      },
-      "peerDependencies": {
-        "@tanstack/react-query": "4.32.1",
-        "react": "^16.8.0 || ^17.0.0 || ^18.0.0",
-        "react-dom": "^16.8.0 || ^17.0.0 || ^18.0.0"
+        "url": "https://paulmillr.com/funding/"
       }
     },
-    "node_modules/@tanstack/react-query-devtools/node_modules/superjson": {
-      "version": "1.13.3",
-      "license": "MIT",
+    "node_modules/@scure/bip39": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/@scure/bip39/-/bip39-1.1.0.tgz",
+      "integrity": "sha512-pwrPOS16VeTKg98dYXQyIjJEcWfz7/1YJIwxUEPFfQPtc86Ym/1sVgQ2RLoD43AazMk2l/unK4ITySSpW2+82w==",
+      "funding": [
+        {
+          "type": "individual",
+          "url": "https://paulmillr.com/funding/"
+        }
+      ],
       "dependencies": {
-        "copy-anything": "^3.0.2"
-      },
-      "engines": {
-        "node": ">=10"
+        "@noble/hashes": "~1.1.1",
+        "@scure/base": "~1.1.0"
       }
     },
-    "node_modules/@tanstack/react-query-persist-client": {
-      "version": "4.32.1",
-      "license": "MIT",
+    "node_modules/@scure/bip39/node_modules/@noble/hashes": {
+      "version": "1.1.5",
+      "resolved": "https://registry.npmjs.org/@noble/hashes/-/hashes-1.1.5.tgz",
+      "integrity": "sha512-LTMZiiLc+V4v1Yi16TD6aX2gmtKszNye0pQgbaLqkvhIqP7nVsSaJsWloGQjJfJ8offaoP5GtX3yY5swbcJxxQ==",
+      "funding": [
+        {
+          "type": "individual",
+          "url": "https://paulmillr.com/funding/"
+        }
+      ]
+    },
+    "node_modules/@scure/btc-signer": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/@scure/btc-signer/-/btc-signer-1.2.1.tgz",
+      "integrity": "sha512-/Zle18/aWhYDBuBeXGDGJTdo0/LKpQhU8ETBJeWABCQkbk0QHCFCinidTiz9hdQFfh0HtasPGq5p6EodVCfEew==",
       "dependencies": {
-        "@tanstack/query-persist-client-core": "4.32.1"
+        "@noble/curves": "~1.3.0",
+        "@noble/hashes": "~1.3.3",
+        "@scure/base": "~1.1.5",
+        "micro-packed": "~0.5.1"
       },
       "funding": {
-        "type": "github",
-        "url": "https://github.com/sponsors/tannerlinsley"
+        "url": "https://paulmillr.com/funding/"
+      }
+    },
+    "node_modules/@secretkeylabs/xverse-core": {
+      "version": "18.7.2",
+      "resolved": "https://npm.pkg.github.com/download/@secretkeylabs/xverse-core/18.7.2/0dc4ba04ad9b58f27031a976faf112a6648ea945",
+      "integrity": "sha512-B07GqC77UFeelKAjnpW0ZNjv7jc/m12PdVJJhRJdB7PRhsl+KHD8Z33JMHazdR6P3VbNlzUeEZ5R8WX+eBQWaA==",
+      "license": "ISC",
+      "dependencies": {
+        "@bitcoinerlab/secp256k1": "^1.0.2",
+        "@noble/curves": "^1.2.0",
+        "@noble/secp256k1": "^1.7.1",
+        "@scure/base": "^1.1.1",
+        "@scure/bip32": "^1.4.0",
+        "@scure/bip39": "^1.3.0",
+        "@scure/btc-signer": "1.2.1",
+        "@stacks/auth": "6.13.1",
+        "@stacks/connect": "7.7.1",
+        "@stacks/encryption": "6.13.1",
+        "@stacks/network": "6.13.0",
+        "@stacks/stacking": "6.13.2",
+        "@stacks/storage": "6.13.1",
+        "@stacks/transactions": "6.13.1",
+        "@stacks/wallet-sdk": "6.13.1",
+        "@tanstack/react-query": "^4.29.3",
+        "@zondax/ledger-stacks": "^1.0.4",
+        "async-mutex": "^0.4.0",
+        "axios": "1.7.0",
+        "base64url": "^3.0.1",
+        "bip32": "^4.0.0",
+        "bip39": "3.0.3",
+        "bitcoin-address-validation": "^2.2.1",
+        "bitcoinjs-lib": "^6.1.3",
+        "bitcoinjs-message": "^2.2.0",
+        "bn.js": "^5.1.3",
+        "bs58": "^5.0.0",
+        "bs58check": "^3.0.1",
+        "buffer": "6.0.3",
+        "c32check": "^2.0.0",
+        "ecdsa-sig-formatter": "^1.0.11",
+        "ecpair": "^2.1.0",
+        "json-bigint": "^1.0.0",
+        "jsontokens": "^4.0.1",
+        "ledger-bitcoin": "^0.2.1",
+        "process": "^0.11.10",
+        "util": "^0.12.4",
+        "uuidv4": "^6.2.13",
+        "varuint-bitcoin": "^1.1.2"
+      },
+      "engines": {
+        "node": "^18.18.2"
       },
       "peerDependencies": {
-        "@tanstack/react-query": "4.32.1"
+        "bignumber.js": "^9.0.0",
+        "micro-packed": ">0.5.0",
+        "react": ">18.0.0",
+        "react-dom": ">18.0.0"
       }
     },
-    "node_modules/@types/argon2-browser": {
-      "version": "1.18.1",
-      "dev": true,
-      "license": "MIT"
+    "node_modules/@secretkeylabs/xverse-core/node_modules/@noble/hashes": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/@noble/hashes/-/hashes-1.4.0.tgz",
+      "integrity": "sha512-V1JJ1WTRUqHHrOSh597hURcMqVKVGL/ea3kv0gSnEdsEZ0/+VyPghM1lMNGc00z7CIQorSvbKpuJkxvuHbvdbg==",
+      "engines": {
+        "node": ">= 16"
+      },
+      "funding": {
+        "url": "https://paulmillr.com/funding/"
+      }
     },
-    "node_modules/@types/bn.js": {
-      "version": "5.1.1",
-      "license": "MIT",
+    "node_modules/@secretkeylabs/xverse-core/node_modules/@scure/bip39": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/@scure/bip39/-/bip39-1.3.0.tgz",
+      "integrity": "sha512-disdg7gHuTDZtY+ZdkmLpPCk7fxZSu3gBiEGuoC1XYxv9cGx3Z6cpTggCgW6odSOOIXCiDjuGejW+aJKCY/pIQ==",
       "dependencies": {
-        "@types/node": "*"
+        "@noble/hashes": "~1.4.0",
+        "@scure/base": "~1.1.6"
+      },
+      "funding": {
+        "url": "https://paulmillr.com/funding/"
       }
     },
-    "node_modules/@types/body-parser": {
-      "version": "1.19.2",
-      "dev": true,
-      "license": "MIT",
+    "node_modules/@secretkeylabs/xverse-core/node_modules/@stacks/connect": {
+      "version": "7.7.1",
+      "resolved": "https://registry.npmjs.org/@stacks/connect/-/connect-7.7.1.tgz",
+      "integrity": "sha512-MwLRhgRLOGo0Y4IDC0qp9RUX2SZubgse1aI2TN/fz2abNIh1LgmOKUua3w17YiBEZxDD9nyQ4KW1c33bdnrOPw==",
       "dependencies": {
-        "@types/connect": "*",
-        "@types/node": "*"
+        "@stacks/auth": "^6.1.1",
+        "@stacks/connect-ui": "6.4.1",
+        "@stacks/network": "^6.1.1",
+        "@stacks/profile": "^6.1.1",
+        "@stacks/transactions": "^6.1.1",
+        "jsontokens": "^4.0.1"
       }
     },
-    "node_modules/@types/bonjour": {
-      "version": "3.5.10",
-      "dev": true,
-      "license": "MIT",
+    "node_modules/@secretkeylabs/xverse-core/node_modules/@stacks/connect-ui": {
+      "version": "6.4.1",
+      "resolved": "https://registry.npmjs.org/@stacks/connect-ui/-/connect-ui-6.4.1.tgz",
+      "integrity": "sha512-Y6Fp26MUsMQq08zFSWus40rS7RNHrHj6VDJrFUqM9VsksV3wftpsRcy7psQusUvW1DS7fPza67IlM1dcN4rvSg==",
       "dependencies": {
-        "@types/node": "*"
+        "@stencil/core": "^2.17.1"
       }
     },
-    "node_modules/@types/chai": {
-      "version": "4.3.11",
-      "dev": true,
-      "license": "MIT"
+    "node_modules/@secretkeylabs/xverse-core/node_modules/@types/node": {
+      "version": "11.11.6",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-11.11.6.tgz",
+      "integrity": "sha512-Exw4yUWMBXM3X+8oqzJNRqZSwUAaS4+7NdvHqQuFi/d+synz++xmX3QIf+BFqneW8N31R8Ky+sikfZUXq07ggQ=="
     },
-    "node_modules/@types/chai-subset": {
-      "version": "1.3.5",
-      "dev": true,
-      "license": "MIT",
+    "node_modules/@secretkeylabs/xverse-core/node_modules/async-mutex": {
+      "version": "0.4.1",
+      "resolved": "https://registry.npmjs.org/async-mutex/-/async-mutex-0.4.1.tgz",
+      "integrity": "sha512-WfoBo4E/TbCX1G95XTjbWTE3X2XLG0m1Xbv2cwOtuPdyH9CZvnaA5nCt1ucjaKEgW2A5IF71hxrRhr83Je5xjA==",
       "dependencies": {
-        "@types/chai": "*"
+        "tslib": "^2.4.0"
       }
     },
-    "node_modules/@types/chrome": {
-      "version": "0.0.237",
-      "dev": true,
-      "license": "MIT",
+    "node_modules/@secretkeylabs/xverse-core/node_modules/bip39": {
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/bip39/-/bip39-3.0.3.tgz",
+      "integrity": "sha512-P0dKrz4g0V0BjXfx7d9QNkJ/Txcz/k+hM9TnjqjUaXtuOfAvxXSw2rJw8DX0e3ZPwnK/IgDxoRqf0bvoVCqbMg==",
       "dependencies": {
-        "@types/filesystem": "*",
-        "@types/har-format": "*"
+        "@types/node": "11.11.6",
+        "create-hash": "^1.1.0",
+        "pbkdf2": "^3.0.9",
+        "randombytes": "^2.0.1"
       }
     },
-    "node_modules/@types/connect": {
-      "version": "3.4.35",
+    "node_modules/@sinclair/typebox": {
+      "version": "0.27.8",
+      "resolved": "https://registry.npmjs.org/@sinclair/typebox/-/typebox-0.27.8.tgz",
+      "integrity": "sha512-+Fj43pSMwJs4KRrH/938Uf+uAELIgVBmQzg/q1YG10djyfA3TnrU8N8XzqCh/okZdszqBQTZf96idMfE5lnwTA==",
+      "dev": true
+    },
+    "node_modules/@snyk/github-codeowners": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/@snyk/github-codeowners/-/github-codeowners-1.1.0.tgz",
+      "integrity": "sha512-lGFf08pbkEac0NYgVf4hdANpAgApRjNByLXB+WBip3qj1iendOIyAwP2GKkKbQMNVy2r1xxDf0ssfWscoiC+Vw==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "@types/node": "*"
+        "commander": "^4.1.1",
+        "ignore": "^5.1.8",
+        "p-map": "^4.0.0"
+      },
+      "bin": {
+        "github-codeowners": "dist/cli.js"
+      },
+      "engines": {
+        "node": ">=8.10"
       }
     },
-    "node_modules/@types/connect-history-api-fallback": {
-      "version": "1.5.0",
+    "node_modules/@snyk/github-codeowners/node_modules/commander": {
+      "version": "4.1.1",
+      "resolved": "https://registry.npmjs.org/commander/-/commander-4.1.1.tgz",
+      "integrity": "sha512-NOKm8xhkzAjzFx8B2v5OAHT+u5pRQc2UCa2Vq9jYL/31o2wi9mxBA7LIFs3sV5VSC49z6pEhfbMULvShKj26WA==",
       "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "@types/express-serve-static-core": "*",
-        "@types/node": "*"
+      "engines": {
+        "node": ">= 6"
       }
     },
-    "node_modules/@types/eslint": {
-      "version": "8.44.1",
+    "node_modules/@snyk/github-codeowners/node_modules/p-map": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/p-map/-/p-map-4.0.0.tgz",
+      "integrity": "sha512-/bjOqmgETBYB5BoEeGVea8dmvHb2m9GLy1E9W43yeyfP6QQCZGFNa+XRceJEuDB6zqr+gKpIAmlLebMpykw/MQ==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "@types/estree": "*",
-        "@types/json-schema": "*"
+        "aggregate-error": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/@types/eslint-scope": {
-      "version": "3.7.4",
-      "dev": true,
-      "license": "MIT",
+    "node_modules/@stacks/auth": {
+      "version": "6.13.1",
+      "resolved": "https://registry.npmjs.org/@stacks/auth/-/auth-6.13.1.tgz",
+      "integrity": "sha512-nr5VeLIJBVI72eWYs/oQ7nrmuZxe89AlS5Lt/WxCcUDK9Z+oqQR1qsxBo86yVDlmrxoNWncHWD38LX54HsOEzA==",
       "dependencies": {
-        "@types/eslint": "*",
-        "@types/estree": "*"
+        "@stacks/common": "^6.13.0",
+        "@stacks/encryption": "^6.13.1",
+        "@stacks/network": "^6.13.0",
+        "@stacks/profile": "^6.13.1",
+        "cross-fetch": "^3.1.5",
+        "jsontokens": "^4.0.1"
       }
     },
-    "node_modules/@types/estree": {
-      "version": "1.0.5",
-      "dev": true,
-      "license": "MIT"
-    },
-    "node_modules/@types/express": {
-      "version": "4.17.17",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "@types/body-parser": "*",
-        "@types/express-serve-static-core": "^4.17.33",
-        "@types/qs": "*",
-        "@types/serve-static": "*"
-      }
-    },
-    "node_modules/@types/express-serve-static-core": {
-      "version": "4.17.35",
-      "dev": true,
-      "license": "MIT",
+    "node_modules/@stacks/common": {
+      "version": "6.13.0",
+      "resolved": "https://registry.npmjs.org/@stacks/common/-/common-6.13.0.tgz",
+      "integrity": "sha512-wwzyihjaSdmL6NxKvDeayy3dqM0L0Q2sawmdNtzJDi0FnXuJGm5PeapJj7bEfcI9XwI7Bw5jZoC6mCn9nc5YIw==",
       "dependencies": {
-        "@types/node": "*",
-        "@types/qs": "*",
-        "@types/range-parser": "*",
-        "@types/send": "*"
+        "@types/bn.js": "^5.1.0",
+        "@types/node": "^18.0.4"
       }
     },
-    "node_modules/@types/filesystem": {
-      "version": "0.0.32",
-      "dev": true,
-      "license": "MIT",
+    "node_modules/@stacks/common/node_modules/@types/node": {
+      "version": "18.19.26",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-18.19.26.tgz",
+      "integrity": "sha512-+wiMJsIwLOYCvUqSdKTrfkS8mpTp+MPINe6+Np4TAGFWWRWiBQ5kSq9nZGCSPkzx9mvT+uEukzpX4MOSCydcvw==",
       "dependencies": {
-        "@types/filewriter": "*"
+        "undici-types": "~5.26.4"
       }
     },
-    "node_modules/@types/filewriter": {
-      "version": "0.0.29",
-      "dev": true,
-      "license": "MIT"
-    },
-    "node_modules/@types/glob": {
-      "version": "7.2.0",
-      "dev": true,
-      "license": "MIT",
+    "node_modules/@stacks/connect": {
+      "version": "7.4.1",
+      "resolved": "https://registry.npmjs.org/@stacks/connect/-/connect-7.4.1.tgz",
+      "integrity": "sha512-kvF7Fnx8oMHNi/9At6UI6kThey+gYlYlbtsxhNL2VqflReXI8z3EndaMJ1WrD55ePIOoydAzV/Fx0rdNFjd4rQ==",
       "dependencies": {
-        "@types/minimatch": "*",
-        "@types/node": "*"
+        "@stacks/auth": "^6.1.1",
+        "@stacks/connect-ui": "6.1.2",
+        "@stacks/network": "^6.1.1",
+        "@stacks/profile": "^6.1.1",
+        "@stacks/transactions": "^6.1.1",
+        "jsontokens": "^4.0.1"
       }
     },
-    "node_modules/@types/har-format": {
-      "version": "1.2.11",
-      "dev": true,
-      "license": "MIT"
-    },
-    "node_modules/@types/hoist-non-react-statics": {
-      "version": "3.3.1",
-      "license": "MIT",
+    "node_modules/@stacks/connect-ui": {
+      "version": "6.1.2",
+      "resolved": "https://registry.npmjs.org/@stacks/connect-ui/-/connect-ui-6.1.2.tgz",
+      "integrity": "sha512-V4gUINXRDB2MO6YHk/JZZeApSnANrMFvIRv9qLBaJPamKsgeiCOBkiC88T7ucLVCz+NvCmS93Ntg4wytDIqdOg==",
       "dependencies": {
-        "@types/react": "*",
-        "hoist-non-react-statics": "^3.3.0"
+        "@stencil/core": "^2.17.1"
       }
     },
-    "node_modules/@types/html-minifier-terser": {
-      "version": "6.1.0",
-      "dev": true,
-      "license": "MIT"
-    },
-    "node_modules/@types/http-errors": {
-      "version": "2.0.1",
-      "dev": true,
-      "license": "MIT"
-    },
-    "node_modules/@types/http-proxy": {
-      "version": "1.17.11",
-      "dev": true,
-      "license": "MIT",
+    "node_modules/@stacks/encryption": {
+      "version": "6.13.1",
+      "resolved": "https://registry.npmjs.org/@stacks/encryption/-/encryption-6.13.1.tgz",
+      "integrity": "sha512-y5IFX3/nGI3fCk70gE0JwH70GpshD8RhUfvhMLcL96oNaec1cCdj1ZUiQupeicfYTHuraaVBYU9xLls4TRmypg==",
       "dependencies": {
-        "@types/node": "*"
+        "@noble/hashes": "1.1.5",
+        "@noble/secp256k1": "1.7.1",
+        "@scure/bip39": "1.1.0",
+        "@stacks/common": "^6.13.0",
+        "@types/node": "^18.0.4",
+        "base64-js": "^1.5.1",
+        "bs58": "^5.0.0",
+        "ripemd160-min": "^0.0.6",
+        "varuint-bitcoin": "^1.1.2"
       }
     },
-    "node_modules/@types/json-schema": {
-      "version": "7.0.12",
-      "dev": true,
-      "license": "MIT"
-    },
-    "node_modules/@types/json5": {
-      "version": "0.0.29",
-      "dev": true,
-      "license": "MIT"
-    },
-    "node_modules/@types/mime": {
-      "version": "1.3.2",
-      "dev": true,
-      "license": "MIT"
-    },
-    "node_modules/@types/minimatch": {
-      "version": "5.1.2",
-      "dev": true,
-      "license": "MIT"
-    },
-    "node_modules/@types/mixpanel-browser": {
-      "version": "2.49.0",
-      "dev": true,
-      "license": "MIT"
+    "node_modules/@stacks/encryption/node_modules/@noble/hashes": {
+      "version": "1.1.5",
+      "resolved": "https://registry.npmjs.org/@noble/hashes/-/hashes-1.1.5.tgz",
+      "integrity": "sha512-LTMZiiLc+V4v1Yi16TD6aX2gmtKszNye0pQgbaLqkvhIqP7nVsSaJsWloGQjJfJ8offaoP5GtX3yY5swbcJxxQ==",
+      "funding": [
+        {
+          "type": "individual",
+          "url": "https://paulmillr.com/funding/"
+        }
+      ]
     },
-    "node_modules/@types/node": {
-      "version": "20.14.9",
-      "license": "MIT",
+    "node_modules/@stacks/encryption/node_modules/@types/node": {
+      "version": "18.19.31",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-18.19.31.tgz",
+      "integrity": "sha512-ArgCD39YpyyrtFKIqMDvjz79jto5fcI/SVUs2HwB+f0dAzq68yqOdyaSivLiLugSziTpNXLQrVb7RZFmdZzbhA==",
       "dependencies": {
         "undici-types": "~5.26.4"
       }
     },
-    "node_modules/@types/prop-types": {
-      "version": "15.7.5",
-      "license": "MIT"
-    },
-    "node_modules/@types/qs": {
-      "version": "6.9.7",
-      "dev": true,
-      "license": "MIT"
-    },
-    "node_modules/@types/range-parser": {
-      "version": "1.2.4",
-      "dev": true,
-      "license": "MIT"
-    },
-    "node_modules/@types/react": {
-      "version": "18.2.18",
-      "license": "MIT",
+    "node_modules/@stacks/network": {
+      "version": "6.13.0",
+      "resolved": "https://registry.npmjs.org/@stacks/network/-/network-6.13.0.tgz",
+      "integrity": "sha512-Ss/Da4BNyPBBj1OieM981fJ7SkevKqLPkzoI1+Yo7cYR2df+0FipIN++Z4RfpJpc8ne60vgcx7nJZXQsiGhKBQ==",
       "dependencies": {
-        "@types/prop-types": "*",
-        "@types/scheduler": "*",
-        "csstype": "^3.0.2"
+        "@stacks/common": "^6.13.0",
+        "cross-fetch": "^3.1.5"
       }
     },
-    "node_modules/@types/react-dom": {
-      "version": "18.2.7",
-      "dev": true,
-      "license": "MIT",
+    "node_modules/@stacks/profile": {
+      "version": "6.13.1",
+      "resolved": "https://registry.npmjs.org/@stacks/profile/-/profile-6.13.1.tgz",
+      "integrity": "sha512-GCDE13hwoUYZvZKTb5c0Tr74DcxIP/n4bffcYrKa5UabITPQ7JwsJIOyDoAwdtl3lu7fi9aBsKrdfHpBBUSQIQ==",
       "dependencies": {
-        "@types/react": "*"
+        "@stacks/common": "^6.13.0",
+        "@stacks/network": "^6.13.0",
+        "@stacks/transactions": "^6.13.1",
+        "jsontokens": "^4.0.1",
+        "schema-inspector": "^2.0.2",
+        "zone-file": "^2.0.0-beta.3"
       }
     },
-    "node_modules/@types/react-lottie": {
-      "version": "1.2.10",
-      "dev": true,
-      "license": "MIT",
+    "node_modules/@stacks/stacking": {
+      "version": "6.13.2",
+      "resolved": "https://registry.npmjs.org/@stacks/stacking/-/stacking-6.13.2.tgz",
+      "integrity": "sha512-4h1UQuL2+Xdra9zMqzUElvKG9X9fenuNE7hD9sIqyxyLFxeQ7gRqczmTYPsmaj4wY5004JNj+efzGJ0VmpOcAA==",
       "dependencies": {
-        "@types/react": "*"
+        "@noble/hashes": "1.1.5",
+        "@scure/base": "1.1.1",
+        "@stacks/common": "^6.13.0",
+        "@stacks/encryption": "^6.13.1",
+        "@stacks/network": "^6.13.0",
+        "@stacks/stacks-blockchain-api-types": "^0.61.0",
+        "@stacks/transactions": "^6.13.1",
+        "bs58": "^5.0.0"
       }
     },
-    "node_modules/@types/react-modal": {
-      "version": "3.16.0",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "@types/react": "*"
-      }
+    "node_modules/@stacks/stacking/node_modules/@noble/hashes": {
+      "version": "1.1.5",
+      "resolved": "https://registry.npmjs.org/@noble/hashes/-/hashes-1.1.5.tgz",
+      "integrity": "sha512-LTMZiiLc+V4v1Yi16TD6aX2gmtKszNye0pQgbaLqkvhIqP7nVsSaJsWloGQjJfJ8offaoP5GtX3yY5swbcJxxQ==",
+      "funding": [
+        {
+          "type": "individual",
+          "url": "https://paulmillr.com/funding/"
+        }
+      ]
     },
-    "node_modules/@types/react-redux": {
-      "version": "7.1.25",
-      "license": "MIT",
+    "node_modules/@stacks/stacking/node_modules/@scure/base": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/@scure/base/-/base-1.1.1.tgz",
+      "integrity": "sha512-ZxOhsSyxYwLJj3pLZCefNitxsj093tb2vq90mp2txoYeBqbcjDjqFhyM8eUjq/uFm6zJ+mUuqxlS2FkuSY1MTA==",
+      "funding": [
+        {
+          "type": "individual",
+          "url": "https://paulmillr.com/funding/"
+        }
+      ]
+    },
+    "node_modules/@stacks/stacking/node_modules/@stacks/stacks-blockchain-api-types": {
+      "version": "0.61.0",
+      "resolved": "https://registry.npmjs.org/@stacks/stacks-blockchain-api-types/-/stacks-blockchain-api-types-0.61.0.tgz",
+      "integrity": "sha512-yPOfTUboo5eA9BZL/hqMcM71GstrFs9YWzOrJFPeP4cOO1wgYvAcckgBRbgiE3NqeX0A7SLZLDAXLZbATuRq9w=="
+    },
+    "node_modules/@stacks/stacks-blockchain-api-types": {
+      "version": "6.1.1",
+      "resolved": "https://registry.npmjs.org/@stacks/stacks-blockchain-api-types/-/stacks-blockchain-api-types-6.1.1.tgz",
+      "integrity": "sha512-Mw5dBPx3DySPupwaq0iBdm1WdEVXIfhjUVaTjI2iSyzWz4Fgs3U7JCaAezLbgNu7Q69c/ZN4JUDWuo9FVjy7oA=="
+    },
+    "node_modules/@stacks/storage": {
+      "version": "6.13.1",
+      "resolved": "https://registry.npmjs.org/@stacks/storage/-/storage-6.13.1.tgz",
+      "integrity": "sha512-XnzRAETDKW7Ij3cuUNllrrnLOCwctV/XrIHgVWnD04LNL5R9apkwp9IkzaFbyJZ+XrkUBKwtdCgVYype2XgT6w==",
       "dependencies": {
-        "@types/hoist-non-react-statics": "^3.3.0",
-        "@types/react": "*",
-        "hoist-non-react-statics": "^3.3.0",
-        "redux": "^4.0.0"
+        "@stacks/auth": "^6.13.1",
+        "@stacks/common": "^6.13.0",
+        "@stacks/encryption": "^6.13.1",
+        "@stacks/network": "^6.13.0",
+        "base64-js": "^1.5.1",
+        "jsontokens": "^4.0.1"
       }
     },
-    "node_modules/@types/redux-state-sync": {
-      "version": "3.1.5",
-      "dev": true,
-      "license": "MIT",
+    "node_modules/@stacks/transactions": {
+      "version": "6.13.1",
+      "resolved": "https://registry.npmjs.org/@stacks/transactions/-/transactions-6.13.1.tgz",
+      "integrity": "sha512-PWw2I+2Fj3CaFYQIoVcqQN6E2qGHNhFv03nuR0CxMq0sx8stPgYZbdzUlnlBcJQdsFiHrw3sPeqnXDZt+Hg5YQ==",
       "dependencies": {
-        "broadcast-channel": "^2.1.8",
-        "redux": "^4.0.1"
+        "@noble/hashes": "1.1.5",
+        "@noble/secp256k1": "1.7.1",
+        "@stacks/common": "^6.13.0",
+        "@stacks/network": "^6.13.0",
+        "c32check": "^2.0.0",
+        "lodash.clonedeep": "^4.5.0"
       }
     },
-    "node_modules/@types/retry": {
-      "version": "0.12.0",
-      "dev": true,
-      "license": "MIT"
+    "node_modules/@stacks/transactions/node_modules/@noble/hashes": {
+      "version": "1.1.5",
+      "resolved": "https://registry.npmjs.org/@noble/hashes/-/hashes-1.1.5.tgz",
+      "integrity": "sha512-LTMZiiLc+V4v1Yi16TD6aX2gmtKszNye0pQgbaLqkvhIqP7nVsSaJsWloGQjJfJ8offaoP5GtX3yY5swbcJxxQ==",
+      "funding": [
+        {
+          "type": "individual",
+          "url": "https://paulmillr.com/funding/"
+        }
+      ]
     },
-    "node_modules/@types/scheduler": {
-      "version": "0.16.3",
-      "license": "MIT"
+    "node_modules/@stacks/wallet-sdk": {
+      "version": "6.13.1",
+      "resolved": "https://registry.npmjs.org/@stacks/wallet-sdk/-/wallet-sdk-6.13.1.tgz",
+      "integrity": "sha512-262CYKAm1j8oVxfGUIJrHp867j9gm5NrqPM85s0TfCv2QhfLDkvme6nKgmvtL2TecAZkBa5tu8M5DQ7z92WvAQ==",
+      "dependencies": {
+        "@scure/bip32": "1.1.3",
+        "@scure/bip39": "1.1.0",
+        "@stacks/auth": "^6.13.1",
+        "@stacks/common": "^6.13.0",
+        "@stacks/encryption": "^6.13.1",
+        "@stacks/network": "^6.13.0",
+        "@stacks/profile": "^6.13.1",
+        "@stacks/storage": "^6.13.1",
+        "@stacks/transactions": "^6.13.1",
+        "buffer": "^6.0.3",
+        "c32check": "^2.0.0",
+        "jsontokens": "^4.0.1",
+        "triplesec": "^4.0.3",
+        "zone-file": "^2.0.0-beta.3"
+      }
     },
-    "node_modules/@types/semver": {
-      "version": "7.5.0",
-      "dev": true,
-      "license": "MIT"
+    "node_modules/@stacks/wallet-sdk/node_modules/@noble/hashes": {
+      "version": "1.1.5",
+      "resolved": "https://registry.npmjs.org/@noble/hashes/-/hashes-1.1.5.tgz",
+      "integrity": "sha512-LTMZiiLc+V4v1Yi16TD6aX2gmtKszNye0pQgbaLqkvhIqP7nVsSaJsWloGQjJfJ8offaoP5GtX3yY5swbcJxxQ==",
+      "funding": [
+        {
+          "type": "individual",
+          "url": "https://paulmillr.com/funding/"
+        }
+      ]
     },
-    "node_modules/@types/send": {
-      "version": "0.17.1",
-      "dev": true,
-      "license": "MIT",
+    "node_modules/@stacks/wallet-sdk/node_modules/@scure/bip32": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/@scure/bip32/-/bip32-1.1.3.tgz",
+      "integrity": "sha512-dSH3+LCWONlSNQuF34xZrG6Xas7tp2jSSqHb/pMfXWM0vKE4JZOtK3uJfoWouUVW5IGlls75HkXmYLldZ8ySgQ==",
+      "funding": [
+        {
+          "type": "individual",
+          "url": "https://paulmillr.com/funding/"
+        }
+      ],
       "dependencies": {
-        "@types/mime": "^1",
-        "@types/node": "*"
+        "@noble/hashes": "~1.1.3",
+        "@noble/secp256k1": "~1.7.0",
+        "@scure/base": "~1.1.0"
       }
     },
-    "node_modules/@types/serve-index": {
-      "version": "1.9.1",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "@types/express": "*"
+    "node_modules/@stencil/core": {
+      "version": "2.22.3",
+      "resolved": "https://registry.npmjs.org/@stencil/core/-/core-2.22.3.tgz",
+      "integrity": "sha512-kmVA0M/HojwsfkeHsifvHVIYe4l5tin7J5+DLgtl8h6WWfiMClND5K3ifCXXI2ETDNKiEk21p6jql3Fx9o2rng==",
+      "bin": {
+        "stencil": "bin/stencil"
+      },
+      "engines": {
+        "node": ">=12.10.0",
+        "npm": ">=6.0.0"
       }
     },
-    "node_modules/@types/serve-static": {
-      "version": "1.15.2",
+    "node_modules/@tanstack/eslint-plugin-query": {
+      "version": "4.32.1",
+      "resolved": "https://registry.npmjs.org/@tanstack/eslint-plugin-query/-/eslint-plugin-query-4.32.1.tgz",
+      "integrity": "sha512-29oveq5n7momN+/d0SheNccnp1qws4JRG/PdeiPHwWAVQ9HxwtZTFxhFJxvMzVk7UsY3LsQB0keIajC+K9ZJ7w==",
       "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "@types/http-errors": "*",
-        "@types/mime": "*",
-        "@types/node": "*"
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/tannerlinsley"
       }
     },
-    "node_modules/@types/sha.js": {
-      "version": "2.4.4",
-      "resolved": "https://registry.npmjs.org/@types/sha.js/-/sha.js-2.4.4.tgz",
-      "integrity": "sha512-Qukd+D6S2Hm0wLVt2Vh+/eWBIoUt+wF8jWjBsG4F8EFQRwKtYvtXCPcNl2OEUQ1R+eTr3xuSaBYUyM3WD1x/Qw==",
+    "node_modules/@tanstack/match-sorter-utils": {
+      "version": "8.8.4",
+      "resolved": "https://registry.npmjs.org/@tanstack/match-sorter-utils/-/match-sorter-utils-8.8.4.tgz",
+      "integrity": "sha512-rKH8LjZiszWEvmi01NR72QWZ8m4xmXre0OOwlRGnjU01Eqz/QnN+cqpty2PJ0efHblq09+KilvyR7lsbzmXVEw==",
       "dependencies": {
-        "@types/node": "*"
+        "remove-accents": "0.4.2"
+      },
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/kentcdodds"
       }
     },
-    "node_modules/@types/sockjs": {
-      "version": "0.3.33",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "@types/node": "*"
+    "node_modules/@tanstack/query-core": {
+      "version": "4.32.1",
+      "resolved": "https://registry.npmjs.org/@tanstack/query-core/-/query-core-4.32.1.tgz",
+      "integrity": "sha512-VEAGHboOFWN/bvf/7cCoeLQfld0AA8n0V/kfc77W+FvxnnSwJufEh6gfjqpX5bRE/DEYfYDYdNtuL3KM+lIs8Q==",
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/tannerlinsley"
       }
     },
-    "node_modules/@types/styled-components": {
-      "version": "5.1.26",
-      "dev": true,
-      "license": "MIT",
+    "node_modules/@tanstack/query-persist-client-core": {
+      "version": "4.32.1",
+      "resolved": "https://registry.npmjs.org/@tanstack/query-persist-client-core/-/query-persist-client-core-4.32.1.tgz",
+      "integrity": "sha512-KgnkNigmOMi2aikxdhCRe0MaAh1Dq94/nNjmcSxfflj9L3v4F9tEQAig/F7m2+jethP1AiIYBax5nN4aqm7NFg==",
       "dependencies": {
-        "@types/hoist-non-react-statics": "*",
-        "@types/react": "*",
-        "csstype": "^3.0.2"
+        "@tanstack/query-core": "4.32.1"
+      },
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/tannerlinsley"
       }
     },
-    "node_modules/@types/uuid": {
-      "version": "8.3.4",
-      "resolved": "https://registry.npmjs.org/@types/uuid/-/uuid-8.3.4.tgz",
-      "integrity": "sha512-c/I8ZRb51j+pYGAu5CrFMRxqZ2ke4y2grEBO5AUjgSkSk+qT2Ea+OdWElz/OiMf5MNpn2b17kuVBwZLQJXzihw=="
-    },
-    "node_modules/@types/webextension-polyfill": {
-      "version": "0.9.2",
-      "dev": true,
-      "license": "MIT"
-    },
-    "node_modules/@types/ws": {
-      "version": "8.5.5",
-      "dev": true,
-      "license": "MIT",
+    "node_modules/@tanstack/query-sync-storage-persister": {
+      "version": "4.32.1",
+      "resolved": "https://registry.npmjs.org/@tanstack/query-sync-storage-persister/-/query-sync-storage-persister-4.32.1.tgz",
+      "integrity": "sha512-kqE+L0uSzVMuPpY8iKtnyZexsZ5IxsJbgiI4s+m+FB8Dzn+5go3snpZIYMQu36S+sWy0N90P2xNR57EOaFMlsg==",
       "dependencies": {
-        "@types/node": "*"
+        "@tanstack/query-persist-client-core": "4.32.1"
+      },
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/tannerlinsley"
       }
     },
-    "node_modules/@types/zxcvbn": {
-      "version": "4.4.1",
-      "dev": true,
-      "license": "MIT"
-    },
-    "node_modules/@typescript-eslint/eslint-plugin": {
-      "version": "5.62.0",
-      "dev": true,
-      "license": "MIT",
+    "node_modules/@tanstack/react-query": {
+      "version": "4.32.1",
+      "resolved": "https://registry.npmjs.org/@tanstack/react-query/-/react-query-4.32.1.tgz",
+      "integrity": "sha512-lPTfOq6bR6DorPaS018gTMd3zs8r06tlERiVY6BRP9SnDkkl4ckqeANava/jPLWrSZP+EA15loQUTmvZs6k2GA==",
       "dependencies": {
-        "@eslint-community/regexpp": "^4.4.0",
-        "@typescript-eslint/scope-manager": "5.62.0",
-        "@typescript-eslint/type-utils": "5.62.0",
-        "@typescript-eslint/utils": "5.62.0",
-        "debug": "^4.3.4",
-        "graphemer": "^1.4.0",
-        "ignore": "^5.2.0",
-        "natural-compare-lite": "^1.4.0",
-        "semver": "^7.3.7",
-        "tsutils": "^3.21.0"
-      },
-      "engines": {
-        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+        "@tanstack/query-core": "4.32.1",
+        "use-sync-external-store": "^1.2.0"
       },
       "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/typescript-eslint"
+        "type": "github",
+        "url": "https://github.com/sponsors/tannerlinsley"
       },
       "peerDependencies": {
-        "@typescript-eslint/parser": "^5.0.0",
-        "eslint": "^6.0.0 || ^7.0.0 || ^8.0.0"
+        "react": "^16.8.0 || ^17.0.0 || ^18.0.0",
+        "react-dom": "^16.8.0 || ^17.0.0 || ^18.0.0",
+        "react-native": "*"
       },
       "peerDependenciesMeta": {
-        "typescript": {
+        "react-dom": {
+          "optional": true
+        },
+        "react-native": {
           "optional": true
         }
       }
     },
-    "node_modules/@typescript-eslint/eslint-plugin/node_modules/lru-cache": {
-      "version": "6.0.0",
-      "dev": true,
-      "license": "ISC",
+    "node_modules/@tanstack/react-query-devtools": {
+      "version": "4.32.1",
+      "resolved": "https://registry.npmjs.org/@tanstack/react-query-devtools/-/react-query-devtools-4.32.1.tgz",
+      "integrity": "sha512-/ZgxCfGXLIXUvaIRzrNCP+C4iv1bIleNzXCjGKFZ4qKEifnv5A/SpWE2dG4SBjqXVlIkMAP82lesfoHcsOm+zg==",
       "dependencies": {
-        "yallist": "^4.0.0"
+        "@tanstack/match-sorter-utils": "^8.7.0",
+        "superjson": "^1.10.0",
+        "use-sync-external-store": "^1.2.0"
       },
-      "engines": {
-        "node": ">=10"
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/tannerlinsley"
+      },
+      "peerDependencies": {
+        "@tanstack/react-query": "4.32.1",
+        "react": "^16.8.0 || ^17.0.0 || ^18.0.0",
+        "react-dom": "^16.8.0 || ^17.0.0 || ^18.0.0"
       }
     },
-    "node_modules/@typescript-eslint/eslint-plugin/node_modules/semver": {
-      "version": "7.5.4",
-      "dev": true,
-      "license": "ISC",
+    "node_modules/@tanstack/react-query-devtools/node_modules/superjson": {
+      "version": "1.13.3",
+      "resolved": "https://registry.npmjs.org/superjson/-/superjson-1.13.3.tgz",
+      "integrity": "sha512-mJiVjfd2vokfDxsQPOwJ/PtanO87LhpYY88ubI5dUB1Ab58Txbyje3+jpm+/83R/fevaq/107NNhtYBLuoTrFg==",
       "dependencies": {
-        "lru-cache": "^6.0.0"
-      },
-      "bin": {
-        "semver": "bin/semver.js"
+        "copy-anything": "^3.0.2"
       },
       "engines": {
         "node": ">=10"
       }
     },
-    "node_modules/@typescript-eslint/eslint-plugin/node_modules/yallist": {
-      "version": "4.0.0",
-      "dev": true,
-      "license": "ISC"
-    },
-    "node_modules/@typescript-eslint/parser": {
-      "version": "5.62.0",
-      "dev": true,
-      "license": "BSD-2-Clause",
+    "node_modules/@tanstack/react-query-persist-client": {
+      "version": "4.32.1",
+      "resolved": "https://registry.npmjs.org/@tanstack/react-query-persist-client/-/react-query-persist-client-4.32.1.tgz",
+      "integrity": "sha512-HtfhSOyMSjdASpPXWBWv9JquUk5b8HjOwbFVmtA8xIDFQm9qS35PikXO2YbBXhuz/LEknRhct/M3PMI/XkRQSg==",
       "dependencies": {
-        "@typescript-eslint/scope-manager": "5.62.0",
-        "@typescript-eslint/types": "5.62.0",
-        "@typescript-eslint/typescript-estree": "5.62.0",
-        "debug": "^4.3.4"
-      },
-      "engines": {
-        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+        "@tanstack/query-persist-client-core": "4.32.1"
       },
       "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/typescript-eslint"
+        "type": "github",
+        "url": "https://github.com/sponsors/tannerlinsley"
       },
       "peerDependencies": {
-        "eslint": "^6.0.0 || ^7.0.0 || ^8.0.0"
-      },
-      "peerDependenciesMeta": {
-        "typescript": {
-          "optional": true
-        }
+        "@tanstack/react-query": "4.32.1"
       }
     },
-    "node_modules/@typescript-eslint/scope-manager": {
-      "version": "5.62.0",
-      "dev": true,
-      "license": "MIT",
+    "node_modules/@types/argon2-browser": {
+      "version": "1.18.1",
+      "resolved": "https://registry.npmjs.org/@types/argon2-browser/-/argon2-browser-1.18.1.tgz",
+      "integrity": "sha512-PZffP/CqH9m2kovDSRQMfMMxUC3V98I7i7/caa0RB0/nvsXzYbL9bKyqZpNMFmLFGZslROlG1R60ONt7abrwlA==",
+      "dev": true
+    },
+    "node_modules/@types/bn.js": {
+      "version": "5.1.1",
+      "resolved": "https://registry.npmjs.org/@types/bn.js/-/bn.js-5.1.1.tgz",
+      "integrity": "sha512-qNrYbZqMx0uJAfKnKclPh+dTwK33KfLHYqtyODwd5HnXOjnkhc4qgn3BrK6RWyGZm5+sIFE7Q7Vz6QQtJB7w7g==",
       "dependencies": {
-        "@typescript-eslint/types": "5.62.0",
-        "@typescript-eslint/visitor-keys": "5.62.0"
-      },
-      "engines": {
-        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/typescript-eslint"
+        "@types/node": "*"
       }
     },
-    "node_modules/@typescript-eslint/type-utils": {
-      "version": "5.62.0",
+    "node_modules/@types/body-parser": {
+      "version": "1.19.2",
+      "resolved": "https://registry.npmjs.org/@types/body-parser/-/body-parser-1.19.2.tgz",
+      "integrity": "sha512-ALYone6pm6QmwZoAgeyNksccT9Q4AWZQ6PvfwR37GT6r6FWUPguq6sUmNGSMV2Wr761oQoBxwGGa6DR5o1DC9g==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "@typescript-eslint/typescript-estree": "5.62.0",
-        "@typescript-eslint/utils": "5.62.0",
-        "debug": "^4.3.4",
-        "tsutils": "^3.21.0"
-      },
-      "engines": {
-        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/typescript-eslint"
-      },
-      "peerDependencies": {
-        "eslint": "*"
-      },
-      "peerDependenciesMeta": {
-        "typescript": {
-          "optional": true
-        }
+        "@types/connect": "*",
+        "@types/node": "*"
       }
     },
-    "node_modules/@typescript-eslint/types": {
-      "version": "5.62.0",
+    "node_modules/@types/bonjour": {
+      "version": "3.5.10",
+      "resolved": "https://registry.npmjs.org/@types/bonjour/-/bonjour-3.5.10.tgz",
+      "integrity": "sha512-p7ienRMiS41Nu2/igbJxxLDWrSZ0WxM8UQgCeO9KhoVF7cOVFkrKsiDr1EsJIla8vV3oEEjGcz11jc5yimhzZw==",
       "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/typescript-eslint"
+      "dependencies": {
+        "@types/node": "*"
       }
     },
-    "node_modules/@typescript-eslint/typescript-estree": {
-      "version": "5.62.0",
+    "node_modules/@types/chai": {
+      "version": "4.3.11",
+      "resolved": "https://registry.npmjs.org/@types/chai/-/chai-4.3.11.tgz",
+      "integrity": "sha512-qQR1dr2rGIHYlJulmr8Ioq3De0Le9E4MJ5AiaeAETJJpndT1uUNHsGFK3L/UIu+rbkQSdj8J/w2bCsBZc/Y5fQ==",
+      "dev": true
+    },
+    "node_modules/@types/chai-subset": {
+      "version": "1.3.5",
+      "resolved": "https://registry.npmjs.org/@types/chai-subset/-/chai-subset-1.3.5.tgz",
+      "integrity": "sha512-c2mPnw+xHtXDoHmdtcCXGwyLMiauiAyxWMzhGpqHC4nqI/Y5G2XhTampslK2rb59kpcuHon03UH8W6iYUzw88A==",
       "dev": true,
-      "license": "BSD-2-Clause",
       "dependencies": {
-        "@typescript-eslint/types": "5.62.0",
-        "@typescript-eslint/visitor-keys": "5.62.0",
-        "debug": "^4.3.4",
-        "globby": "^11.1.0",
-        "is-glob": "^4.0.3",
-        "semver": "^7.3.7",
-        "tsutils": "^3.21.0"
-      },
-      "engines": {
-        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/typescript-eslint"
-      },
-      "peerDependenciesMeta": {
-        "typescript": {
-          "optional": true
-        }
+        "@types/chai": "*"
       }
     },
-    "node_modules/@typescript-eslint/typescript-estree/node_modules/lru-cache": {
-      "version": "6.0.0",
+    "node_modules/@types/chrome": {
+      "version": "0.0.237",
+      "resolved": "https://registry.npmjs.org/@types/chrome/-/chrome-0.0.237.tgz",
+      "integrity": "sha512-krsRmyfMlck5r+H1EapsrrucDRq6iRm0NAi5fapr93CgnpVMDdK+h2+z4x79GegdW7BNH9Vb//gkptORwwwVIQ==",
       "dev": true,
-      "license": "ISC",
       "dependencies": {
-        "yallist": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=10"
+        "@types/filesystem": "*",
+        "@types/har-format": "*"
       }
     },
-    "node_modules/@typescript-eslint/typescript-estree/node_modules/semver": {
-      "version": "7.5.4",
+    "node_modules/@types/connect": {
+      "version": "3.4.35",
+      "resolved": "https://registry.npmjs.org/@types/connect/-/connect-3.4.35.tgz",
+      "integrity": "sha512-cdeYyv4KWoEgpBISTxWvqYsVy444DOqehiF3fM3ne10AmJ62RSyNkUnxMJXHQWRQQX2eR94m5y1IZyDwBjV9FQ==",
       "dev": true,
-      "license": "ISC",
       "dependencies": {
-        "lru-cache": "^6.0.0"
-      },
-      "bin": {
-        "semver": "bin/semver.js"
-      },
-      "engines": {
-        "node": ">=10"
+        "@types/node": "*"
       }
     },
-    "node_modules/@typescript-eslint/typescript-estree/node_modules/yallist": {
-      "version": "4.0.0",
-      "dev": true,
-      "license": "ISC"
-    },
-    "node_modules/@typescript-eslint/utils": {
-      "version": "5.62.0",
+    "node_modules/@types/connect-history-api-fallback": {
+      "version": "1.5.0",
+      "resolved": "https://registry.npmjs.org/@types/connect-history-api-fallback/-/connect-history-api-fallback-1.5.0.tgz",
+      "integrity": "sha512-4x5FkPpLipqwthjPsF7ZRbOv3uoLUFkTA9G9v583qi4pACvq0uTELrB8OLUzPWUI4IJIyvM85vzkV1nyiI2Lig==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "@eslint-community/eslint-utils": "^4.2.0",
-        "@types/json-schema": "^7.0.9",
-        "@types/semver": "^7.3.12",
-        "@typescript-eslint/scope-manager": "5.62.0",
-        "@typescript-eslint/types": "5.62.0",
-        "@typescript-eslint/typescript-estree": "5.62.0",
-        "eslint-scope": "^5.1.1",
-        "semver": "^7.3.7"
-      },
-      "engines": {
-        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/typescript-eslint"
-      },
-      "peerDependencies": {
-        "eslint": "^6.0.0 || ^7.0.0 || ^8.0.0"
+        "@types/express-serve-static-core": "*",
+        "@types/node": "*"
       }
     },
-    "node_modules/@typescript-eslint/utils/node_modules/lru-cache": {
-      "version": "6.0.0",
+    "node_modules/@types/eslint": {
+      "version": "8.44.1",
+      "resolved": "https://registry.npmjs.org/@types/eslint/-/eslint-8.44.1.tgz",
+      "integrity": "sha512-XpNDc4Z5Tb4x+SW1MriMVeIsMoONHCkWFMkR/aPJbzEsxqHy+4Glu/BqTdPrApfDeMaXbtNh6bseNgl5KaWrSg==",
       "dev": true,
-      "license": "ISC",
       "dependencies": {
-        "yallist": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=10"
+        "@types/estree": "*",
+        "@types/json-schema": "*"
       }
     },
-    "node_modules/@typescript-eslint/utils/node_modules/semver": {
-      "version": "7.5.4",
+    "node_modules/@types/eslint-scope": {
+      "version": "3.7.4",
+      "resolved": "https://registry.npmjs.org/@types/eslint-scope/-/eslint-scope-3.7.4.tgz",
+      "integrity": "sha512-9K4zoImiZc3HlIp6AVUDE4CWYx22a+lhSZMYNpbjW04+YF0KWj4pJXnEMjdnFTiQibFFmElcsasJXDbdI/EPhA==",
       "dev": true,
-      "license": "ISC",
       "dependencies": {
-        "lru-cache": "^6.0.0"
-      },
-      "bin": {
-        "semver": "bin/semver.js"
-      },
-      "engines": {
-        "node": ">=10"
+        "@types/eslint": "*",
+        "@types/estree": "*"
       }
     },
-    "node_modules/@typescript-eslint/utils/node_modules/yallist": {
-      "version": "4.0.0",
-      "dev": true,
-      "license": "ISC"
+    "node_modules/@types/estree": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.5.tgz",
+      "integrity": "sha512-/kYRxGDLWzHOB7q+wtSUQlFrtcdUccpfy+X+9iMBpHK8QLLhx2wIPYuS5DYtR9Wa/YlZAbIovy7qVdB1Aq6Lyw==",
+      "dev": true
     },
-    "node_modules/@typescript-eslint/visitor-keys": {
-      "version": "5.62.0",
+    "node_modules/@types/express": {
+      "version": "4.17.17",
+      "resolved": "https://registry.npmjs.org/@types/express/-/express-4.17.17.tgz",
+      "integrity": "sha512-Q4FmmuLGBG58btUnfS1c1r/NQdlp3DMfGDGig8WhfpA2YRUtEkxAjkZb0yvplJGYdF1fsQ81iMDcH24sSCNC/Q==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "@typescript-eslint/types": "5.62.0",
-        "eslint-visitor-keys": "^3.3.0"
-      },
-      "engines": {
-        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/typescript-eslint"
+        "@types/body-parser": "*",
+        "@types/express-serve-static-core": "^4.17.33",
+        "@types/qs": "*",
+        "@types/serve-static": "*"
       }
     },
-    "node_modules/@vitest/expect": {
-      "version": "0.34.6",
+    "node_modules/@types/express-serve-static-core": {
+      "version": "4.17.35",
+      "resolved": "https://registry.npmjs.org/@types/express-serve-static-core/-/express-serve-static-core-4.17.35.tgz",
+      "integrity": "sha512-wALWQwrgiB2AWTT91CB62b6Yt0sNHpznUXeZEcnPU3DRdlDIz74x8Qg1UUYKSVFi+va5vKOLYRBI1bRKiLLKIg==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "@vitest/spy": "0.34.6",
-        "@vitest/utils": "0.34.6",
-        "chai": "^4.3.10"
-      },
-      "funding": {
-        "url": "https://opencollective.com/vitest"
+        "@types/node": "*",
+        "@types/qs": "*",
+        "@types/range-parser": "*",
+        "@types/send": "*"
       }
     },
-    "node_modules/@vitest/runner": {
-      "version": "0.34.6",
+    "node_modules/@types/filesystem": {
+      "version": "0.0.32",
+      "resolved": "https://registry.npmjs.org/@types/filesystem/-/filesystem-0.0.32.tgz",
+      "integrity": "sha512-Yuf4jR5YYMR2DVgwuCiP11s0xuVRyPKmz8vo6HBY3CGdeMj8af93CFZX+T82+VD1+UqHOxTq31lO7MI7lepBtQ==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "@vitest/utils": "0.34.6",
-        "p-limit": "^4.0.0",
-        "pathe": "^1.1.1"
-      },
-      "funding": {
-        "url": "https://opencollective.com/vitest"
+        "@types/filewriter": "*"
       }
     },
-    "node_modules/@vitest/runner/node_modules/p-limit": {
-      "version": "4.0.0",
+    "node_modules/@types/filewriter": {
+      "version": "0.0.29",
+      "resolved": "https://registry.npmjs.org/@types/filewriter/-/filewriter-0.0.29.tgz",
+      "integrity": "sha512-BsPXH/irW0ht0Ji6iw/jJaK8Lj3FJemon2gvEqHKpCdDCeemHa+rI3WBGq5z7cDMZgoLjY40oninGxqk+8NzNQ==",
+      "dev": true
+    },
+    "node_modules/@types/glob": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/@types/glob/-/glob-7.2.0.tgz",
+      "integrity": "sha512-ZUxbzKl0IfJILTS6t7ip5fQQM/J3TJYubDm3nMbgubNNYS62eXeUpoLUC8/7fJNiFYHTrGPQn7hspDUzIHX3UA==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "yocto-queue": "^1.0.0"
-      },
-      "engines": {
-        "node": "^12.20.0 || ^14.13.1 || >=16.0.0"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
+        "@types/minimatch": "*",
+        "@types/node": "*"
       }
     },
-    "node_modules/@vitest/runner/node_modules/yocto-queue": {
-      "version": "1.0.0",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=12.20"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
+    "node_modules/@types/har-format": {
+      "version": "1.2.11",
+      "resolved": "https://registry.npmjs.org/@types/har-format/-/har-format-1.2.11.tgz",
+      "integrity": "sha512-T232/TneofqK30AD1LRrrf8KnjLvzrjWDp7eWST5KoiSzrBfRsLrWDPk4STQPW4NZG6v2MltnduBVmakbZOBIQ==",
+      "dev": true
     },
-    "node_modules/@vitest/snapshot": {
-      "version": "0.34.6",
-      "dev": true,
-      "license": "MIT",
+    "node_modules/@types/hoist-non-react-statics": {
+      "version": "3.3.1",
+      "resolved": "https://registry.npmjs.org/@types/hoist-non-react-statics/-/hoist-non-react-statics-3.3.1.tgz",
+      "integrity": "sha512-iMIqiko6ooLrTh1joXodJK5X9xeEALT1kM5G3ZLhD3hszxBdIEd5C75U834D9mLcINgD4OyZf5uQXjkuYydWvA==",
       "dependencies": {
-        "magic-string": "^0.30.1",
-        "pathe": "^1.1.1",
-        "pretty-format": "^29.5.0"
-      },
-      "funding": {
-        "url": "https://opencollective.com/vitest"
+        "@types/react": "*",
+        "hoist-non-react-statics": "^3.3.0"
       }
     },
-    "node_modules/@vitest/snapshot/node_modules/ansi-styles": {
-      "version": "5.2.0",
+    "node_modules/@types/html-minifier-terser": {
+      "version": "6.1.0",
+      "resolved": "https://registry.npmjs.org/@types/html-minifier-terser/-/html-minifier-terser-6.1.0.tgz",
+      "integrity": "sha512-oh/6byDPnL1zeNXFrDXFLyZjkr1MsBG667IM792caf1L2UPOOMf65NFzjUH/ltyfwjAGfs1rsX1eftK0jC/KIg==",
+      "dev": true
+    },
+    "node_modules/@types/http-errors": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/@types/http-errors/-/http-errors-2.0.1.tgz",
+      "integrity": "sha512-/K3ds8TRAfBvi5vfjuz8y6+GiAYBZ0x4tXv1Av6CWBWn0IlADc+ZX9pMq7oU0fNQPnBwIZl3rmeLp6SBApbxSQ==",
+      "dev": true
+    },
+    "node_modules/@types/http-proxy": {
+      "version": "1.17.11",
+      "resolved": "https://registry.npmjs.org/@types/http-proxy/-/http-proxy-1.17.11.tgz",
+      "integrity": "sha512-HC8G7c1WmaF2ekqpnFq626xd3Zz0uvaqFmBJNRZCGEZCXkvSdJoNFn/8Ygbd9fKNQj8UzLdCETaI0UWPAjK7IA==",
       "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
+      "dependencies": {
+        "@types/node": "*"
       }
     },
-    "node_modules/@vitest/snapshot/node_modules/pretty-format": {
-      "version": "29.7.0",
-      "dev": true,
-      "license": "MIT",
+    "node_modules/@types/json-schema": {
+      "version": "7.0.12",
+      "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.12.tgz",
+      "integrity": "sha512-Hr5Jfhc9eYOQNPYO5WLDq/n4jqijdHNlDXjuAQkkt+mWdQR+XJToOHrsD4cPaMXpn6KO7y2+wM8AZEs8VpBLVA==",
+      "dev": true
+    },
+    "node_modules/@types/json5": {
+      "version": "0.0.29",
+      "resolved": "https://registry.npmjs.org/@types/json5/-/json5-0.0.29.tgz",
+      "integrity": "sha512-dRLjCWHYg4oaA77cxO64oO+7JwCwnIzkZPdrrC71jQmQtlhM556pwKo5bUzqvZndkVbeFLIIi+9TC40JNF5hNQ==",
+      "dev": true
+    },
+    "node_modules/@types/mime": {
+      "version": "1.3.2",
+      "resolved": "https://registry.npmjs.org/@types/mime/-/mime-1.3.2.tgz",
+      "integrity": "sha512-YATxVxgRqNH6nHEIsvg6k2Boc1JHI9ZbH5iWFFv/MTkchz3b1ieGDa5T0a9RznNdI0KhVbdbWSN+KWWrQZRxTw==",
+      "dev": true
+    },
+    "node_modules/@types/minimatch": {
+      "version": "5.1.2",
+      "resolved": "https://registry.npmjs.org/@types/minimatch/-/minimatch-5.1.2.tgz",
+      "integrity": "sha512-K0VQKziLUWkVKiRVrx4a40iPaxTUefQmjtkQofBkYRcoaaL/8rhwDWww9qWbrgicNOgnpIsMxyNIUM4+n6dUIA==",
+      "dev": true
+    },
+    "node_modules/@types/mixpanel-browser": {
+      "version": "2.49.0",
+      "resolved": "https://registry.npmjs.org/@types/mixpanel-browser/-/mixpanel-browser-2.49.0.tgz",
+      "integrity": "sha512-StmgUnS58d44DmIAEX9Kk8qwisAYCl6E2qulIjYyHXUPuJCPOuyUMTTKBp+aU2F2do+kxAzCxiBtsB4fnBT9Fg==",
+      "dev": true
+    },
+    "node_modules/@types/node": {
+      "version": "20.14.9",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-20.14.9.tgz",
+      "integrity": "sha512-06OCtnTXtWOZBJlRApleWndH4JsRVs1pDCc8dLSQp+7PpUpX3ePdHyeNSFTeSe7FtKyQkrlPvHwJOW3SLd8Oyg==",
       "dependencies": {
-        "@jest/schemas": "^29.6.3",
-        "ansi-styles": "^5.0.0",
-        "react-is": "^18.0.0"
-      },
-      "engines": {
-        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+        "undici-types": "~5.26.4"
       }
     },
-    "node_modules/@vitest/spy": {
-      "version": "0.34.6",
-      "dev": true,
-      "license": "MIT",
+    "node_modules/@types/prop-types": {
+      "version": "15.7.5",
+      "resolved": "https://registry.npmjs.org/@types/prop-types/-/prop-types-15.7.5.tgz",
+      "integrity": "sha512-JCB8C6SnDoQf0cNycqd/35A7MjcnK+ZTqE7judS6o7utxUCg6imJg3QK2qzHKszlTjcj2cn+NwMB2i96ubpj7w=="
+    },
+    "node_modules/@types/qs": {
+      "version": "6.9.7",
+      "resolved": "https://registry.npmjs.org/@types/qs/-/qs-6.9.7.tgz",
+      "integrity": "sha512-FGa1F62FT09qcrueBA6qYTrJPVDzah9a+493+o2PCXsesWHIn27G98TsSMs3WPNbZIEj4+VJf6saSFpvD+3Zsw==",
+      "dev": true
+    },
+    "node_modules/@types/range-parser": {
+      "version": "1.2.4",
+      "resolved": "https://registry.npmjs.org/@types/range-parser/-/range-parser-1.2.4.tgz",
+      "integrity": "sha512-EEhsLsD6UsDM1yFhAvy0Cjr6VwmpMWqFBCb9w07wVugF7w9nfajxLuVmngTIpgS6svCnm6Vaw+MZhoDCKnOfsw==",
+      "dev": true
+    },
+    "node_modules/@types/react": {
+      "version": "18.2.18",
+      "resolved": "https://registry.npmjs.org/@types/react/-/react-18.2.18.tgz",
+      "integrity": "sha512-da4NTSeBv/P34xoZPhtcLkmZuJ+oYaCxHmyHzwaDQo9RQPBeXV+06gEk2FpqEcsX9XrnNLvRpVh6bdavDSjtiQ==",
       "dependencies": {
-        "tinyspy": "^2.1.1"
-      },
-      "funding": {
-        "url": "https://opencollective.com/vitest"
+        "@types/prop-types": "*",
+        "@types/scheduler": "*",
+        "csstype": "^3.0.2"
       }
     },
-    "node_modules/@vitest/utils": {
-      "version": "0.34.6",
+    "node_modules/@types/react-dom": {
+      "version": "18.2.7",
+      "resolved": "https://registry.npmjs.org/@types/react-dom/-/react-dom-18.2.7.tgz",
+      "integrity": "sha512-GRaAEriuT4zp9N4p1i8BDBYmEyfo+xQ3yHjJU4eiK5NDa1RmUZG+unZABUTK4/Ox/M+GaHwb6Ow8rUITrtjszA==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "diff-sequences": "^29.4.3",
-        "loupe": "^2.3.6",
-        "pretty-format": "^29.5.0"
-      },
-      "funding": {
-        "url": "https://opencollective.com/vitest"
+        "@types/react": "*"
       }
     },
-    "node_modules/@vitest/utils/node_modules/ansi-styles": {
-      "version": "5.2.0",
+    "node_modules/@types/react-lottie": {
+      "version": "1.2.10",
+      "resolved": "https://registry.npmjs.org/@types/react-lottie/-/react-lottie-1.2.10.tgz",
+      "integrity": "sha512-rCd1p3US4ELKJlqwVnP0h5b24zt5p9OCvKUoNpYExLqwbFZMWEiJ6EGLMmH7nmq5V7KomBIbWO2X/XRFsL0vCA==",
       "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
+      "dependencies": {
+        "@types/react": "*"
       }
     },
-    "node_modules/@vitest/utils/node_modules/diff-sequences": {
-      "version": "29.6.3",
+    "node_modules/@types/react-modal": {
+      "version": "3.16.0",
+      "resolved": "https://registry.npmjs.org/@types/react-modal/-/react-modal-3.16.0.tgz",
+      "integrity": "sha512-iphdqXAyUfByLbxJn5j6d+yh93dbMgshqGP0IuBeaKbZXx0aO+OXsvEkt6QctRdxjeM9/bR+Gp3h9F9djVWTQQ==",
       "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+      "dependencies": {
+        "@types/react": "*"
       }
     },
-    "node_modules/@vitest/utils/node_modules/pretty-format": {
-      "version": "29.7.0",
-      "dev": true,
-      "license": "MIT",
+    "node_modules/@types/react-redux": {
+      "version": "7.1.25",
+      "resolved": "https://registry.npmjs.org/@types/react-redux/-/react-redux-7.1.25.tgz",
+      "integrity": "sha512-bAGh4e+w5D8dajd6InASVIyCo4pZLJ66oLb80F9OBLO1gKESbZcRCJpTT6uLXX+HAB57zw1WTdwJdAsewuTweg==",
       "dependencies": {
-        "@jest/schemas": "^29.6.3",
-        "ansi-styles": "^5.0.0",
-        "react-is": "^18.0.0"
-      },
-      "engines": {
-        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+        "@types/hoist-non-react-statics": "^3.3.0",
+        "@types/react": "*",
+        "hoist-non-react-statics": "^3.3.0",
+        "redux": "^4.0.0"
       }
     },
-    "node_modules/@webassemblyjs/ast": {
-      "version": "1.11.6",
+    "node_modules/@types/redux-state-sync": {
+      "version": "3.1.5",
+      "resolved": "https://registry.npmjs.org/@types/redux-state-sync/-/redux-state-sync-3.1.5.tgz",
+      "integrity": "sha512-NtcV94bmZNFMmcjgYzjK9WHN/0NVHyH4OO/a4sAd4WG1ywcVZA5vdczjPQZLC1IVMRBi693b3FWsWB7wELL+tg==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "@webassemblyjs/helper-numbers": "1.11.6",
-        "@webassemblyjs/helper-wasm-bytecode": "1.11.6"
+        "broadcast-channel": "^2.1.8",
+        "redux": "^4.0.1"
       }
     },
-    "node_modules/@webassemblyjs/floating-point-hex-parser": {
-      "version": "1.11.6",
-      "dev": true,
-      "license": "MIT"
+    "node_modules/@types/retry": {
+      "version": "0.12.0",
+      "resolved": "https://registry.npmjs.org/@types/retry/-/retry-0.12.0.tgz",
+      "integrity": "sha512-wWKOClTTiizcZhXnPY4wikVAwmdYHp8q6DmC+EJUzAMsycb7HB32Kh9RN4+0gExjmPmZSAQjgURXIGATPegAvA==",
+      "dev": true
     },
-    "node_modules/@webassemblyjs/helper-api-error": {
-      "version": "1.11.6",
-      "dev": true,
-      "license": "MIT"
+    "node_modules/@types/scheduler": {
+      "version": "0.16.3",
+      "resolved": "https://registry.npmjs.org/@types/scheduler/-/scheduler-0.16.3.tgz",
+      "integrity": "sha512-5cJ8CB4yAx7BH1oMvdU0Jh9lrEXyPkar6F9G/ERswkCuvP4KQZfZkSjcMbAICCpQTN4OuZn8tz0HiKv9TGZgrQ=="
     },
-    "node_modules/@webassemblyjs/helper-buffer": {
-      "version": "1.11.6",
-      "dev": true,
-      "license": "MIT"
+    "node_modules/@types/semver": {
+      "version": "7.5.0",
+      "resolved": "https://registry.npmjs.org/@types/semver/-/semver-7.5.0.tgz",
+      "integrity": "sha512-G8hZ6XJiHnuhQKR7ZmysCeJWE08o8T0AXtk5darsCaTVsYZhhgUrq53jizaR2FvsoeCwJhlmwTjkXBY5Pn/ZHw==",
+      "dev": true
     },
-    "node_modules/@webassemblyjs/helper-numbers": {
-      "version": "1.11.6",
+    "node_modules/@types/send": {
+      "version": "0.17.1",
+      "resolved": "https://registry.npmjs.org/@types/send/-/send-0.17.1.tgz",
+      "integrity": "sha512-Cwo8LE/0rnvX7kIIa3QHCkcuF21c05Ayb0ZfxPiv0W8VRiZiNW/WuRupHKpqqGVGf7SUA44QSOUKaEd9lIrd/Q==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "@webassemblyjs/floating-point-hex-parser": "1.11.6",
-        "@webassemblyjs/helper-api-error": "1.11.6",
-        "@xtuc/long": "4.2.2"
+        "@types/mime": "^1",
+        "@types/node": "*"
       }
     },
-    "node_modules/@webassemblyjs/helper-wasm-bytecode": {
-      "version": "1.11.6",
-      "dev": true,
-      "license": "MIT"
-    },
-    "node_modules/@webassemblyjs/helper-wasm-section": {
-      "version": "1.11.6",
+    "node_modules/@types/serve-index": {
+      "version": "1.9.1",
+      "resolved": "https://registry.npmjs.org/@types/serve-index/-/serve-index-1.9.1.tgz",
+      "integrity": "sha512-d/Hs3nWDxNL2xAczmOVZNj92YZCS6RGxfBPjKzuu/XirCgXdpKEb88dYNbrYGint6IVWLNP+yonwVAuRC0T2Dg==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "@webassemblyjs/ast": "1.11.6",
-        "@webassemblyjs/helper-buffer": "1.11.6",
-        "@webassemblyjs/helper-wasm-bytecode": "1.11.6",
-        "@webassemblyjs/wasm-gen": "1.11.6"
+        "@types/express": "*"
       }
     },
-    "node_modules/@webassemblyjs/ieee754": {
-      "version": "1.11.6",
+    "node_modules/@types/serve-static": {
+      "version": "1.15.2",
+      "resolved": "https://registry.npmjs.org/@types/serve-static/-/serve-static-1.15.2.tgz",
+      "integrity": "sha512-J2LqtvFYCzaj8pVYKw8klQXrLLk7TBZmQ4ShlcdkELFKGwGMfevMLneMMRkMgZxotOD9wg497LpC7O8PcvAmfw==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "@xtuc/ieee754": "^1.2.0"
+        "@types/http-errors": "*",
+        "@types/mime": "*",
+        "@types/node": "*"
       }
     },
-    "node_modules/@webassemblyjs/leb128": {
-      "version": "1.11.6",
-      "dev": true,
-      "license": "Apache-2.0",
+    "node_modules/@types/sha.js": {
+      "version": "2.4.4",
+      "resolved": "https://registry.npmjs.org/@types/sha.js/-/sha.js-2.4.4.tgz",
+      "integrity": "sha512-Qukd+D6S2Hm0wLVt2Vh+/eWBIoUt+wF8jWjBsG4F8EFQRwKtYvtXCPcNl2OEUQ1R+eTr3xuSaBYUyM3WD1x/Qw==",
       "dependencies": {
-        "@xtuc/long": "4.2.2"
+        "@types/node": "*"
       }
     },
-    "node_modules/@webassemblyjs/utf8": {
-      "version": "1.11.6",
-      "dev": true,
-      "license": "MIT"
-    },
-    "node_modules/@webassemblyjs/wasm-edit": {
-      "version": "1.11.6",
+    "node_modules/@types/sockjs": {
+      "version": "0.3.33",
+      "resolved": "https://registry.npmjs.org/@types/sockjs/-/sockjs-0.3.33.tgz",
+      "integrity": "sha512-f0KEEe05NvUnat+boPTZ0dgaLZ4SfSouXUgv5noUiefG2ajgKjmETo9ZJyuqsl7dfl2aHlLJUiki6B4ZYldiiw==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "@webassemblyjs/ast": "1.11.6",
-        "@webassemblyjs/helper-buffer": "1.11.6",
-        "@webassemblyjs/helper-wasm-bytecode": "1.11.6",
-        "@webassemblyjs/helper-wasm-section": "1.11.6",
-        "@webassemblyjs/wasm-gen": "1.11.6",
-        "@webassemblyjs/wasm-opt": "1.11.6",
-        "@webassemblyjs/wasm-parser": "1.11.6",
-        "@webassemblyjs/wast-printer": "1.11.6"
+        "@types/node": "*"
       }
     },
-    "node_modules/@webassemblyjs/wasm-gen": {
-      "version": "1.11.6",
+    "node_modules/@types/styled-components": {
+      "version": "5.1.26",
+      "resolved": "https://registry.npmjs.org/@types/styled-components/-/styled-components-5.1.26.tgz",
+      "integrity": "sha512-KuKJ9Z6xb93uJiIyxo/+ksS7yLjS1KzG6iv5i78dhVg/X3u5t1H7juRWqVmodIdz6wGVaIApo1u01kmFRdJHVw==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "@webassemblyjs/ast": "1.11.6",
-        "@webassemblyjs/helper-wasm-bytecode": "1.11.6",
-        "@webassemblyjs/ieee754": "1.11.6",
-        "@webassemblyjs/leb128": "1.11.6",
-        "@webassemblyjs/utf8": "1.11.6"
+        "@types/hoist-non-react-statics": "*",
+        "@types/react": "*",
+        "csstype": "^3.0.2"
       }
     },
-    "node_modules/@webassemblyjs/wasm-opt": {
-      "version": "1.11.6",
+    "node_modules/@types/uuid": {
+      "version": "8.3.4",
+      "resolved": "https://registry.npmjs.org/@types/uuid/-/uuid-8.3.4.tgz",
+      "integrity": "sha512-c/I8ZRb51j+pYGAu5CrFMRxqZ2ke4y2grEBO5AUjgSkSk+qT2Ea+OdWElz/OiMf5MNpn2b17kuVBwZLQJXzihw=="
+    },
+    "node_modules/@types/webextension-polyfill": {
+      "version": "0.9.2",
+      "resolved": "https://registry.npmjs.org/@types/webextension-polyfill/-/webextension-polyfill-0.9.2.tgz",
+      "integrity": "sha512-op8YeoK60K6/GIx3snWs3JowBZ+/aeSnZzZuuwynA7VARWfzr3st9aQNk9RWfoBx5xqlNZjAsh2QttPUZnabCw==",
+      "dev": true
+    },
+    "node_modules/@types/ws": {
+      "version": "8.5.5",
+      "resolved": "https://registry.npmjs.org/@types/ws/-/ws-8.5.5.tgz",
+      "integrity": "sha512-lwhs8hktwxSjf9UaZ9tG5M03PGogvFaH8gUgLNbN9HKIg0dvv6q+gkSuJ8HN4/VbyxkuLzCjlN7GquQ0gUJfIg==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "@webassemblyjs/ast": "1.11.6",
-        "@webassemblyjs/helper-buffer": "1.11.6",
-        "@webassemblyjs/wasm-gen": "1.11.6",
-        "@webassemblyjs/wasm-parser": "1.11.6"
+        "@types/node": "*"
       }
     },
-    "node_modules/@webassemblyjs/wasm-parser": {
-      "version": "1.11.6",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "@webassemblyjs/ast": "1.11.6",
-        "@webassemblyjs/helper-api-error": "1.11.6",
-        "@webassemblyjs/helper-wasm-bytecode": "1.11.6",
-        "@webassemblyjs/ieee754": "1.11.6",
-        "@webassemblyjs/leb128": "1.11.6",
-        "@webassemblyjs/utf8": "1.11.6"
-      }
-    },
-    "node_modules/@webassemblyjs/wast-printer": {
-      "version": "1.11.6",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "@webassemblyjs/ast": "1.11.6",
-        "@xtuc/long": "4.2.2"
-      }
-    },
-    "node_modules/@xtuc/ieee754": {
-      "version": "1.2.0",
-      "dev": true,
-      "license": "BSD-3-Clause"
+    "node_modules/@types/zxcvbn": {
+      "version": "4.4.1",
+      "resolved": "https://registry.npmjs.org/@types/zxcvbn/-/zxcvbn-4.4.1.tgz",
+      "integrity": "sha512-3NoqvZC2W5gAC5DZbTpCeJ251vGQmgcWIHQJGq2J240HY6ErQ9aWKkwfoKJlHLx+A83WPNTZ9+3cd2ILxbvr1w==",
+      "dev": true
     },
-    "node_modules/@xtuc/long": {
-      "version": "4.2.2",
+    "node_modules/@typescript-eslint/eslint-plugin": {
+      "version": "5.62.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.62.0.tgz",
+      "integrity": "sha512-TiZzBSJja/LbhNPvk6yc0JrX9XqhQ0hdh6M2svYfsHGejaKFIAGd9MQ+ERIMzLGlN/kZoYIgdxFV0PuljTKXag==",
       "dev": true,
-      "license": "Apache-2.0"
-    },
-    "node_modules/@zondax/ledger-stacks": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/@zondax/ledger-stacks/-/ledger-stacks-1.0.4.tgz",
-      "integrity": "sha512-R8CB0CZ2poTzpcG0jhzzXZvXF7axIsmZFhp06aHCUjgz+1df63YbC4tUzyzmseekwqNWnaebWFejQKJ99WiHZA==",
-      "dependencies": {
-        "@babel/runtime": "^7.12.5",
-        "@ledgerhq/hw-transport": "^6.28.1",
-        "@stacks/transactions": "^4.1.0",
-        "varuint-bitcoin": "^1.1.2"
-      }
-    },
-    "node_modules/@zondax/ledger-stacks/node_modules/@stacks/common": {
-      "version": "4.3.5",
-      "resolved": "https://registry.npmjs.org/@stacks/common/-/common-4.3.5.tgz",
-      "integrity": "sha512-UuViiQ7fn3vdtTe3739aRzbl+wbukekeQuXgqt8d7nB2HC2HodD7GcHhpUga165cO35CD6lQUtj3vXxJb5Ga+A==",
-      "dependencies": {
-        "@types/bn.js": "^5.1.0",
-        "@types/node": "^18.0.4",
-        "buffer": "^6.0.3"
-      }
-    },
-    "node_modules/@zondax/ledger-stacks/node_modules/@stacks/network": {
-      "version": "4.3.5",
-      "resolved": "https://registry.npmjs.org/@stacks/network/-/network-4.3.5.tgz",
-      "integrity": "sha512-TC4+AkuT6qi3MoEGxTftA+4BNp99QvGnI+qtKQkoA1m0KDr8b9hSBUhugJHRhQbWuo7D6q0+JagYEGxLID29Kw==",
-      "dependencies": {
-        "@stacks/common": "^4.3.5",
-        "cross-fetch": "^3.1.5"
-      }
-    },
-    "node_modules/@zondax/ledger-stacks/node_modules/@stacks/transactions": {
-      "version": "4.3.8",
-      "resolved": "https://registry.npmjs.org/@stacks/transactions/-/transactions-4.3.8.tgz",
-      "integrity": "sha512-5xYYv2TdXXM9PVixB79Pr99symQ8fhbVATjempGUxtL23/XUiRiLvJZohDxIE4VQ2EzbB4g4j8Y7oqPjj0h09Q==",
-      "dependencies": {
-        "@noble/hashes": "^1.0.0",
-        "@noble/secp256k1": "^1.5.5",
-        "@stacks/common": "^4.3.5",
-        "@stacks/network": "^4.3.5",
-        "@types/node": "^18.0.4",
-        "@types/sha.js": "^2.4.0",
-        "c32check": "^1.1.3",
-        "lodash.clonedeep": "^4.5.0",
-        "ripemd160-min": "^0.0.6",
-        "sha.js": "^2.4.11",
-        "smart-buffer": "^4.1.0"
-      }
-    },
-    "node_modules/@zondax/ledger-stacks/node_modules/@types/node": {
-      "version": "18.19.46",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-18.19.46.tgz",
-      "integrity": "sha512-vnRgMS7W6cKa1/0G3/DTtQYpVrZ8c0Xm6UkLaVFrb9jtcVC3okokW09Ki1Qdrj9ISokszD69nY4WDLRlvHlhAA==",
-      "dependencies": {
-        "undici-types": "~5.26.4"
-      }
-    },
-    "node_modules/@zondax/ledger-stacks/node_modules/base-x": {
-      "version": "3.0.10",
-      "resolved": "https://registry.npmjs.org/base-x/-/base-x-3.0.10.tgz",
-      "integrity": "sha512-7d0s06rR9rYaIWHkpfLIFICM/tkSVdoPC9qYAQRpxn9DdKNWNsKC0uk++akckyLq16Tx2WIinnZ6WRriAt6njQ==",
-      "dependencies": {
-        "safe-buffer": "^5.0.1"
-      }
-    },
-    "node_modules/@zondax/ledger-stacks/node_modules/c32check": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/c32check/-/c32check-1.1.3.tgz",
-      "integrity": "sha512-ADADE/PjAbJRlwpG3ShaOMbBUlJJZO7xaYSRD5Tub6PixQlgR4s36y9cvMf/YRGpkqX+QOxIdMw216iC320q9A==",
       "dependencies": {
-        "base-x": "^3.0.8",
-        "buffer": "^5.6.0",
-        "cross-sha256": "^1.2.0"
+        "@eslint-community/regexpp": "^4.4.0",
+        "@typescript-eslint/scope-manager": "5.62.0",
+        "@typescript-eslint/type-utils": "5.62.0",
+        "@typescript-eslint/utils": "5.62.0",
+        "debug": "^4.3.4",
+        "graphemer": "^1.4.0",
+        "ignore": "^5.2.0",
+        "natural-compare-lite": "^1.4.0",
+        "semver": "^7.3.7",
+        "tsutils": "^3.21.0"
       },
       "engines": {
-        "node": ">=8"
+        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      },
+      "peerDependencies": {
+        "@typescript-eslint/parser": "^5.0.0",
+        "eslint": "^6.0.0 || ^7.0.0 || ^8.0.0"
+      },
+      "peerDependenciesMeta": {
+        "typescript": {
+          "optional": true
+        }
       }
     },
-    "node_modules/accepts": {
-      "version": "1.3.8",
+    "node_modules/@typescript-eslint/eslint-plugin/node_modules/lru-cache": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
+      "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "mime-types": "~2.1.34",
-        "negotiator": "0.6.3"
+        "yallist": "^4.0.0"
       },
       "engines": {
-        "node": ">= 0.6"
+        "node": ">=10"
       }
     },
-    "node_modules/acorn": {
-      "version": "8.10.0",
+    "node_modules/@typescript-eslint/eslint-plugin/node_modules/semver": {
+      "version": "7.5.4",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz",
+      "integrity": "sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==",
       "dev": true,
-      "license": "MIT",
+      "dependencies": {
+        "lru-cache": "^6.0.0"
+      },
       "bin": {
-        "acorn": "bin/acorn"
+        "semver": "bin/semver.js"
       },
       "engines": {
-        "node": ">=0.4.0"
-      }
-    },
-    "node_modules/acorn-import-assertions": {
-      "version": "1.9.0",
-      "dev": true,
-      "license": "MIT",
-      "peerDependencies": {
-        "acorn": "^8"
-      }
-    },
-    "node_modules/acorn-jsx": {
-      "version": "5.3.2",
-      "dev": true,
-      "license": "MIT",
-      "peerDependencies": {
-        "acorn": "^6.0.0 || ^7.0.0 || ^8.0.0"
+        "node": ">=10"
       }
     },
-    "node_modules/acorn-walk": {
-      "version": "8.3.0",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=0.4.0"
-      }
+    "node_modules/@typescript-eslint/eslint-plugin/node_modules/yallist": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
+      "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==",
+      "dev": true
     },
-    "node_modules/aggregate-error": {
-      "version": "3.1.0",
+    "node_modules/@typescript-eslint/parser": {
+      "version": "5.62.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-5.62.0.tgz",
+      "integrity": "sha512-VlJEV0fOQ7BExOsHYAGrgbEiZoi8D+Bl2+f6V2RrXerRSylnp+ZBHmPvaIa8cz0Ajx7WO7Z5RqfgYg7ED1nRhA==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "clean-stack": "^2.0.0",
-        "indent-string": "^4.0.0"
+        "@typescript-eslint/scope-manager": "5.62.0",
+        "@typescript-eslint/types": "5.62.0",
+        "@typescript-eslint/typescript-estree": "5.62.0",
+        "debug": "^4.3.4"
       },
       "engines": {
-        "node": ">=8"
+        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      },
+      "peerDependencies": {
+        "eslint": "^6.0.0 || ^7.0.0 || ^8.0.0"
+      },
+      "peerDependenciesMeta": {
+        "typescript": {
+          "optional": true
+        }
       }
     },
-    "node_modules/ajv": {
-      "version": "6.12.6",
+    "node_modules/@typescript-eslint/scope-manager": {
+      "version": "5.62.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-5.62.0.tgz",
+      "integrity": "sha512-VXuvVvZeQCQb5Zgf4HAxc04q5j+WrNAtNh9OwCsCgpKqESMTu3tF/jhZ3xG6T4NZwWl65Bg8KuS2uEvhSfLl0w==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "fast-deep-equal": "^3.1.1",
-        "fast-json-stable-stringify": "^2.0.0",
-        "json-schema-traverse": "^0.4.1",
-        "uri-js": "^4.2.2"
+        "@typescript-eslint/types": "5.62.0",
+        "@typescript-eslint/visitor-keys": "5.62.0"
+      },
+      "engines": {
+        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
       },
       "funding": {
-        "type": "github",
-        "url": "https://github.com/sponsors/epoberezkin"
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
       }
     },
-    "node_modules/ajv-formats": {
-      "version": "2.1.1",
+    "node_modules/@typescript-eslint/type-utils": {
+      "version": "5.62.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-5.62.0.tgz",
+      "integrity": "sha512-xsSQreu+VnfbqQpW5vnCJdq1Z3Q0U31qiWmRhr98ONQmcp/yhiPJFPq8MXiJVLiksmOKSjIldZzkebzHuCGzew==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "ajv": "^8.0.0"
+        "@typescript-eslint/typescript-estree": "5.62.0",
+        "@typescript-eslint/utils": "5.62.0",
+        "debug": "^4.3.4",
+        "tsutils": "^3.21.0"
+      },
+      "engines": {
+        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
       },
       "peerDependencies": {
-        "ajv": "^8.0.0"
+        "eslint": "*"
       },
       "peerDependenciesMeta": {
-        "ajv": {
+        "typescript": {
           "optional": true
         }
       }
     },
-    "node_modules/ajv-formats/node_modules/ajv": {
-      "version": "8.12.0",
+    "node_modules/@typescript-eslint/types": {
+      "version": "5.62.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-5.62.0.tgz",
+      "integrity": "sha512-87NVngcbVXUahrRTqIK27gD2t5Cu1yuCXxbLcFtCzZGlfyVWWh8mLHkoxzjsB6DDNnvdL+fW8MiwPEJyGJQDgQ==",
       "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "fast-deep-equal": "^3.1.1",
-        "json-schema-traverse": "^1.0.0",
-        "require-from-string": "^2.0.2",
-        "uri-js": "^4.2.2"
+      "engines": {
+        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
       },
       "funding": {
-        "type": "github",
-        "url": "https://github.com/sponsors/epoberezkin"
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
       }
     },
-    "node_modules/ajv-formats/node_modules/json-schema-traverse": {
-      "version": "1.0.0",
+    "node_modules/@typescript-eslint/typescript-estree": {
+      "version": "5.62.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-5.62.0.tgz",
+      "integrity": "sha512-CmcQ6uY7b9y694lKdRB8FEel7JbU/40iSAPomu++SjLMntB+2Leay2LO6i8VnJk58MtE9/nQSFIH6jpyRWyYzA==",
       "dev": true,
-      "license": "MIT"
-    },
-    "node_modules/ajv-keywords": {
-      "version": "3.5.2",
-      "dev": true,
-      "license": "MIT",
-      "peerDependencies": {
-        "ajv": "^6.9.1"
-      }
-    },
-    "node_modules/alex-sdk": {
-      "version": "0.1.26",
-      "license": "MIT",
       "dependencies": {
-        "clarity-codegen": "^0.3.5"
+        "@typescript-eslint/types": "5.62.0",
+        "@typescript-eslint/visitor-keys": "5.62.0",
+        "debug": "^4.3.4",
+        "globby": "^11.1.0",
+        "is-glob": "^4.0.3",
+        "semver": "^7.3.7",
+        "tsutils": "^3.21.0"
       },
       "engines": {
-        "node": ">=10"
+        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
       },
-      "peerDependencies": {
-        "@stacks/network": "*",
-        "@stacks/transactions": "*"
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      },
+      "peerDependenciesMeta": {
+        "typescript": {
+          "optional": true
+        }
       }
     },
-    "node_modules/ansi-escapes": {
-      "version": "4.3.2",
+    "node_modules/@typescript-eslint/typescript-estree/node_modules/lru-cache": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
+      "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "type-fest": "^0.21.3"
+        "yallist": "^4.0.0"
       },
       "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
+        "node": ">=10"
       }
     },
-    "node_modules/ansi-escapes/node_modules/type-fest": {
-      "version": "0.21.3",
+    "node_modules/@typescript-eslint/typescript-estree/node_modules/semver": {
+      "version": "7.5.4",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz",
+      "integrity": "sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==",
       "dev": true,
-      "license": "(MIT OR CC0-1.0)",
+      "dependencies": {
+        "lru-cache": "^6.0.0"
+      },
+      "bin": {
+        "semver": "bin/semver.js"
+      },
       "engines": {
         "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/ansi-html-community": {
-      "version": "0.0.8",
-      "dev": true,
-      "engines": [
-        "node >= 0.8.0"
-      ],
-      "license": "Apache-2.0",
-      "bin": {
-        "ansi-html": "bin/ansi-html"
-      }
+    "node_modules/@typescript-eslint/typescript-estree/node_modules/yallist": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
+      "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==",
+      "dev": true
     },
-    "node_modules/ansi-regex": {
-      "version": "5.0.1",
-      "license": "MIT",
+    "node_modules/@typescript-eslint/utils": {
+      "version": "5.62.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-5.62.0.tgz",
+      "integrity": "sha512-n8oxjeb5aIbPFEtmQxQYOLI0i9n5ySBEY/ZEHHZqKQSFnxio1rv6dthascc9dLuwrL0RC5mPCxB7vnAVGAYWAQ==",
+      "dev": true,
+      "dependencies": {
+        "@eslint-community/eslint-utils": "^4.2.0",
+        "@types/json-schema": "^7.0.9",
+        "@types/semver": "^7.3.12",
+        "@typescript-eslint/scope-manager": "5.62.0",
+        "@typescript-eslint/types": "5.62.0",
+        "@typescript-eslint/typescript-estree": "5.62.0",
+        "eslint-scope": "^5.1.1",
+        "semver": "^7.3.7"
+      },
       "engines": {
-        "node": ">=8"
+        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      },
+      "peerDependencies": {
+        "eslint": "^6.0.0 || ^7.0.0 || ^8.0.0"
       }
     },
-    "node_modules/ansi-styles": {
-      "version": "3.2.1",
-      "license": "MIT",
+    "node_modules/@typescript-eslint/utils/node_modules/lru-cache": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
+      "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
+      "dev": true,
       "dependencies": {
-        "color-convert": "^1.9.0"
+        "yallist": "^4.0.0"
       },
       "engines": {
-        "node": ">=4"
+        "node": ">=10"
       }
     },
-    "node_modules/anymatch": {
-      "version": "3.1.3",
+    "node_modules/@typescript-eslint/utils/node_modules/semver": {
+      "version": "7.5.4",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz",
+      "integrity": "sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==",
       "dev": true,
-      "license": "ISC",
       "dependencies": {
-        "normalize-path": "^3.0.0",
-        "picomatch": "^2.0.4"
+        "lru-cache": "^6.0.0"
+      },
+      "bin": {
+        "semver": "bin/semver.js"
       },
       "engines": {
-        "node": ">= 8"
+        "node": ">=10"
       }
     },
-    "node_modules/argon2-browser": {
-      "version": "1.18.0",
-      "license": "MIT"
-    },
-    "node_modules/argparse": {
-      "version": "2.0.1",
-      "dev": true,
-      "license": "Python-2.0"
+    "node_modules/@typescript-eslint/utils/node_modules/yallist": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
+      "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==",
+      "dev": true
     },
-    "node_modules/aria-query": {
-      "version": "5.1.3",
+    "node_modules/@typescript-eslint/visitor-keys": {
+      "version": "5.62.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-5.62.0.tgz",
+      "integrity": "sha512-07ny+LHRzQXepkGg6w0mFY41fVUNBrL2Roj/++7V1txKugfjm/Ci/qSND03r2RhlJhJYMcTn9AhhSSqQp0Ysyw==",
       "dev": true,
-      "license": "Apache-2.0",
       "dependencies": {
-        "deep-equal": "^2.0.5"
+        "@typescript-eslint/types": "5.62.0",
+        "eslint-visitor-keys": "^3.3.0"
+      },
+      "engines": {
+        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
       }
     },
-    "node_modules/arity-n": {
-      "version": "1.0.4",
-      "dev": true,
-      "license": "MIT"
-    },
-    "node_modules/array-buffer-byte-length": {
-      "version": "1.0.0",
+    "node_modules/@vitest/expect": {
+      "version": "0.34.6",
+      "resolved": "https://registry.npmjs.org/@vitest/expect/-/expect-0.34.6.tgz",
+      "integrity": "sha512-QUzKpUQRc1qC7qdGo7rMK3AkETI7w18gTCUrsNnyjjJKYiuUB9+TQK3QnR1unhCnWRC0AbKv2omLGQDF/mIjOw==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "call-bind": "^1.0.2",
-        "is-array-buffer": "^3.0.1"
+        "@vitest/spy": "0.34.6",
+        "@vitest/utils": "0.34.6",
+        "chai": "^4.3.10"
       },
       "funding": {
-        "url": "https://github.com/sponsors/ljharb"
+        "url": "https://opencollective.com/vitest"
       }
     },
-    "node_modules/array-flatten": {
-      "version": "2.1.2",
-      "dev": true,
-      "license": "MIT"
-    },
-    "node_modules/array-includes": {
-      "version": "3.1.6",
+    "node_modules/@vitest/runner": {
+      "version": "0.34.6",
+      "resolved": "https://registry.npmjs.org/@vitest/runner/-/runner-0.34.6.tgz",
+      "integrity": "sha512-1CUQgtJSLF47NnhN+F9X2ycxUP0kLHQ/JWvNHbeBfwW8CzEGgeskzNnHDyv1ieKTltuR6sdIHV+nmR6kPxQqzQ==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.1.4",
-        "es-abstract": "^1.20.4",
-        "get-intrinsic": "^1.1.3",
-        "is-string": "^1.0.7"
-      },
-      "engines": {
-        "node": ">= 0.4"
+        "@vitest/utils": "0.34.6",
+        "p-limit": "^4.0.0",
+        "pathe": "^1.1.1"
       },
       "funding": {
-        "url": "https://github.com/sponsors/ljharb"
+        "url": "https://opencollective.com/vitest"
       }
     },
-    "node_modules/array-last": {
-      "version": "1.3.0",
+    "node_modules/@vitest/runner/node_modules/p-limit": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-4.0.0.tgz",
+      "integrity": "sha512-5b0R4txpzjPWVw/cXXUResoD4hb6U/x9BH08L7nw+GN1sezDzPdxeRvpc9c433fZhBan/wusjbCsqwqm4EIBIQ==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "is-number": "^4.0.0"
+        "yocto-queue": "^1.0.0"
       },
       "engines": {
-        "node": ">=0.10.0"
+        "node": "^12.20.0 || ^14.13.1 || >=16.0.0"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/array-last/node_modules/is-number": {
-      "version": "4.0.0",
+    "node_modules/@vitest/runner/node_modules/yocto-queue": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/yocto-queue/-/yocto-queue-1.0.0.tgz",
+      "integrity": "sha512-9bnSc/HEW2uRy67wc+T8UwauLuPJVn28jb+GtJY16iiKWyvmYJRXVT4UamsAEGQfPohgr2q4Tq0sQbQlxTfi1g==",
       "dev": true,
-      "license": "MIT",
       "engines": {
-        "node": ">=0.10.0"
+        "node": ">=12.20"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/array-union": {
-      "version": "2.1.0",
+    "node_modules/@vitest/snapshot": {
+      "version": "0.34.6",
+      "resolved": "https://registry.npmjs.org/@vitest/snapshot/-/snapshot-0.34.6.tgz",
+      "integrity": "sha512-B3OZqYn6k4VaN011D+ve+AA4whM4QkcwcrwaKwAbyyvS/NB1hCWjFIBQxAQQSQir9/RtyAAGuq+4RJmbn2dH4w==",
       "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=8"
+      "dependencies": {
+        "magic-string": "^0.30.1",
+        "pathe": "^1.1.1",
+        "pretty-format": "^29.5.0"
+      },
+      "funding": {
+        "url": "https://opencollective.com/vitest"
       }
     },
-    "node_modules/array-uniq": {
-      "version": "1.0.3",
+    "node_modules/@vitest/snapshot/node_modules/ansi-styles": {
+      "version": "5.2.0",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-5.2.0.tgz",
+      "integrity": "sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==",
       "dev": true,
-      "license": "MIT",
       "engines": {
-        "node": ">=0.10.0"
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
       }
     },
-    "node_modules/array.prototype.findlastindex": {
-      "version": "1.2.2",
+    "node_modules/@vitest/snapshot/node_modules/pretty-format": {
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-29.7.0.tgz",
+      "integrity": "sha512-Pdlw/oPxN+aXdmM9R00JVC9WVFoCLTKJvDVLgmJ+qAffBMxsV85l/Lu7sNx4zSzPyoL2euImuEwHhOXdEgNFZQ==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.1.4",
-        "es-abstract": "^1.20.4",
-        "es-shim-unscopables": "^1.0.0",
-        "get-intrinsic": "^1.1.3"
+        "@jest/schemas": "^29.6.3",
+        "ansi-styles": "^5.0.0",
+        "react-is": "^18.0.0"
       },
       "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
       }
     },
-    "node_modules/array.prototype.flat": {
-      "version": "1.3.1",
+    "node_modules/@vitest/spy": {
+      "version": "0.34.6",
+      "resolved": "https://registry.npmjs.org/@vitest/spy/-/spy-0.34.6.tgz",
+      "integrity": "sha512-xaCvneSaeBw/cz8ySmF7ZwGvL0lBjfvqc1LpQ/vcdHEvpLn3Ff1vAvjw+CoGn0802l++5L/pxb7whwcWAw+DUQ==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.1.4",
-        "es-abstract": "^1.20.4",
-        "es-shim-unscopables": "^1.0.0"
-      },
-      "engines": {
-        "node": ">= 0.4"
+        "tinyspy": "^2.1.1"
       },
       "funding": {
-        "url": "https://github.com/sponsors/ljharb"
+        "url": "https://opencollective.com/vitest"
       }
     },
-    "node_modules/array.prototype.flatmap": {
-      "version": "1.3.1",
+    "node_modules/@vitest/utils": {
+      "version": "0.34.6",
+      "resolved": "https://registry.npmjs.org/@vitest/utils/-/utils-0.34.6.tgz",
+      "integrity": "sha512-IG5aDD8S6zlvloDsnzHw0Ut5xczlF+kv2BOTo+iXfPr54Yhi5qbVOgGB1hZaVq4iJ4C/MZ2J0y15IlsV/ZcI0A==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.1.4",
-        "es-abstract": "^1.20.4",
-        "es-shim-unscopables": "^1.0.0"
+        "diff-sequences": "^29.4.3",
+        "loupe": "^2.3.6",
+        "pretty-format": "^29.5.0"
       },
+      "funding": {
+        "url": "https://opencollective.com/vitest"
+      }
+    },
+    "node_modules/@vitest/utils/node_modules/ansi-styles": {
+      "version": "5.2.0",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-5.2.0.tgz",
+      "integrity": "sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==",
+      "dev": true,
       "engines": {
-        "node": ">= 0.4"
+        "node": ">=10"
       },
       "funding": {
-        "url": "https://github.com/sponsors/ljharb"
+        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
       }
     },
-    "node_modules/array.prototype.tosorted": {
-      "version": "1.1.1",
+    "node_modules/@vitest/utils/node_modules/diff-sequences": {
+      "version": "29.6.3",
+      "resolved": "https://registry.npmjs.org/diff-sequences/-/diff-sequences-29.6.3.tgz",
+      "integrity": "sha512-EjePK1srD3P08o2j4f0ExnylqRs5B9tJjcp9t1krH2qRi8CCdsYfwe9JgSLurFBWwq4uOlipzfk5fHNvwFKr8Q==",
       "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.1.4",
-        "es-abstract": "^1.20.4",
-        "es-shim-unscopables": "^1.0.0",
-        "get-intrinsic": "^1.1.3"
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
       }
     },
-    "node_modules/arraybuffer.prototype.slice": {
-      "version": "1.0.1",
+    "node_modules/@vitest/utils/node_modules/pretty-format": {
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-29.7.0.tgz",
+      "integrity": "sha512-Pdlw/oPxN+aXdmM9R00JVC9WVFoCLTKJvDVLgmJ+qAffBMxsV85l/Lu7sNx4zSzPyoL2euImuEwHhOXdEgNFZQ==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "array-buffer-byte-length": "^1.0.0",
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.2.0",
-        "get-intrinsic": "^1.2.1",
-        "is-array-buffer": "^3.0.2",
-        "is-shared-array-buffer": "^1.0.2"
+        "@jest/schemas": "^29.6.3",
+        "ansi-styles": "^5.0.0",
+        "react-is": "^18.0.0"
       },
       "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
       }
     },
-    "node_modules/asn1.js": {
-      "version": "5.4.1",
-      "license": "MIT",
+    "node_modules/@webassemblyjs/ast": {
+      "version": "1.11.6",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/ast/-/ast-1.11.6.tgz",
+      "integrity": "sha512-IN1xI7PwOvLPgjcf180gC1bqn3q/QaOCwYUahIOhbYUu8KA/3tw2RT/T0Gidi1l7Hhj5D/INhJxiICObqpMu4Q==",
+      "dev": true,
       "dependencies": {
-        "bn.js": "^4.0.0",
-        "inherits": "^2.0.1",
-        "minimalistic-assert": "^1.0.0",
-        "safer-buffer": "^2.1.0"
+        "@webassemblyjs/helper-numbers": "1.11.6",
+        "@webassemblyjs/helper-wasm-bytecode": "1.11.6"
       }
     },
-    "node_modules/asn1.js/node_modules/bn.js": {
-      "version": "4.12.0",
-      "license": "MIT"
+    "node_modules/@webassemblyjs/floating-point-hex-parser": {
+      "version": "1.11.6",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.11.6.tgz",
+      "integrity": "sha512-ejAj9hfRJ2XMsNHk/v6Fu2dGS+i4UaXBXGemOfQ/JfQ6mdQg/WXtwleQRLLS4OvfDhv8rYnVwH27YJLMyYsxhw==",
+      "dev": true
     },
-    "node_modules/assertion-error": {
-      "version": "1.1.0",
+    "node_modules/@webassemblyjs/helper-api-error": {
+      "version": "1.11.6",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-api-error/-/helper-api-error-1.11.6.tgz",
+      "integrity": "sha512-o0YkoP4pVu4rN8aTJgAyj9hC2Sv5UlkzCHhxqWj8butaLvnpdc2jOwh4ewE6CX0txSfLn/UYaV/pheS2Txg//Q==",
+      "dev": true
+    },
+    "node_modules/@webassemblyjs/helper-buffer": {
+      "version": "1.11.6",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-buffer/-/helper-buffer-1.11.6.tgz",
+      "integrity": "sha512-z3nFzdcp1mb8nEOFFk8DrYLpHvhKC3grJD2ardfKOzmbmJvEf/tPIqCY+sNcwZIY8ZD7IkB2l7/pqhUhqm7hLA==",
+      "dev": true
+    },
+    "node_modules/@webassemblyjs/helper-numbers": {
+      "version": "1.11.6",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-numbers/-/helper-numbers-1.11.6.tgz",
+      "integrity": "sha512-vUIhZ8LZoIWHBohiEObxVm6hwP034jwmc9kuq5GdHZH0wiLVLIPcMCdpJzG4C11cHoQ25TFIQj9kaVADVX7N3g==",
       "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": "*"
+      "dependencies": {
+        "@webassemblyjs/floating-point-hex-parser": "1.11.6",
+        "@webassemblyjs/helper-api-error": "1.11.6",
+        "@xtuc/long": "4.2.2"
       }
     },
-    "node_modules/ast-types-flow": {
-      "version": "0.0.7",
-      "dev": true,
-      "license": "ISC"
+    "node_modules/@webassemblyjs/helper-wasm-bytecode": {
+      "version": "1.11.6",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.11.6.tgz",
+      "integrity": "sha512-sFFHKwcmBprO9e7Icf0+gddyWYDViL8bpPjJJl0WHxCdETktXdmtWLGVzoHbqUcY4Be1LkNfwTmXOJUFZYSJdA==",
+      "dev": true
     },
-    "node_modules/astral-regex": {
-      "version": "2.0.0",
+    "node_modules/@webassemblyjs/helper-wasm-section": {
+      "version": "1.11.6",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.11.6.tgz",
+      "integrity": "sha512-LPpZbSOwTpEC2cgn4hTydySy1Ke+XEu+ETXuoyvuyezHO3Kjdu90KK95Sh9xTbmjrCsUwvWwCOQQNta37VrS9g==",
       "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=8"
+      "dependencies": {
+        "@webassemblyjs/ast": "1.11.6",
+        "@webassemblyjs/helper-buffer": "1.11.6",
+        "@webassemblyjs/helper-wasm-bytecode": "1.11.6",
+        "@webassemblyjs/wasm-gen": "1.11.6"
       }
     },
-    "node_modules/async": {
-      "version": "2.6.4",
-      "license": "MIT",
+    "node_modules/@webassemblyjs/ieee754": {
+      "version": "1.11.6",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/ieee754/-/ieee754-1.11.6.tgz",
+      "integrity": "sha512-LM4p2csPNvbij6U1f19v6WR56QZ8JcHg3QIJTlSwzFcmx6WSORicYj6I63f9yU1kEUtrpG+kjkiIAkevHpDXrg==",
+      "dev": true,
       "dependencies": {
-        "lodash": "^4.17.14"
+        "@xtuc/ieee754": "^1.2.0"
       }
     },
-    "node_modules/async-mutex": {
-      "version": "0.5.0",
-      "license": "MIT",
+    "node_modules/@webassemblyjs/leb128": {
+      "version": "1.11.6",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/leb128/-/leb128-1.11.6.tgz",
+      "integrity": "sha512-m7a0FhE67DQXgouf1tbN5XQcdWoNgaAuoULHIfGFIEVKA6tu/edls6XnIlkmS6FrXAquJRPni3ZZKjw6FSPjPQ==",
+      "dev": true,
       "dependencies": {
-        "tslib": "^2.4.0"
+        "@xtuc/long": "4.2.2"
       }
     },
-    "node_modules/asynckit": {
-      "version": "0.4.0",
-      "license": "MIT"
-    },
-    "node_modules/available-typed-arrays": {
-      "version": "1.0.5",
-      "license": "MIT",
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
+    "node_modules/@webassemblyjs/utf8": {
+      "version": "1.11.6",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/utf8/-/utf8-1.11.6.tgz",
+      "integrity": "sha512-vtXf2wTQ3+up9Zsg8sa2yWiQpzSsMyXj0qViVP6xKGCUT8p8YJ6HqI7l5eCnWx1T/FYdsv07HQs2wTFbbof/RA==",
+      "dev": true
     },
-    "node_modules/axe-core": {
-      "version": "4.7.2",
+    "node_modules/@webassemblyjs/wasm-edit": {
+      "version": "1.11.6",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-edit/-/wasm-edit-1.11.6.tgz",
+      "integrity": "sha512-Ybn2I6fnfIGuCR+Faaz7YcvtBKxvoLV3Lebn1tM4o/IAJzmi9AWYIPWpyBfU8cC+JxAO57bk4+zdsTjJR+VTOw==",
       "dev": true,
-      "license": "MPL-2.0",
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/axios": {
-      "version": "1.7.0",
-      "license": "MIT",
       "dependencies": {
-        "follow-redirects": "^1.15.6",
-        "form-data": "^4.0.0",
-        "proxy-from-env": "^1.1.0"
+        "@webassemblyjs/ast": "1.11.6",
+        "@webassemblyjs/helper-buffer": "1.11.6",
+        "@webassemblyjs/helper-wasm-bytecode": "1.11.6",
+        "@webassemblyjs/helper-wasm-section": "1.11.6",
+        "@webassemblyjs/wasm-gen": "1.11.6",
+        "@webassemblyjs/wasm-opt": "1.11.6",
+        "@webassemblyjs/wasm-parser": "1.11.6",
+        "@webassemblyjs/wast-printer": "1.11.6"
       }
     },
-    "node_modules/axobject-query": {
-      "version": "3.2.1",
+    "node_modules/@webassemblyjs/wasm-gen": {
+      "version": "1.11.6",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-gen/-/wasm-gen-1.11.6.tgz",
+      "integrity": "sha512-3XOqkZP/y6B4F0PBAXvI1/bky7GryoogUtfwExeP/v7Nzwo1QLcq5oQmpKlftZLbT+ERUOAZVQjuNVak6UXjPA==",
       "dev": true,
-      "license": "Apache-2.0",
       "dependencies": {
-        "dequal": "^2.0.3"
+        "@webassemblyjs/ast": "1.11.6",
+        "@webassemblyjs/helper-wasm-bytecode": "1.11.6",
+        "@webassemblyjs/ieee754": "1.11.6",
+        "@webassemblyjs/leb128": "1.11.6",
+        "@webassemblyjs/utf8": "1.11.6"
       }
     },
-    "node_modules/babel-plugin-styled-components": {
-      "version": "2.1.4",
-      "license": "MIT",
+    "node_modules/@webassemblyjs/wasm-opt": {
+      "version": "1.11.6",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-opt/-/wasm-opt-1.11.6.tgz",
+      "integrity": "sha512-cOrKuLRE7PCe6AsOVl7WasYf3wbSo4CeOk6PkrjS7g57MFfVUF9u6ysQBBODX0LdgSvQqRiGz3CXvIDKcPNy4g==",
+      "dev": true,
       "dependencies": {
-        "@babel/helper-annotate-as-pure": "^7.22.5",
-        "@babel/helper-module-imports": "^7.22.5",
-        "@babel/plugin-syntax-jsx": "^7.22.5",
-        "lodash": "^4.17.21",
-        "picomatch": "^2.3.1"
-      },
-      "peerDependencies": {
-        "styled-components": ">= 2"
+        "@webassemblyjs/ast": "1.11.6",
+        "@webassemblyjs/helper-buffer": "1.11.6",
+        "@webassemblyjs/wasm-gen": "1.11.6",
+        "@webassemblyjs/wasm-parser": "1.11.6"
       }
     },
-    "node_modules/babel-runtime": {
-      "version": "6.26.0",
-      "license": "MIT",
+    "node_modules/@webassemblyjs/wasm-parser": {
+      "version": "1.11.6",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-parser/-/wasm-parser-1.11.6.tgz",
+      "integrity": "sha512-6ZwPeGzMJM3Dqp3hCsLgESxBGtT/OeCvCZ4TA1JUPYgmhAx38tTPR9JaKy0S5H3evQpO/h2uWs2j6Yc/fjkpTQ==",
+      "dev": true,
       "dependencies": {
-        "core-js": "^2.4.0",
-        "regenerator-runtime": "^0.11.0"
+        "@webassemblyjs/ast": "1.11.6",
+        "@webassemblyjs/helper-api-error": "1.11.6",
+        "@webassemblyjs/helper-wasm-bytecode": "1.11.6",
+        "@webassemblyjs/ieee754": "1.11.6",
+        "@webassemblyjs/leb128": "1.11.6",
+        "@webassemblyjs/utf8": "1.11.6"
       }
     },
-    "node_modules/babel-runtime/node_modules/regenerator-runtime": {
-      "version": "0.11.1",
-      "license": "MIT"
-    },
-    "node_modules/babylon": {
-      "version": "6.18.0",
+    "node_modules/@webassemblyjs/wast-printer": {
+      "version": "1.11.6",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/wast-printer/-/wast-printer-1.11.6.tgz",
+      "integrity": "sha512-JM7AhRcE+yW2GWYaKeHL5vt4xqee5N2WcezptmgyhNS+ScggqcT1OtXykhAb13Sn5Yas0j2uv9tHgrjwvzAP4A==",
       "dev": true,
-      "license": "MIT",
-      "bin": {
-        "babylon": "bin/babylon.js"
+      "dependencies": {
+        "@webassemblyjs/ast": "1.11.6",
+        "@xtuc/long": "4.2.2"
       }
     },
-    "node_modules/balanced-match": {
-      "version": "1.0.2",
-      "license": "MIT"
+    "node_modules/@xtuc/ieee754": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/@xtuc/ieee754/-/ieee754-1.2.0.tgz",
+      "integrity": "sha512-DX8nKgqcGwsc0eJSqYt5lwP4DH5FlHnmuWWBRy7X0NcaGR0ZtuyeESgMwTYVEtxmsNGY+qit4QYT/MIYTOTPeA==",
+      "dev": true
     },
-    "node_modules/base-x": {
-      "version": "4.0.0",
-      "license": "MIT"
+    "node_modules/@xtuc/long": {
+      "version": "4.2.2",
+      "resolved": "https://registry.npmjs.org/@xtuc/long/-/long-4.2.2.tgz",
+      "integrity": "sha512-NuHqBY1PB/D8xU6s/thBgOAiAP7HOYDQ32+BFZILJ8ivkUkAHQnWfn6WhL79Owj1qmUnoN/YPhktdIoucipkAQ==",
+      "dev": true
     },
-    "node_modules/base58-js": {
-      "version": "1.0.5",
-      "license": "MIT",
-      "engines": {
-        "node": ">= 8"
+    "node_modules/@zondax/ledger-stacks": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/@zondax/ledger-stacks/-/ledger-stacks-1.0.4.tgz",
+      "integrity": "sha512-R8CB0CZ2poTzpcG0jhzzXZvXF7axIsmZFhp06aHCUjgz+1df63YbC4tUzyzmseekwqNWnaebWFejQKJ99WiHZA==",
+      "dependencies": {
+        "@babel/runtime": "^7.12.5",
+        "@ledgerhq/hw-transport": "^6.28.1",
+        "@stacks/transactions": "^4.1.0",
+        "varuint-bitcoin": "^1.1.2"
       }
     },
-    "node_modules/base64-js": {
-      "version": "1.5.1",
-      "funding": [
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/feross"
-        },
-        {
-          "type": "patreon",
-          "url": "https://www.patreon.com/feross"
-        },
-        {
-          "type": "consulting",
-          "url": "https://feross.org/support"
-        }
-      ],
-      "license": "MIT"
+    "node_modules/@zondax/ledger-stacks/node_modules/@stacks/common": {
+      "version": "4.3.5",
+      "resolved": "https://registry.npmjs.org/@stacks/common/-/common-4.3.5.tgz",
+      "integrity": "sha512-UuViiQ7fn3vdtTe3739aRzbl+wbukekeQuXgqt8d7nB2HC2HodD7GcHhpUga165cO35CD6lQUtj3vXxJb5Ga+A==",
+      "dependencies": {
+        "@types/bn.js": "^5.1.0",
+        "@types/node": "^18.0.4",
+        "buffer": "^6.0.3"
+      }
     },
-    "node_modules/base64-loader": {
-      "version": "1.0.0",
-      "dev": true,
-      "license": "MIT"
+    "node_modules/@zondax/ledger-stacks/node_modules/@stacks/network": {
+      "version": "4.3.5",
+      "resolved": "https://registry.npmjs.org/@stacks/network/-/network-4.3.5.tgz",
+      "integrity": "sha512-TC4+AkuT6qi3MoEGxTftA+4BNp99QvGnI+qtKQkoA1m0KDr8b9hSBUhugJHRhQbWuo7D6q0+JagYEGxLID29Kw==",
+      "dependencies": {
+        "@stacks/common": "^4.3.5",
+        "cross-fetch": "^3.1.5"
+      }
     },
-    "node_modules/base64url": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/base64url/-/base64url-3.0.1.tgz",
-      "integrity": "sha512-ir1UPr3dkwexU7FdV8qBBbNDRUhMmIekYMFZfi+C/sLNnRESKPl23nB9b2pltqfOQNnGzsDdId90AEtG5tCx4A==",
-      "engines": {
-        "node": ">=6.0.0"
+    "node_modules/@zondax/ledger-stacks/node_modules/@stacks/transactions": {
+      "version": "4.3.8",
+      "resolved": "https://registry.npmjs.org/@stacks/transactions/-/transactions-4.3.8.tgz",
+      "integrity": "sha512-5xYYv2TdXXM9PVixB79Pr99symQ8fhbVATjempGUxtL23/XUiRiLvJZohDxIE4VQ2EzbB4g4j8Y7oqPjj0h09Q==",
+      "dependencies": {
+        "@noble/hashes": "^1.0.0",
+        "@noble/secp256k1": "^1.5.5",
+        "@stacks/common": "^4.3.5",
+        "@stacks/network": "^4.3.5",
+        "@types/node": "^18.0.4",
+        "@types/sha.js": "^2.4.0",
+        "c32check": "^1.1.3",
+        "lodash.clonedeep": "^4.5.0",
+        "ripemd160-min": "^0.0.6",
+        "sha.js": "^2.4.11",
+        "smart-buffer": "^4.1.0"
       }
     },
-    "node_modules/batch": {
-      "version": "0.6.1",
-      "dev": true,
-      "license": "MIT"
+    "node_modules/@zondax/ledger-stacks/node_modules/@types/node": {
+      "version": "18.19.42",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-18.19.42.tgz",
+      "integrity": "sha512-d2ZFc/3lnK2YCYhos8iaNIYu9Vfhr92nHiyJHRltXWjXUBjEE+A4I58Tdbnw4VhggSW+2j5y5gTrLs4biNnubg==",
+      "dependencies": {
+        "undici-types": "~5.26.4"
+      }
     },
-    "node_modules/bech32": {
-      "version": "2.0.0",
-      "license": "MIT"
+    "node_modules/@zondax/ledger-stacks/node_modules/base-x": {
+      "version": "3.0.10",
+      "resolved": "https://registry.npmjs.org/base-x/-/base-x-3.0.10.tgz",
+      "integrity": "sha512-7d0s06rR9rYaIWHkpfLIFICM/tkSVdoPC9qYAQRpxn9DdKNWNsKC0uk++akckyLq16Tx2WIinnZ6WRriAt6njQ==",
+      "dependencies": {
+        "safe-buffer": "^5.0.1"
+      }
     },
-    "node_modules/big-integer": {
-      "version": "1.6.51",
-      "license": "Unlicense",
+    "node_modules/@zondax/ledger-stacks/node_modules/c32check": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/c32check/-/c32check-1.1.3.tgz",
+      "integrity": "sha512-ADADE/PjAbJRlwpG3ShaOMbBUlJJZO7xaYSRD5Tub6PixQlgR4s36y9cvMf/YRGpkqX+QOxIdMw216iC320q9A==",
+      "dependencies": {
+        "base-x": "^3.0.8",
+        "buffer": "^5.6.0",
+        "cross-sha256": "^1.2.0"
+      },
       "engines": {
-        "node": ">=0.6"
+        "node": ">=8"
       }
     },
-    "node_modules/big.js": {
-      "version": "5.2.2",
+    "node_modules/accepts": {
+      "version": "1.3.8",
+      "resolved": "https://registry.npmjs.org/accepts/-/accepts-1.3.8.tgz",
+      "integrity": "sha512-PYAthTa2m2VKxuvSD3DPC/Gy+U+sOA1LAuT8mkmRuvw+NACSaeXEQ+NHcVF7rONl6qcaxV3Uuemwawk+7+SJLw==",
       "dev": true,
-      "license": "MIT",
+      "dependencies": {
+        "mime-types": "~2.1.34",
+        "negotiator": "0.6.3"
+      },
       "engines": {
-        "node": "*"
+        "node": ">= 0.6"
       }
     },
-    "node_modules/bignumber.js": {
-      "version": "9.1.1",
-      "license": "MIT",
+    "node_modules/acorn": {
+      "version": "8.10.0",
+      "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.10.0.tgz",
+      "integrity": "sha512-F0SAmZ8iUtS//m8DmCTA0jlh6TDKkHQyK6xc6V4KDTyZKA9dnvX9/3sRTVQrWm79glUAZbnmmNcdYwUIHWVybw==",
+      "dev": true,
+      "bin": {
+        "acorn": "bin/acorn"
+      },
       "engines": {
-        "node": "*"
+        "node": ">=0.4.0"
       }
     },
-    "node_modules/binary-extensions": {
-      "version": "2.2.0",
+    "node_modules/acorn-import-assertions": {
+      "version": "1.9.0",
+      "resolved": "https://registry.npmjs.org/acorn-import-assertions/-/acorn-import-assertions-1.9.0.tgz",
+      "integrity": "sha512-cmMwop9x+8KFhxvKrKfPYmN6/pKTYYHBqLa0DfvVZcKMJWNyWLnaqND7dx/qn66R7ewM1UX5XMaDVP5wlVTaVA==",
       "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=8"
+      "peerDependencies": {
+        "acorn": "^8"
       }
     },
-    "node_modules/bindings": {
-      "version": "1.5.0",
-      "resolved": "https://registry.npmjs.org/bindings/-/bindings-1.5.0.tgz",
-      "integrity": "sha512-p2q/t/mhvuOj/UeLlV6566GD/guowlr0hHxClI0W9m7MWYkL1F0hLo+0Aexs9HSPCtR1SXQ0TD3MMKrXZajbiQ==",
-      "dependencies": {
-        "file-uri-to-path": "1.0.0"
+    "node_modules/acorn-jsx": {
+      "version": "5.3.2",
+      "resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.3.2.tgz",
+      "integrity": "sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==",
+      "dev": true,
+      "peerDependencies": {
+        "acorn": "^6.0.0 || ^7.0.0 || ^8.0.0"
       }
     },
-    "node_modules/bip174": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/bip174/-/bip174-2.1.1.tgz",
-      "integrity": "sha512-mdFV5+/v0XyNYXjBS6CQPLo9ekCx4gtKZFnJm5PMto7Fs9hTTDpkkzOB7/FtluRI6JbUUAu+snTYfJRgHLZbZQ==",
+    "node_modules/acorn-walk": {
+      "version": "8.3.0",
+      "resolved": "https://registry.npmjs.org/acorn-walk/-/acorn-walk-8.3.0.tgz",
+      "integrity": "sha512-FS7hV565M5l1R08MXqo8odwMTB02C2UqzB17RVgu9EyuYFBqJZ3/ZY97sQD5FewVu1UyDFc1yztUDrAwT0EypA==",
+      "dev": true,
       "engines": {
-        "node": ">=8.0.0"
+        "node": ">=0.4.0"
       }
     },
-    "node_modules/bip32": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/bip32/-/bip32-4.0.0.tgz",
-      "integrity": "sha512-aOGy88DDlVUhspIXJN+dVEtclhIsfAUppD43V0j40cPTld3pv/0X/MlrZSZ6jowIaQQzFwP8M6rFU2z2mVYjDQ==",
+    "node_modules/aggregate-error": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/aggregate-error/-/aggregate-error-3.1.0.tgz",
+      "integrity": "sha512-4I7Td01quW/RpocfNayFdFVk1qSuoh0E7JrbRJ16nH01HhKFQ88INq9Sd+nd72zqRySlr9BmDA8xlEJ6vJMrYA==",
+      "dev": true,
       "dependencies": {
-        "@noble/hashes": "^1.2.0",
-        "@scure/base": "^1.1.1",
-        "typeforce": "^1.11.5",
-        "wif": "^2.0.6"
+        "clean-stack": "^2.0.0",
+        "indent-string": "^4.0.0"
       },
       "engines": {
-        "node": ">=6.0.0"
+        "node": ">=8"
       }
     },
-    "node_modules/bip32-path": {
-      "version": "0.4.2",
-      "resolved": "https://registry.npmjs.org/bip32-path/-/bip32-path-0.4.2.tgz",
-      "integrity": "sha512-ZBMCELjJfcNMkz5bDuJ1WrYvjlhEF5k6mQ8vUr4N7MbVRsXei7ZOg8VhhwMfNiW68NWmLkgkc6WvTickrLGprQ=="
+    "node_modules/ajv": {
+      "version": "6.12.6",
+      "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
+      "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
+      "dev": true,
+      "dependencies": {
+        "fast-deep-equal": "^3.1.1",
+        "fast-json-stable-stringify": "^2.0.0",
+        "json-schema-traverse": "^0.4.1",
+        "uri-js": "^4.2.2"
+      },
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/epoberezkin"
+      }
     },
-    "node_modules/bip39": {
-      "version": "3.1.0",
-      "license": "ISC",
+    "node_modules/ajv-formats": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/ajv-formats/-/ajv-formats-2.1.1.tgz",
+      "integrity": "sha512-Wx0Kx52hxE7C18hkMEggYlEifqWZtYaRgouJor+WMdPnQyEK13vgEWyVNup7SoeeoLMsr4kf5h6dOW11I15MUA==",
+      "dev": true,
       "dependencies": {
-        "@noble/hashes": "^1.2.0"
+        "ajv": "^8.0.0"
+      },
+      "peerDependencies": {
+        "ajv": "^8.0.0"
+      },
+      "peerDependenciesMeta": {
+        "ajv": {
+          "optional": true
+        }
       }
     },
-    "node_modules/bip66": {
-      "version": "1.1.5",
-      "resolved": "https://registry.npmjs.org/bip66/-/bip66-1.1.5.tgz",
-      "integrity": "sha512-nemMHz95EmS38a26XbbdxIYj5csHd3RMP3H5bwQknX0WYHF01qhpufP42mLOwVICuH2JmhIhXiWs89MfUGL7Xw==",
+    "node_modules/ajv-formats/node_modules/ajv": {
+      "version": "8.12.0",
+      "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.12.0.tgz",
+      "integrity": "sha512-sRu1kpcO9yLtYxBKvqfTeh9KzZEwO3STyX1HT+4CaDzC6HpTGYhIhPIzj9XuKU7KYDwnaeh5hcOwjy1QuJzBPA==",
+      "dev": true,
       "dependencies": {
-        "safe-buffer": "^5.0.1"
+        "fast-deep-equal": "^3.1.1",
+        "json-schema-traverse": "^1.0.0",
+        "require-from-string": "^2.0.2",
+        "uri-js": "^4.2.2"
+      },
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/epoberezkin"
       }
     },
-    "node_modules/bip68": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/bip68/-/bip68-1.0.4.tgz",
-      "integrity": "sha512-O1htyufFTYy3EO0JkHg2CLykdXEtV2ssqw47Gq9A0WByp662xpJnMEB9m43LZjsSDjIAOozWRExlFQk2hlV1XQ==",
-      "engines": {
-        "node": ">=4.5.0"
+    "node_modules/ajv-formats/node_modules/json-schema-traverse": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz",
+      "integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==",
+      "dev": true
+    },
+    "node_modules/ajv-keywords": {
+      "version": "3.5.2",
+      "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.5.2.tgz",
+      "integrity": "sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==",
+      "dev": true,
+      "peerDependencies": {
+        "ajv": "^6.9.1"
       }
     },
-    "node_modules/bitcoin-address-validation": {
-      "version": "2.2.3",
-      "license": "MIT",
+    "node_modules/alex-sdk": {
+      "version": "0.1.26",
+      "resolved": "https://registry.npmjs.org/alex-sdk/-/alex-sdk-0.1.26.tgz",
+      "integrity": "sha512-uUjbONoAit6htxZGLOFev8v2h59kE31fM1X9efH0Yi1eLXYSSXojj+iFPTlQTQvIysyseXGxkX4VVTc9aQ13sg==",
       "dependencies": {
-        "base58-js": "^1.0.0",
-        "bech32": "^2.0.0",
-        "sha256-uint8array": "^0.10.3"
+        "clarity-codegen": "^0.3.5"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "peerDependencies": {
+        "@stacks/network": "*",
+        "@stacks/transactions": "*"
       }
     },
-    "node_modules/bitcoinjs-lib": {
-      "version": "6.1.6",
-      "resolved": "https://registry.npmjs.org/bitcoinjs-lib/-/bitcoinjs-lib-6.1.6.tgz",
-      "integrity": "sha512-Fk8+Vc+e2rMoDU5gXkW9tD+313rhkm5h6N9HfZxXvYU9LedttVvmXKTgd9k5rsQJjkSfsv6XRM8uhJv94SrvcA==",
+    "node_modules/ansi-escapes": {
+      "version": "4.3.2",
+      "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-4.3.2.tgz",
+      "integrity": "sha512-gKXj5ALrKWQLsYG9jlTRmR/xKluxHV+Z9QEwNIgCfM1/uwPMCuzVVnh5mwTd+OuBZcwSIMbqssNWRm1lE51QaQ==",
+      "dev": true,
       "dependencies": {
-        "@noble/hashes": "^1.2.0",
-        "bech32": "^2.0.0",
-        "bip174": "^2.1.1",
-        "bs58check": "^3.0.1",
-        "typeforce": "^1.11.3",
-        "varuint-bitcoin": "^1.1.2"
+        "type-fest": "^0.21.3"
       },
       "engines": {
-        "node": ">=8.0.0"
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/bitcoinjs-message": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/bitcoinjs-message/-/bitcoinjs-message-2.2.0.tgz",
-      "integrity": "sha512-103Wy3xg8Y9o+pdhGP4M3/mtQQuUWs6sPuOp1mYphSUoSMHjHTlkj32K4zxU8qMH0Ckv23emfkGlFWtoWZ7YFA==",
-      "dependencies": {
-        "bech32": "^1.1.3",
-        "bs58check": "^2.1.2",
-        "buffer-equals": "^1.0.3",
-        "create-hash": "^1.1.2",
-        "secp256k1": "^3.0.1",
-        "varuint-bitcoin": "^1.0.1"
-      },
+    "node_modules/ansi-escapes/node_modules/type-fest": {
+      "version": "0.21.3",
+      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.21.3.tgz",
+      "integrity": "sha512-t0rzBq87m3fVcduHDUFhKmyyX+9eo6WQjZvf51Ea/M0Q7+T374Jp1aUiyUl0GKxp8M/OETVHSDvmkyPgvX+X2w==",
+      "dev": true,
       "engines": {
-        "node": ">=0.10"
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/bitcoinjs-message/node_modules/base-x": {
-      "version": "3.0.10",
-      "resolved": "https://registry.npmjs.org/base-x/-/base-x-3.0.10.tgz",
-      "integrity": "sha512-7d0s06rR9rYaIWHkpfLIFICM/tkSVdoPC9qYAQRpxn9DdKNWNsKC0uk++akckyLq16Tx2WIinnZ6WRriAt6njQ==",
-      "dependencies": {
-        "safe-buffer": "^5.0.1"
+    "node_modules/ansi-html-community": {
+      "version": "0.0.8",
+      "resolved": "https://registry.npmjs.org/ansi-html-community/-/ansi-html-community-0.0.8.tgz",
+      "integrity": "sha512-1APHAyr3+PCamwNw3bXCPp4HFLONZt/yIH0sZp0/469KWNTEy+qN5jQ3GVX6DMZ1UXAi34yVwtTeaG/HpBuuzw==",
+      "dev": true,
+      "engines": [
+        "node >= 0.8.0"
+      ],
+      "bin": {
+        "ansi-html": "bin/ansi-html"
       }
     },
-    "node_modules/bitcoinjs-message/node_modules/bech32": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/bech32/-/bech32-1.1.4.tgz",
-      "integrity": "sha512-s0IrSOzLlbvX7yp4WBfPITzpAU8sqQcpsmwXDiKwrG4r491vwCO/XpejasRNl0piBMe/DvP4Tz0mIS/X1DPJBQ=="
-    },
-    "node_modules/bitcoinjs-message/node_modules/bs58": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/bs58/-/bs58-4.0.1.tgz",
-      "integrity": "sha512-Ok3Wdf5vOIlBrgCvTq96gBkJw+JUEzdBgyaza5HLtPm7yTHkjRy8+JzNyHF7BHa0bNWOQIp3m5YF0nnFcOIKLw==",
-      "dependencies": {
-        "base-x": "^3.0.2"
+    "node_modules/ansi-regex": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
+      "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
+      "engines": {
+        "node": ">=8"
       }
     },
-    "node_modules/bitcoinjs-message/node_modules/bs58check": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/bs58check/-/bs58check-2.1.2.tgz",
-      "integrity": "sha512-0TS1jicxdU09dwJMNZtVAfzPi6Q6QeN0pM1Fkzrjn+XYHvzMKPU3pHVpva+769iNVSfIYWf7LJ6WR+BuuMf8cA==",
+    "node_modules/ansi-styles": {
+      "version": "3.2.1",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
+      "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
       "dependencies": {
-        "bs58": "^4.0.0",
-        "create-hash": "^1.1.0",
-        "safe-buffer": "^5.1.2"
+        "color-convert": "^1.9.0"
+      },
+      "engines": {
+        "node": ">=4"
       }
     },
-    "node_modules/bn.js": {
-      "version": "5.2.1",
-      "license": "MIT"
-    },
-    "node_modules/body-parser": {
-      "version": "1.20.1",
+    "node_modules/anymatch": {
+      "version": "3.1.3",
+      "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.3.tgz",
+      "integrity": "sha512-KMReFUr0B4t+D+OBkjR3KYqvocp2XaSzO55UcB6mgQMd3KbcE+mWTyvVV7D/zsdEbNnV6acZUutkiHQXvTr1Rw==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "bytes": "3.1.2",
-        "content-type": "~1.0.4",
-        "debug": "2.6.9",
-        "depd": "2.0.0",
-        "destroy": "1.2.0",
-        "http-errors": "2.0.0",
-        "iconv-lite": "0.4.24",
-        "on-finished": "2.4.1",
-        "qs": "6.11.0",
-        "raw-body": "2.5.1",
-        "type-is": "~1.6.18",
-        "unpipe": "1.0.0"
+        "normalize-path": "^3.0.0",
+        "picomatch": "^2.0.4"
       },
       "engines": {
-        "node": ">= 0.8",
-        "npm": "1.2.8000 || >= 1.4.16"
+        "node": ">= 8"
       }
     },
-    "node_modules/body-parser/node_modules/bytes": {
-      "version": "3.1.2",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">= 0.8"
-      }
+    "node_modules/argon2-browser": {
+      "version": "1.18.0",
+      "resolved": "https://registry.npmjs.org/argon2-browser/-/argon2-browser-1.18.0.tgz",
+      "integrity": "sha512-ImVAGIItnFnvET1exhsQB7apRztcoC5TnlSqernMJDUjbc/DLq3UEYeXFrLPrlaIl8cVfwnXb6wX2KpFf2zxHw=="
     },
-    "node_modules/body-parser/node_modules/debug": {
-      "version": "2.6.9",
+    "node_modules/argparse": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz",
+      "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==",
+      "dev": true
+    },
+    "node_modules/aria-query": {
+      "version": "5.1.3",
+      "resolved": "https://registry.npmjs.org/aria-query/-/aria-query-5.1.3.tgz",
+      "integrity": "sha512-R5iJ5lkuHybztUfuOAznmboyjWq8O6sqNqtK7CLOqdydi54VNbORp49mb14KbWgG1QD3JFO9hJdZ+y4KutfdOQ==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "ms": "2.0.0"
+        "deep-equal": "^2.0.5"
       }
     },
-    "node_modules/body-parser/node_modules/iconv-lite": {
-      "version": "0.4.24",
+    "node_modules/arity-n": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/arity-n/-/arity-n-1.0.4.tgz",
+      "integrity": "sha512-fExL2kFDC1Q2DUOx3whE/9KoN66IzkY4b4zUHUBFM1ojEYjZZYDcUW3bek/ufGionX9giIKDC5redH2IlGqcQQ==",
+      "dev": true
+    },
+    "node_modules/array-buffer-byte-length": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/array-buffer-byte-length/-/array-buffer-byte-length-1.0.0.tgz",
+      "integrity": "sha512-LPuwb2P+NrQw3XhxGc36+XSvuBPopovXYTR9Ew++Du9Yb/bx5AzBfrIsBoj0EZUifjQU+sHL21sseZ3jerWO/A==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "safer-buffer": ">= 2.1.2 < 3"
+        "call-bind": "^1.0.2",
+        "is-array-buffer": "^3.0.1"
       },
-      "engines": {
-        "node": ">=0.10.0"
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/body-parser/node_modules/ms": {
-      "version": "2.0.0",
-      "dev": true,
-      "license": "MIT"
+    "node_modules/array-flatten": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/array-flatten/-/array-flatten-2.1.2.tgz",
+      "integrity": "sha512-hNfzcOV8W4NdualtqBFPyVO+54DSJuZGY9qT4pRroB6S9e3iiido2ISIC5h9R2sPJ8H3FHCIiEnsv1lPXO3KtQ==",
+      "dev": true
     },
-    "node_modules/body-parser/node_modules/qs": {
-      "version": "6.11.0",
+    "node_modules/array-includes": {
+      "version": "3.1.6",
+      "resolved": "https://registry.npmjs.org/array-includes/-/array-includes-3.1.6.tgz",
+      "integrity": "sha512-sgTbLvL6cNnw24FnbaDyjmvddQ2ML8arZsgaJhoABMoplz/4QRhtrYS+alr1BUM1Bwp6dhx8vVCBSLG+StwOFw==",
       "dev": true,
-      "license": "BSD-3-Clause",
       "dependencies": {
-        "side-channel": "^1.0.4"
+        "call-bind": "^1.0.2",
+        "define-properties": "^1.1.4",
+        "es-abstract": "^1.20.4",
+        "get-intrinsic": "^1.1.3",
+        "is-string": "^1.0.7"
       },
       "engines": {
-        "node": ">=0.6"
+        "node": ">= 0.4"
       },
       "funding": {
         "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/bonjour-service": {
-      "version": "1.1.1",
+    "node_modules/array-last": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/array-last/-/array-last-1.3.0.tgz",
+      "integrity": "sha512-eOCut5rXlI6aCOS7Z7kCplKRKyiFQ6dHFBem4PwlwKeNFk2/XxTrhRh5T9PyaEWGy/NHTZWbY+nsZlNFJu9rYg==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "array-flatten": "^2.1.2",
-        "dns-equal": "^1.0.0",
-        "fast-deep-equal": "^3.1.3",
-        "multicast-dns": "^7.2.5"
+        "is-number": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
       }
     },
-    "node_modules/boolbase": {
-      "version": "1.0.0",
+    "node_modules/array-last/node_modules/is-number": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/is-number/-/is-number-4.0.0.tgz",
+      "integrity": "sha512-rSklcAIlf1OmFdyAqbnWTLVelsQ58uvZ66S/ZyawjWqIviTWCjg2PzVGw8WUA+nNuPTqb4wgA+NszrJ+08LlgQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/array-union": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/array-union/-/array-union-2.1.0.tgz",
+      "integrity": "sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw==",
       "dev": true,
-      "license": "ISC"
+      "engines": {
+        "node": ">=8"
+      }
     },
-    "node_modules/brace-expansion": {
-      "version": "1.1.11",
-      "license": "MIT",
-      "dependencies": {
-        "balanced-match": "^1.0.0",
-        "concat-map": "0.0.1"
+    "node_modules/array-uniq": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/array-uniq/-/array-uniq-1.0.3.tgz",
+      "integrity": "sha512-MNha4BWQ6JbwhFhj03YK552f7cb3AzoE8SzeljgChvL1dl3IcvggXVz1DilzySZkCja+CXuZbdW7yATchWn8/Q==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
       }
     },
-    "node_modules/braces": {
-      "version": "3.0.2",
+    "node_modules/array.prototype.findlastindex": {
+      "version": "1.2.2",
+      "resolved": "https://registry.npmjs.org/array.prototype.findlastindex/-/array.prototype.findlastindex-1.2.2.tgz",
+      "integrity": "sha512-tb5thFFlUcp7NdNF6/MpDk/1r/4awWG1FIz3YqDf+/zJSTezBb+/5WViH41obXULHVpDzoiCLpJ/ZO9YbJMsdw==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "fill-range": "^7.0.1"
+        "call-bind": "^1.0.2",
+        "define-properties": "^1.1.4",
+        "es-abstract": "^1.20.4",
+        "es-shim-unscopables": "^1.0.0",
+        "get-intrinsic": "^1.1.3"
       },
       "engines": {
-        "node": ">=8"
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/broadcast-channel": {
-      "version": "2.3.4",
+    "node_modules/array.prototype.flat": {
+      "version": "1.3.1",
+      "resolved": "https://registry.npmjs.org/array.prototype.flat/-/array.prototype.flat-1.3.1.tgz",
+      "integrity": "sha512-roTU0KWIOmJ4DRLmwKd19Otg0/mT3qPNt0Qb3GWW8iObuZXxrjB/pzn0R3hqpRSWg4HCwqx+0vwOnWnvlOyeIA==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "@babel/runtime": "^7.6.2",
-        "detect-node": "^2.0.4",
-        "js-sha3": "0.8.0",
-        "microseconds": "0.1.0",
-        "nano-time": "1.0.0",
-        "rimraf": "2.6.3",
-        "unload": "2.2.0"
+        "call-bind": "^1.0.2",
+        "define-properties": "^1.1.4",
+        "es-abstract": "^1.20.4",
+        "es-shim-unscopables": "^1.0.0"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/broadcast-channel/node_modules/rimraf": {
-      "version": "2.6.3",
+    "node_modules/array.prototype.flatmap": {
+      "version": "1.3.1",
+      "resolved": "https://registry.npmjs.org/array.prototype.flatmap/-/array.prototype.flatmap-1.3.1.tgz",
+      "integrity": "sha512-8UGn9O1FDVvMNB0UlLv4voxRMze7+FpHyF5mSMRjWHUMlpoDViniy05870VlxhfgTnLbpuwTzvD76MTtWxB/mQ==",
       "dev": true,
-      "license": "ISC",
       "dependencies": {
-        "glob": "^7.1.3"
+        "call-bind": "^1.0.2",
+        "define-properties": "^1.1.4",
+        "es-abstract": "^1.20.4",
+        "es-shim-unscopables": "^1.0.0"
       },
-      "bin": {
-        "rimraf": "bin.js"
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/brorand": {
-      "version": "1.1.0",
-      "license": "MIT"
-    },
-    "node_modules/browserify-aes": {
-      "version": "1.2.0",
-      "license": "MIT",
+    "node_modules/array.prototype.tosorted": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/array.prototype.tosorted/-/array.prototype.tosorted-1.1.1.tgz",
+      "integrity": "sha512-pZYPXPRl2PqWcsUs6LOMn+1f1532nEoPTYowBtqLwAW+W8vSVhkIGnmOX1t/UQjD6YGI0vcD2B1U7ZFGQH9jnQ==",
+      "dev": true,
       "dependencies": {
-        "buffer-xor": "^1.0.3",
-        "cipher-base": "^1.0.0",
-        "create-hash": "^1.1.0",
-        "evp_bytestokey": "^1.0.3",
-        "inherits": "^2.0.1",
-        "safe-buffer": "^5.0.1"
+        "call-bind": "^1.0.2",
+        "define-properties": "^1.1.4",
+        "es-abstract": "^1.20.4",
+        "es-shim-unscopables": "^1.0.0",
+        "get-intrinsic": "^1.1.3"
       }
     },
-    "node_modules/browserify-cipher": {
+    "node_modules/arraybuffer.prototype.slice": {
       "version": "1.0.1",
-      "license": "MIT",
+      "resolved": "https://registry.npmjs.org/arraybuffer.prototype.slice/-/arraybuffer.prototype.slice-1.0.1.tgz",
+      "integrity": "sha512-09x0ZWFEjj4WD8PDbykUwo3t9arLn8NIzmmYEJFpYekOAQjpkGSyrQhNoRTcwwcFRu+ycWF78QZ63oWTqSjBcw==",
+      "dev": true,
       "dependencies": {
-        "browserify-aes": "^1.0.4",
-        "browserify-des": "^1.0.0",
-        "evp_bytestokey": "^1.0.0"
+        "array-buffer-byte-length": "^1.0.0",
+        "call-bind": "^1.0.2",
+        "define-properties": "^1.2.0",
+        "get-intrinsic": "^1.2.1",
+        "is-array-buffer": "^3.0.2",
+        "is-shared-array-buffer": "^1.0.2"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/browserify-des": {
-      "version": "1.0.2",
-      "license": "MIT",
+    "node_modules/asn1.js": {
+      "version": "5.4.1",
+      "resolved": "https://registry.npmjs.org/asn1.js/-/asn1.js-5.4.1.tgz",
+      "integrity": "sha512-+I//4cYPccV8LdmBLiX8CYvf9Sp3vQsrqu2QNXRcrbiWvcx/UdlFiqUJJzxRQxgsZmvhXhn4cSKeSmoFjVdupA==",
       "dependencies": {
-        "cipher-base": "^1.0.1",
-        "des.js": "^1.0.0",
+        "bn.js": "^4.0.0",
         "inherits": "^2.0.1",
-        "safe-buffer": "^5.1.2"
+        "minimalistic-assert": "^1.0.0",
+        "safer-buffer": "^2.1.0"
       }
     },
-    "node_modules/browserify-rsa": {
-      "version": "4.1.0",
-      "license": "MIT",
+    "node_modules/asn1.js/node_modules/bn.js": {
+      "version": "4.12.0",
+      "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.0.tgz",
+      "integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA=="
+    },
+    "node_modules/assertion-error": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/assertion-error/-/assertion-error-1.1.0.tgz",
+      "integrity": "sha512-jgsaNduz+ndvGyFt3uSuWqvy4lCnIJiovtouQN5JZHOKCS2QuhEdbcQHFhVksz2N2U9hXJo8odG7ETyWlEeuDw==",
+      "dev": true,
+      "engines": {
+        "node": "*"
+      }
+    },
+    "node_modules/ast-types-flow": {
+      "version": "0.0.7",
+      "resolved": "https://registry.npmjs.org/ast-types-flow/-/ast-types-flow-0.0.7.tgz",
+      "integrity": "sha512-eBvWn1lvIApYMhzQMsu9ciLfkBY499mFZlNqG+/9WR7PVlroQw0vG30cOQQbaKz3sCEc44TAOu2ykzqXSNnwag==",
+      "dev": true
+    },
+    "node_modules/astral-regex": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/astral-regex/-/astral-regex-2.0.0.tgz",
+      "integrity": "sha512-Z7tMw1ytTXt5jqMcOP+OQteU1VuNK9Y02uuJtKQ1Sv69jXQKKg5cibLwGJow8yzZP+eAc18EmLGPal0bp36rvQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/async": {
+      "version": "2.6.4",
+      "resolved": "https://registry.npmjs.org/async/-/async-2.6.4.tgz",
+      "integrity": "sha512-mzo5dfJYwAn29PeiJ0zvwTo04zj8HDJj0Mn8TD7sno7q12prdbnasKJHhkm2c1LgrhlJ0teaea8860oxi51mGA==",
       "dependencies": {
-        "bn.js": "^5.0.0",
-        "randombytes": "^2.0.1"
+        "lodash": "^4.17.14"
       }
     },
-    "node_modules/browserify-sign": {
-      "version": "4.2.2",
-      "license": "ISC",
+    "node_modules/async-mutex": {
+      "version": "0.5.0",
+      "resolved": "https://registry.npmjs.org/async-mutex/-/async-mutex-0.5.0.tgz",
+      "integrity": "sha512-1A94B18jkJ3DYq284ohPxoXbfTA5HsQ7/Mf4DEhcyLx3Bz27Rh59iScbB6EPiP+B+joue6YCxcMXSbFC1tZKwA==",
       "dependencies": {
-        "bn.js": "^5.2.1",
-        "browserify-rsa": "^4.1.0",
-        "create-hash": "^1.2.0",
-        "create-hmac": "^1.1.7",
-        "elliptic": "^6.5.4",
-        "inherits": "^2.0.4",
-        "parse-asn1": "^5.1.6",
-        "readable-stream": "^3.6.2",
-        "safe-buffer": "^5.2.1"
+        "tslib": "^2.4.0"
+      }
+    },
+    "node_modules/asynckit": {
+      "version": "0.4.0",
+      "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz",
+      "integrity": "sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q=="
+    },
+    "node_modules/available-typed-arrays": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/available-typed-arrays/-/available-typed-arrays-1.0.5.tgz",
+      "integrity": "sha512-DMD0KiN46eipeziST1LPP/STfDU0sufISXmjSgvVsoU2tqxctQeASejWcfNtxYKqETM1UxQ8sp2OrSBWpHY6sw==",
+      "engines": {
+        "node": ">= 0.4"
       },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/axe-core": {
+      "version": "4.7.2",
+      "resolved": "https://registry.npmjs.org/axe-core/-/axe-core-4.7.2.tgz",
+      "integrity": "sha512-zIURGIS1E1Q4pcrMjp+nnEh+16G56eG/MUllJH8yEvw7asDo7Ac9uhC9KIH5jzpITueEZolfYglnCGIuSBz39g==",
+      "dev": true,
       "engines": {
-        "node": ">= 4"
+        "node": ">=4"
       }
     },
-    "node_modules/browserslist": {
-      "version": "4.22.1",
-      "funding": [
-        {
-          "type": "opencollective",
-          "url": "https://opencollective.com/browserslist"
-        },
-        {
-          "type": "tidelift",
-          "url": "https://tidelift.com/funding/github/npm/browserslist"
-        },
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/ai"
-        }
-      ],
-      "license": "MIT",
+    "node_modules/axios": {
+      "version": "1.7.0",
+      "resolved": "https://registry.npmjs.org/axios/-/axios-1.7.0.tgz",
+      "integrity": "sha512-IiB0wQeKyPRdsFVhBgIo31FbzOyf2M6wYl7/NVutFwFBRMiAbjNiydJIHKeLmPugF4kJLfA1uWZ82Is2QzqqFA==",
       "dependencies": {
-        "caniuse-lite": "^1.0.30001541",
-        "electron-to-chromium": "^1.4.535",
-        "node-releases": "^2.0.13",
-        "update-browserslist-db": "^1.0.13"
-      },
-      "bin": {
-        "browserslist": "cli.js"
-      },
-      "engines": {
-        "node": "^6 || ^7 || ^8 || ^9 || ^10 || ^11 || ^12 || >=13.7"
+        "follow-redirects": "^1.15.6",
+        "form-data": "^4.0.0",
+        "proxy-from-env": "^1.1.0"
       }
     },
-    "node_modules/bs58": {
-      "version": "5.0.0",
-      "license": "MIT",
+    "node_modules/axobject-query": {
+      "version": "3.2.1",
+      "resolved": "https://registry.npmjs.org/axobject-query/-/axobject-query-3.2.1.tgz",
+      "integrity": "sha512-jsyHu61e6N4Vbz/v18DHwWYKK0bSWLqn47eeDSKPB7m8tqMHF9YJ+mhIk2lVteyZrY8tnSj/jHOv4YiTCuCJgg==",
+      "dev": true,
       "dependencies": {
-        "base-x": "^4.0.0"
+        "dequal": "^2.0.3"
       }
     },
-    "node_modules/bs58check": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/bs58check/-/bs58check-3.0.1.tgz",
-      "integrity": "sha512-hjuuJvoWEybo7Hn/0xOrczQKKEKD63WguEjlhLExYs2wUBcebDC1jDNK17eEAD2lYfw82d5ASC1d7K3SWszjaQ==",
+    "node_modules/babel-plugin-styled-components": {
+      "version": "2.1.4",
+      "resolved": "https://registry.npmjs.org/babel-plugin-styled-components/-/babel-plugin-styled-components-2.1.4.tgz",
+      "integrity": "sha512-Xgp9g+A/cG47sUyRwwYxGM4bR/jDRg5N6it/8+HxCnbT5XNKSKDT9xm4oag/osgqjC2It/vH0yXsomOG6k558g==",
       "dependencies": {
-        "@noble/hashes": "^1.2.0",
-        "bs58": "^5.0.0"
+        "@babel/helper-annotate-as-pure": "^7.22.5",
+        "@babel/helper-module-imports": "^7.22.5",
+        "@babel/plugin-syntax-jsx": "^7.22.5",
+        "lodash": "^4.17.21",
+        "picomatch": "^2.3.1"
+      },
+      "peerDependencies": {
+        "styled-components": ">= 2"
       }
     },
-    "node_modules/buffer": {
-      "version": "6.0.3",
+    "node_modules/babel-runtime": {
+      "version": "6.26.0",
+      "resolved": "https://registry.npmjs.org/babel-runtime/-/babel-runtime-6.26.0.tgz",
+      "integrity": "sha512-ITKNuq2wKlW1fJg9sSW52eepoYgZBggvOAHC0u/CYu/qxQ9EVzThCgR69BnSXLHjy2f7SY5zaQ4yt7H9ZVxY2g==",
+      "dependencies": {
+        "core-js": "^2.4.0",
+        "regenerator-runtime": "^0.11.0"
+      }
+    },
+    "node_modules/babel-runtime/node_modules/regenerator-runtime": {
+      "version": "0.11.1",
+      "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.11.1.tgz",
+      "integrity": "sha512-MguG95oij0fC3QV3URf4V2SDYGJhJnJGqvIIgdECeODCT98wSWDAJ94SSuVpYQUoTcGUIL6L4yNB7j1DFFHSBg=="
+    },
+    "node_modules/babylon": {
+      "version": "6.18.0",
+      "resolved": "https://registry.npmjs.org/babylon/-/babylon-6.18.0.tgz",
+      "integrity": "sha512-q/UEjfGJ2Cm3oKV71DJz9d25TPnq5rhBVL2Q4fA5wcC3jcrdn7+SssEybFIxwAvvP+YCsCYNKughoF33GxgycQ==",
+      "dev": true,
+      "bin": {
+        "babylon": "bin/babylon.js"
+      }
+    },
+    "node_modules/balanced-match": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz",
+      "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw=="
+    },
+    "node_modules/base-x": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/base-x/-/base-x-4.0.0.tgz",
+      "integrity": "sha512-FuwxlW4H5kh37X/oW59pwTzzTKRzfrrQwhmyspRM7swOEZcHtDZSCt45U6oKgtuFE+WYPblePMVIPR4RZrh/hw=="
+    },
+    "node_modules/base58-js": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/base58-js/-/base58-js-1.0.5.tgz",
+      "integrity": "sha512-LkkAPP8Zu+c0SVNRTRVDyMfKVORThX+rCViget00xdgLRrKkClCTz1T7cIrpr69ShwV5XJuuoZvMvJ43yURwkA==",
+      "engines": {
+        "node": ">= 8"
+      }
+    },
+    "node_modules/base64-js": {
+      "version": "1.5.1",
+      "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.5.1.tgz",
+      "integrity": "sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==",
       "funding": [
         {
           "type": "github",
@@ -3620,1427 +4072,1529 @@
           "type": "consulting",
           "url": "https://feross.org/support"
         }
-      ],
-      "license": "MIT",
-      "dependencies": {
-        "base64-js": "^1.3.1",
-        "ieee754": "^1.2.1"
-      }
+      ]
     },
-    "node_modules/buffer-equals": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/buffer-equals/-/buffer-equals-1.0.4.tgz",
-      "integrity": "sha512-99MsCq0j5+RhubVEtKQgKaD6EM+UP3xJgIvQqwJ3SOLDUekzxMX1ylXBng+Wa2sh7mGT0W6RUly8ojjr1Tt6nA==",
+    "node_modules/base64-loader": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/base64-loader/-/base64-loader-1.0.0.tgz",
+      "integrity": "sha512-p32+F8dg+ANGx7s8QsZS74ZPHfIycmC2yZcoerzFgbersIYWitPbbF39G6SBx3gyvzyLH5nt1ooocxr0IHuWKA==",
+      "dev": true
+    },
+    "node_modules/base64url": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/base64url/-/base64url-3.0.1.tgz",
+      "integrity": "sha512-ir1UPr3dkwexU7FdV8qBBbNDRUhMmIekYMFZfi+C/sLNnRESKPl23nB9b2pltqfOQNnGzsDdId90AEtG5tCx4A==",
       "engines": {
-        "node": ">=0.10.0"
+        "node": ">=6.0.0"
       }
     },
-    "node_modules/buffer-from": {
-      "version": "1.1.2",
-      "dev": true,
-      "license": "MIT"
+    "node_modules/batch": {
+      "version": "0.6.1",
+      "resolved": "https://registry.npmjs.org/batch/-/batch-0.6.1.tgz",
+      "integrity": "sha512-x+VAiMRL6UPkx+kudNvxTl6hB2XNNCG2r+7wixVfIYwu/2HKRXimwQyaumLjMveWvT2Hkd/cAJw+QBMfJ/EKVw==",
+      "dev": true
     },
-    "node_modules/buffer-xor": {
-      "version": "1.0.3",
-      "license": "MIT"
+    "node_modules/bech32": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/bech32/-/bech32-2.0.0.tgz",
+      "integrity": "sha512-LcknSilhIGatDAsY1ak2I8VtGaHNhgMSYVxFrGLXv+xLHytaKZKcaUJJUE7qmBr7h33o5YQwP55pMI0xmkpJwg=="
     },
-    "node_modules/bytes": {
-      "version": "3.0.0",
+    "node_modules/big-integer": {
+      "version": "1.6.51",
+      "resolved": "https://registry.npmjs.org/big-integer/-/big-integer-1.6.51.tgz",
+      "integrity": "sha512-GPEid2Y9QU1Exl1rpO9B2IPJGHPSupF5GnVIP0blYvNOMer2bTvSWs1jGOUg04hTmu67nmLsQ9TBo1puaotBHg==",
+      "engines": {
+        "node": ">=0.6"
+      }
+    },
+    "node_modules/big.js": {
+      "version": "5.2.2",
+      "resolved": "https://registry.npmjs.org/big.js/-/big.js-5.2.2.tgz",
+      "integrity": "sha512-vyL2OymJxmarO8gxMr0mhChsO9QGwhynfuu4+MHTAW6czfq9humCB7rKpUjDd9YUiDPU4mzpyupFSvOClAwbmQ==",
       "dev": true,
-      "license": "MIT",
       "engines": {
-        "node": ">= 0.8"
+        "node": "*"
       }
     },
-    "node_modules/c32check": {
-      "version": "2.0.0",
-      "license": "MIT",
-      "dependencies": {
-        "@noble/hashes": "^1.1.2",
-        "base-x": "^4.0.0"
-      },
+    "node_modules/bignumber.js": {
+      "version": "9.1.1",
+      "resolved": "https://registry.npmjs.org/bignumber.js/-/bignumber.js-9.1.1.tgz",
+      "integrity": "sha512-pHm4LsMJ6lzgNGVfZHjMoO8sdoRhOzOH4MLmY65Jg70bpxCKu5iOHNJyfF6OyvYw7t8Fpf35RuzUyqnQsj8Vig==",
       "engines": {
-        "node": ">=8"
+        "node": "*"
       }
     },
-    "node_modules/cac": {
-      "version": "6.7.14",
+    "node_modules/binary-extensions": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.2.0.tgz",
+      "integrity": "sha512-jDctJ/IVQbZoJykoeHbhXpOlNBqGNcwXJKJog42E5HDPUwQTSdjCHdihjj0DlnheQ7blbT6dHOafNAiS8ooQKA==",
       "dev": true,
-      "license": "MIT",
       "engines": {
         "node": ">=8"
       }
     },
-    "node_modules/call-bind": {
-      "version": "1.0.7",
-      "license": "MIT",
+    "node_modules/bindings": {
+      "version": "1.5.0",
+      "resolved": "https://registry.npmjs.org/bindings/-/bindings-1.5.0.tgz",
+      "integrity": "sha512-p2q/t/mhvuOj/UeLlV6566GD/guowlr0hHxClI0W9m7MWYkL1F0hLo+0Aexs9HSPCtR1SXQ0TD3MMKrXZajbiQ==",
       "dependencies": {
-        "es-define-property": "^1.0.0",
-        "es-errors": "^1.3.0",
-        "function-bind": "^1.1.2",
-        "get-intrinsic": "^1.2.4",
-        "set-function-length": "^1.2.1"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
+        "file-uri-to-path": "1.0.0"
       }
     },
-    "node_modules/callsites": {
-      "version": "3.1.0",
-      "dev": true,
-      "license": "MIT",
+    "node_modules/bip174": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/bip174/-/bip174-2.1.1.tgz",
+      "integrity": "sha512-mdFV5+/v0XyNYXjBS6CQPLo9ekCx4gtKZFnJm5PMto7Fs9hTTDpkkzOB7/FtluRI6JbUUAu+snTYfJRgHLZbZQ==",
       "engines": {
-        "node": ">=6"
+        "node": ">=8.0.0"
       }
     },
-    "node_modules/camel-case": {
-      "version": "4.1.2",
-      "dev": true,
-      "license": "MIT",
+    "node_modules/bip32": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/bip32/-/bip32-4.0.0.tgz",
+      "integrity": "sha512-aOGy88DDlVUhspIXJN+dVEtclhIsfAUppD43V0j40cPTld3pv/0X/MlrZSZ6jowIaQQzFwP8M6rFU2z2mVYjDQ==",
       "dependencies": {
-        "pascal-case": "^3.1.2",
-        "tslib": "^2.0.3"
-      }
-    },
-    "node_modules/camelize": {
-      "version": "1.0.1",
-      "license": "MIT",
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
+        "@noble/hashes": "^1.2.0",
+        "@scure/base": "^1.1.1",
+        "typeforce": "^1.11.5",
+        "wif": "^2.0.6"
+      },
+      "engines": {
+        "node": ">=6.0.0"
       }
     },
-    "node_modules/caniuse-lite": {
-      "version": "1.0.30001559",
-      "funding": [
-        {
-          "type": "opencollective",
-          "url": "https://opencollective.com/browserslist"
-        },
-        {
-          "type": "tidelift",
-          "url": "https://tidelift.com/funding/github/npm/caniuse-lite"
-        },
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/ai"
-        }
-      ],
-      "license": "CC-BY-4.0"
+    "node_modules/bip32-path": {
+      "version": "0.4.2",
+      "resolved": "https://registry.npmjs.org/bip32-path/-/bip32-path-0.4.2.tgz",
+      "integrity": "sha512-ZBMCELjJfcNMkz5bDuJ1WrYvjlhEF5k6mQ8vUr4N7MbVRsXei7ZOg8VhhwMfNiW68NWmLkgkc6WvTickrLGprQ=="
     },
-    "node_modules/chai": {
-      "version": "4.3.10",
-      "dev": true,
-      "license": "MIT",
+    "node_modules/bip39": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/bip39/-/bip39-3.1.0.tgz",
+      "integrity": "sha512-c9kiwdk45Do5GL0vJMe7tS95VjCii65mYAH7DfWl3uW8AVzXKQVUm64i3hzVybBDMp9r7j9iNxR85+ul8MdN/A==",
       "dependencies": {
-        "assertion-error": "^1.1.0",
-        "check-error": "^1.0.3",
-        "deep-eql": "^4.1.3",
-        "get-func-name": "^2.0.2",
-        "loupe": "^2.3.6",
-        "pathval": "^1.1.1",
-        "type-detect": "^4.0.8"
-      },
-      "engines": {
-        "node": ">=4"
+        "@noble/hashes": "^1.2.0"
       }
     },
-    "node_modules/chalk": {
-      "version": "2.4.2",
-      "license": "MIT",
+    "node_modules/bip66": {
+      "version": "1.1.5",
+      "resolved": "https://registry.npmjs.org/bip66/-/bip66-1.1.5.tgz",
+      "integrity": "sha512-nemMHz95EmS38a26XbbdxIYj5csHd3RMP3H5bwQknX0WYHF01qhpufP42mLOwVICuH2JmhIhXiWs89MfUGL7Xw==",
       "dependencies": {
-        "ansi-styles": "^3.2.1",
-        "escape-string-regexp": "^1.0.5",
-        "supports-color": "^5.3.0"
-      },
-      "engines": {
-        "node": ">=4"
+        "safe-buffer": "^5.0.1"
       }
     },
-    "node_modules/check-error": {
-      "version": "1.0.3",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "get-func-name": "^2.0.2"
-      },
+    "node_modules/bip68": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/bip68/-/bip68-1.0.4.tgz",
+      "integrity": "sha512-O1htyufFTYy3EO0JkHg2CLykdXEtV2ssqw47Gq9A0WByp662xpJnMEB9m43LZjsSDjIAOozWRExlFQk2hlV1XQ==",
       "engines": {
-        "node": "*"
+        "node": ">=4.5.0"
       }
     },
-    "node_modules/chokidar": {
-      "version": "3.5.3",
-      "dev": true,
-      "funding": [
-        {
-          "type": "individual",
-          "url": "https://paulmillr.com/funding/"
-        }
-      ],
-      "license": "MIT",
+    "node_modules/bitcoin-address-validation": {
+      "version": "2.2.3",
+      "resolved": "https://registry.npmjs.org/bitcoin-address-validation/-/bitcoin-address-validation-2.2.3.tgz",
+      "integrity": "sha512-1uGCGl26Ye8JG5qcExtFLQfuib6qEZWNDo1ZlLlwp/z7ygUFby3IxolgEfgMGaC+LG9csbVASLcH8fRLv7DIOg==",
       "dependencies": {
-        "anymatch": "~3.1.2",
-        "braces": "~3.0.2",
-        "glob-parent": "~5.1.2",
-        "is-binary-path": "~2.1.0",
-        "is-glob": "~4.0.1",
-        "normalize-path": "~3.0.0",
-        "readdirp": "~3.6.0"
-      },
-      "engines": {
-        "node": ">= 8.10.0"
-      },
-      "optionalDependencies": {
-        "fsevents": "~2.3.2"
+        "base58-js": "^1.0.0",
+        "bech32": "^2.0.0",
+        "sha256-uint8array": "^0.10.3"
       }
     },
-    "node_modules/chokidar/node_modules/glob-parent": {
-      "version": "5.1.2",
-      "dev": true,
-      "license": "ISC",
+    "node_modules/bitcoinjs-lib": {
+      "version": "6.1.6",
+      "resolved": "https://registry.npmjs.org/bitcoinjs-lib/-/bitcoinjs-lib-6.1.6.tgz",
+      "integrity": "sha512-Fk8+Vc+e2rMoDU5gXkW9tD+313rhkm5h6N9HfZxXvYU9LedttVvmXKTgd9k5rsQJjkSfsv6XRM8uhJv94SrvcA==",
       "dependencies": {
-        "is-glob": "^4.0.1"
+        "@noble/hashes": "^1.2.0",
+        "bech32": "^2.0.0",
+        "bip174": "^2.1.1",
+        "bs58check": "^3.0.1",
+        "typeforce": "^1.11.3",
+        "varuint-bitcoin": "^1.1.2"
       },
       "engines": {
-        "node": ">= 6"
+        "node": ">=8.0.0"
       }
     },
-    "node_modules/chrome-trace-event": {
-      "version": "1.0.3",
-      "dev": true,
-      "license": "MIT",
+    "node_modules/bitcoinjs-message": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/bitcoinjs-message/-/bitcoinjs-message-2.2.0.tgz",
+      "integrity": "sha512-103Wy3xg8Y9o+pdhGP4M3/mtQQuUWs6sPuOp1mYphSUoSMHjHTlkj32K4zxU8qMH0Ckv23emfkGlFWtoWZ7YFA==",
+      "dependencies": {
+        "bech32": "^1.1.3",
+        "bs58check": "^2.1.2",
+        "buffer-equals": "^1.0.3",
+        "create-hash": "^1.1.2",
+        "secp256k1": "^3.0.1",
+        "varuint-bitcoin": "^1.0.1"
+      },
       "engines": {
-        "node": ">=6.0"
+        "node": ">=0.10"
       }
     },
-    "node_modules/cipher-base": {
-      "version": "1.0.4",
-      "license": "MIT",
+    "node_modules/bitcoinjs-message/node_modules/base-x": {
+      "version": "3.0.10",
+      "resolved": "https://registry.npmjs.org/base-x/-/base-x-3.0.10.tgz",
+      "integrity": "sha512-7d0s06rR9rYaIWHkpfLIFICM/tkSVdoPC9qYAQRpxn9DdKNWNsKC0uk++akckyLq16Tx2WIinnZ6WRriAt6njQ==",
       "dependencies": {
-        "inherits": "^2.0.1",
         "safe-buffer": "^5.0.1"
       }
     },
-    "node_modules/clarity-codegen": {
-      "version": "0.3.6",
-      "license": "MIT",
+    "node_modules/bitcoinjs-message/node_modules/bech32": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/bech32/-/bech32-1.1.4.tgz",
+      "integrity": "sha512-s0IrSOzLlbvX7yp4WBfPITzpAU8sqQcpsmwXDiKwrG4r491vwCO/XpejasRNl0piBMe/DvP4Tz0mIS/X1DPJBQ=="
+    },
+    "node_modules/bitcoinjs-message/node_modules/bs58": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/bs58/-/bs58-4.0.1.tgz",
+      "integrity": "sha512-Ok3Wdf5vOIlBrgCvTq96gBkJw+JUEzdBgyaza5HLtPm7yTHkjRy8+JzNyHF7BHa0bNWOQIp3m5YF0nnFcOIKLw==",
       "dependencies": {
-        "@stacks/stacks-blockchain-api-types": "^7.1.10",
-        "axios": "^1.5.0",
-        "lodash": "^4.17.21",
-        "yargs": "^17.7.2",
-        "yqueue": "^1.0.1"
-      },
-      "bin": {
-        "clarity-codegen": "lib/generate/cli.js"
-      },
-      "peerDependencies": {
-        "@stacks/transactions": "*"
+        "base-x": "^3.0.2"
       }
     },
-    "node_modules/clarity-codegen/node_modules/@stacks/stacks-blockchain-api-types": {
-      "version": "7.9.0",
-      "license": "ISC"
+    "node_modules/bitcoinjs-message/node_modules/bs58check": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/bs58check/-/bs58check-2.1.2.tgz",
+      "integrity": "sha512-0TS1jicxdU09dwJMNZtVAfzPi6Q6QeN0pM1Fkzrjn+XYHvzMKPU3pHVpva+769iNVSfIYWf7LJ6WR+BuuMf8cA==",
+      "dependencies": {
+        "bs58": "^4.0.0",
+        "create-hash": "^1.1.0",
+        "safe-buffer": "^5.1.2"
+      }
     },
-    "node_modules/classnames": {
-      "version": "2.3.2",
-      "license": "MIT"
+    "node_modules/bn.js": {
+      "version": "5.2.1",
+      "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-5.2.1.tgz",
+      "integrity": "sha512-eXRvHzWyYPBuB4NBy0cmYQjGitUrtqwbvlzP3G6VFnNRbsZQIxQ10PbKKHt8gZ/HW/D/747aDl+QkDqg3KQLMQ=="
     },
-    "node_modules/clean-css": {
-      "version": "5.3.2",
+    "node_modules/body-parser": {
+      "version": "1.20.1",
+      "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.20.1.tgz",
+      "integrity": "sha512-jWi7abTbYwajOytWCQc37VulmWiRae5RyTpaCyDcS5/lMdtwSz5lOpDE67srw/HYe35f1z3fDQw+3txg7gNtWw==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "source-map": "~0.6.0"
+        "bytes": "3.1.2",
+        "content-type": "~1.0.4",
+        "debug": "2.6.9",
+        "depd": "2.0.0",
+        "destroy": "1.2.0",
+        "http-errors": "2.0.0",
+        "iconv-lite": "0.4.24",
+        "on-finished": "2.4.1",
+        "qs": "6.11.0",
+        "raw-body": "2.5.1",
+        "type-is": "~1.6.18",
+        "unpipe": "1.0.0"
       },
       "engines": {
-        "node": ">= 10.0"
+        "node": ">= 0.8",
+        "npm": "1.2.8000 || >= 1.4.16"
       }
     },
-    "node_modules/clean-css/node_modules/source-map": {
-      "version": "0.6.1",
+    "node_modules/body-parser/node_modules/bytes": {
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.1.2.tgz",
+      "integrity": "sha512-/Nf7TyzTx6S3yRJObOAV7956r8cr2+Oj8AC5dt8wSP3BQAoeX58NoHyCU8P8zGkNXStjTSi6fzO6F0pBdcYbEg==",
       "dev": true,
-      "license": "BSD-3-Clause",
       "engines": {
-        "node": ">=0.10.0"
+        "node": ">= 0.8"
       }
     },
-    "node_modules/clean-stack": {
-      "version": "2.2.0",
+    "node_modules/body-parser/node_modules/debug": {
+      "version": "2.6.9",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+      "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
       "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=6"
+      "dependencies": {
+        "ms": "2.0.0"
       }
     },
-    "node_modules/clean-webpack-plugin": {
-      "version": "4.0.0",
+    "node_modules/body-parser/node_modules/iconv-lite": {
+      "version": "0.4.24",
+      "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz",
+      "integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "del": "^4.1.1"
+        "safer-buffer": ">= 2.1.2 < 3"
       },
       "engines": {
-        "node": ">=10.0.0"
-      },
-      "peerDependencies": {
-        "webpack": ">=4.0.0 <6.0.0"
+        "node": ">=0.10.0"
       }
     },
-    "node_modules/cli-cursor": {
-      "version": "3.1.0",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "restore-cursor": "^3.1.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
+    "node_modules/body-parser/node_modules/ms": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+      "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==",
+      "dev": true
     },
-    "node_modules/cli-truncate": {
-      "version": "3.1.0",
+    "node_modules/body-parser/node_modules/qs": {
+      "version": "6.11.0",
+      "resolved": "https://registry.npmjs.org/qs/-/qs-6.11.0.tgz",
+      "integrity": "sha512-MvjoMCJwEarSbUYk5O+nmoSzSutSsTwF85zcHPQ9OrlFoZOYIjaqBAJIqIXjptyD5vThxGq52Xu/MaJzRkIk4Q==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "slice-ansi": "^5.0.0",
-        "string-width": "^5.0.0"
+        "side-channel": "^1.0.4"
       },
       "engines": {
-        "node": "^12.20.0 || ^14.13.1 || >=16.0.0"
+        "node": ">=0.6"
       },
       "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
+        "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/cliui": {
-      "version": "8.0.1",
-      "license": "ISC",
+    "node_modules/bonjour-service": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/bonjour-service/-/bonjour-service-1.1.1.tgz",
+      "integrity": "sha512-Z/5lQRMOG9k7W+FkeGTNjh7htqn/2LMnfOvBZ8pynNZCM9MwkQkI3zeI4oz09uWdcgmgHugVvBqxGg4VQJ5PCg==",
+      "dev": true,
       "dependencies": {
-        "string-width": "^4.2.0",
-        "strip-ansi": "^6.0.1",
-        "wrap-ansi": "^7.0.0"
-      },
-      "engines": {
-        "node": ">=12"
+        "array-flatten": "^2.1.2",
+        "dns-equal": "^1.0.0",
+        "fast-deep-equal": "^3.1.3",
+        "multicast-dns": "^7.2.5"
       }
     },
-    "node_modules/cliui/node_modules/emoji-regex": {
-      "version": "8.0.0",
-      "license": "MIT"
+    "node_modules/boolbase": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/boolbase/-/boolbase-1.0.0.tgz",
+      "integrity": "sha512-JZOSA7Mo9sNGB8+UjSgzdLtokWAky1zbztM3WRLCbZ70/3cTANmQmOdR7y2g+J0e2WXywy1yS468tY+IruqEww==",
+      "dev": true
     },
-    "node_modules/cliui/node_modules/is-fullwidth-code-point": {
-      "version": "3.0.0",
-      "license": "MIT",
-      "engines": {
-        "node": ">=8"
+    "node_modules/brace-expansion": {
+      "version": "1.1.11",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
+      "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
+      "dependencies": {
+        "balanced-match": "^1.0.0",
+        "concat-map": "0.0.1"
       }
     },
-    "node_modules/cliui/node_modules/string-width": {
-      "version": "4.2.3",
-      "license": "MIT",
+    "node_modules/braces": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz",
+      "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==",
+      "dev": true,
       "dependencies": {
-        "emoji-regex": "^8.0.0",
-        "is-fullwidth-code-point": "^3.0.0",
-        "strip-ansi": "^6.0.1"
+        "fill-range": "^7.0.1"
       },
       "engines": {
         "node": ">=8"
       }
     },
-    "node_modules/clone": {
-      "version": "1.0.4",
+    "node_modules/broadcast-channel": {
+      "version": "2.3.4",
+      "resolved": "https://registry.npmjs.org/broadcast-channel/-/broadcast-channel-2.3.4.tgz",
+      "integrity": "sha512-cx1/dSb6KZ9HW1VtlqM/HLPjrdyzkKoteVmUpLXEpra00mDQW/F9ieDkoavuZMoh9/hC/6OplGzCERsZBfz/Wg==",
       "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "engines": {
-        "node": ">=0.8"
-      }
-    },
-    "node_modules/clsx": {
-      "version": "2.0.0",
-      "license": "MIT",
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/color-convert": {
-      "version": "1.9.3",
-      "license": "MIT",
       "dependencies": {
-        "color-name": "1.1.3"
+        "@babel/runtime": "^7.6.2",
+        "detect-node": "^2.0.4",
+        "js-sha3": "0.8.0",
+        "microseconds": "0.1.0",
+        "nano-time": "1.0.0",
+        "rimraf": "2.6.3",
+        "unload": "2.2.0"
       }
     },
-    "node_modules/color-name": {
-      "version": "1.1.3",
-      "license": "MIT"
-    },
-    "node_modules/colorette": {
-      "version": "2.0.20",
+    "node_modules/broadcast-channel/node_modules/rimraf": {
+      "version": "2.6.3",
+      "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.6.3.tgz",
+      "integrity": "sha512-mwqeW5XsA2qAejG46gYdENaxXjx9onRNCfn7L0duuP4hCuTIi/QO7PDK07KJfp1d+izWPrzEJDcSqBa0OZQriA==",
       "dev": true,
-      "license": "MIT"
+      "dependencies": {
+        "glob": "^7.1.3"
+      },
+      "bin": {
+        "rimraf": "bin.js"
+      }
     },
-    "node_modules/colornames": {
-      "version": "1.1.1",
-      "license": "MIT"
+    "node_modules/brorand": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/brorand/-/brorand-1.1.0.tgz",
+      "integrity": "sha512-cKV8tMCEpQs4hK/ik71d6LrPOnpkpGBR0wzxqr68g2m/LB2GxVYQroAjMJZRVM1Y4BCjCKc3vAamxSzOY2RP+w=="
     },
-    "node_modules/combined-stream": {
-      "version": "1.0.8",
-      "license": "MIT",
+    "node_modules/browserify-aes": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/browserify-aes/-/browserify-aes-1.2.0.tgz",
+      "integrity": "sha512-+7CHXqGuspUn/Sl5aO7Ea0xWGAtETPXNSAjHo48JfLdPWcMng33Xe4znFvQweqc/uzk5zSOI3H52CYnjCfb5hA==",
       "dependencies": {
-        "delayed-stream": "~1.0.0"
-      },
-      "engines": {
-        "node": ">= 0.8"
+        "buffer-xor": "^1.0.3",
+        "cipher-base": "^1.0.0",
+        "create-hash": "^1.1.0",
+        "evp_bytestokey": "^1.0.3",
+        "inherits": "^2.0.1",
+        "safe-buffer": "^5.0.1"
       }
     },
-    "node_modules/commander": {
-      "version": "10.0.1",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=14"
+    "node_modules/browserify-cipher": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/browserify-cipher/-/browserify-cipher-1.0.1.tgz",
+      "integrity": "sha512-sPhkz0ARKbf4rRQt2hTpAHqn47X3llLkUGn+xEJzLjwY8LRs2p0v7ljvI5EyoRO/mexrNunNECisZs+gw2zz1w==",
+      "dependencies": {
+        "browserify-aes": "^1.0.4",
+        "browserify-des": "^1.0.0",
+        "evp_bytestokey": "^1.0.0"
       }
     },
-    "node_modules/common-path-prefix": {
-      "version": "3.0.0",
-      "dev": true,
-      "license": "ISC"
+    "node_modules/browserify-des": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/browserify-des/-/browserify-des-1.0.2.tgz",
+      "integrity": "sha512-BioO1xf3hFwz4kc6iBhI3ieDFompMhrMlnDFC4/0/vd5MokpuAc3R+LYbwTA9A5Yc9pq9UYPqffKpW2ObuwX5A==",
+      "dependencies": {
+        "cipher-base": "^1.0.1",
+        "des.js": "^1.0.0",
+        "inherits": "^2.0.1",
+        "safe-buffer": "^5.1.2"
+      }
     },
-    "node_modules/compose-function": {
-      "version": "3.0.3",
-      "dev": true,
-      "license": "MIT",
+    "node_modules/browserify-rsa": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/browserify-rsa/-/browserify-rsa-4.1.0.tgz",
+      "integrity": "sha512-AdEER0Hkspgno2aR97SAf6vi0y0k8NuOpGnVH3O99rcA5Q6sh8QxcngtHuJ6uXwnfAXNM4Gn1Gb7/MV1+Ymbog==",
       "dependencies": {
-        "arity-n": "^1.0.4"
+        "bn.js": "^5.0.0",
+        "randombytes": "^2.0.1"
       }
     },
-    "node_modules/compressible": {
-      "version": "2.0.18",
-      "dev": true,
-      "license": "MIT",
+    "node_modules/browserify-sign": {
+      "version": "4.2.2",
+      "resolved": "https://registry.npmjs.org/browserify-sign/-/browserify-sign-4.2.2.tgz",
+      "integrity": "sha512-1rudGyeYY42Dk6texmv7c4VcQ0EsvVbLwZkA+AQB7SxvXxmcD93jcHie8bzecJ+ChDlmAm2Qyu0+Ccg5uhZXCg==",
       "dependencies": {
-        "mime-db": ">= 1.43.0 < 2"
+        "bn.js": "^5.2.1",
+        "browserify-rsa": "^4.1.0",
+        "create-hash": "^1.2.0",
+        "create-hmac": "^1.1.7",
+        "elliptic": "^6.5.4",
+        "inherits": "^2.0.4",
+        "parse-asn1": "^5.1.6",
+        "readable-stream": "^3.6.2",
+        "safe-buffer": "^5.2.1"
       },
       "engines": {
-        "node": ">= 0.6"
+        "node": ">= 4"
       }
     },
-    "node_modules/compression": {
-      "version": "1.7.4",
-      "dev": true,
-      "license": "MIT",
+    "node_modules/browserslist": {
+      "version": "4.22.1",
+      "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.22.1.tgz",
+      "integrity": "sha512-FEVc202+2iuClEhZhrWy6ZiAcRLvNMyYcxZ8raemul1DYVOVdFsbqckWLdsixQZCpJlwe77Z3UTalE7jsjnKfQ==",
+      "funding": [
+        {
+          "type": "opencollective",
+          "url": "https://opencollective.com/browserslist"
+        },
+        {
+          "type": "tidelift",
+          "url": "https://tidelift.com/funding/github/npm/browserslist"
+        },
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/ai"
+        }
+      ],
       "dependencies": {
-        "accepts": "~1.3.5",
-        "bytes": "3.0.0",
-        "compressible": "~2.0.16",
-        "debug": "2.6.9",
-        "on-headers": "~1.0.2",
-        "safe-buffer": "5.1.2",
-        "vary": "~1.1.2"
+        "caniuse-lite": "^1.0.30001541",
+        "electron-to-chromium": "^1.4.535",
+        "node-releases": "^2.0.13",
+        "update-browserslist-db": "^1.0.13"
+      },
+      "bin": {
+        "browserslist": "cli.js"
       },
       "engines": {
-        "node": ">= 0.8.0"
+        "node": "^6 || ^7 || ^8 || ^9 || ^10 || ^11 || ^12 || >=13.7"
       }
     },
-    "node_modules/compression/node_modules/debug": {
-      "version": "2.6.9",
-      "dev": true,
-      "license": "MIT",
+    "node_modules/bs58": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/bs58/-/bs58-5.0.0.tgz",
+      "integrity": "sha512-r+ihvQJvahgYT50JD05dyJNKlmmSlMoOGwn1lCcEzanPglg7TxYjioQUYehQ9mAR/+hOSd2jRc/Z2y5UxBymvQ==",
       "dependencies": {
-        "ms": "2.0.0"
+        "base-x": "^4.0.0"
       }
     },
-    "node_modules/compression/node_modules/ms": {
-      "version": "2.0.0",
-      "dev": true,
-      "license": "MIT"
-    },
-    "node_modules/compression/node_modules/safe-buffer": {
-      "version": "5.1.2",
-      "dev": true,
-      "license": "MIT"
-    },
-    "node_modules/concat-map": {
-      "version": "0.0.1",
-      "license": "MIT"
+    "node_modules/bs58check": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/bs58check/-/bs58check-3.0.1.tgz",
+      "integrity": "sha512-hjuuJvoWEybo7Hn/0xOrczQKKEKD63WguEjlhLExYs2wUBcebDC1jDNK17eEAD2lYfw82d5ASC1d7K3SWszjaQ==",
+      "dependencies": {
+        "@noble/hashes": "^1.2.0",
+        "bs58": "^5.0.0"
+      }
     },
-    "node_modules/confusing-browser-globals": {
-      "version": "1.0.11",
-      "dev": true,
-      "license": "MIT"
+    "node_modules/buffer": {
+      "version": "6.0.3",
+      "resolved": "https://registry.npmjs.org/buffer/-/buffer-6.0.3.tgz",
+      "integrity": "sha512-FTiCpNxtwiZZHEZbcbTIcZjERVICn9yq/pDFkTl95/AxzD1naBctN7YO68riM/gLSDY7sdrMby8hofADYuuqOA==",
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/feross"
+        },
+        {
+          "type": "patreon",
+          "url": "https://www.patreon.com/feross"
+        },
+        {
+          "type": "consulting",
+          "url": "https://feross.org/support"
+        }
+      ],
+      "dependencies": {
+        "base64-js": "^1.3.1",
+        "ieee754": "^1.2.1"
+      }
     },
-    "node_modules/connect-history-api-fallback": {
-      "version": "2.0.0",
-      "dev": true,
-      "license": "MIT",
+    "node_modules/buffer-equals": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/buffer-equals/-/buffer-equals-1.0.4.tgz",
+      "integrity": "sha512-99MsCq0j5+RhubVEtKQgKaD6EM+UP3xJgIvQqwJ3SOLDUekzxMX1ylXBng+Wa2sh7mGT0W6RUly8ojjr1Tt6nA==",
       "engines": {
-        "node": ">=0.8"
+        "node": ">=0.10.0"
       }
     },
-    "node_modules/content-disposition": {
-      "version": "0.5.4",
+    "node_modules/buffer-from": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.2.tgz",
+      "integrity": "sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ==",
+      "dev": true
+    },
+    "node_modules/buffer-xor": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/buffer-xor/-/buffer-xor-1.0.3.tgz",
+      "integrity": "sha512-571s0T7nZWK6vB67HI5dyUF7wXiNcfaPPPTl6zYCNApANjIvYJTg7hlud/+cJpdAhS7dVzqMLmfhfHR3rAcOjQ=="
+    },
+    "node_modules/bytes": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.0.0.tgz",
+      "integrity": "sha512-pMhOfFDPiv9t5jjIXkHosWmkSyQbvsgEVNkz0ERHbuLh2T/7j4Mqqpz523Fe8MVY89KC6Sh/QfS2sM+SjgFDcw==",
       "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "safe-buffer": "5.2.1"
-      },
       "engines": {
-        "node": ">= 0.6"
+        "node": ">= 0.8"
       }
     },
-    "node_modules/content-type": {
-      "version": "1.0.5",
-      "dev": true,
-      "license": "MIT",
+    "node_modules/c32check": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/c32check/-/c32check-2.0.0.tgz",
+      "integrity": "sha512-rpwfAcS/CMqo0oCqDf3r9eeLgScRE3l/xHDCXhM3UyrfvIn7PrLq63uHh7yYbv8NzaZn5MVsVhIRpQ+5GZ5HyA==",
+      "dependencies": {
+        "@noble/hashes": "^1.1.2",
+        "base-x": "^4.0.0"
+      },
       "engines": {
-        "node": ">= 0.6"
+        "node": ">=8"
       }
     },
-    "node_modules/cookie": {
-      "version": "0.5.0",
+    "node_modules/cac": {
+      "version": "6.7.14",
+      "resolved": "https://registry.npmjs.org/cac/-/cac-6.7.14.tgz",
+      "integrity": "sha512-b6Ilus+c3RrdDk+JhLKUAQfzzgLEPy6wcXqS7f/xe1EETvsDP6GORG7SFuOs6cID5YkqchW/LXZbX5bc8j7ZcQ==",
       "dev": true,
-      "license": "MIT",
       "engines": {
-        "node": ">= 0.6"
+        "node": ">=8"
       }
     },
-    "node_modules/cookie-signature": {
-      "version": "1.0.6",
-      "dev": true,
-      "license": "MIT"
-    },
-    "node_modules/copy-anything": {
-      "version": "3.0.5",
-      "license": "MIT",
+    "node_modules/call-bind": {
+      "version": "1.0.7",
+      "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.7.tgz",
+      "integrity": "sha512-GHTSNSYICQ7scH7sZ+M2rFopRoLh8t2bLSW6BbgrtLsahOIB5iyAVJf9GjWK3cYTDaMj4XdBpM1cA6pIS0Kv2w==",
       "dependencies": {
-        "is-what": "^4.1.8"
+        "es-define-property": "^1.0.0",
+        "es-errors": "^1.3.0",
+        "function-bind": "^1.1.2",
+        "get-intrinsic": "^1.2.4",
+        "set-function-length": "^1.2.1"
       },
       "engines": {
-        "node": ">=12.13"
+        "node": ">= 0.4"
       },
       "funding": {
-        "url": "https://github.com/sponsors/mesqueeb"
+        "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/copy-webpack-plugin": {
-      "version": "11.0.0",
+    "node_modules/callsites": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz",
+      "integrity": "sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==",
       "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "fast-glob": "^3.2.11",
-        "glob-parent": "^6.0.1",
-        "globby": "^13.1.1",
-        "normalize-path": "^3.0.0",
-        "schema-utils": "^4.0.0",
-        "serialize-javascript": "^6.0.0"
-      },
       "engines": {
-        "node": ">= 14.15.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/webpack"
-      },
-      "peerDependencies": {
-        "webpack": "^5.1.0"
+        "node": ">=6"
       }
     },
-    "node_modules/copy-webpack-plugin/node_modules/ajv": {
-      "version": "8.12.0",
+    "node_modules/camel-case": {
+      "version": "4.1.2",
+      "resolved": "https://registry.npmjs.org/camel-case/-/camel-case-4.1.2.tgz",
+      "integrity": "sha512-gxGWBrTT1JuMx6R+o5PTXMmUnhnVzLQ9SNutD4YqKtI6ap897t3tKECYla6gCWEkplXnlNybEkZg9GEGxKFCgw==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "fast-deep-equal": "^3.1.1",
-        "json-schema-traverse": "^1.0.0",
-        "require-from-string": "^2.0.2",
-        "uri-js": "^4.2.2"
-      },
+        "pascal-case": "^3.1.2",
+        "tslib": "^2.0.3"
+      }
+    },
+    "node_modules/camelize": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/camelize/-/camelize-1.0.1.tgz",
+      "integrity": "sha512-dU+Tx2fsypxTgtLoE36npi3UqcjSSMNYfkqgmoEhtZrraP5VWq0K7FkWVTYa8eMPtnU/G2txVsfdCJTn9uzpuQ==",
       "funding": {
-        "type": "github",
-        "url": "https://github.com/sponsors/epoberezkin"
+        "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/copy-webpack-plugin/node_modules/ajv-keywords": {
-      "version": "5.1.0",
+    "node_modules/caniuse-lite": {
+      "version": "1.0.30001559",
+      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001559.tgz",
+      "integrity": "sha512-cPiMKZgqgkg5LY3/ntGeLFUpi6tzddBNS58A4tnTgQw1zON7u2sZMU7SzOeVH4tj20++9ggL+V6FDOFMTaFFYA==",
+      "funding": [
+        {
+          "type": "opencollective",
+          "url": "https://opencollective.com/browserslist"
+        },
+        {
+          "type": "tidelift",
+          "url": "https://tidelift.com/funding/github/npm/caniuse-lite"
+        },
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/ai"
+        }
+      ]
+    },
+    "node_modules/chai": {
+      "version": "4.3.10",
+      "resolved": "https://registry.npmjs.org/chai/-/chai-4.3.10.tgz",
+      "integrity": "sha512-0UXG04VuVbruMUYbJ6JctvH0YnC/4q3/AkT18q4NaITo91CUm0liMS9VqzT9vZhVQ/1eqPanMWjBM+Juhfb/9g==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "fast-deep-equal": "^3.1.3"
+        "assertion-error": "^1.1.0",
+        "check-error": "^1.0.3",
+        "deep-eql": "^4.1.3",
+        "get-func-name": "^2.0.2",
+        "loupe": "^2.3.6",
+        "pathval": "^1.1.1",
+        "type-detect": "^4.0.8"
       },
-      "peerDependencies": {
-        "ajv": "^8.8.2"
+      "engines": {
+        "node": ">=4"
       }
     },
-    "node_modules/copy-webpack-plugin/node_modules/globby": {
-      "version": "13.2.2",
-      "dev": true,
-      "license": "MIT",
+    "node_modules/chalk": {
+      "version": "2.4.2",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
+      "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
       "dependencies": {
-        "dir-glob": "^3.0.1",
-        "fast-glob": "^3.3.0",
-        "ignore": "^5.2.4",
-        "merge2": "^1.4.1",
-        "slash": "^4.0.0"
+        "ansi-styles": "^3.2.1",
+        "escape-string-regexp": "^1.0.5",
+        "supports-color": "^5.3.0"
       },
       "engines": {
-        "node": "^12.20.0 || ^14.13.1 || >=16.0.0"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
+        "node": ">=4"
       }
     },
-    "node_modules/copy-webpack-plugin/node_modules/json-schema-traverse": {
-      "version": "1.0.0",
-      "dev": true,
-      "license": "MIT"
-    },
-    "node_modules/copy-webpack-plugin/node_modules/schema-utils": {
-      "version": "4.2.0",
+    "node_modules/check-error": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/check-error/-/check-error-1.0.3.tgz",
+      "integrity": "sha512-iKEoDYaRmd1mxM90a2OEfWhjsjPpYPuQ+lMYsoxB126+t8fw7ySEO48nmDg5COTjxDI65/Y2OWpeEHk3ZOe8zg==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "@types/json-schema": "^7.0.9",
-        "ajv": "^8.9.0",
-        "ajv-formats": "^2.1.1",
-        "ajv-keywords": "^5.1.0"
+        "get-func-name": "^2.0.2"
       },
       "engines": {
-        "node": ">= 12.13.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/webpack"
+        "node": "*"
       }
     },
-    "node_modules/copy-webpack-plugin/node_modules/slash": {
-      "version": "4.0.0",
+    "node_modules/chokidar": {
+      "version": "3.5.3",
+      "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.5.3.tgz",
+      "integrity": "sha512-Dr3sfKRP6oTcjf2JmUmFJfeVMvXBdegxB0iVQ5eb2V10uFJUCAS8OByZdVAyVb8xXNz3GjjTgj9kLWsZTqE6kw==",
       "dev": true,
-      "license": "MIT",
+      "funding": [
+        {
+          "type": "individual",
+          "url": "https://paulmillr.com/funding/"
+        }
+      ],
+      "dependencies": {
+        "anymatch": "~3.1.2",
+        "braces": "~3.0.2",
+        "glob-parent": "~5.1.2",
+        "is-binary-path": "~2.1.0",
+        "is-glob": "~4.0.1",
+        "normalize-path": "~3.0.0",
+        "readdirp": "~3.6.0"
+      },
       "engines": {
-        "node": ">=12"
+        "node": ">= 8.10.0"
       },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
+      "optionalDependencies": {
+        "fsevents": "~2.3.2"
       }
     },
-    "node_modules/core-js": {
-      "version": "2.6.12",
-      "hasInstallScript": true,
-      "license": "MIT"
-    },
-    "node_modules/core-js-pure": {
-      "version": "3.32.0",
+    "node_modules/chokidar/node_modules/glob-parent": {
+      "version": "5.1.2",
+      "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz",
+      "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==",
       "dev": true,
-      "hasInstallScript": true,
-      "license": "MIT",
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/core-js"
+      "dependencies": {
+        "is-glob": "^4.0.1"
+      },
+      "engines": {
+        "node": ">= 6"
       }
     },
-    "node_modules/core-util-is": {
+    "node_modules/chrome-trace-event": {
       "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/chrome-trace-event/-/chrome-trace-event-1.0.3.tgz",
+      "integrity": "sha512-p3KULyQg4S7NIHixdwbGX+nFHkoBiA4YQmyWtjb8XngSKV124nJmRysgAeujbUVb15vh+RvFUfCPqU7rXk+hZg==",
       "dev": true,
-      "license": "MIT"
+      "engines": {
+        "node": ">=6.0"
+      }
     },
-    "node_modules/create-ecdh": {
-      "version": "4.0.4",
-      "license": "MIT",
-      "dependencies": {
-        "bn.js": "^4.1.0",
-        "elliptic": "^6.5.3"
-      }
-    },
-    "node_modules/create-ecdh/node_modules/bn.js": {
-      "version": "4.12.0",
-      "license": "MIT"
-    },
-    "node_modules/create-hash": {
-      "version": "1.2.0",
-      "license": "MIT",
+    "node_modules/cipher-base": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/cipher-base/-/cipher-base-1.0.4.tgz",
+      "integrity": "sha512-Kkht5ye6ZGmwv40uUDZztayT2ThLQGfnj/T71N/XzeZeo3nf8foyW7zGTsPYkEya3m5f3cAypH+qe7YOrM1U2Q==",
       "dependencies": {
-        "cipher-base": "^1.0.1",
         "inherits": "^2.0.1",
-        "md5.js": "^1.3.4",
-        "ripemd160": "^2.0.1",
-        "sha.js": "^2.4.0"
+        "safe-buffer": "^5.0.1"
       }
     },
-    "node_modules/create-hmac": {
-      "version": "1.1.7",
-      "license": "MIT",
+    "node_modules/clarity-codegen": {
+      "version": "0.3.6",
+      "resolved": "https://registry.npmjs.org/clarity-codegen/-/clarity-codegen-0.3.6.tgz",
+      "integrity": "sha512-Be1J8RFtPFGfWtQ/7enl3xkU1j2KkIS9W7RbuofIVYfKp11MCZSGQeNV+Gh0dQOQIs3O0WQLLg03ikyNaWtYzQ==",
       "dependencies": {
-        "cipher-base": "^1.0.3",
-        "create-hash": "^1.1.0",
-        "inherits": "^2.0.1",
-        "ripemd160": "^2.0.0",
-        "safe-buffer": "^5.0.1",
-        "sha.js": "^2.4.8"
+        "@stacks/stacks-blockchain-api-types": "^7.1.10",
+        "axios": "^1.5.0",
+        "lodash": "^4.17.21",
+        "yargs": "^17.7.2",
+        "yqueue": "^1.0.1"
+      },
+      "bin": {
+        "clarity-codegen": "lib/generate/cli.js"
+      },
+      "peerDependencies": {
+        "@stacks/transactions": "*"
       }
     },
-    "node_modules/cross-fetch": {
-      "version": "3.1.8",
-      "license": "MIT",
-      "dependencies": {
-        "node-fetch": "^2.6.12"
-      }
+    "node_modules/clarity-codegen/node_modules/@stacks/stacks-blockchain-api-types": {
+      "version": "7.9.0",
+      "resolved": "https://registry.npmjs.org/@stacks/stacks-blockchain-api-types/-/stacks-blockchain-api-types-7.9.0.tgz",
+      "integrity": "sha512-29tcIOxEj0jIAVrMLH2hDuTM0wWtOT4z9EnNgOCEQvipEDPyvoaPjbYJmQUTxzvVjfoLjZAQsvTlJw7fnbkkrg=="
     },
-    "node_modules/cross-sha256": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/cross-sha256/-/cross-sha256-1.2.0.tgz",
-      "integrity": "sha512-KViLNMDZKV7jwFqjFx+rNhG26amnFYYQ0S+VaFlVvpk8tM+2XbFia/don/SjGHg9WQxnFVi6z64CGPuF3T+nNw==",
-      "dependencies": {
-        "buffer": "^5.6.0"
-      }
+    "node_modules/classnames": {
+      "version": "2.3.2",
+      "resolved": "https://registry.npmjs.org/classnames/-/classnames-2.3.2.tgz",
+      "integrity": "sha512-CSbhY4cFEJRe6/GQzIk5qXZ4Jeg5pcsP7b5peFSDpffpe1cqjASH/n9UTjBwOp6XpMSTwQ8Za2K5V02ueA7Tmw=="
     },
-    "node_modules/cross-spawn": {
-      "version": "7.0.3",
+    "node_modules/clean-css": {
+      "version": "5.3.2",
+      "resolved": "https://registry.npmjs.org/clean-css/-/clean-css-5.3.2.tgz",
+      "integrity": "sha512-JVJbM+f3d3Q704rF4bqQ5UUyTtuJ0JRKNbTKVEeujCCBoMdkEi+V+e8oktO9qGQNSvHrFTM6JZRXrUvGR1czww==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "path-key": "^3.1.0",
-        "shebang-command": "^2.0.0",
-        "which": "^2.0.1"
+        "source-map": "~0.6.0"
       },
       "engines": {
-        "node": ">= 8"
+        "node": ">= 10.0"
       }
     },
-    "node_modules/crypto-browserify": {
-      "version": "3.12.0",
-      "license": "MIT",
-      "dependencies": {
-        "browserify-cipher": "^1.0.0",
-        "browserify-sign": "^4.0.0",
-        "create-ecdh": "^4.0.0",
-        "create-hash": "^1.1.0",
-        "create-hmac": "^1.1.0",
-        "diffie-hellman": "^5.0.0",
-        "inherits": "^2.0.1",
-        "pbkdf2": "^3.0.3",
-        "public-encrypt": "^4.0.0",
-        "randombytes": "^2.0.0",
-        "randomfill": "^1.0.3"
-      },
+    "node_modules/clean-css/node_modules/source-map": {
+      "version": "0.6.1",
+      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+      "dev": true,
       "engines": {
-        "node": "*"
+        "node": ">=0.10.0"
       }
     },
-    "node_modules/css-color-keywords": {
-      "version": "1.0.0",
-      "license": "ISC",
+    "node_modules/clean-stack": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/clean-stack/-/clean-stack-2.2.0.tgz",
+      "integrity": "sha512-4diC9HaTE+KRAMWhDhrGOECgWZxoevMc5TlkObMqNSsVU62PYzXZ/SMTjzyGAFF1YusgxGcSWTEXBhp0CPwQ1A==",
+      "dev": true,
       "engines": {
-        "node": ">=4"
+        "node": ">=6"
       }
     },
-    "node_modules/css-loader": {
-      "version": "6.8.1",
+    "node_modules/clean-webpack-plugin": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/clean-webpack-plugin/-/clean-webpack-plugin-4.0.0.tgz",
+      "integrity": "sha512-WuWE1nyTNAyW5T7oNyys2EN0cfP2fdRxhxnIQWiAp0bMabPdHhoGxM8A6YL2GhqwgrPnnaemVE7nv5XJ2Fhh2w==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "icss-utils": "^5.1.0",
-        "postcss": "^8.4.21",
-        "postcss-modules-extract-imports": "^3.0.0",
-        "postcss-modules-local-by-default": "^4.0.3",
-        "postcss-modules-scope": "^3.0.0",
-        "postcss-modules-values": "^4.0.0",
-        "postcss-value-parser": "^4.2.0",
-        "semver": "^7.3.8"
+        "del": "^4.1.1"
       },
       "engines": {
-        "node": ">= 12.13.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/webpack"
+        "node": ">=10.0.0"
       },
       "peerDependencies": {
-        "webpack": "^5.0.0"
+        "webpack": ">=4.0.0 <6.0.0"
       }
     },
-    "node_modules/css-loader/node_modules/lru-cache": {
-      "version": "6.0.0",
+    "node_modules/cli-cursor": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-3.1.0.tgz",
+      "integrity": "sha512-I/zHAwsKf9FqGoXM4WWRACob9+SNukZTd94DWF57E4toouRulbCxcUh6RKUEOQlYTHJnzkPMySvPNaaSLNfLZw==",
       "dev": true,
-      "license": "ISC",
       "dependencies": {
-        "yallist": "^4.0.0"
+        "restore-cursor": "^3.1.0"
       },
       "engines": {
-        "node": ">=10"
+        "node": ">=8"
       }
     },
-    "node_modules/css-loader/node_modules/semver": {
-      "version": "7.5.4",
+    "node_modules/cli-truncate": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/cli-truncate/-/cli-truncate-3.1.0.tgz",
+      "integrity": "sha512-wfOBkjXteqSnI59oPcJkcPl/ZmwvMMOj340qUIY1SKZCv0B9Cf4D4fAucRkIKQmsIuYK3x1rrgU7MeGRruiuiA==",
       "dev": true,
-      "license": "ISC",
       "dependencies": {
-        "lru-cache": "^6.0.0"
-      },
-      "bin": {
-        "semver": "bin/semver.js"
+        "slice-ansi": "^5.0.0",
+        "string-width": "^5.0.0"
       },
       "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/css-loader/node_modules/yallist": {
-      "version": "4.0.0",
-      "dev": true,
-      "license": "ISC"
-    },
-    "node_modules/css-select": {
-      "version": "4.3.0",
-      "dev": true,
-      "license": "BSD-2-Clause",
-      "dependencies": {
-        "boolbase": "^1.0.0",
-        "css-what": "^6.0.1",
-        "domhandler": "^4.3.1",
-        "domutils": "^2.8.0",
-        "nth-check": "^2.0.1"
+        "node": "^12.20.0 || ^14.13.1 || >=16.0.0"
       },
       "funding": {
-        "url": "https://github.com/sponsors/fb55"
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/css-to-react-native": {
-      "version": "3.2.0",
-      "license": "MIT",
+    "node_modules/cliui": {
+      "version": "8.0.1",
+      "resolved": "https://registry.npmjs.org/cliui/-/cliui-8.0.1.tgz",
+      "integrity": "sha512-BSeNnyus75C4//NQ9gQt1/csTXyo/8Sb+afLAkzAptFuMsod9HFokGNudZpi/oQV73hnVK+sR+5PVRMd+Dr7YQ==",
       "dependencies": {
-        "camelize": "^1.0.0",
-        "css-color-keywords": "^1.0.0",
-        "postcss-value-parser": "^4.0.2"
-      }
-    },
-    "node_modules/css-what": {
-      "version": "6.1.0",
-      "dev": true,
-      "license": "BSD-2-Clause",
-      "engines": {
-        "node": ">= 6"
+        "string-width": "^4.2.0",
+        "strip-ansi": "^6.0.1",
+        "wrap-ansi": "^7.0.0"
       },
-      "funding": {
-        "url": "https://github.com/sponsors/fb55"
+      "engines": {
+        "node": ">=12"
       }
     },
-    "node_modules/cssesc": {
+    "node_modules/cliui/node_modules/emoji-regex": {
+      "version": "8.0.0",
+      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
+      "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A=="
+    },
+    "node_modules/cliui/node_modules/is-fullwidth-code-point": {
       "version": "3.0.0",
-      "dev": true,
-      "license": "MIT",
-      "bin": {
-        "cssesc": "bin/cssesc"
-      },
+      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
+      "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
       "engines": {
-        "node": ">=4"
+        "node": ">=8"
       }
     },
-    "node_modules/csstype": {
-      "version": "3.1.2",
-      "license": "MIT"
-    },
-    "node_modules/damerau-levenshtein": {
-      "version": "1.0.8",
-      "dev": true,
-      "license": "BSD-2-Clause"
-    },
-    "node_modules/date-fns": {
-      "version": "2.30.0",
-      "license": "MIT",
+    "node_modules/cliui/node_modules/string-width": {
+      "version": "4.2.3",
+      "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
+      "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
       "dependencies": {
-        "@babel/runtime": "^7.21.0"
+        "emoji-regex": "^8.0.0",
+        "is-fullwidth-code-point": "^3.0.0",
+        "strip-ansi": "^6.0.1"
       },
       "engines": {
-        "node": ">=0.11"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/date-fns"
+        "node": ">=8"
       }
     },
-    "node_modules/debug": {
-      "version": "4.3.4",
-      "license": "MIT",
-      "dependencies": {
-        "ms": "2.1.2"
-      },
+    "node_modules/clone": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/clone/-/clone-1.0.4.tgz",
+      "integrity": "sha512-JQHZ2QMW6l3aH/j6xCqQThY/9OH4D/9ls34cgkUBiEeocRTU04tHfKPBsUK1PqZCUQM7GiA0IIXJSuXHI64Kbg==",
+      "dev": true,
+      "optional": true,
       "engines": {
-        "node": ">=6.0"
-      },
-      "peerDependenciesMeta": {
-        "supports-color": {
-          "optional": true
-        }
+        "node": ">=0.8"
       }
     },
-    "node_modules/deep-eql": {
-      "version": "4.1.3",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "type-detect": "^4.0.0"
-      },
+    "node_modules/clsx": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/clsx/-/clsx-2.0.0.tgz",
+      "integrity": "sha512-rQ1+kcj+ttHG0MKVGBUXwayCCF1oh39BF5COIpRzuCEv8Mwjv0XucrI2ExNTOn9IlLifGClWQcU9BrZORvtw6Q==",
       "engines": {
         "node": ">=6"
       }
     },
-    "node_modules/deep-equal": {
-      "version": "2.2.2",
-      "dev": true,
-      "license": "MIT",
+    "node_modules/color-convert": {
+      "version": "1.9.3",
+      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
+      "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
       "dependencies": {
-        "array-buffer-byte-length": "^1.0.0",
-        "call-bind": "^1.0.2",
-        "es-get-iterator": "^1.1.3",
-        "get-intrinsic": "^1.2.1",
-        "is-arguments": "^1.1.1",
-        "is-array-buffer": "^3.0.2",
-        "is-date-object": "^1.0.5",
-        "is-regex": "^1.1.4",
-        "is-shared-array-buffer": "^1.0.2",
-        "isarray": "^2.0.5",
-        "object-is": "^1.1.5",
-        "object-keys": "^1.1.1",
-        "object.assign": "^4.1.4",
-        "regexp.prototype.flags": "^1.5.0",
-        "side-channel": "^1.0.4",
-        "which-boxed-primitive": "^1.0.2",
-        "which-collection": "^1.0.1",
-        "which-typed-array": "^1.1.9"
+        "color-name": "1.1.3"
+      }
+    },
+    "node_modules/color-name": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
+      "integrity": "sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw=="
+    },
+    "node_modules/colorette": {
+      "version": "2.0.20",
+      "resolved": "https://registry.npmjs.org/colorette/-/colorette-2.0.20.tgz",
+      "integrity": "sha512-IfEDxwoWIjkeXL1eXcDiow4UbKjhLdq6/EuSVR9GMN7KVH3r9gQ83e73hsz1Nd1T3ijd5xv1wcWRYO+D6kCI2w==",
+      "dev": true
+    },
+    "node_modules/colornames": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/colornames/-/colornames-1.1.1.tgz",
+      "integrity": "sha512-/pyV40IrsdulWv+wFPmERh9k/mjsPZ64yUMDmWrtj/k1nmgrzzIENWKdaVKyBbvFdQWqkcaRxr+polCo3VMe7A=="
+    },
+    "node_modules/combined-stream": {
+      "version": "1.0.8",
+      "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz",
+      "integrity": "sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==",
+      "dependencies": {
+        "delayed-stream": "~1.0.0"
       },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
+      "engines": {
+        "node": ">= 0.8"
       }
     },
-    "node_modules/deep-is": {
-      "version": "0.1.4",
+    "node_modules/commander": {
+      "version": "10.0.1",
+      "resolved": "https://registry.npmjs.org/commander/-/commander-10.0.1.tgz",
+      "integrity": "sha512-y4Mg2tXshplEbSGzx7amzPwKKOCGuoSRP/CjEdwwk0FOGlUbq6lKuoyDZTNZkmxHdJtp54hdfY/JUrdL7Xfdug==",
       "dev": true,
-      "license": "MIT"
+      "engines": {
+        "node": ">=14"
+      }
     },
-    "node_modules/deepmerge": {
-      "version": "4.3.1",
+    "node_modules/common-path-prefix": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/common-path-prefix/-/common-path-prefix-3.0.0.tgz",
+      "integrity": "sha512-QE33hToZseCH3jS0qN96O/bSh3kaw/h+Tq7ngyY9eWDUnTlTNUyqfqvCXioLe5Na5jFsL78ra/wuBU4iuEgd4w==",
+      "dev": true
+    },
+    "node_modules/compose-function": {
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/compose-function/-/compose-function-3.0.3.tgz",
+      "integrity": "sha512-xzhzTJ5eC+gmIzvZq+C3kCJHsp9os6tJkrigDRZclyGtOKINbZtE8n1Tzmeh32jW+BUDPbvZpibwvJHBLGMVwg==",
       "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=0.10.0"
+      "dependencies": {
+        "arity-n": "^1.0.4"
       }
     },
-    "node_modules/default-gateway": {
-      "version": "6.0.3",
+    "node_modules/compressible": {
+      "version": "2.0.18",
+      "resolved": "https://registry.npmjs.org/compressible/-/compressible-2.0.18.tgz",
+      "integrity": "sha512-AF3r7P5dWxL8MxyITRMlORQNaOA2IkAFaTr4k7BUumjPtRpGDTZpl0Pb1XCO6JeDCBdp126Cgs9sMxqSjgYyRg==",
       "dev": true,
-      "license": "BSD-2-Clause",
       "dependencies": {
-        "execa": "^5.0.0"
+        "mime-db": ">= 1.43.0 < 2"
       },
       "engines": {
-        "node": ">= 10"
+        "node": ">= 0.6"
       }
     },
-    "node_modules/defaults": {
-      "version": "1.0.4",
+    "node_modules/compression": {
+      "version": "1.7.4",
+      "resolved": "https://registry.npmjs.org/compression/-/compression-1.7.4.tgz",
+      "integrity": "sha512-jaSIDzP9pZVS4ZfQ+TzvtiWhdpFhE2RDHz8QJkpX9SIpLq88VueF5jJw6t+6CUQcAoA6t+x89MLrWAqpfDE8iQ==",
       "dev": true,
-      "license": "MIT",
-      "optional": true,
       "dependencies": {
-        "clone": "^1.0.2"
+        "accepts": "~1.3.5",
+        "bytes": "3.0.0",
+        "compressible": "~2.0.16",
+        "debug": "2.6.9",
+        "on-headers": "~1.0.2",
+        "safe-buffer": "5.1.2",
+        "vary": "~1.1.2"
       },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
+      "engines": {
+        "node": ">= 0.8.0"
       }
     },
-    "node_modules/define-data-property": {
-      "version": "1.1.4",
-      "license": "MIT",
+    "node_modules/compression/node_modules/debug": {
+      "version": "2.6.9",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+      "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+      "dev": true,
       "dependencies": {
-        "es-define-property": "^1.0.0",
-        "es-errors": "^1.3.0",
-        "gopd": "^1.0.1"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
+        "ms": "2.0.0"
       }
     },
-    "node_modules/define-lazy-prop": {
+    "node_modules/compression/node_modules/ms": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+      "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==",
+      "dev": true
+    },
+    "node_modules/compression/node_modules/safe-buffer": {
+      "version": "5.1.2",
+      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
+      "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==",
+      "dev": true
+    },
+    "node_modules/concat-map": {
+      "version": "0.0.1",
+      "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
+      "integrity": "sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg=="
+    },
+    "node_modules/confusing-browser-globals": {
+      "version": "1.0.11",
+      "resolved": "https://registry.npmjs.org/confusing-browser-globals/-/confusing-browser-globals-1.0.11.tgz",
+      "integrity": "sha512-JsPKdmh8ZkmnHxDk55FZ1TqVLvEQTvoByJZRN9jzI0UjxK/QgAmsphz7PGtqgPieQZ/CQcHWXCR7ATDNhGe+YA==",
+      "dev": true
+    },
+    "node_modules/connect-history-api-fallback": {
       "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/connect-history-api-fallback/-/connect-history-api-fallback-2.0.0.tgz",
+      "integrity": "sha512-U73+6lQFmfiNPrYbXqr6kZ1i1wiRqXnp2nhMsINseWXO8lDau0LGEffJ8kQi4EjLZympVgRdvqjAgiZ1tgzDDA==",
       "dev": true,
-      "license": "MIT",
       "engines": {
-        "node": ">=8"
+        "node": ">=0.8"
       }
     },
-    "node_modules/define-properties": {
-      "version": "1.2.0",
+    "node_modules/content-disposition": {
+      "version": "0.5.4",
+      "resolved": "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.4.tgz",
+      "integrity": "sha512-FveZTNuGw04cxlAiWbzi6zTAL/lhehaWbTtgluJh4/E95DqMwTmha3KZN1aAWA8cFIhHzMZUvLevkw5Rqk+tSQ==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "has-property-descriptors": "^1.0.0",
-        "object-keys": "^1.1.1"
+        "safe-buffer": "5.2.1"
       },
       "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
+        "node": ">= 0.6"
       }
     },
-    "node_modules/del": {
-      "version": "4.1.1",
+    "node_modules/content-type": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/content-type/-/content-type-1.0.5.tgz",
+      "integrity": "sha512-nTjqfcBFEipKdXCv4YDQWCfmcLZKm81ldF0pAopTvyrFGVbcR6P/VAAd5G7N+0tTr8QqiU0tFadD6FK4NtJwOA==",
       "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "@types/glob": "^7.1.1",
-        "globby": "^6.1.0",
-        "is-path-cwd": "^2.0.0",
-        "is-path-in-cwd": "^2.0.0",
-        "p-map": "^2.0.0",
-        "pify": "^4.0.1",
-        "rimraf": "^2.6.3"
-      },
       "engines": {
-        "node": ">=6"
+        "node": ">= 0.6"
       }
     },
-    "node_modules/del/node_modules/array-union": {
-      "version": "1.0.2",
+    "node_modules/cookie": {
+      "version": "0.5.0",
+      "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.5.0.tgz",
+      "integrity": "sha512-YZ3GUyn/o8gfKJlnlX7g7xq4gyO6OSuhGPKaaGssGB2qgDUS0gPgtTvoyZLTt9Ab6dC4hfc9dV5arkvc/OCmrw==",
       "dev": true,
-      "license": "MIT",
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
+    "node_modules/cookie-signature": {
+      "version": "1.0.6",
+      "resolved": "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.6.tgz",
+      "integrity": "sha512-QADzlaHc8icV8I7vbaJXJwod9HWYp8uCqf1xa4OfNu1T7JVxQIrUgOWtHdNDtPiywmFbiS12VjotIXLrKM3orQ==",
+      "dev": true
+    },
+    "node_modules/copy-anything": {
+      "version": "3.0.5",
+      "resolved": "https://registry.npmjs.org/copy-anything/-/copy-anything-3.0.5.tgz",
+      "integrity": "sha512-yCEafptTtb4bk7GLEQoM8KVJpxAfdBJYaXyzQEgQQQgYrZiDp8SJmGKlYza6CYjEDNstAdNdKA3UuoULlEbS6w==",
       "dependencies": {
-        "array-uniq": "^1.0.1"
+        "is-what": "^4.1.8"
       },
       "engines": {
-        "node": ">=0.10.0"
+        "node": ">=12.13"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/mesqueeb"
       }
     },
-    "node_modules/del/node_modules/globby": {
-      "version": "6.1.0",
+    "node_modules/copy-webpack-plugin": {
+      "version": "11.0.0",
+      "resolved": "https://registry.npmjs.org/copy-webpack-plugin/-/copy-webpack-plugin-11.0.0.tgz",
+      "integrity": "sha512-fX2MWpamkW0hZxMEg0+mYnA40LTosOSa5TqZ9GYIBzyJa9C3QUaMPSE2xAi/buNr8u89SfD9wHSQVBzrRa/SOQ==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "array-union": "^1.0.1",
-        "glob": "^7.0.3",
-        "object-assign": "^4.0.1",
-        "pify": "^2.0.0",
-        "pinkie-promise": "^2.0.0"
+        "fast-glob": "^3.2.11",
+        "glob-parent": "^6.0.1",
+        "globby": "^13.1.1",
+        "normalize-path": "^3.0.0",
+        "schema-utils": "^4.0.0",
+        "serialize-javascript": "^6.0.0"
       },
       "engines": {
-        "node": ">=0.10.0"
+        "node": ">= 14.15.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/webpack"
+      },
+      "peerDependencies": {
+        "webpack": "^5.1.0"
       }
     },
-    "node_modules/del/node_modules/globby/node_modules/pify": {
-      "version": "2.3.0",
+    "node_modules/copy-webpack-plugin/node_modules/ajv": {
+      "version": "8.12.0",
+      "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.12.0.tgz",
+      "integrity": "sha512-sRu1kpcO9yLtYxBKvqfTeh9KzZEwO3STyX1HT+4CaDzC6HpTGYhIhPIzj9XuKU7KYDwnaeh5hcOwjy1QuJzBPA==",
       "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=0.10.0"
+      "dependencies": {
+        "fast-deep-equal": "^3.1.1",
+        "json-schema-traverse": "^1.0.0",
+        "require-from-string": "^2.0.2",
+        "uri-js": "^4.2.2"
+      },
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/epoberezkin"
       }
     },
-    "node_modules/del/node_modules/rimraf": {
-      "version": "2.7.1",
+    "node_modules/copy-webpack-plugin/node_modules/ajv-keywords": {
+      "version": "5.1.0",
+      "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-5.1.0.tgz",
+      "integrity": "sha512-YCS/JNFAUyr5vAuhk1DWm1CBxRHW9LbJ2ozWeemrIqpbsqKjHVxYPyi5GC0rjZIT5JxJ3virVTS8wk4i/Z+krw==",
       "dev": true,
-      "license": "ISC",
       "dependencies": {
-        "glob": "^7.1.3"
+        "fast-deep-equal": "^3.1.3"
       },
-      "bin": {
-        "rimraf": "bin.js"
+      "peerDependencies": {
+        "ajv": "^8.8.2"
       }
     },
-    "node_modules/delayed-stream": {
-      "version": "1.0.0",
-      "license": "MIT",
+    "node_modules/copy-webpack-plugin/node_modules/globby": {
+      "version": "13.2.2",
+      "resolved": "https://registry.npmjs.org/globby/-/globby-13.2.2.tgz",
+      "integrity": "sha512-Y1zNGV+pzQdh7H39l9zgB4PJqjRNqydvdYCDG4HFXM4XuvSaQQlEc91IU1yALL8gUTDomgBAfz3XJdmUS+oo0w==",
+      "dev": true,
+      "dependencies": {
+        "dir-glob": "^3.0.1",
+        "fast-glob": "^3.3.0",
+        "ignore": "^5.2.4",
+        "merge2": "^1.4.1",
+        "slash": "^4.0.0"
+      },
       "engines": {
-        "node": ">=0.4.0"
+        "node": "^12.20.0 || ^14.13.1 || >=16.0.0"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/depd": {
-      "version": "2.0.0",
+    "node_modules/copy-webpack-plugin/node_modules/json-schema-traverse": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz",
+      "integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==",
+      "dev": true
+    },
+    "node_modules/copy-webpack-plugin/node_modules/schema-utils": {
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-4.2.0.tgz",
+      "integrity": "sha512-L0jRsrPpjdckP3oPug3/VxNKt2trR8TcabrM6FOAAlvC/9Phcmm+cuAgTlxBqdBR1WJx7Naj9WHw+aOmheSVbw==",
       "dev": true,
-      "license": "MIT",
+      "dependencies": {
+        "@types/json-schema": "^7.0.9",
+        "ajv": "^8.9.0",
+        "ajv-formats": "^2.1.1",
+        "ajv-keywords": "^5.1.0"
+      },
       "engines": {
-        "node": ">= 0.8"
+        "node": ">= 12.13.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/webpack"
       }
     },
-    "node_modules/dequal": {
-      "version": "2.0.3",
+    "node_modules/copy-webpack-plugin/node_modules/slash": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/slash/-/slash-4.0.0.tgz",
+      "integrity": "sha512-3dOsAHXXUkQTpOYcoAxLIorMTp4gIQr5IW3iVb7A7lFIp0VHhnynm9izx6TssdrIcVIESAlVjtnO2K8bg+Coew==",
       "dev": true,
-      "license": "MIT",
       "engines": {
-        "node": ">=6"
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/des.js": {
-      "version": "1.1.0",
-      "license": "MIT",
-      "dependencies": {
-        "inherits": "^2.0.1",
-        "minimalistic-assert": "^1.0.0"
-      }
+    "node_modules/core-js": {
+      "version": "2.6.12",
+      "resolved": "https://registry.npmjs.org/core-js/-/core-js-2.6.12.tgz",
+      "integrity": "sha512-Kb2wC0fvsWfQrgk8HU5lW6U/Lcs8+9aaYcy4ZFc6DDlo4nZ7n70dEgE5rtR0oG6ufKDUnrwfWL1mXR5ljDatrQ==",
+      "deprecated": "core-js@<3.23.3 is no longer maintained and not recommended for usage due to the number of issues. Because of the V8 engine whims, feature detection in old core-js versions could cause a slowdown up to 100x even if nothing is polyfilled. Some versions have web compatibility issues. Please, upgrade your dependencies to the actual version of core-js.",
+      "hasInstallScript": true
     },
-    "node_modules/destroy": {
-      "version": "1.2.0",
+    "node_modules/core-js-pure": {
+      "version": "3.32.0",
+      "resolved": "https://registry.npmjs.org/core-js-pure/-/core-js-pure-3.32.0.tgz",
+      "integrity": "sha512-qsev1H+dTNYpDUEURRuOXMvpdtAnNEvQWS/FMJ2Vb5AY8ZP4rAPQldkE27joykZPJTe0+IVgHZYh1P5Xu1/i1g==",
       "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">= 0.8",
-        "npm": "1.2.8000 || >= 1.4.16"
+      "hasInstallScript": true,
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/core-js"
       }
     },
-    "node_modules/detect-node": {
-      "version": "2.1.0",
-      "license": "MIT"
+    "node_modules/core-util-is": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.3.tgz",
+      "integrity": "sha512-ZQBvi1DcpJ4GDqanjucZ2Hj3wEO5pZDS89BWbkcrvdxksJorwUDDZamX9ldFkp9aw2lmBDLgkObEA4DWNJ9FYQ==",
+      "dev": true
     },
-    "node_modules/diffie-hellman": {
-      "version": "5.0.3",
-      "license": "MIT",
+    "node_modules/create-ecdh": {
+      "version": "4.0.4",
+      "resolved": "https://registry.npmjs.org/create-ecdh/-/create-ecdh-4.0.4.tgz",
+      "integrity": "sha512-mf+TCx8wWc9VpuxfP2ht0iSISLZnt0JgWlrOKZiNqyUZWnjIaCIVNQArMHnCZKfEYRg6IM7A+NeJoN8gf/Ws0A==",
       "dependencies": {
         "bn.js": "^4.1.0",
-        "miller-rabin": "^4.0.0",
-        "randombytes": "^2.0.0"
+        "elliptic": "^6.5.3"
       }
     },
-    "node_modules/diffie-hellman/node_modules/bn.js": {
+    "node_modules/create-ecdh/node_modules/bn.js": {
       "version": "4.12.0",
-      "license": "MIT"
+      "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.0.tgz",
+      "integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA=="
     },
-    "node_modules/dir-glob": {
-      "version": "3.0.1",
-      "dev": true,
-      "license": "MIT",
+    "node_modules/create-hash": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/create-hash/-/create-hash-1.2.0.tgz",
+      "integrity": "sha512-z00bCGNHDG8mHAkP7CtT1qVu+bFQUPjYq/4Iv3C3kWjTFV10zIjfSoeqXo9Asws8gwSHDGj/hl2u4OGIjapeCg==",
       "dependencies": {
-        "path-type": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=8"
+        "cipher-base": "^1.0.1",
+        "inherits": "^2.0.1",
+        "md5.js": "^1.3.4",
+        "ripemd160": "^2.0.1",
+        "sha.js": "^2.4.0"
       }
     },
-    "node_modules/dns-equal": {
-      "version": "1.0.0",
-      "dev": true,
-      "license": "MIT"
-    },
-    "node_modules/dns-packet": {
-      "version": "5.6.0",
-      "dev": true,
-      "license": "MIT",
+    "node_modules/create-hmac": {
+      "version": "1.1.7",
+      "resolved": "https://registry.npmjs.org/create-hmac/-/create-hmac-1.1.7.tgz",
+      "integrity": "sha512-MJG9liiZ+ogc4TzUwuvbER1JRdgvUFSB5+VR/g5h82fGaIRWMWddtKBHi7/sVhfjQZ6SehlyhvQYrcYkaUIpLg==",
       "dependencies": {
-        "@leichtgewicht/ip-codec": "^2.0.1"
-      },
-      "engines": {
-        "node": ">=6"
+        "cipher-base": "^1.0.3",
+        "create-hash": "^1.1.0",
+        "inherits": "^2.0.1",
+        "ripemd160": "^2.0.0",
+        "safe-buffer": "^5.0.1",
+        "sha.js": "^2.4.8"
       }
     },
-    "node_modules/doctrine": {
-      "version": "3.0.0",
-      "dev": true,
-      "license": "Apache-2.0",
+    "node_modules/cross-fetch": {
+      "version": "3.1.8",
+      "resolved": "https://registry.npmjs.org/cross-fetch/-/cross-fetch-3.1.8.tgz",
+      "integrity": "sha512-cvA+JwZoU0Xq+h6WkMvAUqPEYy92Obet6UdKLfW60qn99ftItKjB5T+BkyWOFWe2pUyfQ+IJHmpOTznqk1M6Kg==",
       "dependencies": {
-        "esutils": "^2.0.2"
-      },
-      "engines": {
-        "node": ">=6.0.0"
+        "node-fetch": "^2.6.12"
       }
     },
-    "node_modules/dom-converter": {
-      "version": "0.2.0",
-      "dev": true,
-      "license": "MIT",
+    "node_modules/cross-sha256": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/cross-sha256/-/cross-sha256-1.2.0.tgz",
+      "integrity": "sha512-KViLNMDZKV7jwFqjFx+rNhG26amnFYYQ0S+VaFlVvpk8tM+2XbFia/don/SjGHg9WQxnFVi6z64CGPuF3T+nNw==",
       "dependencies": {
-        "utila": "~0.4"
+        "buffer": "^5.6.0"
       }
     },
-    "node_modules/dom-serializer": {
-      "version": "1.4.1",
+    "node_modules/cross-spawn": {
+      "version": "7.0.3",
+      "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz",
+      "integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "domelementtype": "^2.0.1",
-        "domhandler": "^4.2.0",
-        "entities": "^2.0.0"
+        "path-key": "^3.1.0",
+        "shebang-command": "^2.0.0",
+        "which": "^2.0.1"
       },
-      "funding": {
-        "url": "https://github.com/cheeriojs/dom-serializer?sponsor=1"
+      "engines": {
+        "node": ">= 8"
       }
     },
-    "node_modules/dom-serializer/node_modules/entities": {
-      "version": "2.2.0",
-      "dev": true,
-      "license": "BSD-2-Clause",
-      "funding": {
-        "url": "https://github.com/fb55/entities?sponsor=1"
+    "node_modules/crypto-browserify": {
+      "version": "3.12.0",
+      "resolved": "https://registry.npmjs.org/crypto-browserify/-/crypto-browserify-3.12.0.tgz",
+      "integrity": "sha512-fz4spIh+znjO2VjL+IdhEpRJ3YN6sMzITSBijk6FK2UvTqruSQW+/cCZTSNsMiZNvUeq0CqurF+dAbyiGOY6Wg==",
+      "dependencies": {
+        "browserify-cipher": "^1.0.0",
+        "browserify-sign": "^4.0.0",
+        "create-ecdh": "^4.0.0",
+        "create-hash": "^1.1.0",
+        "create-hmac": "^1.1.0",
+        "diffie-hellman": "^5.0.0",
+        "inherits": "^2.0.1",
+        "pbkdf2": "^3.0.3",
+        "public-encrypt": "^4.0.0",
+        "randombytes": "^2.0.0",
+        "randomfill": "^1.0.3"
+      },
+      "engines": {
+        "node": "*"
       }
     },
-    "node_modules/domelementtype": {
-      "version": "2.3.0",
-      "dev": true,
-      "funding": [
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/fb55"
-        }
-      ],
-      "license": "BSD-2-Clause"
+    "node_modules/css-color-keywords": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/css-color-keywords/-/css-color-keywords-1.0.0.tgz",
+      "integrity": "sha512-FyyrDHZKEjXDpNJYvVsV960FiqQyXc/LlYmsxl2BcdMb2WPx0OGRVgTg55rPSyLSNMqP52R9r8geSp7apN3Ofg==",
+      "engines": {
+        "node": ">=4"
+      }
     },
-    "node_modules/domhandler": {
-      "version": "4.3.1",
+    "node_modules/css-loader": {
+      "version": "6.8.1",
+      "resolved": "https://registry.npmjs.org/css-loader/-/css-loader-6.8.1.tgz",
+      "integrity": "sha512-xDAXtEVGlD0gJ07iclwWVkLoZOpEvAWaSyf6W18S2pOC//K8+qUDIx8IIT3D+HjnmkJPQeesOPv5aiUaJsCM2g==",
       "dev": true,
-      "license": "BSD-2-Clause",
       "dependencies": {
-        "domelementtype": "^2.2.0"
+        "icss-utils": "^5.1.0",
+        "postcss": "^8.4.21",
+        "postcss-modules-extract-imports": "^3.0.0",
+        "postcss-modules-local-by-default": "^4.0.3",
+        "postcss-modules-scope": "^3.0.0",
+        "postcss-modules-values": "^4.0.0",
+        "postcss-value-parser": "^4.2.0",
+        "semver": "^7.3.8"
       },
       "engines": {
-        "node": ">= 4"
+        "node": ">= 12.13.0"
       },
       "funding": {
-        "url": "https://github.com/fb55/domhandler?sponsor=1"
+        "type": "opencollective",
+        "url": "https://opencollective.com/webpack"
+      },
+      "peerDependencies": {
+        "webpack": "^5.0.0"
       }
     },
-    "node_modules/domutils": {
-      "version": "2.8.0",
+    "node_modules/css-loader/node_modules/lru-cache": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
+      "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
       "dev": true,
-      "license": "BSD-2-Clause",
       "dependencies": {
-        "dom-serializer": "^1.0.1",
-        "domelementtype": "^2.2.0",
-        "domhandler": "^4.2.0"
+        "yallist": "^4.0.0"
       },
-      "funding": {
-        "url": "https://github.com/fb55/domutils?sponsor=1"
+      "engines": {
+        "node": ">=10"
       }
     },
-    "node_modules/dot-case": {
-      "version": "3.0.4",
+    "node_modules/css-loader/node_modules/semver": {
+      "version": "7.5.4",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz",
+      "integrity": "sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "no-case": "^3.0.4",
-        "tslib": "^2.0.3"
+        "lru-cache": "^6.0.0"
+      },
+      "bin": {
+        "semver": "bin/semver.js"
+      },
+      "engines": {
+        "node": ">=10"
       }
     },
-    "node_modules/dotenv": {
-      "version": "16.4.5",
-      "license": "BSD-2-Clause",
-      "engines": {
-        "node": ">=12"
+    "node_modules/css-loader/node_modules/yallist": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
+      "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==",
+      "dev": true
+    },
+    "node_modules/css-select": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/css-select/-/css-select-4.3.0.tgz",
+      "integrity": "sha512-wPpOYtnsVontu2mODhA19JrqWxNsfdatRKd64kmpRbQgh1KtItko5sTnEpPdpSaJszTOhEMlF/RPz28qj4HqhQ==",
+      "dev": true,
+      "dependencies": {
+        "boolbase": "^1.0.0",
+        "css-what": "^6.0.1",
+        "domhandler": "^4.3.1",
+        "domutils": "^2.8.0",
+        "nth-check": "^2.0.1"
       },
       "funding": {
-        "url": "https://dotenvx.com"
+        "url": "https://github.com/sponsors/fb55"
       }
     },
-    "node_modules/dotenv-defaults": {
-      "version": "2.0.2",
-      "dev": true,
-      "license": "MIT",
+    "node_modules/css-to-react-native": {
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/css-to-react-native/-/css-to-react-native-3.2.0.tgz",
+      "integrity": "sha512-e8RKaLXMOFii+02mOlqwjbD00KSEKqblnpO9e++1aXS1fPQOpS1YoqdVHBqPjHNoxeF2mimzVqawm2KCbEdtHQ==",
       "dependencies": {
-        "dotenv": "^8.2.0"
+        "camelize": "^1.0.0",
+        "css-color-keywords": "^1.0.0",
+        "postcss-value-parser": "^4.0.2"
       }
     },
-    "node_modules/dotenv-defaults/node_modules/dotenv": {
-      "version": "8.6.0",
+    "node_modules/css-what": {
+      "version": "6.1.0",
+      "resolved": "https://registry.npmjs.org/css-what/-/css-what-6.1.0.tgz",
+      "integrity": "sha512-HTUrgRJ7r4dsZKU6GjmpfRK1O76h97Z8MfS1G0FozR+oF2kG6Vfe8JE6zwrkbxigziPHinCJ+gCPjA9EaBDtRw==",
       "dev": true,
-      "license": "BSD-2-Clause",
       "engines": {
-        "node": ">=10"
+        "node": ">= 6"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/fb55"
       }
     },
-    "node_modules/dotenv-webpack": {
-      "version": "8.0.1",
+    "node_modules/cssesc": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/cssesc/-/cssesc-3.0.0.tgz",
+      "integrity": "sha512-/Tb/JcjK111nNScGob5MNtsntNM1aCNUDipB/TkwZFhyDrrE47SOx/18wF2bbjgc3ZzCSKW1T5nt5EbFoAz/Vg==",
       "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "dotenv-defaults": "^2.0.2"
+      "bin": {
+        "cssesc": "bin/cssesc"
       },
       "engines": {
-        "node": ">=10"
-      },
-      "peerDependencies": {
-        "webpack": "^4 || ^5"
+        "node": ">=4"
       }
     },
-    "node_modules/drbg.js": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/drbg.js/-/drbg.js-1.0.1.tgz",
-      "integrity": "sha512-F4wZ06PvqxYLFEZKkFxTDcns9oFNk34hvmJSEwdzsxVQ8YI5YaxtACgQatkYgv2VI2CFkUd2Y+xosPQnHv809g==",
-      "dependencies": {
-        "browserify-aes": "^1.0.6",
-        "create-hash": "^1.1.2",
-        "create-hmac": "^1.1.4"
-      },
-      "engines": {
-        "node": ">=0.10"
-      }
+    "node_modules/csstype": {
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/csstype/-/csstype-3.1.2.tgz",
+      "integrity": "sha512-I7K1Uu0MBPzaFKg4nI5Q7Vs2t+3gWWW648spaF+Rg7pI9ds18Ugn+lvg4SHczUdKlHI5LWBXyqfS8+DufyBsgQ=="
     },
-    "node_modules/eastasianwidth": {
-      "version": "0.2.0",
-      "dev": true,
-      "license": "MIT"
+    "node_modules/damerau-levenshtein": {
+      "version": "1.0.8",
+      "resolved": "https://registry.npmjs.org/damerau-levenshtein/-/damerau-levenshtein-1.0.8.tgz",
+      "integrity": "sha512-sdQSFB7+llfUcQHUQO3+B8ERRj0Oa4w9POWMI/puGtuf7gFywGmkaLCElnudfTiKZV+NvHqL0ifzdrI8Ro7ESA==",
+      "dev": true
     },
-    "node_modules/easy-table": {
-      "version": "1.2.0",
-      "dev": true,
-      "license": "MIT",
+    "node_modules/date-fns": {
+      "version": "2.30.0",
+      "resolved": "https://registry.npmjs.org/date-fns/-/date-fns-2.30.0.tgz",
+      "integrity": "sha512-fnULvOpxnC5/Vg3NCiWelDsLiUc9bRwAPs/+LfTLNvetFCtCTN+yQz15C/fs4AwX1R9K5GLtLfn8QW+dWisaAw==",
       "dependencies": {
-        "ansi-regex": "^5.0.1"
+        "@babel/runtime": "^7.21.0"
       },
-      "optionalDependencies": {
-        "wcwidth": "^1.0.1"
+      "engines": {
+        "node": ">=0.11"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/date-fns"
       }
     },
-    "node_modules/ecdsa-sig-formatter": {
-      "version": "1.0.11",
-      "resolved": "https://registry.npmjs.org/ecdsa-sig-formatter/-/ecdsa-sig-formatter-1.0.11.tgz",
-      "integrity": "sha512-nagl3RYrbNv6kQkeJIpt6NJZy8twLB/2vtz6yN9Z4vRKHN4/QZJIEbqohALSgwKdnksuY3k5Addp5lg8sVoVcQ==",
+    "node_modules/debug": {
+      "version": "4.3.4",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
+      "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==",
       "dependencies": {
-        "safe-buffer": "^5.0.1"
+        "ms": "2.1.2"
+      },
+      "engines": {
+        "node": ">=6.0"
+      },
+      "peerDependenciesMeta": {
+        "supports-color": {
+          "optional": true
+        }
       }
     },
-    "node_modules/ecpair": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/ecpair/-/ecpair-2.1.0.tgz",
-      "integrity": "sha512-cL/mh3MtJutFOvFc27GPZE2pWL3a3k4YvzUWEOvilnfZVlH3Jwgx/7d6tlD7/75tNk8TG2m+7Kgtz0SI1tWcqw==",
+    "node_modules/deep-eql": {
+      "version": "4.1.3",
+      "resolved": "https://registry.npmjs.org/deep-eql/-/deep-eql-4.1.3.tgz",
+      "integrity": "sha512-WaEtAOpRA1MQ0eohqZjpGD8zdI0Ovsm8mmFhaDN8dvDZzyoUMcYDnf5Y6iu7HTXxf8JDS23qWa4a+hKCDyOPzw==",
+      "dev": true,
       "dependencies": {
-        "randombytes": "^2.1.0",
-        "typeforce": "^1.18.0",
-        "wif": "^2.0.6"
+        "type-detect": "^4.0.0"
       },
       "engines": {
-        "node": ">=8.0.0"
+        "node": ">=6"
       }
     },
-    "node_modules/ee-first": {
-      "version": "1.1.1",
+    "node_modules/deep-equal": {
+      "version": "2.2.2",
+      "resolved": "https://registry.npmjs.org/deep-equal/-/deep-equal-2.2.2.tgz",
+      "integrity": "sha512-xjVyBf0w5vH0I42jdAZzOKVldmPgSulmiyPRywoyq7HXC9qdgo17kxJE+rdnif5Tz6+pIrpJI8dCpMNLIGkUiA==",
       "dev": true,
-      "license": "MIT"
-    },
-    "node_modules/electron-to-chromium": {
-      "version": "1.4.572",
-      "license": "ISC"
-    },
-    "node_modules/elliptic": {
-      "version": "6.5.4",
-      "license": "MIT",
       "dependencies": {
-        "bn.js": "^4.11.9",
-        "brorand": "^1.1.0",
-        "hash.js": "^1.0.0",
-        "hmac-drbg": "^1.0.1",
-        "inherits": "^2.0.4",
-        "minimalistic-assert": "^1.0.1",
-        "minimalistic-crypto-utils": "^1.0.1"
+        "array-buffer-byte-length": "^1.0.0",
+        "call-bind": "^1.0.2",
+        "es-get-iterator": "^1.1.3",
+        "get-intrinsic": "^1.2.1",
+        "is-arguments": "^1.1.1",
+        "is-array-buffer": "^3.0.2",
+        "is-date-object": "^1.0.5",
+        "is-regex": "^1.1.4",
+        "is-shared-array-buffer": "^1.0.2",
+        "isarray": "^2.0.5",
+        "object-is": "^1.1.5",
+        "object-keys": "^1.1.1",
+        "object.assign": "^4.1.4",
+        "regexp.prototype.flags": "^1.5.0",
+        "side-channel": "^1.0.4",
+        "which-boxed-primitive": "^1.0.2",
+        "which-collection": "^1.0.1",
+        "which-typed-array": "^1.1.9"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/elliptic/node_modules/bn.js": {
-      "version": "4.12.0",
-      "license": "MIT"
-    },
-    "node_modules/emoji-regex": {
-      "version": "9.2.2",
-      "dev": true,
-      "license": "MIT"
-    },
-    "node_modules/emojis-list": {
-      "version": "3.0.0",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">= 4"
-      }
+    "node_modules/deep-is": {
+      "version": "0.1.4",
+      "resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.4.tgz",
+      "integrity": "sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ==",
+      "dev": true
     },
-    "node_modules/encodeurl": {
-      "version": "1.0.2",
+    "node_modules/deepmerge": {
+      "version": "4.3.1",
+      "resolved": "https://registry.npmjs.org/deepmerge/-/deepmerge-4.3.1.tgz",
+      "integrity": "sha512-3sUqbMEc77XqpdNO7FRyRog+eW3ph+GYCbj+rK+uYyRMuwsVy0rMiVtPn+QJlKFvWP/1PYpapqYn0Me2knFn+A==",
       "dev": true,
-      "license": "MIT",
       "engines": {
-        "node": ">= 0.8"
+        "node": ">=0.10.0"
       }
     },
-    "node_modules/enhanced-resolve": {
-      "version": "5.15.0",
+    "node_modules/default-gateway": {
+      "version": "6.0.3",
+      "resolved": "https://registry.npmjs.org/default-gateway/-/default-gateway-6.0.3.tgz",
+      "integrity": "sha512-fwSOJsbbNzZ/CUFpqFBqYfYNLj1NbMPm8MMCIzHjC83iSJRBEGmDUxU+WP661BaBQImeC2yHwXtz+P/O9o+XEg==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "graceful-fs": "^4.2.4",
-        "tapable": "^2.2.0"
+        "execa": "^5.0.0"
       },
       "engines": {
-        "node": ">=10.13.0"
+        "node": ">= 10"
       }
     },
-    "node_modules/entities": {
-      "version": "4.5.0",
+    "node_modules/defaults": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/defaults/-/defaults-1.0.4.tgz",
+      "integrity": "sha512-eFuaLoy/Rxalv2kr+lqMlUnrDWV+3j4pljOIJgLIhI058IQfWJ7vXhyEIHu+HtC738klGALYxOKDO0bQP3tg8A==",
       "dev": true,
-      "license": "BSD-2-Clause",
-      "engines": {
-        "node": ">=0.12"
+      "optional": true,
+      "dependencies": {
+        "clone": "^1.0.2"
       },
       "funding": {
-        "url": "https://github.com/fb55/entities?sponsor=1"
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/error-ex": {
-      "version": "1.3.2",
-      "dev": true,
-      "license": "MIT",
+    "node_modules/define-data-property": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/define-data-property/-/define-data-property-1.1.4.tgz",
+      "integrity": "sha512-rBMvIzlpA8v6E+SJZoo++HAYqsLrkg7MSfIinMPFhmkorw7X+dOXVJQs+QT69zGkzMyfDnIMN2Wid1+NbL3T+A==",
       "dependencies": {
-        "is-arrayish": "^0.2.1"
+        "es-define-property": "^1.0.0",
+        "es-errors": "^1.3.0",
+        "gopd": "^1.0.1"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/error-stack-parser": {
-      "version": "2.1.4",
+    "node_modules/define-lazy-prop": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/define-lazy-prop/-/define-lazy-prop-2.0.0.tgz",
+      "integrity": "sha512-Ds09qNh8yw3khSjiJjiUInaGX9xlqZDY7JVryGxdxV7NPeuqQfplOpQ66yJFZut3jLa5zOwkXw1g9EI2uKh4Og==",
       "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "stackframe": "^1.3.4"
+      "engines": {
+        "node": ">=8"
       }
     },
-    "node_modules/es-abstract": {
-      "version": "1.22.1",
+    "node_modules/define-properties": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.2.0.tgz",
+      "integrity": "sha512-xvqAVKGfT1+UAvPwKTVw/njhdQ8ZhXK4lI0bCIuCMrp2up9nPnaDftrLtmpTazqd1o+UY4zgzU+avtMbDP+ldA==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "array-buffer-byte-length": "^1.0.0",
-        "arraybuffer.prototype.slice": "^1.0.1",
-        "available-typed-arrays": "^1.0.5",
-        "call-bind": "^1.0.2",
-        "es-set-tostringtag": "^2.0.1",
-        "es-to-primitive": "^1.2.1",
-        "function.prototype.name": "^1.1.5",
-        "get-intrinsic": "^1.2.1",
-        "get-symbol-description": "^1.0.0",
-        "globalthis": "^1.0.3",
-        "gopd": "^1.0.1",
-        "has": "^1.0.3",
         "has-property-descriptors": "^1.0.0",
-        "has-proto": "^1.0.1",
-        "has-symbols": "^1.0.3",
-        "internal-slot": "^1.0.5",
-        "is-array-buffer": "^3.0.2",
-        "is-callable": "^1.2.7",
-        "is-negative-zero": "^2.0.2",
-        "is-regex": "^1.1.4",
-        "is-shared-array-buffer": "^1.0.2",
-        "is-string": "^1.0.7",
-        "is-typed-array": "^1.1.10",
-        "is-weakref": "^1.0.2",
-        "object-inspect": "^1.12.3",
-        "object-keys": "^1.1.1",
-        "object.assign": "^4.1.4",
-        "regexp.prototype.flags": "^1.5.0",
-        "safe-array-concat": "^1.0.0",
-        "safe-regex-test": "^1.0.0",
-        "string.prototype.trim": "^1.2.7",
-        "string.prototype.trimend": "^1.0.6",
-        "string.prototype.trimstart": "^1.0.6",
-        "typed-array-buffer": "^1.0.0",
-        "typed-array-byte-length": "^1.0.0",
-        "typed-array-byte-offset": "^1.0.0",
-        "typed-array-length": "^1.0.4",
-        "unbox-primitive": "^1.0.2",
-        "which-typed-array": "^1.1.10"
+        "object-keys": "^1.1.1"
       },
       "engines": {
         "node": ">= 0.4"
@@ -5049,6636 +5603,18425 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/es-define-property": {
-      "version": "1.0.0",
-      "license": "MIT",
+    "node_modules/del": {
+      "version": "4.1.1",
+      "resolved": "https://registry.npmjs.org/del/-/del-4.1.1.tgz",
+      "integrity": "sha512-QwGuEUouP2kVwQenAsOof5Fv8K9t3D8Ca8NxcXKrIpEHjTXK5J2nXLdP+ALI1cgv8wj7KuwBhTwBkOZSJKM5XQ==",
+      "dev": true,
       "dependencies": {
-        "get-intrinsic": "^1.2.4"
+        "@types/glob": "^7.1.1",
+        "globby": "^6.1.0",
+        "is-path-cwd": "^2.0.0",
+        "is-path-in-cwd": "^2.0.0",
+        "p-map": "^2.0.0",
+        "pify": "^4.0.1",
+        "rimraf": "^2.6.3"
       },
       "engines": {
-        "node": ">= 0.4"
+        "node": ">=6"
       }
     },
-    "node_modules/es-errors": {
-      "version": "1.3.0",
-      "license": "MIT",
+    "node_modules/del/node_modules/array-union": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/array-union/-/array-union-1.0.2.tgz",
+      "integrity": "sha512-Dxr6QJj/RdU/hCaBjOfxW+q6lyuVE6JFWIrAUpuOOhoJJoQ99cUn3igRaHVB5P9WrgFVN0FfArM3x0cueOU8ng==",
+      "dev": true,
+      "dependencies": {
+        "array-uniq": "^1.0.1"
+      },
       "engines": {
-        "node": ">= 0.4"
+        "node": ">=0.10.0"
       }
     },
-    "node_modules/es-get-iterator": {
-      "version": "1.1.3",
+    "node_modules/del/node_modules/globby": {
+      "version": "6.1.0",
+      "resolved": "https://registry.npmjs.org/globby/-/globby-6.1.0.tgz",
+      "integrity": "sha512-KVbFv2TQtbzCoxAnfD6JcHZTYCzyliEaaeM/gH8qQdkKr5s0OP9scEgvdcngyk7AVdY6YVW/TJHd+lQ/Df3Daw==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "call-bind": "^1.0.2",
-        "get-intrinsic": "^1.1.3",
-        "has-symbols": "^1.0.3",
-        "is-arguments": "^1.1.1",
-        "is-map": "^2.0.2",
-        "is-set": "^2.0.2",
-        "is-string": "^1.0.7",
-        "isarray": "^2.0.5",
-        "stop-iteration-iterator": "^1.0.0"
+        "array-union": "^1.0.1",
+        "glob": "^7.0.3",
+        "object-assign": "^4.0.1",
+        "pify": "^2.0.0",
+        "pinkie-promise": "^2.0.0"
       },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
+      "engines": {
+        "node": ">=0.10.0"
       }
     },
-    "node_modules/es-module-lexer": {
-      "version": "1.3.0",
+    "node_modules/del/node_modules/globby/node_modules/pify": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
+      "integrity": "sha512-udgsAY+fTnvv7kI7aaxbqwWNb0AHiB0qBO89PZKPkoTmGOgdbrHDKD+0B2X4uTfJ/FT1R09r9gTsjUjNJotuog==",
       "dev": true,
-      "license": "MIT"
+      "engines": {
+        "node": ">=0.10.0"
+      }
     },
-    "node_modules/es-set-tostringtag": {
-      "version": "2.0.1",
+    "node_modules/del/node_modules/rimraf": {
+      "version": "2.7.1",
+      "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz",
+      "integrity": "sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "get-intrinsic": "^1.1.3",
-        "has": "^1.0.3",
-        "has-tostringtag": "^1.0.0"
+        "glob": "^7.1.3"
       },
-      "engines": {
-        "node": ">= 0.4"
+      "bin": {
+        "rimraf": "bin.js"
       }
     },
-    "node_modules/es-shim-unscopables": {
+    "node_modules/delayed-stream": {
       "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz",
+      "integrity": "sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ==",
+      "engines": {
+        "node": ">=0.4.0"
+      }
+    },
+    "node_modules/depd": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/depd/-/depd-2.0.0.tgz",
+      "integrity": "sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw==",
       "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "has": "^1.0.3"
+      "engines": {
+        "node": ">= 0.8"
       }
     },
-    "node_modules/es-to-primitive": {
-      "version": "1.2.1",
+    "node_modules/dequal": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/dequal/-/dequal-2.0.3.tgz",
+      "integrity": "sha512-0je+qPKHEMohvfRTCEo3CrPG6cAzAYgmzKyxRiYSSDkS6eGJdyVJm7WaYA5ECaAD9wLB2T4EEeymA5aFVcYXCA==",
       "dev": true,
-      "license": "MIT",
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/des.js": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/des.js/-/des.js-1.1.0.tgz",
+      "integrity": "sha512-r17GxjhUCjSRy8aiJpr8/UadFIzMzJGexI3Nmz4ADi9LYSFx4gTBp80+NaX/YsXWWLhpZ7v/v/ubEc/bCNfKwg==",
       "dependencies": {
-        "is-callable": "^1.1.4",
-        "is-date-object": "^1.0.1",
-        "is-symbol": "^1.0.2"
-      },
+        "inherits": "^2.0.1",
+        "minimalistic-assert": "^1.0.0"
+      }
+    },
+    "node_modules/destroy": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/destroy/-/destroy-1.2.0.tgz",
+      "integrity": "sha512-2sJGJTaXIIaR1w4iJSNoN0hnMY7Gpc/n8D4qSCJw8QqFWXf7cuAgnEHxBpweaVcPevC2l3KpjYCx3NypQQgaJg==",
+      "dev": true,
       "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
+        "node": ">= 0.8",
+        "npm": "1.2.8000 || >= 1.4.16"
       }
     },
-    "node_modules/esbuild": {
-      "version": "0.21.5",
+    "node_modules/detect-node": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/detect-node/-/detect-node-2.1.0.tgz",
+      "integrity": "sha512-T0NIuQpnTvFDATNuHN5roPwSBG83rFsuO+MXXH9/3N1eFbn4wcPjttvjMLEPWJ0RGUYgQE7cGgS3tNxbqCGM7g=="
+    },
+    "node_modules/diffie-hellman": {
+      "version": "5.0.3",
+      "resolved": "https://registry.npmjs.org/diffie-hellman/-/diffie-hellman-5.0.3.tgz",
+      "integrity": "sha512-kqag/Nl+f3GwyK25fhUMYj81BUOrZ9IuJsjIcDE5icNM9FJHAVm3VcUDxdLPoQtTuUylWm6ZIknYJwwaPxsUzg==",
+      "dependencies": {
+        "bn.js": "^4.1.0",
+        "miller-rabin": "^4.0.0",
+        "randombytes": "^2.0.0"
+      }
+    },
+    "node_modules/diffie-hellman/node_modules/bn.js": {
+      "version": "4.12.0",
+      "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.0.tgz",
+      "integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA=="
+    },
+    "node_modules/dir-glob": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/dir-glob/-/dir-glob-3.0.1.tgz",
+      "integrity": "sha512-WkrWp9GR4KXfKGYzOLmTuGVi1UWFfws377n9cc55/tb6DuqyF6pcQ5AbiHEshaDpY9v6oaSr2XCDidGmMwdzIA==",
       "dev": true,
-      "hasInstallScript": true,
-      "license": "MIT",
-      "bin": {
-        "esbuild": "bin/esbuild"
+      "dependencies": {
+        "path-type": "^4.0.0"
       },
       "engines": {
-        "node": ">=12"
-      },
-      "optionalDependencies": {
-        "@esbuild/aix-ppc64": "0.21.5",
-        "@esbuild/android-arm": "0.21.5",
-        "@esbuild/android-arm64": "0.21.5",
-        "@esbuild/android-x64": "0.21.5",
-        "@esbuild/darwin-arm64": "0.21.5",
-        "@esbuild/darwin-x64": "0.21.5",
-        "@esbuild/freebsd-arm64": "0.21.5",
-        "@esbuild/freebsd-x64": "0.21.5",
-        "@esbuild/linux-arm": "0.21.5",
-        "@esbuild/linux-arm64": "0.21.5",
-        "@esbuild/linux-ia32": "0.21.5",
-        "@esbuild/linux-loong64": "0.21.5",
-        "@esbuild/linux-mips64el": "0.21.5",
-        "@esbuild/linux-ppc64": "0.21.5",
-        "@esbuild/linux-riscv64": "0.21.5",
-        "@esbuild/linux-s390x": "0.21.5",
-        "@esbuild/linux-x64": "0.21.5",
-        "@esbuild/netbsd-x64": "0.21.5",
-        "@esbuild/openbsd-x64": "0.21.5",
-        "@esbuild/sunos-x64": "0.21.5",
-        "@esbuild/win32-arm64": "0.21.5",
-        "@esbuild/win32-ia32": "0.21.5",
-        "@esbuild/win32-x64": "0.21.5"
+        "node": ">=8"
       }
     },
-    "node_modules/escalade": {
-      "version": "3.1.1",
-      "license": "MIT",
+    "node_modules/dns-equal": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/dns-equal/-/dns-equal-1.0.0.tgz",
+      "integrity": "sha512-z+paD6YUQsk+AbGCEM4PrOXSss5gd66QfcVBFTKR/HpFL9jCqikS94HYwKww6fQyO7IxrIIyUu+g0Ka9tUS2Cg==",
+      "dev": true
+    },
+    "node_modules/dns-packet": {
+      "version": "5.6.0",
+      "resolved": "https://registry.npmjs.org/dns-packet/-/dns-packet-5.6.0.tgz",
+      "integrity": "sha512-rza3UH1LwdHh9qyPXp8lkwpjSNk/AMD3dPytUoRoqnypDUhY0xvbdmVhWOfxO68frEfV9BU8V12Ez7ZsHGZpCQ==",
+      "dev": true,
+      "dependencies": {
+        "@leichtgewicht/ip-codec": "^2.0.1"
+      },
       "engines": {
         "node": ">=6"
       }
     },
-    "node_modules/escape-html": {
-      "version": "1.0.3",
+    "node_modules/doctrine": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-3.0.0.tgz",
+      "integrity": "sha512-yS+Q5i3hBf7GBkd4KG8a7eBNNWNGLTaEwwYWUijIYM7zrlYDM0BFXHjjPWlWZ1Rg7UaddZeIDmi9jF3HmqiQ2w==",
       "dev": true,
-      "license": "MIT"
-    },
-    "node_modules/escape-string-regexp": {
-      "version": "1.0.5",
-      "license": "MIT",
+      "dependencies": {
+        "esutils": "^2.0.2"
+      },
       "engines": {
-        "node": ">=0.8.0"
+        "node": ">=6.0.0"
       }
     },
-    "node_modules/eslint": {
-      "version": "8.40.0",
+    "node_modules/dom-converter": {
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/dom-converter/-/dom-converter-0.2.0.tgz",
+      "integrity": "sha512-gd3ypIPfOMr9h5jIKq8E3sHOTCjeirnl0WK5ZdS1AW0Odt0b1PaWaHdJ4Qk4klv+YB9aJBS7mESXjFoDQPu6DA==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "@eslint-community/eslint-utils": "^4.2.0",
-        "@eslint-community/regexpp": "^4.4.0",
-        "@eslint/eslintrc": "^2.0.3",
-        "@eslint/js": "8.40.0",
-        "@humanwhocodes/config-array": "^0.11.8",
-        "@humanwhocodes/module-importer": "^1.0.1",
-        "@nodelib/fs.walk": "^1.2.8",
-        "ajv": "^6.10.0",
-        "chalk": "^4.0.0",
-        "cross-spawn": "^7.0.2",
-        "debug": "^4.3.2",
-        "doctrine": "^3.0.0",
-        "escape-string-regexp": "^4.0.0",
-        "eslint-scope": "^7.2.0",
-        "eslint-visitor-keys": "^3.4.1",
-        "espree": "^9.5.2",
-        "esquery": "^1.4.2",
-        "esutils": "^2.0.2",
-        "fast-deep-equal": "^3.1.3",
-        "file-entry-cache": "^6.0.1",
-        "find-up": "^5.0.0",
-        "glob-parent": "^6.0.2",
-        "globals": "^13.19.0",
-        "grapheme-splitter": "^1.0.4",
-        "ignore": "^5.2.0",
-        "import-fresh": "^3.0.0",
-        "imurmurhash": "^0.1.4",
-        "is-glob": "^4.0.0",
-        "is-path-inside": "^3.0.3",
-        "js-sdsl": "^4.1.4",
-        "js-yaml": "^4.1.0",
-        "json-stable-stringify-without-jsonify": "^1.0.1",
-        "levn": "^0.4.1",
-        "lodash.merge": "^4.6.2",
-        "minimatch": "^3.1.2",
-        "natural-compare": "^1.4.0",
-        "optionator": "^0.9.1",
-        "strip-ansi": "^6.0.1",
-        "strip-json-comments": "^3.1.0",
-        "text-table": "^0.2.0"
+        "utila": "~0.4"
+      }
+    },
+    "node_modules/dom-serializer": {
+      "version": "1.4.1",
+      "resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-1.4.1.tgz",
+      "integrity": "sha512-VHwB3KfrcOOkelEG2ZOfxqLZdfkil8PtJi4P8N2MMXucZq2yLp75ClViUlOVwyoHEDjYU433Aq+5zWP61+RGag==",
+      "dev": true,
+      "dependencies": {
+        "domelementtype": "^2.0.1",
+        "domhandler": "^4.2.0",
+        "entities": "^2.0.0"
       },
-      "bin": {
-        "eslint": "bin/eslint.js"
+      "funding": {
+        "url": "https://github.com/cheeriojs/dom-serializer?sponsor=1"
+      }
+    },
+    "node_modules/dom-serializer/node_modules/entities": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/entities/-/entities-2.2.0.tgz",
+      "integrity": "sha512-p92if5Nz619I0w+akJrLZH0MX0Pb5DX39XOwQTtXSdQQOaYH03S1uIQp4mhOZtAXrxq4ViO67YTiLBo2638o9A==",
+      "dev": true,
+      "funding": {
+        "url": "https://github.com/fb55/entities?sponsor=1"
+      }
+    },
+    "node_modules/domelementtype": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-2.3.0.tgz",
+      "integrity": "sha512-OLETBj6w0OsagBwdXnPdN0cnMfF9opN69co+7ZrbfPGrdpPVNBUj02spi6B1N7wChLQiPn4CSH/zJvXw56gmHw==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/fb55"
+        }
+      ]
+    },
+    "node_modules/domhandler": {
+      "version": "4.3.1",
+      "resolved": "https://registry.npmjs.org/domhandler/-/domhandler-4.3.1.tgz",
+      "integrity": "sha512-GrwoxYN+uWlzO8uhUXRl0P+kHE4GtVPfYzVLcUxPL7KNdHKj66vvlhiweIHqYYXWlw+T8iLMp42Lm67ghw4WMQ==",
+      "dev": true,
+      "dependencies": {
+        "domelementtype": "^2.2.0"
       },
       "engines": {
-        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+        "node": ">= 4"
       },
       "funding": {
-        "url": "https://opencollective.com/eslint"
+        "url": "https://github.com/fb55/domhandler?sponsor=1"
       }
     },
-    "node_modules/eslint-config-airbnb": {
-      "version": "19.0.4",
+    "node_modules/domutils": {
+      "version": "2.8.0",
+      "resolved": "https://registry.npmjs.org/domutils/-/domutils-2.8.0.tgz",
+      "integrity": "sha512-w96Cjofp72M5IIhpjgobBimYEfoPjx1Vx0BSX9P30WBdZW2WIKU0T1Bd0kz2eNZ9ikjKgHbEyKx8BB6H1L3h3A==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "eslint-config-airbnb-base": "^15.0.0",
-        "object.assign": "^4.1.2",
-        "object.entries": "^1.1.5"
+        "dom-serializer": "^1.0.1",
+        "domelementtype": "^2.2.0",
+        "domhandler": "^4.2.0"
       },
+      "funding": {
+        "url": "https://github.com/fb55/domutils?sponsor=1"
+      }
+    },
+    "node_modules/dot-case": {
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/dot-case/-/dot-case-3.0.4.tgz",
+      "integrity": "sha512-Kv5nKlh6yRrdrGvxeJ2e5y2eRUpkUosIW4A2AS38zwSz27zu7ufDwQPi5Jhs3XAlGNetl3bmnGhQsMtkKJnj3w==",
+      "dev": true,
+      "dependencies": {
+        "no-case": "^3.0.4",
+        "tslib": "^2.0.3"
+      }
+    },
+    "node_modules/dotenv": {
+      "version": "16.4.5",
+      "resolved": "https://registry.npmjs.org/dotenv/-/dotenv-16.4.5.tgz",
+      "integrity": "sha512-ZmdL2rui+eB2YwhsWzjInR8LldtZHGDoQ1ugH85ppHKwpUHL7j7rN0Ti9NCnGiQbhaZ11FpR+7ao1dNsmduNUg==",
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://dotenvx.com"
+      }
+    },
+    "node_modules/dotenv-defaults": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/dotenv-defaults/-/dotenv-defaults-2.0.2.tgz",
+      "integrity": "sha512-iOIzovWfsUHU91L5i8bJce3NYK5JXeAwH50Jh6+ARUdLiiGlYWfGw6UkzsYqaXZH/hjE/eCd/PlfM/qqyK0AMg==",
+      "dev": true,
+      "dependencies": {
+        "dotenv": "^8.2.0"
+      }
+    },
+    "node_modules/dotenv-defaults/node_modules/dotenv": {
+      "version": "8.6.0",
+      "resolved": "https://registry.npmjs.org/dotenv/-/dotenv-8.6.0.tgz",
+      "integrity": "sha512-IrPdXQsk2BbzvCBGBOTmmSH5SodmqZNt4ERAZDmW4CT+tL8VtvinqywuANaFu4bOMWki16nqf0e4oC0QIaDr/g==",
+      "dev": true,
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/dotenv-webpack": {
+      "version": "8.0.1",
+      "resolved": "https://registry.npmjs.org/dotenv-webpack/-/dotenv-webpack-8.0.1.tgz",
+      "integrity": "sha512-CdrgfhZOnx4uB18SgaoP9XHRN2v48BbjuXQsZY5ixs5A8579NxQkmMxRtI7aTwSiSQcM2ao12Fdu+L3ZS3bG4w==",
+      "dev": true,
+      "dependencies": {
+        "dotenv-defaults": "^2.0.2"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "peerDependencies": {
+        "webpack": "^4 || ^5"
+      }
+    },
+    "node_modules/drbg.js": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/drbg.js/-/drbg.js-1.0.1.tgz",
+      "integrity": "sha512-F4wZ06PvqxYLFEZKkFxTDcns9oFNk34hvmJSEwdzsxVQ8YI5YaxtACgQatkYgv2VI2CFkUd2Y+xosPQnHv809g==",
+      "dependencies": {
+        "browserify-aes": "^1.0.6",
+        "create-hash": "^1.1.2",
+        "create-hmac": "^1.1.4"
+      },
+      "engines": {
+        "node": ">=0.10"
+      }
+    },
+    "node_modules/eastasianwidth": {
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/eastasianwidth/-/eastasianwidth-0.2.0.tgz",
+      "integrity": "sha512-I88TYZWc9XiYHRQ4/3c5rjjfgkjhLyW2luGIheGERbNQ6OY7yTybanSpDXZa8y7VUP9YmDcYa+eyq4ca7iLqWA==",
+      "dev": true
+    },
+    "node_modules/easy-table": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/easy-table/-/easy-table-1.2.0.tgz",
+      "integrity": "sha512-OFzVOv03YpvtcWGe5AayU5G2hgybsg3iqA6drU8UaoZyB9jLGMTrz9+asnLp/E+6qPh88yEI1gvyZFZ41dmgww==",
+      "dev": true,
+      "dependencies": {
+        "ansi-regex": "^5.0.1"
+      },
+      "optionalDependencies": {
+        "wcwidth": "^1.0.1"
+      }
+    },
+    "node_modules/ecdsa-sig-formatter": {
+      "version": "1.0.11",
+      "resolved": "https://registry.npmjs.org/ecdsa-sig-formatter/-/ecdsa-sig-formatter-1.0.11.tgz",
+      "integrity": "sha512-nagl3RYrbNv6kQkeJIpt6NJZy8twLB/2vtz6yN9Z4vRKHN4/QZJIEbqohALSgwKdnksuY3k5Addp5lg8sVoVcQ==",
+      "dependencies": {
+        "safe-buffer": "^5.0.1"
+      }
+    },
+    "node_modules/ecpair": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/ecpair/-/ecpair-2.1.0.tgz",
+      "integrity": "sha512-cL/mh3MtJutFOvFc27GPZE2pWL3a3k4YvzUWEOvilnfZVlH3Jwgx/7d6tlD7/75tNk8TG2m+7Kgtz0SI1tWcqw==",
+      "dependencies": {
+        "randombytes": "^2.1.0",
+        "typeforce": "^1.18.0",
+        "wif": "^2.0.6"
+      },
+      "engines": {
+        "node": ">=8.0.0"
+      }
+    },
+    "node_modules/ee-first": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz",
+      "integrity": "sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow==",
+      "dev": true
+    },
+    "node_modules/electron-to-chromium": {
+      "version": "1.4.572",
+      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.572.tgz",
+      "integrity": "sha512-RlFobl4D3ieetbnR+2EpxdzFl9h0RAJkPK3pfiwMug2nhBin2ZCsGIAJWdpNniLz43sgXam/CgipOmvTA+rUiA=="
+    },
+    "node_modules/elliptic": {
+      "version": "6.5.4",
+      "resolved": "https://registry.npmjs.org/elliptic/-/elliptic-6.5.4.tgz",
+      "integrity": "sha512-iLhC6ULemrljPZb+QutR5TQGB+pdW6KGD5RSegS+8sorOZT+rdQFbsQFJgvN3eRqNALqJer4oQ16YvJHlU8hzQ==",
+      "dependencies": {
+        "bn.js": "^4.11.9",
+        "brorand": "^1.1.0",
+        "hash.js": "^1.0.0",
+        "hmac-drbg": "^1.0.1",
+        "inherits": "^2.0.4",
+        "minimalistic-assert": "^1.0.1",
+        "minimalistic-crypto-utils": "^1.0.1"
+      }
+    },
+    "node_modules/elliptic/node_modules/bn.js": {
+      "version": "4.12.0",
+      "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.0.tgz",
+      "integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA=="
+    },
+    "node_modules/emoji-regex": {
+      "version": "9.2.2",
+      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-9.2.2.tgz",
+      "integrity": "sha512-L18DaJsXSUk2+42pv8mLs5jJT2hqFkFE4j21wOmgbUqsZ2hL72NsUU785g9RXgo3s0ZNgVl42TiHp3ZtOv/Vyg==",
+      "dev": true
+    },
+    "node_modules/emojis-list": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/emojis-list/-/emojis-list-3.0.0.tgz",
+      "integrity": "sha512-/kyM18EfinwXZbno9FyUGeFh87KC8HRQBQGildHZbEuRyWFOmv1U10o9BBp8XVZDVNNuQKyIGIu5ZYAAXJ0V2Q==",
+      "dev": true,
+      "engines": {
+        "node": ">= 4"
+      }
+    },
+    "node_modules/encodeurl": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.2.tgz",
+      "integrity": "sha512-TPJXq8JqFaVYm2CWmPvnP2Iyo4ZSM7/QKcSmuMLDObfpH5fi7RUGmd/rTDf+rut/saiDiQEeVTNgAmJEdAOx0w==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.8"
+      }
+    },
+    "node_modules/enhanced-resolve": {
+      "version": "5.15.0",
+      "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.15.0.tgz",
+      "integrity": "sha512-LXYT42KJ7lpIKECr2mAXIaMldcNCh/7E0KBKOu4KSfkHmP+mZmSs+8V5gBAqisWBy0OO4W5Oyys0GO1Y8KtdKg==",
+      "dev": true,
+      "dependencies": {
+        "graceful-fs": "^4.2.4",
+        "tapable": "^2.2.0"
+      },
+      "engines": {
+        "node": ">=10.13.0"
+      }
+    },
+    "node_modules/entities": {
+      "version": "4.5.0",
+      "resolved": "https://registry.npmjs.org/entities/-/entities-4.5.0.tgz",
+      "integrity": "sha512-V0hjH4dGPh9Ao5p0MoRY6BVqtwCjhz6vI5LT8AJ55H+4g9/4vbHx1I54fS0XuclLhDHArPQCiMjDxjaL8fPxhw==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.12"
+      },
+      "funding": {
+        "url": "https://github.com/fb55/entities?sponsor=1"
+      }
+    },
+    "node_modules/error-ex": {
+      "version": "1.3.2",
+      "resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.2.tgz",
+      "integrity": "sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==",
+      "dev": true,
+      "dependencies": {
+        "is-arrayish": "^0.2.1"
+      }
+    },
+    "node_modules/error-stack-parser": {
+      "version": "2.1.4",
+      "resolved": "https://registry.npmjs.org/error-stack-parser/-/error-stack-parser-2.1.4.tgz",
+      "integrity": "sha512-Sk5V6wVazPhq5MhpO+AUxJn5x7XSXGl1R93Vn7i+zS15KDVxQijejNCrz8340/2bgLBjR9GtEG8ZVKONDjcqGQ==",
+      "dev": true,
+      "dependencies": {
+        "stackframe": "^1.3.4"
+      }
+    },
+    "node_modules/es-abstract": {
+      "version": "1.22.1",
+      "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.22.1.tgz",
+      "integrity": "sha512-ioRRcXMO6OFyRpyzV3kE1IIBd4WG5/kltnzdxSCqoP8CMGs/Li+M1uF5o7lOkZVFjDs+NLesthnF66Pg/0q0Lw==",
+      "dev": true,
+      "dependencies": {
+        "array-buffer-byte-length": "^1.0.0",
+        "arraybuffer.prototype.slice": "^1.0.1",
+        "available-typed-arrays": "^1.0.5",
+        "call-bind": "^1.0.2",
+        "es-set-tostringtag": "^2.0.1",
+        "es-to-primitive": "^1.2.1",
+        "function.prototype.name": "^1.1.5",
+        "get-intrinsic": "^1.2.1",
+        "get-symbol-description": "^1.0.0",
+        "globalthis": "^1.0.3",
+        "gopd": "^1.0.1",
+        "has": "^1.0.3",
+        "has-property-descriptors": "^1.0.0",
+        "has-proto": "^1.0.1",
+        "has-symbols": "^1.0.3",
+        "internal-slot": "^1.0.5",
+        "is-array-buffer": "^3.0.2",
+        "is-callable": "^1.2.7",
+        "is-negative-zero": "^2.0.2",
+        "is-regex": "^1.1.4",
+        "is-shared-array-buffer": "^1.0.2",
+        "is-string": "^1.0.7",
+        "is-typed-array": "^1.1.10",
+        "is-weakref": "^1.0.2",
+        "object-inspect": "^1.12.3",
+        "object-keys": "^1.1.1",
+        "object.assign": "^4.1.4",
+        "regexp.prototype.flags": "^1.5.0",
+        "safe-array-concat": "^1.0.0",
+        "safe-regex-test": "^1.0.0",
+        "string.prototype.trim": "^1.2.7",
+        "string.prototype.trimend": "^1.0.6",
+        "string.prototype.trimstart": "^1.0.6",
+        "typed-array-buffer": "^1.0.0",
+        "typed-array-byte-length": "^1.0.0",
+        "typed-array-byte-offset": "^1.0.0",
+        "typed-array-length": "^1.0.4",
+        "unbox-primitive": "^1.0.2",
+        "which-typed-array": "^1.1.10"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/es-define-property": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/es-define-property/-/es-define-property-1.0.0.tgz",
+      "integrity": "sha512-jxayLKShrEqqzJ0eumQbVhTYQM27CfT1T35+gCgDFoL82JLsXqTJ76zv6A0YLOgEnLUMvLzsDsGIrl8NFpT2gQ==",
+      "dependencies": {
+        "get-intrinsic": "^1.2.4"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
+    "node_modules/es-errors": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/es-errors/-/es-errors-1.3.0.tgz",
+      "integrity": "sha512-Zf5H2Kxt2xjTvbJvP2ZWLEICxA6j+hAmMzIlypy4xcBg1vKVnx89Wy0GbS+kf5cwCVFFzdCFh2XSCFNULS6csw==",
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
+    "node_modules/es-get-iterator": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/es-get-iterator/-/es-get-iterator-1.1.3.tgz",
+      "integrity": "sha512-sPZmqHBe6JIiTfN5q2pEi//TwxmAFHwj/XEuYjTuse78i8KxaqMTTzxPoFKuzRpDpTJ+0NAbpfenkmH2rePtuw==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.2",
+        "get-intrinsic": "^1.1.3",
+        "has-symbols": "^1.0.3",
+        "is-arguments": "^1.1.1",
+        "is-map": "^2.0.2",
+        "is-set": "^2.0.2",
+        "is-string": "^1.0.7",
+        "isarray": "^2.0.5",
+        "stop-iteration-iterator": "^1.0.0"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/es-module-lexer": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/es-module-lexer/-/es-module-lexer-1.3.0.tgz",
+      "integrity": "sha512-vZK7T0N2CBmBOixhmjdqx2gWVbFZ4DXZ/NyRMZVlJXPa7CyFS+/a4QQsDGDQy9ZfEzxFuNEsMLeQJnKP2p5/JA==",
+      "dev": true
+    },
+    "node_modules/es-set-tostringtag": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/es-set-tostringtag/-/es-set-tostringtag-2.0.1.tgz",
+      "integrity": "sha512-g3OMbtlwY3QewlqAiMLI47KywjWZoEytKr8pf6iTC8uJq5bIAH52Z9pnQ8pVL6whrCto53JZDuUIsifGeLorTg==",
+      "dev": true,
+      "dependencies": {
+        "get-intrinsic": "^1.1.3",
+        "has": "^1.0.3",
+        "has-tostringtag": "^1.0.0"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
+    "node_modules/es-shim-unscopables": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/es-shim-unscopables/-/es-shim-unscopables-1.0.0.tgz",
+      "integrity": "sha512-Jm6GPcCdC30eMLbZ2x8z2WuRwAws3zTBBKuusffYVUrNj/GVSUAZ+xKMaUpfNDR5IbyNA5LJbaecoUVbmUcB1w==",
+      "dev": true,
+      "dependencies": {
+        "has": "^1.0.3"
+      }
+    },
+    "node_modules/es-to-primitive": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.2.1.tgz",
+      "integrity": "sha512-QCOllgZJtaUo9miYBcLChTUaHNjJF3PYs1VidD7AwiEj1kYxKeQTctLAezAOH5ZKRH0g2IgPn6KwB4IT8iRpvA==",
+      "dev": true,
+      "dependencies": {
+        "is-callable": "^1.1.4",
+        "is-date-object": "^1.0.1",
+        "is-symbol": "^1.0.2"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/esbuild": {
+      "version": "0.21.5",
+      "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.21.5.tgz",
+      "integrity": "sha512-mg3OPMV4hXywwpoDxu3Qda5xCKQi+vCTZq8S9J/EpkhB2HzKXq4SNFZE3+NK93JYxc8VMSep+lOUSC/RVKaBqw==",
+      "dev": true,
+      "hasInstallScript": true,
+      "bin": {
+        "esbuild": "bin/esbuild"
+      },
+      "engines": {
+        "node": ">=12"
+      },
+      "optionalDependencies": {
+        "@esbuild/aix-ppc64": "0.21.5",
+        "@esbuild/android-arm": "0.21.5",
+        "@esbuild/android-arm64": "0.21.5",
+        "@esbuild/android-x64": "0.21.5",
+        "@esbuild/darwin-arm64": "0.21.5",
+        "@esbuild/darwin-x64": "0.21.5",
+        "@esbuild/freebsd-arm64": "0.21.5",
+        "@esbuild/freebsd-x64": "0.21.5",
+        "@esbuild/linux-arm": "0.21.5",
+        "@esbuild/linux-arm64": "0.21.5",
+        "@esbuild/linux-ia32": "0.21.5",
+        "@esbuild/linux-loong64": "0.21.5",
+        "@esbuild/linux-mips64el": "0.21.5",
+        "@esbuild/linux-ppc64": "0.21.5",
+        "@esbuild/linux-riscv64": "0.21.5",
+        "@esbuild/linux-s390x": "0.21.5",
+        "@esbuild/linux-x64": "0.21.5",
+        "@esbuild/netbsd-x64": "0.21.5",
+        "@esbuild/openbsd-x64": "0.21.5",
+        "@esbuild/sunos-x64": "0.21.5",
+        "@esbuild/win32-arm64": "0.21.5",
+        "@esbuild/win32-ia32": "0.21.5",
+        "@esbuild/win32-x64": "0.21.5"
+      }
+    },
+    "node_modules/escalade": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.1.tgz",
+      "integrity": "sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw==",
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/escape-html": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.3.tgz",
+      "integrity": "sha512-NiSupZ4OeuGwr68lGIeym/ksIZMJodUGOSCZ/FSnTxcrekbvqrgdUxlJOMpijaKZVjAJrWrGs/6Jy8OMuyj9ow==",
+      "dev": true
+    },
+    "node_modules/escape-string-regexp": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
+      "integrity": "sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg==",
+      "engines": {
+        "node": ">=0.8.0"
+      }
+    },
+    "node_modules/eslint": {
+      "version": "8.40.0",
+      "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.40.0.tgz",
+      "integrity": "sha512-bvR+TsP9EHL3TqNtj9sCNJVAFK3fBN8Q7g5waghxyRsPLIMwL73XSKnZFK0hk/O2ANC+iAoq6PWMQ+IfBAJIiQ==",
+      "dev": true,
+      "dependencies": {
+        "@eslint-community/eslint-utils": "^4.2.0",
+        "@eslint-community/regexpp": "^4.4.0",
+        "@eslint/eslintrc": "^2.0.3",
+        "@eslint/js": "8.40.0",
+        "@humanwhocodes/config-array": "^0.11.8",
+        "@humanwhocodes/module-importer": "^1.0.1",
+        "@nodelib/fs.walk": "^1.2.8",
+        "ajv": "^6.10.0",
+        "chalk": "^4.0.0",
+        "cross-spawn": "^7.0.2",
+        "debug": "^4.3.2",
+        "doctrine": "^3.0.0",
+        "escape-string-regexp": "^4.0.0",
+        "eslint-scope": "^7.2.0",
+        "eslint-visitor-keys": "^3.4.1",
+        "espree": "^9.5.2",
+        "esquery": "^1.4.2",
+        "esutils": "^2.0.2",
+        "fast-deep-equal": "^3.1.3",
+        "file-entry-cache": "^6.0.1",
+        "find-up": "^5.0.0",
+        "glob-parent": "^6.0.2",
+        "globals": "^13.19.0",
+        "grapheme-splitter": "^1.0.4",
+        "ignore": "^5.2.0",
+        "import-fresh": "^3.0.0",
+        "imurmurhash": "^0.1.4",
+        "is-glob": "^4.0.0",
+        "is-path-inside": "^3.0.3",
+        "js-sdsl": "^4.1.4",
+        "js-yaml": "^4.1.0",
+        "json-stable-stringify-without-jsonify": "^1.0.1",
+        "levn": "^0.4.1",
+        "lodash.merge": "^4.6.2",
+        "minimatch": "^3.1.2",
+        "natural-compare": "^1.4.0",
+        "optionator": "^0.9.1",
+        "strip-ansi": "^6.0.1",
+        "strip-json-comments": "^3.1.0",
+        "text-table": "^0.2.0"
+      },
+      "bin": {
+        "eslint": "bin/eslint.js"
+      },
+      "engines": {
+        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+      },
+      "funding": {
+        "url": "https://opencollective.com/eslint"
+      }
+    },
+    "node_modules/eslint-config-airbnb": {
+      "version": "19.0.4",
+      "resolved": "https://registry.npmjs.org/eslint-config-airbnb/-/eslint-config-airbnb-19.0.4.tgz",
+      "integrity": "sha512-T75QYQVQX57jiNgpF9r1KegMICE94VYwoFQyMGhrvc+lB8YF2E/M/PYDaQe1AJcWaEgqLE+ErXV1Og/+6Vyzew==",
+      "dev": true,
+      "dependencies": {
+        "eslint-config-airbnb-base": "^15.0.0",
+        "object.assign": "^4.1.2",
+        "object.entries": "^1.1.5"
+      },
+      "engines": {
+        "node": "^10.12.0 || ^12.22.0 || ^14.17.0 || >=16.0.0"
+      },
+      "peerDependencies": {
+        "eslint": "^7.32.0 || ^8.2.0",
+        "eslint-plugin-import": "^2.25.3",
+        "eslint-plugin-jsx-a11y": "^6.5.1",
+        "eslint-plugin-react": "^7.28.0",
+        "eslint-plugin-react-hooks": "^4.3.0"
+      }
+    },
+    "node_modules/eslint-config-airbnb-base": {
+      "version": "15.0.0",
+      "resolved": "https://registry.npmjs.org/eslint-config-airbnb-base/-/eslint-config-airbnb-base-15.0.0.tgz",
+      "integrity": "sha512-xaX3z4ZZIcFLvh2oUNvcX5oEofXda7giYmuplVxoOg5A7EXJMrUyqRgR+mhDhPK8LZ4PttFOBvCYDbX3sUoUig==",
+      "dev": true,
+      "dependencies": {
+        "confusing-browser-globals": "^1.0.10",
+        "object.assign": "^4.1.2",
+        "object.entries": "^1.1.5",
+        "semver": "^6.3.0"
+      },
+      "engines": {
+        "node": "^10.12.0 || >=12.0.0"
+      },
+      "peerDependencies": {
+        "eslint": "^7.32.0 || ^8.2.0",
+        "eslint-plugin-import": "^2.25.2"
+      }
+    },
+    "node_modules/eslint-config-airbnb-typescript": {
+      "version": "17.1.0",
+      "resolved": "https://registry.npmjs.org/eslint-config-airbnb-typescript/-/eslint-config-airbnb-typescript-17.1.0.tgz",
+      "integrity": "sha512-GPxI5URre6dDpJ0CtcthSZVBAfI+Uw7un5OYNVxP2EYi3H81Jw701yFP7AU+/vCE7xBtFmjge7kfhhk4+RAiig==",
+      "dev": true,
+      "dependencies": {
+        "eslint-config-airbnb-base": "^15.0.0"
+      },
+      "peerDependencies": {
+        "@typescript-eslint/eslint-plugin": "^5.13.0 || ^6.0.0",
+        "@typescript-eslint/parser": "^5.0.0 || ^6.0.0",
+        "eslint": "^7.32.0 || ^8.2.0",
+        "eslint-plugin-import": "^2.25.3"
+      }
+    },
+    "node_modules/eslint-config-prettier": {
+      "version": "8.10.0",
+      "resolved": "https://registry.npmjs.org/eslint-config-prettier/-/eslint-config-prettier-8.10.0.tgz",
+      "integrity": "sha512-SM8AMJdeQqRYT9O9zguiruQZaN7+z+E4eAP9oiLNGKMtomwaB1E9dcgUD6ZAn/eQAb52USbvezbiljfZUhbJcg==",
+      "dev": true,
+      "bin": {
+        "eslint-config-prettier": "bin/cli.js"
+      },
+      "peerDependencies": {
+        "eslint": ">=7.0.0"
+      }
+    },
+    "node_modules/eslint-import-resolver-node": {
+      "version": "0.3.7",
+      "resolved": "https://registry.npmjs.org/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.7.tgz",
+      "integrity": "sha512-gozW2blMLJCeFpBwugLTGyvVjNoeo1knonXAcatC6bjPBZitotxdWf7Gimr25N4c0AAOo4eOUfaG82IJPDpqCA==",
+      "dev": true,
+      "dependencies": {
+        "debug": "^3.2.7",
+        "is-core-module": "^2.11.0",
+        "resolve": "^1.22.1"
+      }
+    },
+    "node_modules/eslint-import-resolver-node/node_modules/debug": {
+      "version": "3.2.7",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz",
+      "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==",
+      "dev": true,
+      "dependencies": {
+        "ms": "^2.1.1"
+      }
+    },
+    "node_modules/eslint-module-utils": {
+      "version": "2.8.0",
+      "resolved": "https://registry.npmjs.org/eslint-module-utils/-/eslint-module-utils-2.8.0.tgz",
+      "integrity": "sha512-aWajIYfsqCKRDgUfjEXNN/JlrzauMuSEy5sbd7WXbtW3EH6A6MpwEh42c7qD+MqQo9QMJ6fWLAeIJynx0g6OAw==",
+      "dev": true,
+      "dependencies": {
+        "debug": "^3.2.7"
+      },
+      "engines": {
+        "node": ">=4"
+      },
+      "peerDependenciesMeta": {
+        "eslint": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/eslint-module-utils/node_modules/debug": {
+      "version": "3.2.7",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz",
+      "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==",
+      "dev": true,
+      "dependencies": {
+        "ms": "^2.1.1"
+      }
+    },
+    "node_modules/eslint-plugin-import": {
+      "version": "2.28.0",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-import/-/eslint-plugin-import-2.28.0.tgz",
+      "integrity": "sha512-B8s/n+ZluN7sxj9eUf7/pRFERX0r5bnFA2dCaLHy2ZeaQEAz0k+ZZkFWRFHJAqxfxQDx6KLv9LeIki7cFdwW+Q==",
+      "dev": true,
+      "dependencies": {
+        "array-includes": "^3.1.6",
+        "array.prototype.findlastindex": "^1.2.2",
+        "array.prototype.flat": "^1.3.1",
+        "array.prototype.flatmap": "^1.3.1",
+        "debug": "^3.2.7",
+        "doctrine": "^2.1.0",
+        "eslint-import-resolver-node": "^0.3.7",
+        "eslint-module-utils": "^2.8.0",
+        "has": "^1.0.3",
+        "is-core-module": "^2.12.1",
+        "is-glob": "^4.0.3",
+        "minimatch": "^3.1.2",
+        "object.fromentries": "^2.0.6",
+        "object.groupby": "^1.0.0",
+        "object.values": "^1.1.6",
+        "resolve": "^1.22.3",
+        "semver": "^6.3.1",
+        "tsconfig-paths": "^3.14.2"
+      },
+      "engines": {
+        "node": ">=4"
+      },
+      "peerDependencies": {
+        "eslint": "^2 || ^3 || ^4 || ^5 || ^6 || ^7.2.0 || ^8"
+      }
+    },
+    "node_modules/eslint-plugin-import/node_modules/debug": {
+      "version": "3.2.7",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz",
+      "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==",
+      "dev": true,
+      "dependencies": {
+        "ms": "^2.1.1"
+      }
+    },
+    "node_modules/eslint-plugin-import/node_modules/doctrine": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-2.1.0.tgz",
+      "integrity": "sha512-35mSku4ZXK0vfCuHEDAwt55dg2jNajHZ1odvF+8SSr82EsZY4QmXfuWso8oEd8zRhVObSN18aM0CjSdoBX7zIw==",
+      "dev": true,
+      "dependencies": {
+        "esutils": "^2.0.2"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/eslint-plugin-jsx-a11y": {
+      "version": "6.7.1",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-jsx-a11y/-/eslint-plugin-jsx-a11y-6.7.1.tgz",
+      "integrity": "sha512-63Bog4iIethyo8smBklORknVjB0T2dwB8Mr/hIC+fBS0uyHdYYpzM/Ed+YC8VxTjlXHEWFOdmgwcDn1U2L9VCA==",
+      "dev": true,
+      "dependencies": {
+        "@babel/runtime": "^7.20.7",
+        "aria-query": "^5.1.3",
+        "array-includes": "^3.1.6",
+        "array.prototype.flatmap": "^1.3.1",
+        "ast-types-flow": "^0.0.7",
+        "axe-core": "^4.6.2",
+        "axobject-query": "^3.1.1",
+        "damerau-levenshtein": "^1.0.8",
+        "emoji-regex": "^9.2.2",
+        "has": "^1.0.3",
+        "jsx-ast-utils": "^3.3.3",
+        "language-tags": "=1.0.5",
+        "minimatch": "^3.1.2",
+        "object.entries": "^1.1.6",
+        "object.fromentries": "^2.0.6",
+        "semver": "^6.3.0"
+      },
+      "engines": {
+        "node": ">=4.0"
+      },
+      "peerDependencies": {
+        "eslint": "^3 || ^4 || ^5 || ^6 || ^7 || ^8"
+      }
+    },
+    "node_modules/eslint-plugin-no-inline-styles": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-no-inline-styles/-/eslint-plugin-no-inline-styles-1.0.5.tgz",
+      "integrity": "sha512-nftOfHV/ag0P0vEPQ3p54HVpGCp6k/E+pHdYnRm2wDK8QhClfmMjrCw+POL5RH/SN1AmTifCTh5VzkeubLgMpA==",
+      "dev": true,
+      "dependencies": {
+        "lodash.get": "^4.4.2"
+      }
+    },
+    "node_modules/eslint-plugin-playwright": {
+      "version": "1.6.0",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-playwright/-/eslint-plugin-playwright-1.6.0.tgz",
+      "integrity": "sha512-tI1E/EDbHT4Fx5KvukUG3RTIT0gk44gvTP8bNwxLCFsUXVM98ZJG5zWU6Om5JOzH9FrmN4AhMu/UKyEsu0ZoDA==",
+      "dev": true,
+      "dependencies": {
+        "globals": "^13.23.0"
+      },
+      "engines": {
+        "node": ">=16.6.0"
+      },
+      "peerDependencies": {
+        "eslint": ">=8.40.0",
+        "eslint-plugin-jest": ">=25"
+      },
+      "peerDependenciesMeta": {
+        "eslint-plugin-jest": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/eslint-plugin-playwright/node_modules/globals": {
+      "version": "13.24.0",
+      "resolved": "https://registry.npmjs.org/globals/-/globals-13.24.0.tgz",
+      "integrity": "sha512-AhO5QUcj8llrbG09iWhPU2B204J1xnPeL8kQmVorSsy+Sjj1sk8gIyh6cUocGmH4L0UuhAJy+hJMRA4mgA4mFQ==",
+      "dev": true,
+      "dependencies": {
+        "type-fest": "^0.20.2"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/eslint-plugin-playwright/node_modules/type-fest": {
+      "version": "0.20.2",
+      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.20.2.tgz",
+      "integrity": "sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/eslint-plugin-prettier": {
+      "version": "4.2.1",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-prettier/-/eslint-plugin-prettier-4.2.1.tgz",
+      "integrity": "sha512-f/0rXLXUt0oFYs8ra4w49wYZBG5GKZpAYsJSm6rnYL5uVDjd+zowwMwVZHnAjf4edNrKpCDYfXDgmRE/Ak7QyQ==",
+      "dev": true,
+      "dependencies": {
+        "prettier-linter-helpers": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=12.0.0"
+      },
+      "peerDependencies": {
+        "eslint": ">=7.28.0",
+        "prettier": ">=2.0.0"
+      },
+      "peerDependenciesMeta": {
+        "eslint-config-prettier": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/eslint-plugin-react": {
+      "version": "7.33.1",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-react/-/eslint-plugin-react-7.33.1.tgz",
+      "integrity": "sha512-L093k0WAMvr6VhNwReB8VgOq5s2LesZmrpPdKz/kZElQDzqS7G7+DnKoqT+w4JwuiGeAhAvHO0fvy0Eyk4ejDA==",
+      "dev": true,
+      "dependencies": {
+        "array-includes": "^3.1.6",
+        "array.prototype.flatmap": "^1.3.1",
+        "array.prototype.tosorted": "^1.1.1",
+        "doctrine": "^2.1.0",
+        "estraverse": "^5.3.0",
+        "jsx-ast-utils": "^2.4.1 || ^3.0.0",
+        "minimatch": "^3.1.2",
+        "object.entries": "^1.1.6",
+        "object.fromentries": "^2.0.6",
+        "object.hasown": "^1.1.2",
+        "object.values": "^1.1.6",
+        "prop-types": "^15.8.1",
+        "resolve": "^2.0.0-next.4",
+        "semver": "^6.3.1",
+        "string.prototype.matchall": "^4.0.8"
+      },
+      "engines": {
+        "node": ">=4"
+      },
+      "peerDependencies": {
+        "eslint": "^3 || ^4 || ^5 || ^6 || ^7 || ^8"
+      }
+    },
+    "node_modules/eslint-plugin-react-hooks": {
+      "version": "4.6.0",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-react-hooks/-/eslint-plugin-react-hooks-4.6.0.tgz",
+      "integrity": "sha512-oFc7Itz9Qxh2x4gNHStv3BqJq54ExXmfC+a1NjAta66IAN87Wu0R/QArgIS9qKzX3dXKPI9H5crl9QchNMY9+g==",
+      "dev": true,
+      "engines": {
+        "node": ">=10"
+      },
+      "peerDependencies": {
+        "eslint": "^3.0.0 || ^4.0.0 || ^5.0.0 || ^6.0.0 || ^7.0.0 || ^8.0.0-0"
+      }
+    },
+    "node_modules/eslint-plugin-react/node_modules/doctrine": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-2.1.0.tgz",
+      "integrity": "sha512-35mSku4ZXK0vfCuHEDAwt55dg2jNajHZ1odvF+8SSr82EsZY4QmXfuWso8oEd8zRhVObSN18aM0CjSdoBX7zIw==",
+      "dev": true,
+      "dependencies": {
+        "esutils": "^2.0.2"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/eslint-plugin-react/node_modules/resolve": {
+      "version": "2.0.0-next.4",
+      "resolved": "https://registry.npmjs.org/resolve/-/resolve-2.0.0-next.4.tgz",
+      "integrity": "sha512-iMDbmAWtfU+MHpxt/I5iWI7cY6YVEZUQ3MBgPQ++XD1PELuJHIl82xBmObyP2KyQmkNB2dsqF7seoQQiAn5yDQ==",
+      "dev": true,
+      "dependencies": {
+        "is-core-module": "^2.9.0",
+        "path-parse": "^1.0.7",
+        "supports-preserve-symlinks-flag": "^1.0.0"
+      },
+      "bin": {
+        "resolve": "bin/resolve"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/eslint-scope": {
+      "version": "5.1.1",
+      "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.1.1.tgz",
+      "integrity": "sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw==",
+      "dev": true,
+      "dependencies": {
+        "esrecurse": "^4.3.0",
+        "estraverse": "^4.1.1"
+      },
+      "engines": {
+        "node": ">=8.0.0"
+      }
+    },
+    "node_modules/eslint-scope/node_modules/estraverse": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.3.0.tgz",
+      "integrity": "sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==",
+      "dev": true,
+      "engines": {
+        "node": ">=4.0"
+      }
+    },
+    "node_modules/eslint-visitor-keys": {
+      "version": "3.4.2",
+      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.4.2.tgz",
+      "integrity": "sha512-8drBzUEyZ2llkpCA67iYrgEssKDUu68V8ChqqOfFupIaG/LCVPUT+CoGJpT77zJprs4T/W7p07LP7zAIMuweVw==",
+      "dev": true,
+      "engines": {
+        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+      },
+      "funding": {
+        "url": "https://opencollective.com/eslint"
+      }
+    },
+    "node_modules/eslint/node_modules/ansi-styles": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+      "dev": true,
+      "dependencies": {
+        "color-convert": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
+      }
+    },
+    "node_modules/eslint/node_modules/chalk": {
+      "version": "4.1.2",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
+      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+      "dev": true,
+      "dependencies": {
+        "ansi-styles": "^4.1.0",
+        "supports-color": "^7.1.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/chalk?sponsor=1"
+      }
+    },
+    "node_modules/eslint/node_modules/color-convert": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+      "dev": true,
+      "dependencies": {
+        "color-name": "~1.1.4"
+      },
+      "engines": {
+        "node": ">=7.0.0"
+      }
+    },
+    "node_modules/eslint/node_modules/color-name": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+      "dev": true
+    },
+    "node_modules/eslint/node_modules/escape-string-regexp": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz",
+      "integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==",
+      "dev": true,
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/eslint/node_modules/eslint-scope": {
+      "version": "7.2.2",
+      "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-7.2.2.tgz",
+      "integrity": "sha512-dOt21O7lTMhDM+X9mB4GX+DZrZtCUJPL/wlcTqxyrx5IvO0IYtILdtrQGQp+8n5S0gwSVmOf9NQrjMOgfQZlIg==",
+      "dev": true,
+      "dependencies": {
+        "esrecurse": "^4.3.0",
+        "estraverse": "^5.2.0"
+      },
+      "engines": {
+        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+      },
+      "funding": {
+        "url": "https://opencollective.com/eslint"
+      }
+    },
+    "node_modules/eslint/node_modules/globals": {
+      "version": "13.20.0",
+      "resolved": "https://registry.npmjs.org/globals/-/globals-13.20.0.tgz",
+      "integrity": "sha512-Qg5QtVkCy/kv3FUSlu4ukeZDVf9ee0iXLAUYX13gbR17bnejFTzr4iS9bY7kwCf1NztRNm1t91fjOiyx4CSwPQ==",
+      "dev": true,
+      "dependencies": {
+        "type-fest": "^0.20.2"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/eslint/node_modules/has-flag": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/eslint/node_modules/is-path-inside": {
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/is-path-inside/-/is-path-inside-3.0.3.tgz",
+      "integrity": "sha512-Fd4gABb+ycGAmKou8eMftCupSir5lRxqf4aD/vd0cD2qc4HL07OjCeuHMr8Ro4CoMaeCKDB0/ECBOVWjTwUvPQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/eslint/node_modules/supports-color": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+      "dev": true,
+      "dependencies": {
+        "has-flag": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/eslint/node_modules/type-fest": {
+      "version": "0.20.2",
+      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.20.2.tgz",
+      "integrity": "sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/espree": {
+      "version": "9.6.1",
+      "resolved": "https://registry.npmjs.org/espree/-/espree-9.6.1.tgz",
+      "integrity": "sha512-oruZaFkjorTpF32kDSI5/75ViwGeZginGGy2NoOSg3Q9bnwlnmDm4HLnkl0RE3n+njDXR037aY1+x58Z/zFdwQ==",
+      "dev": true,
+      "dependencies": {
+        "acorn": "^8.9.0",
+        "acorn-jsx": "^5.3.2",
+        "eslint-visitor-keys": "^3.4.1"
+      },
+      "engines": {
+        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+      },
+      "funding": {
+        "url": "https://opencollective.com/eslint"
+      }
+    },
+    "node_modules/esquery": {
+      "version": "1.5.0",
+      "resolved": "https://registry.npmjs.org/esquery/-/esquery-1.5.0.tgz",
+      "integrity": "sha512-YQLXUplAwJgCydQ78IMJywZCceoqk1oH01OERdSAJc/7U2AylwjhSCLDEtqwg811idIS/9fIU5GjG73IgjKMVg==",
+      "dev": true,
+      "dependencies": {
+        "estraverse": "^5.1.0"
+      },
+      "engines": {
+        "node": ">=0.10"
+      }
+    },
+    "node_modules/esrecurse": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/esrecurse/-/esrecurse-4.3.0.tgz",
+      "integrity": "sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag==",
+      "dev": true,
+      "dependencies": {
+        "estraverse": "^5.2.0"
+      },
+      "engines": {
+        "node": ">=4.0"
+      }
+    },
+    "node_modules/estraverse": {
+      "version": "5.3.0",
+      "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz",
+      "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==",
+      "dev": true,
+      "engines": {
+        "node": ">=4.0"
+      }
+    },
+    "node_modules/esutils": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.3.tgz",
+      "integrity": "sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/etag": {
+      "version": "1.8.1",
+      "resolved": "https://registry.npmjs.org/etag/-/etag-1.8.1.tgz",
+      "integrity": "sha512-aIL5Fx7mawVa300al2BnEE4iNvo1qETxLrPI/o05L7z6go7fCw1J6EQmbK4FmJ2AS7kgVF/KEZWufBfdClMcPg==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
+    "node_modules/eventemitter3": {
+      "version": "4.0.7",
+      "resolved": "https://registry.npmjs.org/eventemitter3/-/eventemitter3-4.0.7.tgz",
+      "integrity": "sha512-8guHBZCwKnFhYdHr2ysuRWErTwhoN2X8XELRlrRwpmfeY2jjuUN4taQMsULKUVo1K4DvZl+0pgfyoysHxvmvEw=="
+    },
+    "node_modules/events": {
+      "version": "3.3.0",
+      "resolved": "https://registry.npmjs.org/events/-/events-3.3.0.tgz",
+      "integrity": "sha512-mQw+2fkQbALzQ7V0MY0IqdnXNOeTtP4r0lN9z7AAawCXgqea7bDii20AYrIBrFd/Hx0M2Ocz6S111CaFkUcb0Q==",
+      "engines": {
+        "node": ">=0.8.x"
+      }
+    },
+    "node_modules/evp_bytestokey": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/evp_bytestokey/-/evp_bytestokey-1.0.3.tgz",
+      "integrity": "sha512-/f2Go4TognH/KvCISP7OUsHn85hT9nUkxxA9BEWxFn+Oj9o8ZNLm/40hdlgSLyuOimsrTKLUMEorQexp/aPQeA==",
+      "dependencies": {
+        "md5.js": "^1.3.4",
+        "safe-buffer": "^5.1.1"
+      }
+    },
+    "node_modules/execa": {
+      "version": "5.1.1",
+      "resolved": "https://registry.npmjs.org/execa/-/execa-5.1.1.tgz",
+      "integrity": "sha512-8uSpZZocAZRBAPIEINJj3Lo9HyGitllczc27Eh5YYojjMFMn8yHMDMaUHE2Jqfq05D/wucwI4JGURyXt1vchyg==",
+      "dev": true,
+      "dependencies": {
+        "cross-spawn": "^7.0.3",
+        "get-stream": "^6.0.0",
+        "human-signals": "^2.1.0",
+        "is-stream": "^2.0.0",
+        "merge-stream": "^2.0.0",
+        "npm-run-path": "^4.0.1",
+        "onetime": "^5.1.2",
+        "signal-exit": "^3.0.3",
+        "strip-final-newline": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sindresorhus/execa?sponsor=1"
+      }
+    },
+    "node_modules/exenv": {
+      "version": "1.2.2",
+      "resolved": "https://registry.npmjs.org/exenv/-/exenv-1.2.2.tgz",
+      "integrity": "sha512-Z+ktTxTwv9ILfgKCk32OX3n/doe+OcLTRtqK9pcL+JsP3J1/VW8Uvl4ZjLlKqeW4rzK4oesDOGMEMRIZqtP4Iw=="
+    },
+    "node_modules/express": {
+      "version": "4.18.2",
+      "resolved": "https://registry.npmjs.org/express/-/express-4.18.2.tgz",
+      "integrity": "sha512-5/PsL6iGPdfQ/lKM1UuielYgv3BUoJfz1aUwU9vHZ+J7gyvwdQXFEBIEIaxeGf0GIcreATNyBExtalisDbuMqQ==",
+      "dev": true,
+      "dependencies": {
+        "accepts": "~1.3.8",
+        "array-flatten": "1.1.1",
+        "body-parser": "1.20.1",
+        "content-disposition": "0.5.4",
+        "content-type": "~1.0.4",
+        "cookie": "0.5.0",
+        "cookie-signature": "1.0.6",
+        "debug": "2.6.9",
+        "depd": "2.0.0",
+        "encodeurl": "~1.0.2",
+        "escape-html": "~1.0.3",
+        "etag": "~1.8.1",
+        "finalhandler": "1.2.0",
+        "fresh": "0.5.2",
+        "http-errors": "2.0.0",
+        "merge-descriptors": "1.0.1",
+        "methods": "~1.1.2",
+        "on-finished": "2.4.1",
+        "parseurl": "~1.3.3",
+        "path-to-regexp": "0.1.7",
+        "proxy-addr": "~2.0.7",
+        "qs": "6.11.0",
+        "range-parser": "~1.2.1",
+        "safe-buffer": "5.2.1",
+        "send": "0.18.0",
+        "serve-static": "1.15.0",
+        "setprototypeof": "1.2.0",
+        "statuses": "2.0.1",
+        "type-is": "~1.6.18",
+        "utils-merge": "1.0.1",
+        "vary": "~1.1.2"
+      },
+      "engines": {
+        "node": ">= 0.10.0"
+      }
+    },
+    "node_modules/express/node_modules/array-flatten": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/array-flatten/-/array-flatten-1.1.1.tgz",
+      "integrity": "sha512-PCVAQswWemu6UdxsDFFX/+gVeYqKAod3D3UVm91jHwynguOwAvYPhx8nNlM++NqRcK6CxxpUafjmhIdKiHibqg==",
+      "dev": true
+    },
+    "node_modules/express/node_modules/debug": {
+      "version": "2.6.9",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+      "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+      "dev": true,
+      "dependencies": {
+        "ms": "2.0.0"
+      }
+    },
+    "node_modules/express/node_modules/ms": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+      "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==",
+      "dev": true
+    },
+    "node_modules/express/node_modules/qs": {
+      "version": "6.11.0",
+      "resolved": "https://registry.npmjs.org/qs/-/qs-6.11.0.tgz",
+      "integrity": "sha512-MvjoMCJwEarSbUYk5O+nmoSzSutSsTwF85zcHPQ9OrlFoZOYIjaqBAJIqIXjptyD5vThxGq52Xu/MaJzRkIk4Q==",
+      "dev": true,
+      "dependencies": {
+        "side-channel": "^1.0.4"
+      },
+      "engines": {
+        "node": ">=0.6"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/fast-deep-equal": {
+      "version": "3.1.3",
+      "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz",
+      "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==",
+      "dev": true
+    },
+    "node_modules/fast-diff": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/fast-diff/-/fast-diff-1.3.0.tgz",
+      "integrity": "sha512-VxPP4NqbUjj6MaAOafWeUn2cXWLcCtljklUtZf0Ind4XQ+QPtmA0b18zZy0jIQx+ExRVCR/ZQpBmik5lXshNsw==",
+      "dev": true
+    },
+    "node_modules/fast-glob": {
+      "version": "3.3.2",
+      "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.3.2.tgz",
+      "integrity": "sha512-oX2ruAFQwf/Orj8m737Y5adxDQO0LAB7/S5MnxCdTNDd4p6BsyIVsv9JQsATbTSq8KHRpLwIHbVlUNatxd+1Ow==",
+      "dev": true,
+      "dependencies": {
+        "@nodelib/fs.stat": "^2.0.2",
+        "@nodelib/fs.walk": "^1.2.3",
+        "glob-parent": "^5.1.2",
+        "merge2": "^1.3.0",
+        "micromatch": "^4.0.4"
+      },
+      "engines": {
+        "node": ">=8.6.0"
+      }
+    },
+    "node_modules/fast-glob/node_modules/glob-parent": {
+      "version": "5.1.2",
+      "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz",
+      "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==",
+      "dev": true,
+      "dependencies": {
+        "is-glob": "^4.0.1"
+      },
+      "engines": {
+        "node": ">= 6"
+      }
+    },
+    "node_modules/fast-json-stable-stringify": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz",
+      "integrity": "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==",
+      "dev": true
+    },
+    "node_modules/fast-levenshtein": {
+      "version": "2.0.6",
+      "resolved": "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz",
+      "integrity": "sha512-DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw==",
+      "dev": true
+    },
+    "node_modules/fastq": {
+      "version": "1.15.0",
+      "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.15.0.tgz",
+      "integrity": "sha512-wBrocU2LCXXa+lWBt8RoIRD89Fi8OdABODa/kEnyeyjS5aZO5/GNvI5sEINADqP/h8M29UHTHUb53sUu5Ihqdw==",
+      "dev": true,
+      "dependencies": {
+        "reusify": "^1.0.4"
+      }
+    },
+    "node_modules/faye-websocket": {
+      "version": "0.11.4",
+      "resolved": "https://registry.npmjs.org/faye-websocket/-/faye-websocket-0.11.4.tgz",
+      "integrity": "sha512-CzbClwlXAuiRQAlUyfqPgvPoNKTckTPGfwZV4ZdAhVcP2lh9KUxJg2b5GkE7XbjKQ3YJnQ9z6D9ntLAlB+tP8g==",
+      "dev": true,
+      "dependencies": {
+        "websocket-driver": ">=0.5.1"
+      },
+      "engines": {
+        "node": ">=0.8.0"
+      }
+    },
+    "node_modules/file-entry-cache": {
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-6.0.1.tgz",
+      "integrity": "sha512-7Gps/XWymbLk2QLYK4NzpMOrYjMhdIxXuIvy2QBsLE6ljuodKvdkWs/cpyJJ3CVIVpH0Oi1Hvg1ovbMzLdFBBg==",
+      "dev": true,
+      "dependencies": {
+        "flat-cache": "^3.0.4"
+      },
+      "engines": {
+        "node": "^10.12.0 || >=12.0.0"
+      }
+    },
+    "node_modules/file-uri-to-path": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/file-uri-to-path/-/file-uri-to-path-1.0.0.tgz",
+      "integrity": "sha512-0Zt+s3L7Vf1biwWZ29aARiVYLx7iMGnEUl9x33fbB/j3jR81u/O2LbqK+Bm1CDSNDKVtJ/YjwY7TUd5SkeLQLw=="
+    },
+    "node_modules/fill-range": {
+      "version": "7.0.1",
+      "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz",
+      "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==",
+      "dev": true,
+      "dependencies": {
+        "to-regex-range": "^5.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/filter-obj": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/filter-obj/-/filter-obj-1.1.0.tgz",
+      "integrity": "sha512-8rXg1ZnX7xzy2NGDVkBVaAy+lSlPNwad13BtgSlLuxfIslyt5Vg64U7tFcCt4WS1R0hvtnQybT/IyCkGZ3DpXQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/finalhandler": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.2.0.tgz",
+      "integrity": "sha512-5uXcUVftlQMFnWC9qu/svkWv3GTd2PfUhK/3PLkYNAe7FbqJMt3515HaxE6eRL74GdsriiwujiawdaB1BpEISg==",
+      "dev": true,
+      "dependencies": {
+        "debug": "2.6.9",
+        "encodeurl": "~1.0.2",
+        "escape-html": "~1.0.3",
+        "on-finished": "2.4.1",
+        "parseurl": "~1.3.3",
+        "statuses": "2.0.1",
+        "unpipe": "~1.0.0"
+      },
+      "engines": {
+        "node": ">= 0.8"
+      }
+    },
+    "node_modules/finalhandler/node_modules/debug": {
+      "version": "2.6.9",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+      "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+      "dev": true,
+      "dependencies": {
+        "ms": "2.0.0"
+      }
+    },
+    "node_modules/finalhandler/node_modules/ms": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+      "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==",
+      "dev": true
+    },
+    "node_modules/find-up": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/find-up/-/find-up-5.0.0.tgz",
+      "integrity": "sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng==",
+      "dev": true,
+      "dependencies": {
+        "locate-path": "^6.0.0",
+        "path-exists": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/flat-cache": {
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-3.0.4.tgz",
+      "integrity": "sha512-dm9s5Pw7Jc0GvMYbshN6zchCA9RgQlzzEZX3vylR9IqFfS8XciblUXOKfW6SiuJ0e13eDYZoZV5wdrev7P3Nwg==",
+      "dev": true,
+      "dependencies": {
+        "flatted": "^3.1.0",
+        "rimraf": "^3.0.2"
+      },
+      "engines": {
+        "node": "^10.12.0 || >=12.0.0"
+      }
+    },
+    "node_modules/flatted": {
+      "version": "3.2.7",
+      "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.2.7.tgz",
+      "integrity": "sha512-5nqDSxl8nn5BSNxyR3n4I6eDmbolI6WT+QqR547RwxQapgjQBmtktdP+HTBb/a/zLsbzERTONyUB5pefh5TtjQ==",
+      "dev": true
+    },
+    "node_modules/follow-redirects": {
+      "version": "1.15.6",
+      "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.6.tgz",
+      "integrity": "sha512-wWN62YITEaOpSK584EZXJafH1AGpO8RVgElfkuXbTOrPX4fIfOyEpW/CsiNd8JdYrAoOvafRTOEnvsO++qCqFA==",
+      "funding": [
+        {
+          "type": "individual",
+          "url": "https://github.com/sponsors/RubenVerborgh"
+        }
+      ],
+      "engines": {
+        "node": ">=4.0"
+      },
+      "peerDependenciesMeta": {
+        "debug": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/for-each": {
+      "version": "0.3.3",
+      "resolved": "https://registry.npmjs.org/for-each/-/for-each-0.3.3.tgz",
+      "integrity": "sha512-jqYfLp7mo9vIyQf8ykW2v7A+2N4QjeCeI5+Dz9XraiO1ign81wjiH7Fb9vSOWvQfNtmSa4H2RoQTrrXivdUZmw==",
+      "dependencies": {
+        "is-callable": "^1.1.3"
+      }
+    },
+    "node_modules/fork-ts-checker-webpack-plugin": {
+      "version": "9.0.2",
+      "resolved": "https://registry.npmjs.org/fork-ts-checker-webpack-plugin/-/fork-ts-checker-webpack-plugin-9.0.2.tgz",
+      "integrity": "sha512-Uochze2R8peoN1XqlSi/rGUkDQpRogtLFocP9+PGu68zk1BDAKXfdeCdyVZpgTk8V8WFVQXdEz426VKjXLO1Gg==",
+      "dev": true,
+      "dependencies": {
+        "@babel/code-frame": "^7.16.7",
+        "chalk": "^4.1.2",
+        "chokidar": "^3.5.3",
+        "cosmiconfig": "^8.2.0",
+        "deepmerge": "^4.2.2",
+        "fs-extra": "^10.0.0",
+        "memfs": "^3.4.1",
+        "minimatch": "^3.0.4",
+        "node-abort-controller": "^3.0.1",
+        "schema-utils": "^3.1.1",
+        "semver": "^7.3.5",
+        "tapable": "^2.2.1"
+      },
+      "engines": {
+        "node": ">=12.13.0",
+        "yarn": ">=1.0.0"
+      },
+      "peerDependencies": {
+        "typescript": ">3.6.0",
+        "webpack": "^5.11.0"
+      }
+    },
+    "node_modules/fork-ts-checker-webpack-plugin/node_modules/ansi-styles": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+      "dev": true,
+      "dependencies": {
+        "color-convert": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
+      }
+    },
+    "node_modules/fork-ts-checker-webpack-plugin/node_modules/chalk": {
+      "version": "4.1.2",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
+      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+      "dev": true,
+      "dependencies": {
+        "ansi-styles": "^4.1.0",
+        "supports-color": "^7.1.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/chalk?sponsor=1"
+      }
+    },
+    "node_modules/fork-ts-checker-webpack-plugin/node_modules/color-convert": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+      "dev": true,
+      "dependencies": {
+        "color-name": "~1.1.4"
+      },
+      "engines": {
+        "node": ">=7.0.0"
+      }
+    },
+    "node_modules/fork-ts-checker-webpack-plugin/node_modules/color-name": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+      "dev": true
+    },
+    "node_modules/fork-ts-checker-webpack-plugin/node_modules/cosmiconfig": {
+      "version": "8.3.6",
+      "resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-8.3.6.tgz",
+      "integrity": "sha512-kcZ6+W5QzcJ3P1Mt+83OUv/oHFqZHIx8DuxG6eZ5RGMERoLqp4BuGjhHLYGK+Kf5XVkQvqBSmAy/nGWN3qDgEA==",
+      "dev": true,
+      "dependencies": {
+        "import-fresh": "^3.3.0",
+        "js-yaml": "^4.1.0",
+        "parse-json": "^5.2.0",
+        "path-type": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=14"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/d-fischer"
+      },
+      "peerDependencies": {
+        "typescript": ">=4.9.5"
+      },
+      "peerDependenciesMeta": {
+        "typescript": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/fork-ts-checker-webpack-plugin/node_modules/has-flag": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/fork-ts-checker-webpack-plugin/node_modules/lru-cache": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
+      "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
+      "dev": true,
+      "dependencies": {
+        "yallist": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/fork-ts-checker-webpack-plugin/node_modules/semver": {
+      "version": "7.5.4",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz",
+      "integrity": "sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==",
+      "dev": true,
+      "dependencies": {
+        "lru-cache": "^6.0.0"
+      },
+      "bin": {
+        "semver": "bin/semver.js"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/fork-ts-checker-webpack-plugin/node_modules/supports-color": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+      "dev": true,
+      "dependencies": {
+        "has-flag": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/fork-ts-checker-webpack-plugin/node_modules/yallist": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
+      "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==",
+      "dev": true
+    },
+    "node_modules/form-data": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.0.tgz",
+      "integrity": "sha512-ETEklSGi5t0QMZuiXoA/Q6vcnxcLQP5vdugSpuAyi6SVGi2clPPp+xgEhuMaHC+zGgn31Kd235W35f7Hykkaww==",
+      "dependencies": {
+        "asynckit": "^0.4.0",
+        "combined-stream": "^1.0.8",
+        "mime-types": "^2.1.12"
+      },
+      "engines": {
+        "node": ">= 6"
+      }
+    },
+    "node_modules/forwarded": {
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/forwarded/-/forwarded-0.2.0.tgz",
+      "integrity": "sha512-buRG0fpBtRHSTCOASe6hD258tEubFoRLb4ZNA6NxMVHNw2gOcwHo9wyablzMzOA5z9xA9L1KNjk/Nt6MT9aYow==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
+    "node_modules/fresh": {
+      "version": "0.5.2",
+      "resolved": "https://registry.npmjs.org/fresh/-/fresh-0.5.2.tgz",
+      "integrity": "sha512-zJ2mQYM18rEFOudeV4GShTGIQ7RbzA7ozbU9I/XBpm7kqgMywgmylMwXHxZJmkVoYkna9d2pVXVXPdYTP9ej8Q==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
+    "node_modules/fs-extra": {
+      "version": "10.1.0",
+      "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-10.1.0.tgz",
+      "integrity": "sha512-oRXApq54ETRj4eMiFzGnHWGy+zo5raudjuxN0b8H7s/RU2oW0Wvsx9O0ACRN/kRq9E8Vu/ReskGB5o3ji+FzHQ==",
+      "dev": true,
+      "dependencies": {
+        "graceful-fs": "^4.2.0",
+        "jsonfile": "^6.0.1",
+        "universalify": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/fs-monkey": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/fs-monkey/-/fs-monkey-1.0.4.tgz",
+      "integrity": "sha512-INM/fWAxMICjttnD0DX1rBvinKskj5G1w+oy/pnm9u/tSlnBrzFonJMcalKJ30P8RRsPzKcCG7Q8l0jx5Fh9YQ==",
+      "dev": true
+    },
+    "node_modules/fs.realpath": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
+      "integrity": "sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw=="
+    },
+    "node_modules/fsevents": {
+      "version": "2.3.3",
+      "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.3.tgz",
+      "integrity": "sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==",
+      "dev": true,
+      "hasInstallScript": true,
+      "optional": true,
+      "os": [
+        "darwin"
+      ],
+      "engines": {
+        "node": "^8.16.0 || ^10.6.0 || >=11.0.0"
+      }
+    },
+    "node_modules/function-bind": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.2.tgz",
+      "integrity": "sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA==",
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/function.prototype.name": {
+      "version": "1.1.5",
+      "resolved": "https://registry.npmjs.org/function.prototype.name/-/function.prototype.name-1.1.5.tgz",
+      "integrity": "sha512-uN7m/BzVKQnCUF/iW8jYea67v++2u7m5UgENbHRtdDVclOUP+FMPlCNdmk0h/ysGyo2tavMJEDqJAkJdRa1vMA==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.2",
+        "define-properties": "^1.1.3",
+        "es-abstract": "^1.19.0",
+        "functions-have-names": "^1.2.2"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/functions-have-names": {
+      "version": "1.2.3",
+      "resolved": "https://registry.npmjs.org/functions-have-names/-/functions-have-names-1.2.3.tgz",
+      "integrity": "sha512-xckBUXyTIqT97tq2x2AMb+g163b5JFysYk0x4qxNFwbfQkmNZoiRHb6sPzI9/QV33WeuvVYBUIiD4NzNIyqaRQ==",
+      "dev": true,
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/gensync": {
+      "version": "1.0.0-beta.2",
+      "resolved": "https://registry.npmjs.org/gensync/-/gensync-1.0.0-beta.2.tgz",
+      "integrity": "sha512-3hN7NaskYvMDLQY55gnW3NQ+mesEAepTqlg+VEbj7zzqEMBVNhzcGYYeqFo/TlYz6eQiFcp1HcsCZO+nGgS8zg==",
+      "peer": true,
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/get-caller-file": {
+      "version": "2.0.5",
+      "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz",
+      "integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==",
+      "engines": {
+        "node": "6.* || 8.* || >= 10.*"
+      }
+    },
+    "node_modules/get-func-name": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/get-func-name/-/get-func-name-2.0.2.tgz",
+      "integrity": "sha512-8vXOvuE167CtIc3OyItco7N/dpRtBbYOsPsXCz7X/PMnlGjYjSGuZJgM1Y7mmew7BKf9BqvLX2tnOVy1BBUsxQ==",
+      "dev": true,
+      "engines": {
+        "node": "*"
+      }
+    },
+    "node_modules/get-intrinsic": {
+      "version": "1.2.4",
+      "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.2.4.tgz",
+      "integrity": "sha512-5uYhsJH8VJBTv7oslg4BznJYhDoRI6waYCxMmCdnTrcCrHA/fCFKoTFz2JKKE0HdDFUF7/oQuhzumXJK7paBRQ==",
+      "dependencies": {
+        "es-errors": "^1.3.0",
+        "function-bind": "^1.1.2",
+        "has-proto": "^1.0.1",
+        "has-symbols": "^1.0.3",
+        "hasown": "^2.0.0"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/get-stream": {
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-6.0.1.tgz",
+      "integrity": "sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg==",
+      "dev": true,
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/get-symbol-description": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/get-symbol-description/-/get-symbol-description-1.0.0.tgz",
+      "integrity": "sha512-2EmdH1YvIQiZpltCNgkuiUnyukzxM/R6NDJX31Ke3BG1Nq5b0S2PhX59UKi9vZpPDQVdqn+1IcaAwnzTT5vCjw==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.2",
+        "get-intrinsic": "^1.1.1"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/glob": {
+      "version": "7.2.3",
+      "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz",
+      "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==",
+      "dependencies": {
+        "fs.realpath": "^1.0.0",
+        "inflight": "^1.0.4",
+        "inherits": "2",
+        "minimatch": "^3.1.1",
+        "once": "^1.3.0",
+        "path-is-absolute": "^1.0.0"
+      },
+      "engines": {
+        "node": "*"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      }
+    },
+    "node_modules/glob-parent": {
+      "version": "6.0.2",
+      "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-6.0.2.tgz",
+      "integrity": "sha512-XxwI8EOhVQgWp6iDL+3b0r86f4d6AX6zSU55HfB4ydCEuXLXc5FcYeOu+nnGftS4TEju/11rt4KJPTMgbfmv4A==",
+      "dev": true,
+      "dependencies": {
+        "is-glob": "^4.0.3"
+      },
+      "engines": {
+        "node": ">=10.13.0"
+      }
+    },
+    "node_modules/glob-to-regexp": {
+      "version": "0.4.1",
+      "resolved": "https://registry.npmjs.org/glob-to-regexp/-/glob-to-regexp-0.4.1.tgz",
+      "integrity": "sha512-lkX1HJXwyMcprw/5YUZc2s7DrpAiHB21/V+E1rHUrVNokkvB6bqMzT0VfV6/86ZNabt1k14YOIaT7nDvOX3Iiw==",
+      "dev": true
+    },
+    "node_modules/globals": {
+      "version": "11.12.0",
+      "resolved": "https://registry.npmjs.org/globals/-/globals-11.12.0.tgz",
+      "integrity": "sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==",
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/globalthis": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/globalthis/-/globalthis-1.0.3.tgz",
+      "integrity": "sha512-sFdI5LyBiNTHjRd7cGPWapiHWMOXKyuBNX/cWJ3NfzrZQVa8GI/8cofCl74AOVqq9W5kNmguTIzJ/1s2gyI9wA==",
+      "dev": true,
+      "dependencies": {
+        "define-properties": "^1.1.3"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/globby": {
+      "version": "11.1.0",
+      "resolved": "https://registry.npmjs.org/globby/-/globby-11.1.0.tgz",
+      "integrity": "sha512-jhIXaOzy1sb8IyocaruWSn1TjmnBVs8Ayhcy83rmxNJ8q2uWKCAj3CnJY+KpGSXCueAPc0i05kVvVKtP1t9S3g==",
+      "dev": true,
+      "dependencies": {
+        "array-union": "^2.1.0",
+        "dir-glob": "^3.0.1",
+        "fast-glob": "^3.2.9",
+        "ignore": "^5.2.0",
+        "merge2": "^1.4.1",
+        "slash": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/globrex": {
+      "version": "0.1.2",
+      "resolved": "https://registry.npmjs.org/globrex/-/globrex-0.1.2.tgz",
+      "integrity": "sha512-uHJgbwAMwNFf5mLst7IWLNg14x1CkeqglJb/K3doi4dw6q2IvAAmM/Y81kevy83wP+Sst+nutFTYOGg3d1lsxg==",
+      "dev": true
+    },
+    "node_modules/goober": {
+      "version": "2.1.13",
+      "resolved": "https://registry.npmjs.org/goober/-/goober-2.1.13.tgz",
+      "integrity": "sha512-jFj3BQeleOoy7t93E9rZ2de+ScC4lQICLwiAQmKMg9F6roKGaLSHoCDYKkWlSafg138jejvq/mTdvmnwDQgqoQ==",
+      "peerDependencies": {
+        "csstype": "^3.0.10"
+      }
+    },
+    "node_modules/gopd": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/gopd/-/gopd-1.0.1.tgz",
+      "integrity": "sha512-d65bNlIadxvpb/A2abVdlqKqV563juRnZ1Wtk6s1sIR8uNsXR70xqIzVqxVf1eTqDunwT2MkczEeaezCKTZhwA==",
+      "dependencies": {
+        "get-intrinsic": "^1.1.3"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/graceful-fs": {
+      "version": "4.2.11",
+      "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.11.tgz",
+      "integrity": "sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ==",
+      "dev": true
+    },
+    "node_modules/grapheme-splitter": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/grapheme-splitter/-/grapheme-splitter-1.0.4.tgz",
+      "integrity": "sha512-bzh50DW9kTPM00T8y4o8vQg89Di9oLJVLW/KaOGIXJWP/iqCN6WKYkbNOF04vFLJhwcpYUh9ydh/+5vpOqV4YQ==",
+      "dev": true
+    },
+    "node_modules/graphemer": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/graphemer/-/graphemer-1.4.0.tgz",
+      "integrity": "sha512-EtKwoO6kxCL9WO5xipiHTZlSzBm7WLT627TqC/uVRd0HKmq8NXyebnNYxDoBi7wt8eTWrUrKXCOVaFq9x1kgag==",
+      "dev": true
+    },
+    "node_modules/handle-thing": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/handle-thing/-/handle-thing-2.0.1.tgz",
+      "integrity": "sha512-9Qn4yBxelxoh2Ow62nP+Ka/kMnOXRi8BXnRaUwezLNhqelnN49xKz4F/dPP8OYLxLxq6JDtZb2i9XznUQbNPTg==",
+      "dev": true
+    },
+    "node_modules/has": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz",
+      "integrity": "sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==",
+      "dev": true,
+      "dependencies": {
+        "function-bind": "^1.1.1"
+      },
+      "engines": {
+        "node": ">= 0.4.0"
+      }
+    },
+    "node_modules/has-bigints": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/has-bigints/-/has-bigints-1.0.2.tgz",
+      "integrity": "sha512-tSvCKtBr9lkF0Ex0aQiP9N+OpV4zi2r/Nee5VkRDbaqv35RLYMzbwQfFSZZH0kR+Rd6302UJZ2p/bJCEoR3VoQ==",
+      "dev": true,
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/has-flag": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
+      "integrity": "sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw==",
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/has-own-property": {
+      "version": "0.1.0",
+      "resolved": "https://registry.npmjs.org/has-own-property/-/has-own-property-0.1.0.tgz",
+      "integrity": "sha512-14qdBKoonU99XDhWcFKZTShK+QV47qU97u8zzoVo9cL5TZ3BmBHXogItSt9qJjR0KUMFRhcCW8uGIGl8nkl7Aw==",
+      "dev": true
+    },
+    "node_modules/has-property-descriptors": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/has-property-descriptors/-/has-property-descriptors-1.0.2.tgz",
+      "integrity": "sha512-55JNKuIW+vq4Ke1BjOTjM2YctQIvCT7GFzHwmfZPGo5wnrgkid0YQtnAleFSqumZm4az3n2BS+erby5ipJdgrg==",
+      "dependencies": {
+        "es-define-property": "^1.0.0"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/has-proto": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/has-proto/-/has-proto-1.0.1.tgz",
+      "integrity": "sha512-7qE+iP+O+bgF9clE5+UoBFzE65mlBiVj3tKCrlNQ0Ogwm0BjpT/gK4SlLYDMybDh5I3TCTKnPPa0oMG7JDYrhg==",
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/has-symbols": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.3.tgz",
+      "integrity": "sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A==",
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/has-tostringtag": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/has-tostringtag/-/has-tostringtag-1.0.0.tgz",
+      "integrity": "sha512-kFjcSNhnlGV1kyoGk7OXKSawH5JOb/LzUc5w9B02hOTO0dfFRjbHQKvg1d6cf3HbeUmtU9VbbV3qzZ2Teh97WQ==",
+      "dependencies": {
+        "has-symbols": "^1.0.2"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/hash-base": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/hash-base/-/hash-base-3.1.0.tgz",
+      "integrity": "sha512-1nmYp/rhMDiE7AYkDw+lLwlAzz0AntGIe51F3RfFfEqyQ3feY2eI/NcwC6umIQVOASPMsWJLJScWKSSvzL9IVA==",
+      "dependencies": {
+        "inherits": "^2.0.4",
+        "readable-stream": "^3.6.0",
+        "safe-buffer": "^5.2.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/hash.js": {
+      "version": "1.1.7",
+      "resolved": "https://registry.npmjs.org/hash.js/-/hash.js-1.1.7.tgz",
+      "integrity": "sha512-taOaskGt4z4SOANNseOviYDvjEJinIkRgmp7LbKP2YTTmVxWBl87s/uzK9r+44BclBSp2X7K1hqeNfz9JbBeXA==",
+      "dependencies": {
+        "inherits": "^2.0.3",
+        "minimalistic-assert": "^1.0.1"
+      }
+    },
+    "node_modules/hasown": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/hasown/-/hasown-2.0.2.tgz",
+      "integrity": "sha512-0hJU9SCPvmMzIBdZFqNPXWa6dqh7WdH0cII9y+CyS8rG3nL48Bclra9HmKhVVUHyPWNH5Y7xDwAB7bfgSjkUMQ==",
+      "dependencies": {
+        "function-bind": "^1.1.2"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
+    "node_modules/he": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/he/-/he-1.2.0.tgz",
+      "integrity": "sha512-F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw==",
+      "dev": true,
+      "bin": {
+        "he": "bin/he"
+      }
+    },
+    "node_modules/hex-rgb": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/hex-rgb/-/hex-rgb-4.3.0.tgz",
+      "integrity": "sha512-Ox1pJVrDCyGHMG9CFg1tmrRUMRPRsAWYc/PinY0XzJU4K7y7vjNoLKIQ7BR5UJMCxNN8EM1MNDmHWA/B3aZUuw==",
+      "engines": {
+        "node": ">=6"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/hmac-drbg": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/hmac-drbg/-/hmac-drbg-1.0.1.tgz",
+      "integrity": "sha512-Tti3gMqLdZfhOQY1Mzf/AanLiqh1WTiJgEj26ZuYQ9fbkLomzGchCws4FyrSd4VkpBfiNhaE1On+lOz894jvXg==",
+      "dependencies": {
+        "hash.js": "^1.0.3",
+        "minimalistic-assert": "^1.0.0",
+        "minimalistic-crypto-utils": "^1.0.1"
+      }
+    },
+    "node_modules/hoist-non-react-statics": {
+      "version": "3.3.2",
+      "resolved": "https://registry.npmjs.org/hoist-non-react-statics/-/hoist-non-react-statics-3.3.2.tgz",
+      "integrity": "sha512-/gGivxi8JPKWNm/W0jSmzcMPpfpPLc3dY/6GxhX2hQ9iGj3aDfklV4ET7NjKpSinLpJ5vafa9iiGIEZg10SfBw==",
+      "dependencies": {
+        "react-is": "^16.7.0"
+      }
+    },
+    "node_modules/hoist-non-react-statics/node_modules/react-is": {
+      "version": "16.13.1",
+      "resolved": "https://registry.npmjs.org/react-is/-/react-is-16.13.1.tgz",
+      "integrity": "sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ=="
+    },
+    "node_modules/hpack.js": {
+      "version": "2.1.6",
+      "resolved": "https://registry.npmjs.org/hpack.js/-/hpack.js-2.1.6.tgz",
+      "integrity": "sha512-zJxVehUdMGIKsRaNt7apO2Gqp0BdqW5yaiGHXXmbpvxgBYVZnAql+BJb4RO5ad2MgpbZKn5G6nMnegrH1FcNYQ==",
+      "dev": true,
+      "dependencies": {
+        "inherits": "^2.0.1",
+        "obuf": "^1.0.0",
+        "readable-stream": "^2.0.1",
+        "wbuf": "^1.1.0"
+      }
+    },
+    "node_modules/hpack.js/node_modules/isarray": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
+      "integrity": "sha512-VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ==",
+      "dev": true
+    },
+    "node_modules/hpack.js/node_modules/readable-stream": {
+      "version": "2.3.8",
+      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.8.tgz",
+      "integrity": "sha512-8p0AUk4XODgIewSi0l8Epjs+EVnWiK7NoDIEGU0HhE7+ZyY8D1IMY7odu5lRrFXGg71L15KG8QrPmum45RTtdA==",
+      "dev": true,
+      "dependencies": {
+        "core-util-is": "~1.0.0",
+        "inherits": "~2.0.3",
+        "isarray": "~1.0.0",
+        "process-nextick-args": "~2.0.0",
+        "safe-buffer": "~5.1.1",
+        "string_decoder": "~1.1.1",
+        "util-deprecate": "~1.0.1"
+      }
+    },
+    "node_modules/hpack.js/node_modules/safe-buffer": {
+      "version": "5.1.2",
+      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
+      "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==",
+      "dev": true
+    },
+    "node_modules/hpack.js/node_modules/string_decoder": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
+      "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
+      "dev": true,
+      "dependencies": {
+        "safe-buffer": "~5.1.0"
+      }
+    },
+    "node_modules/html-entities": {
+      "version": "2.4.0",
+      "resolved": "https://registry.npmjs.org/html-entities/-/html-entities-2.4.0.tgz",
+      "integrity": "sha512-igBTJcNNNhvZFRtm8uA6xMY6xYleeDwn3PeBCkDz7tHttv4F2hsDI2aPgNERWzvRcNYHNT3ymRaQzllmXj4YsQ==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/mdevils"
+        },
+        {
+          "type": "patreon",
+          "url": "https://patreon.com/mdevils"
+        }
+      ]
+    },
+    "node_modules/html-loader": {
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/html-loader/-/html-loader-4.2.0.tgz",
+      "integrity": "sha512-OxCHD3yt+qwqng2vvcaPApCEvbx+nXWu+v69TYHx1FO8bffHn/JjHtE3TTQZmHjwvnJe4xxzuecetDVBrQR1Zg==",
+      "dev": true,
+      "dependencies": {
+        "html-minifier-terser": "^7.0.0",
+        "parse5": "^7.0.0"
+      },
+      "engines": {
+        "node": ">= 14.15.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/webpack"
+      },
+      "peerDependencies": {
+        "webpack": "^5.0.0"
+      }
+    },
+    "node_modules/html-minifier-terser": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/html-minifier-terser/-/html-minifier-terser-7.2.0.tgz",
+      "integrity": "sha512-tXgn3QfqPIpGl9o+K5tpcj3/MN4SfLtsx2GWwBC3SSd0tXQGyF3gsSqad8loJgKZGM3ZxbYDd5yhiBIdWpmvLA==",
+      "dev": true,
+      "dependencies": {
+        "camel-case": "^4.1.2",
+        "clean-css": "~5.3.2",
+        "commander": "^10.0.0",
+        "entities": "^4.4.0",
+        "param-case": "^3.0.4",
+        "relateurl": "^0.2.7",
+        "terser": "^5.15.1"
+      },
+      "bin": {
+        "html-minifier-terser": "cli.js"
+      },
+      "engines": {
+        "node": "^14.13.1 || >=16.0.0"
+      }
+    },
+    "node_modules/html-parse-stringify": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/html-parse-stringify/-/html-parse-stringify-3.0.1.tgz",
+      "integrity": "sha512-KknJ50kTInJ7qIScF3jeaFRpMpE8/lfiTdzf/twXyPBLAGrLRTmkz3AdTnKeh40X8k9L2fdYwEp/42WGXIRGcg==",
+      "dependencies": {
+        "void-elements": "3.1.0"
+      }
+    },
+    "node_modules/html-webpack-plugin": {
+      "version": "5.5.3",
+      "resolved": "https://registry.npmjs.org/html-webpack-plugin/-/html-webpack-plugin-5.5.3.tgz",
+      "integrity": "sha512-6YrDKTuqaP/TquFH7h4srYWsZx+x6k6+FbsTm0ziCwGHDP78Unr1r9F/H4+sGmMbX08GQcJ+K64x55b+7VM/jg==",
+      "dev": true,
+      "dependencies": {
+        "@types/html-minifier-terser": "^6.0.0",
+        "html-minifier-terser": "^6.0.2",
+        "lodash": "^4.17.21",
+        "pretty-error": "^4.0.0",
+        "tapable": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=10.13.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/html-webpack-plugin"
+      },
+      "peerDependencies": {
+        "webpack": "^5.20.0"
+      }
+    },
+    "node_modules/html-webpack-plugin/node_modules/commander": {
+      "version": "8.3.0",
+      "resolved": "https://registry.npmjs.org/commander/-/commander-8.3.0.tgz",
+      "integrity": "sha512-OkTL9umf+He2DZkUq8f8J9of7yL6RJKI24dVITBmNfZBmri9zYZQrKkuXiKhyfPSu8tUhnVBB1iKXevvnlR4Ww==",
+      "dev": true,
+      "engines": {
+        "node": ">= 12"
+      }
+    },
+    "node_modules/html-webpack-plugin/node_modules/html-minifier-terser": {
+      "version": "6.1.0",
+      "resolved": "https://registry.npmjs.org/html-minifier-terser/-/html-minifier-terser-6.1.0.tgz",
+      "integrity": "sha512-YXxSlJBZTP7RS3tWnQw74ooKa6L9b9i9QYXY21eUEvhZ3u9XLfv6OnFsQq6RxkhHygsaUMvYsZRV5rU/OVNZxw==",
+      "dev": true,
+      "dependencies": {
+        "camel-case": "^4.1.2",
+        "clean-css": "^5.2.2",
+        "commander": "^8.3.0",
+        "he": "^1.2.0",
+        "param-case": "^3.0.4",
+        "relateurl": "^0.2.7",
+        "terser": "^5.10.0"
+      },
+      "bin": {
+        "html-minifier-terser": "cli.js"
+      },
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/htmlparser2": {
+      "version": "6.1.0",
+      "resolved": "https://registry.npmjs.org/htmlparser2/-/htmlparser2-6.1.0.tgz",
+      "integrity": "sha512-gyyPk6rgonLFEDGoeRgQNaEUvdJ4ktTmmUh/h2t7s+M8oPpIPxgNACWa+6ESR57kXstwqPiCut0V8NRpcwgU7A==",
+      "dev": true,
+      "funding": [
+        "https://github.com/fb55/htmlparser2?sponsor=1",
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/fb55"
+        }
+      ],
+      "dependencies": {
+        "domelementtype": "^2.0.1",
+        "domhandler": "^4.0.0",
+        "domutils": "^2.5.2",
+        "entities": "^2.0.0"
+      }
+    },
+    "node_modules/htmlparser2/node_modules/entities": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/entities/-/entities-2.2.0.tgz",
+      "integrity": "sha512-p92if5Nz619I0w+akJrLZH0MX0Pb5DX39XOwQTtXSdQQOaYH03S1uIQp4mhOZtAXrxq4ViO67YTiLBo2638o9A==",
+      "dev": true,
+      "funding": {
+        "url": "https://github.com/fb55/entities?sponsor=1"
+      }
+    },
+    "node_modules/http-deceiver": {
+      "version": "1.2.7",
+      "resolved": "https://registry.npmjs.org/http-deceiver/-/http-deceiver-1.2.7.tgz",
+      "integrity": "sha512-LmpOGxTfbpgtGVxJrj5k7asXHCgNZp5nLfp+hWc8QQRqtb7fUy6kRY3BO1h9ddF6yIPYUARgxGOwB42DnxIaNw==",
+      "dev": true
+    },
+    "node_modules/http-errors": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-2.0.0.tgz",
+      "integrity": "sha512-FtwrG/euBzaEjYeRqOgly7G0qviiXoJWnvEH2Z1plBdXgbyjv34pHTSb9zoeHMyDy33+DWy5Wt9Wo+TURtOYSQ==",
+      "dev": true,
+      "dependencies": {
+        "depd": "2.0.0",
+        "inherits": "2.0.4",
+        "setprototypeof": "1.2.0",
+        "statuses": "2.0.1",
+        "toidentifier": "1.0.1"
+      },
+      "engines": {
+        "node": ">= 0.8"
+      }
+    },
+    "node_modules/http-parser-js": {
+      "version": "0.5.8",
+      "resolved": "https://registry.npmjs.org/http-parser-js/-/http-parser-js-0.5.8.tgz",
+      "integrity": "sha512-SGeBX54F94Wgu5RH3X5jsDtf4eHyRogWX1XGT3b4HuW3tQPM4AaBzoUji/4AAJNXCEOWZ5O0DgZmJw1947gD5Q==",
+      "dev": true
+    },
+    "node_modules/http-proxy": {
+      "version": "1.18.1",
+      "resolved": "https://registry.npmjs.org/http-proxy/-/http-proxy-1.18.1.tgz",
+      "integrity": "sha512-7mz/721AbnJwIVbnaSv1Cz3Am0ZLT/UBwkC92VlxhXv/k/BBQfM2fXElQNC27BVGr0uwUpplYPQM9LnaBMR5NQ==",
+      "dev": true,
+      "dependencies": {
+        "eventemitter3": "^4.0.0",
+        "follow-redirects": "^1.0.0",
+        "requires-port": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=8.0.0"
+      }
+    },
+    "node_modules/http-proxy-middleware": {
+      "version": "2.0.6",
+      "resolved": "https://registry.npmjs.org/http-proxy-middleware/-/http-proxy-middleware-2.0.6.tgz",
+      "integrity": "sha512-ya/UeJ6HVBYxrgYotAZo1KvPWlgB48kUJLDePFeneHsVujFaW5WNj2NgWCAE//B1Dl02BIfYlpNgBy8Kf8Rjmw==",
+      "dev": true,
+      "dependencies": {
+        "@types/http-proxy": "^1.17.8",
+        "http-proxy": "^1.18.1",
+        "is-glob": "^4.0.1",
+        "is-plain-obj": "^3.0.0",
+        "micromatch": "^4.0.2"
+      },
+      "engines": {
+        "node": ">=12.0.0"
+      },
+      "peerDependencies": {
+        "@types/express": "^4.17.13"
+      },
+      "peerDependenciesMeta": {
+        "@types/express": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/human-signals": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/human-signals/-/human-signals-2.1.0.tgz",
+      "integrity": "sha512-B4FFZ6q/T2jhhksgkbEW3HBvWIfDW85snkQgawt07S7J5QXTk6BkNV+0yAeZrM5QpMAdYlocGoljn0sJ/WQkFw==",
+      "dev": true,
+      "engines": {
+        "node": ">=10.17.0"
+      }
+    },
+    "node_modules/husky": {
+      "version": "8.0.3",
+      "resolved": "https://registry.npmjs.org/husky/-/husky-8.0.3.tgz",
+      "integrity": "sha512-+dQSyqPh4x1hlO1swXBiNb2HzTDN1I2IGLQx1GrBuiqFJfoMrnZWwVmatvSiO+Iz8fBUnf+lekwNo4c2LlXItg==",
+      "dev": true,
+      "bin": {
+        "husky": "lib/bin.js"
+      },
+      "engines": {
+        "node": ">=14"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/typicode"
+      }
+    },
+    "node_modules/i18next": {
+      "version": "21.10.0",
+      "resolved": "https://registry.npmjs.org/i18next/-/i18next-21.10.0.tgz",
+      "integrity": "sha512-YeuIBmFsGjUfO3qBmMOc0rQaun4mIpGKET5WDwvu8lU7gvwpcariZLNtL0Fzj+zazcHUrlXHiptcFhBMFaxzfg==",
+      "funding": [
+        {
+          "type": "individual",
+          "url": "https://locize.com"
+        },
+        {
+          "type": "individual",
+          "url": "https://locize.com/i18next.html"
+        },
+        {
+          "type": "individual",
+          "url": "https://www.i18next.com/how-to/faq#i18next-is-awesome.-how-can-i-support-the-project"
+        }
+      ],
+      "dependencies": {
+        "@babel/runtime": "^7.17.2"
+      }
+    },
+    "node_modules/iced-error": {
+      "version": "0.0.13",
+      "resolved": "https://registry.npmjs.org/iced-error/-/iced-error-0.0.13.tgz",
+      "integrity": "sha512-yEEaG8QfyyRL0SsbNNDw3rVgTyqwHFMCuV6jDvD43f/2shmdaFXkqvFLGhDlsYNSolzYHwVLM/CrXt9GygYopA=="
+    },
+    "node_modules/iced-lock": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/iced-lock/-/iced-lock-1.1.0.tgz",
+      "integrity": "sha512-J9UMVitgTMYrkUil5EB9/Q4BPWiMpFH156yjDlmMoMRKs3s3PnXj/6G0UlzIOGnNi5JVNk/zVYLXVnuo+1QnqQ==",
+      "dependencies": {
+        "iced-runtime": "^1.0.0"
+      }
+    },
+    "node_modules/iced-runtime": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/iced-runtime/-/iced-runtime-1.0.4.tgz",
+      "integrity": "sha512-rgiJXNF6ZgF2Clh/TKUlBDW3q51YPDJUXmxGQXx1b8tbZpVpTn+1RX9q1sjNkujXIIaVxZByQzPHHORg7KV51g=="
+    },
+    "node_modules/icss-utils": {
+      "version": "5.1.0",
+      "resolved": "https://registry.npmjs.org/icss-utils/-/icss-utils-5.1.0.tgz",
+      "integrity": "sha512-soFhflCVWLfRNOPU3iv5Z9VUdT44xFRbzjLsEzSr5AQmgqPMTHdU3PMT1Cf1ssx8fLNJDA1juftYl+PUcv3MqA==",
+      "dev": true,
+      "engines": {
+        "node": "^10 || ^12 || >= 14"
+      },
+      "peerDependencies": {
+        "postcss": "^8.1.0"
+      }
+    },
+    "node_modules/identity-function": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/identity-function/-/identity-function-1.0.0.tgz",
+      "integrity": "sha512-kNrgUK0qI+9qLTBidsH85HjDLpZfrrS0ElquKKe/fJFdB3D7VeKdXXEvOPDUHSHOzdZKCAAaQIWWyp0l2yq6pw==",
+      "dev": true
+    },
+    "node_modules/ieee754": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.2.1.tgz",
+      "integrity": "sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA==",
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/feross"
+        },
+        {
+          "type": "patreon",
+          "url": "https://www.patreon.com/feross"
+        },
+        {
+          "type": "consulting",
+          "url": "https://feross.org/support"
+        }
+      ]
+    },
+    "node_modules/ignore": {
+      "version": "5.2.4",
+      "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.2.4.tgz",
+      "integrity": "sha512-MAb38BcSbH0eHNBxn7ql2NH/kX33OkB3lZ1BNdh7ENeRChHTYsTvWrMubiIAMNS2llXEEgZ1MUOBtXChP3kaFQ==",
+      "dev": true,
+      "engines": {
+        "node": ">= 4"
+      }
+    },
+    "node_modules/import-fresh": {
+      "version": "3.3.0",
+      "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.3.0.tgz",
+      "integrity": "sha512-veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw==",
+      "dev": true,
+      "dependencies": {
+        "parent-module": "^1.0.0",
+        "resolve-from": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=6"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/imurmurhash": {
+      "version": "0.1.4",
+      "resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz",
+      "integrity": "sha512-JmXMZ6wuvDmLiHEml9ykzqO6lwFbof0GG4IkcGaENdCRDDmMVnny7s5HsIgHCbaq0w2MyPhDqkhTUgS2LU2PHA==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.8.19"
+      }
+    },
+    "node_modules/indent-string": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/indent-string/-/indent-string-4.0.0.tgz",
+      "integrity": "sha512-EdDDZu4A2OyIK7Lr/2zG+w5jmbuk1DVBnEwREQvBzspBJkCEbRa8GxU1lghYcaGJCnRWibjDXlq779X1/y5xwg==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/inflight": {
+      "version": "1.0.6",
+      "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
+      "integrity": "sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA==",
+      "dependencies": {
+        "once": "^1.3.0",
+        "wrappy": "1"
+      }
+    },
+    "node_modules/inherits": {
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz",
+      "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ=="
+    },
+    "node_modules/internal-slot": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/internal-slot/-/internal-slot-1.0.5.tgz",
+      "integrity": "sha512-Y+R5hJrzs52QCG2laLn4udYVnxsfny9CpOhNhUvk/SSSVyF6T27FzRbF0sroPidSu3X8oEAkOn2K804mjpt6UQ==",
+      "dev": true,
+      "dependencies": {
+        "get-intrinsic": "^1.2.0",
+        "has": "^1.0.3",
+        "side-channel": "^1.0.4"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
+    "node_modules/ipaddr.js": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-2.1.0.tgz",
+      "integrity": "sha512-LlbxQ7xKzfBusov6UMi4MFpEg0m+mAm9xyNGEduwXMEDuf4WfzB/RZwMVYEd7IKGvh4IUkEXYxtAVu9T3OelJQ==",
+      "dev": true,
+      "engines": {
+        "node": ">= 10"
+      }
+    },
+    "node_modules/is-arguments": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/is-arguments/-/is-arguments-1.1.1.tgz",
+      "integrity": "sha512-8Q7EARjzEnKpt/PCD7e1cgUS0a6X8u5tdSiMqXhojOdoV9TsMsiO+9VLC5vAmO8N7/GmXn7yjR8qnA6bVAEzfA==",
+      "dependencies": {
+        "call-bind": "^1.0.2",
+        "has-tostringtag": "^1.0.0"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/is-array-buffer": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/is-array-buffer/-/is-array-buffer-3.0.2.tgz",
+      "integrity": "sha512-y+FyyR/w8vfIRq4eQcM1EYgSTnmHXPqaF+IgzgraytCFq5Xh8lllDVmAZolPJiZttZLeFSINPYMaEJ7/vWUa1w==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.2",
+        "get-intrinsic": "^1.2.0",
+        "is-typed-array": "^1.1.10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/is-arrayish": {
+      "version": "0.2.1",
+      "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz",
+      "integrity": "sha512-zz06S8t0ozoDXMG+ube26zeCTNXcKIPJZJi8hBrF4idCLms4CG9QtK7qBl1boi5ODzFpjswb5JPmHCbMpjaYzg==",
+      "dev": true
+    },
+    "node_modules/is-bigint": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/is-bigint/-/is-bigint-1.0.4.tgz",
+      "integrity": "sha512-zB9CruMamjym81i2JZ3UMn54PKGsQzsJeo6xvN3HJJ4CAsQNB6iRutp2To77OfCNuoxspsIhzaPoO1zyCEhFOg==",
+      "dev": true,
+      "dependencies": {
+        "has-bigints": "^1.0.1"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/is-binary-path": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-2.1.0.tgz",
+      "integrity": "sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==",
+      "dev": true,
+      "dependencies": {
+        "binary-extensions": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/is-boolean-object": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/is-boolean-object/-/is-boolean-object-1.1.2.tgz",
+      "integrity": "sha512-gDYaKHJmnj4aWxyj6YHyXVpdQawtVLHU5cb+eztPGczf6cjuTdwve5ZIEfgXqH4e57An1D1AKf8CZ3kYrQRqYA==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.2",
+        "has-tostringtag": "^1.0.0"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/is-callable": {
+      "version": "1.2.7",
+      "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.7.tgz",
+      "integrity": "sha512-1BC0BVFhS/p0qtw6enp8e+8OD0UrK0oFLztSjNzhcKA3WDuJxxAPXzPuPtKkjEY9UUoEWlX/8fgKeu2S8i9JTA==",
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/is-core-module": {
+      "version": "2.14.0",
+      "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.14.0.tgz",
+      "integrity": "sha512-a5dFJih5ZLYlRtDc0dZWP7RiKr6xIKzmn/oAYCDvdLThadVgyJwlaoQPmRtMSpz+rk0OGAgIu+TcM9HUF0fk1A==",
+      "dev": true,
+      "dependencies": {
+        "hasown": "^2.0.2"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/is-date-object": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/is-date-object/-/is-date-object-1.0.5.tgz",
+      "integrity": "sha512-9YQaSxsAiSwcvS33MBk3wTCVnWK+HhF8VZR2jRxehM16QcVOdHqPn4VPHmRK4lSr38n9JriurInLcP90xsYNfQ==",
+      "dev": true,
+      "dependencies": {
+        "has-tostringtag": "^1.0.0"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/is-docker": {
+      "version": "2.2.1",
+      "resolved": "https://registry.npmjs.org/is-docker/-/is-docker-2.2.1.tgz",
+      "integrity": "sha512-F+i2BKsFrH66iaUFc0woD8sLy8getkwTwtOBjvs56Cx4CgJDeKQeqfz8wAYiSb8JOprWhHH5p77PbmYCvvUuXQ==",
+      "dev": true,
+      "bin": {
+        "is-docker": "cli.js"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/is-extglob": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz",
+      "integrity": "sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/is-fullwidth-code-point": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-4.0.0.tgz",
+      "integrity": "sha512-O4L094N2/dZ7xqVdrXhh9r1KODPJpFms8B5sGdJLPy664AgvXsreZUyCQQNItZRDlYug4xStLjNp/sz3HvBowQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/is-generator-function": {
+      "version": "1.0.10",
+      "resolved": "https://registry.npmjs.org/is-generator-function/-/is-generator-function-1.0.10.tgz",
+      "integrity": "sha512-jsEjy9l3yiXEQ+PsXdmBwEPcOxaXWLspKdplFUVI9vq1iZgIekeC0L167qeu86czQaxed3q/Uzuw0swL0irL8A==",
+      "dependencies": {
+        "has-tostringtag": "^1.0.0"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/is-glob": {
+      "version": "4.0.3",
+      "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz",
+      "integrity": "sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==",
+      "dev": true,
+      "dependencies": {
+        "is-extglob": "^2.1.1"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/is-iterable": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/is-iterable/-/is-iterable-1.1.1.tgz",
+      "integrity": "sha512-EdOZCr0NsGE00Pot+x1ZFx9MJK3C6wy91geZpXwvwexDLJvA4nzYyZf7r+EIwSeVsOLDdBz7ATg9NqKTzuNYuQ==",
+      "dev": true,
+      "engines": {
+        "node": ">= 4"
+      }
+    },
+    "node_modules/is-map": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/is-map/-/is-map-2.0.2.tgz",
+      "integrity": "sha512-cOZFQQozTha1f4MxLFzlgKYPTyj26picdZTx82hbc/Xf4K/tZOOXSCkMvU4pKioRXGDLJRn0GM7Upe7kR721yg==",
+      "dev": true,
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/is-negative-zero": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/is-negative-zero/-/is-negative-zero-2.0.2.tgz",
+      "integrity": "sha512-dqJvarLawXsFbNDeJW7zAz8ItJ9cd28YufuuFzh0G8pNHjJMnY08Dv7sYX2uF5UpQOwieAeOExEYAWWfu7ZZUA==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/is-number": {
+      "version": "7.0.0",
+      "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz",
+      "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.12.0"
+      }
+    },
+    "node_modules/is-number-object": {
+      "version": "1.0.7",
+      "resolved": "https://registry.npmjs.org/is-number-object/-/is-number-object-1.0.7.tgz",
+      "integrity": "sha512-k1U0IRzLMo7ZlYIfzRu23Oh6MiIFasgpb9X76eqfFZAqwH44UI4KTBvBYIZ1dSL9ZzChTB9ShHfLkR4pdW5krQ==",
+      "dev": true,
+      "dependencies": {
+        "has-tostringtag": "^1.0.0"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/is-path-cwd": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/is-path-cwd/-/is-path-cwd-2.2.0.tgz",
+      "integrity": "sha512-w942bTcih8fdJPJmQHFzkS76NEP8Kzzvmw92cXsazb8intwLqPibPPdXf4ANdKV3rYMuuQYGIWtvz9JilB3NFQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/is-path-in-cwd": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/is-path-in-cwd/-/is-path-in-cwd-2.1.0.tgz",
+      "integrity": "sha512-rNocXHgipO+rvnP6dk3zI20RpOtrAM/kzbB258Uw5BWr3TpXi861yzjo16Dn4hUox07iw5AyeMLHWsujkjzvRQ==",
+      "dev": true,
+      "dependencies": {
+        "is-path-inside": "^2.1.0"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/is-path-inside": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/is-path-inside/-/is-path-inside-2.1.0.tgz",
+      "integrity": "sha512-wiyhTzfDWsvwAW53OBWF5zuvaOGlZ6PwYxAbPVDhpm+gM09xKQGjBq/8uYN12aDvMxnAnq3dxTyoSoRNmg5YFg==",
+      "dev": true,
+      "dependencies": {
+        "path-is-inside": "^1.0.2"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/is-plain-obj": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-3.0.0.tgz",
+      "integrity": "sha512-gwsOE28k+23GP1B6vFl1oVh/WOzmawBrKwo5Ev6wMKzPkaXaCDIQKzLnvsA42DRlbVTWorkgTKIviAKCWkfUwA==",
+      "dev": true,
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/is-regex": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.1.4.tgz",
+      "integrity": "sha512-kvRdxDsxZjhzUX07ZnLydzS1TU/TJlTUHHY4YLL87e37oUA49DfkLqgy+VjFocowy29cKvcSiu+kIv728jTTVg==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.2",
+        "has-tostringtag": "^1.0.0"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/is-set": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/is-set/-/is-set-2.0.2.tgz",
+      "integrity": "sha512-+2cnTEZeY5z/iXGbLhPrOAaK/Mau5k5eXq9j14CpRTftq0pAJu2MwVRSZhyZWBzx3o6X795Lz6Bpb6R0GKf37g==",
+      "dev": true,
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/is-shared-array-buffer": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/is-shared-array-buffer/-/is-shared-array-buffer-1.0.2.tgz",
+      "integrity": "sha512-sqN2UDu1/0y6uvXyStCOzyhAjCSlHceFoMKJW8W9EU9cvic/QdsZ0kEU93HEy3IUEFZIiH/3w+AH/UQbPHNdhA==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.2"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/is-stream": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-2.0.1.tgz",
+      "integrity": "sha512-hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/is-string": {
+      "version": "1.0.7",
+      "resolved": "https://registry.npmjs.org/is-string/-/is-string-1.0.7.tgz",
+      "integrity": "sha512-tE2UXzivje6ofPW7l23cjDOMa09gb7xlAqG6jG5ej6uPV32TlWP3NKPigtaGeHNu9fohccRYvIiZMfOOnOYUtg==",
+      "dev": true,
+      "dependencies": {
+        "has-tostringtag": "^1.0.0"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/is-symbol": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/is-symbol/-/is-symbol-1.0.4.tgz",
+      "integrity": "sha512-C/CPBqKWnvdcxqIARxyOh4v1UUEOCHpgDa0WYgpKDFMszcrPcffg5uhwSgPCLD2WWxmq6isisz87tzT01tuGhg==",
+      "dev": true,
+      "dependencies": {
+        "has-symbols": "^1.0.2"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/is-typed-array": {
+      "version": "1.1.12",
+      "resolved": "https://registry.npmjs.org/is-typed-array/-/is-typed-array-1.1.12.tgz",
+      "integrity": "sha512-Z14TF2JNG8Lss5/HMqt0//T9JeHXttXy5pH/DBU4vi98ozO2btxzq9MwYDZYnKwU8nRsz/+GVFVRDq3DkVuSPg==",
+      "dependencies": {
+        "which-typed-array": "^1.1.11"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/is-weakmap": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/is-weakmap/-/is-weakmap-2.0.1.tgz",
+      "integrity": "sha512-NSBR4kH5oVj1Uwvv970ruUkCV7O1mzgVFO4/rev2cLRda9Tm9HrL70ZPut4rOHgY0FNrUu9BCbXA2sdQ+x0chA==",
+      "dev": true,
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/is-weakref": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/is-weakref/-/is-weakref-1.0.2.tgz",
+      "integrity": "sha512-qctsuLZmIQ0+vSSMfoVvyFe2+GSEvnmZ2ezTup1SBse9+twCCeial6EEi3Nc2KFcf6+qz2FBPnjXsk8xhKSaPQ==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.2"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/is-weakset": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/is-weakset/-/is-weakset-2.0.2.tgz",
+      "integrity": "sha512-t2yVvttHkQktwnNNmBQ98AhENLdPUTDTE21uPqAQ0ARwQfGeQKRVS0NNurH7bTf7RrvcVn1OOge45CnBeHCSmg==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.2",
+        "get-intrinsic": "^1.1.1"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/is-what": {
+      "version": "4.1.15",
+      "resolved": "https://registry.npmjs.org/is-what/-/is-what-4.1.15.tgz",
+      "integrity": "sha512-uKua1wfy3Yt+YqsD6mTUEa2zSi3G1oPlqTflgaPJ7z63vUGN5pxFpnQfeSLMFnJDEsdvOtkp1rUWkYjB4YfhgA==",
+      "engines": {
+        "node": ">=12.13"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/mesqueeb"
+      }
+    },
+    "node_modules/is-wsl": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/is-wsl/-/is-wsl-2.2.0.tgz",
+      "integrity": "sha512-fKzAra0rGJUUBwGBgNkHZuToZcn+TtXHpeCgmkMJMMYx1sQDYaCSyjJBSCa2nH1DGm7s3n1oBnohoVTBaN7Lww==",
+      "dev": true,
+      "dependencies": {
+        "is-docker": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/isarray": {
+      "version": "2.0.5",
+      "resolved": "https://registry.npmjs.org/isarray/-/isarray-2.0.5.tgz",
+      "integrity": "sha512-xHjhDr3cNBK0BzdUJSPXZntQUx/mwMS5Rw4A7lPJ90XGAO6ISP/ePDNuo0vhqOZU+UD5JoodwCAAoZQd3FeAKw==",
+      "dev": true
+    },
+    "node_modules/isexe": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz",
+      "integrity": "sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==",
+      "dev": true
+    },
+    "node_modules/iterable-lookahead": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/iterable-lookahead/-/iterable-lookahead-1.0.0.tgz",
+      "integrity": "sha512-hJnEP2Xk4+44DDwJqUQGdXal5VbyeWLaPyDl2AQc242Zr7iqz4DgpQOrEzglWVMGHMDCkguLHEKxd1+rOsmgSQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/jest-worker": {
+      "version": "27.5.1",
+      "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-27.5.1.tgz",
+      "integrity": "sha512-7vuh85V5cdDofPyxn58nrPjBktZo0u9x1g8WtjQol+jZDaE+fhN+cIvTj11GndBnMnyfrUOG1sZQxCdjKh+DKg==",
+      "dev": true,
+      "dependencies": {
+        "@types/node": "*",
+        "merge-stream": "^2.0.0",
+        "supports-color": "^8.0.0"
+      },
+      "engines": {
+        "node": ">= 10.13.0"
+      }
+    },
+    "node_modules/jest-worker/node_modules/has-flag": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/jest-worker/node_modules/supports-color": {
+      "version": "8.1.1",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz",
+      "integrity": "sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==",
+      "dev": true,
+      "dependencies": {
+        "has-flag": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/supports-color?sponsor=1"
+      }
+    },
+    "node_modules/jiti": {
+      "version": "1.21.6",
+      "resolved": "https://registry.npmjs.org/jiti/-/jiti-1.21.6.tgz",
+      "integrity": "sha512-2yTgeWTWzMWkHu6Jp9NKgePDaYHbntiwvYuuJLbbN9vl7DC9DvXKOB2BC3ZZ92D3cvV/aflH0osDfwpHepQ53w==",
+      "dev": true,
+      "bin": {
+        "jiti": "bin/jiti.js"
+      }
+    },
+    "node_modules/js-sdsl": {
+      "version": "4.4.2",
+      "resolved": "https://registry.npmjs.org/js-sdsl/-/js-sdsl-4.4.2.tgz",
+      "integrity": "sha512-dwXFwByc/ajSV6m5bcKAPwe4yDDF6D614pxmIi5odytzxRlwqF6nwoiCek80Ixc7Cvma5awClxrzFtxCQvcM8w==",
+      "dev": true,
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/js-sdsl"
+      }
+    },
+    "node_modules/js-sha256": {
+      "version": "0.10.1",
+      "resolved": "https://registry.npmjs.org/js-sha256/-/js-sha256-0.10.1.tgz",
+      "integrity": "sha512-5obBtsz9301ULlsgggLg542s/jqtddfOpV5KJc4hajc9JV8GeY2gZHSVpYBn4nWqAUTJ9v+xwtbJ1mIBgIH5Vw=="
+    },
+    "node_modules/js-sha3": {
+      "version": "0.8.0",
+      "resolved": "https://registry.npmjs.org/js-sha3/-/js-sha3-0.8.0.tgz",
+      "integrity": "sha512-gF1cRrHhIzNfToc802P800N8PpXS+evLLXfsVpowqmAFR9uwbi89WvXg2QspOmXL8QL86J4T1EpFu+yUkwJY3Q=="
+    },
+    "node_modules/js-tokens": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz",
+      "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ=="
+    },
+    "node_modules/js-yaml": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz",
+      "integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==",
+      "dev": true,
+      "dependencies": {
+        "argparse": "^2.0.1"
+      },
+      "bin": {
+        "js-yaml": "bin/js-yaml.js"
+      }
+    },
+    "node_modules/jsesc": {
+      "version": "2.5.2",
+      "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-2.5.2.tgz",
+      "integrity": "sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA==",
+      "bin": {
+        "jsesc": "bin/jsesc"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/json-bigint": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/json-bigint/-/json-bigint-1.0.0.tgz",
+      "integrity": "sha512-SiPv/8VpZuWbvLSMtTDU8hEfrZWg/mH/nV/b4o0CYbSxu1UIQPLdwKOCIyLQX+VIPO5vrLX3i8qtqFyhdPSUSQ==",
+      "dependencies": {
+        "bignumber.js": "^9.0.0"
+      }
+    },
+    "node_modules/json-parse-even-better-errors": {
+      "version": "2.3.1",
+      "resolved": "https://registry.npmjs.org/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz",
+      "integrity": "sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w==",
+      "dev": true
+    },
+    "node_modules/json-schema-traverse": {
+      "version": "0.4.1",
+      "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
+      "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==",
+      "dev": true
+    },
+    "node_modules/json-stable-stringify-without-jsonify": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz",
+      "integrity": "sha512-Bdboy+l7tA3OGW6FjyFHWkP5LuByj1Tk33Ljyq0axyzdk9//JSi2u3fP1QSmd1KNwq6VOKYGlAu87CisVir6Pw==",
+      "dev": true
+    },
+    "node_modules/json5": {
+      "version": "2.2.3",
+      "resolved": "https://registry.npmjs.org/json5/-/json5-2.2.3.tgz",
+      "integrity": "sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg==",
+      "bin": {
+        "json5": "lib/cli.js"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/jsonc-parser": {
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/jsonc-parser/-/jsonc-parser-3.2.0.tgz",
+      "integrity": "sha512-gfFQZrcTc8CnKXp6Y4/CBT3fTc0OVuDofpre4aEeEpSBPV5X5v4+Vmx+8snU7RLPrNHPKSgLxGo9YuQzz20o+w==",
+      "dev": true
+    },
+    "node_modules/jsonfile": {
+      "version": "6.1.0",
+      "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.1.0.tgz",
+      "integrity": "sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ==",
+      "dev": true,
+      "dependencies": {
+        "universalify": "^2.0.0"
+      },
+      "optionalDependencies": {
+        "graceful-fs": "^4.1.6"
+      }
+    },
+    "node_modules/jsontokens": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/jsontokens/-/jsontokens-4.0.1.tgz",
+      "integrity": "sha512-+MO415LEN6M+3FGsRz4wU20g7N2JA+2j9d9+pGaNJHviG4L8N0qzavGyENw6fJqsq9CcrHOIL6iWX5yeTZ86+Q==",
+      "dependencies": {
+        "@noble/hashes": "^1.1.2",
+        "@noble/secp256k1": "^1.6.3",
+        "base64-js": "^1.5.1"
+      }
+    },
+    "node_modules/jsx-ast-utils": {
+      "version": "3.3.5",
+      "resolved": "https://registry.npmjs.org/jsx-ast-utils/-/jsx-ast-utils-3.3.5.tgz",
+      "integrity": "sha512-ZZow9HBI5O6EPgSJLUb8n2NKgmVWTwCvHGwFuJlMjvLFqlGG6pjirPhtdsseaLZjSibD8eegzmYpUZwoIlj2cQ==",
+      "dev": true,
+      "dependencies": {
+        "array-includes": "^3.1.6",
+        "array.prototype.flat": "^1.3.1",
+        "object.assign": "^4.1.4",
+        "object.values": "^1.1.6"
+      },
+      "engines": {
+        "node": ">=4.0"
+      }
+    },
+    "node_modules/knip": {
+      "version": "5.23.3",
+      "resolved": "https://registry.npmjs.org/knip/-/knip-5.23.3.tgz",
+      "integrity": "sha512-i0vFlpe3D9AZmp3Hlq3ZncjJQB2x21LeVrIV+9rnBavaKpTLhV/sLmE4iqTjEWedLtpfJsax68S68aqZzcXpsQ==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/webpro"
+        },
+        {
+          "type": "opencollective",
+          "url": "https://opencollective.com/knip"
+        },
+        {
+          "type": "polar",
+          "url": "https://polar.sh/webpro-nl"
+        }
+      ],
+      "dependencies": {
+        "@ericcornelissen/bash-parser": "0.5.3",
+        "@nodelib/fs.walk": "2.0.0",
+        "@snyk/github-codeowners": "1.1.0",
+        "easy-table": "1.2.0",
+        "fast-glob": "^3.3.2",
+        "jiti": "^1.21.6",
+        "js-yaml": "^4.1.0",
+        "minimist": "^1.2.8",
+        "picocolors": "^1.0.0",
+        "picomatch": "^4.0.1",
+        "pretty-ms": "^9.0.0",
+        "resolve": "^1.22.8",
+        "smol-toml": "^1.1.4",
+        "strip-json-comments": "5.0.1",
+        "summary": "2.1.0",
+        "tsconfig-paths": "^4.2.0",
+        "zod": "^3.22.4",
+        "zod-validation-error": "^3.0.3"
+      },
+      "bin": {
+        "knip": "bin/knip.js",
+        "knip-bun": "bin/knip-bun.js"
+      },
+      "engines": {
+        "node": ">=18.6.0"
+      },
+      "peerDependencies": {
+        "@types/node": ">=18",
+        "typescript": ">=5.0.4"
+      }
+    },
+    "node_modules/knip/node_modules/@nodelib/fs.scandir": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-3.0.0.tgz",
+      "integrity": "sha512-ktI9+PxfHYtKjF3cLTUAh2N+b8MijCRPNwKJNqTVdL0gB0QxLU2rIRaZ1t71oEa3YBDE6bukH1sR0+CDnpp/Mg==",
+      "dev": true,
+      "dependencies": {
+        "@nodelib/fs.stat": "3.0.0",
+        "run-parallel": "^1.2.0"
+      },
+      "engines": {
+        "node": ">=16.14.0"
+      }
+    },
+    "node_modules/knip/node_modules/@nodelib/fs.stat": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-3.0.0.tgz",
+      "integrity": "sha512-2tQOI38s19P9i7X/Drt0v8iMA+KMsgdhB/dyPER+e+2Y8L1Z7QvnuRdW/uLuf5YRFUYmnj4bMA6qCuZHFI1GDQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=16.14.0"
+      }
+    },
+    "node_modules/knip/node_modules/@nodelib/fs.walk": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/@nodelib/fs.walk/-/fs.walk-2.0.0.tgz",
+      "integrity": "sha512-54voNDBobGdMl3BUXSu7UaDh1P85PGHWlJ5e0XhPugo1JulOyCtp2I+5ri4wplGDJ8QGwPEQW7/x3yTLU7yF1A==",
+      "dev": true,
+      "dependencies": {
+        "@nodelib/fs.scandir": "3.0.0",
+        "fastq": "^1.15.0"
+      },
+      "engines": {
+        "node": ">=16.14.0"
+      }
+    },
+    "node_modules/knip/node_modules/picomatch": {
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.2.tgz",
+      "integrity": "sha512-M7BAV6Rlcy5u+m6oPhAPFgJTzAioX/6B0DxyvDlo9l8+T3nLKbrczg2WLUyzd45L8RqfUMyGPzekbMvX2Ldkwg==",
+      "dev": true,
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/jonschlinkert"
+      }
+    },
+    "node_modules/knip/node_modules/strip-json-comments": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-5.0.1.tgz",
+      "integrity": "sha512-0fk9zBqO67Nq5M/m45qHCJxylV/DhBlIOVExqgOMiCCrzrhU6tCibRXNqE3jwJLftzE9SNuZtYbpzcO+i9FiKw==",
+      "dev": true,
+      "engines": {
+        "node": ">=14.16"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/knip/node_modules/tsconfig-paths": {
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/tsconfig-paths/-/tsconfig-paths-4.2.0.tgz",
+      "integrity": "sha512-NoZ4roiN7LnbKn9QqE1amc9DJfzvZXxF4xDavcOWt1BPkdx+m+0gJuPM+S0vCe7zTJMYUP0R8pO2XMr+Y8oLIg==",
+      "dev": true,
+      "dependencies": {
+        "json5": "^2.2.2",
+        "minimist": "^1.2.6",
+        "strip-bom": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/language-subtag-registry": {
+      "version": "0.3.22",
+      "resolved": "https://registry.npmjs.org/language-subtag-registry/-/language-subtag-registry-0.3.22.tgz",
+      "integrity": "sha512-tN0MCzyWnoz/4nHS6uxdlFWoUZT7ABptwKPQ52Ea7URk6vll88bWBVhodtnlfEuCcKWNGoc+uGbw1cwa9IKh/w==",
+      "dev": true
+    },
+    "node_modules/language-tags": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/language-tags/-/language-tags-1.0.5.tgz",
+      "integrity": "sha512-qJhlO9cGXi6hBGKoxEG/sKZDAHD5Hnu9Hs4WbOY3pCWXDhw0N8x1NenNzm2EnNLkLkk7J2SdxAkDSbb6ftT+UQ==",
+      "dev": true,
+      "dependencies": {
+        "language-subtag-registry": "~0.3.2"
+      }
+    },
+    "node_modules/launch-editor": {
+      "version": "2.6.0",
+      "resolved": "https://registry.npmjs.org/launch-editor/-/launch-editor-2.6.0.tgz",
+      "integrity": "sha512-JpDCcQnyAAzZZaZ7vEiSqL690w7dAEyLao+KC96zBplnYbJS7TYNjvM3M7y3dGz+v7aIsJk3hllWuc0kWAjyRQ==",
+      "dev": true,
+      "dependencies": {
+        "picocolors": "^1.0.0",
+        "shell-quote": "^1.7.3"
+      }
+    },
+    "node_modules/ledger-bitcoin": {
+      "version": "0.2.3",
+      "resolved": "https://registry.npmjs.org/ledger-bitcoin/-/ledger-bitcoin-0.2.3.tgz",
+      "integrity": "sha512-sWdvMTR5CkebNlM0Mam9ROdpsD7Y4087kj4cbIaCCq8IXShCQ44vE3j0wTmt+sHp13eETgY63OWN1rkuIfMfuQ==",
+      "dependencies": {
+        "@bitcoinerlab/descriptors": "^1.0.2",
+        "@bitcoinerlab/secp256k1": "^1.0.5",
+        "@ledgerhq/hw-transport": "^6.20.0",
+        "bip32-path": "^0.4.2",
+        "bitcoinjs-lib": "^6.1.3"
+      },
+      "engines": {
+        "node": ">=14"
+      }
+    },
+    "node_modules/levn": {
+      "version": "0.4.1",
+      "resolved": "https://registry.npmjs.org/levn/-/levn-0.4.1.tgz",
+      "integrity": "sha512-+bT2uH4E5LGE7h/n3evcS/sQlJXCpIp6ym8OWJ5eV6+67Dsql/LaaT7qJBAt2rzfoa/5QBGBhxDix1dMt2kQKQ==",
+      "dev": true,
+      "dependencies": {
+        "prelude-ls": "^1.2.1",
+        "type-check": "~0.4.0"
+      },
+      "engines": {
+        "node": ">= 0.8.0"
+      }
+    },
+    "node_modules/lilconfig": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/lilconfig/-/lilconfig-2.1.0.tgz",
+      "integrity": "sha512-utWOt/GHzuUxnLKxB6dk81RoOeoNeHgbrXiuGk4yyF5qlRz+iIVWu56E2fqGHFrXz0QNUhLB/8nKqvRH66JKGQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/lines-and-columns": {
+      "version": "1.2.4",
+      "resolved": "https://registry.npmjs.org/lines-and-columns/-/lines-and-columns-1.2.4.tgz",
+      "integrity": "sha512-7ylylesZQ/PV29jhEDl3Ufjo6ZX7gCqJr5F7PKrqc93v7fzSymt1BpwEU8nAUXs8qzzvqhbjhK5QZg6Mt/HkBg==",
+      "dev": true
+    },
+    "node_modules/lint-staged": {
+      "version": "13.2.3",
+      "resolved": "https://registry.npmjs.org/lint-staged/-/lint-staged-13.2.3.tgz",
+      "integrity": "sha512-zVVEXLuQIhr1Y7R7YAWx4TZLdvuzk7DnmrsTNL0fax6Z3jrpFcas+vKbzxhhvp6TA55m1SQuWkpzI1qbfDZbAg==",
+      "dev": true,
+      "dependencies": {
+        "chalk": "5.2.0",
+        "cli-truncate": "^3.1.0",
+        "commander": "^10.0.0",
+        "debug": "^4.3.4",
+        "execa": "^7.0.0",
+        "lilconfig": "2.1.0",
+        "listr2": "^5.0.7",
+        "micromatch": "^4.0.5",
+        "normalize-path": "^3.0.0",
+        "object-inspect": "^1.12.3",
+        "pidtree": "^0.6.0",
+        "string-argv": "^0.3.1",
+        "yaml": "^2.2.2"
+      },
+      "bin": {
+        "lint-staged": "bin/lint-staged.js"
+      },
+      "engines": {
+        "node": "^14.13.1 || >=16.0.0"
+      },
+      "funding": {
+        "url": "https://opencollective.com/lint-staged"
+      }
+    },
+    "node_modules/lint-staged/node_modules/chalk": {
+      "version": "5.2.0",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-5.2.0.tgz",
+      "integrity": "sha512-ree3Gqw/nazQAPuJJEy+avdl7QfZMcUvmHIKgEZkGL+xOBzRvup5Hxo6LHuMceSxOabuJLJm5Yp/92R9eMmMvA==",
+      "dev": true,
+      "engines": {
+        "node": "^12.17.0 || ^14.13 || >=16.0.0"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/chalk?sponsor=1"
+      }
+    },
+    "node_modules/lint-staged/node_modules/execa": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/execa/-/execa-7.2.0.tgz",
+      "integrity": "sha512-UduyVP7TLB5IcAQl+OzLyLcS/l32W/GLg+AhHJ+ow40FOk2U3SAllPwR44v4vmdFwIWqpdwxxpQbF1n5ta9seA==",
+      "dev": true,
+      "dependencies": {
+        "cross-spawn": "^7.0.3",
+        "get-stream": "^6.0.1",
+        "human-signals": "^4.3.0",
+        "is-stream": "^3.0.0",
+        "merge-stream": "^2.0.0",
+        "npm-run-path": "^5.1.0",
+        "onetime": "^6.0.0",
+        "signal-exit": "^3.0.7",
+        "strip-final-newline": "^3.0.0"
+      },
+      "engines": {
+        "node": "^14.18.0 || ^16.14.0 || >=18.0.0"
+      },
+      "funding": {
+        "url": "https://github.com/sindresorhus/execa?sponsor=1"
+      }
+    },
+    "node_modules/lint-staged/node_modules/human-signals": {
+      "version": "4.3.1",
+      "resolved": "https://registry.npmjs.org/human-signals/-/human-signals-4.3.1.tgz",
+      "integrity": "sha512-nZXjEF2nbo7lIw3mgYjItAfgQXog3OjJogSbKa2CQIIvSGWcKgeJnQlNXip6NglNzYH45nSRiEVimMvYL8DDqQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=14.18.0"
+      }
+    },
+    "node_modules/lint-staged/node_modules/is-stream": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-3.0.0.tgz",
+      "integrity": "sha512-LnQR4bZ9IADDRSkvpqMGvt/tEJWclzklNgSw48V5EAaAeDd6qGvN8ei6k5p0tvxSR171VmGyHuTiAOfxAbr8kA==",
+      "dev": true,
+      "engines": {
+        "node": "^12.20.0 || ^14.13.1 || >=16.0.0"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/lint-staged/node_modules/mimic-fn": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-4.0.0.tgz",
+      "integrity": "sha512-vqiC06CuhBTUdZH+RYl8sFrL096vA45Ok5ISO6sE/Mr1jRbGH4Csnhi8f3wKVl7x8mO4Au7Ir9D3Oyv1VYMFJw==",
+      "dev": true,
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/lint-staged/node_modules/npm-run-path": {
+      "version": "5.1.0",
+      "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-5.1.0.tgz",
+      "integrity": "sha512-sJOdmRGrY2sjNTRMbSvluQqg+8X7ZK61yvzBEIDhz4f8z1TZFYABsqjjCBd/0PUNE9M6QDgHJXQkGUEm7Q+l9Q==",
+      "dev": true,
+      "dependencies": {
+        "path-key": "^4.0.0"
+      },
+      "engines": {
+        "node": "^12.20.0 || ^14.13.1 || >=16.0.0"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/lint-staged/node_modules/onetime": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/onetime/-/onetime-6.0.0.tgz",
+      "integrity": "sha512-1FlR+gjXK7X+AsAHso35MnyN5KqGwJRi/31ft6x0M194ht7S+rWAvd7PHss9xSKMzE0asv1pyIHaJYq+BbacAQ==",
+      "dev": true,
+      "dependencies": {
+        "mimic-fn": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/lint-staged/node_modules/path-key": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/path-key/-/path-key-4.0.0.tgz",
+      "integrity": "sha512-haREypq7xkM7ErfgIyA0z+Bj4AGKlMSdlQE2jvJo6huWD1EdkKYV+G/T4nq0YEF2vgTT8kqMFKo1uHn950r4SQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/lint-staged/node_modules/strip-final-newline": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/strip-final-newline/-/strip-final-newline-3.0.0.tgz",
+      "integrity": "sha512-dOESqjYr96iWYylGObzd39EuNTa5VJxyvVAEm5Jnh7KGo75V43Hk1odPQkNDyXNmUR6k+gEiDVXnjB8HJ3crXw==",
+      "dev": true,
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/listr2": {
+      "version": "5.0.8",
+      "resolved": "https://registry.npmjs.org/listr2/-/listr2-5.0.8.tgz",
+      "integrity": "sha512-mC73LitKHj9w6v30nLNGPetZIlfpUniNSsxxrbaPcWOjDb92SHPzJPi/t+v1YC/lxKz/AJ9egOjww0qUuFxBpA==",
+      "dev": true,
+      "dependencies": {
+        "cli-truncate": "^2.1.0",
+        "colorette": "^2.0.19",
+        "log-update": "^4.0.0",
+        "p-map": "^4.0.0",
+        "rfdc": "^1.3.0",
+        "rxjs": "^7.8.0",
+        "through": "^2.3.8",
+        "wrap-ansi": "^7.0.0"
+      },
+      "engines": {
+        "node": "^14.13.1 || >=16.0.0"
+      },
+      "peerDependencies": {
+        "enquirer": ">= 2.3.0 < 3"
+      },
+      "peerDependenciesMeta": {
+        "enquirer": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/listr2/node_modules/ansi-styles": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+      "dev": true,
+      "dependencies": {
+        "color-convert": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
+      }
+    },
+    "node_modules/listr2/node_modules/cli-truncate": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/cli-truncate/-/cli-truncate-2.1.0.tgz",
+      "integrity": "sha512-n8fOixwDD6b/ObinzTrp1ZKFzbgvKZvuz/TvejnLn1aQfC6r52XEx85FmuC+3HI+JM7coBRXUvNqEU2PHVrHpg==",
+      "dev": true,
+      "dependencies": {
+        "slice-ansi": "^3.0.0",
+        "string-width": "^4.2.0"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/listr2/node_modules/color-convert": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+      "dev": true,
+      "dependencies": {
+        "color-name": "~1.1.4"
+      },
+      "engines": {
+        "node": ">=7.0.0"
+      }
+    },
+    "node_modules/listr2/node_modules/color-name": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+      "dev": true
+    },
+    "node_modules/listr2/node_modules/emoji-regex": {
+      "version": "8.0.0",
+      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
+      "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
+      "dev": true
+    },
+    "node_modules/listr2/node_modules/is-fullwidth-code-point": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
+      "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/listr2/node_modules/p-map": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/p-map/-/p-map-4.0.0.tgz",
+      "integrity": "sha512-/bjOqmgETBYB5BoEeGVea8dmvHb2m9GLy1E9W43yeyfP6QQCZGFNa+XRceJEuDB6zqr+gKpIAmlLebMpykw/MQ==",
+      "dev": true,
+      "dependencies": {
+        "aggregate-error": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/listr2/node_modules/rxjs": {
+      "version": "7.8.1",
+      "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-7.8.1.tgz",
+      "integrity": "sha512-AA3TVj+0A2iuIoQkWEK/tqFjBq2j+6PO6Y0zJcvzLAFhEFIO3HL0vls9hWLncZbAAbK0mar7oZ4V079I/qPMxg==",
+      "dev": true,
+      "dependencies": {
+        "tslib": "^2.1.0"
+      }
+    },
+    "node_modules/listr2/node_modules/slice-ansi": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-3.0.0.tgz",
+      "integrity": "sha512-pSyv7bSTC7ig9Dcgbw9AuRNUb5k5V6oDudjZoMBSr13qpLBG7tB+zgCkARjq7xIUgdz5P1Qe8u+rSGdouOOIyQ==",
+      "dev": true,
+      "dependencies": {
+        "ansi-styles": "^4.0.0",
+        "astral-regex": "^2.0.0",
+        "is-fullwidth-code-point": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/listr2/node_modules/string-width": {
+      "version": "4.2.3",
+      "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
+      "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
+      "dev": true,
+      "dependencies": {
+        "emoji-regex": "^8.0.0",
+        "is-fullwidth-code-point": "^3.0.0",
+        "strip-ansi": "^6.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/loader-runner": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/loader-runner/-/loader-runner-4.3.0.tgz",
+      "integrity": "sha512-3R/1M+yS3j5ou80Me59j7F9IMs4PXs3VqRrm0TU3AbKPxlmpoY1TNscJV/oGJXo8qCatFGTfDbY6W6ipGOYXfg==",
+      "dev": true,
+      "engines": {
+        "node": ">=6.11.5"
+      }
+    },
+    "node_modules/loader-utils": {
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.4.tgz",
+      "integrity": "sha512-xXqpXoINfFhgua9xiqD8fPFHgkoq1mmmpE92WlDbm9rNRd/EbRb+Gqf908T2DMfuHjjJlksiK2RbHVOdD/MqSw==",
+      "dev": true,
+      "dependencies": {
+        "big.js": "^5.2.2",
+        "emojis-list": "^3.0.0",
+        "json5": "^2.1.2"
+      },
+      "engines": {
+        "node": ">=8.9.0"
+      }
+    },
+    "node_modules/local-pkg": {
+      "version": "0.4.3",
+      "resolved": "https://registry.npmjs.org/local-pkg/-/local-pkg-0.4.3.tgz",
+      "integrity": "sha512-SFppqq5p42fe2qcZQqqEOiVRXl+WCP1MdT6k7BDEW1j++sp5fIY+/fdRQitvKgB5BrBcmrs5m/L0v2FrU5MY1g==",
+      "dev": true,
+      "engines": {
+        "node": ">=14"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/antfu"
+      }
+    },
+    "node_modules/locate-path": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-6.0.0.tgz",
+      "integrity": "sha512-iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw==",
+      "dev": true,
+      "dependencies": {
+        "p-locate": "^5.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/lodash": {
+      "version": "4.17.21",
+      "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz",
+      "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg=="
+    },
+    "node_modules/lodash.clonedeep": {
+      "version": "4.5.0",
+      "resolved": "https://registry.npmjs.org/lodash.clonedeep/-/lodash.clonedeep-4.5.0.tgz",
+      "integrity": "sha512-H5ZhCF25riFd9uB5UCkVKo61m3S/xZk1x4wA6yp/L3RFP6Z/eHH1ymQcGLo7J3GMPfm0V/7m1tryHuGVxpqEBQ=="
+    },
+    "node_modules/lodash.curry": {
+      "version": "4.1.1",
+      "resolved": "https://registry.npmjs.org/lodash.curry/-/lodash.curry-4.1.1.tgz",
+      "integrity": "sha512-/u14pXGviLaweY5JI0IUzgzF2J6Ne8INyzAZjImcryjgkZ+ebruBxy2/JaOOkTqScddcYtakjhSaeemV8lR0tA==",
+      "dev": true
+    },
+    "node_modules/lodash.get": {
+      "version": "4.4.2",
+      "resolved": "https://registry.npmjs.org/lodash.get/-/lodash.get-4.4.2.tgz",
+      "integrity": "sha512-z+Uw/vLuy6gQe8cfaFWD7p0wVv8fJl3mbzXh33RS+0oW2wvUqiRXiQ69gLWSLpgB5/6sU+r6BlQR0MBILadqTQ==",
+      "dev": true
+    },
+    "node_modules/lodash.merge": {
+      "version": "4.6.2",
+      "resolved": "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.2.tgz",
+      "integrity": "sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==",
+      "dev": true
+    },
+    "node_modules/lodash.omit": {
+      "version": "4.5.0",
+      "resolved": "https://registry.npmjs.org/lodash.omit/-/lodash.omit-4.5.0.tgz",
+      "integrity": "sha512-XeqSp49hNGmlkj2EJlfrQFIzQ6lXdNro9sddtQzcJY8QaoC2GO0DT7xaIokHeyM+mIT0mPMlPvkYzg2xCuHdZg==",
+      "license": "MIT"
+    },
+    "node_modules/lodash.padend": {
+      "version": "4.6.1",
+      "resolved": "https://registry.npmjs.org/lodash.padend/-/lodash.padend-4.6.1.tgz",
+      "integrity": "sha512-sOQs2aqGpbl27tmCS1QNZA09Uqp01ZzWfDUoD+xzTii0E7dSQfRKcRetFwa+uXaxaqL+TKm7CgD2JdKP7aZBSw=="
+    },
+    "node_modules/lodash.trimstart": {
+      "version": "4.5.1",
+      "resolved": "https://registry.npmjs.org/lodash.trimstart/-/lodash.trimstart-4.5.1.tgz",
+      "integrity": "sha512-b/+D6La8tU76L/61/aN0jULWHkT0EeJCmVstPBn/K9MtD2qBW83AsBNrr63dKuWYwVMO7ucv13QNO/Ek/2RKaQ=="
+    },
+    "node_modules/lodash.words": {
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/lodash.words/-/lodash.words-4.2.0.tgz",
+      "integrity": "sha512-mXxqd8Yx9BGPij3lZKFSdOsjOTbL4krbCCp9slEozaN4EMppA2dFmK/f8HeohodprY6W0vOdiQ5WFgPaTI75xQ=="
+    },
+    "node_modules/log-update": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/log-update/-/log-update-4.0.0.tgz",
+      "integrity": "sha512-9fkkDevMefjg0mmzWFBW8YkFP91OrizzkW3diF7CpG+S2EYdy4+TVfGwz1zeF8x7hCx1ovSPTOE9Ngib74qqUg==",
+      "dev": true,
+      "dependencies": {
+        "ansi-escapes": "^4.3.0",
+        "cli-cursor": "^3.1.0",
+        "slice-ansi": "^4.0.0",
+        "wrap-ansi": "^6.2.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/log-update/node_modules/ansi-styles": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+      "dev": true,
+      "dependencies": {
+        "color-convert": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
+      }
+    },
+    "node_modules/log-update/node_modules/color-convert": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+      "dev": true,
+      "dependencies": {
+        "color-name": "~1.1.4"
+      },
+      "engines": {
+        "node": ">=7.0.0"
+      }
+    },
+    "node_modules/log-update/node_modules/color-name": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+      "dev": true
+    },
+    "node_modules/log-update/node_modules/emoji-regex": {
+      "version": "8.0.0",
+      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
+      "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
+      "dev": true
+    },
+    "node_modules/log-update/node_modules/is-fullwidth-code-point": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
+      "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/log-update/node_modules/slice-ansi": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-4.0.0.tgz",
+      "integrity": "sha512-qMCMfhY040cVHT43K9BFygqYbUPFZKHOg7K73mtTWJRb8pyP3fzf4Ixd5SzdEJQ6MRUg/WBnOLxghZtKKurENQ==",
+      "dev": true,
+      "dependencies": {
+        "ansi-styles": "^4.0.0",
+        "astral-regex": "^2.0.0",
+        "is-fullwidth-code-point": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/slice-ansi?sponsor=1"
+      }
+    },
+    "node_modules/log-update/node_modules/string-width": {
+      "version": "4.2.3",
+      "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
+      "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
+      "dev": true,
+      "dependencies": {
+        "emoji-regex": "^8.0.0",
+        "is-fullwidth-code-point": "^3.0.0",
+        "strip-ansi": "^6.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/log-update/node_modules/wrap-ansi": {
+      "version": "6.2.0",
+      "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-6.2.0.tgz",
+      "integrity": "sha512-r6lPcBGxZXlIcymEu7InxDMhdW0KDxpLgoFLcguasxCaJ/SOIZwINatK9KY/tf+ZrlywOKU0UDj3ATXUBfxJXA==",
+      "dev": true,
+      "dependencies": {
+        "ansi-styles": "^4.0.0",
+        "string-width": "^4.1.0",
+        "strip-ansi": "^6.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/loose-envify": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/loose-envify/-/loose-envify-1.4.0.tgz",
+      "integrity": "sha512-lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q==",
+      "dependencies": {
+        "js-tokens": "^3.0.0 || ^4.0.0"
+      },
+      "bin": {
+        "loose-envify": "cli.js"
+      }
+    },
+    "node_modules/lottie-web": {
+      "version": "5.12.2",
+      "resolved": "https://registry.npmjs.org/lottie-web/-/lottie-web-5.12.2.tgz",
+      "integrity": "sha512-uvhvYPC8kGPjXT3MyKMrL3JitEAmDMp30lVkuq/590Mw9ok6pWcFCwXJveo0t5uqYw1UREQHofD+jVpdjBv8wg=="
+    },
+    "node_modules/loupe": {
+      "version": "2.3.7",
+      "resolved": "https://registry.npmjs.org/loupe/-/loupe-2.3.7.tgz",
+      "integrity": "sha512-zSMINGVYkdpYSOBmLi0D1Uo7JU9nVdQKrHxC8eYlV+9YKK9WePqAlL7lSlorG/U2Fw1w0hTBmaa/jrQ3UbPHtA==",
+      "dev": true,
+      "dependencies": {
+        "get-func-name": "^2.0.1"
+      }
+    },
+    "node_modules/lower-case": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/lower-case/-/lower-case-2.0.2.tgz",
+      "integrity": "sha512-7fm3l3NAF9WfN6W3JOmf5drwpVqX78JtoGJ3A6W0a6ZnldM41w2fV5D490psKFTpMds8TJse/eHLFFsNHHjHgg==",
+      "dev": true,
+      "dependencies": {
+        "tslib": "^2.0.3"
+      }
+    },
+    "node_modules/lru-cache": {
+      "version": "5.1.1",
+      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-5.1.1.tgz",
+      "integrity": "sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==",
+      "peer": true,
+      "dependencies": {
+        "yallist": "^3.0.2"
+      }
+    },
+    "node_modules/magic-string": {
+      "version": "0.30.5",
+      "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.30.5.tgz",
+      "integrity": "sha512-7xlpfBaQaP/T6Vh8MO/EqXSW5En6INHEvEXQiuff7Gku0PWjU3uf6w/j9o7O+SpB5fOAkrI5HeoNgwjEO0pFsA==",
+      "dev": true,
+      "dependencies": {
+        "@jridgewell/sourcemap-codec": "^1.4.15"
+      },
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/map-obj": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/map-obj/-/map-obj-2.0.0.tgz",
+      "integrity": "sha512-TzQSV2DiMYgoF5RycneKVUzIa9bQsj/B3tTgsE3dOGqlzHnGIDaC7XBE7grnA+8kZPnfqSGFe95VHc2oc0VFUQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/md5.js": {
+      "version": "1.3.5",
+      "resolved": "https://registry.npmjs.org/md5.js/-/md5.js-1.3.5.tgz",
+      "integrity": "sha512-xitP+WxNPcTTOgnTJcrhM0xvdPepipPSf3I8EIpGKeFLjt3PlJLIDG3u8EX53ZIubkb+5U2+3rELYpEhHhzdkg==",
+      "dependencies": {
+        "hash-base": "^3.0.0",
+        "inherits": "^2.0.1",
+        "safe-buffer": "^5.1.2"
+      }
+    },
+    "node_modules/media-typer": {
+      "version": "0.3.0",
+      "resolved": "https://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz",
+      "integrity": "sha512-dq+qelQ9akHpcOl/gUVRTxVIOkAJ1wR3QAvb4RsVjS8oVoFjDGTc679wJYmUmknUF5HwMLOgb5O+a3KxfWapPQ==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
+    "node_modules/memfs": {
+      "version": "3.5.3",
+      "resolved": "https://registry.npmjs.org/memfs/-/memfs-3.5.3.tgz",
+      "integrity": "sha512-UERzLsxzllchadvbPs5aolHh65ISpKpM+ccLbOJ8/vvpBKmAWf+la7dXFy7Mr0ySHbdHrFv5kGFCUHHe6GFEmw==",
+      "dev": true,
+      "dependencies": {
+        "fs-monkey": "^1.0.4"
+      },
+      "engines": {
+        "node": ">= 4.0.0"
+      }
+    },
+    "node_modules/merge-descriptors": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.1.tgz",
+      "integrity": "sha512-cCi6g3/Zr1iqQi6ySbseM1Xvooa98N0w31jzUYrXPX2xqObmFGHJ0tQ5u74H3mVh7wLouTseZyYIq39g8cNp1w==",
+      "dev": true
+    },
+    "node_modules/merge-stream": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/merge-stream/-/merge-stream-2.0.0.tgz",
+      "integrity": "sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w==",
+      "dev": true
+    },
+    "node_modules/merge2": {
+      "version": "1.4.1",
+      "resolved": "https://registry.npmjs.org/merge2/-/merge2-1.4.1.tgz",
+      "integrity": "sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==",
+      "dev": true,
+      "engines": {
+        "node": ">= 8"
+      }
+    },
+    "node_modules/methods": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/methods/-/methods-1.1.2.tgz",
+      "integrity": "sha512-iclAHeNqNm68zFtnZ0e+1L2yUIdvzNoauKU4WBA3VvH/vPFieF7qfRlwUZU+DA9P9bPXIS90ulxoUoCH23sV2w==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
+    "node_modules/micro-packed": {
+      "version": "0.5.1",
+      "resolved": "https://registry.npmjs.org/micro-packed/-/micro-packed-0.5.1.tgz",
+      "integrity": "sha512-VjBHcsMAVfivjCZPnqAEEkcihPBbNd39KLEMH76ksL3ORKSZE04gkrtsAmXtaTor67PmTO5h0Rq9+j3PA4zNrw==",
+      "dependencies": {
+        "@scure/base": "~1.1.5"
+      },
+      "funding": {
+        "url": "https://paulmillr.com/funding/"
+      }
+    },
+    "node_modules/micromatch": {
+      "version": "4.0.5",
+      "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.5.tgz",
+      "integrity": "sha512-DMy+ERcEW2q8Z2Po+WNXuw3c5YaUSFjAO5GsJqfEl7UjvtIuFKO6ZrKvcItdy98dwFI2N1tg3zNIdKaQT+aNdA==",
+      "dev": true,
+      "dependencies": {
+        "braces": "^3.0.2",
+        "picomatch": "^2.3.1"
+      },
+      "engines": {
+        "node": ">=8.6"
+      }
+    },
+    "node_modules/microseconds": {
+      "version": "0.1.0",
+      "resolved": "https://registry.npmjs.org/microseconds/-/microseconds-0.1.0.tgz",
+      "integrity": "sha512-yF2K4aHXKxO4OGhW7Ek2KLgKEAFbSblBLKlF6KzwQUhjK7+uAzatRr6fZ82bftdnuDQrkBHAJp5s8quj1ME3wA==",
+      "dev": true
+    },
+    "node_modules/miller-rabin": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/miller-rabin/-/miller-rabin-4.0.1.tgz",
+      "integrity": "sha512-115fLhvZVqWwHPbClyntxEVfVDfl9DLLTuJvq3g2O/Oxi8AiNouAHvDSzHS0viUJc+V5vm3eq91Xwqn9dp4jRA==",
+      "dependencies": {
+        "bn.js": "^4.0.0",
+        "brorand": "^1.0.1"
+      },
+      "bin": {
+        "miller-rabin": "bin/miller-rabin"
+      }
+    },
+    "node_modules/miller-rabin/node_modules/bn.js": {
+      "version": "4.12.0",
+      "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.0.tgz",
+      "integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA=="
+    },
+    "node_modules/mime": {
+      "version": "1.6.0",
+      "resolved": "https://registry.npmjs.org/mime/-/mime-1.6.0.tgz",
+      "integrity": "sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg==",
+      "dev": true,
+      "bin": {
+        "mime": "cli.js"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/mime-db": {
+      "version": "1.52.0",
+      "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.52.0.tgz",
+      "integrity": "sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==",
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
+    "node_modules/mime-types": {
+      "version": "2.1.35",
+      "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.35.tgz",
+      "integrity": "sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==",
+      "dependencies": {
+        "mime-db": "1.52.0"
+      },
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
+    "node_modules/mimic-fn": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-2.1.0.tgz",
+      "integrity": "sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==",
+      "dev": true,
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/minimalistic-assert": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/minimalistic-assert/-/minimalistic-assert-1.0.1.tgz",
+      "integrity": "sha512-UtJcAD4yEaGtjPezWuO9wC4nwUnVH/8/Im3yEHQP4b67cXlD/Qr9hdITCU1xDbSEXg2XKNaP8jsReV7vQd00/A=="
+    },
+    "node_modules/minimalistic-crypto-utils": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/minimalistic-crypto-utils/-/minimalistic-crypto-utils-1.0.1.tgz",
+      "integrity": "sha512-JIYlbt6g8i5jKfJ3xz7rF0LXmv2TkDxBLUkiBeZ7bAx4GnnNMr8xFpGnOxn6GhTEHx3SjRrZEoU+j04prX1ktg=="
+    },
+    "node_modules/minimatch": {
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
+      "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
+      "dependencies": {
+        "brace-expansion": "^1.1.7"
+      },
+      "engines": {
+        "node": "*"
+      }
+    },
+    "node_modules/minimist": {
+      "version": "1.2.8",
+      "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.8.tgz",
+      "integrity": "sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA==",
+      "dev": true,
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/mixpanel-browser": {
+      "version": "2.47.0",
+      "resolved": "https://registry.npmjs.org/mixpanel-browser/-/mixpanel-browser-2.47.0.tgz",
+      "integrity": "sha512-Ldrva0fRBEIFWmEibBQO1PulfpJVF3pf28Guk09lDirDaSQqqU/xs9zQLwN2rL5VwVtsP1aD3JaCgaa98EjojQ=="
+    },
+    "node_modules/mlly": {
+      "version": "1.4.2",
+      "resolved": "https://registry.npmjs.org/mlly/-/mlly-1.4.2.tgz",
+      "integrity": "sha512-i/Ykufi2t1EZ6NaPLdfnZk2AX8cs0d+mTzVKuPfqPKPatxLApaBoxJQ9x1/uckXtrS/U5oisPMDkNs0yQTaBRg==",
+      "dev": true,
+      "dependencies": {
+        "acorn": "^8.10.0",
+        "pathe": "^1.1.1",
+        "pkg-types": "^1.0.3",
+        "ufo": "^1.3.0"
+      }
+    },
+    "node_modules/more-entropy": {
+      "version": "0.0.7",
+      "resolved": "https://registry.npmjs.org/more-entropy/-/more-entropy-0.0.7.tgz",
+      "integrity": "sha512-e0TxQtU1F6/ZA8WnEA2JLQwwDqBTtZFLJSW7rWgUsQou35wx1IOL0g2O7q7oGoMgIJto+jHMnNGHLfSiylHRrw==",
+      "dependencies": {
+        "iced-runtime": ">=0.0.1"
+      }
+    },
+    "node_modules/ms": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
+      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w=="
+    },
+    "node_modules/multicast-dns": {
+      "version": "7.2.5",
+      "resolved": "https://registry.npmjs.org/multicast-dns/-/multicast-dns-7.2.5.tgz",
+      "integrity": "sha512-2eznPJP8z2BFLX50tf0LuODrpINqP1RVIm/CObbTcBRITQgmC/TjcREF1NeTBzIcR5XO/ukWo+YHOjBbFwIupg==",
+      "dev": true,
+      "dependencies": {
+        "dns-packet": "^5.2.2",
+        "thunky": "^1.0.2"
+      },
+      "bin": {
+        "multicast-dns": "cli.js"
+      }
+    },
+    "node_modules/nan": {
+      "version": "2.20.0",
+      "resolved": "https://registry.npmjs.org/nan/-/nan-2.20.0.tgz",
+      "integrity": "sha512-bk3gXBZDGILuuo/6sKtr0DQmSThYHLtNCdSdXk9YkxD/jK6X2vmCyyXBBxyqZ4XcnzTyYEAThfX3DCEnLf6igw=="
+    },
+    "node_modules/nano-time": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/nano-time/-/nano-time-1.0.0.tgz",
+      "integrity": "sha512-flnngywOoQ0lLQOTRNexn2gGSNuM9bKj9RZAWSzhQ+UJYaAFG9bac4DW9VHjUAzrOaIcajHybCTHe/bkvozQqA==",
+      "dependencies": {
+        "big-integer": "^1.6.16"
+      }
+    },
+    "node_modules/nanoid": {
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-4.0.2.tgz",
+      "integrity": "sha512-7ZtY5KTCNheRGfEFxnedV5zFiORN1+Y1N6zvPTnHQd8ENUvfaDBeuJDZb2bN/oXwXxu3qkTXDzy57W5vAmDTBw==",
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/ai"
+        }
+      ],
+      "bin": {
+        "nanoid": "bin/nanoid.js"
+      },
+      "engines": {
+        "node": "^14 || ^16 || >=18"
+      }
+    },
+    "node_modules/natural-compare": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz",
+      "integrity": "sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw==",
+      "dev": true
+    },
+    "node_modules/natural-compare-lite": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/natural-compare-lite/-/natural-compare-lite-1.4.0.tgz",
+      "integrity": "sha512-Tj+HTDSJJKaZnfiuw+iaF9skdPpTo2GtEly5JHnWV/hfv2Qj/9RKsGISQtLh2ox3l5EAGw487hnBee0sIJ6v2g==",
+      "dev": true
+    },
+    "node_modules/negotiator": {
+      "version": "0.6.3",
+      "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.3.tgz",
+      "integrity": "sha512-+EUsqGPLsM+j/zdChZjsnX51g4XrHFOIXwfnCVPGlQk/k5giakcKsuxCObBRu6DSm9opw/O6slWbJdghQM4bBg==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
+    "node_modules/neo-async": {
+      "version": "2.6.2",
+      "resolved": "https://registry.npmjs.org/neo-async/-/neo-async-2.6.2.tgz",
+      "integrity": "sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==",
+      "dev": true
+    },
+    "node_modules/no-case": {
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/no-case/-/no-case-3.0.4.tgz",
+      "integrity": "sha512-fgAN3jGAh+RoxUGZHTSOLJIqUc2wmoBwGR4tbpNAKmmovFoWq0OdRkb0VkldReO2a2iBT/OEulG9XSUc10r3zg==",
+      "dev": true,
+      "dependencies": {
+        "lower-case": "^2.0.2",
+        "tslib": "^2.0.3"
+      }
+    },
+    "node_modules/node-abort-controller": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/node-abort-controller/-/node-abort-controller-3.1.1.tgz",
+      "integrity": "sha512-AGK2yQKIjRuqnc6VkX2Xj5d+QW8xZ87pa1UK6yA6ouUyuxfHuMP6umE5QK7UmTeOAymo+Zx1Fxiuw9rVx8taHQ==",
+      "dev": true
+    },
+    "node_modules/node-fetch": {
+      "version": "2.6.12",
+      "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.12.tgz",
+      "integrity": "sha512-C/fGU2E8ToujUivIO0H+tpQ6HWo4eEmchoPIoXtxCrVghxdKq+QOHqEZW7tuP3KlV3bC8FRMO5nMCC7Zm1VP6g==",
+      "dependencies": {
+        "whatwg-url": "^5.0.0"
+      },
+      "engines": {
+        "node": "4.x || >=6.0.0"
+      },
+      "peerDependencies": {
+        "encoding": "^0.1.0"
+      },
+      "peerDependenciesMeta": {
+        "encoding": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/node-fetch/node_modules/tr46": {
+      "version": "0.0.3",
+      "resolved": "https://registry.npmjs.org/tr46/-/tr46-0.0.3.tgz",
+      "integrity": "sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw=="
+    },
+    "node_modules/node-fetch/node_modules/webidl-conversions": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-3.0.1.tgz",
+      "integrity": "sha512-2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ=="
+    },
+    "node_modules/node-fetch/node_modules/whatwg-url": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-5.0.0.tgz",
+      "integrity": "sha512-saE57nupxk6v3HY35+jzBwYa0rKSy0XR8JSxZPwgLr7ys0IBzhGviA1/TUGJLmSVqs8pb9AnvICXEuOHLprYTw==",
+      "dependencies": {
+        "tr46": "~0.0.3",
+        "webidl-conversions": "^3.0.0"
+      }
+    },
+    "node_modules/node-forge": {
+      "version": "1.3.1",
+      "resolved": "https://registry.npmjs.org/node-forge/-/node-forge-1.3.1.tgz",
+      "integrity": "sha512-dPEtOeMvF9VMcYV/1Wb8CPoVAXtp6MKMlcbAt4ddqmGqUJ6fQZFXkNZNkNlfevtNkGtaSoXf/vNNNSvgrdXwtA==",
+      "dev": true,
+      "engines": {
+        "node": ">= 6.13.0"
+      }
+    },
+    "node_modules/node-releases": {
+      "version": "2.0.13",
+      "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.13.tgz",
+      "integrity": "sha512-uYr7J37ae/ORWdZeQ1xxMJe3NtdmqMC/JZK+geofDrkLUApKRHPd18/TxtBOJ4A0/+uUIliorNrfYV6s1b02eQ=="
+    },
+    "node_modules/normalize-path": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz",
+      "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/npm-run-path": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-4.0.1.tgz",
+      "integrity": "sha512-S48WzZW777zhNIrn7gxOlISNAqi9ZC/uQFnRdbeIHhZhCA6UqpkOT8T1G7BvfdgP4Er8gF4sUbaS0i7QvIfCWw==",
+      "dev": true,
+      "dependencies": {
+        "path-key": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/nth-check": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/nth-check/-/nth-check-2.1.1.tgz",
+      "integrity": "sha512-lqjrjmaOoAnWfMmBPL+XNnynZh2+swxiX3WUE0s4yEHI6m+AwrK2UZOimIRl3X/4QctVqS8AiZjFqyOGrMXb/w==",
+      "dev": true,
+      "dependencies": {
+        "boolbase": "^1.0.0"
+      },
+      "funding": {
+        "url": "https://github.com/fb55/nth-check?sponsor=1"
+      }
+    },
+    "node_modules/object-assign": {
+      "version": "4.1.1",
+      "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
+      "integrity": "sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg==",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/object-inspect": {
+      "version": "1.12.3",
+      "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.12.3.tgz",
+      "integrity": "sha512-geUvdk7c+eizMNUDkRpW1wJwgfOiOeHbxBR/hLXK1aT6zmVSO0jsQcs7fj6MGw89jC/cjGfLcNOrtMYtGqm81g==",
+      "dev": true,
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/object-is": {
+      "version": "1.1.5",
+      "resolved": "https://registry.npmjs.org/object-is/-/object-is-1.1.5.tgz",
+      "integrity": "sha512-3cyDsyHgtmi7I7DfSSI2LDp6SK2lwvtbg0p0R1e0RvTqF5ceGx+K2dfSjm1bKDMVCFEDAQvy+o8c6a7VujOddw==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.2",
+        "define-properties": "^1.1.3"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/object-keys": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.1.1.tgz",
+      "integrity": "sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
+    "node_modules/object-pairs": {
+      "version": "0.1.0",
+      "resolved": "https://registry.npmjs.org/object-pairs/-/object-pairs-0.1.0.tgz",
+      "integrity": "sha512-3ECr6K831I4xX/Mduxr9UC+HPOz/d6WKKYj9p4cmC8Lg8p7g8gitzsxNX5IWlSIgFWN/a4JgrJaoAMKn20oKwA==",
+      "dev": true
+    },
+    "node_modules/object-values": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/object-values/-/object-values-1.0.0.tgz",
+      "integrity": "sha512-+8hwcz/JnQ9EpLIXzN0Rs7DLsBpJNT/xYehtB/jU93tHYr5BFEO8E+JGQNOSqE7opVzz5cGksKFHt7uUJVLSjQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/object.assign": {
+      "version": "4.1.4",
+      "resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.4.tgz",
+      "integrity": "sha512-1mxKf0e58bvyjSCtKYY4sRe9itRk3PJpquJOjeIkz885CczcI4IvJJDLPS72oowuSh+pBxUFROpX+TU++hxhZQ==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.2",
+        "define-properties": "^1.1.4",
+        "has-symbols": "^1.0.3",
+        "object-keys": "^1.1.1"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/object.entries": {
+      "version": "1.1.6",
+      "resolved": "https://registry.npmjs.org/object.entries/-/object.entries-1.1.6.tgz",
+      "integrity": "sha512-leTPzo4Zvg3pmbQ3rDK69Rl8GQvIqMWubrkxONG9/ojtFE2rD9fjMKfSI5BxW3osRH1m6VdzmqK8oAY9aT4x5w==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.2",
+        "define-properties": "^1.1.4",
+        "es-abstract": "^1.20.4"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
+    "node_modules/object.fromentries": {
+      "version": "2.0.6",
+      "resolved": "https://registry.npmjs.org/object.fromentries/-/object.fromentries-2.0.6.tgz",
+      "integrity": "sha512-VciD13dswC4j1Xt5394WR4MzmAQmlgN72phd/riNp9vtD7tp4QQWJ0R4wvclXcafgcYK8veHRed2W6XeGBvcfg==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.2",
+        "define-properties": "^1.1.4",
+        "es-abstract": "^1.20.4"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/object.groupby": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/object.groupby/-/object.groupby-1.0.0.tgz",
+      "integrity": "sha512-70MWG6NfRH9GnbZOikuhPPYzpUpof9iW2J9E4dW7FXTqPNb6rllE6u39SKwwiNh8lCwX3DDb5OgcKGiEBrTTyw==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.2",
+        "define-properties": "^1.2.0",
+        "es-abstract": "^1.21.2",
+        "get-intrinsic": "^1.2.1"
+      }
+    },
+    "node_modules/object.hasown": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/object.hasown/-/object.hasown-1.1.2.tgz",
+      "integrity": "sha512-B5UIT3J1W+WuWIU55h0mjlwaqxiE5vYENJXIXZ4VFe05pNYrkKuK0U/6aFcb0pKywYJh7IhfoqUfKVmrJJHZHw==",
+      "dev": true,
+      "dependencies": {
+        "define-properties": "^1.1.4",
+        "es-abstract": "^1.20.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/object.values": {
+      "version": "1.1.6",
+      "resolved": "https://registry.npmjs.org/object.values/-/object.values-1.1.6.tgz",
+      "integrity": "sha512-FVVTkD1vENCsAcwNs9k6jea2uHC/X0+JcjG8YA60FN5CMaJmG95wT9jek/xX9nornqGRrBkKtzuAu2wuHpKqvw==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.2",
+        "define-properties": "^1.1.4",
+        "es-abstract": "^1.20.4"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/oblivious-set": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/oblivious-set/-/oblivious-set-1.0.0.tgz",
+      "integrity": "sha512-z+pI07qxo4c2CulUHCDf9lcqDlMSo72N/4rLUpRXf6fu+q8vjt8y0xS+Tlf8NTJDdTXHbdeO1n3MlbctwEoXZw=="
+    },
+    "node_modules/obuf": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/obuf/-/obuf-1.1.2.tgz",
+      "integrity": "sha512-PX1wu0AmAdPqOL1mWhqmlOd8kOIZQwGZw6rh7uby9fTc5lhaOWFLX3I6R1hrF9k3zUY40e6igsLGkDXK92LJNg==",
+      "dev": true
+    },
+    "node_modules/on-finished": {
+      "version": "2.4.1",
+      "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.4.1.tgz",
+      "integrity": "sha512-oVlzkg3ENAhCk2zdv7IJwd/QUD4z2RxRwpkcGY8psCVcCYZNq4wYnVWALHM+brtuJjePWiYF/ClmuDr8Ch5+kg==",
+      "dev": true,
+      "dependencies": {
+        "ee-first": "1.1.1"
+      },
+      "engines": {
+        "node": ">= 0.8"
+      }
+    },
+    "node_modules/on-headers": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/on-headers/-/on-headers-1.0.2.tgz",
+      "integrity": "sha512-pZAE+FJLoyITytdqK0U5s+FIpjN0JP3OzFi/u8Rx+EV5/W+JTWGXG8xFzevE7AjBfDqHv/8vL8qQsIhHnqRkrA==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.8"
+      }
+    },
+    "node_modules/once": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
+      "integrity": "sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==",
+      "dependencies": {
+        "wrappy": "1"
+      }
+    },
+    "node_modules/onetime": {
+      "version": "5.1.2",
+      "resolved": "https://registry.npmjs.org/onetime/-/onetime-5.1.2.tgz",
+      "integrity": "sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg==",
+      "dev": true,
+      "dependencies": {
+        "mimic-fn": "^2.1.0"
+      },
+      "engines": {
+        "node": ">=6"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/open": {
+      "version": "8.4.2",
+      "resolved": "https://registry.npmjs.org/open/-/open-8.4.2.tgz",
+      "integrity": "sha512-7x81NCL719oNbsq/3mh+hVrAWmFuEYUqrq/Iw3kUzH8ReypT9QQ0BLoJS7/G9k6N81XjW4qHWtjWwe/9eLy1EQ==",
+      "dev": true,
+      "dependencies": {
+        "define-lazy-prop": "^2.0.0",
+        "is-docker": "^2.1.1",
+        "is-wsl": "^2.2.0"
+      },
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/optionator": {
+      "version": "0.9.3",
+      "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.9.3.tgz",
+      "integrity": "sha512-JjCoypp+jKn1ttEFExxhetCKeJt9zhAgAve5FXHixTvFDW/5aEktX9bufBKLRRMdU7bNtpLfcGu94B3cdEJgjg==",
+      "dev": true,
+      "dependencies": {
+        "@aashutoshrathi/word-wrap": "^1.2.3",
+        "deep-is": "^0.1.3",
+        "fast-levenshtein": "^2.0.6",
+        "levn": "^0.4.1",
+        "prelude-ls": "^1.2.1",
+        "type-check": "^0.4.0"
+      },
+      "engines": {
+        "node": ">= 0.8.0"
+      }
+    },
+    "node_modules/p-limit": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz",
+      "integrity": "sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==",
+      "dev": true,
+      "dependencies": {
+        "yocto-queue": "^0.1.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/p-locate": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-5.0.0.tgz",
+      "integrity": "sha512-LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw==",
+      "dev": true,
+      "dependencies": {
+        "p-limit": "^3.0.2"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/p-map": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/p-map/-/p-map-2.1.0.tgz",
+      "integrity": "sha512-y3b8Kpd8OAN444hxfBbFfj1FY/RjtTd8tzYwhUqNYXx0fXx2iX4maP4Qr6qhIKbQXI02wTLAda4fYUbDagTUFw==",
+      "dev": true,
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/p-queue": {
+      "version": "7.3.4",
+      "resolved": "https://registry.npmjs.org/p-queue/-/p-queue-7.3.4.tgz",
+      "integrity": "sha512-esox8CWt0j9EZECFvkFl2WNPat8LN4t7WWeXq73D9ha0V96qPRufApZi4ZhPwXAln1uVVal429HVVKPa2X0yQg==",
+      "dependencies": {
+        "eventemitter3": "^4.0.7",
+        "p-timeout": "^5.0.2"
+      },
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/p-retry": {
+      "version": "4.6.2",
+      "resolved": "https://registry.npmjs.org/p-retry/-/p-retry-4.6.2.tgz",
+      "integrity": "sha512-312Id396EbJdvRONlngUx0NydfrIQ5lsYu0znKVUzVvArzEIt08V1qhtyESbGVd1FGX7UKtiFp5uwKZdM8wIuQ==",
+      "dev": true,
+      "dependencies": {
+        "@types/retry": "0.12.0",
+        "retry": "^0.13.1"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/p-timeout": {
+      "version": "5.1.0",
+      "resolved": "https://registry.npmjs.org/p-timeout/-/p-timeout-5.1.0.tgz",
+      "integrity": "sha512-auFDyzzzGZZZdHz3BtET9VEz0SE/uMEAx7uWfGPucfzEwwe/xH0iVeZibQmANYE/hp9T2+UUZT5m+BKyrDp3Ew==",
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/param-case": {
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/param-case/-/param-case-3.0.4.tgz",
+      "integrity": "sha512-RXlj7zCYokReqWpOPH9oYivUzLYZ5vAPIfEmCTNViosC78F8F0H9y7T7gG2M39ymgutxF5gcFEsyZQSph9Bp3A==",
+      "dev": true,
+      "dependencies": {
+        "dot-case": "^3.0.4",
+        "tslib": "^2.0.3"
+      }
+    },
+    "node_modules/parent-module": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/parent-module/-/parent-module-1.0.1.tgz",
+      "integrity": "sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g==",
+      "dev": true,
+      "dependencies": {
+        "callsites": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/parse-asn1": {
+      "version": "5.1.6",
+      "resolved": "https://registry.npmjs.org/parse-asn1/-/parse-asn1-5.1.6.tgz",
+      "integrity": "sha512-RnZRo1EPU6JBnra2vGHj0yhp6ebyjBZpmUCLHWiFhxlzvBCCpAuZ7elsBp1PVAbQN0/04VD/19rfzlBSwLstMw==",
+      "dependencies": {
+        "asn1.js": "^5.2.0",
+        "browserify-aes": "^1.0.0",
+        "evp_bytestokey": "^1.0.0",
+        "pbkdf2": "^3.0.3",
+        "safe-buffer": "^5.1.1"
+      }
+    },
+    "node_modules/parse-json": {
+      "version": "5.2.0",
+      "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-5.2.0.tgz",
+      "integrity": "sha512-ayCKvm/phCGxOkYRSCM82iDwct8/EonSEgCSxWxD7ve6jHggsFl4fZVQBPRNgQoKiuV/odhFrGzQXZwbifC8Rg==",
+      "dev": true,
+      "dependencies": {
+        "@babel/code-frame": "^7.0.0",
+        "error-ex": "^1.3.1",
+        "json-parse-even-better-errors": "^2.3.0",
+        "lines-and-columns": "^1.1.6"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/parse-ms": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/parse-ms/-/parse-ms-4.0.0.tgz",
+      "integrity": "sha512-TXfryirbmq34y8QBwgqCVLi+8oA3oWx2eAnSn62ITyEhEYaWRlVZ2DvMM9eZbMs/RfxPu/PK/aBLyGj4IrqMHw==",
+      "dev": true,
+      "engines": {
+        "node": ">=18"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/parse5": {
+      "version": "7.1.2",
+      "resolved": "https://registry.npmjs.org/parse5/-/parse5-7.1.2.tgz",
+      "integrity": "sha512-Czj1WaSVpaoj0wbhMzLmWD69anp2WH7FXMB9n1Sy8/ZFF9jolSQVMu1Ij5WIyGmcBmhk7EOndpO4mIpihVqAXw==",
+      "dev": true,
+      "dependencies": {
+        "entities": "^4.4.0"
+      },
+      "funding": {
+        "url": "https://github.com/inikulin/parse5?sponsor=1"
+      }
+    },
+    "node_modules/parseurl": {
+      "version": "1.3.3",
+      "resolved": "https://registry.npmjs.org/parseurl/-/parseurl-1.3.3.tgz",
+      "integrity": "sha512-CiyeOxFT/JZyN5m0z9PfXw4SCBJ6Sygz1Dpl0wqjlhDEGGBP1GnsUVEL0p63hoG1fcj3fHynXi9NYO4nWOL+qQ==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.8"
+      }
+    },
+    "node_modules/pascal-case": {
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/pascal-case/-/pascal-case-3.1.2.tgz",
+      "integrity": "sha512-uWlGT3YSnK9x3BQJaOdcZwrnV6hPpd8jFH1/ucpiLRPh/2zCVJKS19E4GvYHvaCcACn3foXZ0cLB9Wrx1KGe5g==",
+      "dev": true,
+      "dependencies": {
+        "no-case": "^3.0.4",
+        "tslib": "^2.0.3"
+      }
+    },
+    "node_modules/path": {
+      "version": "0.12.7",
+      "resolved": "https://registry.npmjs.org/path/-/path-0.12.7.tgz",
+      "integrity": "sha512-aXXC6s+1w7otVF9UletFkFcDsJeO7lSZBPUQhtb5O0xJe8LtYhj/GxldoL09bBj9+ZmE2hNoHqQSFMN5fikh4Q==",
+      "dependencies": {
+        "process": "^0.11.1",
+        "util": "^0.10.3"
+      }
+    },
+    "node_modules/path-exists": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz",
+      "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/path-is-absolute": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
+      "integrity": "sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg==",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/path-is-inside": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/path-is-inside/-/path-is-inside-1.0.2.tgz",
+      "integrity": "sha512-DUWJr3+ULp4zXmol/SZkFf3JGsS9/SIv+Y3Rt93/UjPpDpklB5f1er4O3POIbUuUJ3FXgqte2Q7SrU6zAqwk8w==",
+      "dev": true
+    },
+    "node_modules/path-key": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz",
+      "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/path-parse": {
+      "version": "1.0.7",
+      "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.7.tgz",
+      "integrity": "sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==",
+      "dev": true
+    },
+    "node_modules/path-to-regexp": {
+      "version": "0.1.7",
+      "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.7.tgz",
+      "integrity": "sha512-5DFkuoqlv1uYQKxy8omFBeJPQcdoE07Kv2sferDCrAq1ohOU+MSDswDIbnx3YAM60qIOnYa53wBhXW0EbMonrQ==",
+      "dev": true
+    },
+    "node_modules/path-type": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/path-type/-/path-type-4.0.0.tgz",
+      "integrity": "sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/path/node_modules/inherits": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
+      "integrity": "sha512-x00IRNXNy63jwGkJmzPigoySHbaqpNuzKbBOmzK+g2OdZpQ9w+sxCN+VSB3ja7IAge2OP2qpfxTjeNcyjmW1uw=="
+    },
+    "node_modules/path/node_modules/util": {
+      "version": "0.10.4",
+      "resolved": "https://registry.npmjs.org/util/-/util-0.10.4.tgz",
+      "integrity": "sha512-0Pm9hTQ3se5ll1XihRic3FDIku70C+iHUdT/W926rSgHV5QgXsYbKZN8MSC3tJtSkhuROzvsQjAaFENRXr+19A==",
+      "dependencies": {
+        "inherits": "2.0.3"
+      }
+    },
+    "node_modules/pathe": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/pathe/-/pathe-1.1.1.tgz",
+      "integrity": "sha512-d+RQGp0MAYTIaDBIMmOfMwz3E+LOZnxx1HZd5R18mmCZY0QBlK0LDZfPc8FW8Ed2DlvsuE6PRjroDY+wg4+j/Q==",
+      "dev": true
+    },
+    "node_modules/pathval": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/pathval/-/pathval-1.1.1.tgz",
+      "integrity": "sha512-Dp6zGqpTdETdR63lehJYPeIOqpiNBNtc7BpWSLrOje7UaIsE5aY92r/AunQA7rsXvet3lrJ3JnZX29UPTKXyKQ==",
+      "dev": true,
+      "engines": {
+        "node": "*"
+      }
+    },
+    "node_modules/pbkdf2": {
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/pbkdf2/-/pbkdf2-3.1.2.tgz",
+      "integrity": "sha512-iuh7L6jA7JEGu2WxDwtQP1ddOpaJNC4KlDEFfdQajSGgGPNi4OyDc2R7QnbY2bR9QjBVGwgvTdNJZoE7RaxUMA==",
+      "dependencies": {
+        "create-hash": "^1.1.2",
+        "create-hmac": "^1.1.4",
+        "ripemd160": "^2.0.1",
+        "safe-buffer": "^5.0.1",
+        "sha.js": "^2.4.8"
+      },
+      "engines": {
+        "node": ">=0.12"
+      }
+    },
+    "node_modules/picocolors": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.0.1.tgz",
+      "integrity": "sha512-anP1Z8qwhkbmu7MFP5iTt+wQKXgwzf7zTyGlcdzabySa9vd0Xt392U0rVmz9poOaBj0uHJKyyo9/upk0HrEQew=="
+    },
+    "node_modules/picomatch": {
+      "version": "2.3.1",
+      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz",
+      "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==",
+      "engines": {
+        "node": ">=8.6"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/jonschlinkert"
+      }
+    },
+    "node_modules/pidtree": {
+      "version": "0.6.0",
+      "resolved": "https://registry.npmjs.org/pidtree/-/pidtree-0.6.0.tgz",
+      "integrity": "sha512-eG2dWTVw5bzqGRztnHExczNxt5VGsE6OwTeCG3fdUf9KBsZzO3R5OIIIzWR+iZA0NtZ+RDVdaoE2dK1cn6jH4g==",
+      "dev": true,
+      "bin": {
+        "pidtree": "bin/pidtree.js"
+      },
+      "engines": {
+        "node": ">=0.10"
+      }
+    },
+    "node_modules/pify": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/pify/-/pify-4.0.1.tgz",
+      "integrity": "sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g==",
+      "dev": true,
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/pinkie": {
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/pinkie/-/pinkie-2.0.4.tgz",
+      "integrity": "sha512-MnUuEycAemtSaeFSjXKW/aroV7akBbY+Sv+RkyqFjgAe73F+MR0TBWKBRDkmfWq/HiFmdavfZ1G7h4SPZXaCSg==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/pinkie-promise": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/pinkie-promise/-/pinkie-promise-2.0.1.tgz",
+      "integrity": "sha512-0Gni6D4UcLTbv9c57DfxDGdr41XfgUjqWZu492f0cIGr16zDU06BWP/RAEvOuo7CQ0CNjHaLlM59YJJFm3NWlw==",
+      "dev": true,
+      "dependencies": {
+        "pinkie": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/pkg-types": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/pkg-types/-/pkg-types-1.0.3.tgz",
+      "integrity": "sha512-nN7pYi0AQqJnoLPC9eHFQ8AcyaixBUOwvqc5TDnIKCMEE6I0y8P7OKA7fPexsXGCGxQDl/cmrLAp26LhcwxZ4A==",
+      "dev": true,
+      "dependencies": {
+        "jsonc-parser": "^3.2.0",
+        "mlly": "^1.2.0",
+        "pathe": "^1.1.0"
+      }
+    },
+    "node_modules/playwright": {
+      "version": "1.45.2",
+      "resolved": "https://registry.npmjs.org/playwright/-/playwright-1.45.2.tgz",
+      "integrity": "sha512-ReywF2t/0teRvNBpfIgh5e4wnrI/8Su8ssdo5XsQKpjxJj+jspm00jSoz9BTg91TT0c9HRjXO7LBNVrgYj9X0g==",
+      "license": "Apache-2.0",
+      "dependencies": {
+        "playwright-core": "1.45.2"
+      },
+      "bin": {
+        "playwright": "cli.js"
+      },
+      "engines": {
+        "node": ">=18"
+      },
+      "optionalDependencies": {
+        "fsevents": "2.3.2"
+      }
+    },
+    "node_modules/playwright-core": {
+      "version": "1.45.2",
+      "resolved": "https://registry.npmjs.org/playwright-core/-/playwright-core-1.45.2.tgz",
+      "integrity": "sha512-ha175tAWb0dTK0X4orvBIqi3jGEt701SMxMhyujxNrgd8K0Uy5wMSwwcQHtyB4om7INUkfndx02XnQ2p6dvLDw==",
+      "license": "Apache-2.0",
+      "bin": {
+        "playwright-core": "cli.js"
+      },
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/playwright/node_modules/fsevents": {
+      "version": "2.3.2",
+      "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.2.tgz",
+      "integrity": "sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==",
+      "hasInstallScript": true,
+      "optional": true,
+      "os": [
+        "darwin"
+      ],
+      "engines": {
+        "node": "^8.16.0 || ^10.6.0 || >=11.0.0"
+      }
+    },
+    "node_modules/postcss": {
+      "version": "8.4.39",
+      "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.39.tgz",
+      "integrity": "sha512-0vzE+lAiG7hZl1/9I8yzKLx3aR9Xbof3fBHKunvMfOCYAtMhrsnccJY2iTURb9EZd5+pLuiNV9/c/GZJOHsgIw==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "opencollective",
+          "url": "https://opencollective.com/postcss/"
+        },
+        {
+          "type": "tidelift",
+          "url": "https://tidelift.com/funding/github/npm/postcss"
+        },
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/ai"
+        }
+      ],
+      "dependencies": {
+        "nanoid": "^3.3.7",
+        "picocolors": "^1.0.1",
+        "source-map-js": "^1.2.0"
+      },
+      "engines": {
+        "node": "^10 || ^12 || >=14"
+      }
+    },
+    "node_modules/postcss-modules-extract-imports": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/postcss-modules-extract-imports/-/postcss-modules-extract-imports-3.0.0.tgz",
+      "integrity": "sha512-bdHleFnP3kZ4NYDhuGlVK+CMrQ/pqUm8bx/oGL93K6gVwiclvX5x0n76fYMKuIGKzlABOy13zsvqjb0f92TEXw==",
+      "dev": true,
+      "engines": {
+        "node": "^10 || ^12 || >= 14"
+      },
+      "peerDependencies": {
+        "postcss": "^8.1.0"
+      }
+    },
+    "node_modules/postcss-modules-local-by-default": {
+      "version": "4.0.3",
+      "resolved": "https://registry.npmjs.org/postcss-modules-local-by-default/-/postcss-modules-local-by-default-4.0.3.tgz",
+      "integrity": "sha512-2/u2zraspoACtrbFRnTijMiQtb4GW4BvatjaG/bCjYQo8kLTdevCUlwuBHx2sCnSyrI3x3qj4ZK1j5LQBgzmwA==",
+      "dev": true,
+      "dependencies": {
+        "icss-utils": "^5.0.0",
+        "postcss-selector-parser": "^6.0.2",
+        "postcss-value-parser": "^4.1.0"
+      },
+      "engines": {
+        "node": "^10 || ^12 || >= 14"
+      },
+      "peerDependencies": {
+        "postcss": "^8.1.0"
+      }
+    },
+    "node_modules/postcss-modules-scope": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/postcss-modules-scope/-/postcss-modules-scope-3.0.0.tgz",
+      "integrity": "sha512-hncihwFA2yPath8oZ15PZqvWGkWf+XUfQgUGamS4LqoP1anQLOsOJw0vr7J7IwLpoY9fatA2qiGUGmuZL0Iqlg==",
+      "dev": true,
+      "dependencies": {
+        "postcss-selector-parser": "^6.0.4"
+      },
+      "engines": {
+        "node": "^10 || ^12 || >= 14"
+      },
+      "peerDependencies": {
+        "postcss": "^8.1.0"
+      }
+    },
+    "node_modules/postcss-modules-values": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/postcss-modules-values/-/postcss-modules-values-4.0.0.tgz",
+      "integrity": "sha512-RDxHkAiEGI78gS2ofyvCsu7iycRv7oqw5xMWn9iMoR0N/7mf9D50ecQqUo5BZ9Zh2vH4bCUR/ktCqbB9m8vJjQ==",
+      "dev": true,
+      "dependencies": {
+        "icss-utils": "^5.0.0"
+      },
+      "engines": {
+        "node": "^10 || ^12 || >= 14"
+      },
+      "peerDependencies": {
+        "postcss": "^8.1.0"
+      }
+    },
+    "node_modules/postcss-selector-parser": {
+      "version": "6.0.13",
+      "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.0.13.tgz",
+      "integrity": "sha512-EaV1Gl4mUEV4ddhDnv/xtj7sxwrwxdetHdWUGnT4VJQf+4d05v6lHYZr8N573k5Z0BViss7BDhfWtKS3+sfAqQ==",
+      "dev": true,
+      "dependencies": {
+        "cssesc": "^3.0.0",
+        "util-deprecate": "^1.0.2"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/postcss-value-parser": {
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.2.0.tgz",
+      "integrity": "sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ=="
+    },
+    "node_modules/postcss/node_modules/nanoid": {
+      "version": "3.3.7",
+      "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.7.tgz",
+      "integrity": "sha512-eSRppjcPIatRIMC1U6UngP8XFcz8MQWGQdt1MTBQ7NaAmvXDfvNxbvWV3x2y6CdEUciCSsDHDQZbhYaB8QEo2g==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/ai"
+        }
+      ],
+      "bin": {
+        "nanoid": "bin/nanoid.cjs"
+      },
+      "engines": {
+        "node": "^10 || ^12 || ^13.7 || ^14 || >=15.0.1"
+      }
+    },
+    "node_modules/prelude-ls": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.2.1.tgz",
+      "integrity": "sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.8.0"
+      }
+    },
+    "node_modules/prettier": {
+      "version": "2.8.8",
+      "resolved": "https://registry.npmjs.org/prettier/-/prettier-2.8.8.tgz",
+      "integrity": "sha512-tdN8qQGvNjw4CHbY+XXk0JgCXn9QiF21a55rBe5LJAU+kDyC4WQn4+awm2Xfk2lQMk5fKup9XgzTZtGkjBdP9Q==",
+      "dev": true,
+      "bin": {
+        "prettier": "bin-prettier.js"
+      },
+      "engines": {
+        "node": ">=10.13.0"
+      },
+      "funding": {
+        "url": "https://github.com/prettier/prettier?sponsor=1"
+      }
+    },
+    "node_modules/prettier-linter-helpers": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/prettier-linter-helpers/-/prettier-linter-helpers-1.0.0.tgz",
+      "integrity": "sha512-GbK2cP9nraSSUF9N2XwUwqfzlAFlMNYYl+ShE/V+H8a9uNl/oUqB1w2EL54Jh0OlyRSd8RfWYJ3coVS4TROP2w==",
+      "dev": true,
+      "dependencies": {
+        "fast-diff": "^1.1.2"
+      },
+      "engines": {
+        "node": ">=6.0.0"
+      }
+    },
+    "node_modules/prettier-plugin-organize-imports": {
+      "version": "3.2.3",
+      "resolved": "https://registry.npmjs.org/prettier-plugin-organize-imports/-/prettier-plugin-organize-imports-3.2.3.tgz",
+      "integrity": "sha512-KFvk8C/zGyvUaE3RvxN2MhCLwzV6OBbFSkwZ2OamCrs9ZY4i5L77jQ/w4UmUr+lqX8qbaqVq6bZZkApn+IgJSg==",
+      "dev": true,
+      "peerDependencies": {
+        "@volar/vue-language-plugin-pug": "^1.0.4",
+        "@volar/vue-typescript": "^1.0.4",
+        "prettier": ">=2.0",
+        "typescript": ">=2.9"
+      },
+      "peerDependenciesMeta": {
+        "@volar/vue-language-plugin-pug": {
+          "optional": true
+        },
+        "@volar/vue-typescript": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/pretty-error": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/pretty-error/-/pretty-error-4.0.0.tgz",
+      "integrity": "sha512-AoJ5YMAcXKYxKhuJGdcvse+Voc6v1RgnsR3nWcYU7q4t6z0Q6T86sv5Zq8VIRbOWWFpvdGE83LtdSMNd+6Y0xw==",
+      "dev": true,
+      "dependencies": {
+        "lodash": "^4.17.20",
+        "renderkid": "^3.0.0"
+      }
+    },
+    "node_modules/pretty-ms": {
+      "version": "9.0.0",
+      "resolved": "https://registry.npmjs.org/pretty-ms/-/pretty-ms-9.0.0.tgz",
+      "integrity": "sha512-E9e9HJ9R9NasGOgPaPE8VMeiPKAyWR5jcFpNnwIejslIhWqdqOrb2wShBsncMPUb+BcCd2OPYfh7p2W6oemTng==",
+      "dev": true,
+      "dependencies": {
+        "parse-ms": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=18"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/process": {
+      "version": "0.11.10",
+      "resolved": "https://registry.npmjs.org/process/-/process-0.11.10.tgz",
+      "integrity": "sha512-cdGef/drWFoydD1JsMzuFf8100nZl+GT+yacc2bEced5f9Rjk4z+WtFUTBu9PhOi9j/jfmBPu0mMEY4wIdAF8A==",
+      "engines": {
+        "node": ">= 0.6.0"
+      }
+    },
+    "node_modules/process-nextick-args": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.1.tgz",
+      "integrity": "sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag==",
+      "dev": true
+    },
+    "node_modules/progress": {
+      "version": "1.1.8",
+      "resolved": "https://registry.npmjs.org/progress/-/progress-1.1.8.tgz",
+      "integrity": "sha512-UdA8mJ4weIkUBO224tIarHzuHs4HuYiJvsuGT7j/SPQiUJVjYvNDBIPa0hAorduOfjGohB/qHWRa/lrrWX/mXw==",
+      "engines": {
+        "node": ">=0.4.0"
+      }
+    },
+    "node_modules/prop-types": {
+      "version": "15.8.1",
+      "resolved": "https://registry.npmjs.org/prop-types/-/prop-types-15.8.1.tgz",
+      "integrity": "sha512-oj87CgZICdulUohogVAR7AjlC0327U4el4L6eAvOqCeudMDVU0NThNaV+b9Df4dXgSP1gXMTnPdhfe/2qDH5cg==",
+      "dependencies": {
+        "loose-envify": "^1.4.0",
+        "object-assign": "^4.1.1",
+        "react-is": "^16.13.1"
+      }
+    },
+    "node_modules/prop-types/node_modules/react-is": {
+      "version": "16.13.1",
+      "resolved": "https://registry.npmjs.org/react-is/-/react-is-16.13.1.tgz",
+      "integrity": "sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ=="
+    },
+    "node_modules/proxy-addr": {
+      "version": "2.0.7",
+      "resolved": "https://registry.npmjs.org/proxy-addr/-/proxy-addr-2.0.7.tgz",
+      "integrity": "sha512-llQsMLSUDUPT44jdrU/O37qlnifitDP+ZwrmmZcoSKyLKvtZxpyV0n2/bD/N4tBAAZ/gJEdZU7KMraoK1+XYAg==",
+      "dev": true,
+      "dependencies": {
+        "forwarded": "0.2.0",
+        "ipaddr.js": "1.9.1"
+      },
+      "engines": {
+        "node": ">= 0.10"
+      }
+    },
+    "node_modules/proxy-addr/node_modules/ipaddr.js": {
+      "version": "1.9.1",
+      "resolved": "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.9.1.tgz",
+      "integrity": "sha512-0KI/607xoxSToH7GjN1FfSbLoU0+btTicjsQSWQlh/hZykN8KpmMf7uYwPW3R+akZ6R/w18ZlXSHBYXiYUPO3g==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.10"
+      }
+    },
+    "node_modules/proxy-from-env": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/proxy-from-env/-/proxy-from-env-1.1.0.tgz",
+      "integrity": "sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg=="
+    },
+    "node_modules/public-encrypt": {
+      "version": "4.0.3",
+      "resolved": "https://registry.npmjs.org/public-encrypt/-/public-encrypt-4.0.3.tgz",
+      "integrity": "sha512-zVpa8oKZSz5bTMTFClc1fQOnyyEzpl5ozpi1B5YcvBrdohMjH2rfsBtyXcuNuwjsDIXmBYlF2N5FlJYhR29t8Q==",
+      "dependencies": {
+        "bn.js": "^4.1.0",
+        "browserify-rsa": "^4.0.0",
+        "create-hash": "^1.1.0",
+        "parse-asn1": "^5.0.0",
+        "randombytes": "^2.0.1",
+        "safe-buffer": "^5.1.2"
+      }
+    },
+    "node_modules/public-encrypt/node_modules/bn.js": {
+      "version": "4.12.0",
+      "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.0.tgz",
+      "integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA=="
+    },
+    "node_modules/punycode": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.3.0.tgz",
+      "integrity": "sha512-rRV+zQD8tVFys26lAGR9WUuS4iUAngJScM+ZRSKtvl5tKeZ2t5bvdNFdNHBW9FWR4guGHlgmsZ1G7BSm2wTbuA==",
+      "dev": true,
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/qr-code-styling": {
+      "version": "1.5.0",
+      "resolved": "https://registry.npmjs.org/qr-code-styling/-/qr-code-styling-1.5.0.tgz",
+      "integrity": "sha512-7C+1cZGsZWH0BIRtv24faKZJwkxdYlynXktP9dDxKNSik2bqaUZck3B3MpQod/wqm9i3l4q7QsPGkRGKvcuqZw==",
+      "dependencies": {
+        "qrcode-generator": "^1.4.3"
+      }
+    },
+    "node_modules/qr.js": {
+      "version": "0.0.0",
+      "resolved": "https://registry.npmjs.org/qr.js/-/qr.js-0.0.0.tgz",
+      "integrity": "sha512-c4iYnWb+k2E+vYpRimHqSu575b1/wKl4XFeJGpFmrJQz5I88v9aY2czh7s0w36srfCM1sXgC/xpoJz5dJfq+OQ=="
+    },
+    "node_modules/qrcode-generator": {
+      "version": "1.4.4",
+      "resolved": "https://registry.npmjs.org/qrcode-generator/-/qrcode-generator-1.4.4.tgz",
+      "integrity": "sha512-HM7yY8O2ilqhmULxGMpcHSF1EhJJ9yBj8gvDEuZ6M+KGJ0YY2hKpnXvRD+hZPLrDVck3ExIGhmPtSdcjC+guuw=="
+    },
+    "node_modules/queue-microtask": {
+      "version": "1.2.3",
+      "resolved": "https://registry.npmjs.org/queue-microtask/-/queue-microtask-1.2.3.tgz",
+      "integrity": "sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/feross"
+        },
+        {
+          "type": "patreon",
+          "url": "https://www.patreon.com/feross"
+        },
+        {
+          "type": "consulting",
+          "url": "https://feross.org/support"
+        }
+      ]
+    },
+    "node_modules/randombytes": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/randombytes/-/randombytes-2.1.0.tgz",
+      "integrity": "sha512-vYl3iOX+4CKUWuxGi9Ukhie6fsqXqS9FE2Zaic4tNFD2N2QQaXOMFbuKK4QmDHC0JO6B1Zp41J0LpT0oR68amQ==",
+      "dependencies": {
+        "safe-buffer": "^5.1.0"
+      }
+    },
+    "node_modules/randomfill": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/randomfill/-/randomfill-1.0.4.tgz",
+      "integrity": "sha512-87lcbR8+MhcWcUiQ+9e+Rwx8MyR2P7qnt15ynUlbm3TU/fjbgz4GsvfSUDTemtCCtVCqb4ZcEFlyPNTh9bBTLw==",
+      "dependencies": {
+        "randombytes": "^2.0.5",
+        "safe-buffer": "^5.1.0"
+      }
+    },
+    "node_modules/range-parser": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/range-parser/-/range-parser-1.2.1.tgz",
+      "integrity": "sha512-Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
+    "node_modules/raw-body": {
+      "version": "2.5.1",
+      "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.5.1.tgz",
+      "integrity": "sha512-qqJBtEyVgS0ZmPGdCFPWJ3FreoqvG4MVQln/kCgF7Olq95IbOp0/BWyMwbdtn4VTvkM8Y7khCQ2Xgk/tcrCXig==",
+      "dev": true,
+      "dependencies": {
+        "bytes": "3.1.2",
+        "http-errors": "2.0.0",
+        "iconv-lite": "0.4.24",
+        "unpipe": "1.0.0"
+      },
+      "engines": {
+        "node": ">= 0.8"
+      }
+    },
+    "node_modules/raw-body/node_modules/bytes": {
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.1.2.tgz",
+      "integrity": "sha512-/Nf7TyzTx6S3yRJObOAV7956r8cr2+Oj8AC5dt8wSP3BQAoeX58NoHyCU8P8zGkNXStjTSi6fzO6F0pBdcYbEg==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.8"
+      }
+    },
+    "node_modules/raw-body/node_modules/iconv-lite": {
+      "version": "0.4.24",
+      "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz",
+      "integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==",
+      "dev": true,
+      "dependencies": {
+        "safer-buffer": ">= 2.1.2 < 3"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/rc-dialog": {
+      "version": "9.1.0",
+      "resolved": "https://registry.npmjs.org/rc-dialog/-/rc-dialog-9.1.0.tgz",
+      "integrity": "sha512-5ry+JABAWEbaKyYsmITtrJbZbJys8CtMyzV8Xn4LYuXMeUx5XVHNyJRoqLFE4AzBuXXzOWeaC49cg+XkxK6kHA==",
+      "dependencies": {
+        "@babel/runtime": "^7.10.1",
+        "@rc-component/portal": "^1.0.0-8",
+        "classnames": "^2.2.6",
+        "rc-motion": "^2.3.0",
+        "rc-util": "^5.21.0"
+      },
+      "peerDependencies": {
+        "react": ">=16.9.0",
+        "react-dom": ">=16.9.0"
+      }
+    },
+    "node_modules/rc-image": {
+      "version": "5.18.1",
+      "resolved": "https://registry.npmjs.org/rc-image/-/rc-image-5.18.1.tgz",
+      "integrity": "sha512-xdr5zHpSJ6sGdV5oIkHWbttc21LlGKZZjWXVXxSS0sNmqSn97WzOKQBNrTA85UP7oBPPThZAGGGNmGnTkx2qYQ==",
+      "dependencies": {
+        "@babel/runtime": "^7.11.2",
+        "@rc-component/portal": "^1.0.2",
+        "classnames": "^2.2.6",
+        "rc-dialog": "~9.1.0",
+        "rc-motion": "^2.6.2",
+        "rc-util": "^5.0.6"
+      },
+      "peerDependencies": {
+        "react": ">=16.9.0",
+        "react-dom": ">=16.9.0"
+      }
+    },
+    "node_modules/rc-motion": {
+      "version": "2.7.3",
+      "resolved": "https://registry.npmjs.org/rc-motion/-/rc-motion-2.7.3.tgz",
+      "integrity": "sha512-2xUvo8yGHdOHeQbdI8BtBsCIrWKchEmFEIskf0nmHtJsou+meLd/JE+vnvSX2JxcBrJtXY2LuBpxAOxrbY/wMQ==",
+      "dependencies": {
+        "@babel/runtime": "^7.11.1",
+        "classnames": "^2.2.1",
+        "rc-util": "^5.21.0"
+      },
+      "peerDependencies": {
+        "react": ">=16.9.0",
+        "react-dom": ">=16.9.0"
+      }
+    },
+    "node_modules/rc-util": {
+      "version": "5.35.0",
+      "resolved": "https://registry.npmjs.org/rc-util/-/rc-util-5.35.0.tgz",
+      "integrity": "sha512-MTXlixb3EoSTEchsOc7XWsVyoUQqoCsh2Z1a2IptwNgqleMF6ZgQeY52UzUbNj5CcVBg9YljOWjuOV07jSSm4Q==",
+      "dependencies": {
+        "@babel/runtime": "^7.18.3",
+        "react-is": "^16.12.0"
+      },
+      "peerDependencies": {
+        "react": ">=16.9.0",
+        "react-dom": ">=16.9.0"
+      }
+    },
+    "node_modules/rc-util/node_modules/react-is": {
+      "version": "16.13.1",
+      "resolved": "https://registry.npmjs.org/react-is/-/react-is-16.13.1.tgz",
+      "integrity": "sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ=="
+    },
+    "node_modules/react": {
+      "version": "18.2.0",
+      "resolved": "https://registry.npmjs.org/react/-/react-18.2.0.tgz",
+      "integrity": "sha512-/3IjMdb2L9QbBdWiW5e3P2/npwMBaU9mHCSCUzNln0ZCYbcfTsGbTJrU/kGemdH2IWmB2ioZ+zkxtmq6g09fGQ==",
+      "dependencies": {
+        "loose-envify": "^1.1.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/react-content-loader": {
+      "version": "6.2.1",
+      "resolved": "https://registry.npmjs.org/react-content-loader/-/react-content-loader-6.2.1.tgz",
+      "integrity": "sha512-6ONbFX+Hi3SHuP66JB8CPvJn372pj+qwltJV0J8z/8MFrq98I1cbFdZuhDWeQXu3CFxiiDTXJn7DFxx2ZvrO7g==",
+      "engines": {
+        "node": ">=10"
+      },
+      "peerDependencies": {
+        "react": ">=16.0.0"
+      }
+    },
+    "node_modules/react-dom": {
+      "version": "18.2.0",
+      "resolved": "https://registry.npmjs.org/react-dom/-/react-dom-18.2.0.tgz",
+      "integrity": "sha512-6IMTriUmvsjHUjNtEDudZfuDQUoWXVxKHhlEGSk81n4YFS+r/Kl99wXiwlVXtPBtJenozv2P+hxDsw9eA7Xo6g==",
+      "dependencies": {
+        "loose-envify": "^1.1.0",
+        "scheduler": "^0.23.0"
+      },
+      "peerDependencies": {
+        "react": "^18.2.0"
+      }
+    },
+    "node_modules/react-hot-toast": {
+      "version": "2.4.1",
+      "resolved": "https://registry.npmjs.org/react-hot-toast/-/react-hot-toast-2.4.1.tgz",
+      "integrity": "sha512-j8z+cQbWIM5LY37pR6uZR6D4LfseplqnuAO4co4u8917hBUvXlEqyP1ZzqVLcqoyUesZZv/ImreoCeHVDpE5pQ==",
+      "dependencies": {
+        "goober": "^2.1.10"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "peerDependencies": {
+        "react": ">=16",
+        "react-dom": ">=16"
+      }
+    },
+    "node_modules/react-i18next": {
+      "version": "11.18.6",
+      "resolved": "https://registry.npmjs.org/react-i18next/-/react-i18next-11.18.6.tgz",
+      "integrity": "sha512-yHb2F9BiT0lqoQDt8loZ5gWP331GwctHz9tYQ8A2EIEUu+CcEdjBLQWli1USG3RdWQt3W+jqQLg/d4rrQR96LA==",
+      "dependencies": {
+        "@babel/runtime": "^7.14.5",
+        "html-parse-stringify": "^3.0.1"
+      },
+      "peerDependencies": {
+        "i18next": ">= 19.0.0",
+        "react": ">= 16.8.0"
+      },
+      "peerDependenciesMeta": {
+        "react-dom": {
+          "optional": true
+        },
+        "react-native": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/react-is": {
+      "version": "18.2.0",
+      "resolved": "https://registry.npmjs.org/react-is/-/react-is-18.2.0.tgz",
+      "integrity": "sha512-xWGDIW6x921xtzPkhiULtthJHoJvBbF3q26fzloPCK0hsvxtPVelvftw3zjbHWSkR2km9Z+4uxbDDK/6Zw9B8w=="
+    },
+    "node_modules/react-is-visible": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/react-is-visible/-/react-is-visible-1.2.0.tgz",
+      "integrity": "sha512-052RH7aHdKrABOBH12wvS2zTAzJ8MnaswPvX2AQGq5wxvD8BnQ5vcnf0cA0cj2g4bjH0+qXz1AIkEL9ZlnN23A==",
+      "dependencies": {
+        "@babel/runtime": "^7.12.5",
+        "hoist-non-react-statics": "3.3.2"
+      },
+      "peerDependencies": {
+        "react": ">=16.8.0",
+        "react-dom": ">=16.8.0"
+      }
+    },
+    "node_modules/react-lifecycles-compat": {
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/react-lifecycles-compat/-/react-lifecycles-compat-3.0.4.tgz",
+      "integrity": "sha512-fBASbA6LnOU9dOU2eW7aQ8xmYBSXUIWr+UmF9b1efZBazGNO+rcXT/icdKnYm2pTwcRylVUYwW7H1PHfLekVzA=="
+    },
+    "node_modules/react-lottie": {
+      "version": "1.2.4",
+      "resolved": "https://registry.npmjs.org/react-lottie/-/react-lottie-1.2.4.tgz",
+      "integrity": "sha512-kBGxI+MIZGBf4wZhNCWwHkMcVP+kbpmrLWH/SkO0qCKc7D7eSPcxQbfpsmsCo8v2KCBYjuGSou+xTqK44D/jMg==",
+      "dependencies": {
+        "babel-runtime": "^6.26.0",
+        "lottie-web": "^5.1.3"
+      },
+      "engines": {
+        "npm": "^3.0.0"
+      },
+      "peerDependencies": {
+        "react": ">=15.0.0"
+      }
+    },
+    "node_modules/react-modal": {
+      "version": "3.16.1",
+      "resolved": "https://registry.npmjs.org/react-modal/-/react-modal-3.16.1.tgz",
+      "integrity": "sha512-VStHgI3BVcGo7OXczvnJN7yT2TWHJPDXZWyI/a0ssFNhGZWsPmB8cF0z33ewDXq4VfYMO1vXgiv/g8Nj9NDyWg==",
+      "dependencies": {
+        "exenv": "^1.2.0",
+        "prop-types": "^15.7.2",
+        "react-lifecycles-compat": "^3.0.0",
+        "warning": "^4.0.3"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "peerDependencies": {
+        "react": "^0.14.0 || ^15.0.0 || ^16 || ^17 || ^18",
+        "react-dom": "^0.14.0 || ^15.0.0 || ^16 || ^17 || ^18"
+      }
+    },
+    "node_modules/react-number-format": {
+      "version": "5.2.2",
+      "resolved": "https://registry.npmjs.org/react-number-format/-/react-number-format-5.2.2.tgz",
+      "integrity": "sha512-wCh64Z1HCwXcO2dbgkeYIaB+Rmp/fcsH8kAeRtUkc46dv1pIrgDjie2WkOqKBw8YqyqhwNdYgNFNQuuY+iGJ/g==",
+      "dependencies": {
+        "prop-types": "^15.7.2"
+      },
+      "peerDependencies": {
+        "react": "^0.14 || ^15.0.0 || ^16.0.0 || ^17.0.0 || ^18.0.0",
+        "react-dom": "^0.14 || ^15.0.0 || ^16.0.0 || ^17.0.0 || ^18.0.0"
+      }
+    },
+    "node_modules/react-qr-code": {
+      "version": "2.0.11",
+      "resolved": "https://registry.npmjs.org/react-qr-code/-/react-qr-code-2.0.11.tgz",
+      "integrity": "sha512-P7mvVM5vk9NjGdHMt4Z0KWeeJYwRAtonHTghZT2r+AASinLUUKQ9wfsGH2lPKsT++gps7hXmaiMGRvwTDEL9OA==",
+      "dependencies": {
+        "prop-types": "^15.8.1",
+        "qr.js": "0.0.0"
+      },
+      "peerDependencies": {
+        "react": "^16.x || ^17.x || ^18.x",
+        "react-native-svg": "*"
+      },
+      "peerDependenciesMeta": {
+        "react-native-svg": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/react-redux": {
+      "version": "7.2.9",
+      "resolved": "https://registry.npmjs.org/react-redux/-/react-redux-7.2.9.tgz",
+      "integrity": "sha512-Gx4L3uM182jEEayZfRbI/G11ZpYdNAnBs70lFVMNdHJI76XYtR+7m0MN+eAs7UHBPhWXcnFPaS+9owSCJQHNpQ==",
+      "dependencies": {
+        "@babel/runtime": "^7.15.4",
+        "@types/react-redux": "^7.1.20",
+        "hoist-non-react-statics": "^3.3.2",
+        "loose-envify": "^1.4.0",
+        "prop-types": "^15.7.2",
+        "react-is": "^17.0.2"
+      },
+      "peerDependencies": {
+        "react": "^16.8.3 || ^17 || ^18"
+      },
+      "peerDependenciesMeta": {
+        "react-dom": {
+          "optional": true
+        },
+        "react-native": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/react-redux/node_modules/react-is": {
+      "version": "17.0.2",
+      "resolved": "https://registry.npmjs.org/react-is/-/react-is-17.0.2.tgz",
+      "integrity": "sha512-w2GsyukL62IJnlaff/nRegPQR94C/XXamvMWmSHRJ4y7Ts/4ocGRmTHvOs8PSE6pB3dWOrD/nueuU5sduBsQ4w=="
+    },
+    "node_modules/react-refresh": {
+      "version": "0.14.0",
+      "resolved": "https://registry.npmjs.org/react-refresh/-/react-refresh-0.14.0.tgz",
+      "integrity": "sha512-wViHqhAd8OHeLS/IRMJjTSDHF3U9eWi62F/MledQGPdJGDhodXJ9PBLNGr6WWL7qlH12Mt3TyTpbS+hGXMjCzQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/react-refresh-typescript": {
+      "version": "2.0.9",
+      "resolved": "https://registry.npmjs.org/react-refresh-typescript/-/react-refresh-typescript-2.0.9.tgz",
+      "integrity": "sha512-chAnOO4vpxm/3WkgOVmti+eN8yUtkJzeGkOigV6UA9eDFz12W34e/SsYe2H5+RwYJ3+sfSZkVbiXcG1chEBxlg==",
+      "dev": true,
+      "peerDependencies": {
+        "react-refresh": "0.10.x || 0.11.x || 0.12.x || 0.13.x || 0.14.x",
+        "typescript": "^4.8 || ^5.0"
+      }
+    },
+    "node_modules/react-router": {
+      "version": "6.14.2",
+      "resolved": "https://registry.npmjs.org/react-router/-/react-router-6.14.2.tgz",
+      "integrity": "sha512-09Zss2dE2z+T1D03IheqAFtK4UzQyX8nFPWx6jkwdYzGLXd5ie06A6ezS2fO6zJfEb/SpG6UocN2O1hfD+2urQ==",
+      "dependencies": {
+        "@remix-run/router": "1.7.2"
+      },
+      "engines": {
+        "node": ">=14"
+      },
+      "peerDependencies": {
+        "react": ">=16.8"
+      }
+    },
+    "node_modules/react-router-dom": {
+      "version": "6.14.2",
+      "resolved": "https://registry.npmjs.org/react-router-dom/-/react-router-dom-6.14.2.tgz",
+      "integrity": "sha512-5pWX0jdKR48XFZBuJqHosX3AAHjRAzygouMTyimnBPOLdY3WjzUSKhus2FVMihUFWzeLebDgr4r8UeQFAct7Bg==",
+      "dependencies": {
+        "@remix-run/router": "1.7.2",
+        "react-router": "6.14.2"
+      },
+      "engines": {
+        "node": ">=14"
+      },
+      "peerDependencies": {
+        "react": ">=16.8",
+        "react-dom": ">=16.8"
+      }
+    },
+    "node_modules/react-switch": {
+      "version": "7.0.0",
+      "resolved": "https://registry.npmjs.org/react-switch/-/react-switch-7.0.0.tgz",
+      "integrity": "sha512-KkDeW+cozZXI6knDPyUt3KBN1rmhoVYgAdCJqAh7st7tk8YE6N0iR89zjCWO8T8dUTeJGTR0KU+5CHCRMRffiA==",
+      "dependencies": {
+        "prop-types": "^15.7.2"
+      },
+      "peerDependencies": {
+        "react": "^15.3.0 || ^16.0.0 || ^17.0.0 || ^18.0.0",
+        "react-dom": "^15.3.0 || ^16.0.0 || ^17.0.0 || ^18.0.0"
+      }
+    },
+    "node_modules/react-tabs": {
+      "version": "6.0.2",
+      "resolved": "https://registry.npmjs.org/react-tabs/-/react-tabs-6.0.2.tgz",
+      "integrity": "sha512-aQXTKolnM28k3KguGDBSAbJvcowOQr23A+CUJdzJtOSDOtTwzEaJA+1U4KwhNL9+Obe+jFS7geuvA7ICQPXOnQ==",
+      "dependencies": {
+        "clsx": "^2.0.0",
+        "prop-types": "^15.5.0"
+      },
+      "peerDependencies": {
+        "react": "^18.0.0"
+      }
+    },
+    "node_modules/react-tooltip": {
+      "version": "5.19.0",
+      "resolved": "https://registry.npmjs.org/react-tooltip/-/react-tooltip-5.19.0.tgz",
+      "integrity": "sha512-NSUk77GMpxYKHFKJVNHL++QQXRuH2QW1qDrXPtJnp2s/MJvUnU73N5TTADwDyrO2+xGlr0xHhjvQphkF60cMEA==",
+      "dependencies": {
+        "@floating-ui/dom": "^1.0.0",
+        "classnames": "^2.3.0"
+      },
+      "peerDependencies": {
+        "react": ">=16.14.0",
+        "react-dom": ">=16.14.0"
+      }
+    },
+    "node_modules/readable-stream": {
+      "version": "3.6.2",
+      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.2.tgz",
+      "integrity": "sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA==",
+      "dependencies": {
+        "inherits": "^2.0.3",
+        "string_decoder": "^1.1.1",
+        "util-deprecate": "^1.0.1"
+      },
+      "engines": {
+        "node": ">= 6"
+      }
+    },
+    "node_modules/readdirp": {
+      "version": "3.6.0",
+      "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.6.0.tgz",
+      "integrity": "sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA==",
+      "dev": true,
+      "dependencies": {
+        "picomatch": "^2.2.1"
+      },
+      "engines": {
+        "node": ">=8.10.0"
+      }
+    },
+    "node_modules/redux": {
+      "version": "4.2.1",
+      "resolved": "https://registry.npmjs.org/redux/-/redux-4.2.1.tgz",
+      "integrity": "sha512-LAUYz4lc+Do8/g7aeRa8JkyDErK6ekstQaqWQrNRW//MY1TvCEpMtpTWvlQ+FPbWCx+Xixu/6SHt5N0HR+SB4w==",
+      "dependencies": {
+        "@babel/runtime": "^7.9.2"
+      }
+    },
+    "node_modules/redux-persist": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/redux-persist/-/redux-persist-6.0.0.tgz",
+      "integrity": "sha512-71LLMbUq2r02ng2We9S215LtPu3fY0KgaGE0k8WRgl6RkqxtGfl7HUozz1Dftwsb0D/5mZ8dwAaPbtnzfvbEwQ==",
+      "peerDependencies": {
+        "redux": ">4.0.0"
+      }
+    },
+    "node_modules/redux-state-sync": {
+      "version": "3.1.4",
+      "resolved": "https://registry.npmjs.org/redux-state-sync/-/redux-state-sync-3.1.4.tgz",
+      "integrity": "sha512-nhJBzaXVXPXvUhQJ7m0LdoXBnrcw+cTYQ8bzW9DeJKdq6UNYynXwQWAlVUvsbT/hDV+vB6BC4DMLXkUVGpF2yQ==",
+      "dependencies": {
+        "broadcast-channel": "^3.1.0"
+      }
+    },
+    "node_modules/redux-state-sync/node_modules/broadcast-channel": {
+      "version": "3.7.0",
+      "resolved": "https://registry.npmjs.org/broadcast-channel/-/broadcast-channel-3.7.0.tgz",
+      "integrity": "sha512-cIAKJXAxGJceNZGTZSBzMxzyOn72cVgPnKx4dc6LRjQgbaJUQqhy5rzL3zbMxkMWsGKkv2hSFkPRMEXfoMZ2Mg==",
+      "dependencies": {
+        "@babel/runtime": "^7.7.2",
+        "detect-node": "^2.1.0",
+        "js-sha3": "0.8.0",
+        "microseconds": "0.2.0",
+        "nano-time": "1.0.0",
+        "oblivious-set": "1.0.0",
+        "rimraf": "3.0.2",
+        "unload": "2.2.0"
+      }
+    },
+    "node_modules/redux-state-sync/node_modules/microseconds": {
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/microseconds/-/microseconds-0.2.0.tgz",
+      "integrity": "sha512-n7DHHMjR1avBbSpsTBj6fmMGh2AGrifVV4e+WYc3Q9lO+xnSZ3NyhcBND3vzzatt05LFhoKFRxrIyklmLlUtyA=="
+    },
+    "node_modules/regenerator-runtime": {
+      "version": "0.13.11",
+      "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.11.tgz",
+      "integrity": "sha512-kY1AZVr2Ra+t+piVaJ4gxaFaReZVH40AKNo7UCX6W+dEwBo/2oZJzqfuN1qLq1oL45o56cPaTXELwrTh8Fpggg=="
+    },
+    "node_modules/regexp.prototype.flags": {
+      "version": "1.5.0",
+      "resolved": "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.5.0.tgz",
+      "integrity": "sha512-0SutC3pNudRKgquxGoRGIz946MZVHqbNfPjBdxeOhBrdgDKlRoXmYLQN9xRbrR09ZXWeGAdPuif7egofn6v5LA==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.2",
+        "define-properties": "^1.2.0",
+        "functions-have-names": "^1.2.3"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/relateurl": {
+      "version": "0.2.7",
+      "resolved": "https://registry.npmjs.org/relateurl/-/relateurl-0.2.7.tgz",
+      "integrity": "sha512-G08Dxvm4iDN3MLM0EsP62EDV9IuhXPR6blNz6Utcp7zyV3tr4HVNINt6MpaRWbxoOHT3Q7YN2P+jaHX8vUbgog==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.10"
+      }
+    },
+    "node_modules/remove-accents": {
+      "version": "0.4.2",
+      "resolved": "https://registry.npmjs.org/remove-accents/-/remove-accents-0.4.2.tgz",
+      "integrity": "sha512-7pXIJqJOq5tFgG1A2Zxti3Ht8jJF337m4sowbuHsW30ZnkQFnDzy9qBNhgzX8ZLW4+UBcXiiR7SwR6pokHsxiA=="
+    },
+    "node_modules/renderkid": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/renderkid/-/renderkid-3.0.0.tgz",
+      "integrity": "sha512-q/7VIQA8lmM1hF+jn+sFSPWGlMkSAeNYcPLmDQx2zzuiDfaLrOmumR8iaUKlenFgh0XRPIUeSPlH3A+AW3Z5pg==",
+      "dev": true,
+      "dependencies": {
+        "css-select": "^4.1.3",
+        "dom-converter": "^0.2.0",
+        "htmlparser2": "^6.1.0",
+        "lodash": "^4.17.21",
+        "strip-ansi": "^6.0.1"
+      }
+    },
+    "node_modules/require-directory": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz",
+      "integrity": "sha512-fGxEI7+wsG9xrvdjsrlmL22OMTTiHRwAMroiEeMgq8gzoLC/PQr7RsRDSTLUg/bZAZtF+TVIkHc6/4RIKrui+Q==",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/require-from-string": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/require-from-string/-/require-from-string-2.0.2.tgz",
+      "integrity": "sha512-Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/requires-port": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/requires-port/-/requires-port-1.0.0.tgz",
+      "integrity": "sha512-KigOCHcocU3XODJxsu8i/j8T9tzT4adHiecwORRQ0ZZFcp7ahwXuRU1m+yuO90C5ZUyGeGfocHDI14M3L3yDAQ==",
+      "dev": true
+    },
+    "node_modules/resolve": {
+      "version": "1.22.8",
+      "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.8.tgz",
+      "integrity": "sha512-oKWePCxqpd6FlLvGV1VU0x7bkPmmCNolxzjMf4NczoDnQcIWrAF+cPtZn5i6n+RfD2d9i0tzpKnG6Yk168yIyw==",
+      "dev": true,
+      "dependencies": {
+        "is-core-module": "^2.13.0",
+        "path-parse": "^1.0.7",
+        "supports-preserve-symlinks-flag": "^1.0.0"
+      },
+      "bin": {
+        "resolve": "bin/resolve"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/resolve-from": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz",
+      "integrity": "sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==",
+      "dev": true,
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/restore-cursor": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-3.1.0.tgz",
+      "integrity": "sha512-l+sSefzHpj5qimhFSE5a8nufZYAM3sBSVMAPtYkmC+4EH2anSGaEMXSD0izRQbu9nfyQ9y5JrVmp7E8oZrUjvA==",
+      "dev": true,
+      "dependencies": {
+        "onetime": "^5.1.0",
+        "signal-exit": "^3.0.2"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/retry": {
+      "version": "0.13.1",
+      "resolved": "https://registry.npmjs.org/retry/-/retry-0.13.1.tgz",
+      "integrity": "sha512-XQBQ3I8W1Cge0Seh+6gjj03LbmRFWuoszgK9ooCpwYIrhhoO80pfq4cUkU5DkknwfOfFteRwlZ56PYOGYyFWdg==",
+      "dev": true,
+      "engines": {
+        "node": ">= 4"
+      }
+    },
+    "node_modules/reusify": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/reusify/-/reusify-1.0.4.tgz",
+      "integrity": "sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw==",
+      "dev": true,
+      "engines": {
+        "iojs": ">=1.0.0",
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/reverse-arguments": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/reverse-arguments/-/reverse-arguments-1.0.0.tgz",
+      "integrity": "sha512-/x8uIPdTafBqakK0TmPNJzgkLP+3H+yxpUJhCQHsLBg1rYEVNR2D8BRYNWQhVBjyOd7oo1dZRVzIkwMY2oqfYQ==",
+      "dev": true
+    },
+    "node_modules/rfdc": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/rfdc/-/rfdc-1.3.0.tgz",
+      "integrity": "sha512-V2hovdzFbOi77/WajaSMXk2OLm+xNIeQdMMuB7icj7bk6zi2F8GGAxigcnDFpJHbNyNcgyJDiP+8nOrY5cZGrA==",
+      "dev": true
+    },
+    "node_modules/rgb-hex": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/rgb-hex/-/rgb-hex-3.0.0.tgz",
+      "integrity": "sha512-8h7ZcwxCBDKvchSWbWngJuSCqJGQ6nDuLLg+QcRyQDbX9jMWt+PpPeXAhSla0GOooEomk3lCprUpGkMdsLjKyg==",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/rimraf": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz",
+      "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==",
+      "dependencies": {
+        "glob": "^7.1.3"
+      },
+      "bin": {
+        "rimraf": "bin.js"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      }
+    },
+    "node_modules/ripemd160": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/ripemd160/-/ripemd160-2.0.2.tgz",
+      "integrity": "sha512-ii4iagi25WusVoiC4B4lq7pbXfAp3D9v5CwfkY33vffw2+pkDjY1D8GaN7spsxvCSx8dkPqOZCEZyfxcmJG2IA==",
+      "dependencies": {
+        "hash-base": "^3.0.0",
+        "inherits": "^2.0.1"
+      }
+    },
+    "node_modules/ripemd160-min": {
+      "version": "0.0.6",
+      "resolved": "https://registry.npmjs.org/ripemd160-min/-/ripemd160-min-0.0.6.tgz",
+      "integrity": "sha512-+GcJgQivhs6S9qvLogusiTcS9kQUfgR75whKuy5jIhuiOfQuJ8fjqxV6EGD5duH1Y/FawFUMtMhyeq3Fbnib8A==",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/rollup": {
+      "version": "4.18.0",
+      "resolved": "https://registry.npmjs.org/rollup/-/rollup-4.18.0.tgz",
+      "integrity": "sha512-QmJz14PX3rzbJCN1SG4Xe/bAAX2a6NpCP8ab2vfu2GiUr8AQcr2nCV/oEO3yneFarB67zk8ShlIyWb2LGTb3Sg==",
+      "dev": true,
+      "dependencies": {
+        "@types/estree": "1.0.5"
+      },
+      "bin": {
+        "rollup": "dist/bin/rollup"
+      },
+      "engines": {
+        "node": ">=18.0.0",
+        "npm": ">=8.0.0"
+      },
+      "optionalDependencies": {
+        "@rollup/rollup-android-arm-eabi": "4.18.0",
+        "@rollup/rollup-android-arm64": "4.18.0",
+        "@rollup/rollup-darwin-arm64": "4.18.0",
+        "@rollup/rollup-darwin-x64": "4.18.0",
+        "@rollup/rollup-linux-arm-gnueabihf": "4.18.0",
+        "@rollup/rollup-linux-arm-musleabihf": "4.18.0",
+        "@rollup/rollup-linux-arm64-gnu": "4.18.0",
+        "@rollup/rollup-linux-arm64-musl": "4.18.0",
+        "@rollup/rollup-linux-powerpc64le-gnu": "4.18.0",
+        "@rollup/rollup-linux-riscv64-gnu": "4.18.0",
+        "@rollup/rollup-linux-s390x-gnu": "4.18.0",
+        "@rollup/rollup-linux-x64-gnu": "4.18.0",
+        "@rollup/rollup-linux-x64-musl": "4.18.0",
+        "@rollup/rollup-win32-arm64-msvc": "4.18.0",
+        "@rollup/rollup-win32-ia32-msvc": "4.18.0",
+        "@rollup/rollup-win32-x64-msvc": "4.18.0",
+        "fsevents": "~2.3.2"
+      }
+    },
+    "node_modules/run-parallel": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/run-parallel/-/run-parallel-1.2.0.tgz",
+      "integrity": "sha512-5l4VyZR86LZ/lDxZTR6jqL8AFE2S0IFLMP26AbjsLVADxHdhB/c0GUsH+y39UfCi3dzz8OlQuPmnaJOMoDHQBA==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/feross"
+        },
+        {
+          "type": "patreon",
+          "url": "https://www.patreon.com/feross"
+        },
+        {
+          "type": "consulting",
+          "url": "https://feross.org/support"
+        }
+      ],
+      "dependencies": {
+        "queue-microtask": "^1.2.2"
+      }
+    },
+    "node_modules/rxjs": {
+      "version": "6.6.7",
+      "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.6.7.tgz",
+      "integrity": "sha512-hTdwr+7yYNIT5n4AMYp85KA6yw2Va0FLa3Rguvbpa4W3I5xynaBZo41cM3XM+4Q6fRMj3sBYIR1VAmZMXYJvRQ==",
+      "dependencies": {
+        "tslib": "^1.9.0"
+      },
+      "engines": {
+        "npm": ">=2.0.0"
+      }
+    },
+    "node_modules/rxjs/node_modules/tslib": {
+      "version": "1.14.1",
+      "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz",
+      "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg=="
+    },
+    "node_modules/safe-array-concat": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/safe-array-concat/-/safe-array-concat-1.0.0.tgz",
+      "integrity": "sha512-9dVEFruWIsnie89yym+xWTAYASdpw3CJV7Li/6zBewGf9z2i1j31rP6jnY0pHEO4QZh6N0K11bFjWmdR8UGdPQ==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.2",
+        "get-intrinsic": "^1.2.0",
+        "has-symbols": "^1.0.3",
+        "isarray": "^2.0.5"
+      },
+      "engines": {
+        "node": ">=0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/safe-buffer": {
+      "version": "5.2.1",
+      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz",
+      "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==",
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/feross"
+        },
+        {
+          "type": "patreon",
+          "url": "https://www.patreon.com/feross"
+        },
+        {
+          "type": "consulting",
+          "url": "https://feross.org/support"
+        }
+      ]
+    },
+    "node_modules/safe-regex-test": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/safe-regex-test/-/safe-regex-test-1.0.0.tgz",
+      "integrity": "sha512-JBUUzyOgEwXQY1NuPtvcj/qcBDbDmEvWufhlnXZIm75DEHp+afM1r1ujJpJsV/gSM4t59tpDyPi1sd6ZaPFfsA==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.2",
+        "get-intrinsic": "^1.1.3",
+        "is-regex": "^1.1.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/safer-buffer": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz",
+      "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg=="
+    },
+    "node_modules/scheduler": {
+      "version": "0.23.0",
+      "resolved": "https://registry.npmjs.org/scheduler/-/scheduler-0.23.0.tgz",
+      "integrity": "sha512-CtuThmgHNg7zIZWAXi3AsyIzA3n4xx7aNyjwC2VJldO2LMVDhFK+63xGqq6CsJH4rTAt6/M+N4GhZiDYPx9eUw==",
+      "dependencies": {
+        "loose-envify": "^1.1.0"
+      }
+    },
+    "node_modules/schema-inspector": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/schema-inspector/-/schema-inspector-2.1.0.tgz",
+      "integrity": "sha512-3bmQVhbA01/EW8cZin4vIpqlpNU2SIy4BhKCfCgogJ3T/L76dLx3QAE+++4o+dNT33sa+SN9vOJL7iHiHFjiNg==",
+      "dependencies": {
+        "async": "~2.6.3"
+      }
+    },
+    "node_modules/schema-utils": {
+      "version": "3.3.0",
+      "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.3.0.tgz",
+      "integrity": "sha512-pN/yOAvcC+5rQ5nERGuwrjLlYvLTbCibnZ1I7B1LaiAz9BRBlE9GMgE/eqV30P7aJQUf7Ddimy/RsbYO/GrVGg==",
+      "dev": true,
+      "dependencies": {
+        "@types/json-schema": "^7.0.8",
+        "ajv": "^6.12.5",
+        "ajv-keywords": "^3.5.2"
+      },
+      "engines": {
+        "node": ">= 10.13.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/webpack"
+      }
+    },
+    "node_modules/secp256k1": {
+      "version": "3.8.0",
+      "resolved": "https://registry.npmjs.org/secp256k1/-/secp256k1-3.8.0.tgz",
+      "integrity": "sha512-k5ke5avRZbtl9Tqx/SA7CbY3NF6Ro+Sj9cZxezFzuBlLDmyqPiL8hJJ+EmzD8Ig4LUDByHJ3/iPOVoRixs/hmw==",
+      "hasInstallScript": true,
+      "dependencies": {
+        "bindings": "^1.5.0",
+        "bip66": "^1.1.5",
+        "bn.js": "^4.11.8",
+        "create-hash": "^1.2.0",
+        "drbg.js": "^1.0.1",
+        "elliptic": "^6.5.2",
+        "nan": "^2.14.0",
+        "safe-buffer": "^5.1.2"
+      },
+      "engines": {
+        "node": ">=4.0.0"
+      }
+    },
+    "node_modules/secp256k1/node_modules/bn.js": {
+      "version": "4.12.0",
+      "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.0.tgz",
+      "integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA=="
+    },
+    "node_modules/select-hose": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/select-hose/-/select-hose-2.0.0.tgz",
+      "integrity": "sha512-mEugaLK+YfkijB4fx0e6kImuJdCIt2LxCRcbEYPqRGCs4F2ogyfZU5IAZRdjCP8JPq2AtdNoC/Dux63d9Kiryg==",
+      "dev": true
+    },
+    "node_modules/selfsigned": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/selfsigned/-/selfsigned-2.1.1.tgz",
+      "integrity": "sha512-GSL3aowiF7wa/WtSFwnUrludWFoNhftq8bUkH9pkzjpN2XSPOAYEgg6e0sS9s0rZwgJzJiQRPU18A6clnoW5wQ==",
+      "dev": true,
+      "dependencies": {
+        "node-forge": "^1"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/semver": {
+      "version": "6.3.1",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
+      "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==",
+      "bin": {
+        "semver": "bin/semver.js"
+      }
+    },
+    "node_modules/send": {
+      "version": "0.18.0",
+      "resolved": "https://registry.npmjs.org/send/-/send-0.18.0.tgz",
+      "integrity": "sha512-qqWzuOjSFOuqPjFe4NOsMLafToQQwBSOEpS+FwEt3A2V3vKubTquT3vmLTQpFgMXp8AlFWFuP1qKaJZOtPpVXg==",
+      "dev": true,
+      "dependencies": {
+        "debug": "2.6.9",
+        "depd": "2.0.0",
+        "destroy": "1.2.0",
+        "encodeurl": "~1.0.2",
+        "escape-html": "~1.0.3",
+        "etag": "~1.8.1",
+        "fresh": "0.5.2",
+        "http-errors": "2.0.0",
+        "mime": "1.6.0",
+        "ms": "2.1.3",
+        "on-finished": "2.4.1",
+        "range-parser": "~1.2.1",
+        "statuses": "2.0.1"
+      },
+      "engines": {
+        "node": ">= 0.8.0"
+      }
+    },
+    "node_modules/send/node_modules/debug": {
+      "version": "2.6.9",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+      "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+      "dev": true,
+      "dependencies": {
+        "ms": "2.0.0"
+      }
+    },
+    "node_modules/send/node_modules/debug/node_modules/ms": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+      "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==",
+      "dev": true
+    },
+    "node_modules/send/node_modules/ms": {
+      "version": "2.1.3",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz",
+      "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==",
+      "dev": true
+    },
+    "node_modules/serialize-javascript": {
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-6.0.1.tgz",
+      "integrity": "sha512-owoXEFjWRllis8/M1Q+Cw5k8ZH40e3zhp/ovX+Xr/vi1qj6QesbyXXViFbpNvWvPNAD62SutwEXavefrLJWj7w==",
+      "dev": true,
+      "dependencies": {
+        "randombytes": "^2.1.0"
+      }
+    },
+    "node_modules/serve-index": {
+      "version": "1.9.1",
+      "resolved": "https://registry.npmjs.org/serve-index/-/serve-index-1.9.1.tgz",
+      "integrity": "sha512-pXHfKNP4qujrtteMrSBb0rc8HJ9Ms/GrXwcUtUtD5s4ewDJI8bT3Cz2zTVRMKtri49pLx2e0Ya8ziP5Ya2pZZw==",
+      "dev": true,
+      "dependencies": {
+        "accepts": "~1.3.4",
+        "batch": "0.6.1",
+        "debug": "2.6.9",
+        "escape-html": "~1.0.3",
+        "http-errors": "~1.6.2",
+        "mime-types": "~2.1.17",
+        "parseurl": "~1.3.2"
+      },
+      "engines": {
+        "node": ">= 0.8.0"
+      }
+    },
+    "node_modules/serve-index/node_modules/debug": {
+      "version": "2.6.9",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+      "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+      "dev": true,
+      "dependencies": {
+        "ms": "2.0.0"
+      }
+    },
+    "node_modules/serve-index/node_modules/depd": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/depd/-/depd-1.1.2.tgz",
+      "integrity": "sha512-7emPTl6Dpo6JRXOXjLRxck+FlLRX5847cLKEn00PLAgc3g2hTZZgr+e4c2v6QpSmLeFP3n5yUo7ft6avBK/5jQ==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
+    "node_modules/serve-index/node_modules/http-errors": {
+      "version": "1.6.3",
+      "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.6.3.tgz",
+      "integrity": "sha512-lks+lVC8dgGyh97jxvxeYTWQFvh4uw4yC12gVl63Cg30sjPX4wuGcdkICVXDAESr6OJGjqGA8Iz5mkeN6zlD7A==",
+      "dev": true,
+      "dependencies": {
+        "depd": "~1.1.2",
+        "inherits": "2.0.3",
+        "setprototypeof": "1.1.0",
+        "statuses": ">= 1.4.0 < 2"
+      },
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
+    "node_modules/serve-index/node_modules/inherits": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
+      "integrity": "sha512-x00IRNXNy63jwGkJmzPigoySHbaqpNuzKbBOmzK+g2OdZpQ9w+sxCN+VSB3ja7IAge2OP2qpfxTjeNcyjmW1uw==",
+      "dev": true
+    },
+    "node_modules/serve-index/node_modules/ms": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+      "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==",
+      "dev": true
+    },
+    "node_modules/serve-index/node_modules/setprototypeof": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.1.0.tgz",
+      "integrity": "sha512-BvE/TwpZX4FXExxOxZyRGQQv651MSwmWKZGqvmPcRIjDqWub67kTKuIMx43cZZrS/cBBzwBcNDWoFxt2XEFIpQ==",
+      "dev": true
+    },
+    "node_modules/serve-index/node_modules/statuses": {
+      "version": "1.5.0",
+      "resolved": "https://registry.npmjs.org/statuses/-/statuses-1.5.0.tgz",
+      "integrity": "sha512-OpZ3zP+jT1PI7I8nemJX4AKmAX070ZkYPVWV/AaKTJl+tXCTGyVdC1a4SL8RUQYEwk/f34ZX8UTykN68FwrqAA==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
+    "node_modules/serve-static": {
+      "version": "1.15.0",
+      "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.15.0.tgz",
+      "integrity": "sha512-XGuRDNjXUijsUL0vl6nSD7cwURuzEgglbOaFuZM9g3kwDXOWVTck0jLzjPzGD+TazWbboZYu52/9/XPdUgne9g==",
+      "dev": true,
+      "dependencies": {
+        "encodeurl": "~1.0.2",
+        "escape-html": "~1.0.3",
+        "parseurl": "~1.3.3",
+        "send": "0.18.0"
+      },
+      "engines": {
+        "node": ">= 0.8.0"
+      }
+    },
+    "node_modules/set-function-length": {
+      "version": "1.2.2",
+      "resolved": "https://registry.npmjs.org/set-function-length/-/set-function-length-1.2.2.tgz",
+      "integrity": "sha512-pgRc4hJ4/sNjWCSS9AmnS40x3bNMDTknHgL5UaMBTMyJnU90EgWh1Rz+MC9eFu4BuN/UwZjKQuY/1v3rM7HMfg==",
+      "dependencies": {
+        "define-data-property": "^1.1.4",
+        "es-errors": "^1.3.0",
+        "function-bind": "^1.1.2",
+        "get-intrinsic": "^1.2.4",
+        "gopd": "^1.0.1",
+        "has-property-descriptors": "^1.0.2"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
+    "node_modules/setprototypeof": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.2.0.tgz",
+      "integrity": "sha512-E5LDX7Wrp85Kil5bhZv46j8jOeboKq5JMmYM3gVGdGH8xFpPWXUMsNrlODCrkoxMEeNi/XZIwuRvY4XNwYMJpw==",
+      "dev": true
+    },
+    "node_modules/sha.js": {
+      "version": "2.4.11",
+      "resolved": "https://registry.npmjs.org/sha.js/-/sha.js-2.4.11.tgz",
+      "integrity": "sha512-QMEp5B7cftE7APOjk5Y6xgrbWu+WkLVQwk8JNjZ8nKRciZaByEW6MubieAiToS7+dwvrjGhH8jRXz3MVd0AYqQ==",
+      "dependencies": {
+        "inherits": "^2.0.1",
+        "safe-buffer": "^5.0.1"
+      },
+      "bin": {
+        "sha.js": "bin.js"
+      }
+    },
+    "node_modules/sha256-uint8array": {
+      "version": "0.10.7",
+      "resolved": "https://registry.npmjs.org/sha256-uint8array/-/sha256-uint8array-0.10.7.tgz",
+      "integrity": "sha512-1Q6JQU4tX9NqsDGodej6pkrUVQVNapLZnvkwIhddH/JqzBZF1fSaxSWNY6sziXBE8aEa2twtGkXUrwzGeZCMpQ=="
+    },
+    "node_modules/shallowequal": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/shallowequal/-/shallowequal-1.1.0.tgz",
+      "integrity": "sha512-y0m1JoUZSlPAjXVtPPW70aZWfIL/dSP7AFkRnniLCrK/8MDKog3TySTBmckD+RObVxH0v4Tox67+F14PdED2oQ=="
+    },
+    "node_modules/shebang-command": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz",
+      "integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==",
+      "dev": true,
+      "dependencies": {
+        "shebang-regex": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/shebang-regex": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz",
+      "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/shell-quote": {
+      "version": "1.8.1",
+      "resolved": "https://registry.npmjs.org/shell-quote/-/shell-quote-1.8.1.tgz",
+      "integrity": "sha512-6j1W9l1iAs/4xYBI1SYOVZyFcCis9b4KCLQ8fgAGG07QvzaRLVVRQvAy85yNmmZSjYjg4MWh4gNvlPujU/5LpA==",
+      "dev": true,
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/shell-quote-word": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/shell-quote-word/-/shell-quote-word-1.0.1.tgz",
+      "integrity": "sha512-lT297f1WLAdq0A4O+AknIFRP6kkiI3s8C913eJ0XqBxJbZPGWUNkRQk2u8zk4bEAjUJ5i+fSLwB6z1HzeT+DEg==",
+      "dev": true
+    },
+    "node_modules/side-channel": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.0.4.tgz",
+      "integrity": "sha512-q5XPytqFEIKHkGdiMIrY10mvLRvnQh42/+GoBlFW3b2LXLE2xxJpZFdm94we0BaoV3RwJyGqg5wS7epxTv0Zvw==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.0",
+        "get-intrinsic": "^1.0.2",
+        "object-inspect": "^1.9.0"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/siginfo": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/siginfo/-/siginfo-2.0.0.tgz",
+      "integrity": "sha512-ybx0WO1/8bSBLEWXZvEd7gMW3Sn3JFlW3TvX1nREbDLRNQNaeNN8WK0meBwPdAaOI7TtRRRJn/Es1zhrrCHu7g==",
+      "dev": true
+    },
+    "node_modules/signal-exit": {
+      "version": "3.0.7",
+      "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.7.tgz",
+      "integrity": "sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==",
+      "dev": true
+    },
+    "node_modules/slash": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz",
+      "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/slice-ansi": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-5.0.0.tgz",
+      "integrity": "sha512-FC+lgizVPfie0kkhqUScwRu1O/lF6NOgJmlCgK+/LYxDCTk8sGelYaHDhFcDN+Sn3Cv+3VSa4Byeo+IMCzpMgQ==",
+      "dev": true,
+      "dependencies": {
+        "ansi-styles": "^6.0.0",
+        "is-fullwidth-code-point": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/slice-ansi?sponsor=1"
+      }
+    },
+    "node_modules/slice-ansi/node_modules/ansi-styles": {
+      "version": "6.2.1",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-6.2.1.tgz",
+      "integrity": "sha512-bN798gFfQX+viw3R7yrGWRqnrN2oRkEkUjjl4JNn4E8GxxbjtG3FbrEIIY3l8/hrwUwIeCZvi4QuOTP4MErVug==",
+      "dev": true,
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
+      }
+    },
+    "node_modules/smart-buffer": {
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/smart-buffer/-/smart-buffer-4.2.0.tgz",
+      "integrity": "sha512-94hK0Hh8rPqQl2xXc3HsaBoOXKV20MToPkcXvwbISWLEs+64sBq5kFgn2kJDHb1Pry9yrP0dxrCI9RRci7RXKg==",
+      "engines": {
+        "node": ">= 6.0.0",
+        "npm": ">= 3.0.0"
+      }
+    },
+    "node_modules/smol-toml": {
+      "version": "1.2.2",
+      "resolved": "https://registry.npmjs.org/smol-toml/-/smol-toml-1.2.2.tgz",
+      "integrity": "sha512-fVEjX2ybKdJKzFL46VshQbj9PuA4IUKivalgp48/3zwS9vXzyykzQ6AX92UxHSvWJagziMRLeHMgEzoGO7A8hQ==",
+      "dev": true,
+      "engines": {
+        "node": ">= 18"
+      }
+    },
+    "node_modules/sockjs": {
+      "version": "0.3.24",
+      "resolved": "https://registry.npmjs.org/sockjs/-/sockjs-0.3.24.tgz",
+      "integrity": "sha512-GJgLTZ7vYb/JtPSSZ10hsOYIvEYsjbNU+zPdIHcUaWVNUEPivzxku31865sSSud0Da0W4lEeOPlmw93zLQchuQ==",
+      "dev": true,
+      "dependencies": {
+        "faye-websocket": "^0.11.3",
+        "uuid": "^8.3.2",
+        "websocket-driver": "^0.7.4"
+      }
+    },
+    "node_modules/source-map": {
+      "version": "0.7.4",
+      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.7.4.tgz",
+      "integrity": "sha512-l3BikUxvPOcn5E74dZiq5BGsTb5yEwhaTSzccU6t4sDOH8NWJCstKO5QT2CvtFoK6F0saL7p9xHAqHOlCPJygA==",
+      "dev": true,
+      "engines": {
+        "node": ">= 8"
+      }
+    },
+    "node_modules/source-map-js": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.2.0.tgz",
+      "integrity": "sha512-itJW8lvSA0TXEphiRoawsCksnlf8SyvmFzIhltqAHluXd88pkCd+cXJVHTDwdCr0IzwptSm035IHQktUu1QUMg==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/spdy": {
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/spdy/-/spdy-4.0.2.tgz",
+      "integrity": "sha512-r46gZQZQV+Kl9oItvl1JZZqJKGr+oEkB08A6BzkiR7593/7IbtuncXHd2YoYeTsG4157ZssMu9KYvUHLcjcDoA==",
+      "dev": true,
+      "dependencies": {
+        "debug": "^4.1.0",
+        "handle-thing": "^2.0.0",
+        "http-deceiver": "^1.2.7",
+        "select-hose": "^2.0.0",
+        "spdy-transport": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=6.0.0"
+      }
+    },
+    "node_modules/spdy-transport": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/spdy-transport/-/spdy-transport-3.0.0.tgz",
+      "integrity": "sha512-hsLVFE5SjA6TCisWeJXFKniGGOpBgMLmerfO2aCyCU5s7nJ/rpAepqmFifv/GCbSbueEeAJJnmSQ2rKC/g8Fcw==",
+      "dev": true,
+      "dependencies": {
+        "debug": "^4.1.0",
+        "detect-node": "^2.0.4",
+        "hpack.js": "^2.1.6",
+        "obuf": "^1.1.2",
+        "readable-stream": "^3.0.6",
+        "wbuf": "^1.7.3"
+      }
+    },
+    "node_modules/stackback": {
+      "version": "0.0.2",
+      "resolved": "https://registry.npmjs.org/stackback/-/stackback-0.0.2.tgz",
+      "integrity": "sha512-1XMJE5fQo1jGH6Y/7ebnwPOBEkIEnT4QF32d5R1+VXdXveM0IBMJt8zfaxX1P3QhVwrYe+576+jkANtSS2mBbw==",
+      "dev": true
+    },
+    "node_modules/stackframe": {
+      "version": "1.3.4",
+      "resolved": "https://registry.npmjs.org/stackframe/-/stackframe-1.3.4.tgz",
+      "integrity": "sha512-oeVtt7eWQS+Na6F//S4kJ2K2VbRlS9D43mAlMyVpVWovy9o+jfgH8O9agzANzaiLjclA0oYzUXEM4PurhSUChw==",
+      "dev": true
+    },
+    "node_modules/statuses": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/statuses/-/statuses-2.0.1.tgz",
+      "integrity": "sha512-RwNA9Z/7PrK06rYLIzFMlaF+l73iwpzsqRIFgbMLbTcLD6cOao82TaWefPXQvB2fOC4AjuYSEndS7N/mTCbkdQ==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.8"
+      }
+    },
+    "node_modules/std-env": {
+      "version": "3.5.0",
+      "resolved": "https://registry.npmjs.org/std-env/-/std-env-3.5.0.tgz",
+      "integrity": "sha512-JGUEaALvL0Mf6JCfYnJOTcobY+Nc7sG/TemDRBqCA0wEr4DER7zDchaaixTlmOxAjG1uRJmX82EQcxwTQTkqVA==",
+      "dev": true
+    },
+    "node_modules/stop-iteration-iterator": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/stop-iteration-iterator/-/stop-iteration-iterator-1.0.0.tgz",
+      "integrity": "sha512-iCGQj+0l0HOdZ2AEeBADlsRC+vsnDsZsbdSiH1yNSjcfKM7fdpCMfqAL/dwF5BLiw/XhRft/Wax6zQbhq2BcjQ==",
+      "dev": true,
+      "dependencies": {
+        "internal-slot": "^1.0.4"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
+    "node_modules/stream-browserify": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/stream-browserify/-/stream-browserify-3.0.0.tgz",
+      "integrity": "sha512-H73RAHsVBapbim0tU2JwwOiXUj+fikfiaoYAKHF3VJfA0pe2BCzkhAHBlLG6REzE+2WNZcxOXjK7lkso+9euLA==",
+      "dependencies": {
+        "inherits": "~2.0.4",
+        "readable-stream": "^3.5.0"
+      }
+    },
+    "node_modules/string_decoder": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.3.0.tgz",
+      "integrity": "sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==",
+      "dependencies": {
+        "safe-buffer": "~5.2.0"
+      }
+    },
+    "node_modules/string-argv": {
+      "version": "0.3.2",
+      "resolved": "https://registry.npmjs.org/string-argv/-/string-argv-0.3.2.tgz",
+      "integrity": "sha512-aqD2Q0144Z+/RqG52NeHEkZauTAUWJO8c6yTftGJKO3Tja5tUgIfmIl6kExvhtxSDP7fXB6DvzkfMpCd/F3G+Q==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.6.19"
+      }
+    },
+    "node_modules/string-to-color": {
+      "version": "2.2.2",
+      "resolved": "https://registry.npmjs.org/string-to-color/-/string-to-color-2.2.2.tgz",
+      "integrity": "sha512-XeA2goP7PNsSlz8RRn6KhYswnMf5Tl+38ajfy8n4oZJyMGC4qqKgHNHsZ/3qwvr42NRIjf9eSr721SyetDeMkA==",
+      "dependencies": {
+        "colornames": "^1.1.1",
+        "hex-rgb": "^4.1.0",
+        "lodash.padend": "^4.6.1",
+        "lodash.trimstart": "^4.5.1",
+        "lodash.words": "^4.2.0",
+        "rgb-hex": "^3.0.0"
+      }
+    },
+    "node_modules/string-width": {
+      "version": "5.1.2",
+      "resolved": "https://registry.npmjs.org/string-width/-/string-width-5.1.2.tgz",
+      "integrity": "sha512-HnLOCR3vjcY8beoNLtcjZ5/nxn2afmME6lhrDrebokqMap+XbeW8n9TXpPDOqdGK5qcI3oT0GKTW6wC7EMiVqA==",
+      "dev": true,
+      "dependencies": {
+        "eastasianwidth": "^0.2.0",
+        "emoji-regex": "^9.2.2",
+        "strip-ansi": "^7.0.1"
+      },
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/string-width/node_modules/ansi-regex": {
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.0.1.tgz",
+      "integrity": "sha512-n5M855fKb2SsfMIiFFoVrABHJC8QtHwVx+mHWP3QcEqBHYienj5dHSgjbxtC0WEZXYt4wcD6zrQElDPhFuZgfA==",
+      "dev": true,
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-regex?sponsor=1"
+      }
+    },
+    "node_modules/string-width/node_modules/strip-ansi": {
+      "version": "7.1.0",
+      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.1.0.tgz",
+      "integrity": "sha512-iq6eVVI64nQQTRYq2KtEg2d2uU7LElhTJwsH4YzIHZshxlgZms/wIc4VoDQTlG/IvVIrBKG06CrZnp0qv7hkcQ==",
+      "dev": true,
+      "dependencies": {
+        "ansi-regex": "^6.0.1"
+      },
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/strip-ansi?sponsor=1"
+      }
+    },
+    "node_modules/string.fromcodepoint": {
+      "version": "0.2.1",
+      "resolved": "https://registry.npmjs.org/string.fromcodepoint/-/string.fromcodepoint-0.2.1.tgz",
+      "integrity": "sha512-n69H31OnxSGSZyZbgBlvYIXlrMhJQ0dQAX1js1QDhpaUH6zmU3QYlj07bCwCNlPOu3oRXIubGPl2gDGnHsiCqg==",
+      "dev": true
+    },
+    "node_modules/string.prototype.matchall": {
+      "version": "4.0.8",
+      "resolved": "https://registry.npmjs.org/string.prototype.matchall/-/string.prototype.matchall-4.0.8.tgz",
+      "integrity": "sha512-6zOCOcJ+RJAQshcTvXPHoxoQGONa3e/Lqx90wUA+wEzX78sg5Bo+1tQo4N0pohS0erG9qtCqJDjNCQBjeWVxyg==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.2",
+        "define-properties": "^1.1.4",
+        "es-abstract": "^1.20.4",
+        "get-intrinsic": "^1.1.3",
+        "has-symbols": "^1.0.3",
+        "internal-slot": "^1.0.3",
+        "regexp.prototype.flags": "^1.4.3",
+        "side-channel": "^1.0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/string.prototype.trim": {
+      "version": "1.2.7",
+      "resolved": "https://registry.npmjs.org/string.prototype.trim/-/string.prototype.trim-1.2.7.tgz",
+      "integrity": "sha512-p6TmeT1T3411M8Cgg9wBTMRtY2q9+PNy9EV1i2lIXUN/btt763oIfxwN3RR8VU6wHX8j/1CFy0L+YuThm6bgOg==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.2",
+        "define-properties": "^1.1.4",
+        "es-abstract": "^1.20.4"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/string.prototype.trimend": {
+      "version": "1.0.6",
+      "resolved": "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.6.tgz",
+      "integrity": "sha512-JySq+4mrPf9EsDBEDYMOb/lM7XQLulwg5R/m1r0PXEFqrV0qHvl58sdTilSXtKOflCsK2E8jxf+GKC0T07RWwQ==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.2",
+        "define-properties": "^1.1.4",
+        "es-abstract": "^1.20.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/string.prototype.trimstart": {
+      "version": "1.0.6",
+      "resolved": "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.6.tgz",
+      "integrity": "sha512-omqjMDaY92pbn5HOX7f9IccLA+U1tA9GvtU4JrodiXFfYB7jPzzHpRzpglLAjtUV6bB557zwClJezTqnAiYnQA==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.2",
+        "define-properties": "^1.1.4",
+        "es-abstract": "^1.20.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/strip-ansi": {
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
+      "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
+      "dependencies": {
+        "ansi-regex": "^5.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/strip-bom": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz",
+      "integrity": "sha512-vavAMRXOgBVNF6nyEEmL3DBK19iRpDcoIwW+swQ+CbGiu7lju6t+JklA1MHweoWtadgt4ISVUsXLyDq34ddcwA==",
+      "dev": true,
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/strip-final-newline": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/strip-final-newline/-/strip-final-newline-2.0.0.tgz",
+      "integrity": "sha512-BrpvfNAE3dcvq7ll3xVumzjKjZQ5tI1sEUIKr3Uoks0XUl45St3FlatVqef9prk4jRDzhW6WZg+3bk93y6pLjA==",
+      "dev": true,
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/strip-json-comments": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz",
+      "integrity": "sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/strip-literal": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/strip-literal/-/strip-literal-1.3.0.tgz",
+      "integrity": "sha512-PugKzOsyXpArk0yWmUwqOZecSO0GH0bPoctLcqNDH9J04pVW3lflYE0ujElBGTloevcxF5MofAOZ7C5l2b+wLg==",
+      "dev": true,
+      "dependencies": {
+        "acorn": "^8.10.0"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/antfu"
+      }
+    },
+    "node_modules/style-loader": {
+      "version": "3.3.3",
+      "resolved": "https://registry.npmjs.org/style-loader/-/style-loader-3.3.3.tgz",
+      "integrity": "sha512-53BiGLXAcll9maCYtZi2RCQZKa8NQQai5C4horqKyRmHj9H7QmcUyucrH+4KW/gBQbXM2AsB0axoEcFZPlfPcw==",
+      "dev": true,
+      "engines": {
+        "node": ">= 12.13.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/webpack"
+      },
+      "peerDependencies": {
+        "webpack": "^5.0.0"
+      }
+    },
+    "node_modules/styled-components": {
+      "version": "5.3.11",
+      "resolved": "https://registry.npmjs.org/styled-components/-/styled-components-5.3.11.tgz",
+      "integrity": "sha512-uuzIIfnVkagcVHv9nE0VPlHPSCmXIUGKfJ42LNjxCCTDTL5sgnJ8Z7GZBq0EnLYGln77tPpEpExt2+qa+cZqSw==",
+      "dependencies": {
+        "@babel/helper-module-imports": "^7.0.0",
+        "@babel/traverse": "^7.4.5",
+        "@emotion/is-prop-valid": "^1.1.0",
+        "@emotion/stylis": "^0.8.4",
+        "@emotion/unitless": "^0.7.4",
+        "babel-plugin-styled-components": ">= 1.12.0",
+        "css-to-react-native": "^3.0.0",
+        "hoist-non-react-statics": "^3.0.0",
+        "shallowequal": "^1.1.0",
+        "supports-color": "^5.5.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/styled-components"
+      },
+      "peerDependencies": {
+        "react": ">= 16.8.0",
+        "react-dom": ">= 16.8.0",
+        "react-is": ">= 16.8.0"
+      }
+    },
+    "node_modules/styled-components/node_modules/@emotion/unitless": {
+      "version": "0.7.5",
+      "resolved": "https://registry.npmjs.org/@emotion/unitless/-/unitless-0.7.5.tgz",
+      "integrity": "sha512-OWORNpfjMsSSUBVrRBVGECkhWcULOAJz9ZW8uK9qgxD+87M7jHRcvh/A96XXNhXTLmKcoYSQtBEX7lHMO7YRwg=="
+    },
+    "node_modules/summary": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/summary/-/summary-2.1.0.tgz",
+      "integrity": "sha512-nMIjMrd5Z2nuB2RZCKJfFMjgS3fygbeyGk9PxPPaJR1RIcyN9yn4A63Isovzm3ZtQuEkLBVgMdPup8UeLH7aQw==",
+      "dev": true
+    },
+    "node_modules/superjson": {
+      "version": "2.2.1",
+      "resolved": "https://registry.npmjs.org/superjson/-/superjson-2.2.1.tgz",
+      "integrity": "sha512-8iGv75BYOa0xRJHK5vRLEjE2H/i4lulTjzpUXic3Eg8akftYjkmQDa8JARQ42rlczXyFR3IeRoeFCc7RxHsYZA==",
+      "dependencies": {
+        "copy-anything": "^3.0.2"
+      },
+      "engines": {
+        "node": ">=16"
+      }
+    },
+    "node_modules/supports-color": {
+      "version": "5.5.0",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
+      "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
+      "dependencies": {
+        "has-flag": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/supports-preserve-symlinks-flag": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz",
+      "integrity": "sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/swiper": {
+      "version": "11.0.6",
+      "resolved": "https://registry.npmjs.org/swiper/-/swiper-11.0.6.tgz",
+      "integrity": "sha512-W/Me7MQl5rNgdM5x9i3Gll76WsyVpnHn91GhBOyL7RCFUeg62aVnflzlVfIpXzZ/87FtJOfAoDH79ZH2Yq76zA==",
+      "funding": [
+        {
+          "type": "patreon",
+          "url": "https://www.patreon.com/swiperjs"
+        },
+        {
+          "type": "open_collective",
+          "url": "http://opencollective.com/swiper"
+        }
+      ],
+      "engines": {
+        "node": ">= 4.7.0"
+      }
+    },
+    "node_modules/tapable": {
+      "version": "2.2.1",
+      "resolved": "https://registry.npmjs.org/tapable/-/tapable-2.2.1.tgz",
+      "integrity": "sha512-GNzQvQTOIP6RyTfE2Qxb8ZVlNmw0n88vp1szwWRimP02mnTsx3Wtn5qRdqY9w2XduFNUgvOwhNnQsjwCp+kqaQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/terser": {
+      "version": "5.19.2",
+      "resolved": "https://registry.npmjs.org/terser/-/terser-5.19.2.tgz",
+      "integrity": "sha512-qC5+dmecKJA4cpYxRa5aVkKehYsQKc+AHeKl0Oe62aYjBL8ZA33tTljktDHJSaxxMnbI5ZYw+o/S2DxxLu8OfA==",
+      "dev": true,
+      "dependencies": {
+        "@jridgewell/source-map": "^0.3.3",
+        "acorn": "^8.8.2",
+        "commander": "^2.20.0",
+        "source-map-support": "~0.5.20"
+      },
+      "bin": {
+        "terser": "bin/terser"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/terser-webpack-plugin": {
+      "version": "5.3.9",
+      "resolved": "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-5.3.9.tgz",
+      "integrity": "sha512-ZuXsqE07EcggTWQjXUj+Aot/OMcD0bMKGgF63f7UxYcu5/AJF53aIpK1YoP5xR9l6s/Hy2b+t1AM0bLNPRuhwA==",
+      "dev": true,
+      "dependencies": {
+        "@jridgewell/trace-mapping": "^0.3.17",
+        "jest-worker": "^27.4.5",
+        "schema-utils": "^3.1.1",
+        "serialize-javascript": "^6.0.1",
+        "terser": "^5.16.8"
+      },
+      "engines": {
+        "node": ">= 10.13.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/webpack"
+      },
+      "peerDependencies": {
+        "webpack": "^5.1.0"
+      },
+      "peerDependenciesMeta": {
+        "@swc/core": {
+          "optional": true
+        },
+        "esbuild": {
+          "optional": true
+        },
+        "uglify-js": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/terser/node_modules/commander": {
+      "version": "2.20.3",
+      "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz",
+      "integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==",
+      "dev": true
+    },
+    "node_modules/terser/node_modules/source-map": {
+      "version": "0.6.1",
+      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/terser/node_modules/source-map-support": {
+      "version": "0.5.21",
+      "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.21.tgz",
+      "integrity": "sha512-uBHU3L3czsIyYXKX88fdrGovxdSCoTGDRZ6SYXtSRxLZUzHg5P/66Ht6uoUlHu9EZod+inXhKo3qQgwXUT/y1w==",
+      "dev": true,
+      "dependencies": {
+        "buffer-from": "^1.0.0",
+        "source-map": "^0.6.0"
+      }
+    },
+    "node_modules/text-table": {
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz",
+      "integrity": "sha512-N+8UisAXDGk8PFXP4HAzVR9nbfmVJ3zYLAWiTIoqC5v5isinhr+r5uaO8+7r3BMfuNIufIsA7RdpVgacC2cSpw==",
+      "dev": true
+    },
+    "node_modules/through": {
+      "version": "2.3.8",
+      "resolved": "https://registry.npmjs.org/through/-/through-2.3.8.tgz",
+      "integrity": "sha512-w89qg7PI8wAdvX60bMDP+bFoD5Dvhm9oLheFp5O4a2QF0cSBGsBX4qZmadPMvVqlLJBBci+WqGGOAPvcDeNSVg==",
+      "dev": true
+    },
+    "node_modules/thunky": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/thunky/-/thunky-1.1.0.tgz",
+      "integrity": "sha512-eHY7nBftgThBqOyHGVN+l8gF0BucP09fMo0oO/Lb0w1OF80dJv+lDVpXG60WMQvkcxAkNybKsrEIE3ZtKGmPrA==",
+      "dev": true
+    },
+    "node_modules/tinybench": {
+      "version": "2.5.1",
+      "resolved": "https://registry.npmjs.org/tinybench/-/tinybench-2.5.1.tgz",
+      "integrity": "sha512-65NKvSuAVDP/n4CqH+a9w2kTlLReS9vhsAP06MWx+/89nMinJyB2icyl58RIcqCmIggpojIGeuJGhjU1aGMBSg==",
+      "dev": true
+    },
+    "node_modules/tinypool": {
+      "version": "0.7.0",
+      "resolved": "https://registry.npmjs.org/tinypool/-/tinypool-0.7.0.tgz",
+      "integrity": "sha512-zSYNUlYSMhJ6Zdou4cJwo/p7w5nmAH17GRfU/ui3ctvjXFErXXkruT4MWW6poDeXgCaIBlGLrfU6TbTXxyGMww==",
+      "dev": true,
+      "engines": {
+        "node": ">=14.0.0"
+      }
+    },
+    "node_modules/tinyspy": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/tinyspy/-/tinyspy-2.2.0.tgz",
+      "integrity": "sha512-d2eda04AN/cPOR89F7Xv5bK/jrQEhmcLFe6HFldoeO9AJtps+fqEnh486vnT/8y4bw38pSyxDcTCAq+Ks2aJTg==",
+      "dev": true,
+      "engines": {
+        "node": ">=14.0.0"
+      }
+    },
+    "node_modules/to-fast-properties": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-2.0.0.tgz",
+      "integrity": "sha512-/OaKK0xYrs3DmxRYqL/yDc+FxFUVYhDlXMhRmv3z915w2HF1tnN1omB354j8VUGO/hbRzyD6Y3sA7v7GS/ceog==",
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/to-no-case": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/to-no-case/-/to-no-case-1.0.2.tgz",
+      "integrity": "sha512-Z3g735FxuZY8rodxV4gH7LxClE4H0hTIyHNIHdk+vpQxjLm0cwnKXq/OFVZ76SOQmto7txVcwSCwkU5kqp+FKg==",
+      "dev": true
+    },
+    "node_modules/to-pascal-case": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/to-pascal-case/-/to-pascal-case-1.0.0.tgz",
+      "integrity": "sha512-QGMWHqM6xPrcQW57S23c5/3BbYb0Tbe9p+ur98ckRnGDwD4wbbtDiYI38CfmMKNB5Iv0REjs5SNDntTwvDxzZA==",
+      "dev": true,
+      "dependencies": {
+        "to-space-case": "^1.0.0"
+      }
+    },
+    "node_modules/to-regex-range": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz",
+      "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==",
+      "dev": true,
+      "dependencies": {
+        "is-number": "^7.0.0"
+      },
+      "engines": {
+        "node": ">=8.0"
+      }
+    },
+    "node_modules/to-space-case": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/to-space-case/-/to-space-case-1.0.0.tgz",
+      "integrity": "sha512-rLdvwXZ39VOn1IxGL3V6ZstoTbwLRckQmn/U8ZDLuWwIXNpuZDhQ3AiRUlhTbOXFVE9C+dR51wM0CBDhk31VcA==",
+      "dev": true,
+      "dependencies": {
+        "to-no-case": "^1.0.0"
+      }
+    },
+    "node_modules/toidentifier": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/toidentifier/-/toidentifier-1.0.1.tgz",
+      "integrity": "sha512-o5sSPKEkg/DIQNmH43V0/uerLrpzVedkUh8tGNvaeXpfpuwjKenlSox/2O/BTlZUtEe+JG7s5YhEz608PlAHRA==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.6"
+      }
+    },
+    "node_modules/triplesec": {
+      "version": "4.0.3",
+      "resolved": "https://registry.npmjs.org/triplesec/-/triplesec-4.0.3.tgz",
+      "integrity": "sha512-fug70e1nJoCMxsXQJlETisAALohm84vl++IiTTHEqM7Lgqwz62jrlwqOC/gJEAJjO/ByN127sEcioB56HW3wIw==",
+      "dependencies": {
+        "iced-error": ">=0.0.9",
+        "iced-lock": "^1.0.1",
+        "iced-runtime": "^1.0.2",
+        "more-entropy": ">=0.0.7",
+        "progress": "~1.1.2",
+        "uglify-js": "^3.1.9"
+      }
+    },
+    "node_modules/ts-loader": {
+      "version": "9.5.1",
+      "resolved": "https://registry.npmjs.org/ts-loader/-/ts-loader-9.5.1.tgz",
+      "integrity": "sha512-rNH3sK9kGZcH9dYzC7CewQm4NtxJTjSEVRJ2DyBZR7f8/wcta+iV44UPCXc5+nzDzivKtlzV6c9P4e+oFhDLYg==",
+      "dev": true,
+      "dependencies": {
+        "chalk": "^4.1.0",
+        "enhanced-resolve": "^5.0.0",
+        "micromatch": "^4.0.0",
+        "semver": "^7.3.4",
+        "source-map": "^0.7.4"
+      },
+      "engines": {
+        "node": ">=12.0.0"
+      },
+      "peerDependencies": {
+        "typescript": "*",
+        "webpack": "^5.0.0"
+      }
+    },
+    "node_modules/ts-loader/node_modules/ansi-styles": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+      "dev": true,
+      "dependencies": {
+        "color-convert": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
+      }
+    },
+    "node_modules/ts-loader/node_modules/chalk": {
+      "version": "4.1.2",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
+      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+      "dev": true,
+      "dependencies": {
+        "ansi-styles": "^4.1.0",
+        "supports-color": "^7.1.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/chalk?sponsor=1"
+      }
+    },
+    "node_modules/ts-loader/node_modules/color-convert": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+      "dev": true,
+      "dependencies": {
+        "color-name": "~1.1.4"
+      },
+      "engines": {
+        "node": ">=7.0.0"
+      }
+    },
+    "node_modules/ts-loader/node_modules/color-name": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+      "dev": true
+    },
+    "node_modules/ts-loader/node_modules/has-flag": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/ts-loader/node_modules/lru-cache": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
+      "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
+      "dev": true,
+      "dependencies": {
+        "yallist": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/ts-loader/node_modules/semver": {
+      "version": "7.5.4",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz",
+      "integrity": "sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==",
+      "dev": true,
+      "dependencies": {
+        "lru-cache": "^6.0.0"
+      },
+      "bin": {
+        "semver": "bin/semver.js"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/ts-loader/node_modules/supports-color": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+      "dev": true,
+      "dependencies": {
+        "has-flag": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/ts-loader/node_modules/yallist": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
+      "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==",
+      "dev": true
+    },
+    "node_modules/ts-transformer-keys": {
+      "version": "0.4.4",
+      "resolved": "https://registry.npmjs.org/ts-transformer-keys/-/ts-transformer-keys-0.4.4.tgz",
+      "integrity": "sha512-LrqgvaFvar01/5mbunRyeLTSIkqoC2xfcpL/90aDY6vR07DGyH+UaYGdIEsUudnlAw2Sr0pxFgdZvE0QIyI4qA==",
+      "peerDependencies": {
+        "typescript": ">=2.4.1"
+      }
+    },
+    "node_modules/tsc-files": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/tsc-files/-/tsc-files-1.1.4.tgz",
+      "integrity": "sha512-RePsRsOLru3BPpnf237y1Xe1oCGta8rmSYzM76kYo5tLGsv5R2r3s64yapYorGTPuuLyfS9NVbh9ydzmvNie2w==",
+      "dev": true,
+      "bin": {
+        "tsc-files": "cli.js"
+      },
+      "peerDependencies": {
+        "typescript": ">=3"
+      }
+    },
+    "node_modules/tsconfck": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/tsconfck/-/tsconfck-3.1.0.tgz",
+      "integrity": "sha512-CMjc5zMnyAjcS9sPLytrbFmj89st2g+JYtY/c02ug4Q+CZaAtCgbyviI0n1YvjZE/pzoc6FbNsINS13DOL1B9w==",
+      "dev": true,
+      "bin": {
+        "tsconfck": "bin/tsconfck.js"
+      },
+      "engines": {
+        "node": "^18 || >=20"
+      },
+      "peerDependencies": {
+        "typescript": "^5.0.0"
+      },
+      "peerDependenciesMeta": {
+        "typescript": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/tsconfig-paths": {
+      "version": "3.14.2",
+      "resolved": "https://registry.npmjs.org/tsconfig-paths/-/tsconfig-paths-3.14.2.tgz",
+      "integrity": "sha512-o/9iXgCYc5L/JxCHPe3Hvh8Q/2xm5Z+p18PESBU6Ff33695QnCHBEjcytY2q19ua7Mbl/DavtBOLq+oG0RCL+g==",
+      "dev": true,
+      "dependencies": {
+        "@types/json5": "^0.0.29",
+        "json5": "^1.0.2",
+        "minimist": "^1.2.6",
+        "strip-bom": "^3.0.0"
+      }
+    },
+    "node_modules/tsconfig-paths-webpack-plugin": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/tsconfig-paths-webpack-plugin/-/tsconfig-paths-webpack-plugin-4.1.0.tgz",
+      "integrity": "sha512-xWFISjviPydmtmgeUAuXp4N1fky+VCtfhOkDUFIv5ea7p4wuTomI4QTrXvFBX2S4jZsmyTSrStQl+E+4w+RzxA==",
+      "dev": true,
+      "dependencies": {
+        "chalk": "^4.1.0",
+        "enhanced-resolve": "^5.7.0",
+        "tsconfig-paths": "^4.1.2"
+      },
+      "engines": {
+        "node": ">=10.13.0"
+      }
+    },
+    "node_modules/tsconfig-paths-webpack-plugin/node_modules/ansi-styles": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+      "dev": true,
+      "dependencies": {
+        "color-convert": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
+      }
+    },
+    "node_modules/tsconfig-paths-webpack-plugin/node_modules/chalk": {
+      "version": "4.1.2",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
+      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+      "dev": true,
+      "dependencies": {
+        "ansi-styles": "^4.1.0",
+        "supports-color": "^7.1.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/chalk?sponsor=1"
+      }
+    },
+    "node_modules/tsconfig-paths-webpack-plugin/node_modules/color-convert": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+      "dev": true,
+      "dependencies": {
+        "color-name": "~1.1.4"
+      },
+      "engines": {
+        "node": ">=7.0.0"
+      }
+    },
+    "node_modules/tsconfig-paths-webpack-plugin/node_modules/color-name": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+      "dev": true
+    },
+    "node_modules/tsconfig-paths-webpack-plugin/node_modules/has-flag": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/tsconfig-paths-webpack-plugin/node_modules/supports-color": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+      "dev": true,
+      "dependencies": {
+        "has-flag": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/tsconfig-paths-webpack-plugin/node_modules/tsconfig-paths": {
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/tsconfig-paths/-/tsconfig-paths-4.2.0.tgz",
+      "integrity": "sha512-NoZ4roiN7LnbKn9QqE1amc9DJfzvZXxF4xDavcOWt1BPkdx+m+0gJuPM+S0vCe7zTJMYUP0R8pO2XMr+Y8oLIg==",
+      "dev": true,
+      "dependencies": {
+        "json5": "^2.2.2",
+        "minimist": "^1.2.6",
+        "strip-bom": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/tsconfig-paths/node_modules/json5": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/json5/-/json5-1.0.2.tgz",
+      "integrity": "sha512-g1MWMLBiz8FKi1e4w0UyVL3w+iJceWAFBAaBnnGKOpNa5f8TLktkbre1+s6oICydWAm+HRUGTmI+//xv2hvXYA==",
+      "dev": true,
+      "dependencies": {
+        "minimist": "^1.2.0"
+      },
+      "bin": {
+        "json5": "lib/cli.js"
+      }
+    },
+    "node_modules/tslib": {
+      "version": "2.6.1",
+      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.1.tgz",
+      "integrity": "sha512-t0hLfiEKfMUoqhG+U1oid7Pva4bbDPHYfJNiB7BiIjRkj1pyC++4N3huJfqY6aRH6VTB0rvtzQwjM4K6qpfOig=="
+    },
+    "node_modules/tsutils": {
+      "version": "3.21.0",
+      "resolved": "https://registry.npmjs.org/tsutils/-/tsutils-3.21.0.tgz",
+      "integrity": "sha512-mHKK3iUXL+3UF6xL5k0PEhKRUBKPBCv/+RkEOpjRWxxx27KKRBmmA60A9pgOUvMi8GKhRMPEmjBRPzs2W7O1OA==",
+      "dev": true,
+      "dependencies": {
+        "tslib": "^1.8.1"
+      },
+      "engines": {
+        "node": ">= 6"
+      },
+      "peerDependencies": {
+        "typescript": ">=2.8.0 || >= 3.2.0-dev || >= 3.3.0-dev || >= 3.4.0-dev || >= 3.5.0-dev || >= 3.6.0-dev || >= 3.6.0-beta || >= 3.7.0-dev || >= 3.7.0-beta"
+      }
+    },
+    "node_modules/tsutils/node_modules/tslib": {
+      "version": "1.14.1",
+      "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz",
+      "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==",
+      "dev": true
+    },
+    "node_modules/type-check": {
+      "version": "0.4.0",
+      "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.4.0.tgz",
+      "integrity": "sha512-XleUoc9uwGXqjWwXaUTZAmzMcFZ5858QA2vvx1Ur5xIcixXIP+8LnFDgRplU30us6teqdlskFfu+ae4K79Ooew==",
+      "dev": true,
+      "dependencies": {
+        "prelude-ls": "^1.2.1"
+      },
+      "engines": {
+        "node": ">= 0.8.0"
+      }
+    },
+    "node_modules/type-detect": {
+      "version": "4.0.8",
+      "resolved": "https://registry.npmjs.org/type-detect/-/type-detect-4.0.8.tgz",
+      "integrity": "sha512-0fr/mIH1dlO+x7TlcMy+bIDqKPsw/70tVyeHW787goQjhmqaZe10uwLujubK9q9Lg6Fiho1KUKDYz0Z7k7g5/g==",
+      "dev": true,
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/type-fest": {
+      "version": "2.19.0",
+      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-2.19.0.tgz",
+      "integrity": "sha512-RAH822pAdBgcNMAfWnCBU3CFZcfZ/i1eZjwFU/dsLKumyuuP3niueg2UAukXYF0E2AAoc82ZSSf9J0WQBinzHA==",
+      "dev": true,
+      "engines": {
+        "node": ">=12.20"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/type-is": {
+      "version": "1.6.18",
+      "resolved": "https://registry.npmjs.org/type-is/-/type-is-1.6.18.tgz",
+      "integrity": "sha512-TkRKr9sUTxEH8MdfuCSP7VizJyzRNMjj2J2do2Jr3Kym598JVdEksuzPQCnlFPW4ky9Q+iA+ma9BGm06XQBy8g==",
+      "dev": true,
+      "dependencies": {
+        "media-typer": "0.3.0",
+        "mime-types": "~2.1.24"
+      },
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
+    "node_modules/typed-array-buffer": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/typed-array-buffer/-/typed-array-buffer-1.0.0.tgz",
+      "integrity": "sha512-Y8KTSIglk9OZEr8zywiIHG/kmQ7KWyjseXs1CbSo8vC42w7hg2HgYTxSWwP0+is7bWDc1H+Fo026CpHFwm8tkw==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.2",
+        "get-intrinsic": "^1.2.1",
+        "is-typed-array": "^1.1.10"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
+    "node_modules/typed-array-byte-length": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/typed-array-byte-length/-/typed-array-byte-length-1.0.0.tgz",
+      "integrity": "sha512-Or/+kvLxNpeQ9DtSydonMxCx+9ZXOswtwJn17SNLvhptaXYDJvkFFP5zbfU/uLmvnBJlI4yrnXRxpdWH/M5tNA==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.2",
+        "for-each": "^0.3.3",
+        "has-proto": "^1.0.1",
+        "is-typed-array": "^1.1.10"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/typed-array-byte-offset": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/typed-array-byte-offset/-/typed-array-byte-offset-1.0.0.tgz",
+      "integrity": "sha512-RD97prjEt9EL8YgAgpOkf3O4IF9lhJFr9g0htQkm0rchFp/Vx7LW5Q8fSXXub7BXAODyUQohRMyOc3faCPd0hg==",
+      "dev": true,
+      "dependencies": {
+        "available-typed-arrays": "^1.0.5",
+        "call-bind": "^1.0.2",
+        "for-each": "^0.3.3",
+        "has-proto": "^1.0.1",
+        "is-typed-array": "^1.1.10"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/typed-array-length": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/typed-array-length/-/typed-array-length-1.0.4.tgz",
+      "integrity": "sha512-KjZypGq+I/H7HI5HlOoGHkWUUGq+Q0TPhQurLbyrVrvnKTBgzLhIJ7j6J/XTQOi0d1RjyZ0wdas8bKs2p0x3Ng==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.2",
+        "for-each": "^0.3.3",
+        "is-typed-array": "^1.1.9"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/typeforce": {
+      "version": "1.18.0",
+      "resolved": "https://registry.npmjs.org/typeforce/-/typeforce-1.18.0.tgz",
+      "integrity": "sha512-7uc1O8h1M1g0rArakJdf0uLRSSgFcYexrVoKo+bzJd32gd4gDy2L/Z+8/FjPnU9ydY3pEnVPtr9FyscYY60K1g=="
+    },
+    "node_modules/typescript": {
+      "version": "5.5.4",
+      "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.5.4.tgz",
+      "integrity": "sha512-Mtq29sKDAEYP7aljRgtPOpTvOfbwRWlS6dPRzwjdE+C0R4brX/GUyhHSecbHMFLNBLcJIPt9nl9yG5TZ1weH+Q==",
+      "license": "Apache-2.0",
+      "bin": {
+        "tsc": "bin/tsc",
+        "tsserver": "bin/tsserver"
+      },
+      "engines": {
+        "node": ">=14.17"
+      }
+    },
+    "node_modules/typescript-plugin-styled-components": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/typescript-plugin-styled-components/-/typescript-plugin-styled-components-3.0.0.tgz",
+      "integrity": "sha512-QWlhTl6NqsFxtJyxn7pJjm3RhgzXSByUftZ3AoQClrMMpa4yAaHuJKTN1gFpH3Ti+Rwm56fNUfG9pXSBU+WW3A==",
+      "dev": true,
+      "peerDependencies": {
+        "typescript": "~4.8 || 5"
+      }
+    },
+    "node_modules/ufo": {
+      "version": "1.3.2",
+      "resolved": "https://registry.npmjs.org/ufo/-/ufo-1.3.2.tgz",
+      "integrity": "sha512-o+ORpgGwaYQXgqGDwd+hkS4PuZ3QnmqMMxRuajK/a38L6fTpcE5GPIfrf+L/KemFzfUpeUQc1rRS1iDBozvnFA==",
+      "dev": true
+    },
+    "node_modules/uglify-js": {
+      "version": "3.19.1",
+      "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.19.1.tgz",
+      "integrity": "sha512-y/2wiW+ceTYR2TSSptAhfnEtpLaQ4Ups5zrjB2d3kuVxHj16j/QJwPl5PvuGy9uARb39J0+iKxcRPvtpsx4A4A==",
+      "bin": {
+        "uglifyjs": "bin/uglifyjs"
+      },
+      "engines": {
+        "node": ">=0.8.0"
+      }
+    },
+    "node_modules/unbox-primitive": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/unbox-primitive/-/unbox-primitive-1.0.2.tgz",
+      "integrity": "sha512-61pPlCD9h51VoreyJ0BReideM3MDKMKnh6+V9L08331ipq6Q8OFXZYiqP6n/tbHx4s5I9uRhcye6BrbkizkBDw==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.2",
+        "has-bigints": "^1.0.2",
+        "has-symbols": "^1.0.3",
+        "which-boxed-primitive": "^1.0.2"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/undici-types": {
+      "version": "5.26.5",
+      "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-5.26.5.tgz",
+      "integrity": "sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA=="
+    },
+    "node_modules/unescape-js": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/unescape-js/-/unescape-js-1.1.4.tgz",
+      "integrity": "sha512-42SD8NOQEhdYntEiUQdYq/1V/YHwr1HLwlHuTJB5InVVdOSbgI6xu8jK5q65yIzuFCfczzyDF/7hbGzVbyCw0g==",
+      "dev": true,
+      "dependencies": {
+        "string.fromcodepoint": "^0.2.1"
+      }
+    },
+    "node_modules/universalify": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.1.tgz",
+      "integrity": "sha512-gptHNQghINnc/vTGIk0SOFGFNXw7JVrlRUtConJRlvaw6DuX0wO5Jeko9sWrMBhh+PsYAZ7oXAiOnf/UKogyiw==",
+      "dev": true,
+      "engines": {
+        "node": ">= 10.0.0"
+      }
+    },
+    "node_modules/unload": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/unload/-/unload-2.2.0.tgz",
+      "integrity": "sha512-B60uB5TNBLtN6/LsgAf3udH9saB5p7gqJwcFfbOEZ8BcBHnGwCf6G/TGiEqkRAxX7zAFIUtzdrXQSdL3Q/wqNA==",
+      "dependencies": {
+        "@babel/runtime": "^7.6.2",
+        "detect-node": "^2.0.4"
+      }
+    },
+    "node_modules/unpipe": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/unpipe/-/unpipe-1.0.0.tgz",
+      "integrity": "sha512-pjy2bYhSsufwWlKwPc+l3cN7+wuJlK6uz0YdJEOlQDbl6jo/YlPi4mb8agUkVC8BF7V8NuzeyPNqRksA3hztKQ==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.8"
+      }
+    },
+    "node_modules/update-browserslist-db": {
+      "version": "1.0.13",
+      "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.0.13.tgz",
+      "integrity": "sha512-xebP81SNcPuNpPP3uzeW1NYXxI3rxyJzF3pD6sH4jE7o/IX+WtSpwnVU+qIsDPyk0d3hmFQ7mjqc6AtV604hbg==",
+      "funding": [
+        {
+          "type": "opencollective",
+          "url": "https://opencollective.com/browserslist"
+        },
+        {
+          "type": "tidelift",
+          "url": "https://tidelift.com/funding/github/npm/browserslist"
+        },
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/ai"
+        }
+      ],
+      "dependencies": {
+        "escalade": "^3.1.1",
+        "picocolors": "^1.0.0"
+      },
+      "bin": {
+        "update-browserslist-db": "cli.js"
+      },
+      "peerDependencies": {
+        "browserslist": ">= 4.21.0"
+      }
+    },
+    "node_modules/uri-js": {
+      "version": "4.4.1",
+      "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.4.1.tgz",
+      "integrity": "sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==",
+      "dev": true,
+      "dependencies": {
+        "punycode": "^2.1.0"
+      }
+    },
+    "node_modules/use-sync-external-store": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/use-sync-external-store/-/use-sync-external-store-1.2.0.tgz",
+      "integrity": "sha512-eEgnFxGQ1Ife9bzYs6VLi8/4X6CObHMw9Qr9tPY43iKwsPw8xE8+EFsf/2cFZ5S3esXgpWgtSCtLNS41F+sKPA==",
+      "peerDependencies": {
+        "react": "^16.8.0 || ^17.0.0 || ^18.0.0"
+      }
+    },
+    "node_modules/util": {
+      "version": "0.12.5",
+      "resolved": "https://registry.npmjs.org/util/-/util-0.12.5.tgz",
+      "integrity": "sha512-kZf/K6hEIrWHI6XqOFUiiMa+79wE/D8Q+NCNAWclkyg3b4d2k7s0QGepNjiABc+aR3N1PAyHL7p6UcLY6LmrnA==",
+      "dependencies": {
+        "inherits": "^2.0.3",
+        "is-arguments": "^1.0.4",
+        "is-generator-function": "^1.0.7",
+        "is-typed-array": "^1.1.3",
+        "which-typed-array": "^1.1.2"
+      }
+    },
+    "node_modules/util-deprecate": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
+      "integrity": "sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw=="
+    },
+    "node_modules/utila": {
+      "version": "0.4.0",
+      "resolved": "https://registry.npmjs.org/utila/-/utila-0.4.0.tgz",
+      "integrity": "sha512-Z0DbgELS9/L/75wZbro8xAnT50pBVFQZ+hUEueGDU5FN51YSCYM+jdxsfCiHjwNP/4LCDD0i/graKpeBnOXKRA==",
+      "dev": true
+    },
+    "node_modules/utils-merge": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.1.tgz",
+      "integrity": "sha512-pMZTvIkT1d+TFGvDOqodOclx0QWkkgi6Tdoa8gC8ffGAAqz9pzPTZWAybbsHHoED/ztMtkv/VoYTYyShUn81hA==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.4.0"
+      }
+    },
+    "node_modules/uuid": {
+      "version": "8.3.2",
+      "resolved": "https://registry.npmjs.org/uuid/-/uuid-8.3.2.tgz",
+      "integrity": "sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==",
+      "bin": {
+        "uuid": "dist/bin/uuid"
+      }
+    },
+    "node_modules/uuidv4": {
+      "version": "6.2.13",
+      "resolved": "https://registry.npmjs.org/uuidv4/-/uuidv4-6.2.13.tgz",
+      "integrity": "sha512-AXyzMjazYB3ovL3q051VLH06Ixj//Knx7QnUSi1T//Ie3io6CpsPu9nVMOx5MoLWh6xV0B9J0hIaxungxXUbPQ==",
+      "dependencies": {
+        "@types/uuid": "8.3.4",
+        "uuid": "8.3.2"
+      }
+    },
+    "node_modules/valibot": {
+      "version": "0.33.2",
+      "resolved": "https://registry.npmjs.org/valibot/-/valibot-0.33.2.tgz",
+      "integrity": "sha512-ZpFWuI+bs5+PP66q4zVFn4e4t/s5jmMw5iPBZmGUoi8iQqXyU9YY/BLCAyk62Z/bNS8qdUNBEyx52952qdqW3w=="
+    },
+    "node_modules/valid-url": {
+      "version": "1.0.9",
+      "resolved": "https://registry.npmjs.org/valid-url/-/valid-url-1.0.9.tgz",
+      "integrity": "sha512-QQDsV8OnSf5Uc30CKSwG9lnhMPe6exHtTXLRYX8uMwKENy640pU+2BgBL0LRbDh/eYRahNCS7aewCx0wf3NYVA=="
+    },
+    "node_modules/varuint-bitcoin": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/varuint-bitcoin/-/varuint-bitcoin-1.1.2.tgz",
+      "integrity": "sha512-4EVb+w4rx+YfVM32HQX42AbbT7/1f5zwAYhIujKXKk8NQK+JfRVl3pqT3hjNn/L+RstigmGGKVwHA/P0wgITZw==",
+      "dependencies": {
+        "safe-buffer": "^5.1.1"
+      }
+    },
+    "node_modules/vary": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/vary/-/vary-1.1.2.tgz",
+      "integrity": "sha512-BNGbWLfd0eUPabhkXUVm0j8uuvREyTh5ovRa/dyow/BqAbZJyC+5fU+IzQOzmAKzYqYRAISoRhdQr3eIZ/PXqg==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.8"
+      }
+    },
+    "node_modules/vite": {
+      "version": "5.3.2",
+      "resolved": "https://registry.npmjs.org/vite/-/vite-5.3.2.tgz",
+      "integrity": "sha512-6lA7OBHBlXUxiJxbO5aAY2fsHHzDr1q7DvXYnyZycRs2Dz+dXBWuhpWHvmljTRTpQC2uvGmUFFkSHF2vGo90MA==",
+      "dev": true,
+      "dependencies": {
+        "esbuild": "^0.21.3",
+        "postcss": "^8.4.38",
+        "rollup": "^4.13.0"
+      },
+      "bin": {
+        "vite": "bin/vite.js"
+      },
+      "engines": {
+        "node": "^18.0.0 || >=20.0.0"
+      },
+      "funding": {
+        "url": "https://github.com/vitejs/vite?sponsor=1"
+      },
+      "optionalDependencies": {
+        "fsevents": "~2.3.3"
+      },
+      "peerDependencies": {
+        "@types/node": "^18.0.0 || >=20.0.0",
+        "less": "*",
+        "lightningcss": "^1.21.0",
+        "sass": "*",
+        "stylus": "*",
+        "sugarss": "*",
+        "terser": "^5.4.0"
+      },
+      "peerDependenciesMeta": {
+        "@types/node": {
+          "optional": true
+        },
+        "less": {
+          "optional": true
+        },
+        "lightningcss": {
+          "optional": true
+        },
+        "sass": {
+          "optional": true
+        },
+        "stylus": {
+          "optional": true
+        },
+        "sugarss": {
+          "optional": true
+        },
+        "terser": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/vite-node": {
+      "version": "0.34.6",
+      "resolved": "https://registry.npmjs.org/vite-node/-/vite-node-0.34.6.tgz",
+      "integrity": "sha512-nlBMJ9x6n7/Amaz6F3zJ97EBwR2FkzhBRxF5e+jE6LA3yi6Wtc2lyTij1OnDMIr34v5g/tVQtsVAzhT0jc5ygA==",
+      "dev": true,
+      "dependencies": {
+        "cac": "^6.7.14",
+        "debug": "^4.3.4",
+        "mlly": "^1.4.0",
+        "pathe": "^1.1.1",
+        "picocolors": "^1.0.0",
+        "vite": "^3.0.0 || ^4.0.0 || ^5.0.0-0"
+      },
+      "bin": {
+        "vite-node": "vite-node.mjs"
+      },
+      "engines": {
+        "node": ">=v14.18.0"
+      },
+      "funding": {
+        "url": "https://opencollective.com/vitest"
+      }
+    },
+    "node_modules/vite-tsconfig-paths": {
+      "version": "4.3.2",
+      "resolved": "https://registry.npmjs.org/vite-tsconfig-paths/-/vite-tsconfig-paths-4.3.2.tgz",
+      "integrity": "sha512-0Vd/a6po6Q+86rPlntHye7F31zA2URZMbH8M3saAZ/xR9QoGN/L21bxEGfXdWmFdNkqPpRdxFT7nmNe12e9/uA==",
+      "dev": true,
+      "dependencies": {
+        "debug": "^4.1.1",
+        "globrex": "^0.1.2",
+        "tsconfck": "^3.0.3"
+      },
+      "peerDependencies": {
+        "vite": "*"
+      },
+      "peerDependenciesMeta": {
+        "vite": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/vitest": {
+      "version": "0.34.6",
+      "resolved": "https://registry.npmjs.org/vitest/-/vitest-0.34.6.tgz",
+      "integrity": "sha512-+5CALsOvbNKnS+ZHMXtuUC7nL8/7F1F2DnHGjSsszX8zCjWSSviphCb/NuS9Nzf4Q03KyyDRBAXhF/8lffME4Q==",
+      "dev": true,
+      "dependencies": {
+        "@types/chai": "^4.3.5",
+        "@types/chai-subset": "^1.3.3",
+        "@types/node": "*",
+        "@vitest/expect": "0.34.6",
+        "@vitest/runner": "0.34.6",
+        "@vitest/snapshot": "0.34.6",
+        "@vitest/spy": "0.34.6",
+        "@vitest/utils": "0.34.6",
+        "acorn": "^8.9.0",
+        "acorn-walk": "^8.2.0",
+        "cac": "^6.7.14",
+        "chai": "^4.3.10",
+        "debug": "^4.3.4",
+        "local-pkg": "^0.4.3",
+        "magic-string": "^0.30.1",
+        "pathe": "^1.1.1",
+        "picocolors": "^1.0.0",
+        "std-env": "^3.3.3",
+        "strip-literal": "^1.0.1",
+        "tinybench": "^2.5.0",
+        "tinypool": "^0.7.0",
+        "vite": "^3.1.0 || ^4.0.0 || ^5.0.0-0",
+        "vite-node": "0.34.6",
+        "why-is-node-running": "^2.2.2"
+      },
+      "bin": {
+        "vitest": "vitest.mjs"
+      },
+      "engines": {
+        "node": ">=v14.18.0"
+      },
+      "funding": {
+        "url": "https://opencollective.com/vitest"
+      },
+      "peerDependencies": {
+        "@edge-runtime/vm": "*",
+        "@vitest/browser": "*",
+        "@vitest/ui": "*",
+        "happy-dom": "*",
+        "jsdom": "*",
+        "playwright": "*",
+        "safaridriver": "*",
+        "webdriverio": "*"
+      },
+      "peerDependenciesMeta": {
+        "@edge-runtime/vm": {
+          "optional": true
+        },
+        "@vitest/browser": {
+          "optional": true
+        },
+        "@vitest/ui": {
+          "optional": true
+        },
+        "happy-dom": {
+          "optional": true
+        },
+        "jsdom": {
+          "optional": true
+        },
+        "playwright": {
+          "optional": true
+        },
+        "safaridriver": {
+          "optional": true
+        },
+        "webdriverio": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/vlq": {
+      "version": "0.2.3",
+      "resolved": "https://registry.npmjs.org/vlq/-/vlq-0.2.3.tgz",
+      "integrity": "sha512-DRibZL6DsNhIgYQ+wNdWDL2SL3bKPlVrRiBqV5yuMm++op8W4kGFtaQfCs4KEJn0wBZcHVHJ3eoywX8983k1ow==",
+      "dev": true
+    },
+    "node_modules/void-elements": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/void-elements/-/void-elements-3.1.0.tgz",
+      "integrity": "sha512-Dhxzh5HZuiHQhbvTW9AMetFfBHDMYpo23Uo9btPXgdYP+3T5S+p+jgNy7spra+veYhBP2dCSgxR/i2Y02h5/6w==",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/warning": {
+      "version": "4.0.3",
+      "resolved": "https://registry.npmjs.org/warning/-/warning-4.0.3.tgz",
+      "integrity": "sha512-rpJyN222KWIvHJ/F53XSZv0Zl/accqHR8et1kpaMTD/fLCRxtV8iX8czMzY7sVZupTI3zcUTg8eycS2kNF9l6w==",
+      "dependencies": {
+        "loose-envify": "^1.0.0"
+      }
+    },
+    "node_modules/watchpack": {
+      "version": "2.4.0",
+      "resolved": "https://registry.npmjs.org/watchpack/-/watchpack-2.4.0.tgz",
+      "integrity": "sha512-Lcvm7MGST/4fup+ifyKi2hjyIAwcdI4HRgtvTpIUxBRhB+RFtUh8XtDOxUfctVCnhVi+QQj49i91OyvzkJl6cg==",
+      "dev": true,
+      "dependencies": {
+        "glob-to-regexp": "^0.4.1",
+        "graceful-fs": "^4.1.2"
+      },
+      "engines": {
+        "node": ">=10.13.0"
+      }
+    },
+    "node_modules/wbuf": {
+      "version": "1.7.3",
+      "resolved": "https://registry.npmjs.org/wbuf/-/wbuf-1.7.3.tgz",
+      "integrity": "sha512-O84QOnr0icsbFGLS0O3bI5FswxzRr8/gHwWkDlQFskhSPryQXvrTMxjxGP4+iWYoauLoBvfDpkrOauZ+0iZpDA==",
+      "dev": true,
+      "dependencies": {
+        "minimalistic-assert": "^1.0.0"
+      }
+    },
+    "node_modules/wcwidth": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/wcwidth/-/wcwidth-1.0.1.tgz",
+      "integrity": "sha512-XHPEwS0q6TaxcvG85+8EYkbiCux2XtWG2mkc47Ng2A77BQu9+DqIOJldST4HgPkuea7dvKSj5VgX3P1d4rW8Tg==",
+      "dev": true,
+      "optional": true,
+      "dependencies": {
+        "defaults": "^1.0.3"
+      }
+    },
+    "node_modules/webextension-polyfill": {
+      "version": "0.10.0",
+      "resolved": "https://registry.npmjs.org/webextension-polyfill/-/webextension-polyfill-0.10.0.tgz",
+      "integrity": "sha512-c5s35LgVa5tFaHhrZDnr3FpQpjj1BB+RXhLTYUxGqBVN460HkbM8TBtEqdXWbpTKfzwCcjAZVF7zXCYSKtcp9g=="
+    },
+    "node_modules/webpack": {
+      "version": "5.89.0",
+      "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.89.0.tgz",
+      "integrity": "sha512-qyfIC10pOr70V+jkmud8tMfajraGCZMBWJtrmuBymQKCrLTRejBI8STDp1MCyZu/QTdZSeacCQYpYNQVOzX5kw==",
+      "dev": true,
+      "dependencies": {
+        "@types/eslint-scope": "^3.7.3",
+        "@types/estree": "^1.0.0",
+        "@webassemblyjs/ast": "^1.11.5",
+        "@webassemblyjs/wasm-edit": "^1.11.5",
+        "@webassemblyjs/wasm-parser": "^1.11.5",
+        "acorn": "^8.7.1",
+        "acorn-import-assertions": "^1.9.0",
+        "browserslist": "^4.14.5",
+        "chrome-trace-event": "^1.0.2",
+        "enhanced-resolve": "^5.15.0",
+        "es-module-lexer": "^1.2.1",
+        "eslint-scope": "5.1.1",
+        "events": "^3.2.0",
+        "glob-to-regexp": "^0.4.1",
+        "graceful-fs": "^4.2.9",
+        "json-parse-even-better-errors": "^2.3.1",
+        "loader-runner": "^4.2.0",
+        "mime-types": "^2.1.27",
+        "neo-async": "^2.6.2",
+        "schema-utils": "^3.2.0",
+        "tapable": "^2.1.1",
+        "terser-webpack-plugin": "^5.3.7",
+        "watchpack": "^2.4.0",
+        "webpack-sources": "^3.2.3"
+      },
+      "bin": {
+        "webpack": "bin/webpack.js"
+      },
+      "engines": {
+        "node": ">=10.13.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/webpack"
+      },
+      "peerDependenciesMeta": {
+        "webpack-cli": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/webpack-dev-middleware": {
+      "version": "5.3.3",
+      "resolved": "https://registry.npmjs.org/webpack-dev-middleware/-/webpack-dev-middleware-5.3.3.tgz",
+      "integrity": "sha512-hj5CYrY0bZLB+eTO+x/j67Pkrquiy7kWepMHmUMoPsmcUaeEnQJqFzHJOyxgWlq746/wUuA64p9ta34Kyb01pA==",
+      "dev": true,
+      "dependencies": {
+        "colorette": "^2.0.10",
+        "memfs": "^3.4.3",
+        "mime-types": "^2.1.31",
+        "range-parser": "^1.2.1",
+        "schema-utils": "^4.0.0"
+      },
+      "engines": {
+        "node": ">= 12.13.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/webpack"
+      },
+      "peerDependencies": {
+        "webpack": "^4.0.0 || ^5.0.0"
+      }
+    },
+    "node_modules/webpack-dev-middleware/node_modules/ajv": {
+      "version": "8.12.0",
+      "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.12.0.tgz",
+      "integrity": "sha512-sRu1kpcO9yLtYxBKvqfTeh9KzZEwO3STyX1HT+4CaDzC6HpTGYhIhPIzj9XuKU7KYDwnaeh5hcOwjy1QuJzBPA==",
+      "dev": true,
+      "dependencies": {
+        "fast-deep-equal": "^3.1.1",
+        "json-schema-traverse": "^1.0.0",
+        "require-from-string": "^2.0.2",
+        "uri-js": "^4.2.2"
+      },
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/epoberezkin"
+      }
+    },
+    "node_modules/webpack-dev-middleware/node_modules/ajv-keywords": {
+      "version": "5.1.0",
+      "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-5.1.0.tgz",
+      "integrity": "sha512-YCS/JNFAUyr5vAuhk1DWm1CBxRHW9LbJ2ozWeemrIqpbsqKjHVxYPyi5GC0rjZIT5JxJ3virVTS8wk4i/Z+krw==",
+      "dev": true,
+      "dependencies": {
+        "fast-deep-equal": "^3.1.3"
+      },
+      "peerDependencies": {
+        "ajv": "^8.8.2"
+      }
+    },
+    "node_modules/webpack-dev-middleware/node_modules/json-schema-traverse": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz",
+      "integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==",
+      "dev": true
+    },
+    "node_modules/webpack-dev-middleware/node_modules/schema-utils": {
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-4.2.0.tgz",
+      "integrity": "sha512-L0jRsrPpjdckP3oPug3/VxNKt2trR8TcabrM6FOAAlvC/9Phcmm+cuAgTlxBqdBR1WJx7Naj9WHw+aOmheSVbw==",
+      "dev": true,
+      "dependencies": {
+        "@types/json-schema": "^7.0.9",
+        "ajv": "^8.9.0",
+        "ajv-formats": "^2.1.1",
+        "ajv-keywords": "^5.1.0"
+      },
+      "engines": {
+        "node": ">= 12.13.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/webpack"
+      }
+    },
+    "node_modules/webpack-dev-server": {
+      "version": "4.15.1",
+      "resolved": "https://registry.npmjs.org/webpack-dev-server/-/webpack-dev-server-4.15.1.tgz",
+      "integrity": "sha512-5hbAst3h3C3L8w6W4P96L5vaV0PxSmJhxZvWKYIdgxOQm8pNZ5dEOmmSLBVpP85ReeyRt6AS1QJNyo/oFFPeVA==",
+      "dev": true,
+      "dependencies": {
+        "@types/bonjour": "^3.5.9",
+        "@types/connect-history-api-fallback": "^1.3.5",
+        "@types/express": "^4.17.13",
+        "@types/serve-index": "^1.9.1",
+        "@types/serve-static": "^1.13.10",
+        "@types/sockjs": "^0.3.33",
+        "@types/ws": "^8.5.5",
+        "ansi-html-community": "^0.0.8",
+        "bonjour-service": "^1.0.11",
+        "chokidar": "^3.5.3",
+        "colorette": "^2.0.10",
+        "compression": "^1.7.4",
+        "connect-history-api-fallback": "^2.0.0",
+        "default-gateway": "^6.0.3",
+        "express": "^4.17.3",
+        "graceful-fs": "^4.2.6",
+        "html-entities": "^2.3.2",
+        "http-proxy-middleware": "^2.0.3",
+        "ipaddr.js": "^2.0.1",
+        "launch-editor": "^2.6.0",
+        "open": "^8.0.9",
+        "p-retry": "^4.5.0",
+        "rimraf": "^3.0.2",
+        "schema-utils": "^4.0.0",
+        "selfsigned": "^2.1.1",
+        "serve-index": "^1.9.1",
+        "sockjs": "^0.3.24",
+        "spdy": "^4.0.2",
+        "webpack-dev-middleware": "^5.3.1",
+        "ws": "^8.13.0"
+      },
+      "bin": {
+        "webpack-dev-server": "bin/webpack-dev-server.js"
+      },
+      "engines": {
+        "node": ">= 12.13.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/webpack"
+      },
+      "peerDependencies": {
+        "webpack": "^4.37.0 || ^5.0.0"
+      },
+      "peerDependenciesMeta": {
+        "webpack": {
+          "optional": true
+        },
+        "webpack-cli": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/webpack-dev-server/node_modules/ajv": {
+      "version": "8.12.0",
+      "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.12.0.tgz",
+      "integrity": "sha512-sRu1kpcO9yLtYxBKvqfTeh9KzZEwO3STyX1HT+4CaDzC6HpTGYhIhPIzj9XuKU7KYDwnaeh5hcOwjy1QuJzBPA==",
+      "dev": true,
+      "dependencies": {
+        "fast-deep-equal": "^3.1.1",
+        "json-schema-traverse": "^1.0.0",
+        "require-from-string": "^2.0.2",
+        "uri-js": "^4.2.2"
+      },
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/epoberezkin"
+      }
+    },
+    "node_modules/webpack-dev-server/node_modules/ajv-keywords": {
+      "version": "5.1.0",
+      "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-5.1.0.tgz",
+      "integrity": "sha512-YCS/JNFAUyr5vAuhk1DWm1CBxRHW9LbJ2ozWeemrIqpbsqKjHVxYPyi5GC0rjZIT5JxJ3virVTS8wk4i/Z+krw==",
+      "dev": true,
+      "dependencies": {
+        "fast-deep-equal": "^3.1.3"
+      },
+      "peerDependencies": {
+        "ajv": "^8.8.2"
+      }
+    },
+    "node_modules/webpack-dev-server/node_modules/json-schema-traverse": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz",
+      "integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==",
+      "dev": true
+    },
+    "node_modules/webpack-dev-server/node_modules/schema-utils": {
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-4.2.0.tgz",
+      "integrity": "sha512-L0jRsrPpjdckP3oPug3/VxNKt2trR8TcabrM6FOAAlvC/9Phcmm+cuAgTlxBqdBR1WJx7Naj9WHw+aOmheSVbw==",
+      "dev": true,
+      "dependencies": {
+        "@types/json-schema": "^7.0.9",
+        "ajv": "^8.9.0",
+        "ajv-formats": "^2.1.1",
+        "ajv-keywords": "^5.1.0"
+      },
+      "engines": {
+        "node": ">= 12.13.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/webpack"
+      }
+    },
+    "node_modules/webpack-dev-server/node_modules/ws": {
+      "version": "8.13.0",
+      "resolved": "https://registry.npmjs.org/ws/-/ws-8.13.0.tgz",
+      "integrity": "sha512-x9vcZYTrFPC7aSIbj7sRCYo7L/Xb8Iy+pW0ng0wt2vCJv7M9HOMy0UoN3rr+IFC7hb7vXoqS+P9ktyLLLhO+LA==",
+      "dev": true,
+      "engines": {
+        "node": ">=10.0.0"
+      },
+      "peerDependencies": {
+        "bufferutil": "^4.0.1",
+        "utf-8-validate": ">=5.0.2"
+      },
+      "peerDependenciesMeta": {
+        "bufferutil": {
+          "optional": true
+        },
+        "utf-8-validate": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/webpack-sources": {
+      "version": "3.2.3",
+      "resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-3.2.3.tgz",
+      "integrity": "sha512-/DyMEOrDgLKKIG0fmvtz+4dUX/3Ghozwgm6iPp8KRhvn+eQf9+Q7GWxVNMk3+uCPWfdXYC4ExGBckIXdFEfH1w==",
+      "dev": true,
+      "engines": {
+        "node": ">=10.13.0"
+      }
+    },
+    "node_modules/websocket-driver": {
+      "version": "0.7.4",
+      "resolved": "https://registry.npmjs.org/websocket-driver/-/websocket-driver-0.7.4.tgz",
+      "integrity": "sha512-b17KeDIQVjvb0ssuSDF2cYXSg2iztliJ4B9WdsuB6J952qCPKmnVq4DyW5motImXHDC1cBT/1UezrJVsKw5zjg==",
+      "dev": true,
+      "dependencies": {
+        "http-parser-js": ">=0.5.1",
+        "safe-buffer": ">=5.1.0",
+        "websocket-extensions": ">=0.1.1"
+      },
+      "engines": {
+        "node": ">=0.8.0"
+      }
+    },
+    "node_modules/websocket-extensions": {
+      "version": "0.1.4",
+      "resolved": "https://registry.npmjs.org/websocket-extensions/-/websocket-extensions-0.1.4.tgz",
+      "integrity": "sha512-OqedPIGOfsDlo31UNwYbCFMSaO9m9G/0faIHj5/dZFDMFqPTcx6UwqyOy3COEaEOg/9VsGIpdqn62W5KhoKSpg==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.8.0"
+      }
+    },
+    "node_modules/which": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",
+      "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==",
+      "dev": true,
+      "dependencies": {
+        "isexe": "^2.0.0"
+      },
+      "bin": {
+        "node-which": "bin/node-which"
+      },
+      "engines": {
+        "node": ">= 8"
+      }
+    },
+    "node_modules/which-boxed-primitive": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/which-boxed-primitive/-/which-boxed-primitive-1.0.2.tgz",
+      "integrity": "sha512-bwZdv0AKLpplFY2KZRX6TvyuN7ojjr7lwkg6ml0roIy9YeuSr7JS372qlNW18UQYzgYK9ziGcerWqZOmEn9VNg==",
+      "dev": true,
+      "dependencies": {
+        "is-bigint": "^1.0.1",
+        "is-boolean-object": "^1.1.0",
+        "is-number-object": "^1.0.4",
+        "is-string": "^1.0.5",
+        "is-symbol": "^1.0.3"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/which-collection": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/which-collection/-/which-collection-1.0.1.tgz",
+      "integrity": "sha512-W8xeTUwaln8i3K/cY1nGXzdnVZlidBcagyNFtBdD5kxnb4TvGKR7FfSIS3mYpwWS1QUCutfKz8IY8RjftB0+1A==",
+      "dev": true,
+      "dependencies": {
+        "is-map": "^2.0.1",
+        "is-set": "^2.0.1",
+        "is-weakmap": "^2.0.1",
+        "is-weakset": "^2.0.1"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/which-typed-array": {
+      "version": "1.1.11",
+      "resolved": "https://registry.npmjs.org/which-typed-array/-/which-typed-array-1.1.11.tgz",
+      "integrity": "sha512-qe9UWWpkeG5yzZ0tNYxDmd7vo58HDBc39mZ0xWWpolAGADdFOzkfamWLDxkOWcvHQKVmdTyQdLD4NOfjLWTKew==",
+      "dependencies": {
+        "available-typed-arrays": "^1.0.5",
+        "call-bind": "^1.0.2",
+        "for-each": "^0.3.3",
+        "gopd": "^1.0.1",
+        "has-tostringtag": "^1.0.0"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/why-is-node-running": {
+      "version": "2.2.2",
+      "resolved": "https://registry.npmjs.org/why-is-node-running/-/why-is-node-running-2.2.2.tgz",
+      "integrity": "sha512-6tSwToZxTOcotxHeA+qGCq1mVzKR3CwcJGmVcY+QE8SHy6TnpFnh8PAvPNHYr7EcuVeG0QSMxtYCuO1ta/G/oA==",
+      "dev": true,
+      "dependencies": {
+        "siginfo": "^2.0.0",
+        "stackback": "0.0.2"
+      },
+      "bin": {
+        "why-is-node-running": "cli.js"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/wif": {
+      "version": "2.0.6",
+      "resolved": "https://registry.npmjs.org/wif/-/wif-2.0.6.tgz",
+      "integrity": "sha512-HIanZn1zmduSF+BQhkE+YXIbEiH0xPr1012QbFEGB0xsKqJii0/SqJjyn8dFv6y36kOznMgMB+LGcbZTJ1xACQ==",
+      "dependencies": {
+        "bs58check": "<3.0.0"
+      }
+    },
+    "node_modules/wif/node_modules/base-x": {
+      "version": "3.0.10",
+      "resolved": "https://registry.npmjs.org/base-x/-/base-x-3.0.10.tgz",
+      "integrity": "sha512-7d0s06rR9rYaIWHkpfLIFICM/tkSVdoPC9qYAQRpxn9DdKNWNsKC0uk++akckyLq16Tx2WIinnZ6WRriAt6njQ==",
+      "dependencies": {
+        "safe-buffer": "^5.0.1"
+      }
+    },
+    "node_modules/wif/node_modules/bs58": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/bs58/-/bs58-4.0.1.tgz",
+      "integrity": "sha512-Ok3Wdf5vOIlBrgCvTq96gBkJw+JUEzdBgyaza5HLtPm7yTHkjRy8+JzNyHF7BHa0bNWOQIp3m5YF0nnFcOIKLw==",
+      "dependencies": {
+        "base-x": "^3.0.2"
+      }
+    },
+    "node_modules/wif/node_modules/bs58check": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/bs58check/-/bs58check-2.1.2.tgz",
+      "integrity": "sha512-0TS1jicxdU09dwJMNZtVAfzPi6Q6QeN0pM1Fkzrjn+XYHvzMKPU3pHVpva+769iNVSfIYWf7LJ6WR+BuuMf8cA==",
+      "dependencies": {
+        "bs58": "^4.0.0",
+        "create-hash": "^1.1.0",
+        "safe-buffer": "^5.1.2"
+      }
+    },
+    "node_modules/wrap-ansi": {
+      "version": "7.0.0",
+      "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz",
+      "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==",
+      "dependencies": {
+        "ansi-styles": "^4.0.0",
+        "string-width": "^4.1.0",
+        "strip-ansi": "^6.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/wrap-ansi?sponsor=1"
+      }
+    },
+    "node_modules/wrap-ansi/node_modules/ansi-styles": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+      "dependencies": {
+        "color-convert": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
+      }
+    },
+    "node_modules/wrap-ansi/node_modules/color-convert": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+      "dependencies": {
+        "color-name": "~1.1.4"
+      },
+      "engines": {
+        "node": ">=7.0.0"
+      }
+    },
+    "node_modules/wrap-ansi/node_modules/color-name": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="
+    },
+    "node_modules/wrap-ansi/node_modules/emoji-regex": {
+      "version": "8.0.0",
+      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
+      "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A=="
+    },
+    "node_modules/wrap-ansi/node_modules/is-fullwidth-code-point": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
+      "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
       "engines": {
-        "node": "^10.12.0 || ^12.22.0 || ^14.17.0 || >=16.0.0"
+        "node": ">=8"
+      }
+    },
+    "node_modules/wrap-ansi/node_modules/string-width": {
+      "version": "4.2.3",
+      "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
+      "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
+      "dependencies": {
+        "emoji-regex": "^8.0.0",
+        "is-fullwidth-code-point": "^3.0.0",
+        "strip-ansi": "^6.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/wrappy": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
+      "integrity": "sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ=="
+    },
+    "node_modules/y18n": {
+      "version": "5.0.8",
+      "resolved": "https://registry.npmjs.org/y18n/-/y18n-5.0.8.tgz",
+      "integrity": "sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==",
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/yallist": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.1.1.tgz",
+      "integrity": "sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==",
+      "peer": true
+    },
+    "node_modules/yaml": {
+      "version": "2.3.1",
+      "resolved": "https://registry.npmjs.org/yaml/-/yaml-2.3.1.tgz",
+      "integrity": "sha512-2eHWfjaoXgTBC2jNM1LRef62VQa0umtvRiDSk6HSzW7RvS5YtkabJrwYLLEKWBc8a5U2PTSCs+dJjUTJdlHsWQ==",
+      "dev": true,
+      "engines": {
+        "node": ">= 14"
+      }
+    },
+    "node_modules/yargs": {
+      "version": "17.7.2",
+      "resolved": "https://registry.npmjs.org/yargs/-/yargs-17.7.2.tgz",
+      "integrity": "sha512-7dSzzRQ++CKnNI/krKnYRV7JKKPUXMEh61soaHKg9mrWEhzFWhFnxPxGl+69cD1Ou63C13NUPCnmIcrvqCuM6w==",
+      "dependencies": {
+        "cliui": "^8.0.1",
+        "escalade": "^3.1.1",
+        "get-caller-file": "^2.0.5",
+        "require-directory": "^2.1.1",
+        "string-width": "^4.2.3",
+        "y18n": "^5.0.5",
+        "yargs-parser": "^21.1.1"
+      },
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/yargs-parser": {
+      "version": "21.1.1",
+      "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-21.1.1.tgz",
+      "integrity": "sha512-tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw==",
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/yargs/node_modules/emoji-regex": {
+      "version": "8.0.0",
+      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
+      "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A=="
+    },
+    "node_modules/yargs/node_modules/is-fullwidth-code-point": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
+      "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/yargs/node_modules/string-width": {
+      "version": "4.2.3",
+      "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
+      "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
+      "dependencies": {
+        "emoji-regex": "^8.0.0",
+        "is-fullwidth-code-point": "^3.0.0",
+        "strip-ansi": "^6.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/yocto-queue": {
+      "version": "0.1.0",
+      "resolved": "https://registry.npmjs.org/yocto-queue/-/yocto-queue-0.1.0.tgz",
+      "integrity": "sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==",
+      "dev": true,
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/yqueue": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/yqueue/-/yqueue-1.0.1.tgz",
+      "integrity": "sha512-DBxJZBRafFLA/tCc5uO8ZTGFr+sQgn1FRJkZ4cVrIQIk6bv2bInraE3mbpLAJw9z93JGrLkqDoyTLrrZaCNq5w=="
+    },
+    "node_modules/zod": {
+      "version": "3.22.4",
+      "resolved": "https://registry.npmjs.org/zod/-/zod-3.22.4.tgz",
+      "integrity": "sha512-iC+8Io04lddc+mVqQ9AZ7OQ2MrUKGN+oIQyq1vemgt46jwCwLfhq7/pwnBnNXXXZb8VTVLKwp9EDkx+ryxIWmg==",
+      "funding": {
+        "url": "https://github.com/sponsors/colinhacks"
+      }
+    },
+    "node_modules/zod-validation-error": {
+      "version": "3.3.0",
+      "resolved": "https://registry.npmjs.org/zod-validation-error/-/zod-validation-error-3.3.0.tgz",
+      "integrity": "sha512-Syib9oumw1NTqEv4LT0e6U83Td9aVRk9iTXPUQr1otyV1PuXQKOvOwhMNqZIq5hluzHP2pMgnOmHEo7kPdI2mw==",
+      "dev": true,
+      "engines": {
+        "node": ">=18.0.0"
       },
       "peerDependencies": {
-        "eslint": "^7.32.0 || ^8.2.0",
-        "eslint-plugin-import": "^2.25.3",
-        "eslint-plugin-jsx-a11y": "^6.5.1",
-        "eslint-plugin-react": "^7.28.0",
-        "eslint-plugin-react-hooks": "^4.3.0"
+        "zod": "^3.18.0"
+      }
+    },
+    "node_modules/zone-file": {
+      "version": "2.0.0-beta.3",
+      "resolved": "https://registry.npmjs.org/zone-file/-/zone-file-2.0.0-beta.3.tgz",
+      "integrity": "sha512-6tE3PSRcpN5lbTTLlkLez40WkNPc9vw/u1J2j6DBiy0jcVX48nCkWrx2EC+bWHqC2SLp069Xw4AdnYn/qp/W5g==",
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/zxcvbn": {
+      "version": "4.4.2",
+      "resolved": "https://registry.npmjs.org/zxcvbn/-/zxcvbn-4.4.2.tgz",
+      "integrity": "sha512-Bq0B+ixT/DMyG8kgX2xWcI5jUvCwqrMxSFam7m0lAf78nf04hv6lNCsyLYdyYTrCVMqNDY/206K7eExYCeSyUQ=="
+    }
+  },
+  "dependencies": {
+    "@aashutoshrathi/word-wrap": {
+      "version": "1.2.6",
+      "resolved": "https://registry.npmjs.org/@aashutoshrathi/word-wrap/-/word-wrap-1.2.6.tgz",
+      "integrity": "sha512-1Yjs2SvM8TflER/OD3cOjhWWOZb58A2t7wpE2S9XfBYTiIl+XFhQG2bjy4Pu1I+EAlCNUzRDYDdFwFYUKvXcIA==",
+      "dev": true
+    },
+    "@ampproject/remapping": {
+      "version": "2.2.1",
+      "resolved": "https://registry.npmjs.org/@ampproject/remapping/-/remapping-2.2.1.tgz",
+      "integrity": "sha512-lFMjJTrFL3j7L9yBxwYfCq2k6qqwHyzuUl/XBnif78PWTJYyL/dfowQHWE3sp6U6ZzqWiiIZnpTMO96zhkjwtg==",
+      "peer": true,
+      "requires": {
+        "@jridgewell/gen-mapping": "^0.3.0",
+        "@jridgewell/trace-mapping": "^0.3.9"
+      }
+    },
+    "@aryzing/superqs": {
+      "version": "0.0.6",
+      "resolved": "https://registry.npmjs.org/@aryzing/superqs/-/superqs-0.0.6.tgz",
+      "integrity": "sha512-MQR7BysZv1BqEmiFohs967UvMJMnWBipn2EFTG9AotyYXGgY67g7iofVOq8K83LAiOLVImr5kLhlzsmMTKLjFA==",
+      "requires": {
+        "superjson": "2.2.1"
+      }
+    },
+    "@babel/code-frame": {
+      "version": "7.23.4",
+      "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.23.4.tgz",
+      "integrity": "sha512-r1IONyb6Ia+jYR2vvIDhdWdlTGhqbBoFqLTQidzZ4kepUFH15ejXvFHxCVbtl7BOXIudsIubf4E81xeA3h3IXA==",
+      "requires": {
+        "@babel/highlight": "^7.23.4",
+        "chalk": "^2.4.2"
+      }
+    },
+    "@babel/compat-data": {
+      "version": "7.23.3",
+      "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.23.3.tgz",
+      "integrity": "sha512-BmR4bWbDIoFJmJ9z2cZ8Gmm2MXgEDgjdWgpKmKWUt54UGFJdlj31ECtbaDvCG/qVdG3AQ1SfpZEs01lUFbzLOQ==",
+      "peer": true
+    },
+    "@babel/core": {
+      "version": "7.23.3",
+      "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.23.3.tgz",
+      "integrity": "sha512-Jg+msLuNuCJDyBvFv5+OKOUjWMZgd85bKjbICd3zWrKAo+bJ49HJufi7CQE0q0uR8NGyO6xkCACScNqyjHSZew==",
+      "peer": true,
+      "requires": {
+        "@ampproject/remapping": "^2.2.0",
+        "@babel/code-frame": "^7.22.13",
+        "@babel/generator": "^7.23.3",
+        "@babel/helper-compilation-targets": "^7.22.15",
+        "@babel/helper-module-transforms": "^7.23.3",
+        "@babel/helpers": "^7.23.2",
+        "@babel/parser": "^7.23.3",
+        "@babel/template": "^7.22.15",
+        "@babel/traverse": "^7.23.3",
+        "@babel/types": "^7.23.3",
+        "convert-source-map": "^2.0.0",
+        "debug": "^4.1.0",
+        "gensync": "^1.0.0-beta.2",
+        "json5": "^2.2.3",
+        "semver": "^6.3.1"
+      },
+      "dependencies": {
+        "convert-source-map": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-2.0.0.tgz",
+          "integrity": "sha512-Kvp459HrV2FEJ1CAsi1Ku+MY3kasH19TFykTz2xWmMeq6bk2NU3XXvfJ+Q61m0xktWwt+1HSYf3JZsTms3aRJg==",
+          "peer": true
+        }
+      }
+    },
+    "@babel/generator": {
+      "version": "7.23.4",
+      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.23.4.tgz",
+      "integrity": "sha512-esuS49Cga3HcThFNebGhlgsrVLkvhqvYDTzgjfFFlHJcIfLe5jFmRRfCQ1KuBfc4Jrtn3ndLgKWAKjBE+IraYQ==",
+      "requires": {
+        "@babel/types": "^7.23.4",
+        "@jridgewell/gen-mapping": "^0.3.2",
+        "@jridgewell/trace-mapping": "^0.3.17",
+        "jsesc": "^2.5.1"
+      }
+    },
+    "@babel/helper-annotate-as-pure": {
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.22.5.tgz",
+      "integrity": "sha512-LvBTxu8bQSQkcyKOU+a1btnNFQ1dMAd0R6PyW3arXes06F6QLWLIrd681bxRPIXlrMGR3XYnW9JyML7dP3qgxg==",
+      "requires": {
+        "@babel/types": "^7.22.5"
+      }
+    },
+    "@babel/helper-compilation-targets": {
+      "version": "7.22.15",
+      "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.22.15.tgz",
+      "integrity": "sha512-y6EEzULok0Qvz8yyLkCvVX+02ic+By2UdOhylwUOvOn9dvYc9mKICJuuU1n1XBI02YWsNsnrY1kc6DVbjcXbtw==",
+      "peer": true,
+      "requires": {
+        "@babel/compat-data": "^7.22.9",
+        "@babel/helper-validator-option": "^7.22.15",
+        "browserslist": "^4.21.9",
+        "lru-cache": "^5.1.1",
+        "semver": "^6.3.1"
+      }
+    },
+    "@babel/helper-environment-visitor": {
+      "version": "7.22.20",
+      "resolved": "https://registry.npmjs.org/@babel/helper-environment-visitor/-/helper-environment-visitor-7.22.20.tgz",
+      "integrity": "sha512-zfedSIzFhat/gFhWfHtgWvlec0nqB9YEIVrpuwjruLlXfUSnA8cJB0miHKwqDnQ7d32aKo2xt88/xZptwxbfhA=="
+    },
+    "@babel/helper-function-name": {
+      "version": "7.23.0",
+      "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.23.0.tgz",
+      "integrity": "sha512-OErEqsrxjZTJciZ4Oo+eoZqeW9UIiOcuYKRJA4ZAgV9myA+pOXhhmpfNCKjEH/auVfEYVFJ6y1Tc4r0eIApqiw==",
+      "requires": {
+        "@babel/template": "^7.22.15",
+        "@babel/types": "^7.23.0"
+      }
+    },
+    "@babel/helper-hoist-variables": {
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.22.5.tgz",
+      "integrity": "sha512-wGjk9QZVzvknA6yKIUURb8zY3grXCcOZt+/7Wcy8O2uctxhplmUPkOdlgoNhmdVee2c92JXbf1xpMtVNbfoxRw==",
+      "requires": {
+        "@babel/types": "^7.22.5"
+      }
+    },
+    "@babel/helper-module-imports": {
+      "version": "7.22.15",
+      "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.22.15.tgz",
+      "integrity": "sha512-0pYVBnDKZO2fnSPCrgM/6WMc7eS20Fbok+0r88fp+YtWVLZrp4CkafFGIp+W0VKw4a22sgebPT99y+FDNMdP4w==",
+      "requires": {
+        "@babel/types": "^7.22.15"
+      }
+    },
+    "@babel/helper-module-transforms": {
+      "version": "7.23.3",
+      "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.23.3.tgz",
+      "integrity": "sha512-7bBs4ED9OmswdfDzpz4MpWgSrV7FXlc3zIagvLFjS5H+Mk7Snr21vQ6QwrsoCGMfNC4e4LQPdoULEt4ykz0SRQ==",
+      "peer": true,
+      "requires": {
+        "@babel/helper-environment-visitor": "^7.22.20",
+        "@babel/helper-module-imports": "^7.22.15",
+        "@babel/helper-simple-access": "^7.22.5",
+        "@babel/helper-split-export-declaration": "^7.22.6",
+        "@babel/helper-validator-identifier": "^7.22.20"
+      }
+    },
+    "@babel/helper-plugin-utils": {
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.22.5.tgz",
+      "integrity": "sha512-uLls06UVKgFG9QD4OeFYLEGteMIAa5kpTPcFL28yuCIIzsf6ZyKZMllKVOCZFhiZ5ptnwX4mtKdWCBE/uT4amg=="
+    },
+    "@babel/helper-simple-access": {
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.22.5.tgz",
+      "integrity": "sha512-n0H99E/K+Bika3++WNL17POvo4rKWZ7lZEp1Q+fStVbUi8nxPQEBOlTmCOxW/0JsS56SKKQ+ojAe2pHKJHN35w==",
+      "peer": true,
+      "requires": {
+        "@babel/types": "^7.22.5"
+      }
+    },
+    "@babel/helper-split-export-declaration": {
+      "version": "7.22.6",
+      "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.22.6.tgz",
+      "integrity": "sha512-AsUnxuLhRYsisFiaJwvp1QF+I3KjD5FOxut14q/GzovUe6orHLesW2C7d754kRm53h5gqrz6sFl6sxc4BVtE/g==",
+      "requires": {
+        "@babel/types": "^7.22.5"
+      }
+    },
+    "@babel/helper-string-parser": {
+      "version": "7.23.4",
+      "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.23.4.tgz",
+      "integrity": "sha512-803gmbQdqwdf4olxrX4AJyFBV/RTr3rSmOj0rKwesmzlfhYNDEs+/iOcznzpNWlJlIlTJC2QfPFcHB6DlzdVLQ=="
+    },
+    "@babel/helper-validator-identifier": {
+      "version": "7.22.20",
+      "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.22.20.tgz",
+      "integrity": "sha512-Y4OZ+ytlatR8AI+8KZfKuL5urKp7qey08ha31L8b3BwewJAoJamTzyvxPR/5D+KkdJCGPq/+8TukHBlY10FX9A=="
+    },
+    "@babel/helper-validator-option": {
+      "version": "7.22.15",
+      "resolved": "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.22.15.tgz",
+      "integrity": "sha512-bMn7RmyFjY/mdECUbgn9eoSY4vqvacUnS9i9vGAGttgFWesO6B4CYWA7XlpbWgBt71iv/hfbPlynohStqnu5hA==",
+      "peer": true
+    },
+    "@babel/helpers": {
+      "version": "7.23.4",
+      "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.23.4.tgz",
+      "integrity": "sha512-HfcMizYz10cr3h29VqyfGL6ZWIjTwWfvYBMsBVGwpcbhNGe3wQ1ZXZRPzZoAHhd9OqHadHqjQ89iVKINXnbzuw==",
+      "peer": true,
+      "requires": {
+        "@babel/template": "^7.22.15",
+        "@babel/traverse": "^7.23.4",
+        "@babel/types": "^7.23.4"
+      }
+    },
+    "@babel/highlight": {
+      "version": "7.23.4",
+      "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.23.4.tgz",
+      "integrity": "sha512-acGdbYSfp2WheJoJm/EBBBLh/ID8KDc64ISZ9DYtBmC8/Q204PZJLHyzeB5qMzJ5trcOkybd78M4x2KWsUq++A==",
+      "requires": {
+        "@babel/helper-validator-identifier": "^7.22.20",
+        "chalk": "^2.4.2",
+        "js-tokens": "^4.0.0"
+      }
+    },
+    "@babel/parser": {
+      "version": "7.23.4",
+      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.23.4.tgz",
+      "integrity": "sha512-vf3Xna6UEprW+7t6EtOmFpHNAuxw3xqPZghy+brsnusscJRW5BMUzzHZc5ICjULee81WeUV2jjakG09MDglJXQ=="
+    },
+    "@babel/plugin-syntax-jsx": {
+      "version": "7.23.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.23.3.tgz",
+      "integrity": "sha512-EB2MELswq55OHUoRZLGg/zC7QWUKfNLpE57m/S2yr1uEneIgsTgrSzXP3NXEsMkVn76OlaVVnzN+ugObuYGwhg==",
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.22.5"
+      }
+    },
+    "@babel/runtime": {
+      "version": "7.22.6",
+      "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.22.6.tgz",
+      "integrity": "sha512-wDb5pWm4WDdF6LFUde3Jl8WzPA+3ZbxYqkC6xAXuD3irdEHN1k0NfTRrJD8ZD378SJ61miMLCqIOXYhd8x+AJQ==",
+      "requires": {
+        "regenerator-runtime": "^0.13.11"
+      }
+    },
+    "@babel/template": {
+      "version": "7.22.15",
+      "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.22.15.tgz",
+      "integrity": "sha512-QPErUVm4uyJa60rkI73qneDacvdvzxshT3kksGqlGWYdOTIUOwJ7RDUL8sGqslY1uXWSL6xMFKEXDS3ox2uF0w==",
+      "requires": {
+        "@babel/code-frame": "^7.22.13",
+        "@babel/parser": "^7.22.15",
+        "@babel/types": "^7.22.15"
+      }
+    },
+    "@babel/traverse": {
+      "version": "7.23.4",
+      "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.23.4.tgz",
+      "integrity": "sha512-IYM8wSUwunWTB6tFC2dkKZhxbIjHoWemdK+3f8/wq8aKhbUscxD5MX72ubd90fxvFknaLPeGw5ycU84V1obHJg==",
+      "requires": {
+        "@babel/code-frame": "^7.23.4",
+        "@babel/generator": "^7.23.4",
+        "@babel/helper-environment-visitor": "^7.22.20",
+        "@babel/helper-function-name": "^7.23.0",
+        "@babel/helper-hoist-variables": "^7.22.5",
+        "@babel/helper-split-export-declaration": "^7.22.6",
+        "@babel/parser": "^7.23.4",
+        "@babel/types": "^7.23.4",
+        "debug": "^4.1.0",
+        "globals": "^11.1.0"
       }
     },
-    "node_modules/eslint-config-airbnb-base": {
-      "version": "15.0.0",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "confusing-browser-globals": "^1.0.10",
-        "object.assign": "^4.1.2",
-        "object.entries": "^1.1.5",
-        "semver": "^6.3.0"
-      },
-      "engines": {
-        "node": "^10.12.0 || >=12.0.0"
-      },
-      "peerDependencies": {
-        "eslint": "^7.32.0 || ^8.2.0",
-        "eslint-plugin-import": "^2.25.2"
+    "@babel/types": {
+      "version": "7.23.4",
+      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.23.4.tgz",
+      "integrity": "sha512-7uIFwVYpoplT5jp/kVv6EF93VaJ8H+Yn5IczYiaAi98ajzjfoZfslet/e0sLh+wVBjb2qqIut1b0S26VSafsSQ==",
+      "requires": {
+        "@babel/helper-string-parser": "^7.23.4",
+        "@babel/helper-validator-identifier": "^7.22.20",
+        "to-fast-properties": "^2.0.0"
       }
     },
-    "node_modules/eslint-config-airbnb-typescript": {
-      "version": "17.1.0",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "eslint-config-airbnb-base": "^15.0.0"
-      },
-      "peerDependencies": {
-        "@typescript-eslint/eslint-plugin": "^5.13.0 || ^6.0.0",
-        "@typescript-eslint/parser": "^5.0.0 || ^6.0.0",
-        "eslint": "^7.32.0 || ^8.2.0",
-        "eslint-plugin-import": "^2.25.3"
+    "@bitcoinerlab/descriptors": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/@bitcoinerlab/descriptors/-/descriptors-1.1.1.tgz",
+      "integrity": "sha512-AMFkbBBg9T1iWtEmWB23oADk7zaOQix6wUPLXalhTyFDjhkFXDd6pCRfto/HAdaPg/ccM4GMTVgYLee9WdYFyQ==",
+      "requires": {
+        "@bitcoinerlab/miniscript": "^1.2.1",
+        "@bitcoinerlab/secp256k1": "^1.0.5",
+        "bip32": "^4.0.0",
+        "bitcoinjs-lib": "^6.1.3",
+        "ecpair": "^2.1.0"
       }
     },
-    "node_modules/eslint-config-prettier": {
-      "version": "8.10.0",
-      "dev": true,
-      "license": "MIT",
-      "bin": {
-        "eslint-config-prettier": "bin/cli.js"
-      },
-      "peerDependencies": {
-        "eslint": ">=7.0.0"
+    "@bitcoinerlab/miniscript": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/@bitcoinerlab/miniscript/-/miniscript-1.4.0.tgz",
+      "integrity": "sha512-BsG3dmwQmgKHnRZecDgUsPjwcpnf1wgaZbolcMTByS10k1zYzIx97W51LzG7GvokRJ+wnzTX/GhC8Y3L2X0CQA==",
+      "requires": {
+        "bip68": "^1.0.4"
       }
     },
-    "node_modules/eslint-import-resolver-node": {
-      "version": "0.3.7",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "debug": "^3.2.7",
-        "is-core-module": "^2.11.0",
-        "resolve": "^1.22.1"
+    "@bitcoinerlab/secp256k1": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/@bitcoinerlab/secp256k1/-/secp256k1-1.1.1.tgz",
+      "integrity": "sha512-uhjW51WfVLpnHN7+G0saDcM/k9IqcyTbZ+bDgLF3AX8V/a3KXSE9vn7UPBrcdU72tp0J4YPR7BHp2m7MLAZ/1Q==",
+      "requires": {
+        "@noble/hashes": "^1.1.5",
+        "@noble/secp256k1": "^1.7.1"
       }
     },
-    "node_modules/eslint-import-resolver-node/node_modules/debug": {
-      "version": "3.2.7",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "ms": "^2.1.1"
+    "@emotion/is-prop-valid": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/@emotion/is-prop-valid/-/is-prop-valid-1.2.1.tgz",
+      "integrity": "sha512-61Mf7Ufx4aDxx1xlDeOm8aFFigGHE4z+0sKCa+IHCeZKiyP9RLD0Mmx7m8b9/Cf37f7NAvQOOJAbQQGVr5uERw==",
+      "requires": {
+        "@emotion/memoize": "^0.8.1"
       }
     },
-    "node_modules/eslint-module-utils": {
-      "version": "2.8.0",
+    "@emotion/memoize": {
+      "version": "0.8.1",
+      "resolved": "https://registry.npmjs.org/@emotion/memoize/-/memoize-0.8.1.tgz",
+      "integrity": "sha512-W2P2c/VRW1/1tLox0mVUalvnWXxavmv/Oum2aPsRcoDJuob75FC3Y8FbpfLwUegRcxINtGUMPq0tFCvYNTBXNA=="
+    },
+    "@emotion/stylis": {
+      "version": "0.8.5",
+      "resolved": "https://registry.npmjs.org/@emotion/stylis/-/stylis-0.8.5.tgz",
+      "integrity": "sha512-h6KtPihKFn3T9fuIrwvXXUOwlx3rfUvfZIcP5a6rh8Y7zjE3O06hT5Ss4S/YI1AYhuZ1kjaE/5EaOOI2NqSylQ=="
+    },
+    "@ericcornelissen/bash-parser": {
+      "version": "0.5.3",
+      "resolved": "https://registry.npmjs.org/@ericcornelissen/bash-parser/-/bash-parser-0.5.3.tgz",
+      "integrity": "sha512-9Z0sGuXqf6En19qmwB0Syi1Mc8TYl756dNuuaYal9mrypKa0Jq/IX6aJfh6Rk2S3z66KBisWTqloDo7weYj4zg==",
       "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "debug": "^3.2.7"
-      },
-      "engines": {
-        "node": ">=4"
+      "requires": {
+        "array-last": "^1.1.1",
+        "babylon": "^6.9.1",
+        "compose-function": "^3.0.3",
+        "filter-obj": "^1.1.0",
+        "has-own-property": "^0.1.0",
+        "identity-function": "^1.0.0",
+        "is-iterable": "^1.1.0",
+        "iterable-lookahead": "^1.0.0",
+        "lodash.curry": "^4.1.1",
+        "magic-string": "^0.16.0",
+        "map-obj": "^2.0.0",
+        "object-pairs": "^0.1.0",
+        "object-values": "^1.0.0",
+        "reverse-arguments": "^1.0.0",
+        "shell-quote-word": "^1.0.1",
+        "to-pascal-case": "^1.0.0",
+        "unescape-js": "^1.0.5"
       },
-      "peerDependenciesMeta": {
-        "eslint": {
-          "optional": true
+      "dependencies": {
+        "magic-string": {
+          "version": "0.16.0",
+          "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.16.0.tgz",
+          "integrity": "sha512-c4BEos3y6G2qO0B9X7K0FVLOPT9uGrjYwYRLFmDqyl5YMboUviyecnXWp94fJTSMwPw2/sf+CEYt5AGpmklkkQ==",
+          "dev": true,
+          "requires": {
+            "vlq": "^0.2.1"
+          }
         }
       }
     },
-    "node_modules/eslint-module-utils/node_modules/debug": {
-      "version": "3.2.7",
+    "@esbuild/aix-ppc64": {
+      "version": "0.21.5",
+      "resolved": "https://registry.npmjs.org/@esbuild/aix-ppc64/-/aix-ppc64-0.21.5.tgz",
+      "integrity": "sha512-1SDgH6ZSPTlggy1yI6+Dbkiz8xzpHJEVAlF/AM1tHPLsf5STom9rwtjE4hKAF20FfXXNTFqEYXyJNWh1GiZedQ==",
       "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "ms": "^2.1.1"
-      }
+      "optional": true
     },
-    "node_modules/eslint-plugin-import": {
-      "version": "2.28.0",
+    "@esbuild/android-arm": {
+      "version": "0.21.5",
+      "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.21.5.tgz",
+      "integrity": "sha512-vCPvzSjpPHEi1siZdlvAlsPxXl7WbOVUBBAowWug4rJHb68Ox8KualB+1ocNvT5fjv6wpkX6o/iEpbDrf68zcg==",
       "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "array-includes": "^3.1.6",
-        "array.prototype.findlastindex": "^1.2.2",
-        "array.prototype.flat": "^1.3.1",
-        "array.prototype.flatmap": "^1.3.1",
-        "debug": "^3.2.7",
-        "doctrine": "^2.1.0",
-        "eslint-import-resolver-node": "^0.3.7",
-        "eslint-module-utils": "^2.8.0",
-        "has": "^1.0.3",
-        "is-core-module": "^2.12.1",
-        "is-glob": "^4.0.3",
-        "minimatch": "^3.1.2",
-        "object.fromentries": "^2.0.6",
-        "object.groupby": "^1.0.0",
-        "object.values": "^1.1.6",
-        "resolve": "^1.22.3",
-        "semver": "^6.3.1",
-        "tsconfig-paths": "^3.14.2"
-      },
-      "engines": {
-        "node": ">=4"
-      },
-      "peerDependencies": {
-        "eslint": "^2 || ^3 || ^4 || ^5 || ^6 || ^7.2.0 || ^8"
-      }
+      "optional": true
     },
-    "node_modules/eslint-plugin-import/node_modules/debug": {
-      "version": "3.2.7",
+    "@esbuild/android-arm64": {
+      "version": "0.21.5",
+      "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.21.5.tgz",
+      "integrity": "sha512-c0uX9VAUBQ7dTDCjq+wdyGLowMdtR/GoC2U5IYk/7D1H1JYC0qseD7+11iMP2mRLN9RcCMRcjC4YMclCzGwS/A==",
       "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "ms": "^2.1.1"
-      }
+      "optional": true
     },
-    "node_modules/eslint-plugin-import/node_modules/doctrine": {
-      "version": "2.1.0",
+    "@esbuild/android-x64": {
+      "version": "0.21.5",
+      "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.21.5.tgz",
+      "integrity": "sha512-D7aPRUUNHRBwHxzxRvp856rjUHRFW1SdQATKXH2hqA0kAZb1hKmi02OpYRacl0TxIGz/ZmXWlbZgjwWYaCakTA==",
       "dev": true,
-      "license": "Apache-2.0",
-      "dependencies": {
-        "esutils": "^2.0.2"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
+      "optional": true
     },
-    "node_modules/eslint-plugin-jsx-a11y": {
-      "version": "6.7.1",
+    "@esbuild/darwin-arm64": {
+      "version": "0.21.5",
+      "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.21.5.tgz",
+      "integrity": "sha512-DwqXqZyuk5AiWWf3UfLiRDJ5EDd49zg6O9wclZ7kUMv2WRFr4HKjXp/5t8JZ11QbQfUS6/cRCKGwYhtNAY88kQ==",
       "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "@babel/runtime": "^7.20.7",
-        "aria-query": "^5.1.3",
-        "array-includes": "^3.1.6",
-        "array.prototype.flatmap": "^1.3.1",
-        "ast-types-flow": "^0.0.7",
-        "axe-core": "^4.6.2",
-        "axobject-query": "^3.1.1",
-        "damerau-levenshtein": "^1.0.8",
-        "emoji-regex": "^9.2.2",
-        "has": "^1.0.3",
-        "jsx-ast-utils": "^3.3.3",
-        "language-tags": "=1.0.5",
-        "minimatch": "^3.1.2",
-        "object.entries": "^1.1.6",
-        "object.fromentries": "^2.0.6",
-        "semver": "^6.3.0"
-      },
-      "engines": {
-        "node": ">=4.0"
-      },
-      "peerDependencies": {
-        "eslint": "^3 || ^4 || ^5 || ^6 || ^7 || ^8"
-      }
+      "optional": true
     },
-    "node_modules/eslint-plugin-no-inline-styles": {
-      "version": "1.0.5",
+    "@esbuild/darwin-x64": {
+      "version": "0.21.5",
+      "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.21.5.tgz",
+      "integrity": "sha512-se/JjF8NlmKVG4kNIuyWMV/22ZaerB+qaSi5MdrXtd6R08kvs2qCN4C09miupktDitvh8jRFflwGFBQcxZRjbw==",
       "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "lodash.get": "^4.4.2"
-      }
+      "optional": true
     },
-    "node_modules/eslint-plugin-playwright": {
-      "version": "1.6.0",
+    "@esbuild/freebsd-arm64": {
+      "version": "0.21.5",
+      "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.21.5.tgz",
+      "integrity": "sha512-5JcRxxRDUJLX8JXp/wcBCy3pENnCgBR9bN6JsY4OmhfUtIHe3ZW0mawA7+RDAcMLrMIZaf03NlQiX9DGyB8h4g==",
       "dev": true,
-      "license": "MIT",
-      "workspaces": [
-        "examples"
-      ],
-      "dependencies": {
-        "globals": "^13.23.0"
-      },
-      "engines": {
-        "node": ">=16.6.0"
-      },
-      "peerDependencies": {
-        "eslint": ">=8.40.0",
-        "eslint-plugin-jest": ">=25"
-      },
-      "peerDependenciesMeta": {
-        "eslint-plugin-jest": {
-          "optional": true
-        }
-      }
+      "optional": true
     },
-    "node_modules/eslint-plugin-playwright/node_modules/globals": {
-      "version": "13.24.0",
+    "@esbuild/freebsd-x64": {
+      "version": "0.21.5",
+      "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.21.5.tgz",
+      "integrity": "sha512-J95kNBj1zkbMXtHVH29bBriQygMXqoVQOQYA+ISs0/2l3T9/kj42ow2mpqerRBxDJnmkUDCaQT/dfNXWX/ZZCQ==",
       "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "type-fest": "^0.20.2"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
+      "optional": true
     },
-    "node_modules/eslint-plugin-playwright/node_modules/type-fest": {
-      "version": "0.20.2",
+    "@esbuild/linux-arm": {
+      "version": "0.21.5",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.21.5.tgz",
+      "integrity": "sha512-bPb5AHZtbeNGjCKVZ9UGqGwo8EUu4cLq68E95A53KlxAPRmUyYv2D6F0uUI65XisGOL1hBP5mTronbgo+0bFcA==",
       "dev": true,
-      "license": "(MIT OR CC0-1.0)",
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
+      "optional": true
+    },
+    "@esbuild/linux-arm64": {
+      "version": "0.21.5",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.21.5.tgz",
+      "integrity": "sha512-ibKvmyYzKsBeX8d8I7MH/TMfWDXBF3db4qM6sy+7re0YXya+K1cem3on9XgdT2EQGMu4hQyZhan7TeQ8XkGp4Q==",
+      "dev": true,
+      "optional": true
+    },
+    "@esbuild/linux-ia32": {
+      "version": "0.21.5",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.21.5.tgz",
+      "integrity": "sha512-YvjXDqLRqPDl2dvRODYmmhz4rPeVKYvppfGYKSNGdyZkA01046pLWyRKKI3ax8fbJoK5QbxblURkwK/MWY18Tg==",
+      "dev": true,
+      "optional": true
     },
-    "node_modules/eslint-plugin-prettier": {
-      "version": "4.2.1",
+    "@esbuild/linux-loong64": {
+      "version": "0.21.5",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.21.5.tgz",
+      "integrity": "sha512-uHf1BmMG8qEvzdrzAqg2SIG/02+4/DHB6a9Kbya0XDvwDEKCoC8ZRWI5JJvNdUjtciBGFQ5PuBlpEOXQj+JQSg==",
       "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "prettier-linter-helpers": "^1.0.0"
-      },
-      "engines": {
-        "node": ">=12.0.0"
-      },
-      "peerDependencies": {
-        "eslint": ">=7.28.0",
-        "prettier": ">=2.0.0"
-      },
-      "peerDependenciesMeta": {
-        "eslint-config-prettier": {
-          "optional": true
-        }
-      }
+      "optional": true
     },
-    "node_modules/eslint-plugin-react": {
-      "version": "7.33.1",
+    "@esbuild/linux-mips64el": {
+      "version": "0.21.5",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.21.5.tgz",
+      "integrity": "sha512-IajOmO+KJK23bj52dFSNCMsz1QP1DqM6cwLUv3W1QwyxkyIWecfafnI555fvSGqEKwjMXVLokcV5ygHW5b3Jbg==",
       "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "array-includes": "^3.1.6",
-        "array.prototype.flatmap": "^1.3.1",
-        "array.prototype.tosorted": "^1.1.1",
-        "doctrine": "^2.1.0",
-        "estraverse": "^5.3.0",
-        "jsx-ast-utils": "^2.4.1 || ^3.0.0",
-        "minimatch": "^3.1.2",
-        "object.entries": "^1.1.6",
-        "object.fromentries": "^2.0.6",
-        "object.hasown": "^1.1.2",
-        "object.values": "^1.1.6",
-        "prop-types": "^15.8.1",
-        "resolve": "^2.0.0-next.4",
-        "semver": "^6.3.1",
-        "string.prototype.matchall": "^4.0.8"
-      },
-      "engines": {
-        "node": ">=4"
-      },
-      "peerDependencies": {
-        "eslint": "^3 || ^4 || ^5 || ^6 || ^7 || ^8"
-      }
+      "optional": true
     },
-    "node_modules/eslint-plugin-react-hooks": {
-      "version": "4.6.0",
+    "@esbuild/linux-ppc64": {
+      "version": "0.21.5",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.21.5.tgz",
+      "integrity": "sha512-1hHV/Z4OEfMwpLO8rp7CvlhBDnjsC3CttJXIhBi+5Aj5r+MBvy4egg7wCbe//hSsT+RvDAG7s81tAvpL2XAE4w==",
       "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=10"
-      },
-      "peerDependencies": {
-        "eslint": "^3.0.0 || ^4.0.0 || ^5.0.0 || ^6.0.0 || ^7.0.0 || ^8.0.0-0"
-      }
+      "optional": true
     },
-    "node_modules/eslint-plugin-react/node_modules/doctrine": {
-      "version": "2.1.0",
+    "@esbuild/linux-riscv64": {
+      "version": "0.21.5",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.21.5.tgz",
+      "integrity": "sha512-2HdXDMd9GMgTGrPWnJzP2ALSokE/0O5HhTUvWIbD3YdjME8JwvSCnNGBnTThKGEB91OZhzrJ4qIIxk/SBmyDDA==",
       "dev": true,
-      "license": "Apache-2.0",
-      "dependencies": {
-        "esutils": "^2.0.2"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
+      "optional": true
     },
-    "node_modules/eslint-plugin-react/node_modules/resolve": {
-      "version": "2.0.0-next.4",
+    "@esbuild/linux-s390x": {
+      "version": "0.21.5",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.21.5.tgz",
+      "integrity": "sha512-zus5sxzqBJD3eXxwvjN1yQkRepANgxE9lgOW2qLnmr8ikMTphkjgXu1HR01K4FJg8h1kEEDAqDcZQtbrRnB41A==",
       "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "is-core-module": "^2.9.0",
-        "path-parse": "^1.0.7",
-        "supports-preserve-symlinks-flag": "^1.0.0"
-      },
-      "bin": {
-        "resolve": "bin/resolve"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
+      "optional": true
     },
-    "node_modules/eslint-scope": {
-      "version": "5.1.1",
+    "@esbuild/linux-x64": {
+      "version": "0.21.5",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.21.5.tgz",
+      "integrity": "sha512-1rYdTpyv03iycF1+BhzrzQJCdOuAOtaqHTWJZCWvijKD2N5Xu0TtVC8/+1faWqcP9iBCWOmjmhoH94dH82BxPQ==",
       "dev": true,
-      "license": "BSD-2-Clause",
-      "dependencies": {
-        "esrecurse": "^4.3.0",
-        "estraverse": "^4.1.1"
-      },
-      "engines": {
-        "node": ">=8.0.0"
-      }
+      "optional": true
     },
-    "node_modules/eslint-scope/node_modules/estraverse": {
-      "version": "4.3.0",
+    "@esbuild/netbsd-x64": {
+      "version": "0.21.5",
+      "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.21.5.tgz",
+      "integrity": "sha512-Woi2MXzXjMULccIwMnLciyZH4nCIMpWQAs049KEeMvOcNADVxo0UBIQPfSmxB3CWKedngg7sWZdLvLczpe0tLg==",
       "dev": true,
-      "license": "BSD-2-Clause",
-      "engines": {
-        "node": ">=4.0"
-      }
+      "optional": true
     },
-    "node_modules/eslint-visitor-keys": {
-      "version": "3.4.2",
+    "@esbuild/openbsd-x64": {
+      "version": "0.21.5",
+      "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.21.5.tgz",
+      "integrity": "sha512-HLNNw99xsvx12lFBUwoT8EVCsSvRNDVxNpjZ7bPn947b8gJPzeHWyNVhFsaerc0n3TsbOINvRP2byTZ5LKezow==",
       "dev": true,
-      "license": "Apache-2.0",
-      "engines": {
-        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
-      },
-      "funding": {
-        "url": "https://opencollective.com/eslint"
-      }
+      "optional": true
     },
-    "node_modules/eslint/node_modules/ansi-styles": {
-      "version": "4.3.0",
+    "@esbuild/sunos-x64": {
+      "version": "0.21.5",
+      "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.21.5.tgz",
+      "integrity": "sha512-6+gjmFpfy0BHU5Tpptkuh8+uw3mnrvgs+dSPQXQOv3ekbordwnzTVEb4qnIvQcYXq6gzkyTnoZ9dZG+D4garKg==",
       "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "color-convert": "^2.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
-      }
+      "optional": true
     },
-    "node_modules/eslint/node_modules/chalk": {
-      "version": "4.1.2",
+    "@esbuild/win32-arm64": {
+      "version": "0.21.5",
+      "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.21.5.tgz",
+      "integrity": "sha512-Z0gOTd75VvXqyq7nsl93zwahcTROgqvuAcYDUr+vOv8uHhNSKROyU961kgtCD1e95IqPKSQKH7tBTslnS3tA8A==",
       "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "ansi-styles": "^4.1.0",
-        "supports-color": "^7.1.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/chalk?sponsor=1"
-      }
+      "optional": true
     },
-    "node_modules/eslint/node_modules/color-convert": {
-      "version": "2.0.1",
+    "@esbuild/win32-ia32": {
+      "version": "0.21.5",
+      "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.21.5.tgz",
+      "integrity": "sha512-SWXFF1CL2RVNMaVs+BBClwtfZSvDgtL//G/smwAc5oVK/UPu2Gu9tIaRgFmYFFKrmg3SyAjSrElf0TiJ1v8fYA==",
       "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "color-name": "~1.1.4"
-      },
-      "engines": {
-        "node": ">=7.0.0"
-      }
+      "optional": true
     },
-    "node_modules/eslint/node_modules/color-name": {
-      "version": "1.1.4",
+    "@esbuild/win32-x64": {
+      "version": "0.21.5",
+      "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.21.5.tgz",
+      "integrity": "sha512-tQd/1efJuzPC6rCFwEvLtci/xNFcTZknmXs98FYDfGE4wP9ClFV98nyKrzJKVPMhdDnjzLhdUyMX4PsQAPjwIw==",
       "dev": true,
-      "license": "MIT"
+      "optional": true
     },
-    "node_modules/eslint/node_modules/escape-string-regexp": {
-      "version": "4.0.0",
+    "@eslint-community/eslint-utils": {
+      "version": "4.4.0",
+      "resolved": "https://registry.npmjs.org/@eslint-community/eslint-utils/-/eslint-utils-4.4.0.tgz",
+      "integrity": "sha512-1/sA4dwrzBAyeUoQ6oxahHKmrZvsnLCg4RfxW3ZFGGmQkSNQPFNLV9CUEFQP1x9EYXHTo5p6xdhZM1Ne9p/AfA==",
       "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
+      "requires": {
+        "eslint-visitor-keys": "^3.3.0"
       }
     },
-    "node_modules/eslint/node_modules/eslint-scope": {
-      "version": "7.2.2",
+    "@eslint-community/regexpp": {
+      "version": "4.6.2",
+      "resolved": "https://registry.npmjs.org/@eslint-community/regexpp/-/regexpp-4.6.2.tgz",
+      "integrity": "sha512-pPTNuaAG3QMH+buKyBIGJs3g/S5y0caxw0ygM3YyE6yJFySwiGGSzA+mM3KJ8QQvzeLh3blwgSonkFjgQdxzMw==",
+      "dev": true
+    },
+    "@eslint/eslintrc": {
+      "version": "2.1.4",
+      "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-2.1.4.tgz",
+      "integrity": "sha512-269Z39MS6wVJtsoUl10L60WdkhJVdPG24Q4eZTH3nnF6lpvSShEK3wQjDX9JRWAUPvPh7COouPpU9IrqaZFvtQ==",
       "dev": true,
-      "license": "BSD-2-Clause",
-      "dependencies": {
-        "esrecurse": "^4.3.0",
-        "estraverse": "^5.2.0"
-      },
-      "engines": {
-        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+      "requires": {
+        "ajv": "^6.12.4",
+        "debug": "^4.3.2",
+        "espree": "^9.6.0",
+        "globals": "^13.19.0",
+        "ignore": "^5.2.0",
+        "import-fresh": "^3.2.1",
+        "js-yaml": "^4.1.0",
+        "minimatch": "^3.1.2",
+        "strip-json-comments": "^3.1.1"
       },
-      "funding": {
-        "url": "https://opencollective.com/eslint"
+      "dependencies": {
+        "globals": {
+          "version": "13.24.0",
+          "resolved": "https://registry.npmjs.org/globals/-/globals-13.24.0.tgz",
+          "integrity": "sha512-AhO5QUcj8llrbG09iWhPU2B204J1xnPeL8kQmVorSsy+Sjj1sk8gIyh6cUocGmH4L0UuhAJy+hJMRA4mgA4mFQ==",
+          "dev": true,
+          "requires": {
+            "type-fest": "^0.20.2"
+          }
+        },
+        "type-fest": {
+          "version": "0.20.2",
+          "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.20.2.tgz",
+          "integrity": "sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==",
+          "dev": true
+        }
       }
     },
-    "node_modules/eslint/node_modules/globals": {
-      "version": "13.20.0",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "type-fest": "^0.20.2"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
+    "@eslint/js": {
+      "version": "8.40.0",
+      "resolved": "https://registry.npmjs.org/@eslint/js/-/js-8.40.0.tgz",
+      "integrity": "sha512-ElyB54bJIhXQYVKjDSvCkPO1iU1tSAeVQJbllWJq1XQSmmA4dgFk8CbiBGpiOPxleE48vDogxCtmMYku4HSVLA==",
+      "dev": true
+    },
+    "@floating-ui/core": {
+      "version": "1.4.1",
+      "resolved": "https://registry.npmjs.org/@floating-ui/core/-/core-1.4.1.tgz",
+      "integrity": "sha512-jk3WqquEJRlcyu7997NtR5PibI+y5bi+LS3hPmguVClypenMsCY3CBa3LAQnozRCtCrYWSEtAdiskpamuJRFOQ==",
+      "requires": {
+        "@floating-ui/utils": "^0.1.1"
       }
     },
-    "node_modules/eslint/node_modules/has-flag": {
-      "version": "4.0.0",
+    "@floating-ui/dom": {
+      "version": "1.5.1",
+      "resolved": "https://registry.npmjs.org/@floating-ui/dom/-/dom-1.5.1.tgz",
+      "integrity": "sha512-KwvVcPSXg6mQygvA1TjbN/gh///36kKtllIF8SUm0qpFj8+rvYrpvlYdL1JoA71SHpDqgSSdGOSoQ0Mp3uY5aw==",
+      "requires": {
+        "@floating-ui/core": "^1.4.1",
+        "@floating-ui/utils": "^0.1.1"
+      }
+    },
+    "@floating-ui/utils": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/@floating-ui/utils/-/utils-0.1.1.tgz",
+      "integrity": "sha512-m0G6wlnhm/AX0H12IOWtK8gASEMffnX08RtKkCgTdHb9JpHKGloI7icFfLg9ZmQeavcvR0PKmzxClyuFPSjKWw=="
+    },
+    "@humanwhocodes/config-array": {
+      "version": "0.11.14",
+      "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.11.14.tgz",
+      "integrity": "sha512-3T8LkOmg45BV5FICb15QQMsyUSWrQ8AygVfC7ZG32zOalnqrilm018ZVCw0eapXux8FtA33q8PSRSstjee3jSg==",
       "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=8"
+      "requires": {
+        "@humanwhocodes/object-schema": "^2.0.2",
+        "debug": "^4.3.1",
+        "minimatch": "^3.0.5"
       }
     },
-    "node_modules/eslint/node_modules/is-path-inside": {
-      "version": "3.0.3",
+    "@humanwhocodes/module-importer": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/@humanwhocodes/module-importer/-/module-importer-1.0.1.tgz",
+      "integrity": "sha512-bxveV4V8v5Yb4ncFTT3rPSgZBOpCkjfK0y4oVVVJwIuDVBRMDXrPyXRL988i5ap9m9bnyEEjWfm5WkBmtffLfA==",
+      "dev": true
+    },
+    "@humanwhocodes/object-schema": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/@humanwhocodes/object-schema/-/object-schema-2.0.2.tgz",
+      "integrity": "sha512-6EwiSjwWYP7pTckG6I5eyFANjPhmPjUX9JRLUSfNPC7FX7zK9gyZAfUEaECL6ALTpGX5AjnBq3C9XmVWPitNpw==",
+      "dev": true
+    },
+    "@jest/schemas": {
+      "version": "29.6.3",
+      "resolved": "https://registry.npmjs.org/@jest/schemas/-/schemas-29.6.3.tgz",
+      "integrity": "sha512-mo5j5X+jIZmJQveBKeS/clAueipV7KgiX1vMgCxam1RNYiqE1w62n0/tJJnHtjW8ZHcQco5gY85jA3mi0L+nSA==",
       "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=8"
+      "requires": {
+        "@sinclair/typebox": "^0.27.8"
       }
     },
-    "node_modules/eslint/node_modules/supports-color": {
-      "version": "7.2.0",
+    "@jridgewell/gen-mapping": {
+      "version": "0.3.3",
+      "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.3.tgz",
+      "integrity": "sha512-HLhSWOLRi875zjjMG/r+Nv0oCW8umGb0BgEhyX3dDX3egwZtB8PqLnjz3yedt8R5StBrzcg4aBpnh8UA9D1BoQ==",
+      "requires": {
+        "@jridgewell/set-array": "^1.0.1",
+        "@jridgewell/sourcemap-codec": "^1.4.10",
+        "@jridgewell/trace-mapping": "^0.3.9"
+      }
+    },
+    "@jridgewell/resolve-uri": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.1.0.tgz",
+      "integrity": "sha512-F2msla3tad+Mfht5cJq7LSXcdudKTWCVYUgw6pLFOOHSTtZlj6SWNYAp+AhuqLmWdBO2X5hPrLcu8cVP8fy28w=="
+    },
+    "@jridgewell/set-array": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/@jridgewell/set-array/-/set-array-1.1.2.tgz",
+      "integrity": "sha512-xnkseuNADM0gt2bs+BvhO0p78Mk762YnZdsuzFV018NoG1Sj1SCQvpSqa7XUaTam5vAGasABV9qXASMKnFMwMw=="
+    },
+    "@jridgewell/source-map": {
+      "version": "0.3.5",
+      "resolved": "https://registry.npmjs.org/@jridgewell/source-map/-/source-map-0.3.5.tgz",
+      "integrity": "sha512-UTYAUj/wviwdsMfzoSJspJxbkH5o1snzwX0//0ENX1u/55kkZZkcTZP6u9bwKGkv+dkk9at4m1Cpt0uY80kcpQ==",
       "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "has-flag": "^4.0.0"
+      "requires": {
+        "@jridgewell/gen-mapping": "^0.3.0",
+        "@jridgewell/trace-mapping": "^0.3.9"
+      }
+    },
+    "@jridgewell/sourcemap-codec": {
+      "version": "1.4.15",
+      "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.15.tgz",
+      "integrity": "sha512-eF2rxCRulEKXHTRiDrDy6erMYWqNw4LPdQ8UQA4huuxaQsVeRPFl2oM8oDGxMFhJUWZf9McpLtJasDDZb/Bpeg=="
+    },
+    "@jridgewell/trace-mapping": {
+      "version": "0.3.18",
+      "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.18.tgz",
+      "integrity": "sha512-w+niJYzMHdd7USdiH2U6869nqhD2nbfZXND5Yp93qIbEmnDNk7PD48o+YchRVpzMU7M6jVCbenTR7PA1FLQ9pA==",
+      "requires": {
+        "@jridgewell/resolve-uri": "3.1.0",
+        "@jridgewell/sourcemap-codec": "1.4.14"
       },
-      "engines": {
-        "node": ">=8"
+      "dependencies": {
+        "@jridgewell/sourcemap-codec": {
+          "version": "1.4.14",
+          "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.14.tgz",
+          "integrity": "sha512-XPSJHWmi394fuUuzDnGz1wiKqWfo1yXecHQMRf2l6hztTO+nPru658AyDngaBe7isIxEkRsPR3FZh+s7iVa4Uw=="
+        }
       }
     },
-    "node_modules/eslint/node_modules/type-fest": {
-      "version": "0.20.2",
-      "dev": true,
-      "license": "(MIT OR CC0-1.0)",
-      "engines": {
-        "node": ">=10"
+    "@ledgerhq/devices": {
+      "version": "8.0.5",
+      "resolved": "https://registry.npmjs.org/@ledgerhq/devices/-/devices-8.0.5.tgz",
+      "integrity": "sha512-Cy4LOfcYhYGWLd2nRA/CY/AneJT+Q3RyNwzoRx28gqAN21vF3+IZtL0jqs1n78rZ2bTEHyBS1GMOX13s5Y+O4g==",
+      "requires": {
+        "@ledgerhq/errors": "^6.13.0",
+        "@ledgerhq/logs": "^6.10.1",
+        "rxjs": "6",
+        "semver": "^7.3.5"
       },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
+      "dependencies": {
+        "lru-cache": {
+          "version": "6.0.0",
+          "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
+          "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
+          "requires": {
+            "yallist": "^4.0.0"
+          }
+        },
+        "semver": {
+          "version": "7.5.4",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz",
+          "integrity": "sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==",
+          "requires": {
+            "lru-cache": "^6.0.0"
+          }
+        },
+        "yallist": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
+          "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A=="
+        }
       }
     },
-    "node_modules/espree": {
-      "version": "9.6.1",
-      "dev": true,
-      "license": "BSD-2-Clause",
-      "dependencies": {
-        "acorn": "^8.9.0",
-        "acorn-jsx": "^5.3.2",
-        "eslint-visitor-keys": "^3.4.1"
-      },
-      "engines": {
-        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
-      },
-      "funding": {
-        "url": "https://opencollective.com/eslint"
+    "@ledgerhq/errors": {
+      "version": "6.13.0",
+      "resolved": "https://registry.npmjs.org/@ledgerhq/errors/-/errors-6.13.0.tgz",
+      "integrity": "sha512-cMFNX2AN6Gdj4RVIizI/7vWb+JYRu5na0rQSjybf7xGW5MSVdFVRcOg90VvqnDRsNfgFBbJzhpf7o4D7S3yFgg=="
+    },
+    "@ledgerhq/hw-transport": {
+      "version": "6.28.6",
+      "resolved": "https://registry.npmjs.org/@ledgerhq/hw-transport/-/hw-transport-6.28.6.tgz",
+      "integrity": "sha512-0VVB4jIG6ZTRtHusI5kO2jPcc1yFQ+iIcNKiTaaBHytsdGjTfhipje+W4vxo+nCdOKdrkOqB80GwykmKuNNXyA==",
+      "requires": {
+        "@ledgerhq/devices": "^8.0.5",
+        "@ledgerhq/errors": "^6.13.0",
+        "events": "^3.3.0"
       }
     },
-    "node_modules/esquery": {
-      "version": "1.5.0",
-      "dev": true,
-      "license": "BSD-3-Clause",
-      "dependencies": {
-        "estraverse": "^5.1.0"
-      },
-      "engines": {
-        "node": ">=0.10"
+    "@ledgerhq/hw-transport-webusb": {
+      "version": "6.27.17",
+      "resolved": "https://registry.npmjs.org/@ledgerhq/hw-transport-webusb/-/hw-transport-webusb-6.27.17.tgz",
+      "integrity": "sha512-HRh3PWwAHqfuibAif15H2X5ZbH8nNisDX49IxBoexBz/fM5ivP95kZZQsXLxzPxey5ima49B7AjWY3LyGBytqA==",
+      "requires": {
+        "@ledgerhq/devices": "^8.0.5",
+        "@ledgerhq/errors": "^6.13.0",
+        "@ledgerhq/hw-transport": "^6.28.6",
+        "@ledgerhq/logs": "^6.10.1"
       }
     },
-    "node_modules/esrecurse": {
-      "version": "4.3.0",
-      "dev": true,
-      "license": "BSD-2-Clause",
-      "dependencies": {
-        "estraverse": "^5.2.0"
-      },
-      "engines": {
-        "node": ">=4.0"
+    "@ledgerhq/logs": {
+      "version": "6.10.1",
+      "resolved": "https://registry.npmjs.org/@ledgerhq/logs/-/logs-6.10.1.tgz",
+      "integrity": "sha512-z+ILK8Q3y+nfUl43ctCPuR4Y2bIxk/ooCQFwZxhtci1EhAtMDzMAx2W25qx8G1PPL9UUOdnUax19+F0OjXoj4w=="
+    },
+    "@leichtgewicht/ip-codec": {
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/@leichtgewicht/ip-codec/-/ip-codec-2.0.4.tgz",
+      "integrity": "sha512-Hcv+nVC0kZnQ3tD9GVu5xSMR4VVYOteQIr/hwFPVEvPdlXqgGEuRjiheChHgdM+JyqdgNcmzZOX/tnl0JOiI7A==",
+      "dev": true
+    },
+    "@noble/curves": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/@noble/curves/-/curves-1.3.0.tgz",
+      "integrity": "sha512-t01iSXPuN+Eqzb4eBX0S5oubSqXbK/xXa1Ne18Hj8f9pStxztHCE2gfboSp/dZRLSqfuLpRK2nDXDK+W9puocA==",
+      "requires": {
+        "@noble/hashes": "1.3.3"
       }
     },
-    "node_modules/estraverse": {
-      "version": "5.3.0",
+    "@noble/hashes": {
+      "version": "1.3.3",
+      "resolved": "https://registry.npmjs.org/@noble/hashes/-/hashes-1.3.3.tgz",
+      "integrity": "sha512-V7/fPHgl+jsVPXqqeOzT8egNj2iBIVt+ECeMMG8TdcnTikP3oaBtUVqpT/gYCR68aEBJSF+XbYUxStjbFMqIIA=="
+    },
+    "@noble/secp256k1": {
+      "version": "1.7.1",
+      "resolved": "https://registry.npmjs.org/@noble/secp256k1/-/secp256k1-1.7.1.tgz",
+      "integrity": "sha512-hOUk6AyBFmqVrv7k5WAw/LpszxVbj9gGN4JRkIX52fdFAj1UA61KXmZDvqVEm+pOyec3+fIeZB02LYa/pWOArw=="
+    },
+    "@nodelib/fs.scandir": {
+      "version": "2.1.5",
+      "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz",
+      "integrity": "sha512-vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g==",
       "dev": true,
-      "license": "BSD-2-Clause",
-      "engines": {
-        "node": ">=4.0"
+      "requires": {
+        "@nodelib/fs.stat": "2.0.5",
+        "run-parallel": "^1.1.9"
       }
     },
-    "node_modules/esutils": {
-      "version": "2.0.3",
+    "@nodelib/fs.stat": {
+      "version": "2.0.5",
+      "resolved": "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz",
+      "integrity": "sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A==",
+      "dev": true
+    },
+    "@nodelib/fs.walk": {
+      "version": "1.2.8",
+      "resolved": "https://registry.npmjs.org/@nodelib/fs.walk/-/fs.walk-1.2.8.tgz",
+      "integrity": "sha512-oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg==",
       "dev": true,
-      "license": "BSD-2-Clause",
-      "engines": {
-        "node": ">=0.10.0"
+      "requires": {
+        "@nodelib/fs.scandir": "2.1.5",
+        "fastq": "^1.6.0"
       }
     },
-    "node_modules/etag": {
-      "version": "1.8.1",
+    "@phosphor-icons/react": {
+      "version": "2.0.10",
+      "resolved": "https://registry.npmjs.org/@phosphor-icons/react/-/react-2.0.10.tgz",
+      "integrity": "sha512-q5ITPNFhmEiYZLZOvEhjo2phlfxoOmit7vE1tBYMxcMqnZX2vdbMw3deDE7wCegpBKM/q/p39BJmhhoPcjZyCg==",
+      "requires": {}
+    },
+    "@playwright/test": {
+      "version": "1.45.2",
+      "resolved": "https://registry.npmjs.org/@playwright/test/-/test-1.45.2.tgz",
+      "integrity": "sha512-JxG9eq92ET75EbVi3s+4sYbcG7q72ECeZNbdBlaMkGcNbiDQ4cAi8U2QP5oKkOx+1gpaiL1LDStmzCaEM1Z6fQ==",
+      "requires": {
+        "playwright": "1.45.2"
+      }
+    },
+    "@pmmmwh/react-refresh-webpack-plugin": {
+      "version": "0.5.10",
+      "resolved": "https://registry.npmjs.org/@pmmmwh/react-refresh-webpack-plugin/-/react-refresh-webpack-plugin-0.5.10.tgz",
+      "integrity": "sha512-j0Ya0hCFZPd4x40qLzbhGsh9TMtdb+CJQiso+WxLOPNasohq9cc5SNUcwsZaRH6++Xh91Xkm/xHCkuIiIu0LUA==",
       "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">= 0.6"
+      "requires": {
+        "ansi-html-community": "^0.0.8",
+        "common-path-prefix": "^3.0.0",
+        "core-js-pure": "^3.23.3",
+        "error-stack-parser": "^2.0.6",
+        "find-up": "^5.0.0",
+        "html-entities": "^2.1.0",
+        "loader-utils": "^2.0.4",
+        "schema-utils": "^3.0.0",
+        "source-map": "^0.7.3"
       }
     },
-    "node_modules/eventemitter3": {
-      "version": "4.0.7",
-      "license": "MIT"
+    "@rc-component/portal": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/@rc-component/portal/-/portal-1.1.2.tgz",
+      "integrity": "sha512-6f813C0IsasTZms08kfA8kPAGxbbkYToa8ALaiDIGGECU4i9hj8Plgbx0sNJDrey3EtHO30hmdaxtT0138xZcg==",
+      "requires": {
+        "@babel/runtime": "^7.18.0",
+        "classnames": "^2.3.2",
+        "rc-util": "^5.24.4"
+      }
     },
-    "node_modules/events": {
-      "version": "3.3.0",
-      "license": "MIT",
-      "engines": {
-        "node": ">=0.8.x"
+    "@react-spring/animated": {
+      "version": "9.7.3",
+      "resolved": "https://registry.npmjs.org/@react-spring/animated/-/animated-9.7.3.tgz",
+      "integrity": "sha512-5CWeNJt9pNgyvuSzQH+uy2pvTg8Y4/OisoscZIR8/ZNLIOI+CatFBhGZpDGTF/OzdNFsAoGk3wiUYTwoJ0YIvw==",
+      "requires": {
+        "@react-spring/shared": "~9.7.3",
+        "@react-spring/types": "~9.7.3"
       }
     },
-    "node_modules/evp_bytestokey": {
-      "version": "1.0.3",
-      "license": "MIT",
-      "dependencies": {
-        "md5.js": "^1.3.4",
-        "safe-buffer": "^5.1.1"
+    "@react-spring/core": {
+      "version": "9.7.3",
+      "resolved": "https://registry.npmjs.org/@react-spring/core/-/core-9.7.3.tgz",
+      "integrity": "sha512-IqFdPVf3ZOC1Cx7+M0cXf4odNLxDC+n7IN3MDcVCTIOSBfqEcBebSv+vlY5AhM0zw05PDbjKrNmBpzv/AqpjnQ==",
+      "requires": {
+        "@react-spring/animated": "~9.7.3",
+        "@react-spring/shared": "~9.7.3",
+        "@react-spring/types": "~9.7.3"
       }
     },
-    "node_modules/execa": {
-      "version": "5.1.1",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "cross-spawn": "^7.0.3",
-        "get-stream": "^6.0.0",
-        "human-signals": "^2.1.0",
-        "is-stream": "^2.0.0",
-        "merge-stream": "^2.0.0",
-        "npm-run-path": "^4.0.1",
-        "onetime": "^5.1.2",
-        "signal-exit": "^3.0.3",
-        "strip-final-newline": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sindresorhus/execa?sponsor=1"
+    "@react-spring/shared": {
+      "version": "9.7.3",
+      "resolved": "https://registry.npmjs.org/@react-spring/shared/-/shared-9.7.3.tgz",
+      "integrity": "sha512-NEopD+9S5xYyQ0pGtioacLhL2luflh6HACSSDUZOwLHoxA5eku1UPuqcJqjwSD6luKjjLfiLOspxo43FUHKKSA==",
+      "requires": {
+        "@react-spring/types": "~9.7.3"
       }
     },
-    "node_modules/exenv": {
-      "version": "1.2.2",
-      "license": "BSD-3-Clause"
+    "@react-spring/types": {
+      "version": "9.7.3",
+      "resolved": "https://registry.npmjs.org/@react-spring/types/-/types-9.7.3.tgz",
+      "integrity": "sha512-Kpx/fQ/ZFX31OtlqVEFfgaD1ACzul4NksrvIgYfIFq9JpDHFwQkMVZ10tbo0FU/grje4rcL4EIrjekl3kYwgWw=="
     },
-    "node_modules/express": {
-      "version": "4.18.2",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "accepts": "~1.3.8",
-        "array-flatten": "1.1.1",
-        "body-parser": "1.20.1",
-        "content-disposition": "0.5.4",
-        "content-type": "~1.0.4",
-        "cookie": "0.5.0",
-        "cookie-signature": "1.0.6",
-        "debug": "2.6.9",
-        "depd": "2.0.0",
-        "encodeurl": "~1.0.2",
-        "escape-html": "~1.0.3",
-        "etag": "~1.8.1",
-        "finalhandler": "1.2.0",
-        "fresh": "0.5.2",
-        "http-errors": "2.0.0",
-        "merge-descriptors": "1.0.1",
-        "methods": "~1.1.2",
-        "on-finished": "2.4.1",
-        "parseurl": "~1.3.3",
-        "path-to-regexp": "0.1.7",
-        "proxy-addr": "~2.0.7",
-        "qs": "6.11.0",
-        "range-parser": "~1.2.1",
-        "safe-buffer": "5.2.1",
-        "send": "0.18.0",
-        "serve-static": "1.15.0",
-        "setprototypeof": "1.2.0",
-        "statuses": "2.0.1",
-        "type-is": "~1.6.18",
-        "utils-merge": "1.0.1",
-        "vary": "~1.1.2"
-      },
-      "engines": {
-        "node": ">= 0.10.0"
+    "@react-spring/web": {
+      "version": "9.7.3",
+      "resolved": "https://registry.npmjs.org/@react-spring/web/-/web-9.7.3.tgz",
+      "integrity": "sha512-BXt6BpS9aJL/QdVqEIX9YoUy8CE6TJrU0mNCqSoxdXlIeNcEBWOfIyE6B14ENNsyQKS3wOWkiJfco0tCr/9tUg==",
+      "requires": {
+        "@react-spring/animated": "~9.7.3",
+        "@react-spring/core": "~9.7.3",
+        "@react-spring/shared": "~9.7.3",
+        "@react-spring/types": "~9.7.3"
       }
     },
-    "node_modules/express/node_modules/array-flatten": {
-      "version": "1.1.1",
+    "@remix-run/router": {
+      "version": "1.7.2",
+      "resolved": "https://registry.npmjs.org/@remix-run/router/-/router-1.7.2.tgz",
+      "integrity": "sha512-7Lcn7IqGMV+vizMPoEl5F0XDshcdDYtMI6uJLQdQz5CfZAwy3vvGKYSUk789qndt5dEC4HfSjviSYlSoHGL2+A=="
+    },
+    "@rollup/rollup-android-arm-eabi": {
+      "version": "4.18.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.18.0.tgz",
+      "integrity": "sha512-Tya6xypR10giZV1XzxmH5wr25VcZSncG0pZIjfePT0OVBvqNEurzValetGNarVrGiq66EBVAFn15iYX4w6FKgQ==",
       "dev": true,
-      "license": "MIT"
+      "optional": true
     },
-    "node_modules/express/node_modules/debug": {
-      "version": "2.6.9",
+    "@rollup/rollup-android-arm64": {
+      "version": "4.18.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.18.0.tgz",
+      "integrity": "sha512-avCea0RAP03lTsDhEyfy+hpfr85KfyTctMADqHVhLAF3MlIkq83CP8UfAHUssgXTYd+6er6PaAhx/QGv4L1EiA==",
       "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "ms": "2.0.0"
-      }
+      "optional": true
     },
-    "node_modules/express/node_modules/ms": {
-      "version": "2.0.0",
+    "@rollup/rollup-darwin-arm64": {
+      "version": "4.18.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.18.0.tgz",
+      "integrity": "sha512-IWfdwU7KDSm07Ty0PuA/W2JYoZ4iTj3TUQjkVsO/6U+4I1jN5lcR71ZEvRh52sDOERdnNhhHU57UITXz5jC1/w==",
       "dev": true,
-      "license": "MIT"
+      "optional": true
     },
-    "node_modules/express/node_modules/qs": {
-      "version": "6.11.0",
+    "@rollup/rollup-darwin-x64": {
+      "version": "4.18.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.18.0.tgz",
+      "integrity": "sha512-n2LMsUz7Ynu7DoQrSQkBf8iNrjOGyPLrdSg802vk6XT3FtsgX6JbE8IHRvposskFm9SNxzkLYGSq9QdpLYpRNA==",
       "dev": true,
-      "license": "BSD-3-Clause",
-      "dependencies": {
-        "side-channel": "^1.0.4"
-      },
-      "engines": {
-        "node": ">=0.6"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
+      "optional": true
     },
-    "node_modules/fast-deep-equal": {
-      "version": "3.1.3",
+    "@rollup/rollup-linux-arm-gnueabihf": {
+      "version": "4.18.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.18.0.tgz",
+      "integrity": "sha512-C/zbRYRXFjWvz9Z4haRxcTdnkPt1BtCkz+7RtBSuNmKzMzp3ZxdM28Mpccn6pt28/UWUCTXa+b0Mx1k3g6NOMA==",
       "dev": true,
-      "license": "MIT"
+      "optional": true
     },
-    "node_modules/fast-diff": {
-      "version": "1.3.0",
+    "@rollup/rollup-linux-arm-musleabihf": {
+      "version": "4.18.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-musleabihf/-/rollup-linux-arm-musleabihf-4.18.0.tgz",
+      "integrity": "sha512-l3m9ewPgjQSXrUMHg93vt0hYCGnrMOcUpTz6FLtbwljo2HluS4zTXFy2571YQbisTnfTKPZ01u/ukJdQTLGh9A==",
       "dev": true,
-      "license": "Apache-2.0"
+      "optional": true
     },
-    "node_modules/fast-glob": {
-      "version": "3.3.2",
+    "@rollup/rollup-linux-arm64-gnu": {
+      "version": "4.18.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.18.0.tgz",
+      "integrity": "sha512-rJ5D47d8WD7J+7STKdCUAgmQk49xuFrRi9pZkWoRD1UeSMakbcepWXPF8ycChBoAqs1pb2wzvbY6Q33WmN2ftw==",
       "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "@nodelib/fs.stat": "^2.0.2",
-        "@nodelib/fs.walk": "^1.2.3",
-        "glob-parent": "^5.1.2",
-        "merge2": "^1.3.0",
-        "micromatch": "^4.0.4"
-      },
-      "engines": {
-        "node": ">=8.6.0"
-      }
+      "optional": true
+    },
+    "@rollup/rollup-linux-arm64-musl": {
+      "version": "4.18.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.18.0.tgz",
+      "integrity": "sha512-be6Yx37b24ZwxQ+wOQXXLZqpq4jTckJhtGlWGZs68TgdKXJgw54lUUoFYrg6Zs/kjzAQwEwYbp8JxZVzZLRepQ==",
+      "dev": true,
+      "optional": true
     },
-    "node_modules/fast-glob/node_modules/glob-parent": {
-      "version": "5.1.2",
+    "@rollup/rollup-linux-powerpc64le-gnu": {
+      "version": "4.18.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-powerpc64le-gnu/-/rollup-linux-powerpc64le-gnu-4.18.0.tgz",
+      "integrity": "sha512-hNVMQK+qrA9Todu9+wqrXOHxFiD5YmdEi3paj6vP02Kx1hjd2LLYR2eaN7DsEshg09+9uzWi2W18MJDlG0cxJA==",
       "dev": true,
-      "license": "ISC",
-      "dependencies": {
-        "is-glob": "^4.0.1"
-      },
-      "engines": {
-        "node": ">= 6"
-      }
+      "optional": true
     },
-    "node_modules/fast-json-stable-stringify": {
-      "version": "2.1.0",
+    "@rollup/rollup-linux-riscv64-gnu": {
+      "version": "4.18.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-gnu/-/rollup-linux-riscv64-gnu-4.18.0.tgz",
+      "integrity": "sha512-ROCM7i+m1NfdrsmvwSzoxp9HFtmKGHEqu5NNDiZWQtXLA8S5HBCkVvKAxJ8U+CVctHwV2Gb5VUaK7UAkzhDjlg==",
       "dev": true,
-      "license": "MIT"
+      "optional": true
     },
-    "node_modules/fast-levenshtein": {
-      "version": "2.0.6",
+    "@rollup/rollup-linux-s390x-gnu": {
+      "version": "4.18.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-s390x-gnu/-/rollup-linux-s390x-gnu-4.18.0.tgz",
+      "integrity": "sha512-0UyyRHyDN42QL+NbqevXIIUnKA47A+45WyasO+y2bGJ1mhQrfrtXUpTxCOrfxCR4esV3/RLYyucGVPiUsO8xjg==",
       "dev": true,
-      "license": "MIT"
+      "optional": true
     },
-    "node_modules/fastq": {
-      "version": "1.15.0",
+    "@rollup/rollup-linux-x64-gnu": {
+      "version": "4.18.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.18.0.tgz",
+      "integrity": "sha512-xuglR2rBVHA5UsI8h8UbX4VJ470PtGCf5Vpswh7p2ukaqBGFTnsfzxUBetoWBWymHMxbIG0Cmx7Y9qDZzr648w==",
       "dev": true,
-      "license": "ISC",
-      "dependencies": {
-        "reusify": "^1.0.4"
-      }
+      "optional": true
     },
-    "node_modules/faye-websocket": {
-      "version": "0.11.4",
+    "@rollup/rollup-linux-x64-musl": {
+      "version": "4.18.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.18.0.tgz",
+      "integrity": "sha512-LKaqQL9osY/ir2geuLVvRRs+utWUNilzdE90TpyoX0eNqPzWjRm14oMEE+YLve4k/NAqCdPkGYDaDF5Sw+xBfg==",
       "dev": true,
-      "license": "Apache-2.0",
-      "dependencies": {
-        "websocket-driver": ">=0.5.1"
-      },
-      "engines": {
-        "node": ">=0.8.0"
-      }
+      "optional": true
     },
-    "node_modules/file-entry-cache": {
-      "version": "6.0.1",
+    "@rollup/rollup-win32-arm64-msvc": {
+      "version": "4.18.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.18.0.tgz",
+      "integrity": "sha512-7J6TkZQFGo9qBKH0pk2cEVSRhJbL6MtfWxth7Y5YmZs57Pi+4x6c2dStAUvaQkHQLnEQv1jzBUW43GvZW8OFqA==",
       "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "flat-cache": "^3.0.4"
-      },
-      "engines": {
-        "node": "^10.12.0 || >=12.0.0"
-      }
+      "optional": true
     },
-    "node_modules/file-uri-to-path": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/file-uri-to-path/-/file-uri-to-path-1.0.0.tgz",
-      "integrity": "sha512-0Zt+s3L7Vf1biwWZ29aARiVYLx7iMGnEUl9x33fbB/j3jR81u/O2LbqK+Bm1CDSNDKVtJ/YjwY7TUd5SkeLQLw=="
+    "@rollup/rollup-win32-ia32-msvc": {
+      "version": "4.18.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.18.0.tgz",
+      "integrity": "sha512-Txjh+IxBPbkUB9+SXZMpv+b/vnTEtFyfWZgJ6iyCmt2tdx0OF5WhFowLmnh8ENGNpfUlUZkdI//4IEmhwPieNg==",
+      "dev": true,
+      "optional": true
     },
-    "node_modules/fill-range": {
-      "version": "7.0.1",
+    "@rollup/rollup-win32-x64-msvc": {
+      "version": "4.18.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.18.0.tgz",
+      "integrity": "sha512-UOo5FdvOL0+eIVTgS4tIdbW+TtnBLWg1YBCcU2KWM7nuNwRz9bksDX1bekJJCpu25N1DVWaCwnT39dVQxzqS8g==",
       "dev": true,
-      "license": "MIT",
+      "optional": true
+    },
+    "@sats-connect/core": {
+      "version": "0.2.1",
+      "resolved": "https://registry.npmjs.org/@sats-connect/core/-/core-0.2.1.tgz",
+      "integrity": "sha512-e7ARFqN4JE8kBiSUNOcEvBffiBK9v7k+/PlwgYY5lGyanmBOMj5twBn/f/4+52GBLZXkwhJtidIWZ8LgnBdlbw==",
+      "requires": {
+        "axios": "1.6.8",
+        "bitcoin-address-validation": "2.2.3",
+        "buffer": "6.0.3",
+        "jsontokens": "4.0.1",
+        "lodash.omit": "4.5.0"
+      },
       "dependencies": {
-        "to-regex-range": "^5.0.1"
+        "axios": {
+          "version": "1.6.8",
+          "resolved": "https://registry.npmjs.org/axios/-/axios-1.6.8.tgz",
+          "integrity": "sha512-v/ZHtJDU39mDpyBoFVkETcd/uNdxrWRrg3bKpOKzXFA6Bvqopts6ALSMU3y6ijYxbw2B+wPrIv46egTzJXCLGQ==",
+          "requires": {
+            "follow-redirects": "^1.15.6",
+            "form-data": "^4.0.0",
+            "proxy-from-env": "^1.1.0"
+          }
+        }
+      }
+    },
+    "@scure/base": {
+      "version": "1.1.7",
+      "resolved": "https://registry.npmjs.org/@scure/base/-/base-1.1.7.tgz",
+      "integrity": "sha512-PPNYBslrLNNUQ/Yad37MHYsNQtK67EhWb6WtSvNLLPo7SdVZgkUjD6Dg+5On7zNwmskf8OX7I7Nx5oN+MIWE0g=="
+    },
+    "@scure/bip32": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/@scure/bip32/-/bip32-1.4.0.tgz",
+      "integrity": "sha512-sVUpc0Vq3tXCkDGYVWGIZTRfnvu8LoTDaev7vbwh0omSvVORONr960MQWdKqJDCReIEmTj3PAr73O3aoxz7OPg==",
+      "requires": {
+        "@noble/curves": "~1.4.0",
+        "@noble/hashes": "~1.4.0",
+        "@scure/base": "~1.1.6"
       },
-      "engines": {
-        "node": ">=8"
+      "dependencies": {
+        "@noble/curves": {
+          "version": "1.4.2",
+          "resolved": "https://registry.npmjs.org/@noble/curves/-/curves-1.4.2.tgz",
+          "integrity": "sha512-TavHr8qycMChk8UwMld0ZDRvatedkzWfH8IiaeGCfymOP5i0hSCozz9vHOL0nkwk7HRMlFnAiKpS2jrUmSybcw==",
+          "requires": {
+            "@noble/hashes": "1.4.0"
+          }
+        },
+        "@noble/hashes": {
+          "version": "1.4.0",
+          "resolved": "https://registry.npmjs.org/@noble/hashes/-/hashes-1.4.0.tgz",
+          "integrity": "sha512-V1JJ1WTRUqHHrOSh597hURcMqVKVGL/ea3kv0gSnEdsEZ0/+VyPghM1lMNGc00z7CIQorSvbKpuJkxvuHbvdbg=="
+        }
       }
     },
-    "node_modules/filter-obj": {
+    "@scure/bip39": {
       "version": "1.1.0",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=0.10.0"
+      "resolved": "https://registry.npmjs.org/@scure/bip39/-/bip39-1.1.0.tgz",
+      "integrity": "sha512-pwrPOS16VeTKg98dYXQyIjJEcWfz7/1YJIwxUEPFfQPtc86Ym/1sVgQ2RLoD43AazMk2l/unK4ITySSpW2+82w==",
+      "requires": {
+        "@noble/hashes": "~1.1.1",
+        "@scure/base": "~1.1.0"
+      },
+      "dependencies": {
+        "@noble/hashes": {
+          "version": "1.1.5",
+          "resolved": "https://registry.npmjs.org/@noble/hashes/-/hashes-1.1.5.tgz",
+          "integrity": "sha512-LTMZiiLc+V4v1Yi16TD6aX2gmtKszNye0pQgbaLqkvhIqP7nVsSaJsWloGQjJfJ8offaoP5GtX3yY5swbcJxxQ=="
+        }
       }
     },
-    "node_modules/finalhandler": {
-      "version": "1.2.0",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "debug": "2.6.9",
-        "encodeurl": "~1.0.2",
-        "escape-html": "~1.0.3",
-        "on-finished": "2.4.1",
-        "parseurl": "~1.3.3",
-        "statuses": "2.0.1",
-        "unpipe": "~1.0.0"
-      },
-      "engines": {
-        "node": ">= 0.8"
+    "@scure/btc-signer": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/@scure/btc-signer/-/btc-signer-1.2.1.tgz",
+      "integrity": "sha512-/Zle18/aWhYDBuBeXGDGJTdo0/LKpQhU8ETBJeWABCQkbk0QHCFCinidTiz9hdQFfh0HtasPGq5p6EodVCfEew==",
+      "requires": {
+        "@noble/curves": "~1.3.0",
+        "@noble/hashes": "~1.3.3",
+        "@scure/base": "~1.1.5",
+        "micro-packed": "~0.5.1"
       }
     },
-    "node_modules/finalhandler/node_modules/debug": {
-      "version": "2.6.9",
-      "dev": true,
-      "license": "MIT",
+    "@secretkeylabs/xverse-core": {
+      "version": "18.7.2",
+      "resolved": "https://npm.pkg.github.com/download/@secretkeylabs/xverse-core/18.7.2/0dc4ba04ad9b58f27031a976faf112a6648ea945",
+      "integrity": "sha512-B07GqC77UFeelKAjnpW0ZNjv7jc/m12PdVJJhRJdB7PRhsl+KHD8Z33JMHazdR6P3VbNlzUeEZ5R8WX+eBQWaA==",
+      "requires": {
+        "@bitcoinerlab/secp256k1": "^1.0.2",
+        "@noble/curves": "^1.2.0",
+        "@noble/secp256k1": "^1.7.1",
+        "@scure/base": "^1.1.1",
+        "@scure/bip32": "^1.4.0",
+        "@scure/bip39": "^1.3.0",
+        "@scure/btc-signer": "1.2.1",
+        "@stacks/auth": "6.13.1",
+        "@stacks/connect": "7.7.1",
+        "@stacks/encryption": "6.13.1",
+        "@stacks/network": "6.13.0",
+        "@stacks/stacking": "6.13.2",
+        "@stacks/storage": "6.13.1",
+        "@stacks/transactions": "6.13.1",
+        "@stacks/wallet-sdk": "6.13.1",
+        "@tanstack/react-query": "^4.29.3",
+        "@zondax/ledger-stacks": "^1.0.4",
+        "async-mutex": "^0.4.0",
+        "axios": "1.7.0",
+        "base64url": "^3.0.1",
+        "bip32": "^4.0.0",
+        "bip39": "3.0.3",
+        "bitcoin-address-validation": "^2.2.1",
+        "bitcoinjs-lib": "^6.1.3",
+        "bitcoinjs-message": "^2.2.0",
+        "bn.js": "^5.1.3",
+        "bs58": "^5.0.0",
+        "bs58check": "^3.0.1",
+        "buffer": "6.0.3",
+        "c32check": "^2.0.0",
+        "ecdsa-sig-formatter": "^1.0.11",
+        "ecpair": "^2.1.0",
+        "json-bigint": "^1.0.0",
+        "jsontokens": "^4.0.1",
+        "ledger-bitcoin": "^0.2.1",
+        "process": "^0.11.10",
+        "util": "^0.12.4",
+        "uuidv4": "^6.2.13",
+        "varuint-bitcoin": "^1.1.2"
+      },
       "dependencies": {
-        "ms": "2.0.0"
+        "@noble/hashes": {
+          "version": "1.4.0",
+          "resolved": "https://registry.npmjs.org/@noble/hashes/-/hashes-1.4.0.tgz",
+          "integrity": "sha512-V1JJ1WTRUqHHrOSh597hURcMqVKVGL/ea3kv0gSnEdsEZ0/+VyPghM1lMNGc00z7CIQorSvbKpuJkxvuHbvdbg=="
+        },
+        "@scure/bip39": {
+          "version": "1.3.0",
+          "resolved": "https://registry.npmjs.org/@scure/bip39/-/bip39-1.3.0.tgz",
+          "integrity": "sha512-disdg7gHuTDZtY+ZdkmLpPCk7fxZSu3gBiEGuoC1XYxv9cGx3Z6cpTggCgW6odSOOIXCiDjuGejW+aJKCY/pIQ==",
+          "requires": {
+            "@noble/hashes": "~1.4.0",
+            "@scure/base": "~1.1.6"
+          }
+        },
+        "@stacks/connect": {
+          "version": "7.7.1",
+          "resolved": "https://registry.npmjs.org/@stacks/connect/-/connect-7.7.1.tgz",
+          "integrity": "sha512-MwLRhgRLOGo0Y4IDC0qp9RUX2SZubgse1aI2TN/fz2abNIh1LgmOKUua3w17YiBEZxDD9nyQ4KW1c33bdnrOPw==",
+          "requires": {
+            "@stacks/auth": "^6.1.1",
+            "@stacks/connect-ui": "6.4.1",
+            "@stacks/network": "^6.1.1",
+            "@stacks/profile": "^6.1.1",
+            "@stacks/transactions": "^6.1.1",
+            "jsontokens": "^4.0.1"
+          }
+        },
+        "@stacks/connect-ui": {
+          "version": "6.4.1",
+          "resolved": "https://registry.npmjs.org/@stacks/connect-ui/-/connect-ui-6.4.1.tgz",
+          "integrity": "sha512-Y6Fp26MUsMQq08zFSWus40rS7RNHrHj6VDJrFUqM9VsksV3wftpsRcy7psQusUvW1DS7fPza67IlM1dcN4rvSg==",
+          "requires": {
+            "@stencil/core": "^2.17.1"
+          }
+        },
+        "@types/node": {
+          "version": "11.11.6",
+          "resolved": "https://registry.npmjs.org/@types/node/-/node-11.11.6.tgz",
+          "integrity": "sha512-Exw4yUWMBXM3X+8oqzJNRqZSwUAaS4+7NdvHqQuFi/d+synz++xmX3QIf+BFqneW8N31R8Ky+sikfZUXq07ggQ=="
+        },
+        "async-mutex": {
+          "version": "0.4.1",
+          "resolved": "https://registry.npmjs.org/async-mutex/-/async-mutex-0.4.1.tgz",
+          "integrity": "sha512-WfoBo4E/TbCX1G95XTjbWTE3X2XLG0m1Xbv2cwOtuPdyH9CZvnaA5nCt1ucjaKEgW2A5IF71hxrRhr83Je5xjA==",
+          "requires": {
+            "tslib": "^2.4.0"
+          }
+        },
+        "bip39": {
+          "version": "3.0.3",
+          "resolved": "https://registry.npmjs.org/bip39/-/bip39-3.0.3.tgz",
+          "integrity": "sha512-P0dKrz4g0V0BjXfx7d9QNkJ/Txcz/k+hM9TnjqjUaXtuOfAvxXSw2rJw8DX0e3ZPwnK/IgDxoRqf0bvoVCqbMg==",
+          "requires": {
+            "@types/node": "11.11.6",
+            "create-hash": "^1.1.0",
+            "pbkdf2": "^3.0.9",
+            "randombytes": "^2.0.1"
+          }
+        }
       }
     },
-    "node_modules/finalhandler/node_modules/ms": {
-      "version": "2.0.0",
-      "dev": true,
-      "license": "MIT"
+    "@sinclair/typebox": {
+      "version": "0.27.8",
+      "resolved": "https://registry.npmjs.org/@sinclair/typebox/-/typebox-0.27.8.tgz",
+      "integrity": "sha512-+Fj43pSMwJs4KRrH/938Uf+uAELIgVBmQzg/q1YG10djyfA3TnrU8N8XzqCh/okZdszqBQTZf96idMfE5lnwTA==",
+      "dev": true
     },
-    "node_modules/find-up": {
-      "version": "5.0.0",
+    "@snyk/github-codeowners": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/@snyk/github-codeowners/-/github-codeowners-1.1.0.tgz",
+      "integrity": "sha512-lGFf08pbkEac0NYgVf4hdANpAgApRjNByLXB+WBip3qj1iendOIyAwP2GKkKbQMNVy2r1xxDf0ssfWscoiC+Vw==",
       "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "locate-path": "^6.0.0",
-        "path-exists": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=10"
+      "requires": {
+        "commander": "^4.1.1",
+        "ignore": "^5.1.8",
+        "p-map": "^4.0.0"
       },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
+      "dependencies": {
+        "commander": {
+          "version": "4.1.1",
+          "resolved": "https://registry.npmjs.org/commander/-/commander-4.1.1.tgz",
+          "integrity": "sha512-NOKm8xhkzAjzFx8B2v5OAHT+u5pRQc2UCa2Vq9jYL/31o2wi9mxBA7LIFs3sV5VSC49z6pEhfbMULvShKj26WA==",
+          "dev": true
+        },
+        "p-map": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/p-map/-/p-map-4.0.0.tgz",
+          "integrity": "sha512-/bjOqmgETBYB5BoEeGVea8dmvHb2m9GLy1E9W43yeyfP6QQCZGFNa+XRceJEuDB6zqr+gKpIAmlLebMpykw/MQ==",
+          "dev": true,
+          "requires": {
+            "aggregate-error": "^3.0.0"
+          }
+        }
       }
     },
-    "node_modules/flat-cache": {
-      "version": "3.0.4",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "flatted": "^3.1.0",
-        "rimraf": "^3.0.2"
+    "@stacks/auth": {
+      "version": "6.13.1",
+      "resolved": "https://registry.npmjs.org/@stacks/auth/-/auth-6.13.1.tgz",
+      "integrity": "sha512-nr5VeLIJBVI72eWYs/oQ7nrmuZxe89AlS5Lt/WxCcUDK9Z+oqQR1qsxBo86yVDlmrxoNWncHWD38LX54HsOEzA==",
+      "requires": {
+        "@stacks/common": "^6.13.0",
+        "@stacks/encryption": "^6.13.1",
+        "@stacks/network": "^6.13.0",
+        "@stacks/profile": "^6.13.1",
+        "cross-fetch": "^3.1.5",
+        "jsontokens": "^4.0.1"
+      }
+    },
+    "@stacks/common": {
+      "version": "6.13.0",
+      "resolved": "https://registry.npmjs.org/@stacks/common/-/common-6.13.0.tgz",
+      "integrity": "sha512-wwzyihjaSdmL6NxKvDeayy3dqM0L0Q2sawmdNtzJDi0FnXuJGm5PeapJj7bEfcI9XwI7Bw5jZoC6mCn9nc5YIw==",
+      "requires": {
+        "@types/bn.js": "^5.1.0",
+        "@types/node": "^18.0.4"
       },
-      "engines": {
-        "node": "^10.12.0 || >=12.0.0"
+      "dependencies": {
+        "@types/node": {
+          "version": "18.19.26",
+          "resolved": "https://registry.npmjs.org/@types/node/-/node-18.19.26.tgz",
+          "integrity": "sha512-+wiMJsIwLOYCvUqSdKTrfkS8mpTp+MPINe6+Np4TAGFWWRWiBQ5kSq9nZGCSPkzx9mvT+uEukzpX4MOSCydcvw==",
+          "requires": {
+            "undici-types": "~5.26.4"
+          }
+        }
       }
     },
-    "node_modules/flatted": {
-      "version": "3.2.7",
-      "dev": true,
-      "license": "ISC"
+    "@stacks/connect": {
+      "version": "7.4.1",
+      "resolved": "https://registry.npmjs.org/@stacks/connect/-/connect-7.4.1.tgz",
+      "integrity": "sha512-kvF7Fnx8oMHNi/9At6UI6kThey+gYlYlbtsxhNL2VqflReXI8z3EndaMJ1WrD55ePIOoydAzV/Fx0rdNFjd4rQ==",
+      "requires": {
+        "@stacks/auth": "^6.1.1",
+        "@stacks/connect-ui": "6.1.2",
+        "@stacks/network": "^6.1.1",
+        "@stacks/profile": "^6.1.1",
+        "@stacks/transactions": "^6.1.1",
+        "jsontokens": "^4.0.1"
+      }
     },
-    "node_modules/follow-redirects": {
-      "version": "1.15.6",
-      "funding": [
-        {
-          "type": "individual",
-          "url": "https://github.com/sponsors/RubenVerborgh"
-        }
-      ],
-      "license": "MIT",
-      "engines": {
-        "node": ">=4.0"
+    "@stacks/connect-ui": {
+      "version": "6.1.2",
+      "resolved": "https://registry.npmjs.org/@stacks/connect-ui/-/connect-ui-6.1.2.tgz",
+      "integrity": "sha512-V4gUINXRDB2MO6YHk/JZZeApSnANrMFvIRv9qLBaJPamKsgeiCOBkiC88T7ucLVCz+NvCmS93Ntg4wytDIqdOg==",
+      "requires": {
+        "@stencil/core": "^2.17.1"
+      }
+    },
+    "@stacks/encryption": {
+      "version": "6.13.1",
+      "resolved": "https://registry.npmjs.org/@stacks/encryption/-/encryption-6.13.1.tgz",
+      "integrity": "sha512-y5IFX3/nGI3fCk70gE0JwH70GpshD8RhUfvhMLcL96oNaec1cCdj1ZUiQupeicfYTHuraaVBYU9xLls4TRmypg==",
+      "requires": {
+        "@noble/hashes": "1.1.5",
+        "@noble/secp256k1": "1.7.1",
+        "@scure/bip39": "1.1.0",
+        "@stacks/common": "^6.13.0",
+        "@types/node": "^18.0.4",
+        "base64-js": "^1.5.1",
+        "bs58": "^5.0.0",
+        "ripemd160-min": "^0.0.6",
+        "varuint-bitcoin": "^1.1.2"
       },
-      "peerDependenciesMeta": {
-        "debug": {
-          "optional": true
+      "dependencies": {
+        "@noble/hashes": {
+          "version": "1.1.5",
+          "resolved": "https://registry.npmjs.org/@noble/hashes/-/hashes-1.1.5.tgz",
+          "integrity": "sha512-LTMZiiLc+V4v1Yi16TD6aX2gmtKszNye0pQgbaLqkvhIqP7nVsSaJsWloGQjJfJ8offaoP5GtX3yY5swbcJxxQ=="
+        },
+        "@types/node": {
+          "version": "18.19.31",
+          "resolved": "https://registry.npmjs.org/@types/node/-/node-18.19.31.tgz",
+          "integrity": "sha512-ArgCD39YpyyrtFKIqMDvjz79jto5fcI/SVUs2HwB+f0dAzq68yqOdyaSivLiLugSziTpNXLQrVb7RZFmdZzbhA==",
+          "requires": {
+            "undici-types": "~5.26.4"
+          }
         }
       }
     },
-    "node_modules/for-each": {
-      "version": "0.3.3",
-      "license": "MIT",
-      "dependencies": {
-        "is-callable": "^1.1.3"
+    "@stacks/network": {
+      "version": "6.13.0",
+      "resolved": "https://registry.npmjs.org/@stacks/network/-/network-6.13.0.tgz",
+      "integrity": "sha512-Ss/Da4BNyPBBj1OieM981fJ7SkevKqLPkzoI1+Yo7cYR2df+0FipIN++Z4RfpJpc8ne60vgcx7nJZXQsiGhKBQ==",
+      "requires": {
+        "@stacks/common": "^6.13.0",
+        "cross-fetch": "^3.1.5"
       }
     },
-    "node_modules/fork-ts-checker-webpack-plugin": {
-      "version": "9.0.2",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "@babel/code-frame": "^7.16.7",
-        "chalk": "^4.1.2",
-        "chokidar": "^3.5.3",
-        "cosmiconfig": "^8.2.0",
-        "deepmerge": "^4.2.2",
-        "fs-extra": "^10.0.0",
-        "memfs": "^3.4.1",
-        "minimatch": "^3.0.4",
-        "node-abort-controller": "^3.0.1",
-        "schema-utils": "^3.1.1",
-        "semver": "^7.3.5",
-        "tapable": "^2.2.1"
-      },
-      "engines": {
-        "node": ">=12.13.0",
-        "yarn": ">=1.0.0"
-      },
-      "peerDependencies": {
-        "typescript": ">3.6.0",
-        "webpack": "^5.11.0"
+    "@stacks/profile": {
+      "version": "6.13.1",
+      "resolved": "https://registry.npmjs.org/@stacks/profile/-/profile-6.13.1.tgz",
+      "integrity": "sha512-GCDE13hwoUYZvZKTb5c0Tr74DcxIP/n4bffcYrKa5UabITPQ7JwsJIOyDoAwdtl3lu7fi9aBsKrdfHpBBUSQIQ==",
+      "requires": {
+        "@stacks/common": "^6.13.0",
+        "@stacks/network": "^6.13.0",
+        "@stacks/transactions": "^6.13.1",
+        "jsontokens": "^4.0.1",
+        "schema-inspector": "^2.0.2",
+        "zone-file": "^2.0.0-beta.3"
       }
     },
-    "node_modules/fork-ts-checker-webpack-plugin/node_modules/ansi-styles": {
-      "version": "4.3.0",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "color-convert": "^2.0.1"
-      },
-      "engines": {
-        "node": ">=8"
+    "@stacks/stacking": {
+      "version": "6.13.2",
+      "resolved": "https://registry.npmjs.org/@stacks/stacking/-/stacking-6.13.2.tgz",
+      "integrity": "sha512-4h1UQuL2+Xdra9zMqzUElvKG9X9fenuNE7hD9sIqyxyLFxeQ7gRqczmTYPsmaj4wY5004JNj+efzGJ0VmpOcAA==",
+      "requires": {
+        "@noble/hashes": "1.1.5",
+        "@scure/base": "1.1.1",
+        "@stacks/common": "^6.13.0",
+        "@stacks/encryption": "^6.13.1",
+        "@stacks/network": "^6.13.0",
+        "@stacks/stacks-blockchain-api-types": "^0.61.0",
+        "@stacks/transactions": "^6.13.1",
+        "bs58": "^5.0.0"
       },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
+      "dependencies": {
+        "@noble/hashes": {
+          "version": "1.1.5",
+          "resolved": "https://registry.npmjs.org/@noble/hashes/-/hashes-1.1.5.tgz",
+          "integrity": "sha512-LTMZiiLc+V4v1Yi16TD6aX2gmtKszNye0pQgbaLqkvhIqP7nVsSaJsWloGQjJfJ8offaoP5GtX3yY5swbcJxxQ=="
+        },
+        "@scure/base": {
+          "version": "1.1.1",
+          "resolved": "https://registry.npmjs.org/@scure/base/-/base-1.1.1.tgz",
+          "integrity": "sha512-ZxOhsSyxYwLJj3pLZCefNitxsj093tb2vq90mp2txoYeBqbcjDjqFhyM8eUjq/uFm6zJ+mUuqxlS2FkuSY1MTA=="
+        },
+        "@stacks/stacks-blockchain-api-types": {
+          "version": "0.61.0",
+          "resolved": "https://registry.npmjs.org/@stacks/stacks-blockchain-api-types/-/stacks-blockchain-api-types-0.61.0.tgz",
+          "integrity": "sha512-yPOfTUboo5eA9BZL/hqMcM71GstrFs9YWzOrJFPeP4cOO1wgYvAcckgBRbgiE3NqeX0A7SLZLDAXLZbATuRq9w=="
+        }
       }
     },
-    "node_modules/fork-ts-checker-webpack-plugin/node_modules/chalk": {
-      "version": "4.1.2",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "ansi-styles": "^4.1.0",
-        "supports-color": "^7.1.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/chalk?sponsor=1"
+    "@stacks/stacks-blockchain-api-types": {
+      "version": "6.1.1",
+      "resolved": "https://registry.npmjs.org/@stacks/stacks-blockchain-api-types/-/stacks-blockchain-api-types-6.1.1.tgz",
+      "integrity": "sha512-Mw5dBPx3DySPupwaq0iBdm1WdEVXIfhjUVaTjI2iSyzWz4Fgs3U7JCaAezLbgNu7Q69c/ZN4JUDWuo9FVjy7oA=="
+    },
+    "@stacks/storage": {
+      "version": "6.13.1",
+      "resolved": "https://registry.npmjs.org/@stacks/storage/-/storage-6.13.1.tgz",
+      "integrity": "sha512-XnzRAETDKW7Ij3cuUNllrrnLOCwctV/XrIHgVWnD04LNL5R9apkwp9IkzaFbyJZ+XrkUBKwtdCgVYype2XgT6w==",
+      "requires": {
+        "@stacks/auth": "^6.13.1",
+        "@stacks/common": "^6.13.0",
+        "@stacks/encryption": "^6.13.1",
+        "@stacks/network": "^6.13.0",
+        "base64-js": "^1.5.1",
+        "jsontokens": "^4.0.1"
       }
     },
-    "node_modules/fork-ts-checker-webpack-plugin/node_modules/color-convert": {
-      "version": "2.0.1",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "color-name": "~1.1.4"
+    "@stacks/transactions": {
+      "version": "6.13.1",
+      "resolved": "https://registry.npmjs.org/@stacks/transactions/-/transactions-6.13.1.tgz",
+      "integrity": "sha512-PWw2I+2Fj3CaFYQIoVcqQN6E2qGHNhFv03nuR0CxMq0sx8stPgYZbdzUlnlBcJQdsFiHrw3sPeqnXDZt+Hg5YQ==",
+      "requires": {
+        "@noble/hashes": "1.1.5",
+        "@noble/secp256k1": "1.7.1",
+        "@stacks/common": "^6.13.0",
+        "@stacks/network": "^6.13.0",
+        "c32check": "^2.0.0",
+        "lodash.clonedeep": "^4.5.0"
       },
-      "engines": {
-        "node": ">=7.0.0"
+      "dependencies": {
+        "@noble/hashes": {
+          "version": "1.1.5",
+          "resolved": "https://registry.npmjs.org/@noble/hashes/-/hashes-1.1.5.tgz",
+          "integrity": "sha512-LTMZiiLc+V4v1Yi16TD6aX2gmtKszNye0pQgbaLqkvhIqP7nVsSaJsWloGQjJfJ8offaoP5GtX3yY5swbcJxxQ=="
+        }
       }
     },
-    "node_modules/fork-ts-checker-webpack-plugin/node_modules/color-name": {
-      "version": "1.1.4",
-      "dev": true,
-      "license": "MIT"
-    },
-    "node_modules/fork-ts-checker-webpack-plugin/node_modules/cosmiconfig": {
-      "version": "8.3.6",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "import-fresh": "^3.3.0",
-        "js-yaml": "^4.1.0",
-        "parse-json": "^5.2.0",
-        "path-type": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=14"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/d-fischer"
-      },
-      "peerDependencies": {
-        "typescript": ">=4.9.5"
+    "@stacks/wallet-sdk": {
+      "version": "6.13.1",
+      "resolved": "https://registry.npmjs.org/@stacks/wallet-sdk/-/wallet-sdk-6.13.1.tgz",
+      "integrity": "sha512-262CYKAm1j8oVxfGUIJrHp867j9gm5NrqPM85s0TfCv2QhfLDkvme6nKgmvtL2TecAZkBa5tu8M5DQ7z92WvAQ==",
+      "requires": {
+        "@scure/bip32": "1.1.3",
+        "@scure/bip39": "1.1.0",
+        "@stacks/auth": "^6.13.1",
+        "@stacks/common": "^6.13.0",
+        "@stacks/encryption": "^6.13.1",
+        "@stacks/network": "^6.13.0",
+        "@stacks/profile": "^6.13.1",
+        "@stacks/storage": "^6.13.1",
+        "@stacks/transactions": "^6.13.1",
+        "buffer": "6.0.3",
+        "c32check": "^2.0.0",
+        "jsontokens": "^4.0.1",
+        "triplesec": "^4.0.3",
+        "zone-file": "^2.0.0-beta.3"
       },
-      "peerDependenciesMeta": {
-        "typescript": {
-          "optional": true
+      "dependencies": {
+        "@noble/hashes": {
+          "version": "1.1.5",
+          "resolved": "https://registry.npmjs.org/@noble/hashes/-/hashes-1.1.5.tgz",
+          "integrity": "sha512-LTMZiiLc+V4v1Yi16TD6aX2gmtKszNye0pQgbaLqkvhIqP7nVsSaJsWloGQjJfJ8offaoP5GtX3yY5swbcJxxQ=="
+        },
+        "@scure/bip32": {
+          "version": "1.1.3",
+          "resolved": "https://registry.npmjs.org/@scure/bip32/-/bip32-1.1.3.tgz",
+          "integrity": "sha512-dSH3+LCWONlSNQuF34xZrG6Xas7tp2jSSqHb/pMfXWM0vKE4JZOtK3uJfoWouUVW5IGlls75HkXmYLldZ8ySgQ==",
+          "requires": {
+            "@noble/hashes": "~1.1.3",
+            "@noble/secp256k1": "~1.7.0",
+            "@scure/base": "~1.1.0"
+          }
         }
       }
     },
-    "node_modules/fork-ts-checker-webpack-plugin/node_modules/has-flag": {
-      "version": "4.0.0",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=8"
-      }
+    "@stencil/core": {
+      "version": "2.22.3",
+      "resolved": "https://registry.npmjs.org/@stencil/core/-/core-2.22.3.tgz",
+      "integrity": "sha512-kmVA0M/HojwsfkeHsifvHVIYe4l5tin7J5+DLgtl8h6WWfiMClND5K3ifCXXI2ETDNKiEk21p6jql3Fx9o2rng=="
     },
-    "node_modules/fork-ts-checker-webpack-plugin/node_modules/lru-cache": {
-      "version": "6.0.0",
-      "dev": true,
-      "license": "ISC",
-      "dependencies": {
-        "yallist": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=10"
+    "@tanstack/eslint-plugin-query": {
+      "version": "4.32.1",
+      "resolved": "https://registry.npmjs.org/@tanstack/eslint-plugin-query/-/eslint-plugin-query-4.32.1.tgz",
+      "integrity": "sha512-29oveq5n7momN+/d0SheNccnp1qws4JRG/PdeiPHwWAVQ9HxwtZTFxhFJxvMzVk7UsY3LsQB0keIajC+K9ZJ7w==",
+      "dev": true
+    },
+    "@tanstack/match-sorter-utils": {
+      "version": "8.8.4",
+      "resolved": "https://registry.npmjs.org/@tanstack/match-sorter-utils/-/match-sorter-utils-8.8.4.tgz",
+      "integrity": "sha512-rKH8LjZiszWEvmi01NR72QWZ8m4xmXre0OOwlRGnjU01Eqz/QnN+cqpty2PJ0efHblq09+KilvyR7lsbzmXVEw==",
+      "requires": {
+        "remove-accents": "0.4.2"
       }
     },
-    "node_modules/fork-ts-checker-webpack-plugin/node_modules/semver": {
-      "version": "7.5.4",
-      "dev": true,
-      "license": "ISC",
-      "dependencies": {
-        "lru-cache": "^6.0.0"
-      },
-      "bin": {
-        "semver": "bin/semver.js"
-      },
-      "engines": {
-        "node": ">=10"
+    "@tanstack/query-core": {
+      "version": "4.32.1",
+      "resolved": "https://registry.npmjs.org/@tanstack/query-core/-/query-core-4.32.1.tgz",
+      "integrity": "sha512-VEAGHboOFWN/bvf/7cCoeLQfld0AA8n0V/kfc77W+FvxnnSwJufEh6gfjqpX5bRE/DEYfYDYdNtuL3KM+lIs8Q=="
+    },
+    "@tanstack/query-persist-client-core": {
+      "version": "4.32.1",
+      "resolved": "https://registry.npmjs.org/@tanstack/query-persist-client-core/-/query-persist-client-core-4.32.1.tgz",
+      "integrity": "sha512-KgnkNigmOMi2aikxdhCRe0MaAh1Dq94/nNjmcSxfflj9L3v4F9tEQAig/F7m2+jethP1AiIYBax5nN4aqm7NFg==",
+      "requires": {
+        "@tanstack/query-core": "4.32.1"
       }
     },
-    "node_modules/fork-ts-checker-webpack-plugin/node_modules/supports-color": {
-      "version": "7.2.0",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "has-flag": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=8"
+    "@tanstack/query-sync-storage-persister": {
+      "version": "4.32.1",
+      "resolved": "https://registry.npmjs.org/@tanstack/query-sync-storage-persister/-/query-sync-storage-persister-4.32.1.tgz",
+      "integrity": "sha512-kqE+L0uSzVMuPpY8iKtnyZexsZ5IxsJbgiI4s+m+FB8Dzn+5go3snpZIYMQu36S+sWy0N90P2xNR57EOaFMlsg==",
+      "requires": {
+        "@tanstack/query-persist-client-core": "4.32.1"
       }
     },
-    "node_modules/fork-ts-checker-webpack-plugin/node_modules/yallist": {
-      "version": "4.0.0",
-      "dev": true,
-      "license": "ISC"
+    "@tanstack/react-query": {
+      "version": "4.32.1",
+      "resolved": "https://registry.npmjs.org/@tanstack/react-query/-/react-query-4.32.1.tgz",
+      "integrity": "sha512-lPTfOq6bR6DorPaS018gTMd3zs8r06tlERiVY6BRP9SnDkkl4ckqeANava/jPLWrSZP+EA15loQUTmvZs6k2GA==",
+      "requires": {
+        "@tanstack/query-core": "4.32.1",
+        "use-sync-external-store": "^1.2.0"
+      }
     },
-    "node_modules/form-data": {
-      "version": "4.0.0",
-      "license": "MIT",
-      "dependencies": {
-        "asynckit": "^0.4.0",
-        "combined-stream": "^1.0.8",
-        "mime-types": "^2.1.12"
+    "@tanstack/react-query-devtools": {
+      "version": "4.32.1",
+      "resolved": "https://registry.npmjs.org/@tanstack/react-query-devtools/-/react-query-devtools-4.32.1.tgz",
+      "integrity": "sha512-/ZgxCfGXLIXUvaIRzrNCP+C4iv1bIleNzXCjGKFZ4qKEifnv5A/SpWE2dG4SBjqXVlIkMAP82lesfoHcsOm+zg==",
+      "requires": {
+        "@tanstack/match-sorter-utils": "^8.7.0",
+        "superjson": "^1.10.0",
+        "use-sync-external-store": "^1.2.0"
       },
-      "engines": {
-        "node": ">= 6"
+      "dependencies": {
+        "superjson": {
+          "version": "1.13.3",
+          "resolved": "https://registry.npmjs.org/superjson/-/superjson-1.13.3.tgz",
+          "integrity": "sha512-mJiVjfd2vokfDxsQPOwJ/PtanO87LhpYY88ubI5dUB1Ab58Txbyje3+jpm+/83R/fevaq/107NNhtYBLuoTrFg==",
+          "requires": {
+            "copy-anything": "^3.0.2"
+          }
+        }
       }
     },
-    "node_modules/forwarded": {
-      "version": "0.2.0",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">= 0.6"
+    "@tanstack/react-query-persist-client": {
+      "version": "4.32.1",
+      "resolved": "https://registry.npmjs.org/@tanstack/react-query-persist-client/-/react-query-persist-client-4.32.1.tgz",
+      "integrity": "sha512-HtfhSOyMSjdASpPXWBWv9JquUk5b8HjOwbFVmtA8xIDFQm9qS35PikXO2YbBXhuz/LEknRhct/M3PMI/XkRQSg==",
+      "requires": {
+        "@tanstack/query-persist-client-core": "4.32.1"
       }
     },
-    "node_modules/fresh": {
-      "version": "0.5.2",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">= 0.6"
+    "@types/argon2-browser": {
+      "version": "1.18.1",
+      "resolved": "https://registry.npmjs.org/@types/argon2-browser/-/argon2-browser-1.18.1.tgz",
+      "integrity": "sha512-PZffP/CqH9m2kovDSRQMfMMxUC3V98I7i7/caa0RB0/nvsXzYbL9bKyqZpNMFmLFGZslROlG1R60ONt7abrwlA==",
+      "dev": true
+    },
+    "@types/bn.js": {
+      "version": "5.1.1",
+      "resolved": "https://registry.npmjs.org/@types/bn.js/-/bn.js-5.1.1.tgz",
+      "integrity": "sha512-qNrYbZqMx0uJAfKnKclPh+dTwK33KfLHYqtyODwd5HnXOjnkhc4qgn3BrK6RWyGZm5+sIFE7Q7Vz6QQtJB7w7g==",
+      "requires": {
+        "@types/node": "*"
       }
     },
-    "node_modules/fs-extra": {
-      "version": "10.1.0",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "graceful-fs": "^4.2.0",
-        "jsonfile": "^6.0.1",
-        "universalify": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=12"
+    "@types/body-parser": {
+      "version": "1.19.2",
+      "resolved": "https://registry.npmjs.org/@types/body-parser/-/body-parser-1.19.2.tgz",
+      "integrity": "sha512-ALYone6pm6QmwZoAgeyNksccT9Q4AWZQ6PvfwR37GT6r6FWUPguq6sUmNGSMV2Wr761oQoBxwGGa6DR5o1DC9g==",
+      "dev": true,
+      "requires": {
+        "@types/connect": "*",
+        "@types/node": "*"
       }
     },
-    "node_modules/fs-monkey": {
-      "version": "1.0.4",
+    "@types/bonjour": {
+      "version": "3.5.10",
+      "resolved": "https://registry.npmjs.org/@types/bonjour/-/bonjour-3.5.10.tgz",
+      "integrity": "sha512-p7ienRMiS41Nu2/igbJxxLDWrSZ0WxM8UQgCeO9KhoVF7cOVFkrKsiDr1EsJIla8vV3oEEjGcz11jc5yimhzZw==",
       "dev": true,
-      "license": "Unlicense"
+      "requires": {
+        "@types/node": "*"
+      }
     },
-    "node_modules/fs.realpath": {
-      "version": "1.0.0",
-      "license": "ISC"
+    "@types/chai": {
+      "version": "4.3.11",
+      "resolved": "https://registry.npmjs.org/@types/chai/-/chai-4.3.11.tgz",
+      "integrity": "sha512-qQR1dr2rGIHYlJulmr8Ioq3De0Le9E4MJ5AiaeAETJJpndT1uUNHsGFK3L/UIu+rbkQSdj8J/w2bCsBZc/Y5fQ==",
+      "dev": true
     },
-    "node_modules/fsevents": {
-      "version": "2.3.3",
+    "@types/chai-subset": {
+      "version": "1.3.5",
+      "resolved": "https://registry.npmjs.org/@types/chai-subset/-/chai-subset-1.3.5.tgz",
+      "integrity": "sha512-c2mPnw+xHtXDoHmdtcCXGwyLMiauiAyxWMzhGpqHC4nqI/Y5G2XhTampslK2rb59kpcuHon03UH8W6iYUzw88A==",
       "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "darwin"
-      ],
-      "engines": {
-        "node": "^8.16.0 || ^10.6.0 || >=11.0.0"
-      }
-    },
-    "node_modules/function-bind": {
-      "version": "1.1.2",
-      "license": "MIT",
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
+      "requires": {
+        "@types/chai": "*"
       }
     },
-    "node_modules/function.prototype.name": {
-      "version": "1.1.5",
+    "@types/chrome": {
+      "version": "0.0.237",
+      "resolved": "https://registry.npmjs.org/@types/chrome/-/chrome-0.0.237.tgz",
+      "integrity": "sha512-krsRmyfMlck5r+H1EapsrrucDRq6iRm0NAi5fapr93CgnpVMDdK+h2+z4x79GegdW7BNH9Vb//gkptORwwwVIQ==",
       "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.1.3",
-        "es-abstract": "^1.19.0",
-        "functions-have-names": "^1.2.2"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
+      "requires": {
+        "@types/filesystem": "*",
+        "@types/har-format": "*"
       }
     },
-    "node_modules/functions-have-names": {
-      "version": "1.2.3",
+    "@types/connect": {
+      "version": "3.4.35",
+      "resolved": "https://registry.npmjs.org/@types/connect/-/connect-3.4.35.tgz",
+      "integrity": "sha512-cdeYyv4KWoEgpBISTxWvqYsVy444DOqehiF3fM3ne10AmJ62RSyNkUnxMJXHQWRQQX2eR94m5y1IZyDwBjV9FQ==",
       "dev": true,
-      "license": "MIT",
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
+      "requires": {
+        "@types/node": "*"
       }
     },
-    "node_modules/gensync": {
-      "version": "1.0.0-beta.2",
-      "license": "MIT",
-      "peer": true,
-      "engines": {
-        "node": ">=6.9.0"
+    "@types/connect-history-api-fallback": {
+      "version": "1.5.0",
+      "resolved": "https://registry.npmjs.org/@types/connect-history-api-fallback/-/connect-history-api-fallback-1.5.0.tgz",
+      "integrity": "sha512-4x5FkPpLipqwthjPsF7ZRbOv3uoLUFkTA9G9v583qi4pACvq0uTELrB8OLUzPWUI4IJIyvM85vzkV1nyiI2Lig==",
+      "dev": true,
+      "requires": {
+        "@types/express-serve-static-core": "*",
+        "@types/node": "*"
       }
     },
-    "node_modules/get-caller-file": {
-      "version": "2.0.5",
-      "license": "ISC",
-      "engines": {
-        "node": "6.* || 8.* || >= 10.*"
+    "@types/eslint": {
+      "version": "8.44.1",
+      "resolved": "https://registry.npmjs.org/@types/eslint/-/eslint-8.44.1.tgz",
+      "integrity": "sha512-XpNDc4Z5Tb4x+SW1MriMVeIsMoONHCkWFMkR/aPJbzEsxqHy+4Glu/BqTdPrApfDeMaXbtNh6bseNgl5KaWrSg==",
+      "dev": true,
+      "requires": {
+        "@types/estree": "*",
+        "@types/json-schema": "*"
       }
     },
-    "node_modules/get-func-name": {
-      "version": "2.0.2",
+    "@types/eslint-scope": {
+      "version": "3.7.4",
+      "resolved": "https://registry.npmjs.org/@types/eslint-scope/-/eslint-scope-3.7.4.tgz",
+      "integrity": "sha512-9K4zoImiZc3HlIp6AVUDE4CWYx22a+lhSZMYNpbjW04+YF0KWj4pJXnEMjdnFTiQibFFmElcsasJXDbdI/EPhA==",
       "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": "*"
+      "requires": {
+        "@types/eslint": "*",
+        "@types/estree": "*"
       }
     },
-    "node_modules/get-intrinsic": {
-      "version": "1.2.4",
-      "license": "MIT",
-      "dependencies": {
-        "es-errors": "^1.3.0",
-        "function-bind": "^1.1.2",
-        "has-proto": "^1.0.1",
-        "has-symbols": "^1.0.3",
-        "hasown": "^2.0.0"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
+    "@types/estree": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.5.tgz",
+      "integrity": "sha512-/kYRxGDLWzHOB7q+wtSUQlFrtcdUccpfy+X+9iMBpHK8QLLhx2wIPYuS5DYtR9Wa/YlZAbIovy7qVdB1Aq6Lyw==",
+      "dev": true
     },
-    "node_modules/get-stream": {
-      "version": "6.0.1",
+    "@types/express": {
+      "version": "4.17.17",
+      "resolved": "https://registry.npmjs.org/@types/express/-/express-4.17.17.tgz",
+      "integrity": "sha512-Q4FmmuLGBG58btUnfS1c1r/NQdlp3DMfGDGig8WhfpA2YRUtEkxAjkZb0yvplJGYdF1fsQ81iMDcH24sSCNC/Q==",
       "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
+      "requires": {
+        "@types/body-parser": "*",
+        "@types/express-serve-static-core": "^4.17.33",
+        "@types/qs": "*",
+        "@types/serve-static": "*"
       }
     },
-    "node_modules/get-symbol-description": {
-      "version": "1.0.0",
+    "@types/express-serve-static-core": {
+      "version": "4.17.35",
+      "resolved": "https://registry.npmjs.org/@types/express-serve-static-core/-/express-serve-static-core-4.17.35.tgz",
+      "integrity": "sha512-wALWQwrgiB2AWTT91CB62b6Yt0sNHpznUXeZEcnPU3DRdlDIz74x8Qg1UUYKSVFi+va5vKOLYRBI1bRKiLLKIg==",
       "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "call-bind": "^1.0.2",
-        "get-intrinsic": "^1.1.1"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
+      "requires": {
+        "@types/node": "*",
+        "@types/qs": "*",
+        "@types/range-parser": "*",
+        "@types/send": "*"
       }
     },
-    "node_modules/glob": {
-      "version": "7.2.3",
-      "license": "ISC",
-      "dependencies": {
-        "fs.realpath": "^1.0.0",
-        "inflight": "^1.0.4",
-        "inherits": "2",
-        "minimatch": "^3.1.1",
-        "once": "^1.3.0",
-        "path-is-absolute": "^1.0.0"
-      },
-      "engines": {
-        "node": "*"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/isaacs"
+    "@types/filesystem": {
+      "version": "0.0.32",
+      "resolved": "https://registry.npmjs.org/@types/filesystem/-/filesystem-0.0.32.tgz",
+      "integrity": "sha512-Yuf4jR5YYMR2DVgwuCiP11s0xuVRyPKmz8vo6HBY3CGdeMj8af93CFZX+T82+VD1+UqHOxTq31lO7MI7lepBtQ==",
+      "dev": true,
+      "requires": {
+        "@types/filewriter": "*"
       }
     },
-    "node_modules/glob-parent": {
-      "version": "6.0.2",
+    "@types/filewriter": {
+      "version": "0.0.29",
+      "resolved": "https://registry.npmjs.org/@types/filewriter/-/filewriter-0.0.29.tgz",
+      "integrity": "sha512-BsPXH/irW0ht0Ji6iw/jJaK8Lj3FJemon2gvEqHKpCdDCeemHa+rI3WBGq5z7cDMZgoLjY40oninGxqk+8NzNQ==",
+      "dev": true
+    },
+    "@types/glob": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/@types/glob/-/glob-7.2.0.tgz",
+      "integrity": "sha512-ZUxbzKl0IfJILTS6t7ip5fQQM/J3TJYubDm3nMbgubNNYS62eXeUpoLUC8/7fJNiFYHTrGPQn7hspDUzIHX3UA==",
       "dev": true,
-      "license": "ISC",
-      "dependencies": {
-        "is-glob": "^4.0.3"
-      },
-      "engines": {
-        "node": ">=10.13.0"
+      "requires": {
+        "@types/minimatch": "*",
+        "@types/node": "*"
       }
     },
-    "node_modules/glob-to-regexp": {
-      "version": "0.4.1",
-      "dev": true,
-      "license": "BSD-2-Clause"
+    "@types/har-format": {
+      "version": "1.2.11",
+      "resolved": "https://registry.npmjs.org/@types/har-format/-/har-format-1.2.11.tgz",
+      "integrity": "sha512-T232/TneofqK30AD1LRrrf8KnjLvzrjWDp7eWST5KoiSzrBfRsLrWDPk4STQPW4NZG6v2MltnduBVmakbZOBIQ==",
+      "dev": true
     },
-    "node_modules/globals": {
-      "version": "11.12.0",
-      "license": "MIT",
-      "engines": {
-        "node": ">=4"
+    "@types/hoist-non-react-statics": {
+      "version": "3.3.1",
+      "resolved": "https://registry.npmjs.org/@types/hoist-non-react-statics/-/hoist-non-react-statics-3.3.1.tgz",
+      "integrity": "sha512-iMIqiko6ooLrTh1joXodJK5X9xeEALT1kM5G3ZLhD3hszxBdIEd5C75U834D9mLcINgD4OyZf5uQXjkuYydWvA==",
+      "requires": {
+        "@types/react": "*",
+        "hoist-non-react-statics": "^3.3.0"
       }
     },
-    "node_modules/globalthis": {
-      "version": "1.0.3",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "define-properties": "^1.1.3"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
+    "@types/html-minifier-terser": {
+      "version": "6.1.0",
+      "resolved": "https://registry.npmjs.org/@types/html-minifier-terser/-/html-minifier-terser-6.1.0.tgz",
+      "integrity": "sha512-oh/6byDPnL1zeNXFrDXFLyZjkr1MsBG667IM792caf1L2UPOOMf65NFzjUH/ltyfwjAGfs1rsX1eftK0jC/KIg==",
+      "dev": true
     },
-    "node_modules/globby": {
-      "version": "11.1.0",
+    "@types/http-errors": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/@types/http-errors/-/http-errors-2.0.1.tgz",
+      "integrity": "sha512-/K3ds8TRAfBvi5vfjuz8y6+GiAYBZ0x4tXv1Av6CWBWn0IlADc+ZX9pMq7oU0fNQPnBwIZl3rmeLp6SBApbxSQ==",
+      "dev": true
+    },
+    "@types/http-proxy": {
+      "version": "1.17.11",
+      "resolved": "https://registry.npmjs.org/@types/http-proxy/-/http-proxy-1.17.11.tgz",
+      "integrity": "sha512-HC8G7c1WmaF2ekqpnFq626xd3Zz0uvaqFmBJNRZCGEZCXkvSdJoNFn/8Ygbd9fKNQj8UzLdCETaI0UWPAjK7IA==",
       "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "array-union": "^2.1.0",
-        "dir-glob": "^3.0.1",
-        "fast-glob": "^3.2.9",
-        "ignore": "^5.2.0",
-        "merge2": "^1.4.1",
-        "slash": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
+      "requires": {
+        "@types/node": "*"
       }
     },
-    "node_modules/globrex": {
-      "version": "0.1.2",
-      "dev": true,
-      "license": "MIT"
+    "@types/json-schema": {
+      "version": "7.0.12",
+      "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.12.tgz",
+      "integrity": "sha512-Hr5Jfhc9eYOQNPYO5WLDq/n4jqijdHNlDXjuAQkkt+mWdQR+XJToOHrsD4cPaMXpn6KO7y2+wM8AZEs8VpBLVA==",
+      "dev": true
     },
-    "node_modules/goober": {
-      "version": "2.1.13",
-      "license": "MIT",
-      "peerDependencies": {
-        "csstype": "^3.0.10"
+    "@types/json5": {
+      "version": "0.0.29",
+      "resolved": "https://registry.npmjs.org/@types/json5/-/json5-0.0.29.tgz",
+      "integrity": "sha512-dRLjCWHYg4oaA77cxO64oO+7JwCwnIzkZPdrrC71jQmQtlhM556pwKo5bUzqvZndkVbeFLIIi+9TC40JNF5hNQ==",
+      "dev": true
+    },
+    "@types/mime": {
+      "version": "1.3.2",
+      "resolved": "https://registry.npmjs.org/@types/mime/-/mime-1.3.2.tgz",
+      "integrity": "sha512-YATxVxgRqNH6nHEIsvg6k2Boc1JHI9ZbH5iWFFv/MTkchz3b1ieGDa5T0a9RznNdI0KhVbdbWSN+KWWrQZRxTw==",
+      "dev": true
+    },
+    "@types/minimatch": {
+      "version": "5.1.2",
+      "resolved": "https://registry.npmjs.org/@types/minimatch/-/minimatch-5.1.2.tgz",
+      "integrity": "sha512-K0VQKziLUWkVKiRVrx4a40iPaxTUefQmjtkQofBkYRcoaaL/8rhwDWww9qWbrgicNOgnpIsMxyNIUM4+n6dUIA==",
+      "dev": true
+    },
+    "@types/mixpanel-browser": {
+      "version": "2.49.0",
+      "resolved": "https://registry.npmjs.org/@types/mixpanel-browser/-/mixpanel-browser-2.49.0.tgz",
+      "integrity": "sha512-StmgUnS58d44DmIAEX9Kk8qwisAYCl6E2qulIjYyHXUPuJCPOuyUMTTKBp+aU2F2do+kxAzCxiBtsB4fnBT9Fg==",
+      "dev": true
+    },
+    "@types/node": {
+      "version": "20.14.9",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-20.14.9.tgz",
+      "integrity": "sha512-06OCtnTXtWOZBJlRApleWndH4JsRVs1pDCc8dLSQp+7PpUpX3ePdHyeNSFTeSe7FtKyQkrlPvHwJOW3SLd8Oyg==",
+      "requires": {
+        "undici-types": "~5.26.4"
       }
     },
-    "node_modules/gopd": {
-      "version": "1.0.1",
-      "license": "MIT",
-      "dependencies": {
-        "get-intrinsic": "^1.1.3"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
+    "@types/prop-types": {
+      "version": "15.7.5",
+      "resolved": "https://registry.npmjs.org/@types/prop-types/-/prop-types-15.7.5.tgz",
+      "integrity": "sha512-JCB8C6SnDoQf0cNycqd/35A7MjcnK+ZTqE7judS6o7utxUCg6imJg3QK2qzHKszlTjcj2cn+NwMB2i96ubpj7w=="
+    },
+    "@types/qs": {
+      "version": "6.9.7",
+      "resolved": "https://registry.npmjs.org/@types/qs/-/qs-6.9.7.tgz",
+      "integrity": "sha512-FGa1F62FT09qcrueBA6qYTrJPVDzah9a+493+o2PCXsesWHIn27G98TsSMs3WPNbZIEj4+VJf6saSFpvD+3Zsw==",
+      "dev": true
+    },
+    "@types/range-parser": {
+      "version": "1.2.4",
+      "resolved": "https://registry.npmjs.org/@types/range-parser/-/range-parser-1.2.4.tgz",
+      "integrity": "sha512-EEhsLsD6UsDM1yFhAvy0Cjr6VwmpMWqFBCb9w07wVugF7w9nfajxLuVmngTIpgS6svCnm6Vaw+MZhoDCKnOfsw==",
+      "dev": true
+    },
+    "@types/react": {
+      "version": "18.2.18",
+      "resolved": "https://registry.npmjs.org/@types/react/-/react-18.2.18.tgz",
+      "integrity": "sha512-da4NTSeBv/P34xoZPhtcLkmZuJ+oYaCxHmyHzwaDQo9RQPBeXV+06gEk2FpqEcsX9XrnNLvRpVh6bdavDSjtiQ==",
+      "requires": {
+        "@types/prop-types": "*",
+        "@types/scheduler": "*",
+        "csstype": "^3.0.2"
       }
     },
-    "node_modules/graceful-fs": {
-      "version": "4.2.11",
+    "@types/react-dom": {
+      "version": "18.2.7",
+      "resolved": "https://registry.npmjs.org/@types/react-dom/-/react-dom-18.2.7.tgz",
+      "integrity": "sha512-GRaAEriuT4zp9N4p1i8BDBYmEyfo+xQ3yHjJU4eiK5NDa1RmUZG+unZABUTK4/Ox/M+GaHwb6Ow8rUITrtjszA==",
       "dev": true,
-      "license": "ISC"
+      "requires": {
+        "@types/react": "*"
+      }
     },
-    "node_modules/grapheme-splitter": {
-      "version": "1.0.4",
+    "@types/react-lottie": {
+      "version": "1.2.10",
+      "resolved": "https://registry.npmjs.org/@types/react-lottie/-/react-lottie-1.2.10.tgz",
+      "integrity": "sha512-rCd1p3US4ELKJlqwVnP0h5b24zt5p9OCvKUoNpYExLqwbFZMWEiJ6EGLMmH7nmq5V7KomBIbWO2X/XRFsL0vCA==",
       "dev": true,
-      "license": "MIT"
+      "requires": {
+        "@types/react": "*"
+      }
     },
-    "node_modules/graphemer": {
-      "version": "1.4.0",
+    "@types/react-modal": {
+      "version": "3.16.0",
+      "resolved": "https://registry.npmjs.org/@types/react-modal/-/react-modal-3.16.0.tgz",
+      "integrity": "sha512-iphdqXAyUfByLbxJn5j6d+yh93dbMgshqGP0IuBeaKbZXx0aO+OXsvEkt6QctRdxjeM9/bR+Gp3h9F9djVWTQQ==",
       "dev": true,
-      "license": "MIT"
+      "requires": {
+        "@types/react": "*"
+      }
     },
-    "node_modules/handle-thing": {
-      "version": "2.0.1",
-      "dev": true,
-      "license": "MIT"
+    "@types/react-redux": {
+      "version": "7.1.25",
+      "resolved": "https://registry.npmjs.org/@types/react-redux/-/react-redux-7.1.25.tgz",
+      "integrity": "sha512-bAGh4e+w5D8dajd6InASVIyCo4pZLJ66oLb80F9OBLO1gKESbZcRCJpTT6uLXX+HAB57zw1WTdwJdAsewuTweg==",
+      "requires": {
+        "@types/hoist-non-react-statics": "^3.3.0",
+        "@types/react": "*",
+        "hoist-non-react-statics": "^3.3.0",
+        "redux": "^4.0.0"
+      }
     },
-    "node_modules/has": {
-      "version": "1.0.3",
+    "@types/redux-state-sync": {
+      "version": "3.1.5",
+      "resolved": "https://registry.npmjs.org/@types/redux-state-sync/-/redux-state-sync-3.1.5.tgz",
+      "integrity": "sha512-NtcV94bmZNFMmcjgYzjK9WHN/0NVHyH4OO/a4sAd4WG1ywcVZA5vdczjPQZLC1IVMRBi693b3FWsWB7wELL+tg==",
       "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "function-bind": "^1.1.1"
-      },
-      "engines": {
-        "node": ">= 0.4.0"
+      "requires": {
+        "broadcast-channel": "^2.1.8",
+        "redux": "^4.0.1"
       }
     },
-    "node_modules/has-bigints": {
-      "version": "1.0.2",
+    "@types/retry": {
+      "version": "0.12.0",
+      "resolved": "https://registry.npmjs.org/@types/retry/-/retry-0.12.0.tgz",
+      "integrity": "sha512-wWKOClTTiizcZhXnPY4wikVAwmdYHp8q6DmC+EJUzAMsycb7HB32Kh9RN4+0gExjmPmZSAQjgURXIGATPegAvA==",
+      "dev": true
+    },
+    "@types/scheduler": {
+      "version": "0.16.3",
+      "resolved": "https://registry.npmjs.org/@types/scheduler/-/scheduler-0.16.3.tgz",
+      "integrity": "sha512-5cJ8CB4yAx7BH1oMvdU0Jh9lrEXyPkar6F9G/ERswkCuvP4KQZfZkSjcMbAICCpQTN4OuZn8tz0HiKv9TGZgrQ=="
+    },
+    "@types/semver": {
+      "version": "7.5.0",
+      "resolved": "https://registry.npmjs.org/@types/semver/-/semver-7.5.0.tgz",
+      "integrity": "sha512-G8hZ6XJiHnuhQKR7ZmysCeJWE08o8T0AXtk5darsCaTVsYZhhgUrq53jizaR2FvsoeCwJhlmwTjkXBY5Pn/ZHw==",
+      "dev": true
+    },
+    "@types/send": {
+      "version": "0.17.1",
+      "resolved": "https://registry.npmjs.org/@types/send/-/send-0.17.1.tgz",
+      "integrity": "sha512-Cwo8LE/0rnvX7kIIa3QHCkcuF21c05Ayb0ZfxPiv0W8VRiZiNW/WuRupHKpqqGVGf7SUA44QSOUKaEd9lIrd/Q==",
       "dev": true,
-      "license": "MIT",
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
+      "requires": {
+        "@types/mime": "^1",
+        "@types/node": "*"
       }
     },
-    "node_modules/has-flag": {
-      "version": "3.0.0",
-      "license": "MIT",
-      "engines": {
-        "node": ">=4"
+    "@types/serve-index": {
+      "version": "1.9.1",
+      "resolved": "https://registry.npmjs.org/@types/serve-index/-/serve-index-1.9.1.tgz",
+      "integrity": "sha512-d/Hs3nWDxNL2xAczmOVZNj92YZCS6RGxfBPjKzuu/XirCgXdpKEb88dYNbrYGint6IVWLNP+yonwVAuRC0T2Dg==",
+      "dev": true,
+      "requires": {
+        "@types/express": "*"
       }
     },
-    "node_modules/has-own-property": {
-      "version": "0.1.0",
+    "@types/serve-static": {
+      "version": "1.15.2",
+      "resolved": "https://registry.npmjs.org/@types/serve-static/-/serve-static-1.15.2.tgz",
+      "integrity": "sha512-J2LqtvFYCzaj8pVYKw8klQXrLLk7TBZmQ4ShlcdkELFKGwGMfevMLneMMRkMgZxotOD9wg497LpC7O8PcvAmfw==",
       "dev": true,
-      "license": "MIT"
-    },
-    "node_modules/has-property-descriptors": {
-      "version": "1.0.2",
-      "license": "MIT",
-      "dependencies": {
-        "es-define-property": "^1.0.0"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
+      "requires": {
+        "@types/http-errors": "*",
+        "@types/mime": "*",
+        "@types/node": "*"
       }
     },
-    "node_modules/has-proto": {
-      "version": "1.0.1",
-      "license": "MIT",
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
+    "@types/sha.js": {
+      "version": "2.4.4",
+      "resolved": "https://registry.npmjs.org/@types/sha.js/-/sha.js-2.4.4.tgz",
+      "integrity": "sha512-Qukd+D6S2Hm0wLVt2Vh+/eWBIoUt+wF8jWjBsG4F8EFQRwKtYvtXCPcNl2OEUQ1R+eTr3xuSaBYUyM3WD1x/Qw==",
+      "requires": {
+        "@types/node": "*"
       }
     },
-    "node_modules/has-symbols": {
-      "version": "1.0.3",
-      "license": "MIT",
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
+    "@types/sockjs": {
+      "version": "0.3.33",
+      "resolved": "https://registry.npmjs.org/@types/sockjs/-/sockjs-0.3.33.tgz",
+      "integrity": "sha512-f0KEEe05NvUnat+boPTZ0dgaLZ4SfSouXUgv5noUiefG2ajgKjmETo9ZJyuqsl7dfl2aHlLJUiki6B4ZYldiiw==",
+      "dev": true,
+      "requires": {
+        "@types/node": "*"
       }
     },
-    "node_modules/has-tostringtag": {
-      "version": "1.0.0",
-      "license": "MIT",
-      "dependencies": {
-        "has-symbols": "^1.0.2"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
+    "@types/styled-components": {
+      "version": "5.1.26",
+      "resolved": "https://registry.npmjs.org/@types/styled-components/-/styled-components-5.1.26.tgz",
+      "integrity": "sha512-KuKJ9Z6xb93uJiIyxo/+ksS7yLjS1KzG6iv5i78dhVg/X3u5t1H7juRWqVmodIdz6wGVaIApo1u01kmFRdJHVw==",
+      "dev": true,
+      "requires": {
+        "@types/hoist-non-react-statics": "*",
+        "@types/react": "*",
+        "csstype": "^3.0.2"
       }
     },
-    "node_modules/hash-base": {
-      "version": "3.1.0",
-      "license": "MIT",
-      "dependencies": {
-        "inherits": "^2.0.4",
-        "readable-stream": "^3.6.0",
-        "safe-buffer": "^5.2.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
+    "@types/uuid": {
+      "version": "8.3.4",
+      "resolved": "https://registry.npmjs.org/@types/uuid/-/uuid-8.3.4.tgz",
+      "integrity": "sha512-c/I8ZRb51j+pYGAu5CrFMRxqZ2ke4y2grEBO5AUjgSkSk+qT2Ea+OdWElz/OiMf5MNpn2b17kuVBwZLQJXzihw=="
     },
-    "node_modules/hash.js": {
-      "version": "1.1.7",
-      "license": "MIT",
-      "dependencies": {
-        "inherits": "^2.0.3",
-        "minimalistic-assert": "^1.0.1"
-      }
+    "@types/webextension-polyfill": {
+      "version": "0.9.2",
+      "resolved": "https://registry.npmjs.org/@types/webextension-polyfill/-/webextension-polyfill-0.9.2.tgz",
+      "integrity": "sha512-op8YeoK60K6/GIx3snWs3JowBZ+/aeSnZzZuuwynA7VARWfzr3st9aQNk9RWfoBx5xqlNZjAsh2QttPUZnabCw==",
+      "dev": true
     },
-    "node_modules/hasown": {
-      "version": "2.0.2",
-      "license": "MIT",
-      "dependencies": {
-        "function-bind": "^1.1.2"
-      },
-      "engines": {
-        "node": ">= 0.4"
+    "@types/ws": {
+      "version": "8.5.5",
+      "resolved": "https://registry.npmjs.org/@types/ws/-/ws-8.5.5.tgz",
+      "integrity": "sha512-lwhs8hktwxSjf9UaZ9tG5M03PGogvFaH8gUgLNbN9HKIg0dvv6q+gkSuJ8HN4/VbyxkuLzCjlN7GquQ0gUJfIg==",
+      "dev": true,
+      "requires": {
+        "@types/node": "*"
       }
     },
-    "node_modules/he": {
-      "version": "1.2.0",
+    "@types/zxcvbn": {
+      "version": "4.4.1",
+      "resolved": "https://registry.npmjs.org/@types/zxcvbn/-/zxcvbn-4.4.1.tgz",
+      "integrity": "sha512-3NoqvZC2W5gAC5DZbTpCeJ251vGQmgcWIHQJGq2J240HY6ErQ9aWKkwfoKJlHLx+A83WPNTZ9+3cd2ILxbvr1w==",
+      "dev": true
+    },
+    "@typescript-eslint/eslint-plugin": {
+      "version": "5.62.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.62.0.tgz",
+      "integrity": "sha512-TiZzBSJja/LbhNPvk6yc0JrX9XqhQ0hdh6M2svYfsHGejaKFIAGd9MQ+ERIMzLGlN/kZoYIgdxFV0PuljTKXag==",
       "dev": true,
-      "license": "MIT",
-      "bin": {
-        "he": "bin/he"
+      "requires": {
+        "@eslint-community/regexpp": "^4.4.0",
+        "@typescript-eslint/scope-manager": "5.62.0",
+        "@typescript-eslint/type-utils": "5.62.0",
+        "@typescript-eslint/utils": "5.62.0",
+        "debug": "^4.3.4",
+        "graphemer": "^1.4.0",
+        "ignore": "^5.2.0",
+        "natural-compare-lite": "^1.4.0",
+        "semver": "^7.3.7",
+        "tsutils": "^3.21.0"
+      },
+      "dependencies": {
+        "lru-cache": {
+          "version": "6.0.0",
+          "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
+          "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
+          "dev": true,
+          "requires": {
+            "yallist": "^4.0.0"
+          }
+        },
+        "semver": {
+          "version": "7.5.4",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz",
+          "integrity": "sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==",
+          "dev": true,
+          "requires": {
+            "lru-cache": "^6.0.0"
+          }
+        },
+        "yallist": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
+          "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==",
+          "dev": true
+        }
       }
     },
-    "node_modules/hex-rgb": {
-      "version": "4.3.0",
-      "license": "MIT",
-      "engines": {
-        "node": ">=6"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
+    "@typescript-eslint/parser": {
+      "version": "5.62.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-5.62.0.tgz",
+      "integrity": "sha512-VlJEV0fOQ7BExOsHYAGrgbEiZoi8D+Bl2+f6V2RrXerRSylnp+ZBHmPvaIa8cz0Ajx7WO7Z5RqfgYg7ED1nRhA==",
+      "dev": true,
+      "requires": {
+        "@typescript-eslint/scope-manager": "5.62.0",
+        "@typescript-eslint/types": "5.62.0",
+        "@typescript-eslint/typescript-estree": "5.62.0",
+        "debug": "^4.3.4"
       }
     },
-    "node_modules/hmac-drbg": {
-      "version": "1.0.1",
-      "license": "MIT",
-      "dependencies": {
-        "hash.js": "^1.0.3",
-        "minimalistic-assert": "^1.0.0",
-        "minimalistic-crypto-utils": "^1.0.1"
+    "@typescript-eslint/scope-manager": {
+      "version": "5.62.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-5.62.0.tgz",
+      "integrity": "sha512-VXuvVvZeQCQb5Zgf4HAxc04q5j+WrNAtNh9OwCsCgpKqESMTu3tF/jhZ3xG6T4NZwWl65Bg8KuS2uEvhSfLl0w==",
+      "dev": true,
+      "requires": {
+        "@typescript-eslint/types": "5.62.0",
+        "@typescript-eslint/visitor-keys": "5.62.0"
       }
     },
-    "node_modules/hoist-non-react-statics": {
-      "version": "3.3.2",
-      "license": "BSD-3-Clause",
-      "dependencies": {
-        "react-is": "^16.7.0"
+    "@typescript-eslint/type-utils": {
+      "version": "5.62.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-5.62.0.tgz",
+      "integrity": "sha512-xsSQreu+VnfbqQpW5vnCJdq1Z3Q0U31qiWmRhr98ONQmcp/yhiPJFPq8MXiJVLiksmOKSjIldZzkebzHuCGzew==",
+      "dev": true,
+      "requires": {
+        "@typescript-eslint/typescript-estree": "5.62.0",
+        "@typescript-eslint/utils": "5.62.0",
+        "debug": "^4.3.4",
+        "tsutils": "^3.21.0"
       }
     },
-    "node_modules/hoist-non-react-statics/node_modules/react-is": {
-      "version": "16.13.1",
-      "license": "MIT"
+    "@typescript-eslint/types": {
+      "version": "5.62.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-5.62.0.tgz",
+      "integrity": "sha512-87NVngcbVXUahrRTqIK27gD2t5Cu1yuCXxbLcFtCzZGlfyVWWh8mLHkoxzjsB6DDNnvdL+fW8MiwPEJyGJQDgQ==",
+      "dev": true
     },
-    "node_modules/hpack.js": {
-      "version": "2.1.6",
+    "@typescript-eslint/typescript-estree": {
+      "version": "5.62.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-5.62.0.tgz",
+      "integrity": "sha512-CmcQ6uY7b9y694lKdRB8FEel7JbU/40iSAPomu++SjLMntB+2Leay2LO6i8VnJk58MtE9/nQSFIH6jpyRWyYzA==",
       "dev": true,
-      "license": "MIT",
+      "requires": {
+        "@typescript-eslint/types": "5.62.0",
+        "@typescript-eslint/visitor-keys": "5.62.0",
+        "debug": "^4.3.4",
+        "globby": "^11.1.0",
+        "is-glob": "^4.0.3",
+        "semver": "^7.3.7",
+        "tsutils": "^3.21.0"
+      },
       "dependencies": {
-        "inherits": "^2.0.1",
-        "obuf": "^1.0.0",
-        "readable-stream": "^2.0.1",
-        "wbuf": "^1.1.0"
+        "lru-cache": {
+          "version": "6.0.0",
+          "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
+          "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
+          "dev": true,
+          "requires": {
+            "yallist": "^4.0.0"
+          }
+        },
+        "semver": {
+          "version": "7.5.4",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz",
+          "integrity": "sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==",
+          "dev": true,
+          "requires": {
+            "lru-cache": "^6.0.0"
+          }
+        },
+        "yallist": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
+          "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==",
+          "dev": true
+        }
       }
     },
-    "node_modules/hpack.js/node_modules/isarray": {
-      "version": "1.0.0",
-      "dev": true,
-      "license": "MIT"
-    },
-    "node_modules/hpack.js/node_modules/readable-stream": {
-      "version": "2.3.8",
+    "@typescript-eslint/utils": {
+      "version": "5.62.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-5.62.0.tgz",
+      "integrity": "sha512-n8oxjeb5aIbPFEtmQxQYOLI0i9n5ySBEY/ZEHHZqKQSFnxio1rv6dthascc9dLuwrL0RC5mPCxB7vnAVGAYWAQ==",
       "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "core-util-is": "~1.0.0",
-        "inherits": "~2.0.3",
-        "isarray": "~1.0.0",
-        "process-nextick-args": "~2.0.0",
-        "safe-buffer": "~5.1.1",
-        "string_decoder": "~1.1.1",
-        "util-deprecate": "~1.0.1"
+      "requires": {
+        "@eslint-community/eslint-utils": "^4.2.0",
+        "@types/json-schema": "^7.0.9",
+        "@types/semver": "^7.3.12",
+        "@typescript-eslint/scope-manager": "5.62.0",
+        "@typescript-eslint/types": "5.62.0",
+        "@typescript-eslint/typescript-estree": "5.62.0",
+        "eslint-scope": "^5.1.1",
+        "semver": "^7.3.7"
+      },
+      "dependencies": {
+        "lru-cache": {
+          "version": "6.0.0",
+          "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
+          "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
+          "dev": true,
+          "requires": {
+            "yallist": "^4.0.0"
+          }
+        },
+        "semver": {
+          "version": "7.5.4",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz",
+          "integrity": "sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==",
+          "dev": true,
+          "requires": {
+            "lru-cache": "^6.0.0"
+          }
+        },
+        "yallist": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
+          "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==",
+          "dev": true
+        }
       }
     },
-    "node_modules/hpack.js/node_modules/safe-buffer": {
-      "version": "5.1.2",
+    "@typescript-eslint/visitor-keys": {
+      "version": "5.62.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-5.62.0.tgz",
+      "integrity": "sha512-07ny+LHRzQXepkGg6w0mFY41fVUNBrL2Roj/++7V1txKugfjm/Ci/qSND03r2RhlJhJYMcTn9AhhSSqQp0Ysyw==",
       "dev": true,
-      "license": "MIT"
+      "requires": {
+        "@typescript-eslint/types": "5.62.0",
+        "eslint-visitor-keys": "^3.3.0"
+      }
     },
-    "node_modules/hpack.js/node_modules/string_decoder": {
-      "version": "1.1.1",
+    "@vitest/expect": {
+      "version": "0.34.6",
+      "resolved": "https://registry.npmjs.org/@vitest/expect/-/expect-0.34.6.tgz",
+      "integrity": "sha512-QUzKpUQRc1qC7qdGo7rMK3AkETI7w18gTCUrsNnyjjJKYiuUB9+TQK3QnR1unhCnWRC0AbKv2omLGQDF/mIjOw==",
       "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "safe-buffer": "~5.1.0"
+      "requires": {
+        "@vitest/spy": "0.34.6",
+        "@vitest/utils": "0.34.6",
+        "chai": "^4.3.10"
       }
     },
-    "node_modules/html-entities": {
-      "version": "2.4.0",
+    "@vitest/runner": {
+      "version": "0.34.6",
+      "resolved": "https://registry.npmjs.org/@vitest/runner/-/runner-0.34.6.tgz",
+      "integrity": "sha512-1CUQgtJSLF47NnhN+F9X2ycxUP0kLHQ/JWvNHbeBfwW8CzEGgeskzNnHDyv1ieKTltuR6sdIHV+nmR6kPxQqzQ==",
       "dev": true,
-      "funding": [
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/mdevils"
+      "requires": {
+        "@vitest/utils": "0.34.6",
+        "p-limit": "^4.0.0",
+        "pathe": "^1.1.1"
+      },
+      "dependencies": {
+        "p-limit": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-4.0.0.tgz",
+          "integrity": "sha512-5b0R4txpzjPWVw/cXXUResoD4hb6U/x9BH08L7nw+GN1sezDzPdxeRvpc9c433fZhBan/wusjbCsqwqm4EIBIQ==",
+          "dev": true,
+          "requires": {
+            "yocto-queue": "^1.0.0"
+          }
         },
-        {
-          "type": "patreon",
-          "url": "https://patreon.com/mdevils"
+        "yocto-queue": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/yocto-queue/-/yocto-queue-1.0.0.tgz",
+          "integrity": "sha512-9bnSc/HEW2uRy67wc+T8UwauLuPJVn28jb+GtJY16iiKWyvmYJRXVT4UamsAEGQfPohgr2q4Tq0sQbQlxTfi1g==",
+          "dev": true
         }
-      ],
-      "license": "MIT"
+      }
     },
-    "node_modules/html-loader": {
-      "version": "4.2.0",
+    "@vitest/snapshot": {
+      "version": "0.34.6",
+      "resolved": "https://registry.npmjs.org/@vitest/snapshot/-/snapshot-0.34.6.tgz",
+      "integrity": "sha512-B3OZqYn6k4VaN011D+ve+AA4whM4QkcwcrwaKwAbyyvS/NB1hCWjFIBQxAQQSQir9/RtyAAGuq+4RJmbn2dH4w==",
       "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "html-minifier-terser": "^7.0.0",
-        "parse5": "^7.0.0"
-      },
-      "engines": {
-        "node": ">= 14.15.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/webpack"
+      "requires": {
+        "magic-string": "^0.30.1",
+        "pathe": "^1.1.1",
+        "pretty-format": "^29.5.0"
       },
-      "peerDependencies": {
-        "webpack": "^5.0.0"
+      "dependencies": {
+        "ansi-styles": {
+          "version": "5.2.0",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-5.2.0.tgz",
+          "integrity": "sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==",
+          "dev": true
+        },
+        "pretty-format": {
+          "version": "29.7.0",
+          "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-29.7.0.tgz",
+          "integrity": "sha512-Pdlw/oPxN+aXdmM9R00JVC9WVFoCLTKJvDVLgmJ+qAffBMxsV85l/Lu7sNx4zSzPyoL2euImuEwHhOXdEgNFZQ==",
+          "dev": true,
+          "requires": {
+            "@jest/schemas": "^29.6.3",
+            "ansi-styles": "^5.0.0",
+            "react-is": "^18.0.0"
+          }
+        }
       }
     },
-    "node_modules/html-minifier-terser": {
-      "version": "7.2.0",
+    "@vitest/spy": {
+      "version": "0.34.6",
+      "resolved": "https://registry.npmjs.org/@vitest/spy/-/spy-0.34.6.tgz",
+      "integrity": "sha512-xaCvneSaeBw/cz8ySmF7ZwGvL0lBjfvqc1LpQ/vcdHEvpLn3Ff1vAvjw+CoGn0802l++5L/pxb7whwcWAw+DUQ==",
       "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "camel-case": "^4.1.2",
-        "clean-css": "~5.3.2",
-        "commander": "^10.0.0",
-        "entities": "^4.4.0",
-        "param-case": "^3.0.4",
-        "relateurl": "^0.2.7",
-        "terser": "^5.15.1"
-      },
-      "bin": {
-        "html-minifier-terser": "cli.js"
-      },
-      "engines": {
-        "node": "^14.13.1 || >=16.0.0"
+      "requires": {
+        "tinyspy": "^2.1.1"
       }
     },
-    "node_modules/html-parse-stringify": {
-      "version": "3.0.1",
-      "license": "MIT",
+    "@vitest/utils": {
+      "version": "0.34.6",
+      "resolved": "https://registry.npmjs.org/@vitest/utils/-/utils-0.34.6.tgz",
+      "integrity": "sha512-IG5aDD8S6zlvloDsnzHw0Ut5xczlF+kv2BOTo+iXfPr54Yhi5qbVOgGB1hZaVq4iJ4C/MZ2J0y15IlsV/ZcI0A==",
+      "dev": true,
+      "requires": {
+        "diff-sequences": "^29.4.3",
+        "loupe": "^2.3.6",
+        "pretty-format": "^29.5.0"
+      },
       "dependencies": {
-        "void-elements": "3.1.0"
+        "ansi-styles": {
+          "version": "5.2.0",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-5.2.0.tgz",
+          "integrity": "sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==",
+          "dev": true
+        },
+        "diff-sequences": {
+          "version": "29.6.3",
+          "resolved": "https://registry.npmjs.org/diff-sequences/-/diff-sequences-29.6.3.tgz",
+          "integrity": "sha512-EjePK1srD3P08o2j4f0ExnylqRs5B9tJjcp9t1krH2qRi8CCdsYfwe9JgSLurFBWwq4uOlipzfk5fHNvwFKr8Q==",
+          "dev": true
+        },
+        "pretty-format": {
+          "version": "29.7.0",
+          "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-29.7.0.tgz",
+          "integrity": "sha512-Pdlw/oPxN+aXdmM9R00JVC9WVFoCLTKJvDVLgmJ+qAffBMxsV85l/Lu7sNx4zSzPyoL2euImuEwHhOXdEgNFZQ==",
+          "dev": true,
+          "requires": {
+            "@jest/schemas": "^29.6.3",
+            "ansi-styles": "^5.0.0",
+            "react-is": "^18.0.0"
+          }
+        }
       }
     },
-    "node_modules/html-webpack-plugin": {
-      "version": "5.5.3",
+    "@webassemblyjs/ast": {
+      "version": "1.11.6",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/ast/-/ast-1.11.6.tgz",
+      "integrity": "sha512-IN1xI7PwOvLPgjcf180gC1bqn3q/QaOCwYUahIOhbYUu8KA/3tw2RT/T0Gidi1l7Hhj5D/INhJxiICObqpMu4Q==",
       "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "@types/html-minifier-terser": "^6.0.0",
-        "html-minifier-terser": "^6.0.2",
-        "lodash": "^4.17.21",
-        "pretty-error": "^4.0.0",
-        "tapable": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=10.13.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/html-webpack-plugin"
-      },
-      "peerDependencies": {
-        "webpack": "^5.20.0"
+      "requires": {
+        "@webassemblyjs/helper-numbers": "1.11.6",
+        "@webassemblyjs/helper-wasm-bytecode": "1.11.6"
       }
     },
-    "node_modules/html-webpack-plugin/node_modules/commander": {
-      "version": "8.3.0",
+    "@webassemblyjs/floating-point-hex-parser": {
+      "version": "1.11.6",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.11.6.tgz",
+      "integrity": "sha512-ejAj9hfRJ2XMsNHk/v6Fu2dGS+i4UaXBXGemOfQ/JfQ6mdQg/WXtwleQRLLS4OvfDhv8rYnVwH27YJLMyYsxhw==",
+      "dev": true
+    },
+    "@webassemblyjs/helper-api-error": {
+      "version": "1.11.6",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-api-error/-/helper-api-error-1.11.6.tgz",
+      "integrity": "sha512-o0YkoP4pVu4rN8aTJgAyj9hC2Sv5UlkzCHhxqWj8butaLvnpdc2jOwh4ewE6CX0txSfLn/UYaV/pheS2Txg//Q==",
+      "dev": true
+    },
+    "@webassemblyjs/helper-buffer": {
+      "version": "1.11.6",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-buffer/-/helper-buffer-1.11.6.tgz",
+      "integrity": "sha512-z3nFzdcp1mb8nEOFFk8DrYLpHvhKC3grJD2ardfKOzmbmJvEf/tPIqCY+sNcwZIY8ZD7IkB2l7/pqhUhqm7hLA==",
+      "dev": true
+    },
+    "@webassemblyjs/helper-numbers": {
+      "version": "1.11.6",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-numbers/-/helper-numbers-1.11.6.tgz",
+      "integrity": "sha512-vUIhZ8LZoIWHBohiEObxVm6hwP034jwmc9kuq5GdHZH0wiLVLIPcMCdpJzG4C11cHoQ25TFIQj9kaVADVX7N3g==",
       "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">= 12"
+      "requires": {
+        "@webassemblyjs/floating-point-hex-parser": "1.11.6",
+        "@webassemblyjs/helper-api-error": "1.11.6",
+        "@xtuc/long": "4.2.2"
       }
     },
-    "node_modules/html-webpack-plugin/node_modules/html-minifier-terser": {
-      "version": "6.1.0",
+    "@webassemblyjs/helper-wasm-bytecode": {
+      "version": "1.11.6",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.11.6.tgz",
+      "integrity": "sha512-sFFHKwcmBprO9e7Icf0+gddyWYDViL8bpPjJJl0WHxCdETktXdmtWLGVzoHbqUcY4Be1LkNfwTmXOJUFZYSJdA==",
+      "dev": true
+    },
+    "@webassemblyjs/helper-wasm-section": {
+      "version": "1.11.6",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.11.6.tgz",
+      "integrity": "sha512-LPpZbSOwTpEC2cgn4hTydySy1Ke+XEu+ETXuoyvuyezHO3Kjdu90KK95Sh9xTbmjrCsUwvWwCOQQNta37VrS9g==",
       "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "camel-case": "^4.1.2",
-        "clean-css": "^5.2.2",
-        "commander": "^8.3.0",
-        "he": "^1.2.0",
-        "param-case": "^3.0.4",
-        "relateurl": "^0.2.7",
-        "terser": "^5.10.0"
-      },
-      "bin": {
-        "html-minifier-terser": "cli.js"
-      },
-      "engines": {
-        "node": ">=12"
+      "requires": {
+        "@webassemblyjs/ast": "1.11.6",
+        "@webassemblyjs/helper-buffer": "1.11.6",
+        "@webassemblyjs/helper-wasm-bytecode": "1.11.6",
+        "@webassemblyjs/wasm-gen": "1.11.6"
       }
     },
-    "node_modules/htmlparser2": {
-      "version": "6.1.0",
+    "@webassemblyjs/ieee754": {
+      "version": "1.11.6",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/ieee754/-/ieee754-1.11.6.tgz",
+      "integrity": "sha512-LM4p2csPNvbij6U1f19v6WR56QZ8JcHg3QIJTlSwzFcmx6WSORicYj6I63f9yU1kEUtrpG+kjkiIAkevHpDXrg==",
       "dev": true,
-      "funding": [
-        "https://github.com/fb55/htmlparser2?sponsor=1",
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/fb55"
-        }
-      ],
-      "license": "MIT",
-      "dependencies": {
-        "domelementtype": "^2.0.1",
-        "domhandler": "^4.0.0",
-        "domutils": "^2.5.2",
-        "entities": "^2.0.0"
+      "requires": {
+        "@xtuc/ieee754": "^1.2.0"
       }
     },
-    "node_modules/htmlparser2/node_modules/entities": {
-      "version": "2.2.0",
+    "@webassemblyjs/leb128": {
+      "version": "1.11.6",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/leb128/-/leb128-1.11.6.tgz",
+      "integrity": "sha512-m7a0FhE67DQXgouf1tbN5XQcdWoNgaAuoULHIfGFIEVKA6tu/edls6XnIlkmS6FrXAquJRPni3ZZKjw6FSPjPQ==",
       "dev": true,
-      "license": "BSD-2-Clause",
-      "funding": {
-        "url": "https://github.com/fb55/entities?sponsor=1"
+      "requires": {
+        "@xtuc/long": "4.2.2"
       }
     },
-    "node_modules/http-deceiver": {
-      "version": "1.2.7",
-      "dev": true,
-      "license": "MIT"
+    "@webassemblyjs/utf8": {
+      "version": "1.11.6",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/utf8/-/utf8-1.11.6.tgz",
+      "integrity": "sha512-vtXf2wTQ3+up9Zsg8sa2yWiQpzSsMyXj0qViVP6xKGCUT8p8YJ6HqI7l5eCnWx1T/FYdsv07HQs2wTFbbof/RA==",
+      "dev": true
     },
-    "node_modules/http-errors": {
-      "version": "2.0.0",
+    "@webassemblyjs/wasm-edit": {
+      "version": "1.11.6",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-edit/-/wasm-edit-1.11.6.tgz",
+      "integrity": "sha512-Ybn2I6fnfIGuCR+Faaz7YcvtBKxvoLV3Lebn1tM4o/IAJzmi9AWYIPWpyBfU8cC+JxAO57bk4+zdsTjJR+VTOw==",
       "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "depd": "2.0.0",
-        "inherits": "2.0.4",
-        "setprototypeof": "1.2.0",
-        "statuses": "2.0.1",
-        "toidentifier": "1.0.1"
-      },
-      "engines": {
-        "node": ">= 0.8"
+      "requires": {
+        "@webassemblyjs/ast": "1.11.6",
+        "@webassemblyjs/helper-buffer": "1.11.6",
+        "@webassemblyjs/helper-wasm-bytecode": "1.11.6",
+        "@webassemblyjs/helper-wasm-section": "1.11.6",
+        "@webassemblyjs/wasm-gen": "1.11.6",
+        "@webassemblyjs/wasm-opt": "1.11.6",
+        "@webassemblyjs/wasm-parser": "1.11.6",
+        "@webassemblyjs/wast-printer": "1.11.6"
       }
     },
-    "node_modules/http-parser-js": {
-      "version": "0.5.8",
-      "dev": true,
-      "license": "MIT"
-    },
-    "node_modules/http-proxy": {
-      "version": "1.18.1",
+    "@webassemblyjs/wasm-gen": {
+      "version": "1.11.6",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-gen/-/wasm-gen-1.11.6.tgz",
+      "integrity": "sha512-3XOqkZP/y6B4F0PBAXvI1/bky7GryoogUtfwExeP/v7Nzwo1QLcq5oQmpKlftZLbT+ERUOAZVQjuNVak6UXjPA==",
       "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "eventemitter3": "^4.0.0",
-        "follow-redirects": "^1.0.0",
-        "requires-port": "^1.0.0"
-      },
-      "engines": {
-        "node": ">=8.0.0"
+      "requires": {
+        "@webassemblyjs/ast": "1.11.6",
+        "@webassemblyjs/helper-wasm-bytecode": "1.11.6",
+        "@webassemblyjs/ieee754": "1.11.6",
+        "@webassemblyjs/leb128": "1.11.6",
+        "@webassemblyjs/utf8": "1.11.6"
       }
     },
-    "node_modules/http-proxy-middleware": {
-      "version": "2.0.6",
+    "@webassemblyjs/wasm-opt": {
+      "version": "1.11.6",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-opt/-/wasm-opt-1.11.6.tgz",
+      "integrity": "sha512-cOrKuLRE7PCe6AsOVl7WasYf3wbSo4CeOk6PkrjS7g57MFfVUF9u6ysQBBODX0LdgSvQqRiGz3CXvIDKcPNy4g==",
       "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "@types/http-proxy": "^1.17.8",
-        "http-proxy": "^1.18.1",
-        "is-glob": "^4.0.1",
-        "is-plain-obj": "^3.0.0",
-        "micromatch": "^4.0.2"
-      },
-      "engines": {
-        "node": ">=12.0.0"
-      },
-      "peerDependencies": {
-        "@types/express": "^4.17.13"
-      },
-      "peerDependenciesMeta": {
-        "@types/express": {
-          "optional": true
-        }
+      "requires": {
+        "@webassemblyjs/ast": "1.11.6",
+        "@webassemblyjs/helper-buffer": "1.11.6",
+        "@webassemblyjs/wasm-gen": "1.11.6",
+        "@webassemblyjs/wasm-parser": "1.11.6"
       }
     },
-    "node_modules/human-signals": {
-      "version": "2.1.0",
+    "@webassemblyjs/wasm-parser": {
+      "version": "1.11.6",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-parser/-/wasm-parser-1.11.6.tgz",
+      "integrity": "sha512-6ZwPeGzMJM3Dqp3hCsLgESxBGtT/OeCvCZ4TA1JUPYgmhAx38tTPR9JaKy0S5H3evQpO/h2uWs2j6Yc/fjkpTQ==",
       "dev": true,
-      "license": "Apache-2.0",
-      "engines": {
-        "node": ">=10.17.0"
+      "requires": {
+        "@webassemblyjs/ast": "1.11.6",
+        "@webassemblyjs/helper-api-error": "1.11.6",
+        "@webassemblyjs/helper-wasm-bytecode": "1.11.6",
+        "@webassemblyjs/ieee754": "1.11.6",
+        "@webassemblyjs/leb128": "1.11.6",
+        "@webassemblyjs/utf8": "1.11.6"
       }
     },
-    "node_modules/husky": {
-      "version": "8.0.3",
+    "@webassemblyjs/wast-printer": {
+      "version": "1.11.6",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/wast-printer/-/wast-printer-1.11.6.tgz",
+      "integrity": "sha512-JM7AhRcE+yW2GWYaKeHL5vt4xqee5N2WcezptmgyhNS+ScggqcT1OtXykhAb13Sn5Yas0j2uv9tHgrjwvzAP4A==",
       "dev": true,
-      "license": "MIT",
-      "bin": {
-        "husky": "lib/bin.js"
-      },
-      "engines": {
-        "node": ">=14"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/typicode"
+      "requires": {
+        "@webassemblyjs/ast": "1.11.6",
+        "@xtuc/long": "4.2.2"
       }
     },
-    "node_modules/i18next": {
-      "version": "21.10.0",
-      "funding": [
-        {
-          "type": "individual",
-          "url": "https://locize.com"
+    "@xtuc/ieee754": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/@xtuc/ieee754/-/ieee754-1.2.0.tgz",
+      "integrity": "sha512-DX8nKgqcGwsc0eJSqYt5lwP4DH5FlHnmuWWBRy7X0NcaGR0ZtuyeESgMwTYVEtxmsNGY+qit4QYT/MIYTOTPeA==",
+      "dev": true
+    },
+    "@xtuc/long": {
+      "version": "4.2.2",
+      "resolved": "https://registry.npmjs.org/@xtuc/long/-/long-4.2.2.tgz",
+      "integrity": "sha512-NuHqBY1PB/D8xU6s/thBgOAiAP7HOYDQ32+BFZILJ8ivkUkAHQnWfn6WhL79Owj1qmUnoN/YPhktdIoucipkAQ==",
+      "dev": true
+    },
+    "@zondax/ledger-stacks": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/@zondax/ledger-stacks/-/ledger-stacks-1.0.4.tgz",
+      "integrity": "sha512-R8CB0CZ2poTzpcG0jhzzXZvXF7axIsmZFhp06aHCUjgz+1df63YbC4tUzyzmseekwqNWnaebWFejQKJ99WiHZA==",
+      "requires": {
+        "@babel/runtime": "^7.12.5",
+        "@ledgerhq/hw-transport": "^6.28.1",
+        "@stacks/transactions": "^4.1.0",
+        "varuint-bitcoin": "^1.1.2"
+      },
+      "dependencies": {
+        "@stacks/common": {
+          "version": "4.3.5",
+          "resolved": "https://registry.npmjs.org/@stacks/common/-/common-4.3.5.tgz",
+          "integrity": "sha512-UuViiQ7fn3vdtTe3739aRzbl+wbukekeQuXgqt8d7nB2HC2HodD7GcHhpUga165cO35CD6lQUtj3vXxJb5Ga+A==",
+          "requires": {
+            "@types/bn.js": "^5.1.0",
+            "@types/node": "^18.0.4",
+            "buffer": "6.0.3"
+          }
         },
-        {
-          "type": "individual",
-          "url": "https://locize.com/i18next.html"
+        "@stacks/network": {
+          "version": "4.3.5",
+          "resolved": "https://registry.npmjs.org/@stacks/network/-/network-4.3.5.tgz",
+          "integrity": "sha512-TC4+AkuT6qi3MoEGxTftA+4BNp99QvGnI+qtKQkoA1m0KDr8b9hSBUhugJHRhQbWuo7D6q0+JagYEGxLID29Kw==",
+          "requires": {
+            "@stacks/common": "^4.3.5",
+            "cross-fetch": "^3.1.5"
+          }
         },
-        {
-          "type": "individual",
-          "url": "https://www.i18next.com/how-to/faq#i18next-is-awesome.-how-can-i-support-the-project"
+        "@stacks/transactions": {
+          "version": "4.3.8",
+          "resolved": "https://registry.npmjs.org/@stacks/transactions/-/transactions-4.3.8.tgz",
+          "integrity": "sha512-5xYYv2TdXXM9PVixB79Pr99symQ8fhbVATjempGUxtL23/XUiRiLvJZohDxIE4VQ2EzbB4g4j8Y7oqPjj0h09Q==",
+          "requires": {
+            "@noble/hashes": "^1.0.0",
+            "@noble/secp256k1": "^1.5.5",
+            "@stacks/common": "^4.3.5",
+            "@stacks/network": "^4.3.5",
+            "@types/node": "^18.0.4",
+            "@types/sha.js": "^2.4.0",
+            "c32check": "^1.1.3",
+            "lodash.clonedeep": "^4.5.0",
+            "ripemd160-min": "^0.0.6",
+            "sha.js": "^2.4.11",
+            "smart-buffer": "^4.1.0"
+          }
+        },
+        "@types/node": {
+          "version": "18.19.42",
+          "resolved": "https://registry.npmjs.org/@types/node/-/node-18.19.42.tgz",
+          "integrity": "sha512-d2ZFc/3lnK2YCYhos8iaNIYu9Vfhr92nHiyJHRltXWjXUBjEE+A4I58Tdbnw4VhggSW+2j5y5gTrLs4biNnubg==",
+          "requires": {
+            "undici-types": "~5.26.4"
+          }
+        },
+        "base-x": {
+          "version": "3.0.10",
+          "resolved": "https://registry.npmjs.org/base-x/-/base-x-3.0.10.tgz",
+          "integrity": "sha512-7d0s06rR9rYaIWHkpfLIFICM/tkSVdoPC9qYAQRpxn9DdKNWNsKC0uk++akckyLq16Tx2WIinnZ6WRriAt6njQ==",
+          "requires": {
+            "safe-buffer": "^5.0.1"
+          }
+        },
+        "c32check": {
+          "version": "1.1.3",
+          "resolved": "https://registry.npmjs.org/c32check/-/c32check-1.1.3.tgz",
+          "integrity": "sha512-ADADE/PjAbJRlwpG3ShaOMbBUlJJZO7xaYSRD5Tub6PixQlgR4s36y9cvMf/YRGpkqX+QOxIdMw216iC320q9A==",
+          "requires": {
+            "base-x": "^3.0.8",
+            "buffer": "6.0.3",
+            "cross-sha256": "^1.2.0"
+          }
         }
-      ],
-      "license": "MIT",
-      "dependencies": {
-        "@babel/runtime": "^7.17.2"
       }
     },
-    "node_modules/iced-error": {
-      "version": "0.0.13",
-      "resolved": "https://registry.npmjs.org/iced-error/-/iced-error-0.0.13.tgz",
-      "integrity": "sha512-yEEaG8QfyyRL0SsbNNDw3rVgTyqwHFMCuV6jDvD43f/2shmdaFXkqvFLGhDlsYNSolzYHwVLM/CrXt9GygYopA=="
-    },
-    "node_modules/iced-lock": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/iced-lock/-/iced-lock-1.1.0.tgz",
-      "integrity": "sha512-J9UMVitgTMYrkUil5EB9/Q4BPWiMpFH156yjDlmMoMRKs3s3PnXj/6G0UlzIOGnNi5JVNk/zVYLXVnuo+1QnqQ==",
-      "dependencies": {
-        "iced-runtime": "^1.0.0"
+    "accepts": {
+      "version": "1.3.8",
+      "resolved": "https://registry.npmjs.org/accepts/-/accepts-1.3.8.tgz",
+      "integrity": "sha512-PYAthTa2m2VKxuvSD3DPC/Gy+U+sOA1LAuT8mkmRuvw+NACSaeXEQ+NHcVF7rONl6qcaxV3Uuemwawk+7+SJLw==",
+      "dev": true,
+      "requires": {
+        "mime-types": "~2.1.34",
+        "negotiator": "0.6.3"
       }
     },
-    "node_modules/iced-runtime": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/iced-runtime/-/iced-runtime-1.0.4.tgz",
-      "integrity": "sha512-rgiJXNF6ZgF2Clh/TKUlBDW3q51YPDJUXmxGQXx1b8tbZpVpTn+1RX9q1sjNkujXIIaVxZByQzPHHORg7KV51g=="
+    "acorn": {
+      "version": "8.10.0",
+      "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.10.0.tgz",
+      "integrity": "sha512-F0SAmZ8iUtS//m8DmCTA0jlh6TDKkHQyK6xc6V4KDTyZKA9dnvX9/3sRTVQrWm79glUAZbnmmNcdYwUIHWVybw==",
+      "dev": true
     },
-    "node_modules/icss-utils": {
-      "version": "5.1.0",
+    "acorn-import-assertions": {
+      "version": "1.9.0",
+      "resolved": "https://registry.npmjs.org/acorn-import-assertions/-/acorn-import-assertions-1.9.0.tgz",
+      "integrity": "sha512-cmMwop9x+8KFhxvKrKfPYmN6/pKTYYHBqLa0DfvVZcKMJWNyWLnaqND7dx/qn66R7ewM1UX5XMaDVP5wlVTaVA==",
       "dev": true,
-      "license": "ISC",
-      "engines": {
-        "node": "^10 || ^12 || >= 14"
-      },
-      "peerDependencies": {
-        "postcss": "^8.1.0"
-      }
+      "requires": {}
     },
-    "node_modules/identity-function": {
-      "version": "1.0.0",
+    "acorn-jsx": {
+      "version": "5.3.2",
+      "resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.3.2.tgz",
+      "integrity": "sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==",
       "dev": true,
-      "license": "public domain"
+      "requires": {}
     },
-    "node_modules/ieee754": {
-      "version": "1.2.1",
-      "funding": [
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/feross"
-        },
-        {
-          "type": "patreon",
-          "url": "https://www.patreon.com/feross"
-        },
-        {
-          "type": "consulting",
-          "url": "https://feross.org/support"
-        }
-      ],
-      "license": "BSD-3-Clause"
+    "acorn-walk": {
+      "version": "8.3.0",
+      "resolved": "https://registry.npmjs.org/acorn-walk/-/acorn-walk-8.3.0.tgz",
+      "integrity": "sha512-FS7hV565M5l1R08MXqo8odwMTB02C2UqzB17RVgu9EyuYFBqJZ3/ZY97sQD5FewVu1UyDFc1yztUDrAwT0EypA==",
+      "dev": true
     },
-    "node_modules/ignore": {
-      "version": "5.2.4",
+    "aggregate-error": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/aggregate-error/-/aggregate-error-3.1.0.tgz",
+      "integrity": "sha512-4I7Td01quW/RpocfNayFdFVk1qSuoh0E7JrbRJ16nH01HhKFQ88INq9Sd+nd72zqRySlr9BmDA8xlEJ6vJMrYA==",
       "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">= 4"
+      "requires": {
+        "clean-stack": "^2.0.0",
+        "indent-string": "^4.0.0"
       }
     },
-    "node_modules/import-fresh": {
-      "version": "3.3.0",
+    "ajv": {
+      "version": "6.12.6",
+      "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
+      "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
       "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "parent-module": "^1.0.0",
-        "resolve-from": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=6"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
+      "requires": {
+        "fast-deep-equal": "^3.1.1",
+        "fast-json-stable-stringify": "^2.0.0",
+        "json-schema-traverse": "^0.4.1",
+        "uri-js": "^4.2.2"
       }
     },
-    "node_modules/imurmurhash": {
-      "version": "0.1.4",
+    "ajv-formats": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/ajv-formats/-/ajv-formats-2.1.1.tgz",
+      "integrity": "sha512-Wx0Kx52hxE7C18hkMEggYlEifqWZtYaRgouJor+WMdPnQyEK13vgEWyVNup7SoeeoLMsr4kf5h6dOW11I15MUA==",
       "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=0.8.19"
+      "requires": {
+        "ajv": "^8.0.0"
+      },
+      "dependencies": {
+        "ajv": {
+          "version": "8.12.0",
+          "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.12.0.tgz",
+          "integrity": "sha512-sRu1kpcO9yLtYxBKvqfTeh9KzZEwO3STyX1HT+4CaDzC6HpTGYhIhPIzj9XuKU7KYDwnaeh5hcOwjy1QuJzBPA==",
+          "dev": true,
+          "requires": {
+            "fast-deep-equal": "^3.1.1",
+            "json-schema-traverse": "^1.0.0",
+            "require-from-string": "^2.0.2",
+            "uri-js": "^4.2.2"
+          }
+        },
+        "json-schema-traverse": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz",
+          "integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==",
+          "dev": true
+        }
       }
     },
-    "node_modules/indent-string": {
-      "version": "4.0.0",
+    "ajv-keywords": {
+      "version": "3.5.2",
+      "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.5.2.tgz",
+      "integrity": "sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==",
       "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=8"
-      }
+      "requires": {}
     },
-    "node_modules/inflight": {
-      "version": "1.0.6",
-      "license": "ISC",
-      "dependencies": {
-        "once": "^1.3.0",
-        "wrappy": "1"
+    "alex-sdk": {
+      "version": "0.1.26",
+      "resolved": "https://registry.npmjs.org/alex-sdk/-/alex-sdk-0.1.26.tgz",
+      "integrity": "sha512-uUjbONoAit6htxZGLOFev8v2h59kE31fM1X9efH0Yi1eLXYSSXojj+iFPTlQTQvIysyseXGxkX4VVTc9aQ13sg==",
+      "requires": {
+        "clarity-codegen": "^0.3.5"
       }
     },
-    "node_modules/inherits": {
-      "version": "2.0.4",
-      "license": "ISC"
-    },
-    "node_modules/internal-slot": {
-      "version": "1.0.5",
+    "ansi-escapes": {
+      "version": "4.3.2",
+      "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-4.3.2.tgz",
+      "integrity": "sha512-gKXj5ALrKWQLsYG9jlTRmR/xKluxHV+Z9QEwNIgCfM1/uwPMCuzVVnh5mwTd+OuBZcwSIMbqssNWRm1lE51QaQ==",
       "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "get-intrinsic": "^1.2.0",
-        "has": "^1.0.3",
-        "side-channel": "^1.0.4"
+      "requires": {
+        "type-fest": "^0.21.3"
       },
-      "engines": {
-        "node": ">= 0.4"
+      "dependencies": {
+        "type-fest": {
+          "version": "0.21.3",
+          "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.21.3.tgz",
+          "integrity": "sha512-t0rzBq87m3fVcduHDUFhKmyyX+9eo6WQjZvf51Ea/M0Q7+T374Jp1aUiyUl0GKxp8M/OETVHSDvmkyPgvX+X2w==",
+          "dev": true
+        }
       }
     },
-    "node_modules/ipaddr.js": {
-      "version": "2.1.0",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">= 10"
-      }
+    "ansi-html-community": {
+      "version": "0.0.8",
+      "resolved": "https://registry.npmjs.org/ansi-html-community/-/ansi-html-community-0.0.8.tgz",
+      "integrity": "sha512-1APHAyr3+PCamwNw3bXCPp4HFLONZt/yIH0sZp0/469KWNTEy+qN5jQ3GVX6DMZ1UXAi34yVwtTeaG/HpBuuzw==",
+      "dev": true
     },
-    "node_modules/is-arguments": {
-      "version": "1.1.1",
-      "license": "MIT",
-      "dependencies": {
-        "call-bind": "^1.0.2",
-        "has-tostringtag": "^1.0.0"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
+    "ansi-regex": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
+      "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ=="
+    },
+    "ansi-styles": {
+      "version": "3.2.1",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
+      "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
+      "requires": {
+        "color-convert": "^1.9.0"
       }
     },
-    "node_modules/is-array-buffer": {
-      "version": "3.0.2",
+    "anymatch": {
+      "version": "3.1.3",
+      "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.3.tgz",
+      "integrity": "sha512-KMReFUr0B4t+D+OBkjR3KYqvocp2XaSzO55UcB6mgQMd3KbcE+mWTyvVV7D/zsdEbNnV6acZUutkiHQXvTr1Rw==",
       "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "call-bind": "^1.0.2",
-        "get-intrinsic": "^1.2.0",
-        "is-typed-array": "^1.1.10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
+      "requires": {
+        "normalize-path": "^3.0.0",
+        "picomatch": "^2.0.4"
       }
     },
-    "node_modules/is-arrayish": {
-      "version": "0.2.1",
-      "dev": true,
-      "license": "MIT"
+    "argon2-browser": {
+      "version": "1.18.0",
+      "resolved": "https://registry.npmjs.org/argon2-browser/-/argon2-browser-1.18.0.tgz",
+      "integrity": "sha512-ImVAGIItnFnvET1exhsQB7apRztcoC5TnlSqernMJDUjbc/DLq3UEYeXFrLPrlaIl8cVfwnXb6wX2KpFf2zxHw=="
     },
-    "node_modules/is-bigint": {
-      "version": "1.0.4",
+    "argparse": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz",
+      "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==",
+      "dev": true
+    },
+    "aria-query": {
+      "version": "5.1.3",
+      "resolved": "https://registry.npmjs.org/aria-query/-/aria-query-5.1.3.tgz",
+      "integrity": "sha512-R5iJ5lkuHybztUfuOAznmboyjWq8O6sqNqtK7CLOqdydi54VNbORp49mb14KbWgG1QD3JFO9hJdZ+y4KutfdOQ==",
       "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "has-bigints": "^1.0.1"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
+      "requires": {
+        "deep-equal": "^2.0.5"
       }
     },
-    "node_modules/is-binary-path": {
-      "version": "2.1.0",
+    "arity-n": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/arity-n/-/arity-n-1.0.4.tgz",
+      "integrity": "sha512-fExL2kFDC1Q2DUOx3whE/9KoN66IzkY4b4zUHUBFM1ojEYjZZYDcUW3bek/ufGionX9giIKDC5redH2IlGqcQQ==",
+      "dev": true
+    },
+    "array-buffer-byte-length": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/array-buffer-byte-length/-/array-buffer-byte-length-1.0.0.tgz",
+      "integrity": "sha512-LPuwb2P+NrQw3XhxGc36+XSvuBPopovXYTR9Ew++Du9Yb/bx5AzBfrIsBoj0EZUifjQU+sHL21sseZ3jerWO/A==",
       "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "binary-extensions": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=8"
+      "requires": {
+        "call-bind": "^1.0.2",
+        "is-array-buffer": "^3.0.1"
       }
     },
-    "node_modules/is-boolean-object": {
-      "version": "1.1.2",
+    "array-flatten": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/array-flatten/-/array-flatten-2.1.2.tgz",
+      "integrity": "sha512-hNfzcOV8W4NdualtqBFPyVO+54DSJuZGY9qT4pRroB6S9e3iiido2ISIC5h9R2sPJ8H3FHCIiEnsv1lPXO3KtQ==",
+      "dev": true
+    },
+    "array-includes": {
+      "version": "3.1.6",
+      "resolved": "https://registry.npmjs.org/array-includes/-/array-includes-3.1.6.tgz",
+      "integrity": "sha512-sgTbLvL6cNnw24FnbaDyjmvddQ2ML8arZsgaJhoABMoplz/4QRhtrYS+alr1BUM1Bwp6dhx8vVCBSLG+StwOFw==",
       "dev": true,
-      "license": "MIT",
-      "dependencies": {
+      "requires": {
         "call-bind": "^1.0.2",
-        "has-tostringtag": "^1.0.0"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
+        "define-properties": "^1.1.4",
+        "es-abstract": "^1.20.4",
+        "get-intrinsic": "^1.1.3",
+        "is-string": "^1.0.7"
       }
     },
-    "node_modules/is-callable": {
-      "version": "1.2.7",
-      "license": "MIT",
-      "engines": {
-        "node": ">= 0.4"
+    "array-last": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/array-last/-/array-last-1.3.0.tgz",
+      "integrity": "sha512-eOCut5rXlI6aCOS7Z7kCplKRKyiFQ6dHFBem4PwlwKeNFk2/XxTrhRh5T9PyaEWGy/NHTZWbY+nsZlNFJu9rYg==",
+      "dev": true,
+      "requires": {
+        "is-number": "^4.0.0"
       },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
+      "dependencies": {
+        "is-number": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/is-number/-/is-number-4.0.0.tgz",
+          "integrity": "sha512-rSklcAIlf1OmFdyAqbnWTLVelsQ58uvZ66S/ZyawjWqIviTWCjg2PzVGw8WUA+nNuPTqb4wgA+NszrJ+08LlgQ==",
+          "dev": true
+        }
       }
     },
-    "node_modules/is-core-module": {
-      "version": "2.14.0",
+    "array-union": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/array-union/-/array-union-2.1.0.tgz",
+      "integrity": "sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw==",
+      "dev": true
+    },
+    "array-uniq": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/array-uniq/-/array-uniq-1.0.3.tgz",
+      "integrity": "sha512-MNha4BWQ6JbwhFhj03YK552f7cb3AzoE8SzeljgChvL1dl3IcvggXVz1DilzySZkCja+CXuZbdW7yATchWn8/Q==",
+      "dev": true
+    },
+    "array.prototype.findlastindex": {
+      "version": "1.2.2",
+      "resolved": "https://registry.npmjs.org/array.prototype.findlastindex/-/array.prototype.findlastindex-1.2.2.tgz",
+      "integrity": "sha512-tb5thFFlUcp7NdNF6/MpDk/1r/4awWG1FIz3YqDf+/zJSTezBb+/5WViH41obXULHVpDzoiCLpJ/ZO9YbJMsdw==",
       "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "hasown": "^2.0.2"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
+      "requires": {
+        "call-bind": "^1.0.2",
+        "define-properties": "^1.1.4",
+        "es-abstract": "^1.20.4",
+        "es-shim-unscopables": "^1.0.0",
+        "get-intrinsic": "^1.1.3"
       }
     },
-    "node_modules/is-date-object": {
-      "version": "1.0.5",
+    "array.prototype.flat": {
+      "version": "1.3.1",
+      "resolved": "https://registry.npmjs.org/array.prototype.flat/-/array.prototype.flat-1.3.1.tgz",
+      "integrity": "sha512-roTU0KWIOmJ4DRLmwKd19Otg0/mT3qPNt0Qb3GWW8iObuZXxrjB/pzn0R3hqpRSWg4HCwqx+0vwOnWnvlOyeIA==",
       "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "has-tostringtag": "^1.0.0"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
+      "requires": {
+        "call-bind": "^1.0.2",
+        "define-properties": "^1.1.4",
+        "es-abstract": "^1.20.4",
+        "es-shim-unscopables": "^1.0.0"
       }
     },
-    "node_modules/is-docker": {
-      "version": "2.2.1",
+    "array.prototype.flatmap": {
+      "version": "1.3.1",
+      "resolved": "https://registry.npmjs.org/array.prototype.flatmap/-/array.prototype.flatmap-1.3.1.tgz",
+      "integrity": "sha512-8UGn9O1FDVvMNB0UlLv4voxRMze7+FpHyF5mSMRjWHUMlpoDViniy05870VlxhfgTnLbpuwTzvD76MTtWxB/mQ==",
       "dev": true,
-      "license": "MIT",
-      "bin": {
-        "is-docker": "cli.js"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
+      "requires": {
+        "call-bind": "^1.0.2",
+        "define-properties": "^1.1.4",
+        "es-abstract": "^1.20.4",
+        "es-shim-unscopables": "^1.0.0"
       }
     },
-    "node_modules/is-extglob": {
-      "version": "2.1.1",
+    "array.prototype.tosorted": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/array.prototype.tosorted/-/array.prototype.tosorted-1.1.1.tgz",
+      "integrity": "sha512-pZYPXPRl2PqWcsUs6LOMn+1f1532nEoPTYowBtqLwAW+W8vSVhkIGnmOX1t/UQjD6YGI0vcD2B1U7ZFGQH9jnQ==",
       "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=0.10.0"
+      "requires": {
+        "call-bind": "^1.0.2",
+        "define-properties": "^1.1.4",
+        "es-abstract": "^1.20.4",
+        "es-shim-unscopables": "^1.0.0",
+        "get-intrinsic": "^1.1.3"
       }
     },
-    "node_modules/is-fullwidth-code-point": {
-      "version": "4.0.0",
+    "arraybuffer.prototype.slice": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/arraybuffer.prototype.slice/-/arraybuffer.prototype.slice-1.0.1.tgz",
+      "integrity": "sha512-09x0ZWFEjj4WD8PDbykUwo3t9arLn8NIzmmYEJFpYekOAQjpkGSyrQhNoRTcwwcFRu+ycWF78QZ63oWTqSjBcw==",
       "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=12"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
+      "requires": {
+        "array-buffer-byte-length": "^1.0.0",
+        "call-bind": "^1.0.2",
+        "define-properties": "^1.2.0",
+        "get-intrinsic": "^1.2.1",
+        "is-array-buffer": "^3.0.2",
+        "is-shared-array-buffer": "^1.0.2"
       }
     },
-    "node_modules/is-generator-function": {
-      "version": "1.0.10",
-      "resolved": "https://registry.npmjs.org/is-generator-function/-/is-generator-function-1.0.10.tgz",
-      "integrity": "sha512-jsEjy9l3yiXEQ+PsXdmBwEPcOxaXWLspKdplFUVI9vq1iZgIekeC0L167qeu86czQaxed3q/Uzuw0swL0irL8A==",
-      "dependencies": {
-        "has-tostringtag": "^1.0.0"
-      },
-      "engines": {
-        "node": ">= 0.4"
+    "asn1.js": {
+      "version": "5.4.1",
+      "resolved": "https://registry.npmjs.org/asn1.js/-/asn1.js-5.4.1.tgz",
+      "integrity": "sha512-+I//4cYPccV8LdmBLiX8CYvf9Sp3vQsrqu2QNXRcrbiWvcx/UdlFiqUJJzxRQxgsZmvhXhn4cSKeSmoFjVdupA==",
+      "requires": {
+        "bn.js": "^4.0.0",
+        "inherits": "^2.0.1",
+        "minimalistic-assert": "^1.0.0",
+        "safer-buffer": "^2.1.0"
       },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
+      "dependencies": {
+        "bn.js": {
+          "version": "4.12.0",
+          "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.0.tgz",
+          "integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA=="
+        }
       }
     },
-    "node_modules/is-glob": {
-      "version": "4.0.3",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "is-extglob": "^2.1.1"
-      },
-      "engines": {
-        "node": ">=0.10.0"
+    "assertion-error": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/assertion-error/-/assertion-error-1.1.0.tgz",
+      "integrity": "sha512-jgsaNduz+ndvGyFt3uSuWqvy4lCnIJiovtouQN5JZHOKCS2QuhEdbcQHFhVksz2N2U9hXJo8odG7ETyWlEeuDw==",
+      "dev": true
+    },
+    "ast-types-flow": {
+      "version": "0.0.7",
+      "resolved": "https://registry.npmjs.org/ast-types-flow/-/ast-types-flow-0.0.7.tgz",
+      "integrity": "sha512-eBvWn1lvIApYMhzQMsu9ciLfkBY499mFZlNqG+/9WR7PVlroQw0vG30cOQQbaKz3sCEc44TAOu2ykzqXSNnwag==",
+      "dev": true
+    },
+    "astral-regex": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/astral-regex/-/astral-regex-2.0.0.tgz",
+      "integrity": "sha512-Z7tMw1ytTXt5jqMcOP+OQteU1VuNK9Y02uuJtKQ1Sv69jXQKKg5cibLwGJow8yzZP+eAc18EmLGPal0bp36rvQ==",
+      "dev": true
+    },
+    "async": {
+      "version": "2.6.4",
+      "resolved": "https://registry.npmjs.org/async/-/async-2.6.4.tgz",
+      "integrity": "sha512-mzo5dfJYwAn29PeiJ0zvwTo04zj8HDJj0Mn8TD7sno7q12prdbnasKJHhkm2c1LgrhlJ0teaea8860oxi51mGA==",
+      "requires": {
+        "lodash": "^4.17.14"
       }
     },
-    "node_modules/is-iterable": {
-      "version": "1.1.1",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">= 4"
+    "async-mutex": {
+      "version": "0.5.0",
+      "resolved": "https://registry.npmjs.org/async-mutex/-/async-mutex-0.5.0.tgz",
+      "integrity": "sha512-1A94B18jkJ3DYq284ohPxoXbfTA5HsQ7/Mf4DEhcyLx3Bz27Rh59iScbB6EPiP+B+joue6YCxcMXSbFC1tZKwA==",
+      "requires": {
+        "tslib": "^2.4.0"
       }
     },
-    "node_modules/is-map": {
-      "version": "2.0.2",
-      "dev": true,
-      "license": "MIT",
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
+    "asynckit": {
+      "version": "0.4.0",
+      "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz",
+      "integrity": "sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q=="
+    },
+    "available-typed-arrays": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/available-typed-arrays/-/available-typed-arrays-1.0.5.tgz",
+      "integrity": "sha512-DMD0KiN46eipeziST1LPP/STfDU0sufISXmjSgvVsoU2tqxctQeASejWcfNtxYKqETM1UxQ8sp2OrSBWpHY6sw=="
+    },
+    "axe-core": {
+      "version": "4.7.2",
+      "resolved": "https://registry.npmjs.org/axe-core/-/axe-core-4.7.2.tgz",
+      "integrity": "sha512-zIURGIS1E1Q4pcrMjp+nnEh+16G56eG/MUllJH8yEvw7asDo7Ac9uhC9KIH5jzpITueEZolfYglnCGIuSBz39g==",
+      "dev": true
+    },
+    "axios": {
+      "version": "1.7.0",
+      "resolved": "https://registry.npmjs.org/axios/-/axios-1.7.0.tgz",
+      "integrity": "sha512-IiB0wQeKyPRdsFVhBgIo31FbzOyf2M6wYl7/NVutFwFBRMiAbjNiydJIHKeLmPugF4kJLfA1uWZ82Is2QzqqFA==",
+      "requires": {
+        "follow-redirects": "^1.15.6",
+        "form-data": "^4.0.0",
+        "proxy-from-env": "^1.1.0"
       }
     },
-    "node_modules/is-negative-zero": {
-      "version": "2.0.2",
+    "axobject-query": {
+      "version": "3.2.1",
+      "resolved": "https://registry.npmjs.org/axobject-query/-/axobject-query-3.2.1.tgz",
+      "integrity": "sha512-jsyHu61e6N4Vbz/v18DHwWYKK0bSWLqn47eeDSKPB7m8tqMHF9YJ+mhIk2lVteyZrY8tnSj/jHOv4YiTCuCJgg==",
       "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
+      "requires": {
+        "dequal": "^2.0.3"
       }
     },
-    "node_modules/is-number": {
-      "version": "7.0.0",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=0.12.0"
+    "babel-plugin-styled-components": {
+      "version": "2.1.4",
+      "resolved": "https://registry.npmjs.org/babel-plugin-styled-components/-/babel-plugin-styled-components-2.1.4.tgz",
+      "integrity": "sha512-Xgp9g+A/cG47sUyRwwYxGM4bR/jDRg5N6it/8+HxCnbT5XNKSKDT9xm4oag/osgqjC2It/vH0yXsomOG6k558g==",
+      "requires": {
+        "@babel/helper-annotate-as-pure": "^7.22.5",
+        "@babel/helper-module-imports": "^7.22.5",
+        "@babel/plugin-syntax-jsx": "^7.22.5",
+        "lodash": "^4.17.21",
+        "picomatch": "^2.3.1"
       }
     },
-    "node_modules/is-number-object": {
-      "version": "1.0.7",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "has-tostringtag": "^1.0.0"
-      },
-      "engines": {
-        "node": ">= 0.4"
+    "babel-runtime": {
+      "version": "6.26.0",
+      "resolved": "https://registry.npmjs.org/babel-runtime/-/babel-runtime-6.26.0.tgz",
+      "integrity": "sha512-ITKNuq2wKlW1fJg9sSW52eepoYgZBggvOAHC0u/CYu/qxQ9EVzThCgR69BnSXLHjy2f7SY5zaQ4yt7H9ZVxY2g==",
+      "requires": {
+        "core-js": "^2.4.0",
+        "regenerator-runtime": "^0.11.0"
       },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
+      "dependencies": {
+        "regenerator-runtime": {
+          "version": "0.11.1",
+          "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.11.1.tgz",
+          "integrity": "sha512-MguG95oij0fC3QV3URf4V2SDYGJhJnJGqvIIgdECeODCT98wSWDAJ94SSuVpYQUoTcGUIL6L4yNB7j1DFFHSBg=="
+        }
       }
     },
-    "node_modules/is-path-cwd": {
+    "babylon": {
+      "version": "6.18.0",
+      "resolved": "https://registry.npmjs.org/babylon/-/babylon-6.18.0.tgz",
+      "integrity": "sha512-q/UEjfGJ2Cm3oKV71DJz9d25TPnq5rhBVL2Q4fA5wcC3jcrdn7+SssEybFIxwAvvP+YCsCYNKughoF33GxgycQ==",
+      "dev": true
+    },
+    "balanced-match": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz",
+      "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw=="
+    },
+    "base-x": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/base-x/-/base-x-4.0.0.tgz",
+      "integrity": "sha512-FuwxlW4H5kh37X/oW59pwTzzTKRzfrrQwhmyspRM7swOEZcHtDZSCt45U6oKgtuFE+WYPblePMVIPR4RZrh/hw=="
+    },
+    "base58-js": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/base58-js/-/base58-js-1.0.5.tgz",
+      "integrity": "sha512-LkkAPP8Zu+c0SVNRTRVDyMfKVORThX+rCViget00xdgLRrKkClCTz1T7cIrpr69ShwV5XJuuoZvMvJ43yURwkA=="
+    },
+    "base64-js": {
+      "version": "1.5.1",
+      "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.5.1.tgz",
+      "integrity": "sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA=="
+    },
+    "base64-loader": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/base64-loader/-/base64-loader-1.0.0.tgz",
+      "integrity": "sha512-p32+F8dg+ANGx7s8QsZS74ZPHfIycmC2yZcoerzFgbersIYWitPbbF39G6SBx3gyvzyLH5nt1ooocxr0IHuWKA==",
+      "dev": true
+    },
+    "base64url": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/base64url/-/base64url-3.0.1.tgz",
+      "integrity": "sha512-ir1UPr3dkwexU7FdV8qBBbNDRUhMmIekYMFZfi+C/sLNnRESKPl23nB9b2pltqfOQNnGzsDdId90AEtG5tCx4A=="
+    },
+    "batch": {
+      "version": "0.6.1",
+      "resolved": "https://registry.npmjs.org/batch/-/batch-0.6.1.tgz",
+      "integrity": "sha512-x+VAiMRL6UPkx+kudNvxTl6hB2XNNCG2r+7wixVfIYwu/2HKRXimwQyaumLjMveWvT2Hkd/cAJw+QBMfJ/EKVw==",
+      "dev": true
+    },
+    "bech32": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/bech32/-/bech32-2.0.0.tgz",
+      "integrity": "sha512-LcknSilhIGatDAsY1ak2I8VtGaHNhgMSYVxFrGLXv+xLHytaKZKcaUJJUE7qmBr7h33o5YQwP55pMI0xmkpJwg=="
+    },
+    "big-integer": {
+      "version": "1.6.51",
+      "resolved": "https://registry.npmjs.org/big-integer/-/big-integer-1.6.51.tgz",
+      "integrity": "sha512-GPEid2Y9QU1Exl1rpO9B2IPJGHPSupF5GnVIP0blYvNOMer2bTvSWs1jGOUg04hTmu67nmLsQ9TBo1puaotBHg=="
+    },
+    "big.js": {
+      "version": "5.2.2",
+      "resolved": "https://registry.npmjs.org/big.js/-/big.js-5.2.2.tgz",
+      "integrity": "sha512-vyL2OymJxmarO8gxMr0mhChsO9QGwhynfuu4+MHTAW6czfq9humCB7rKpUjDd9YUiDPU4mzpyupFSvOClAwbmQ==",
+      "dev": true
+    },
+    "bignumber.js": {
+      "version": "9.1.1",
+      "resolved": "https://registry.npmjs.org/bignumber.js/-/bignumber.js-9.1.1.tgz",
+      "integrity": "sha512-pHm4LsMJ6lzgNGVfZHjMoO8sdoRhOzOH4MLmY65Jg70bpxCKu5iOHNJyfF6OyvYw7t8Fpf35RuzUyqnQsj8Vig=="
+    },
+    "binary-extensions": {
       "version": "2.2.0",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=6"
-      }
+      "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.2.0.tgz",
+      "integrity": "sha512-jDctJ/IVQbZoJykoeHbhXpOlNBqGNcwXJKJog42E5HDPUwQTSdjCHdihjj0DlnheQ7blbT6dHOafNAiS8ooQKA==",
+      "dev": true
     },
-    "node_modules/is-path-in-cwd": {
-      "version": "2.1.0",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "is-path-inside": "^2.1.0"
-      },
-      "engines": {
-        "node": ">=6"
+    "bindings": {
+      "version": "1.5.0",
+      "resolved": "https://registry.npmjs.org/bindings/-/bindings-1.5.0.tgz",
+      "integrity": "sha512-p2q/t/mhvuOj/UeLlV6566GD/guowlr0hHxClI0W9m7MWYkL1F0hLo+0Aexs9HSPCtR1SXQ0TD3MMKrXZajbiQ==",
+      "requires": {
+        "file-uri-to-path": "1.0.0"
       }
     },
-    "node_modules/is-path-inside": {
-      "version": "2.1.0",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "path-is-inside": "^1.0.2"
-      },
-      "engines": {
-        "node": ">=6"
+    "bip174": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/bip174/-/bip174-2.1.1.tgz",
+      "integrity": "sha512-mdFV5+/v0XyNYXjBS6CQPLo9ekCx4gtKZFnJm5PMto7Fs9hTTDpkkzOB7/FtluRI6JbUUAu+snTYfJRgHLZbZQ=="
+    },
+    "bip32": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/bip32/-/bip32-4.0.0.tgz",
+      "integrity": "sha512-aOGy88DDlVUhspIXJN+dVEtclhIsfAUppD43V0j40cPTld3pv/0X/MlrZSZ6jowIaQQzFwP8M6rFU2z2mVYjDQ==",
+      "requires": {
+        "@noble/hashes": "^1.2.0",
+        "@scure/base": "^1.1.1",
+        "typeforce": "^1.11.5",
+        "wif": "^2.0.6"
       }
     },
-    "node_modules/is-plain-obj": {
-      "version": "3.0.0",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
+    "bip32-path": {
+      "version": "0.4.2",
+      "resolved": "https://registry.npmjs.org/bip32-path/-/bip32-path-0.4.2.tgz",
+      "integrity": "sha512-ZBMCELjJfcNMkz5bDuJ1WrYvjlhEF5k6mQ8vUr4N7MbVRsXei7ZOg8VhhwMfNiW68NWmLkgkc6WvTickrLGprQ=="
+    },
+    "bip39": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/bip39/-/bip39-3.1.0.tgz",
+      "integrity": "sha512-c9kiwdk45Do5GL0vJMe7tS95VjCii65mYAH7DfWl3uW8AVzXKQVUm64i3hzVybBDMp9r7j9iNxR85+ul8MdN/A==",
+      "requires": {
+        "@noble/hashes": "^1.2.0"
       }
     },
-    "node_modules/is-regex": {
-      "version": "1.1.4",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "call-bind": "^1.0.2",
-        "has-tostringtag": "^1.0.0"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
+    "bip66": {
+      "version": "1.1.5",
+      "resolved": "https://registry.npmjs.org/bip66/-/bip66-1.1.5.tgz",
+      "integrity": "sha512-nemMHz95EmS38a26XbbdxIYj5csHd3RMP3H5bwQknX0WYHF01qhpufP42mLOwVICuH2JmhIhXiWs89MfUGL7Xw==",
+      "requires": {
+        "safe-buffer": "^5.0.1"
       }
     },
-    "node_modules/is-set": {
-      "version": "2.0.2",
-      "dev": true,
-      "license": "MIT",
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
+    "bip68": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/bip68/-/bip68-1.0.4.tgz",
+      "integrity": "sha512-O1htyufFTYy3EO0JkHg2CLykdXEtV2ssqw47Gq9A0WByp662xpJnMEB9m43LZjsSDjIAOozWRExlFQk2hlV1XQ=="
+    },
+    "bitcoin-address-validation": {
+      "version": "2.2.3",
+      "resolved": "https://registry.npmjs.org/bitcoin-address-validation/-/bitcoin-address-validation-2.2.3.tgz",
+      "integrity": "sha512-1uGCGl26Ye8JG5qcExtFLQfuib6qEZWNDo1ZlLlwp/z7ygUFby3IxolgEfgMGaC+LG9csbVASLcH8fRLv7DIOg==",
+      "requires": {
+        "base58-js": "^1.0.0",
+        "bech32": "^2.0.0",
+        "sha256-uint8array": "^0.10.3"
       }
     },
-    "node_modules/is-shared-array-buffer": {
-      "version": "1.0.2",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "call-bind": "^1.0.2"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
+    "bitcoinjs-lib": {
+      "version": "6.1.6",
+      "resolved": "https://registry.npmjs.org/bitcoinjs-lib/-/bitcoinjs-lib-6.1.6.tgz",
+      "integrity": "sha512-Fk8+Vc+e2rMoDU5gXkW9tD+313rhkm5h6N9HfZxXvYU9LedttVvmXKTgd9k5rsQJjkSfsv6XRM8uhJv94SrvcA==",
+      "requires": {
+        "@noble/hashes": "^1.2.0",
+        "bech32": "^2.0.0",
+        "bip174": "^2.1.1",
+        "bs58check": "^3.0.1",
+        "typeforce": "^1.11.3",
+        "varuint-bitcoin": "^1.1.2"
       }
     },
-    "node_modules/is-stream": {
-      "version": "2.0.1",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=8"
+    "bitcoinjs-message": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/bitcoinjs-message/-/bitcoinjs-message-2.2.0.tgz",
+      "integrity": "sha512-103Wy3xg8Y9o+pdhGP4M3/mtQQuUWs6sPuOp1mYphSUoSMHjHTlkj32K4zxU8qMH0Ckv23emfkGlFWtoWZ7YFA==",
+      "requires": {
+        "bech32": "^1.1.3",
+        "bs58check": "^2.1.2",
+        "buffer-equals": "^1.0.3",
+        "create-hash": "^1.1.2",
+        "secp256k1": "^3.0.1",
+        "varuint-bitcoin": "^1.0.1"
       },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
+      "dependencies": {
+        "base-x": {
+          "version": "3.0.10",
+          "resolved": "https://registry.npmjs.org/base-x/-/base-x-3.0.10.tgz",
+          "integrity": "sha512-7d0s06rR9rYaIWHkpfLIFICM/tkSVdoPC9qYAQRpxn9DdKNWNsKC0uk++akckyLq16Tx2WIinnZ6WRriAt6njQ==",
+          "requires": {
+            "safe-buffer": "^5.0.1"
+          }
+        },
+        "bech32": {
+          "version": "1.1.4",
+          "resolved": "https://registry.npmjs.org/bech32/-/bech32-1.1.4.tgz",
+          "integrity": "sha512-s0IrSOzLlbvX7yp4WBfPITzpAU8sqQcpsmwXDiKwrG4r491vwCO/XpejasRNl0piBMe/DvP4Tz0mIS/X1DPJBQ=="
+        },
+        "bs58": {
+          "version": "4.0.1",
+          "resolved": "https://registry.npmjs.org/bs58/-/bs58-4.0.1.tgz",
+          "integrity": "sha512-Ok3Wdf5vOIlBrgCvTq96gBkJw+JUEzdBgyaza5HLtPm7yTHkjRy8+JzNyHF7BHa0bNWOQIp3m5YF0nnFcOIKLw==",
+          "requires": {
+            "base-x": "^3.0.2"
+          }
+        },
+        "bs58check": {
+          "version": "2.1.2",
+          "resolved": "https://registry.npmjs.org/bs58check/-/bs58check-2.1.2.tgz",
+          "integrity": "sha512-0TS1jicxdU09dwJMNZtVAfzPi6Q6QeN0pM1Fkzrjn+XYHvzMKPU3pHVpva+769iNVSfIYWf7LJ6WR+BuuMf8cA==",
+          "requires": {
+            "bs58": "^4.0.0",
+            "create-hash": "^1.1.0",
+            "safe-buffer": "^5.1.2"
+          }
+        }
       }
     },
-    "node_modules/is-string": {
-      "version": "1.0.7",
+    "bn.js": {
+      "version": "5.2.1",
+      "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-5.2.1.tgz",
+      "integrity": "sha512-eXRvHzWyYPBuB4NBy0cmYQjGitUrtqwbvlzP3G6VFnNRbsZQIxQ10PbKKHt8gZ/HW/D/747aDl+QkDqg3KQLMQ=="
+    },
+    "body-parser": {
+      "version": "1.20.1",
+      "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.20.1.tgz",
+      "integrity": "sha512-jWi7abTbYwajOytWCQc37VulmWiRae5RyTpaCyDcS5/lMdtwSz5lOpDE67srw/HYe35f1z3fDQw+3txg7gNtWw==",
       "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "has-tostringtag": "^1.0.0"
-      },
-      "engines": {
-        "node": ">= 0.4"
+      "requires": {
+        "bytes": "3.1.2",
+        "content-type": "~1.0.4",
+        "debug": "2.6.9",
+        "depd": "2.0.0",
+        "destroy": "1.2.0",
+        "http-errors": "2.0.0",
+        "iconv-lite": "0.4.24",
+        "on-finished": "2.4.1",
+        "qs": "6.11.0",
+        "raw-body": "2.5.1",
+        "type-is": "~1.6.18",
+        "unpipe": "1.0.0"
       },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
+      "dependencies": {
+        "bytes": {
+          "version": "3.1.2",
+          "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.1.2.tgz",
+          "integrity": "sha512-/Nf7TyzTx6S3yRJObOAV7956r8cr2+Oj8AC5dt8wSP3BQAoeX58NoHyCU8P8zGkNXStjTSi6fzO6F0pBdcYbEg==",
+          "dev": true
+        },
+        "debug": {
+          "version": "2.6.9",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+          "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+          "dev": true,
+          "requires": {
+            "ms": "2.0.0"
+          }
+        },
+        "iconv-lite": {
+          "version": "0.4.24",
+          "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz",
+          "integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==",
+          "dev": true,
+          "requires": {
+            "safer-buffer": ">= 2.1.2 < 3"
+          }
+        },
+        "ms": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+          "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==",
+          "dev": true
+        },
+        "qs": {
+          "version": "6.11.0",
+          "resolved": "https://registry.npmjs.org/qs/-/qs-6.11.0.tgz",
+          "integrity": "sha512-MvjoMCJwEarSbUYk5O+nmoSzSutSsTwF85zcHPQ9OrlFoZOYIjaqBAJIqIXjptyD5vThxGq52Xu/MaJzRkIk4Q==",
+          "dev": true,
+          "requires": {
+            "side-channel": "^1.0.4"
+          }
+        }
       }
     },
-    "node_modules/is-symbol": {
-      "version": "1.0.4",
+    "bonjour-service": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/bonjour-service/-/bonjour-service-1.1.1.tgz",
+      "integrity": "sha512-Z/5lQRMOG9k7W+FkeGTNjh7htqn/2LMnfOvBZ8pynNZCM9MwkQkI3zeI4oz09uWdcgmgHugVvBqxGg4VQJ5PCg==",
       "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "has-symbols": "^1.0.2"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
+      "requires": {
+        "array-flatten": "^2.1.2",
+        "dns-equal": "^1.0.0",
+        "fast-deep-equal": "^3.1.3",
+        "multicast-dns": "^7.2.5"
       }
     },
-    "node_modules/is-typed-array": {
-      "version": "1.1.12",
-      "license": "MIT",
-      "dependencies": {
-        "which-typed-array": "^1.1.11"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
+    "boolbase": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/boolbase/-/boolbase-1.0.0.tgz",
+      "integrity": "sha512-JZOSA7Mo9sNGB8+UjSgzdLtokWAky1zbztM3WRLCbZ70/3cTANmQmOdR7y2g+J0e2WXywy1yS468tY+IruqEww==",
+      "dev": true
     },
-    "node_modules/is-weakmap": {
-      "version": "2.0.1",
-      "dev": true,
-      "license": "MIT",
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
+    "brace-expansion": {
+      "version": "1.1.11",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
+      "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
+      "requires": {
+        "balanced-match": "^1.0.0",
+        "concat-map": "0.0.1"
       }
     },
-    "node_modules/is-weakref": {
-      "version": "1.0.2",
+    "braces": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz",
+      "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==",
       "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "call-bind": "^1.0.2"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
+      "requires": {
+        "fill-range": "^7.0.1"
       }
     },
-    "node_modules/is-weakset": {
-      "version": "2.0.2",
+    "broadcast-channel": {
+      "version": "2.3.4",
+      "resolved": "https://registry.npmjs.org/broadcast-channel/-/broadcast-channel-2.3.4.tgz",
+      "integrity": "sha512-cx1/dSb6KZ9HW1VtlqM/HLPjrdyzkKoteVmUpLXEpra00mDQW/F9ieDkoavuZMoh9/hC/6OplGzCERsZBfz/Wg==",
       "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "call-bind": "^1.0.2",
-        "get-intrinsic": "^1.1.1"
+      "requires": {
+        "@babel/runtime": "^7.6.2",
+        "detect-node": "^2.0.4",
+        "js-sha3": "0.8.0",
+        "microseconds": "0.1.0",
+        "nano-time": "1.0.0",
+        "rimraf": "2.6.3",
+        "unload": "2.2.0"
       },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
+      "dependencies": {
+        "rimraf": {
+          "version": "2.6.3",
+          "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.6.3.tgz",
+          "integrity": "sha512-mwqeW5XsA2qAejG46gYdENaxXjx9onRNCfn7L0duuP4hCuTIi/QO7PDK07KJfp1d+izWPrzEJDcSqBa0OZQriA==",
+          "dev": true,
+          "requires": {
+            "glob": "^7.1.3"
+          }
+        }
       }
     },
-    "node_modules/is-what": {
-      "version": "4.1.15",
-      "license": "MIT",
-      "engines": {
-        "node": ">=12.13"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/mesqueeb"
-      }
+    "brorand": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/brorand/-/brorand-1.1.0.tgz",
+      "integrity": "sha512-cKV8tMCEpQs4hK/ik71d6LrPOnpkpGBR0wzxqr68g2m/LB2GxVYQroAjMJZRVM1Y4BCjCKc3vAamxSzOY2RP+w=="
     },
-    "node_modules/is-wsl": {
-      "version": "2.2.0",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "is-docker": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=8"
+    "browserify-aes": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/browserify-aes/-/browserify-aes-1.2.0.tgz",
+      "integrity": "sha512-+7CHXqGuspUn/Sl5aO7Ea0xWGAtETPXNSAjHo48JfLdPWcMng33Xe4znFvQweqc/uzk5zSOI3H52CYnjCfb5hA==",
+      "requires": {
+        "buffer-xor": "^1.0.3",
+        "cipher-base": "^1.0.0",
+        "create-hash": "^1.1.0",
+        "evp_bytestokey": "^1.0.3",
+        "inherits": "^2.0.1",
+        "safe-buffer": "^5.0.1"
       }
     },
-    "node_modules/isarray": {
-      "version": "2.0.5",
-      "dev": true,
-      "license": "MIT"
-    },
-    "node_modules/isexe": {
-      "version": "2.0.0",
-      "dev": true,
-      "license": "ISC"
+    "browserify-cipher": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/browserify-cipher/-/browserify-cipher-1.0.1.tgz",
+      "integrity": "sha512-sPhkz0ARKbf4rRQt2hTpAHqn47X3llLkUGn+xEJzLjwY8LRs2p0v7ljvI5EyoRO/mexrNunNECisZs+gw2zz1w==",
+      "requires": {
+        "browserify-aes": "^1.0.4",
+        "browserify-des": "^1.0.0",
+        "evp_bytestokey": "^1.0.0"
+      }
     },
-    "node_modules/iterable-lookahead": {
-      "version": "1.0.0",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=4"
+    "browserify-des": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/browserify-des/-/browserify-des-1.0.2.tgz",
+      "integrity": "sha512-BioO1xf3hFwz4kc6iBhI3ieDFompMhrMlnDFC4/0/vd5MokpuAc3R+LYbwTA9A5Yc9pq9UYPqffKpW2ObuwX5A==",
+      "requires": {
+        "cipher-base": "^1.0.1",
+        "des.js": "^1.0.0",
+        "inherits": "^2.0.1",
+        "safe-buffer": "^5.1.2"
       }
     },
-    "node_modules/jest-worker": {
-      "version": "27.5.1",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "@types/node": "*",
-        "merge-stream": "^2.0.0",
-        "supports-color": "^8.0.0"
-      },
-      "engines": {
-        "node": ">= 10.13.0"
+    "browserify-rsa": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/browserify-rsa/-/browserify-rsa-4.1.0.tgz",
+      "integrity": "sha512-AdEER0Hkspgno2aR97SAf6vi0y0k8NuOpGnVH3O99rcA5Q6sh8QxcngtHuJ6uXwnfAXNM4Gn1Gb7/MV1+Ymbog==",
+      "requires": {
+        "bn.js": "^5.0.0",
+        "randombytes": "^2.0.1"
       }
     },
-    "node_modules/jest-worker/node_modules/has-flag": {
-      "version": "4.0.0",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=8"
+    "browserify-sign": {
+      "version": "4.2.2",
+      "resolved": "https://registry.npmjs.org/browserify-sign/-/browserify-sign-4.2.2.tgz",
+      "integrity": "sha512-1rudGyeYY42Dk6texmv7c4VcQ0EsvVbLwZkA+AQB7SxvXxmcD93jcHie8bzecJ+ChDlmAm2Qyu0+Ccg5uhZXCg==",
+      "requires": {
+        "bn.js": "^5.2.1",
+        "browserify-rsa": "^4.1.0",
+        "create-hash": "^1.2.0",
+        "create-hmac": "^1.1.7",
+        "elliptic": "^6.5.4",
+        "inherits": "^2.0.4",
+        "parse-asn1": "^5.1.6",
+        "readable-stream": "^3.6.2",
+        "safe-buffer": "^5.2.1"
       }
     },
-    "node_modules/jest-worker/node_modules/supports-color": {
-      "version": "8.1.1",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "has-flag": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/supports-color?sponsor=1"
+    "browserslist": {
+      "version": "4.22.1",
+      "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.22.1.tgz",
+      "integrity": "sha512-FEVc202+2iuClEhZhrWy6ZiAcRLvNMyYcxZ8raemul1DYVOVdFsbqckWLdsixQZCpJlwe77Z3UTalE7jsjnKfQ==",
+      "requires": {
+        "caniuse-lite": "^1.0.30001541",
+        "electron-to-chromium": "^1.4.535",
+        "node-releases": "^2.0.13",
+        "update-browserslist-db": "^1.0.13"
       }
     },
-    "node_modules/jiti": {
-      "version": "1.21.6",
-      "dev": true,
-      "license": "MIT",
-      "bin": {
-        "jiti": "bin/jiti.js"
+    "bs58": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/bs58/-/bs58-5.0.0.tgz",
+      "integrity": "sha512-r+ihvQJvahgYT50JD05dyJNKlmmSlMoOGwn1lCcEzanPglg7TxYjioQUYehQ9mAR/+hOSd2jRc/Z2y5UxBymvQ==",
+      "requires": {
+        "base-x": "^4.0.0"
       }
     },
-    "node_modules/js-sdsl": {
-      "version": "4.4.2",
-      "dev": true,
-      "license": "MIT",
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/js-sdsl"
+    "bs58check": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/bs58check/-/bs58check-3.0.1.tgz",
+      "integrity": "sha512-hjuuJvoWEybo7Hn/0xOrczQKKEKD63WguEjlhLExYs2wUBcebDC1jDNK17eEAD2lYfw82d5ASC1d7K3SWszjaQ==",
+      "requires": {
+        "@noble/hashes": "^1.2.0",
+        "bs58": "^5.0.0"
       }
     },
-    "node_modules/js-sha256": {
-      "version": "0.10.1",
-      "license": "MIT"
+    "buffer": {
+      "version": "6.0.3",
+      "resolved": "https://registry.npmjs.org/buffer/-/buffer-6.0.3.tgz",
+      "integrity": "sha512-FTiCpNxtwiZZHEZbcbTIcZjERVICn9yq/pDFkTl95/AxzD1naBctN7YO68riM/gLSDY7sdrMby8hofADYuuqOA==",
+      "requires": {
+        "base64-js": "^1.3.1",
+        "ieee754": "^1.2.1"
+      }
     },
-    "node_modules/js-sha3": {
-      "version": "0.8.0",
-      "license": "MIT"
+    "buffer-equals": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/buffer-equals/-/buffer-equals-1.0.4.tgz",
+      "integrity": "sha512-99MsCq0j5+RhubVEtKQgKaD6EM+UP3xJgIvQqwJ3SOLDUekzxMX1ylXBng+Wa2sh7mGT0W6RUly8ojjr1Tt6nA=="
     },
-    "node_modules/js-tokens": {
-      "version": "4.0.0",
-      "license": "MIT"
+    "buffer-from": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.2.tgz",
+      "integrity": "sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ==",
+      "dev": true
     },
-    "node_modules/js-yaml": {
-      "version": "4.1.0",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "argparse": "^2.0.1"
-      },
-      "bin": {
-        "js-yaml": "bin/js-yaml.js"
-      }
+    "buffer-xor": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/buffer-xor/-/buffer-xor-1.0.3.tgz",
+      "integrity": "sha512-571s0T7nZWK6vB67HI5dyUF7wXiNcfaPPPTl6zYCNApANjIvYJTg7hlud/+cJpdAhS7dVzqMLmfhfHR3rAcOjQ=="
     },
-    "node_modules/jsesc": {
-      "version": "2.5.2",
-      "license": "MIT",
-      "bin": {
-        "jsesc": "bin/jsesc"
-      },
-      "engines": {
-        "node": ">=4"
+    "bytes": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.0.0.tgz",
+      "integrity": "sha512-pMhOfFDPiv9t5jjIXkHosWmkSyQbvsgEVNkz0ERHbuLh2T/7j4Mqqpz523Fe8MVY89KC6Sh/QfS2sM+SjgFDcw==",
+      "dev": true
+    },
+    "c32check": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/c32check/-/c32check-2.0.0.tgz",
+      "integrity": "sha512-rpwfAcS/CMqo0oCqDf3r9eeLgScRE3l/xHDCXhM3UyrfvIn7PrLq63uHh7yYbv8NzaZn5MVsVhIRpQ+5GZ5HyA==",
+      "requires": {
+        "@noble/hashes": "^1.1.2",
+        "base-x": "^4.0.0"
       }
     },
-    "node_modules/json-bigint": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/json-bigint/-/json-bigint-1.0.0.tgz",
-      "integrity": "sha512-SiPv/8VpZuWbvLSMtTDU8hEfrZWg/mH/nV/b4o0CYbSxu1UIQPLdwKOCIyLQX+VIPO5vrLX3i8qtqFyhdPSUSQ==",
-      "dependencies": {
-        "bignumber.js": "^9.0.0"
+    "cac": {
+      "version": "6.7.14",
+      "resolved": "https://registry.npmjs.org/cac/-/cac-6.7.14.tgz",
+      "integrity": "sha512-b6Ilus+c3RrdDk+JhLKUAQfzzgLEPy6wcXqS7f/xe1EETvsDP6GORG7SFuOs6cID5YkqchW/LXZbX5bc8j7ZcQ==",
+      "dev": true
+    },
+    "call-bind": {
+      "version": "1.0.7",
+      "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.7.tgz",
+      "integrity": "sha512-GHTSNSYICQ7scH7sZ+M2rFopRoLh8t2bLSW6BbgrtLsahOIB5iyAVJf9GjWK3cYTDaMj4XdBpM1cA6pIS0Kv2w==",
+      "requires": {
+        "es-define-property": "^1.0.0",
+        "es-errors": "^1.3.0",
+        "function-bind": "^1.1.2",
+        "get-intrinsic": "^1.2.4",
+        "set-function-length": "^1.2.1"
       }
     },
-    "node_modules/json-parse-even-better-errors": {
-      "version": "2.3.1",
-      "dev": true,
-      "license": "MIT"
+    "callsites": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz",
+      "integrity": "sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==",
+      "dev": true
     },
-    "node_modules/json-schema-traverse": {
-      "version": "0.4.1",
+    "camel-case": {
+      "version": "4.1.2",
+      "resolved": "https://registry.npmjs.org/camel-case/-/camel-case-4.1.2.tgz",
+      "integrity": "sha512-gxGWBrTT1JuMx6R+o5PTXMmUnhnVzLQ9SNutD4YqKtI6ap897t3tKECYla6gCWEkplXnlNybEkZg9GEGxKFCgw==",
       "dev": true,
-      "license": "MIT"
+      "requires": {
+        "pascal-case": "^3.1.2",
+        "tslib": "^2.0.3"
+      }
     },
-    "node_modules/json-stable-stringify-without-jsonify": {
+    "camelize": {
       "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/camelize/-/camelize-1.0.1.tgz",
+      "integrity": "sha512-dU+Tx2fsypxTgtLoE36npi3UqcjSSMNYfkqgmoEhtZrraP5VWq0K7FkWVTYa8eMPtnU/G2txVsfdCJTn9uzpuQ=="
+    },
+    "caniuse-lite": {
+      "version": "1.0.30001559",
+      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001559.tgz",
+      "integrity": "sha512-cPiMKZgqgkg5LY3/ntGeLFUpi6tzddBNS58A4tnTgQw1zON7u2sZMU7SzOeVH4tj20++9ggL+V6FDOFMTaFFYA=="
+    },
+    "chai": {
+      "version": "4.3.10",
+      "resolved": "https://registry.npmjs.org/chai/-/chai-4.3.10.tgz",
+      "integrity": "sha512-0UXG04VuVbruMUYbJ6JctvH0YnC/4q3/AkT18q4NaITo91CUm0liMS9VqzT9vZhVQ/1eqPanMWjBM+Juhfb/9g==",
       "dev": true,
-      "license": "MIT"
+      "requires": {
+        "assertion-error": "^1.1.0",
+        "check-error": "^1.0.3",
+        "deep-eql": "^4.1.3",
+        "get-func-name": "^2.0.2",
+        "loupe": "^2.3.6",
+        "pathval": "^1.1.1",
+        "type-detect": "^4.0.8"
+      }
     },
-    "node_modules/json5": {
-      "version": "2.2.3",
-      "license": "MIT",
-      "bin": {
-        "json5": "lib/cli.js"
-      },
-      "engines": {
-        "node": ">=6"
+    "chalk": {
+      "version": "2.4.2",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
+      "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
+      "requires": {
+        "ansi-styles": "^3.2.1",
+        "escape-string-regexp": "^1.0.5",
+        "supports-color": "^5.3.0"
       }
     },
-    "node_modules/jsonc-parser": {
-      "version": "3.2.0",
+    "check-error": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/check-error/-/check-error-1.0.3.tgz",
+      "integrity": "sha512-iKEoDYaRmd1mxM90a2OEfWhjsjPpYPuQ+lMYsoxB126+t8fw7ySEO48nmDg5COTjxDI65/Y2OWpeEHk3ZOe8zg==",
       "dev": true,
-      "license": "MIT"
+      "requires": {
+        "get-func-name": "^2.0.2"
+      }
     },
-    "node_modules/jsonfile": {
-      "version": "6.1.0",
+    "chokidar": {
+      "version": "3.5.3",
+      "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.5.3.tgz",
+      "integrity": "sha512-Dr3sfKRP6oTcjf2JmUmFJfeVMvXBdegxB0iVQ5eb2V10uFJUCAS8OByZdVAyVb8xXNz3GjjTgj9kLWsZTqE6kw==",
       "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "universalify": "^2.0.0"
+      "requires": {
+        "anymatch": "~3.1.2",
+        "braces": "~3.0.2",
+        "fsevents": "~2.3.2",
+        "glob-parent": "~5.1.2",
+        "is-binary-path": "~2.1.0",
+        "is-glob": "~4.0.1",
+        "normalize-path": "~3.0.0",
+        "readdirp": "~3.6.0"
       },
-      "optionalDependencies": {
-        "graceful-fs": "^4.1.6"
-      }
-    },
-    "node_modules/jsontokens": {
-      "version": "4.0.1",
-      "license": "MIT",
       "dependencies": {
-        "@noble/hashes": "^1.1.2",
-        "@noble/secp256k1": "^1.6.3",
-        "base64-js": "^1.5.1"
+        "glob-parent": {
+          "version": "5.1.2",
+          "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz",
+          "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==",
+          "dev": true,
+          "requires": {
+            "is-glob": "^4.0.1"
+          }
+        }
       }
     },
-    "node_modules/jsx-ast-utils": {
-      "version": "3.3.5",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "array-includes": "^3.1.6",
-        "array.prototype.flat": "^1.3.1",
-        "object.assign": "^4.1.4",
-        "object.values": "^1.1.6"
-      },
-      "engines": {
-        "node": ">=4.0"
+    "chrome-trace-event": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/chrome-trace-event/-/chrome-trace-event-1.0.3.tgz",
+      "integrity": "sha512-p3KULyQg4S7NIHixdwbGX+nFHkoBiA4YQmyWtjb8XngSKV124nJmRysgAeujbUVb15vh+RvFUfCPqU7rXk+hZg==",
+      "dev": true
+    },
+    "cipher-base": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/cipher-base/-/cipher-base-1.0.4.tgz",
+      "integrity": "sha512-Kkht5ye6ZGmwv40uUDZztayT2ThLQGfnj/T71N/XzeZeo3nf8foyW7zGTsPYkEya3m5f3cAypH+qe7YOrM1U2Q==",
+      "requires": {
+        "inherits": "^2.0.1",
+        "safe-buffer": "^5.0.1"
       }
     },
-    "node_modules/knip": {
-      "version": "5.23.3",
-      "dev": true,
-      "funding": [
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/webpro"
-        },
-        {
-          "type": "opencollective",
-          "url": "https://opencollective.com/knip"
-        },
-        {
-          "type": "polar",
-          "url": "https://polar.sh/webpro-nl"
-        }
-      ],
-      "license": "ISC",
-      "dependencies": {
-        "@ericcornelissen/bash-parser": "0.5.3",
-        "@nodelib/fs.walk": "2.0.0",
-        "@snyk/github-codeowners": "1.1.0",
-        "easy-table": "1.2.0",
-        "fast-glob": "^3.3.2",
-        "jiti": "^1.21.6",
-        "js-yaml": "^4.1.0",
-        "minimist": "^1.2.8",
-        "picocolors": "^1.0.0",
-        "picomatch": "^4.0.1",
-        "pretty-ms": "^9.0.0",
-        "resolve": "^1.22.8",
-        "smol-toml": "^1.1.4",
-        "strip-json-comments": "5.0.1",
-        "summary": "2.1.0",
-        "tsconfig-paths": "^4.2.0",
-        "zod": "^3.22.4",
-        "zod-validation-error": "^3.0.3"
-      },
-      "bin": {
-        "knip": "bin/knip.js",
-        "knip-bun": "bin/knip-bun.js"
-      },
-      "engines": {
-        "node": ">=18.6.0"
+    "clarity-codegen": {
+      "version": "0.3.6",
+      "resolved": "https://registry.npmjs.org/clarity-codegen/-/clarity-codegen-0.3.6.tgz",
+      "integrity": "sha512-Be1J8RFtPFGfWtQ/7enl3xkU1j2KkIS9W7RbuofIVYfKp11MCZSGQeNV+Gh0dQOQIs3O0WQLLg03ikyNaWtYzQ==",
+      "requires": {
+        "@stacks/stacks-blockchain-api-types": "^7.1.10",
+        "axios": "^1.5.0",
+        "lodash": "^4.17.21",
+        "yargs": "^17.7.2",
+        "yqueue": "^1.0.1"
       },
-      "peerDependencies": {
-        "@types/node": ">=18",
-        "typescript": ">=5.0.4"
+      "dependencies": {
+        "@stacks/stacks-blockchain-api-types": {
+          "version": "7.9.0",
+          "resolved": "https://registry.npmjs.org/@stacks/stacks-blockchain-api-types/-/stacks-blockchain-api-types-7.9.0.tgz",
+          "integrity": "sha512-29tcIOxEj0jIAVrMLH2hDuTM0wWtOT4z9EnNgOCEQvipEDPyvoaPjbYJmQUTxzvVjfoLjZAQsvTlJw7fnbkkrg=="
+        }
       }
     },
-    "node_modules/knip/node_modules/@nodelib/fs.scandir": {
-      "version": "3.0.0",
+    "classnames": {
+      "version": "2.3.2",
+      "resolved": "https://registry.npmjs.org/classnames/-/classnames-2.3.2.tgz",
+      "integrity": "sha512-CSbhY4cFEJRe6/GQzIk5qXZ4Jeg5pcsP7b5peFSDpffpe1cqjASH/n9UTjBwOp6XpMSTwQ8Za2K5V02ueA7Tmw=="
+    },
+    "clean-css": {
+      "version": "5.3.2",
+      "resolved": "https://registry.npmjs.org/clean-css/-/clean-css-5.3.2.tgz",
+      "integrity": "sha512-JVJbM+f3d3Q704rF4bqQ5UUyTtuJ0JRKNbTKVEeujCCBoMdkEi+V+e8oktO9qGQNSvHrFTM6JZRXrUvGR1czww==",
       "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "@nodelib/fs.stat": "3.0.0",
-        "run-parallel": "^1.2.0"
+      "requires": {
+        "source-map": "~0.6.0"
       },
-      "engines": {
-        "node": ">=16.14.0"
+      "dependencies": {
+        "source-map": {
+          "version": "0.6.1",
+          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+          "dev": true
+        }
       }
     },
-    "node_modules/knip/node_modules/@nodelib/fs.stat": {
-      "version": "3.0.0",
+    "clean-stack": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/clean-stack/-/clean-stack-2.2.0.tgz",
+      "integrity": "sha512-4diC9HaTE+KRAMWhDhrGOECgWZxoevMc5TlkObMqNSsVU62PYzXZ/SMTjzyGAFF1YusgxGcSWTEXBhp0CPwQ1A==",
+      "dev": true
+    },
+    "clean-webpack-plugin": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/clean-webpack-plugin/-/clean-webpack-plugin-4.0.0.tgz",
+      "integrity": "sha512-WuWE1nyTNAyW5T7oNyys2EN0cfP2fdRxhxnIQWiAp0bMabPdHhoGxM8A6YL2GhqwgrPnnaemVE7nv5XJ2Fhh2w==",
       "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=16.14.0"
+      "requires": {
+        "del": "^4.1.1"
       }
     },
-    "node_modules/knip/node_modules/@nodelib/fs.walk": {
-      "version": "2.0.0",
+    "cli-cursor": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-3.1.0.tgz",
+      "integrity": "sha512-I/zHAwsKf9FqGoXM4WWRACob9+SNukZTd94DWF57E4toouRulbCxcUh6RKUEOQlYTHJnzkPMySvPNaaSLNfLZw==",
       "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "@nodelib/fs.scandir": "3.0.0",
-        "fastq": "^1.15.0"
-      },
-      "engines": {
-        "node": ">=16.14.0"
+      "requires": {
+        "restore-cursor": "^3.1.0"
       }
     },
-    "node_modules/knip/node_modules/picomatch": {
-      "version": "4.0.2",
+    "cli-truncate": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/cli-truncate/-/cli-truncate-3.1.0.tgz",
+      "integrity": "sha512-wfOBkjXteqSnI59oPcJkcPl/ZmwvMMOj340qUIY1SKZCv0B9Cf4D4fAucRkIKQmsIuYK3x1rrgU7MeGRruiuiA==",
       "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=12"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/jonschlinkert"
+      "requires": {
+        "slice-ansi": "^5.0.0",
+        "string-width": "^5.0.0"
       }
     },
-    "node_modules/knip/node_modules/strip-json-comments": {
-      "version": "5.0.1",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=14.16"
+    "cliui": {
+      "version": "8.0.1",
+      "resolved": "https://registry.npmjs.org/cliui/-/cliui-8.0.1.tgz",
+      "integrity": "sha512-BSeNnyus75C4//NQ9gQt1/csTXyo/8Sb+afLAkzAptFuMsod9HFokGNudZpi/oQV73hnVK+sR+5PVRMd+Dr7YQ==",
+      "requires": {
+        "string-width": "^4.2.0",
+        "strip-ansi": "^6.0.1",
+        "wrap-ansi": "^7.0.0"
       },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
+      "dependencies": {
+        "emoji-regex": {
+          "version": "8.0.0",
+          "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
+          "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A=="
+        },
+        "is-fullwidth-code-point": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
+          "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg=="
+        },
+        "string-width": {
+          "version": "4.2.3",
+          "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
+          "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
+          "requires": {
+            "emoji-regex": "^8.0.0",
+            "is-fullwidth-code-point": "^3.0.0",
+            "strip-ansi": "^6.0.1"
+          }
+        }
       }
     },
-    "node_modules/knip/node_modules/tsconfig-paths": {
-      "version": "4.2.0",
+    "clone": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/clone/-/clone-1.0.4.tgz",
+      "integrity": "sha512-JQHZ2QMW6l3aH/j6xCqQThY/9OH4D/9ls34cgkUBiEeocRTU04tHfKPBsUK1PqZCUQM7GiA0IIXJSuXHI64Kbg==",
       "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "json5": "^2.2.2",
-        "minimist": "^1.2.6",
-        "strip-bom": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=6"
+      "optional": true
+    },
+    "clsx": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/clsx/-/clsx-2.0.0.tgz",
+      "integrity": "sha512-rQ1+kcj+ttHG0MKVGBUXwayCCF1oh39BF5COIpRzuCEv8Mwjv0XucrI2ExNTOn9IlLifGClWQcU9BrZORvtw6Q=="
+    },
+    "color-convert": {
+      "version": "1.9.3",
+      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
+      "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
+      "requires": {
+        "color-name": "1.1.3"
       }
     },
-    "node_modules/language-subtag-registry": {
-      "version": "0.3.22",
-      "dev": true,
-      "license": "CC0-1.0"
+    "color-name": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
+      "integrity": "sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw=="
     },
-    "node_modules/language-tags": {
-      "version": "1.0.5",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "language-subtag-registry": "~0.3.2"
+    "colorette": {
+      "version": "2.0.20",
+      "resolved": "https://registry.npmjs.org/colorette/-/colorette-2.0.20.tgz",
+      "integrity": "sha512-IfEDxwoWIjkeXL1eXcDiow4UbKjhLdq6/EuSVR9GMN7KVH3r9gQ83e73hsz1Nd1T3ijd5xv1wcWRYO+D6kCI2w==",
+      "dev": true
+    },
+    "colornames": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/colornames/-/colornames-1.1.1.tgz",
+      "integrity": "sha512-/pyV40IrsdulWv+wFPmERh9k/mjsPZ64yUMDmWrtj/k1nmgrzzIENWKdaVKyBbvFdQWqkcaRxr+polCo3VMe7A=="
+    },
+    "combined-stream": {
+      "version": "1.0.8",
+      "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz",
+      "integrity": "sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==",
+      "requires": {
+        "delayed-stream": "~1.0.0"
       }
     },
-    "node_modules/launch-editor": {
-      "version": "2.6.0",
+    "commander": {
+      "version": "10.0.1",
+      "resolved": "https://registry.npmjs.org/commander/-/commander-10.0.1.tgz",
+      "integrity": "sha512-y4Mg2tXshplEbSGzx7amzPwKKOCGuoSRP/CjEdwwk0FOGlUbq6lKuoyDZTNZkmxHdJtp54hdfY/JUrdL7Xfdug==",
+      "dev": true
+    },
+    "common-path-prefix": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/common-path-prefix/-/common-path-prefix-3.0.0.tgz",
+      "integrity": "sha512-QE33hToZseCH3jS0qN96O/bSh3kaw/h+Tq7ngyY9eWDUnTlTNUyqfqvCXioLe5Na5jFsL78ra/wuBU4iuEgd4w==",
+      "dev": true
+    },
+    "compose-function": {
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/compose-function/-/compose-function-3.0.3.tgz",
+      "integrity": "sha512-xzhzTJ5eC+gmIzvZq+C3kCJHsp9os6tJkrigDRZclyGtOKINbZtE8n1Tzmeh32jW+BUDPbvZpibwvJHBLGMVwg==",
       "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "picocolors": "^1.0.0",
-        "shell-quote": "^1.7.3"
+      "requires": {
+        "arity-n": "^1.0.4"
       }
     },
-    "node_modules/ledger-bitcoin": {
-      "version": "0.2.3",
-      "resolved": "https://registry.npmjs.org/ledger-bitcoin/-/ledger-bitcoin-0.2.3.tgz",
-      "integrity": "sha512-sWdvMTR5CkebNlM0Mam9ROdpsD7Y4087kj4cbIaCCq8IXShCQ44vE3j0wTmt+sHp13eETgY63OWN1rkuIfMfuQ==",
-      "dependencies": {
-        "@bitcoinerlab/descriptors": "^1.0.2",
-        "@bitcoinerlab/secp256k1": "^1.0.5",
-        "@ledgerhq/hw-transport": "^6.20.0",
-        "bip32-path": "^0.4.2",
-        "bitcoinjs-lib": "^6.1.3"
-      },
-      "engines": {
-        "node": ">=14"
+    "compressible": {
+      "version": "2.0.18",
+      "resolved": "https://registry.npmjs.org/compressible/-/compressible-2.0.18.tgz",
+      "integrity": "sha512-AF3r7P5dWxL8MxyITRMlORQNaOA2IkAFaTr4k7BUumjPtRpGDTZpl0Pb1XCO6JeDCBdp126Cgs9sMxqSjgYyRg==",
+      "dev": true,
+      "requires": {
+        "mime-db": ">= 1.43.0 < 2"
       }
     },
-    "node_modules/levn": {
-      "version": "0.4.1",
+    "compression": {
+      "version": "1.7.4",
+      "resolved": "https://registry.npmjs.org/compression/-/compression-1.7.4.tgz",
+      "integrity": "sha512-jaSIDzP9pZVS4ZfQ+TzvtiWhdpFhE2RDHz8QJkpX9SIpLq88VueF5jJw6t+6CUQcAoA6t+x89MLrWAqpfDE8iQ==",
       "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "prelude-ls": "^1.2.1",
-        "type-check": "~0.4.0"
+      "requires": {
+        "accepts": "~1.3.5",
+        "bytes": "3.0.0",
+        "compressible": "~2.0.16",
+        "debug": "2.6.9",
+        "on-headers": "~1.0.2",
+        "safe-buffer": "5.1.2",
+        "vary": "~1.1.2"
       },
-      "engines": {
-        "node": ">= 0.8.0"
+      "dependencies": {
+        "debug": {
+          "version": "2.6.9",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+          "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+          "dev": true,
+          "requires": {
+            "ms": "2.0.0"
+          }
+        },
+        "ms": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+          "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==",
+          "dev": true
+        },
+        "safe-buffer": {
+          "version": "5.1.2",
+          "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
+          "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==",
+          "dev": true
+        }
       }
     },
-    "node_modules/lilconfig": {
-      "version": "2.1.0",
+    "concat-map": {
+      "version": "0.0.1",
+      "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
+      "integrity": "sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg=="
+    },
+    "confusing-browser-globals": {
+      "version": "1.0.11",
+      "resolved": "https://registry.npmjs.org/confusing-browser-globals/-/confusing-browser-globals-1.0.11.tgz",
+      "integrity": "sha512-JsPKdmh8ZkmnHxDk55FZ1TqVLvEQTvoByJZRN9jzI0UjxK/QgAmsphz7PGtqgPieQZ/CQcHWXCR7ATDNhGe+YA==",
+      "dev": true
+    },
+    "connect-history-api-fallback": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/connect-history-api-fallback/-/connect-history-api-fallback-2.0.0.tgz",
+      "integrity": "sha512-U73+6lQFmfiNPrYbXqr6kZ1i1wiRqXnp2nhMsINseWXO8lDau0LGEffJ8kQi4EjLZympVgRdvqjAgiZ1tgzDDA==",
+      "dev": true
+    },
+    "content-disposition": {
+      "version": "0.5.4",
+      "resolved": "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.4.tgz",
+      "integrity": "sha512-FveZTNuGw04cxlAiWbzi6zTAL/lhehaWbTtgluJh4/E95DqMwTmha3KZN1aAWA8cFIhHzMZUvLevkw5Rqk+tSQ==",
       "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=10"
+      "requires": {
+        "safe-buffer": "5.2.1"
       }
     },
-    "node_modules/lines-and-columns": {
-      "version": "1.2.4",
-      "dev": true,
-      "license": "MIT"
+    "content-type": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/content-type/-/content-type-1.0.5.tgz",
+      "integrity": "sha512-nTjqfcBFEipKdXCv4YDQWCfmcLZKm81ldF0pAopTvyrFGVbcR6P/VAAd5G7N+0tTr8QqiU0tFadD6FK4NtJwOA==",
+      "dev": true
     },
-    "node_modules/lint-staged": {
-      "version": "13.2.3",
+    "cookie": {
+      "version": "0.5.0",
+      "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.5.0.tgz",
+      "integrity": "sha512-YZ3GUyn/o8gfKJlnlX7g7xq4gyO6OSuhGPKaaGssGB2qgDUS0gPgtTvoyZLTt9Ab6dC4hfc9dV5arkvc/OCmrw==",
+      "dev": true
+    },
+    "cookie-signature": {
+      "version": "1.0.6",
+      "resolved": "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.6.tgz",
+      "integrity": "sha512-QADzlaHc8icV8I7vbaJXJwod9HWYp8uCqf1xa4OfNu1T7JVxQIrUgOWtHdNDtPiywmFbiS12VjotIXLrKM3orQ==",
+      "dev": true
+    },
+    "copy-anything": {
+      "version": "3.0.5",
+      "resolved": "https://registry.npmjs.org/copy-anything/-/copy-anything-3.0.5.tgz",
+      "integrity": "sha512-yCEafptTtb4bk7GLEQoM8KVJpxAfdBJYaXyzQEgQQQgYrZiDp8SJmGKlYza6CYjEDNstAdNdKA3UuoULlEbS6w==",
+      "requires": {
+        "is-what": "^4.1.8"
+      }
+    },
+    "copy-webpack-plugin": {
+      "version": "11.0.0",
+      "resolved": "https://registry.npmjs.org/copy-webpack-plugin/-/copy-webpack-plugin-11.0.0.tgz",
+      "integrity": "sha512-fX2MWpamkW0hZxMEg0+mYnA40LTosOSa5TqZ9GYIBzyJa9C3QUaMPSE2xAi/buNr8u89SfD9wHSQVBzrRa/SOQ==",
       "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "chalk": "5.2.0",
-        "cli-truncate": "^3.1.0",
-        "commander": "^10.0.0",
-        "debug": "^4.3.4",
-        "execa": "^7.0.0",
-        "lilconfig": "2.1.0",
-        "listr2": "^5.0.7",
-        "micromatch": "^4.0.5",
+      "requires": {
+        "fast-glob": "^3.2.11",
+        "glob-parent": "^6.0.1",
+        "globby": "^13.1.1",
         "normalize-path": "^3.0.0",
-        "object-inspect": "^1.12.3",
-        "pidtree": "^0.6.0",
-        "string-argv": "^0.3.1",
-        "yaml": "^2.2.2"
-      },
-      "bin": {
-        "lint-staged": "bin/lint-staged.js"
+        "schema-utils": "^4.0.0",
+        "serialize-javascript": "^6.0.0"
       },
-      "engines": {
-        "node": "^14.13.1 || >=16.0.0"
+      "dependencies": {
+        "ajv": {
+          "version": "8.12.0",
+          "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.12.0.tgz",
+          "integrity": "sha512-sRu1kpcO9yLtYxBKvqfTeh9KzZEwO3STyX1HT+4CaDzC6HpTGYhIhPIzj9XuKU7KYDwnaeh5hcOwjy1QuJzBPA==",
+          "dev": true,
+          "requires": {
+            "fast-deep-equal": "^3.1.1",
+            "json-schema-traverse": "^1.0.0",
+            "require-from-string": "^2.0.2",
+            "uri-js": "^4.2.2"
+          }
+        },
+        "ajv-keywords": {
+          "version": "5.1.0",
+          "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-5.1.0.tgz",
+          "integrity": "sha512-YCS/JNFAUyr5vAuhk1DWm1CBxRHW9LbJ2ozWeemrIqpbsqKjHVxYPyi5GC0rjZIT5JxJ3virVTS8wk4i/Z+krw==",
+          "dev": true,
+          "requires": {
+            "fast-deep-equal": "^3.1.3"
+          }
+        },
+        "globby": {
+          "version": "13.2.2",
+          "resolved": "https://registry.npmjs.org/globby/-/globby-13.2.2.tgz",
+          "integrity": "sha512-Y1zNGV+pzQdh7H39l9zgB4PJqjRNqydvdYCDG4HFXM4XuvSaQQlEc91IU1yALL8gUTDomgBAfz3XJdmUS+oo0w==",
+          "dev": true,
+          "requires": {
+            "dir-glob": "^3.0.1",
+            "fast-glob": "^3.3.0",
+            "ignore": "^5.2.4",
+            "merge2": "^1.4.1",
+            "slash": "^4.0.0"
+          }
+        },
+        "json-schema-traverse": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz",
+          "integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==",
+          "dev": true
+        },
+        "schema-utils": {
+          "version": "4.2.0",
+          "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-4.2.0.tgz",
+          "integrity": "sha512-L0jRsrPpjdckP3oPug3/VxNKt2trR8TcabrM6FOAAlvC/9Phcmm+cuAgTlxBqdBR1WJx7Naj9WHw+aOmheSVbw==",
+          "dev": true,
+          "requires": {
+            "@types/json-schema": "^7.0.9",
+            "ajv": "^8.9.0",
+            "ajv-formats": "^2.1.1",
+            "ajv-keywords": "^5.1.0"
+          }
+        },
+        "slash": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/slash/-/slash-4.0.0.tgz",
+          "integrity": "sha512-3dOsAHXXUkQTpOYcoAxLIorMTp4gIQr5IW3iVb7A7lFIp0VHhnynm9izx6TssdrIcVIESAlVjtnO2K8bg+Coew==",
+          "dev": true
+        }
+      }
+    },
+    "core-js": {
+      "version": "2.6.12",
+      "resolved": "https://registry.npmjs.org/core-js/-/core-js-2.6.12.tgz",
+      "integrity": "sha512-Kb2wC0fvsWfQrgk8HU5lW6U/Lcs8+9aaYcy4ZFc6DDlo4nZ7n70dEgE5rtR0oG6ufKDUnrwfWL1mXR5ljDatrQ=="
+    },
+    "core-js-pure": {
+      "version": "3.32.0",
+      "resolved": "https://registry.npmjs.org/core-js-pure/-/core-js-pure-3.32.0.tgz",
+      "integrity": "sha512-qsev1H+dTNYpDUEURRuOXMvpdtAnNEvQWS/FMJ2Vb5AY8ZP4rAPQldkE27joykZPJTe0+IVgHZYh1P5Xu1/i1g==",
+      "dev": true
+    },
+    "core-util-is": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.3.tgz",
+      "integrity": "sha512-ZQBvi1DcpJ4GDqanjucZ2Hj3wEO5pZDS89BWbkcrvdxksJorwUDDZamX9ldFkp9aw2lmBDLgkObEA4DWNJ9FYQ==",
+      "dev": true
+    },
+    "create-ecdh": {
+      "version": "4.0.4",
+      "resolved": "https://registry.npmjs.org/create-ecdh/-/create-ecdh-4.0.4.tgz",
+      "integrity": "sha512-mf+TCx8wWc9VpuxfP2ht0iSISLZnt0JgWlrOKZiNqyUZWnjIaCIVNQArMHnCZKfEYRg6IM7A+NeJoN8gf/Ws0A==",
+      "requires": {
+        "bn.js": "^4.1.0",
+        "elliptic": "^6.5.3"
       },
-      "funding": {
-        "url": "https://opencollective.com/lint-staged"
+      "dependencies": {
+        "bn.js": {
+          "version": "4.12.0",
+          "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.0.tgz",
+          "integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA=="
+        }
+      }
+    },
+    "create-hash": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/create-hash/-/create-hash-1.2.0.tgz",
+      "integrity": "sha512-z00bCGNHDG8mHAkP7CtT1qVu+bFQUPjYq/4Iv3C3kWjTFV10zIjfSoeqXo9Asws8gwSHDGj/hl2u4OGIjapeCg==",
+      "requires": {
+        "cipher-base": "^1.0.1",
+        "inherits": "^2.0.1",
+        "md5.js": "^1.3.4",
+        "ripemd160": "^2.0.1",
+        "sha.js": "^2.4.0"
+      }
+    },
+    "create-hmac": {
+      "version": "1.1.7",
+      "resolved": "https://registry.npmjs.org/create-hmac/-/create-hmac-1.1.7.tgz",
+      "integrity": "sha512-MJG9liiZ+ogc4TzUwuvbER1JRdgvUFSB5+VR/g5h82fGaIRWMWddtKBHi7/sVhfjQZ6SehlyhvQYrcYkaUIpLg==",
+      "requires": {
+        "cipher-base": "^1.0.3",
+        "create-hash": "^1.1.0",
+        "inherits": "^2.0.1",
+        "ripemd160": "^2.0.0",
+        "safe-buffer": "^5.0.1",
+        "sha.js": "^2.4.8"
       }
     },
-    "node_modules/lint-staged/node_modules/chalk": {
-      "version": "5.2.0",
+    "cross-fetch": {
+      "version": "3.1.8",
+      "resolved": "https://registry.npmjs.org/cross-fetch/-/cross-fetch-3.1.8.tgz",
+      "integrity": "sha512-cvA+JwZoU0Xq+h6WkMvAUqPEYy92Obet6UdKLfW60qn99ftItKjB5T+BkyWOFWe2pUyfQ+IJHmpOTznqk1M6Kg==",
+      "requires": {
+        "node-fetch": "^2.6.12"
+      }
+    },
+    "cross-sha256": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/cross-sha256/-/cross-sha256-1.2.0.tgz",
+      "integrity": "sha512-KViLNMDZKV7jwFqjFx+rNhG26amnFYYQ0S+VaFlVvpk8tM+2XbFia/don/SjGHg9WQxnFVi6z64CGPuF3T+nNw==",
+      "requires": {
+        "buffer": "6.0.3"
+      }
+    },
+    "cross-spawn": {
+      "version": "7.0.3",
+      "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz",
+      "integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==",
       "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": "^12.17.0 || ^14.13 || >=16.0.0"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/chalk?sponsor=1"
+      "requires": {
+        "path-key": "^3.1.0",
+        "shebang-command": "^2.0.0",
+        "which": "^2.0.1"
       }
     },
-    "node_modules/lint-staged/node_modules/execa": {
-      "version": "7.2.0",
+    "crypto-browserify": {
+      "version": "3.12.0",
+      "resolved": "https://registry.npmjs.org/crypto-browserify/-/crypto-browserify-3.12.0.tgz",
+      "integrity": "sha512-fz4spIh+znjO2VjL+IdhEpRJ3YN6sMzITSBijk6FK2UvTqruSQW+/cCZTSNsMiZNvUeq0CqurF+dAbyiGOY6Wg==",
+      "requires": {
+        "browserify-cipher": "^1.0.0",
+        "browserify-sign": "^4.0.0",
+        "create-ecdh": "^4.0.0",
+        "create-hash": "^1.1.0",
+        "create-hmac": "^1.1.0",
+        "diffie-hellman": "^5.0.0",
+        "inherits": "^2.0.1",
+        "pbkdf2": "^3.0.3",
+        "public-encrypt": "^4.0.0",
+        "randombytes": "^2.0.0",
+        "randomfill": "^1.0.3"
+      }
+    },
+    "css-color-keywords": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/css-color-keywords/-/css-color-keywords-1.0.0.tgz",
+      "integrity": "sha512-FyyrDHZKEjXDpNJYvVsV960FiqQyXc/LlYmsxl2BcdMb2WPx0OGRVgTg55rPSyLSNMqP52R9r8geSp7apN3Ofg=="
+    },
+    "css-loader": {
+      "version": "6.8.1",
+      "resolved": "https://registry.npmjs.org/css-loader/-/css-loader-6.8.1.tgz",
+      "integrity": "sha512-xDAXtEVGlD0gJ07iclwWVkLoZOpEvAWaSyf6W18S2pOC//K8+qUDIx8IIT3D+HjnmkJPQeesOPv5aiUaJsCM2g==",
       "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "cross-spawn": "^7.0.3",
-        "get-stream": "^6.0.1",
-        "human-signals": "^4.3.0",
-        "is-stream": "^3.0.0",
-        "merge-stream": "^2.0.0",
-        "npm-run-path": "^5.1.0",
-        "onetime": "^6.0.0",
-        "signal-exit": "^3.0.7",
-        "strip-final-newline": "^3.0.0"
-      },
-      "engines": {
-        "node": "^14.18.0 || ^16.14.0 || >=18.0.0"
+      "requires": {
+        "icss-utils": "^5.1.0",
+        "postcss": "^8.4.21",
+        "postcss-modules-extract-imports": "^3.0.0",
+        "postcss-modules-local-by-default": "^4.0.3",
+        "postcss-modules-scope": "^3.0.0",
+        "postcss-modules-values": "^4.0.0",
+        "postcss-value-parser": "^4.2.0",
+        "semver": "^7.3.8"
       },
-      "funding": {
-        "url": "https://github.com/sindresorhus/execa?sponsor=1"
+      "dependencies": {
+        "lru-cache": {
+          "version": "6.0.0",
+          "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
+          "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
+          "dev": true,
+          "requires": {
+            "yallist": "^4.0.0"
+          }
+        },
+        "semver": {
+          "version": "7.5.4",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz",
+          "integrity": "sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==",
+          "dev": true,
+          "requires": {
+            "lru-cache": "^6.0.0"
+          }
+        },
+        "yallist": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
+          "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==",
+          "dev": true
+        }
       }
     },
-    "node_modules/lint-staged/node_modules/human-signals": {
-      "version": "4.3.1",
+    "css-select": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/css-select/-/css-select-4.3.0.tgz",
+      "integrity": "sha512-wPpOYtnsVontu2mODhA19JrqWxNsfdatRKd64kmpRbQgh1KtItko5sTnEpPdpSaJszTOhEMlF/RPz28qj4HqhQ==",
       "dev": true,
-      "license": "Apache-2.0",
-      "engines": {
-        "node": ">=14.18.0"
+      "requires": {
+        "boolbase": "^1.0.0",
+        "css-what": "^6.0.1",
+        "domhandler": "^4.3.1",
+        "domutils": "^2.8.0",
+        "nth-check": "^2.0.1"
       }
     },
-    "node_modules/lint-staged/node_modules/is-stream": {
+    "css-to-react-native": {
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/css-to-react-native/-/css-to-react-native-3.2.0.tgz",
+      "integrity": "sha512-e8RKaLXMOFii+02mOlqwjbD00KSEKqblnpO9e++1aXS1fPQOpS1YoqdVHBqPjHNoxeF2mimzVqawm2KCbEdtHQ==",
+      "requires": {
+        "camelize": "^1.0.0",
+        "css-color-keywords": "^1.0.0",
+        "postcss-value-parser": "^4.0.2"
+      }
+    },
+    "css-what": {
+      "version": "6.1.0",
+      "resolved": "https://registry.npmjs.org/css-what/-/css-what-6.1.0.tgz",
+      "integrity": "sha512-HTUrgRJ7r4dsZKU6GjmpfRK1O76h97Z8MfS1G0FozR+oF2kG6Vfe8JE6zwrkbxigziPHinCJ+gCPjA9EaBDtRw==",
+      "dev": true
+    },
+    "cssesc": {
       "version": "3.0.0",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": "^12.20.0 || ^14.13.1 || >=16.0.0"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
+      "resolved": "https://registry.npmjs.org/cssesc/-/cssesc-3.0.0.tgz",
+      "integrity": "sha512-/Tb/JcjK111nNScGob5MNtsntNM1aCNUDipB/TkwZFhyDrrE47SOx/18wF2bbjgc3ZzCSKW1T5nt5EbFoAz/Vg==",
+      "dev": true
+    },
+    "csstype": {
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/csstype/-/csstype-3.1.2.tgz",
+      "integrity": "sha512-I7K1Uu0MBPzaFKg4nI5Q7Vs2t+3gWWW648spaF+Rg7pI9ds18Ugn+lvg4SHczUdKlHI5LWBXyqfS8+DufyBsgQ=="
+    },
+    "damerau-levenshtein": {
+      "version": "1.0.8",
+      "resolved": "https://registry.npmjs.org/damerau-levenshtein/-/damerau-levenshtein-1.0.8.tgz",
+      "integrity": "sha512-sdQSFB7+llfUcQHUQO3+B8ERRj0Oa4w9POWMI/puGtuf7gFywGmkaLCElnudfTiKZV+NvHqL0ifzdrI8Ro7ESA==",
+      "dev": true
+    },
+    "date-fns": {
+      "version": "2.30.0",
+      "resolved": "https://registry.npmjs.org/date-fns/-/date-fns-2.30.0.tgz",
+      "integrity": "sha512-fnULvOpxnC5/Vg3NCiWelDsLiUc9bRwAPs/+LfTLNvetFCtCTN+yQz15C/fs4AwX1R9K5GLtLfn8QW+dWisaAw==",
+      "requires": {
+        "@babel/runtime": "^7.21.0"
       }
     },
-    "node_modules/lint-staged/node_modules/mimic-fn": {
-      "version": "4.0.0",
+    "debug": {
+      "version": "4.3.4",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
+      "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==",
+      "requires": {
+        "ms": "2.1.2"
+      }
+    },
+    "deep-eql": {
+      "version": "4.1.3",
+      "resolved": "https://registry.npmjs.org/deep-eql/-/deep-eql-4.1.3.tgz",
+      "integrity": "sha512-WaEtAOpRA1MQ0eohqZjpGD8zdI0Ovsm8mmFhaDN8dvDZzyoUMcYDnf5Y6iu7HTXxf8JDS23qWa4a+hKCDyOPzw==",
       "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=12"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
+      "requires": {
+        "type-detect": "^4.0.0"
       }
     },
-    "node_modules/lint-staged/node_modules/npm-run-path": {
-      "version": "5.1.0",
+    "deep-equal": {
+      "version": "2.2.2",
+      "resolved": "https://registry.npmjs.org/deep-equal/-/deep-equal-2.2.2.tgz",
+      "integrity": "sha512-xjVyBf0w5vH0I42jdAZzOKVldmPgSulmiyPRywoyq7HXC9qdgo17kxJE+rdnif5Tz6+pIrpJI8dCpMNLIGkUiA==",
       "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "path-key": "^4.0.0"
-      },
-      "engines": {
-        "node": "^12.20.0 || ^14.13.1 || >=16.0.0"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
+      "requires": {
+        "array-buffer-byte-length": "^1.0.0",
+        "call-bind": "^1.0.2",
+        "es-get-iterator": "^1.1.3",
+        "get-intrinsic": "^1.2.1",
+        "is-arguments": "^1.1.1",
+        "is-array-buffer": "^3.0.2",
+        "is-date-object": "^1.0.5",
+        "is-regex": "^1.1.4",
+        "is-shared-array-buffer": "^1.0.2",
+        "isarray": "^2.0.5",
+        "object-is": "^1.1.5",
+        "object-keys": "^1.1.1",
+        "object.assign": "^4.1.4",
+        "regexp.prototype.flags": "^1.5.0",
+        "side-channel": "^1.0.4",
+        "which-boxed-primitive": "^1.0.2",
+        "which-collection": "^1.0.1",
+        "which-typed-array": "^1.1.9"
       }
     },
-    "node_modules/lint-staged/node_modules/onetime": {
-      "version": "6.0.0",
+    "deep-is": {
+      "version": "0.1.4",
+      "resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.4.tgz",
+      "integrity": "sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ==",
+      "dev": true
+    },
+    "deepmerge": {
+      "version": "4.3.1",
+      "resolved": "https://registry.npmjs.org/deepmerge/-/deepmerge-4.3.1.tgz",
+      "integrity": "sha512-3sUqbMEc77XqpdNO7FRyRog+eW3ph+GYCbj+rK+uYyRMuwsVy0rMiVtPn+QJlKFvWP/1PYpapqYn0Me2knFn+A==",
+      "dev": true
+    },
+    "default-gateway": {
+      "version": "6.0.3",
+      "resolved": "https://registry.npmjs.org/default-gateway/-/default-gateway-6.0.3.tgz",
+      "integrity": "sha512-fwSOJsbbNzZ/CUFpqFBqYfYNLj1NbMPm8MMCIzHjC83iSJRBEGmDUxU+WP661BaBQImeC2yHwXtz+P/O9o+XEg==",
       "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "mimic-fn": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=12"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
+      "requires": {
+        "execa": "^5.0.0"
       }
     },
-    "node_modules/lint-staged/node_modules/path-key": {
-      "version": "4.0.0",
+    "defaults": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/defaults/-/defaults-1.0.4.tgz",
+      "integrity": "sha512-eFuaLoy/Rxalv2kr+lqMlUnrDWV+3j4pljOIJgLIhI058IQfWJ7vXhyEIHu+HtC738klGALYxOKDO0bQP3tg8A==",
       "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=12"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
+      "optional": true,
+      "requires": {
+        "clone": "^1.0.2"
       }
     },
-    "node_modules/lint-staged/node_modules/strip-final-newline": {
-      "version": "3.0.0",
+    "define-data-property": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/define-data-property/-/define-data-property-1.1.4.tgz",
+      "integrity": "sha512-rBMvIzlpA8v6E+SJZoo++HAYqsLrkg7MSfIinMPFhmkorw7X+dOXVJQs+QT69zGkzMyfDnIMN2Wid1+NbL3T+A==",
+      "requires": {
+        "es-define-property": "^1.0.0",
+        "es-errors": "^1.3.0",
+        "gopd": "^1.0.1"
+      }
+    },
+    "define-lazy-prop": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/define-lazy-prop/-/define-lazy-prop-2.0.0.tgz",
+      "integrity": "sha512-Ds09qNh8yw3khSjiJjiUInaGX9xlqZDY7JVryGxdxV7NPeuqQfplOpQ66yJFZut3jLa5zOwkXw1g9EI2uKh4Og==",
+      "dev": true
+    },
+    "define-properties": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.2.0.tgz",
+      "integrity": "sha512-xvqAVKGfT1+UAvPwKTVw/njhdQ8ZhXK4lI0bCIuCMrp2up9nPnaDftrLtmpTazqd1o+UY4zgzU+avtMbDP+ldA==",
       "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=12"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
+      "requires": {
+        "has-property-descriptors": "^1.0.0",
+        "object-keys": "^1.1.1"
       }
     },
-    "node_modules/listr2": {
-      "version": "5.0.8",
+    "del": {
+      "version": "4.1.1",
+      "resolved": "https://registry.npmjs.org/del/-/del-4.1.1.tgz",
+      "integrity": "sha512-QwGuEUouP2kVwQenAsOof5Fv8K9t3D8Ca8NxcXKrIpEHjTXK5J2nXLdP+ALI1cgv8wj7KuwBhTwBkOZSJKM5XQ==",
       "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "cli-truncate": "^2.1.0",
-        "colorette": "^2.0.19",
-        "log-update": "^4.0.0",
-        "p-map": "^4.0.0",
-        "rfdc": "^1.3.0",
-        "rxjs": "^7.8.0",
-        "through": "^2.3.8",
-        "wrap-ansi": "^7.0.0"
-      },
-      "engines": {
-        "node": "^14.13.1 || >=16.0.0"
-      },
-      "peerDependencies": {
-        "enquirer": ">= 2.3.0 < 3"
+      "requires": {
+        "@types/glob": "^7.1.1",
+        "globby": "^6.1.0",
+        "is-path-cwd": "^2.0.0",
+        "is-path-in-cwd": "^2.0.0",
+        "p-map": "^2.0.0",
+        "pify": "^4.0.1",
+        "rimraf": "^2.6.3"
       },
-      "peerDependenciesMeta": {
-        "enquirer": {
-          "optional": true
+      "dependencies": {
+        "array-union": {
+          "version": "1.0.2",
+          "resolved": "https://registry.npmjs.org/array-union/-/array-union-1.0.2.tgz",
+          "integrity": "sha512-Dxr6QJj/RdU/hCaBjOfxW+q6lyuVE6JFWIrAUpuOOhoJJoQ99cUn3igRaHVB5P9WrgFVN0FfArM3x0cueOU8ng==",
+          "dev": true,
+          "requires": {
+            "array-uniq": "^1.0.1"
+          }
+        },
+        "globby": {
+          "version": "6.1.0",
+          "resolved": "https://registry.npmjs.org/globby/-/globby-6.1.0.tgz",
+          "integrity": "sha512-KVbFv2TQtbzCoxAnfD6JcHZTYCzyliEaaeM/gH8qQdkKr5s0OP9scEgvdcngyk7AVdY6YVW/TJHd+lQ/Df3Daw==",
+          "dev": true,
+          "requires": {
+            "array-union": "^1.0.1",
+            "glob": "^7.0.3",
+            "object-assign": "^4.0.1",
+            "pify": "^2.0.0",
+            "pinkie-promise": "^2.0.0"
+          },
+          "dependencies": {
+            "pify": {
+              "version": "2.3.0",
+              "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
+              "integrity": "sha512-udgsAY+fTnvv7kI7aaxbqwWNb0AHiB0qBO89PZKPkoTmGOgdbrHDKD+0B2X4uTfJ/FT1R09r9gTsjUjNJotuog==",
+              "dev": true
+            }
+          }
+        },
+        "rimraf": {
+          "version": "2.7.1",
+          "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz",
+          "integrity": "sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==",
+          "dev": true,
+          "requires": {
+            "glob": "^7.1.3"
+          }
         }
       }
     },
-    "node_modules/listr2/node_modules/ansi-styles": {
-      "version": "4.3.0",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "color-convert": "^2.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
+    "delayed-stream": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz",
+      "integrity": "sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ=="
+    },
+    "depd": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/depd/-/depd-2.0.0.tgz",
+      "integrity": "sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw==",
+      "dev": true
+    },
+    "dequal": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/dequal/-/dequal-2.0.3.tgz",
+      "integrity": "sha512-0je+qPKHEMohvfRTCEo3CrPG6cAzAYgmzKyxRiYSSDkS6eGJdyVJm7WaYA5ECaAD9wLB2T4EEeymA5aFVcYXCA==",
+      "dev": true
+    },
+    "des.js": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/des.js/-/des.js-1.1.0.tgz",
+      "integrity": "sha512-r17GxjhUCjSRy8aiJpr8/UadFIzMzJGexI3Nmz4ADi9LYSFx4gTBp80+NaX/YsXWWLhpZ7v/v/ubEc/bCNfKwg==",
+      "requires": {
+        "inherits": "^2.0.1",
+        "minimalistic-assert": "^1.0.0"
       }
     },
-    "node_modules/listr2/node_modules/cli-truncate": {
+    "destroy": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/destroy/-/destroy-1.2.0.tgz",
+      "integrity": "sha512-2sJGJTaXIIaR1w4iJSNoN0hnMY7Gpc/n8D4qSCJw8QqFWXf7cuAgnEHxBpweaVcPevC2l3KpjYCx3NypQQgaJg==",
+      "dev": true
+    },
+    "detect-node": {
       "version": "2.1.0",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "slice-ansi": "^3.0.0",
-        "string-width": "^4.2.0"
-      },
-      "engines": {
-        "node": ">=8"
+      "resolved": "https://registry.npmjs.org/detect-node/-/detect-node-2.1.0.tgz",
+      "integrity": "sha512-T0NIuQpnTvFDATNuHN5roPwSBG83rFsuO+MXXH9/3N1eFbn4wcPjttvjMLEPWJ0RGUYgQE7cGgS3tNxbqCGM7g=="
+    },
+    "diffie-hellman": {
+      "version": "5.0.3",
+      "resolved": "https://registry.npmjs.org/diffie-hellman/-/diffie-hellman-5.0.3.tgz",
+      "integrity": "sha512-kqag/Nl+f3GwyK25fhUMYj81BUOrZ9IuJsjIcDE5icNM9FJHAVm3VcUDxdLPoQtTuUylWm6ZIknYJwwaPxsUzg==",
+      "requires": {
+        "bn.js": "^4.1.0",
+        "miller-rabin": "^4.0.0",
+        "randombytes": "^2.0.0"
       },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
+      "dependencies": {
+        "bn.js": {
+          "version": "4.12.0",
+          "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.0.tgz",
+          "integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA=="
+        }
       }
     },
-    "node_modules/listr2/node_modules/color-convert": {
-      "version": "2.0.1",
+    "dir-glob": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/dir-glob/-/dir-glob-3.0.1.tgz",
+      "integrity": "sha512-WkrWp9GR4KXfKGYzOLmTuGVi1UWFfws377n9cc55/tb6DuqyF6pcQ5AbiHEshaDpY9v6oaSr2XCDidGmMwdzIA==",
       "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "color-name": "~1.1.4"
-      },
-      "engines": {
-        "node": ">=7.0.0"
+      "requires": {
+        "path-type": "^4.0.0"
       }
     },
-    "node_modules/listr2/node_modules/color-name": {
-      "version": "1.1.4",
-      "dev": true,
-      "license": "MIT"
+    "dns-equal": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/dns-equal/-/dns-equal-1.0.0.tgz",
+      "integrity": "sha512-z+paD6YUQsk+AbGCEM4PrOXSss5gd66QfcVBFTKR/HpFL9jCqikS94HYwKww6fQyO7IxrIIyUu+g0Ka9tUS2Cg==",
+      "dev": true
     },
-    "node_modules/listr2/node_modules/emoji-regex": {
-      "version": "8.0.0",
+    "dns-packet": {
+      "version": "5.6.0",
+      "resolved": "https://registry.npmjs.org/dns-packet/-/dns-packet-5.6.0.tgz",
+      "integrity": "sha512-rza3UH1LwdHh9qyPXp8lkwpjSNk/AMD3dPytUoRoqnypDUhY0xvbdmVhWOfxO68frEfV9BU8V12Ez7ZsHGZpCQ==",
       "dev": true,
-      "license": "MIT"
+      "requires": {
+        "@leichtgewicht/ip-codec": "^2.0.1"
+      }
     },
-    "node_modules/listr2/node_modules/is-fullwidth-code-point": {
+    "doctrine": {
       "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-3.0.0.tgz",
+      "integrity": "sha512-yS+Q5i3hBf7GBkd4KG8a7eBNNWNGLTaEwwYWUijIYM7zrlYDM0BFXHjjPWlWZ1Rg7UaddZeIDmi9jF3HmqiQ2w==",
       "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=8"
+      "requires": {
+        "esutils": "^2.0.2"
       }
     },
-    "node_modules/listr2/node_modules/p-map": {
-      "version": "4.0.0",
+    "dom-converter": {
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/dom-converter/-/dom-converter-0.2.0.tgz",
+      "integrity": "sha512-gd3ypIPfOMr9h5jIKq8E3sHOTCjeirnl0WK5ZdS1AW0Odt0b1PaWaHdJ4Qk4klv+YB9aJBS7mESXjFoDQPu6DA==",
       "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "aggregate-error": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
+      "requires": {
+        "utila": "~0.4"
       }
     },
-    "node_modules/listr2/node_modules/rxjs": {
-      "version": "7.8.1",
+    "dom-serializer": {
+      "version": "1.4.1",
+      "resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-1.4.1.tgz",
+      "integrity": "sha512-VHwB3KfrcOOkelEG2ZOfxqLZdfkil8PtJi4P8N2MMXucZq2yLp75ClViUlOVwyoHEDjYU433Aq+5zWP61+RGag==",
       "dev": true,
-      "license": "Apache-2.0",
+      "requires": {
+        "domelementtype": "^2.0.1",
+        "domhandler": "^4.2.0",
+        "entities": "^2.0.0"
+      },
       "dependencies": {
-        "tslib": "^2.1.0"
+        "entities": {
+          "version": "2.2.0",
+          "resolved": "https://registry.npmjs.org/entities/-/entities-2.2.0.tgz",
+          "integrity": "sha512-p92if5Nz619I0w+akJrLZH0MX0Pb5DX39XOwQTtXSdQQOaYH03S1uIQp4mhOZtAXrxq4ViO67YTiLBo2638o9A==",
+          "dev": true
+        }
       }
     },
-    "node_modules/listr2/node_modules/slice-ansi": {
-      "version": "3.0.0",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "ansi-styles": "^4.0.0",
-        "astral-regex": "^2.0.0",
-        "is-fullwidth-code-point": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
+    "domelementtype": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-2.3.0.tgz",
+      "integrity": "sha512-OLETBj6w0OsagBwdXnPdN0cnMfF9opN69co+7ZrbfPGrdpPVNBUj02spi6B1N7wChLQiPn4CSH/zJvXw56gmHw==",
+      "dev": true
     },
-    "node_modules/listr2/node_modules/string-width": {
-      "version": "4.2.3",
+    "domhandler": {
+      "version": "4.3.1",
+      "resolved": "https://registry.npmjs.org/domhandler/-/domhandler-4.3.1.tgz",
+      "integrity": "sha512-GrwoxYN+uWlzO8uhUXRl0P+kHE4GtVPfYzVLcUxPL7KNdHKj66vvlhiweIHqYYXWlw+T8iLMp42Lm67ghw4WMQ==",
       "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "emoji-regex": "^8.0.0",
-        "is-fullwidth-code-point": "^3.0.0",
-        "strip-ansi": "^6.0.1"
-      },
-      "engines": {
-        "node": ">=8"
+      "requires": {
+        "domelementtype": "^2.2.0"
       }
     },
-    "node_modules/loader-runner": {
-      "version": "4.3.0",
+    "domutils": {
+      "version": "2.8.0",
+      "resolved": "https://registry.npmjs.org/domutils/-/domutils-2.8.0.tgz",
+      "integrity": "sha512-w96Cjofp72M5IIhpjgobBimYEfoPjx1Vx0BSX9P30WBdZW2WIKU0T1Bd0kz2eNZ9ikjKgHbEyKx8BB6H1L3h3A==",
       "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=6.11.5"
+      "requires": {
+        "dom-serializer": "^1.0.1",
+        "domelementtype": "^2.2.0",
+        "domhandler": "^4.2.0"
       }
     },
-    "node_modules/loader-utils": {
-      "version": "2.0.4",
+    "dot-case": {
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/dot-case/-/dot-case-3.0.4.tgz",
+      "integrity": "sha512-Kv5nKlh6yRrdrGvxeJ2e5y2eRUpkUosIW4A2AS38zwSz27zu7ufDwQPi5Jhs3XAlGNetl3bmnGhQsMtkKJnj3w==",
       "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "big.js": "^5.2.2",
-        "emojis-list": "^3.0.0",
-        "json5": "^2.1.2"
-      },
-      "engines": {
-        "node": ">=8.9.0"
+      "requires": {
+        "no-case": "^3.0.4",
+        "tslib": "^2.0.3"
       }
     },
-    "node_modules/local-pkg": {
-      "version": "0.4.3",
+    "dotenv": {
+      "version": "16.4.5",
+      "resolved": "https://registry.npmjs.org/dotenv/-/dotenv-16.4.5.tgz",
+      "integrity": "sha512-ZmdL2rui+eB2YwhsWzjInR8LldtZHGDoQ1ugH85ppHKwpUHL7j7rN0Ti9NCnGiQbhaZ11FpR+7ao1dNsmduNUg=="
+    },
+    "dotenv-defaults": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/dotenv-defaults/-/dotenv-defaults-2.0.2.tgz",
+      "integrity": "sha512-iOIzovWfsUHU91L5i8bJce3NYK5JXeAwH50Jh6+ARUdLiiGlYWfGw6UkzsYqaXZH/hjE/eCd/PlfM/qqyK0AMg==",
       "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=14"
+      "requires": {
+        "dotenv": "^8.2.0"
       },
-      "funding": {
-        "url": "https://github.com/sponsors/antfu"
+      "dependencies": {
+        "dotenv": {
+          "version": "8.6.0",
+          "resolved": "https://registry.npmjs.org/dotenv/-/dotenv-8.6.0.tgz",
+          "integrity": "sha512-IrPdXQsk2BbzvCBGBOTmmSH5SodmqZNt4ERAZDmW4CT+tL8VtvinqywuANaFu4bOMWki16nqf0e4oC0QIaDr/g==",
+          "dev": true
+        }
       }
     },
-    "node_modules/locate-path": {
-      "version": "6.0.0",
+    "dotenv-webpack": {
+      "version": "8.0.1",
+      "resolved": "https://registry.npmjs.org/dotenv-webpack/-/dotenv-webpack-8.0.1.tgz",
+      "integrity": "sha512-CdrgfhZOnx4uB18SgaoP9XHRN2v48BbjuXQsZY5ixs5A8579NxQkmMxRtI7aTwSiSQcM2ao12Fdu+L3ZS3bG4w==",
       "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "p-locate": "^5.0.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
+      "requires": {
+        "dotenv-defaults": "^2.0.2"
       }
     },
-    "node_modules/lodash": {
-      "version": "4.17.21",
-      "license": "MIT"
-    },
-    "node_modules/lodash.clonedeep": {
-      "version": "4.5.0",
-      "license": "MIT"
-    },
-    "node_modules/lodash.curry": {
-      "version": "4.1.1",
-      "dev": true,
-      "license": "MIT"
+    "drbg.js": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/drbg.js/-/drbg.js-1.0.1.tgz",
+      "integrity": "sha512-F4wZ06PvqxYLFEZKkFxTDcns9oFNk34hvmJSEwdzsxVQ8YI5YaxtACgQatkYgv2VI2CFkUd2Y+xosPQnHv809g==",
+      "requires": {
+        "browserify-aes": "^1.0.6",
+        "create-hash": "^1.1.2",
+        "create-hmac": "^1.1.4"
+      }
     },
-    "node_modules/lodash.get": {
-      "version": "4.4.2",
-      "dev": true,
-      "license": "MIT"
+    "eastasianwidth": {
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/eastasianwidth/-/eastasianwidth-0.2.0.tgz",
+      "integrity": "sha512-I88TYZWc9XiYHRQ4/3c5rjjfgkjhLyW2luGIheGERbNQ6OY7yTybanSpDXZa8y7VUP9YmDcYa+eyq4ca7iLqWA==",
+      "dev": true
     },
-    "node_modules/lodash.merge": {
-      "version": "4.6.2",
+    "easy-table": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/easy-table/-/easy-table-1.2.0.tgz",
+      "integrity": "sha512-OFzVOv03YpvtcWGe5AayU5G2hgybsg3iqA6drU8UaoZyB9jLGMTrz9+asnLp/E+6qPh88yEI1gvyZFZ41dmgww==",
       "dev": true,
-      "license": "MIT"
+      "requires": {
+        "ansi-regex": "^5.0.1",
+        "wcwidth": "^1.0.1"
+      }
     },
-    "node_modules/lodash.omit": {
-      "version": "4.5.0",
-      "license": "MIT"
+    "ecdsa-sig-formatter": {
+      "version": "1.0.11",
+      "resolved": "https://registry.npmjs.org/ecdsa-sig-formatter/-/ecdsa-sig-formatter-1.0.11.tgz",
+      "integrity": "sha512-nagl3RYrbNv6kQkeJIpt6NJZy8twLB/2vtz6yN9Z4vRKHN4/QZJIEbqohALSgwKdnksuY3k5Addp5lg8sVoVcQ==",
+      "requires": {
+        "safe-buffer": "^5.0.1"
+      }
     },
-    "node_modules/lodash.padend": {
-      "version": "4.6.1",
-      "license": "MIT"
+    "ecpair": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/ecpair/-/ecpair-2.1.0.tgz",
+      "integrity": "sha512-cL/mh3MtJutFOvFc27GPZE2pWL3a3k4YvzUWEOvilnfZVlH3Jwgx/7d6tlD7/75tNk8TG2m+7Kgtz0SI1tWcqw==",
+      "requires": {
+        "randombytes": "^2.1.0",
+        "typeforce": "^1.18.0",
+        "wif": "^2.0.6"
+      }
     },
-    "node_modules/lodash.trimstart": {
-      "version": "4.5.1",
-      "license": "MIT"
+    "ee-first": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz",
+      "integrity": "sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow==",
+      "dev": true
     },
-    "node_modules/lodash.words": {
-      "version": "4.2.0",
-      "license": "MIT"
+    "electron-to-chromium": {
+      "version": "1.4.572",
+      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.572.tgz",
+      "integrity": "sha512-RlFobl4D3ieetbnR+2EpxdzFl9h0RAJkPK3pfiwMug2nhBin2ZCsGIAJWdpNniLz43sgXam/CgipOmvTA+rUiA=="
     },
-    "node_modules/log-update": {
-      "version": "4.0.0",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "ansi-escapes": "^4.3.0",
-        "cli-cursor": "^3.1.0",
-        "slice-ansi": "^4.0.0",
-        "wrap-ansi": "^6.2.0"
-      },
-      "engines": {
-        "node": ">=10"
+    "elliptic": {
+      "version": "6.5.4",
+      "resolved": "https://registry.npmjs.org/elliptic/-/elliptic-6.5.4.tgz",
+      "integrity": "sha512-iLhC6ULemrljPZb+QutR5TQGB+pdW6KGD5RSegS+8sorOZT+rdQFbsQFJgvN3eRqNALqJer4oQ16YvJHlU8hzQ==",
+      "requires": {
+        "bn.js": "^4.11.9",
+        "brorand": "^1.1.0",
+        "hash.js": "^1.0.0",
+        "hmac-drbg": "^1.0.1",
+        "inherits": "^2.0.4",
+        "minimalistic-assert": "^1.0.1",
+        "minimalistic-crypto-utils": "^1.0.1"
       },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/log-update/node_modules/ansi-styles": {
-      "version": "4.3.0",
-      "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "color-convert": "^2.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
+        "bn.js": {
+          "version": "4.12.0",
+          "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.0.tgz",
+          "integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA=="
+        }
       }
     },
-    "node_modules/log-update/node_modules/color-convert": {
-      "version": "2.0.1",
+    "emoji-regex": {
+      "version": "9.2.2",
+      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-9.2.2.tgz",
+      "integrity": "sha512-L18DaJsXSUk2+42pv8mLs5jJT2hqFkFE4j21wOmgbUqsZ2hL72NsUU785g9RXgo3s0ZNgVl42TiHp3ZtOv/Vyg==",
+      "dev": true
+    },
+    "emojis-list": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/emojis-list/-/emojis-list-3.0.0.tgz",
+      "integrity": "sha512-/kyM18EfinwXZbno9FyUGeFh87KC8HRQBQGildHZbEuRyWFOmv1U10o9BBp8XVZDVNNuQKyIGIu5ZYAAXJ0V2Q==",
+      "dev": true
+    },
+    "encodeurl": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.2.tgz",
+      "integrity": "sha512-TPJXq8JqFaVYm2CWmPvnP2Iyo4ZSM7/QKcSmuMLDObfpH5fi7RUGmd/rTDf+rut/saiDiQEeVTNgAmJEdAOx0w==",
+      "dev": true
+    },
+    "enhanced-resolve": {
+      "version": "5.15.0",
+      "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.15.0.tgz",
+      "integrity": "sha512-LXYT42KJ7lpIKECr2mAXIaMldcNCh/7E0KBKOu4KSfkHmP+mZmSs+8V5gBAqisWBy0OO4W5Oyys0GO1Y8KtdKg==",
       "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "color-name": "~1.1.4"
-      },
-      "engines": {
-        "node": ">=7.0.0"
+      "requires": {
+        "graceful-fs": "^4.2.4",
+        "tapable": "^2.2.0"
       }
     },
-    "node_modules/log-update/node_modules/color-name": {
-      "version": "1.1.4",
-      "dev": true,
-      "license": "MIT"
+    "entities": {
+      "version": "4.5.0",
+      "resolved": "https://registry.npmjs.org/entities/-/entities-4.5.0.tgz",
+      "integrity": "sha512-V0hjH4dGPh9Ao5p0MoRY6BVqtwCjhz6vI5LT8AJ55H+4g9/4vbHx1I54fS0XuclLhDHArPQCiMjDxjaL8fPxhw==",
+      "dev": true
     },
-    "node_modules/log-update/node_modules/emoji-regex": {
-      "version": "8.0.0",
+    "error-ex": {
+      "version": "1.3.2",
+      "resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.2.tgz",
+      "integrity": "sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==",
       "dev": true,
-      "license": "MIT"
+      "requires": {
+        "is-arrayish": "^0.2.1"
+      }
     },
-    "node_modules/log-update/node_modules/is-fullwidth-code-point": {
-      "version": "3.0.0",
+    "error-stack-parser": {
+      "version": "2.1.4",
+      "resolved": "https://registry.npmjs.org/error-stack-parser/-/error-stack-parser-2.1.4.tgz",
+      "integrity": "sha512-Sk5V6wVazPhq5MhpO+AUxJn5x7XSXGl1R93Vn7i+zS15KDVxQijejNCrz8340/2bgLBjR9GtEG8ZVKONDjcqGQ==",
       "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=8"
+      "requires": {
+        "stackframe": "^1.3.4"
       }
     },
-    "node_modules/log-update/node_modules/slice-ansi": {
-      "version": "4.0.0",
+    "es-abstract": {
+      "version": "1.22.1",
+      "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.22.1.tgz",
+      "integrity": "sha512-ioRRcXMO6OFyRpyzV3kE1IIBd4WG5/kltnzdxSCqoP8CMGs/Li+M1uF5o7lOkZVFjDs+NLesthnF66Pg/0q0Lw==",
       "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "ansi-styles": "^4.0.0",
-        "astral-regex": "^2.0.0",
-        "is-fullwidth-code-point": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/slice-ansi?sponsor=1"
+      "requires": {
+        "array-buffer-byte-length": "^1.0.0",
+        "arraybuffer.prototype.slice": "^1.0.1",
+        "available-typed-arrays": "^1.0.5",
+        "call-bind": "^1.0.2",
+        "es-set-tostringtag": "^2.0.1",
+        "es-to-primitive": "^1.2.1",
+        "function.prototype.name": "^1.1.5",
+        "get-intrinsic": "^1.2.1",
+        "get-symbol-description": "^1.0.0",
+        "globalthis": "^1.0.3",
+        "gopd": "^1.0.1",
+        "has": "^1.0.3",
+        "has-property-descriptors": "^1.0.0",
+        "has-proto": "^1.0.1",
+        "has-symbols": "^1.0.3",
+        "internal-slot": "^1.0.5",
+        "is-array-buffer": "^3.0.2",
+        "is-callable": "^1.2.7",
+        "is-negative-zero": "^2.0.2",
+        "is-regex": "^1.1.4",
+        "is-shared-array-buffer": "^1.0.2",
+        "is-string": "^1.0.7",
+        "is-typed-array": "^1.1.10",
+        "is-weakref": "^1.0.2",
+        "object-inspect": "^1.12.3",
+        "object-keys": "^1.1.1",
+        "object.assign": "^4.1.4",
+        "regexp.prototype.flags": "^1.5.0",
+        "safe-array-concat": "^1.0.0",
+        "safe-regex-test": "^1.0.0",
+        "string.prototype.trim": "^1.2.7",
+        "string.prototype.trimend": "^1.0.6",
+        "string.prototype.trimstart": "^1.0.6",
+        "typed-array-buffer": "^1.0.0",
+        "typed-array-byte-length": "^1.0.0",
+        "typed-array-byte-offset": "^1.0.0",
+        "typed-array-length": "^1.0.4",
+        "unbox-primitive": "^1.0.2",
+        "which-typed-array": "^1.1.10"
       }
     },
-    "node_modules/log-update/node_modules/string-width": {
-      "version": "4.2.3",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "emoji-regex": "^8.0.0",
-        "is-fullwidth-code-point": "^3.0.0",
-        "strip-ansi": "^6.0.1"
-      },
-      "engines": {
-        "node": ">=8"
+    "es-define-property": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/es-define-property/-/es-define-property-1.0.0.tgz",
+      "integrity": "sha512-jxayLKShrEqqzJ0eumQbVhTYQM27CfT1T35+gCgDFoL82JLsXqTJ76zv6A0YLOgEnLUMvLzsDsGIrl8NFpT2gQ==",
+      "requires": {
+        "get-intrinsic": "^1.2.4"
       }
     },
-    "node_modules/log-update/node_modules/wrap-ansi": {
-      "version": "6.2.0",
+    "es-errors": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/es-errors/-/es-errors-1.3.0.tgz",
+      "integrity": "sha512-Zf5H2Kxt2xjTvbJvP2ZWLEICxA6j+hAmMzIlypy4xcBg1vKVnx89Wy0GbS+kf5cwCVFFzdCFh2XSCFNULS6csw=="
+    },
+    "es-get-iterator": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/es-get-iterator/-/es-get-iterator-1.1.3.tgz",
+      "integrity": "sha512-sPZmqHBe6JIiTfN5q2pEi//TwxmAFHwj/XEuYjTuse78i8KxaqMTTzxPoFKuzRpDpTJ+0NAbpfenkmH2rePtuw==",
       "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "ansi-styles": "^4.0.0",
-        "string-width": "^4.1.0",
-        "strip-ansi": "^6.0.0"
-      },
-      "engines": {
-        "node": ">=8"
+      "requires": {
+        "call-bind": "^1.0.2",
+        "get-intrinsic": "^1.1.3",
+        "has-symbols": "^1.0.3",
+        "is-arguments": "^1.1.1",
+        "is-map": "^2.0.2",
+        "is-set": "^2.0.2",
+        "is-string": "^1.0.7",
+        "isarray": "^2.0.5",
+        "stop-iteration-iterator": "^1.0.0"
       }
     },
-    "node_modules/loose-envify": {
-      "version": "1.4.0",
-      "license": "MIT",
-      "dependencies": {
-        "js-tokens": "^3.0.0 || ^4.0.0"
-      },
-      "bin": {
-        "loose-envify": "cli.js"
+    "es-module-lexer": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/es-module-lexer/-/es-module-lexer-1.3.0.tgz",
+      "integrity": "sha512-vZK7T0N2CBmBOixhmjdqx2gWVbFZ4DXZ/NyRMZVlJXPa7CyFS+/a4QQsDGDQy9ZfEzxFuNEsMLeQJnKP2p5/JA==",
+      "dev": true
+    },
+    "es-set-tostringtag": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/es-set-tostringtag/-/es-set-tostringtag-2.0.1.tgz",
+      "integrity": "sha512-g3OMbtlwY3QewlqAiMLI47KywjWZoEytKr8pf6iTC8uJq5bIAH52Z9pnQ8pVL6whrCto53JZDuUIsifGeLorTg==",
+      "dev": true,
+      "requires": {
+        "get-intrinsic": "^1.1.3",
+        "has": "^1.0.3",
+        "has-tostringtag": "^1.0.0"
       }
     },
-    "node_modules/lottie-web": {
-      "version": "5.12.2",
-      "license": "MIT"
+    "es-shim-unscopables": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/es-shim-unscopables/-/es-shim-unscopables-1.0.0.tgz",
+      "integrity": "sha512-Jm6GPcCdC30eMLbZ2x8z2WuRwAws3zTBBKuusffYVUrNj/GVSUAZ+xKMaUpfNDR5IbyNA5LJbaecoUVbmUcB1w==",
+      "dev": true,
+      "requires": {
+        "has": "^1.0.3"
+      }
     },
-    "node_modules/loupe": {
-      "version": "2.3.7",
+    "es-to-primitive": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.2.1.tgz",
+      "integrity": "sha512-QCOllgZJtaUo9miYBcLChTUaHNjJF3PYs1VidD7AwiEj1kYxKeQTctLAezAOH5ZKRH0g2IgPn6KwB4IT8iRpvA==",
       "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "get-func-name": "^2.0.1"
+      "requires": {
+        "is-callable": "^1.1.4",
+        "is-date-object": "^1.0.1",
+        "is-symbol": "^1.0.2"
       }
     },
-    "node_modules/lower-case": {
-      "version": "2.0.2",
+    "esbuild": {
+      "version": "0.21.5",
+      "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.21.5.tgz",
+      "integrity": "sha512-mg3OPMV4hXywwpoDxu3Qda5xCKQi+vCTZq8S9J/EpkhB2HzKXq4SNFZE3+NK93JYxc8VMSep+lOUSC/RVKaBqw==",
       "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "tslib": "^2.0.3"
+      "requires": {
+        "@esbuild/aix-ppc64": "0.21.5",
+        "@esbuild/android-arm": "0.21.5",
+        "@esbuild/android-arm64": "0.21.5",
+        "@esbuild/android-x64": "0.21.5",
+        "@esbuild/darwin-arm64": "0.21.5",
+        "@esbuild/darwin-x64": "0.21.5",
+        "@esbuild/freebsd-arm64": "0.21.5",
+        "@esbuild/freebsd-x64": "0.21.5",
+        "@esbuild/linux-arm": "0.21.5",
+        "@esbuild/linux-arm64": "0.21.5",
+        "@esbuild/linux-ia32": "0.21.5",
+        "@esbuild/linux-loong64": "0.21.5",
+        "@esbuild/linux-mips64el": "0.21.5",
+        "@esbuild/linux-ppc64": "0.21.5",
+        "@esbuild/linux-riscv64": "0.21.5",
+        "@esbuild/linux-s390x": "0.21.5",
+        "@esbuild/linux-x64": "0.21.5",
+        "@esbuild/netbsd-x64": "0.21.5",
+        "@esbuild/openbsd-x64": "0.21.5",
+        "@esbuild/sunos-x64": "0.21.5",
+        "@esbuild/win32-arm64": "0.21.5",
+        "@esbuild/win32-ia32": "0.21.5",
+        "@esbuild/win32-x64": "0.21.5"
       }
     },
-    "node_modules/lru-cache": {
-      "version": "5.1.1",
-      "license": "ISC",
-      "peer": true,
+    "escalade": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.1.tgz",
+      "integrity": "sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw=="
+    },
+    "escape-html": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.3.tgz",
+      "integrity": "sha512-NiSupZ4OeuGwr68lGIeym/ksIZMJodUGOSCZ/FSnTxcrekbvqrgdUxlJOMpijaKZVjAJrWrGs/6Jy8OMuyj9ow==",
+      "dev": true
+    },
+    "escape-string-regexp": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
+      "integrity": "sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg=="
+    },
+    "eslint": {
+      "version": "8.40.0",
+      "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.40.0.tgz",
+      "integrity": "sha512-bvR+TsP9EHL3TqNtj9sCNJVAFK3fBN8Q7g5waghxyRsPLIMwL73XSKnZFK0hk/O2ANC+iAoq6PWMQ+IfBAJIiQ==",
+      "dev": true,
+      "requires": {
+        "@eslint-community/eslint-utils": "^4.2.0",
+        "@eslint-community/regexpp": "^4.4.0",
+        "@eslint/eslintrc": "^2.0.3",
+        "@eslint/js": "8.40.0",
+        "@humanwhocodes/config-array": "^0.11.8",
+        "@humanwhocodes/module-importer": "^1.0.1",
+        "@nodelib/fs.walk": "^1.2.8",
+        "ajv": "^6.10.0",
+        "chalk": "^4.0.0",
+        "cross-spawn": "^7.0.2",
+        "debug": "^4.3.2",
+        "doctrine": "^3.0.0",
+        "escape-string-regexp": "^4.0.0",
+        "eslint-scope": "^7.2.0",
+        "eslint-visitor-keys": "^3.4.1",
+        "espree": "^9.5.2",
+        "esquery": "^1.4.2",
+        "esutils": "^2.0.2",
+        "fast-deep-equal": "^3.1.3",
+        "file-entry-cache": "^6.0.1",
+        "find-up": "^5.0.0",
+        "glob-parent": "^6.0.2",
+        "globals": "^13.19.0",
+        "grapheme-splitter": "^1.0.4",
+        "ignore": "^5.2.0",
+        "import-fresh": "^3.0.0",
+        "imurmurhash": "^0.1.4",
+        "is-glob": "^4.0.0",
+        "is-path-inside": "^3.0.3",
+        "js-sdsl": "^4.1.4",
+        "js-yaml": "^4.1.0",
+        "json-stable-stringify-without-jsonify": "^1.0.1",
+        "levn": "^0.4.1",
+        "lodash.merge": "^4.6.2",
+        "minimatch": "^3.1.2",
+        "natural-compare": "^1.4.0",
+        "optionator": "^0.9.1",
+        "strip-ansi": "^6.0.1",
+        "strip-json-comments": "^3.1.0",
+        "text-table": "^0.2.0"
+      },
       "dependencies": {
-        "yallist": "^3.0.2"
+        "ansi-styles": {
+          "version": "4.3.0",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+          "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+          "dev": true,
+          "requires": {
+            "color-convert": "^2.0.1"
+          }
+        },
+        "chalk": {
+          "version": "4.1.2",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
+          "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+          "dev": true,
+          "requires": {
+            "ansi-styles": "^4.1.0",
+            "supports-color": "^7.1.0"
+          }
+        },
+        "color-convert": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+          "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+          "dev": true,
+          "requires": {
+            "color-name": "~1.1.4"
+          }
+        },
+        "color-name": {
+          "version": "1.1.4",
+          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+          "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+          "dev": true
+        },
+        "escape-string-regexp": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz",
+          "integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==",
+          "dev": true
+        },
+        "eslint-scope": {
+          "version": "7.2.2",
+          "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-7.2.2.tgz",
+          "integrity": "sha512-dOt21O7lTMhDM+X9mB4GX+DZrZtCUJPL/wlcTqxyrx5IvO0IYtILdtrQGQp+8n5S0gwSVmOf9NQrjMOgfQZlIg==",
+          "dev": true,
+          "requires": {
+            "esrecurse": "^4.3.0",
+            "estraverse": "^5.2.0"
+          }
+        },
+        "globals": {
+          "version": "13.20.0",
+          "resolved": "https://registry.npmjs.org/globals/-/globals-13.20.0.tgz",
+          "integrity": "sha512-Qg5QtVkCy/kv3FUSlu4ukeZDVf9ee0iXLAUYX13gbR17bnejFTzr4iS9bY7kwCf1NztRNm1t91fjOiyx4CSwPQ==",
+          "dev": true,
+          "requires": {
+            "type-fest": "^0.20.2"
+          }
+        },
+        "has-flag": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+          "dev": true
+        },
+        "is-path-inside": {
+          "version": "3.0.3",
+          "resolved": "https://registry.npmjs.org/is-path-inside/-/is-path-inside-3.0.3.tgz",
+          "integrity": "sha512-Fd4gABb+ycGAmKou8eMftCupSir5lRxqf4aD/vd0cD2qc4HL07OjCeuHMr8Ro4CoMaeCKDB0/ECBOVWjTwUvPQ==",
+          "dev": true
+        },
+        "supports-color": {
+          "version": "7.2.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+          "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+          "dev": true,
+          "requires": {
+            "has-flag": "^4.0.0"
+          }
+        },
+        "type-fest": {
+          "version": "0.20.2",
+          "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.20.2.tgz",
+          "integrity": "sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==",
+          "dev": true
+        }
       }
     },
-    "node_modules/magic-string": {
-      "version": "0.30.5",
+    "eslint-config-airbnb": {
+      "version": "19.0.4",
+      "resolved": "https://registry.npmjs.org/eslint-config-airbnb/-/eslint-config-airbnb-19.0.4.tgz",
+      "integrity": "sha512-T75QYQVQX57jiNgpF9r1KegMICE94VYwoFQyMGhrvc+lB8YF2E/M/PYDaQe1AJcWaEgqLE+ErXV1Og/+6Vyzew==",
       "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "@jridgewell/sourcemap-codec": "^1.4.15"
-      },
-      "engines": {
-        "node": ">=12"
+      "requires": {
+        "eslint-config-airbnb-base": "^15.0.0",
+        "object.assign": "^4.1.2",
+        "object.entries": "^1.1.5"
       }
     },
-    "node_modules/map-obj": {
-      "version": "2.0.0",
+    "eslint-config-airbnb-base": {
+      "version": "15.0.0",
+      "resolved": "https://registry.npmjs.org/eslint-config-airbnb-base/-/eslint-config-airbnb-base-15.0.0.tgz",
+      "integrity": "sha512-xaX3z4ZZIcFLvh2oUNvcX5oEofXda7giYmuplVxoOg5A7EXJMrUyqRgR+mhDhPK8LZ4PttFOBvCYDbX3sUoUig==",
       "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=4"
+      "requires": {
+        "confusing-browser-globals": "^1.0.10",
+        "object.assign": "^4.1.2",
+        "object.entries": "^1.1.5",
+        "semver": "^6.3.0"
       }
     },
-    "node_modules/md5.js": {
-      "version": "1.3.5",
-      "license": "MIT",
-      "dependencies": {
-        "hash-base": "^3.0.0",
-        "inherits": "^2.0.1",
-        "safe-buffer": "^5.1.2"
+    "eslint-config-airbnb-typescript": {
+      "version": "17.1.0",
+      "resolved": "https://registry.npmjs.org/eslint-config-airbnb-typescript/-/eslint-config-airbnb-typescript-17.1.0.tgz",
+      "integrity": "sha512-GPxI5URre6dDpJ0CtcthSZVBAfI+Uw7un5OYNVxP2EYi3H81Jw701yFP7AU+/vCE7xBtFmjge7kfhhk4+RAiig==",
+      "dev": true,
+      "requires": {
+        "eslint-config-airbnb-base": "^15.0.0"
       }
     },
-    "node_modules/media-typer": {
-      "version": "0.3.0",
+    "eslint-config-prettier": {
+      "version": "8.10.0",
+      "resolved": "https://registry.npmjs.org/eslint-config-prettier/-/eslint-config-prettier-8.10.0.tgz",
+      "integrity": "sha512-SM8AMJdeQqRYT9O9zguiruQZaN7+z+E4eAP9oiLNGKMtomwaB1E9dcgUD6ZAn/eQAb52USbvezbiljfZUhbJcg==",
       "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">= 0.6"
-      }
+      "requires": {}
     },
-    "node_modules/memfs": {
-      "version": "3.5.3",
+    "eslint-import-resolver-node": {
+      "version": "0.3.7",
+      "resolved": "https://registry.npmjs.org/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.7.tgz",
+      "integrity": "sha512-gozW2blMLJCeFpBwugLTGyvVjNoeo1knonXAcatC6bjPBZitotxdWf7Gimr25N4c0AAOo4eOUfaG82IJPDpqCA==",
       "dev": true,
-      "license": "Unlicense",
-      "dependencies": {
-        "fs-monkey": "^1.0.4"
+      "requires": {
+        "debug": "^3.2.7",
+        "is-core-module": "^2.11.0",
+        "resolve": "^1.22.1"
       },
-      "engines": {
-        "node": ">= 4.0.0"
+      "dependencies": {
+        "debug": {
+          "version": "3.2.7",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz",
+          "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==",
+          "dev": true,
+          "requires": {
+            "ms": "^2.1.1"
+          }
+        }
       }
     },
-    "node_modules/merge-descriptors": {
-      "version": "1.0.1",
+    "eslint-module-utils": {
+      "version": "2.8.0",
+      "resolved": "https://registry.npmjs.org/eslint-module-utils/-/eslint-module-utils-2.8.0.tgz",
+      "integrity": "sha512-aWajIYfsqCKRDgUfjEXNN/JlrzauMuSEy5sbd7WXbtW3EH6A6MpwEh42c7qD+MqQo9QMJ6fWLAeIJynx0g6OAw==",
       "dev": true,
-      "license": "MIT"
+      "requires": {
+        "debug": "^3.2.7"
+      },
+      "dependencies": {
+        "debug": {
+          "version": "3.2.7",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz",
+          "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==",
+          "dev": true,
+          "requires": {
+            "ms": "^2.1.1"
+          }
+        }
+      }
     },
-    "node_modules/merge-stream": {
-      "version": "2.0.0",
+    "eslint-plugin-import": {
+      "version": "2.28.0",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-import/-/eslint-plugin-import-2.28.0.tgz",
+      "integrity": "sha512-B8s/n+ZluN7sxj9eUf7/pRFERX0r5bnFA2dCaLHy2ZeaQEAz0k+ZZkFWRFHJAqxfxQDx6KLv9LeIki7cFdwW+Q==",
       "dev": true,
-      "license": "MIT"
+      "requires": {
+        "array-includes": "^3.1.6",
+        "array.prototype.findlastindex": "^1.2.2",
+        "array.prototype.flat": "^1.3.1",
+        "array.prototype.flatmap": "^1.3.1",
+        "debug": "^3.2.7",
+        "doctrine": "^2.1.0",
+        "eslint-import-resolver-node": "^0.3.7",
+        "eslint-module-utils": "^2.8.0",
+        "has": "^1.0.3",
+        "is-core-module": "^2.12.1",
+        "is-glob": "^4.0.3",
+        "minimatch": "^3.1.2",
+        "object.fromentries": "^2.0.6",
+        "object.groupby": "^1.0.0",
+        "object.values": "^1.1.6",
+        "resolve": "^1.22.3",
+        "semver": "^6.3.1",
+        "tsconfig-paths": "^3.14.2"
+      },
+      "dependencies": {
+        "debug": {
+          "version": "3.2.7",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz",
+          "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==",
+          "dev": true,
+          "requires": {
+            "ms": "^2.1.1"
+          }
+        },
+        "doctrine": {
+          "version": "2.1.0",
+          "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-2.1.0.tgz",
+          "integrity": "sha512-35mSku4ZXK0vfCuHEDAwt55dg2jNajHZ1odvF+8SSr82EsZY4QmXfuWso8oEd8zRhVObSN18aM0CjSdoBX7zIw==",
+          "dev": true,
+          "requires": {
+            "esutils": "^2.0.2"
+          }
+        }
+      }
     },
-    "node_modules/merge2": {
-      "version": "1.4.1",
+    "eslint-plugin-jsx-a11y": {
+      "version": "6.7.1",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-jsx-a11y/-/eslint-plugin-jsx-a11y-6.7.1.tgz",
+      "integrity": "sha512-63Bog4iIethyo8smBklORknVjB0T2dwB8Mr/hIC+fBS0uyHdYYpzM/Ed+YC8VxTjlXHEWFOdmgwcDn1U2L9VCA==",
       "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">= 8"
+      "requires": {
+        "@babel/runtime": "^7.20.7",
+        "aria-query": "^5.1.3",
+        "array-includes": "^3.1.6",
+        "array.prototype.flatmap": "^1.3.1",
+        "ast-types-flow": "^0.0.7",
+        "axe-core": "^4.6.2",
+        "axobject-query": "^3.1.1",
+        "damerau-levenshtein": "^1.0.8",
+        "emoji-regex": "^9.2.2",
+        "has": "^1.0.3",
+        "jsx-ast-utils": "^3.3.3",
+        "language-tags": "=1.0.5",
+        "minimatch": "^3.1.2",
+        "object.entries": "^1.1.6",
+        "object.fromentries": "^2.0.6",
+        "semver": "^6.3.0"
       }
     },
-    "node_modules/methods": {
-      "version": "1.1.2",
+    "eslint-plugin-no-inline-styles": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-no-inline-styles/-/eslint-plugin-no-inline-styles-1.0.5.tgz",
+      "integrity": "sha512-nftOfHV/ag0P0vEPQ3p54HVpGCp6k/E+pHdYnRm2wDK8QhClfmMjrCw+POL5RH/SN1AmTifCTh5VzkeubLgMpA==",
       "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">= 0.6"
+      "requires": {
+        "lodash.get": "^4.4.2"
       }
     },
-    "node_modules/micro-packed": {
-      "version": "0.5.1",
-      "license": "MIT",
-      "dependencies": {
-        "@scure/base": "~1.1.5"
+    "eslint-plugin-playwright": {
+      "version": "1.6.0",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-playwright/-/eslint-plugin-playwright-1.6.0.tgz",
+      "integrity": "sha512-tI1E/EDbHT4Fx5KvukUG3RTIT0gk44gvTP8bNwxLCFsUXVM98ZJG5zWU6Om5JOzH9FrmN4AhMu/UKyEsu0ZoDA==",
+      "dev": true,
+      "requires": {
+        "globals": "^13.23.0"
       },
-      "funding": {
-        "url": "https://paulmillr.com/funding/"
+      "dependencies": {
+        "globals": {
+          "version": "13.24.0",
+          "resolved": "https://registry.npmjs.org/globals/-/globals-13.24.0.tgz",
+          "integrity": "sha512-AhO5QUcj8llrbG09iWhPU2B204J1xnPeL8kQmVorSsy+Sjj1sk8gIyh6cUocGmH4L0UuhAJy+hJMRA4mgA4mFQ==",
+          "dev": true,
+          "requires": {
+            "type-fest": "^0.20.2"
+          }
+        },
+        "type-fest": {
+          "version": "0.20.2",
+          "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.20.2.tgz",
+          "integrity": "sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==",
+          "dev": true
+        }
       }
     },
-    "node_modules/micromatch": {
-      "version": "4.0.5",
+    "eslint-plugin-prettier": {
+      "version": "4.2.1",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-prettier/-/eslint-plugin-prettier-4.2.1.tgz",
+      "integrity": "sha512-f/0rXLXUt0oFYs8ra4w49wYZBG5GKZpAYsJSm6rnYL5uVDjd+zowwMwVZHnAjf4edNrKpCDYfXDgmRE/Ak7QyQ==",
       "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "braces": "^3.0.2",
-        "picomatch": "^2.3.1"
-      },
-      "engines": {
-        "node": ">=8.6"
+      "requires": {
+        "prettier-linter-helpers": "^1.0.0"
       }
     },
-    "node_modules/microseconds": {
-      "version": "0.1.0",
+    "eslint-plugin-react": {
+      "version": "7.33.1",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-react/-/eslint-plugin-react-7.33.1.tgz",
+      "integrity": "sha512-L093k0WAMvr6VhNwReB8VgOq5s2LesZmrpPdKz/kZElQDzqS7G7+DnKoqT+w4JwuiGeAhAvHO0fvy0Eyk4ejDA==",
       "dev": true,
-      "license": "MIT"
-    },
-    "node_modules/miller-rabin": {
-      "version": "4.0.1",
-      "license": "MIT",
-      "dependencies": {
-        "bn.js": "^4.0.0",
-        "brorand": "^1.0.1"
+      "requires": {
+        "array-includes": "^3.1.6",
+        "array.prototype.flatmap": "^1.3.1",
+        "array.prototype.tosorted": "^1.1.1",
+        "doctrine": "^2.1.0",
+        "estraverse": "^5.3.0",
+        "jsx-ast-utils": "^2.4.1 || ^3.0.0",
+        "minimatch": "^3.1.2",
+        "object.entries": "^1.1.6",
+        "object.fromentries": "^2.0.6",
+        "object.hasown": "^1.1.2",
+        "object.values": "^1.1.6",
+        "prop-types": "^15.8.1",
+        "resolve": "^2.0.0-next.4",
+        "semver": "^6.3.1",
+        "string.prototype.matchall": "^4.0.8"
       },
-      "bin": {
-        "miller-rabin": "bin/miller-rabin"
+      "dependencies": {
+        "doctrine": {
+          "version": "2.1.0",
+          "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-2.1.0.tgz",
+          "integrity": "sha512-35mSku4ZXK0vfCuHEDAwt55dg2jNajHZ1odvF+8SSr82EsZY4QmXfuWso8oEd8zRhVObSN18aM0CjSdoBX7zIw==",
+          "dev": true,
+          "requires": {
+            "esutils": "^2.0.2"
+          }
+        },
+        "resolve": {
+          "version": "2.0.0-next.4",
+          "resolved": "https://registry.npmjs.org/resolve/-/resolve-2.0.0-next.4.tgz",
+          "integrity": "sha512-iMDbmAWtfU+MHpxt/I5iWI7cY6YVEZUQ3MBgPQ++XD1PELuJHIl82xBmObyP2KyQmkNB2dsqF7seoQQiAn5yDQ==",
+          "dev": true,
+          "requires": {
+            "is-core-module": "^2.9.0",
+            "path-parse": "^1.0.7",
+            "supports-preserve-symlinks-flag": "^1.0.0"
+          }
+        }
       }
     },
-    "node_modules/miller-rabin/node_modules/bn.js": {
-      "version": "4.12.0",
-      "license": "MIT"
+    "eslint-plugin-react-hooks": {
+      "version": "4.6.0",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-react-hooks/-/eslint-plugin-react-hooks-4.6.0.tgz",
+      "integrity": "sha512-oFc7Itz9Qxh2x4gNHStv3BqJq54ExXmfC+a1NjAta66IAN87Wu0R/QArgIS9qKzX3dXKPI9H5crl9QchNMY9+g==",
+      "dev": true,
+      "requires": {}
     },
-    "node_modules/mime": {
-      "version": "1.6.0",
+    "eslint-scope": {
+      "version": "5.1.1",
+      "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.1.1.tgz",
+      "integrity": "sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw==",
       "dev": true,
-      "license": "MIT",
-      "bin": {
-        "mime": "cli.js"
+      "requires": {
+        "esrecurse": "^4.3.0",
+        "estraverse": "^4.1.1"
       },
-      "engines": {
-        "node": ">=4"
+      "dependencies": {
+        "estraverse": {
+          "version": "4.3.0",
+          "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.3.0.tgz",
+          "integrity": "sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==",
+          "dev": true
+        }
       }
     },
-    "node_modules/mime-db": {
-      "version": "1.52.0",
-      "license": "MIT",
-      "engines": {
-        "node": ">= 0.6"
+    "eslint-visitor-keys": {
+      "version": "3.4.2",
+      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.4.2.tgz",
+      "integrity": "sha512-8drBzUEyZ2llkpCA67iYrgEssKDUu68V8ChqqOfFupIaG/LCVPUT+CoGJpT77zJprs4T/W7p07LP7zAIMuweVw==",
+      "dev": true
+    },
+    "espree": {
+      "version": "9.6.1",
+      "resolved": "https://registry.npmjs.org/espree/-/espree-9.6.1.tgz",
+      "integrity": "sha512-oruZaFkjorTpF32kDSI5/75ViwGeZginGGy2NoOSg3Q9bnwlnmDm4HLnkl0RE3n+njDXR037aY1+x58Z/zFdwQ==",
+      "dev": true,
+      "requires": {
+        "acorn": "^8.9.0",
+        "acorn-jsx": "^5.3.2",
+        "eslint-visitor-keys": "^3.4.1"
       }
     },
-    "node_modules/mime-types": {
-      "version": "2.1.35",
-      "license": "MIT",
-      "dependencies": {
-        "mime-db": "1.52.0"
-      },
-      "engines": {
-        "node": ">= 0.6"
+    "esquery": {
+      "version": "1.5.0",
+      "resolved": "https://registry.npmjs.org/esquery/-/esquery-1.5.0.tgz",
+      "integrity": "sha512-YQLXUplAwJgCydQ78IMJywZCceoqk1oH01OERdSAJc/7U2AylwjhSCLDEtqwg811idIS/9fIU5GjG73IgjKMVg==",
+      "dev": true,
+      "requires": {
+        "estraverse": "^5.1.0"
       }
     },
-    "node_modules/mimic-fn": {
-      "version": "2.1.0",
+    "esrecurse": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/esrecurse/-/esrecurse-4.3.0.tgz",
+      "integrity": "sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag==",
       "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=6"
+      "requires": {
+        "estraverse": "^5.2.0"
       }
     },
-    "node_modules/minimalistic-assert": {
-      "version": "1.0.1",
-      "license": "ISC"
+    "estraverse": {
+      "version": "5.3.0",
+      "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz",
+      "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==",
+      "dev": true
     },
-    "node_modules/minimalistic-crypto-utils": {
-      "version": "1.0.1",
-      "license": "MIT"
+    "esutils": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.3.tgz",
+      "integrity": "sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==",
+      "dev": true
     },
-    "node_modules/minimatch": {
-      "version": "3.1.2",
-      "license": "ISC",
-      "dependencies": {
-        "brace-expansion": "^1.1.7"
-      },
-      "engines": {
-        "node": "*"
-      }
+    "etag": {
+      "version": "1.8.1",
+      "resolved": "https://registry.npmjs.org/etag/-/etag-1.8.1.tgz",
+      "integrity": "sha512-aIL5Fx7mawVa300al2BnEE4iNvo1qETxLrPI/o05L7z6go7fCw1J6EQmbK4FmJ2AS7kgVF/KEZWufBfdClMcPg==",
+      "dev": true
     },
-    "node_modules/minimist": {
-      "version": "1.2.8",
-      "dev": true,
-      "license": "MIT",
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
+    "eventemitter3": {
+      "version": "4.0.7",
+      "resolved": "https://registry.npmjs.org/eventemitter3/-/eventemitter3-4.0.7.tgz",
+      "integrity": "sha512-8guHBZCwKnFhYdHr2ysuRWErTwhoN2X8XELRlrRwpmfeY2jjuUN4taQMsULKUVo1K4DvZl+0pgfyoysHxvmvEw=="
     },
-    "node_modules/mixpanel-browser": {
-      "version": "2.47.0",
-      "license": "Apache-2.0"
+    "events": {
+      "version": "3.3.0",
+      "resolved": "https://registry.npmjs.org/events/-/events-3.3.0.tgz",
+      "integrity": "sha512-mQw+2fkQbALzQ7V0MY0IqdnXNOeTtP4r0lN9z7AAawCXgqea7bDii20AYrIBrFd/Hx0M2Ocz6S111CaFkUcb0Q=="
     },
-    "node_modules/mlly": {
-      "version": "1.4.2",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "acorn": "^8.10.0",
-        "pathe": "^1.1.1",
-        "pkg-types": "^1.0.3",
-        "ufo": "^1.3.0"
+    "evp_bytestokey": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/evp_bytestokey/-/evp_bytestokey-1.0.3.tgz",
+      "integrity": "sha512-/f2Go4TognH/KvCISP7OUsHn85hT9nUkxxA9BEWxFn+Oj9o8ZNLm/40hdlgSLyuOimsrTKLUMEorQexp/aPQeA==",
+      "requires": {
+        "md5.js": "^1.3.4",
+        "safe-buffer": "^5.1.1"
       }
     },
-    "node_modules/more-entropy": {
-      "version": "0.0.7",
-      "resolved": "https://registry.npmjs.org/more-entropy/-/more-entropy-0.0.7.tgz",
-      "integrity": "sha512-e0TxQtU1F6/ZA8WnEA2JLQwwDqBTtZFLJSW7rWgUsQou35wx1IOL0g2O7q7oGoMgIJto+jHMnNGHLfSiylHRrw==",
-      "dependencies": {
-        "iced-runtime": ">=0.0.1"
+    "execa": {
+      "version": "5.1.1",
+      "resolved": "https://registry.npmjs.org/execa/-/execa-5.1.1.tgz",
+      "integrity": "sha512-8uSpZZocAZRBAPIEINJj3Lo9HyGitllczc27Eh5YYojjMFMn8yHMDMaUHE2Jqfq05D/wucwI4JGURyXt1vchyg==",
+      "dev": true,
+      "requires": {
+        "cross-spawn": "^7.0.3",
+        "get-stream": "^6.0.0",
+        "human-signals": "^2.1.0",
+        "is-stream": "^2.0.0",
+        "merge-stream": "^2.0.0",
+        "npm-run-path": "^4.0.1",
+        "onetime": "^5.1.2",
+        "signal-exit": "^3.0.3",
+        "strip-final-newline": "^2.0.0"
       }
     },
-    "node_modules/ms": {
-      "version": "2.1.2",
-      "license": "MIT"
+    "exenv": {
+      "version": "1.2.2",
+      "resolved": "https://registry.npmjs.org/exenv/-/exenv-1.2.2.tgz",
+      "integrity": "sha512-Z+ktTxTwv9ILfgKCk32OX3n/doe+OcLTRtqK9pcL+JsP3J1/VW8Uvl4ZjLlKqeW4rzK4oesDOGMEMRIZqtP4Iw=="
     },
-    "node_modules/multicast-dns": {
-      "version": "7.2.5",
+    "express": {
+      "version": "4.18.2",
+      "resolved": "https://registry.npmjs.org/express/-/express-4.18.2.tgz",
+      "integrity": "sha512-5/PsL6iGPdfQ/lKM1UuielYgv3BUoJfz1aUwU9vHZ+J7gyvwdQXFEBIEIaxeGf0GIcreATNyBExtalisDbuMqQ==",
       "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "dns-packet": "^5.2.2",
-        "thunky": "^1.0.2"
+      "requires": {
+        "accepts": "~1.3.8",
+        "array-flatten": "1.1.1",
+        "body-parser": "1.20.1",
+        "content-disposition": "0.5.4",
+        "content-type": "~1.0.4",
+        "cookie": "0.5.0",
+        "cookie-signature": "1.0.6",
+        "debug": "2.6.9",
+        "depd": "2.0.0",
+        "encodeurl": "~1.0.2",
+        "escape-html": "~1.0.3",
+        "etag": "~1.8.1",
+        "finalhandler": "1.2.0",
+        "fresh": "0.5.2",
+        "http-errors": "2.0.0",
+        "merge-descriptors": "1.0.1",
+        "methods": "~1.1.2",
+        "on-finished": "2.4.1",
+        "parseurl": "~1.3.3",
+        "path-to-regexp": "0.1.7",
+        "proxy-addr": "~2.0.7",
+        "qs": "6.11.0",
+        "range-parser": "~1.2.1",
+        "safe-buffer": "5.2.1",
+        "send": "0.18.0",
+        "serve-static": "1.15.0",
+        "setprototypeof": "1.2.0",
+        "statuses": "2.0.1",
+        "type-is": "~1.6.18",
+        "utils-merge": "1.0.1",
+        "vary": "~1.1.2"
       },
-      "bin": {
-        "multicast-dns": "cli.js"
+      "dependencies": {
+        "array-flatten": {
+          "version": "1.1.1",
+          "resolved": "https://registry.npmjs.org/array-flatten/-/array-flatten-1.1.1.tgz",
+          "integrity": "sha512-PCVAQswWemu6UdxsDFFX/+gVeYqKAod3D3UVm91jHwynguOwAvYPhx8nNlM++NqRcK6CxxpUafjmhIdKiHibqg==",
+          "dev": true
+        },
+        "debug": {
+          "version": "2.6.9",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+          "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+          "dev": true,
+          "requires": {
+            "ms": "2.0.0"
+          }
+        },
+        "ms": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+          "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==",
+          "dev": true
+        },
+        "qs": {
+          "version": "6.11.0",
+          "resolved": "https://registry.npmjs.org/qs/-/qs-6.11.0.tgz",
+          "integrity": "sha512-MvjoMCJwEarSbUYk5O+nmoSzSutSsTwF85zcHPQ9OrlFoZOYIjaqBAJIqIXjptyD5vThxGq52Xu/MaJzRkIk4Q==",
+          "dev": true,
+          "requires": {
+            "side-channel": "^1.0.4"
+          }
+        }
       }
     },
-    "node_modules/nan": {
-      "version": "2.20.0",
-      "resolved": "https://registry.npmjs.org/nan/-/nan-2.20.0.tgz",
-      "integrity": "sha512-bk3gXBZDGILuuo/6sKtr0DQmSThYHLtNCdSdXk9YkxD/jK6X2vmCyyXBBxyqZ4XcnzTyYEAThfX3DCEnLf6igw=="
+    "fast-deep-equal": {
+      "version": "3.1.3",
+      "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz",
+      "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==",
+      "dev": true
     },
-    "node_modules/nano-time": {
-      "version": "1.0.0",
-      "license": "ISC",
-      "dependencies": {
-        "big-integer": "^1.6.16"
-      }
+    "fast-diff": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/fast-diff/-/fast-diff-1.3.0.tgz",
+      "integrity": "sha512-VxPP4NqbUjj6MaAOafWeUn2cXWLcCtljklUtZf0Ind4XQ+QPtmA0b18zZy0jIQx+ExRVCR/ZQpBmik5lXshNsw==",
+      "dev": true
     },
-    "node_modules/nanoid": {
-      "version": "4.0.2",
-      "funding": [
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/ai"
-        }
-      ],
-      "license": "MIT",
-      "bin": {
-        "nanoid": "bin/nanoid.js"
+    "fast-glob": {
+      "version": "3.3.2",
+      "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.3.2.tgz",
+      "integrity": "sha512-oX2ruAFQwf/Orj8m737Y5adxDQO0LAB7/S5MnxCdTNDd4p6BsyIVsv9JQsATbTSq8KHRpLwIHbVlUNatxd+1Ow==",
+      "dev": true,
+      "requires": {
+        "@nodelib/fs.stat": "^2.0.2",
+        "@nodelib/fs.walk": "^1.2.3",
+        "glob-parent": "^5.1.2",
+        "merge2": "^1.3.0",
+        "micromatch": "^4.0.4"
       },
-      "engines": {
-        "node": "^14 || ^16 || >=18"
+      "dependencies": {
+        "glob-parent": {
+          "version": "5.1.2",
+          "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz",
+          "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==",
+          "dev": true,
+          "requires": {
+            "is-glob": "^4.0.1"
+          }
+        }
       }
     },
-    "node_modules/natural-compare": {
-      "version": "1.4.0",
-      "dev": true,
-      "license": "MIT"
+    "fast-json-stable-stringify": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz",
+      "integrity": "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==",
+      "dev": true
     },
-    "node_modules/natural-compare-lite": {
-      "version": "1.4.0",
-      "dev": true,
-      "license": "MIT"
+    "fast-levenshtein": {
+      "version": "2.0.6",
+      "resolved": "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz",
+      "integrity": "sha512-DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw==",
+      "dev": true
     },
-    "node_modules/negotiator": {
-      "version": "0.6.3",
+    "fastq": {
+      "version": "1.15.0",
+      "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.15.0.tgz",
+      "integrity": "sha512-wBrocU2LCXXa+lWBt8RoIRD89Fi8OdABODa/kEnyeyjS5aZO5/GNvI5sEINADqP/h8M29UHTHUb53sUu5Ihqdw==",
       "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">= 0.6"
+      "requires": {
+        "reusify": "^1.0.4"
       }
     },
-    "node_modules/neo-async": {
-      "version": "2.6.2",
+    "faye-websocket": {
+      "version": "0.11.4",
+      "resolved": "https://registry.npmjs.org/faye-websocket/-/faye-websocket-0.11.4.tgz",
+      "integrity": "sha512-CzbClwlXAuiRQAlUyfqPgvPoNKTckTPGfwZV4ZdAhVcP2lh9KUxJg2b5GkE7XbjKQ3YJnQ9z6D9ntLAlB+tP8g==",
       "dev": true,
-      "license": "MIT"
+      "requires": {
+        "websocket-driver": ">=0.5.1"
+      }
     },
-    "node_modules/no-case": {
-      "version": "3.0.4",
+    "file-entry-cache": {
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-6.0.1.tgz",
+      "integrity": "sha512-7Gps/XWymbLk2QLYK4NzpMOrYjMhdIxXuIvy2QBsLE6ljuodKvdkWs/cpyJJ3CVIVpH0Oi1Hvg1ovbMzLdFBBg==",
       "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "lower-case": "^2.0.2",
-        "tslib": "^2.0.3"
+      "requires": {
+        "flat-cache": "^3.0.4"
       }
     },
-    "node_modules/node-abort-controller": {
-      "version": "3.1.1",
+    "file-uri-to-path": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/file-uri-to-path/-/file-uri-to-path-1.0.0.tgz",
+      "integrity": "sha512-0Zt+s3L7Vf1biwWZ29aARiVYLx7iMGnEUl9x33fbB/j3jR81u/O2LbqK+Bm1CDSNDKVtJ/YjwY7TUd5SkeLQLw=="
+    },
+    "fill-range": {
+      "version": "7.0.1",
+      "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz",
+      "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==",
       "dev": true,
-      "license": "MIT"
+      "requires": {
+        "to-regex-range": "^5.0.1"
+      }
     },
-    "node_modules/node-fetch": {
-      "version": "2.6.12",
-      "license": "MIT",
-      "dependencies": {
-        "whatwg-url": "^5.0.0"
-      },
-      "engines": {
-        "node": "4.x || >=6.0.0"
-      },
-      "peerDependencies": {
-        "encoding": "^0.1.0"
+    "filter-obj": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/filter-obj/-/filter-obj-1.1.0.tgz",
+      "integrity": "sha512-8rXg1ZnX7xzy2NGDVkBVaAy+lSlPNwad13BtgSlLuxfIslyt5Vg64U7tFcCt4WS1R0hvtnQybT/IyCkGZ3DpXQ==",
+      "dev": true
+    },
+    "finalhandler": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.2.0.tgz",
+      "integrity": "sha512-5uXcUVftlQMFnWC9qu/svkWv3GTd2PfUhK/3PLkYNAe7FbqJMt3515HaxE6eRL74GdsriiwujiawdaB1BpEISg==",
+      "dev": true,
+      "requires": {
+        "debug": "2.6.9",
+        "encodeurl": "~1.0.2",
+        "escape-html": "~1.0.3",
+        "on-finished": "2.4.1",
+        "parseurl": "~1.3.3",
+        "statuses": "2.0.1",
+        "unpipe": "~1.0.0"
       },
-      "peerDependenciesMeta": {
-        "encoding": {
-          "optional": true
+      "dependencies": {
+        "debug": {
+          "version": "2.6.9",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+          "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+          "dev": true,
+          "requires": {
+            "ms": "2.0.0"
+          }
+        },
+        "ms": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+          "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==",
+          "dev": true
         }
       }
     },
-    "node_modules/node-fetch/node_modules/tr46": {
-      "version": "0.0.3",
-      "license": "MIT"
-    },
-    "node_modules/node-fetch/node_modules/webidl-conversions": {
-      "version": "3.0.1",
-      "license": "BSD-2-Clause"
-    },
-    "node_modules/node-fetch/node_modules/whatwg-url": {
+    "find-up": {
       "version": "5.0.0",
-      "license": "MIT",
-      "dependencies": {
-        "tr46": "~0.0.3",
-        "webidl-conversions": "^3.0.0"
+      "resolved": "https://registry.npmjs.org/find-up/-/find-up-5.0.0.tgz",
+      "integrity": "sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng==",
+      "dev": true,
+      "requires": {
+        "locate-path": "^6.0.0",
+        "path-exists": "^4.0.0"
       }
     },
-    "node_modules/node-forge": {
-      "version": "1.3.1",
+    "flat-cache": {
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-3.0.4.tgz",
+      "integrity": "sha512-dm9s5Pw7Jc0GvMYbshN6zchCA9RgQlzzEZX3vylR9IqFfS8XciblUXOKfW6SiuJ0e13eDYZoZV5wdrev7P3Nwg==",
       "dev": true,
-      "license": "(BSD-3-Clause OR GPL-2.0)",
-      "engines": {
-        "node": ">= 6.13.0"
+      "requires": {
+        "flatted": "^3.1.0",
+        "rimraf": "^3.0.2"
       }
     },
-    "node_modules/node-releases": {
-      "version": "2.0.13",
-      "license": "MIT"
+    "flatted": {
+      "version": "3.2.7",
+      "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.2.7.tgz",
+      "integrity": "sha512-5nqDSxl8nn5BSNxyR3n4I6eDmbolI6WT+QqR547RwxQapgjQBmtktdP+HTBb/a/zLsbzERTONyUB5pefh5TtjQ==",
+      "dev": true
     },
-    "node_modules/normalize-path": {
-      "version": "3.0.0",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=0.10.0"
+    "follow-redirects": {
+      "version": "1.15.6",
+      "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.6.tgz",
+      "integrity": "sha512-wWN62YITEaOpSK584EZXJafH1AGpO8RVgElfkuXbTOrPX4fIfOyEpW/CsiNd8JdYrAoOvafRTOEnvsO++qCqFA=="
+    },
+    "for-each": {
+      "version": "0.3.3",
+      "resolved": "https://registry.npmjs.org/for-each/-/for-each-0.3.3.tgz",
+      "integrity": "sha512-jqYfLp7mo9vIyQf8ykW2v7A+2N4QjeCeI5+Dz9XraiO1ign81wjiH7Fb9vSOWvQfNtmSa4H2RoQTrrXivdUZmw==",
+      "requires": {
+        "is-callable": "^1.1.3"
       }
     },
-    "node_modules/npm-run-path": {
-      "version": "4.0.1",
+    "fork-ts-checker-webpack-plugin": {
+      "version": "9.0.2",
+      "resolved": "https://registry.npmjs.org/fork-ts-checker-webpack-plugin/-/fork-ts-checker-webpack-plugin-9.0.2.tgz",
+      "integrity": "sha512-Uochze2R8peoN1XqlSi/rGUkDQpRogtLFocP9+PGu68zk1BDAKXfdeCdyVZpgTk8V8WFVQXdEz426VKjXLO1Gg==",
       "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "path-key": "^3.0.0"
+      "requires": {
+        "@babel/code-frame": "^7.16.7",
+        "chalk": "^4.1.2",
+        "chokidar": "^3.5.3",
+        "cosmiconfig": "^8.2.0",
+        "deepmerge": "^4.2.2",
+        "fs-extra": "^10.0.0",
+        "memfs": "^3.4.1",
+        "minimatch": "^3.0.4",
+        "node-abort-controller": "^3.0.1",
+        "schema-utils": "^3.1.1",
+        "semver": "^7.3.5",
+        "tapable": "^2.2.1"
       },
-      "engines": {
-        "node": ">=8"
+      "dependencies": {
+        "ansi-styles": {
+          "version": "4.3.0",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+          "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+          "dev": true,
+          "requires": {
+            "color-convert": "^2.0.1"
+          }
+        },
+        "chalk": {
+          "version": "4.1.2",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
+          "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+          "dev": true,
+          "requires": {
+            "ansi-styles": "^4.1.0",
+            "supports-color": "^7.1.0"
+          }
+        },
+        "color-convert": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+          "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+          "dev": true,
+          "requires": {
+            "color-name": "~1.1.4"
+          }
+        },
+        "color-name": {
+          "version": "1.1.4",
+          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+          "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+          "dev": true
+        },
+        "cosmiconfig": {
+          "version": "8.3.6",
+          "resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-8.3.6.tgz",
+          "integrity": "sha512-kcZ6+W5QzcJ3P1Mt+83OUv/oHFqZHIx8DuxG6eZ5RGMERoLqp4BuGjhHLYGK+Kf5XVkQvqBSmAy/nGWN3qDgEA==",
+          "dev": true,
+          "requires": {
+            "import-fresh": "^3.3.0",
+            "js-yaml": "^4.1.0",
+            "parse-json": "^5.2.0",
+            "path-type": "^4.0.0"
+          }
+        },
+        "has-flag": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+          "dev": true
+        },
+        "lru-cache": {
+          "version": "6.0.0",
+          "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
+          "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
+          "dev": true,
+          "requires": {
+            "yallist": "^4.0.0"
+          }
+        },
+        "semver": {
+          "version": "7.5.4",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz",
+          "integrity": "sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==",
+          "dev": true,
+          "requires": {
+            "lru-cache": "^6.0.0"
+          }
+        },
+        "supports-color": {
+          "version": "7.2.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+          "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+          "dev": true,
+          "requires": {
+            "has-flag": "^4.0.0"
+          }
+        },
+        "yallist": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
+          "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==",
+          "dev": true
+        }
       }
     },
-    "node_modules/nth-check": {
-      "version": "2.1.1",
+    "form-data": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.0.tgz",
+      "integrity": "sha512-ETEklSGi5t0QMZuiXoA/Q6vcnxcLQP5vdugSpuAyi6SVGi2clPPp+xgEhuMaHC+zGgn31Kd235W35f7Hykkaww==",
+      "requires": {
+        "asynckit": "^0.4.0",
+        "combined-stream": "^1.0.8",
+        "mime-types": "^2.1.12"
+      }
+    },
+    "forwarded": {
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/forwarded/-/forwarded-0.2.0.tgz",
+      "integrity": "sha512-buRG0fpBtRHSTCOASe6hD258tEubFoRLb4ZNA6NxMVHNw2gOcwHo9wyablzMzOA5z9xA9L1KNjk/Nt6MT9aYow==",
+      "dev": true
+    },
+    "fresh": {
+      "version": "0.5.2",
+      "resolved": "https://registry.npmjs.org/fresh/-/fresh-0.5.2.tgz",
+      "integrity": "sha512-zJ2mQYM18rEFOudeV4GShTGIQ7RbzA7ozbU9I/XBpm7kqgMywgmylMwXHxZJmkVoYkna9d2pVXVXPdYTP9ej8Q==",
+      "dev": true
+    },
+    "fs-extra": {
+      "version": "10.1.0",
+      "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-10.1.0.tgz",
+      "integrity": "sha512-oRXApq54ETRj4eMiFzGnHWGy+zo5raudjuxN0b8H7s/RU2oW0Wvsx9O0ACRN/kRq9E8Vu/ReskGB5o3ji+FzHQ==",
       "dev": true,
-      "license": "BSD-2-Clause",
-      "dependencies": {
-        "boolbase": "^1.0.0"
-      },
-      "funding": {
-        "url": "https://github.com/fb55/nth-check?sponsor=1"
+      "requires": {
+        "graceful-fs": "^4.2.0",
+        "jsonfile": "^6.0.1",
+        "universalify": "^2.0.0"
       }
     },
-    "node_modules/object-assign": {
-      "version": "4.1.1",
-      "license": "MIT",
-      "engines": {
-        "node": ">=0.10.0"
-      }
+    "fs-monkey": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/fs-monkey/-/fs-monkey-1.0.4.tgz",
+      "integrity": "sha512-INM/fWAxMICjttnD0DX1rBvinKskj5G1w+oy/pnm9u/tSlnBrzFonJMcalKJ30P8RRsPzKcCG7Q8l0jx5Fh9YQ==",
+      "dev": true
     },
-    "node_modules/object-inspect": {
-      "version": "1.12.3",
+    "fs.realpath": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
+      "integrity": "sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw=="
+    },
+    "fsevents": {
+      "version": "2.3.3",
+      "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.3.tgz",
+      "integrity": "sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==",
       "dev": true,
-      "license": "MIT",
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
+      "optional": true
     },
-    "node_modules/object-is": {
+    "function-bind": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.2.tgz",
+      "integrity": "sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA=="
+    },
+    "function.prototype.name": {
       "version": "1.1.5",
+      "resolved": "https://registry.npmjs.org/function.prototype.name/-/function.prototype.name-1.1.5.tgz",
+      "integrity": "sha512-uN7m/BzVKQnCUF/iW8jYea67v++2u7m5UgENbHRtdDVclOUP+FMPlCNdmk0h/ysGyo2tavMJEDqJAkJdRa1vMA==",
       "dev": true,
-      "license": "MIT",
-      "dependencies": {
+      "requires": {
         "call-bind": "^1.0.2",
-        "define-properties": "^1.1.3"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
+        "define-properties": "^1.1.3",
+        "es-abstract": "^1.19.0",
+        "functions-have-names": "^1.2.2"
       }
     },
-    "node_modules/object-keys": {
-      "version": "1.1.1",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">= 0.4"
-      }
+    "functions-have-names": {
+      "version": "1.2.3",
+      "resolved": "https://registry.npmjs.org/functions-have-names/-/functions-have-names-1.2.3.tgz",
+      "integrity": "sha512-xckBUXyTIqT97tq2x2AMb+g163b5JFysYk0x4qxNFwbfQkmNZoiRHb6sPzI9/QV33WeuvVYBUIiD4NzNIyqaRQ==",
+      "dev": true
     },
-    "node_modules/object-pairs": {
-      "version": "0.1.0",
-      "dev": true,
-      "license": "MIT"
+    "gensync": {
+      "version": "1.0.0-beta.2",
+      "resolved": "https://registry.npmjs.org/gensync/-/gensync-1.0.0-beta.2.tgz",
+      "integrity": "sha512-3hN7NaskYvMDLQY55gnW3NQ+mesEAepTqlg+VEbj7zzqEMBVNhzcGYYeqFo/TlYz6eQiFcp1HcsCZO+nGgS8zg==",
+      "peer": true
     },
-    "node_modules/object-values": {
-      "version": "1.0.0",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=0.10.0"
-      }
+    "get-caller-file": {
+      "version": "2.0.5",
+      "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz",
+      "integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg=="
     },
-    "node_modules/object.assign": {
-      "version": "4.1.4",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.1.4",
+    "get-func-name": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/get-func-name/-/get-func-name-2.0.2.tgz",
+      "integrity": "sha512-8vXOvuE167CtIc3OyItco7N/dpRtBbYOsPsXCz7X/PMnlGjYjSGuZJgM1Y7mmew7BKf9BqvLX2tnOVy1BBUsxQ==",
+      "dev": true
+    },
+    "get-intrinsic": {
+      "version": "1.2.4",
+      "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.2.4.tgz",
+      "integrity": "sha512-5uYhsJH8VJBTv7oslg4BznJYhDoRI6waYCxMmCdnTrcCrHA/fCFKoTFz2JKKE0HdDFUF7/oQuhzumXJK7paBRQ==",
+      "requires": {
+        "es-errors": "^1.3.0",
+        "function-bind": "^1.1.2",
+        "has-proto": "^1.0.1",
         "has-symbols": "^1.0.3",
-        "object-keys": "^1.1.1"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
+        "hasown": "^2.0.0"
       }
     },
-    "node_modules/object.entries": {
-      "version": "1.1.6",
+    "get-stream": {
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-6.0.1.tgz",
+      "integrity": "sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg==",
+      "dev": true
+    },
+    "get-symbol-description": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/get-symbol-description/-/get-symbol-description-1.0.0.tgz",
+      "integrity": "sha512-2EmdH1YvIQiZpltCNgkuiUnyukzxM/R6NDJX31Ke3BG1Nq5b0S2PhX59UKi9vZpPDQVdqn+1IcaAwnzTT5vCjw==",
       "dev": true,
-      "license": "MIT",
-      "dependencies": {
+      "requires": {
         "call-bind": "^1.0.2",
-        "define-properties": "^1.1.4",
-        "es-abstract": "^1.20.4"
-      },
-      "engines": {
-        "node": ">= 0.4"
+        "get-intrinsic": "^1.1.1"
       }
     },
-    "node_modules/object.fromentries": {
-      "version": "2.0.6",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.1.4",
-        "es-abstract": "^1.20.4"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
+    "glob": {
+      "version": "7.2.3",
+      "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz",
+      "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==",
+      "requires": {
+        "fs.realpath": "^1.0.0",
+        "inflight": "^1.0.4",
+        "inherits": "2",
+        "minimatch": "^3.1.1",
+        "once": "^1.3.0",
+        "path-is-absolute": "^1.0.0"
       }
     },
-    "node_modules/object.groupby": {
-      "version": "1.0.0",
+    "glob-parent": {
+      "version": "6.0.2",
+      "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-6.0.2.tgz",
+      "integrity": "sha512-XxwI8EOhVQgWp6iDL+3b0r86f4d6AX6zSU55HfB4ydCEuXLXc5FcYeOu+nnGftS4TEju/11rt4KJPTMgbfmv4A==",
       "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.2.0",
-        "es-abstract": "^1.21.2",
-        "get-intrinsic": "^1.2.1"
+      "requires": {
+        "is-glob": "^4.0.3"
       }
     },
-    "node_modules/object.hasown": {
-      "version": "1.1.2",
+    "glob-to-regexp": {
+      "version": "0.4.1",
+      "resolved": "https://registry.npmjs.org/glob-to-regexp/-/glob-to-regexp-0.4.1.tgz",
+      "integrity": "sha512-lkX1HJXwyMcprw/5YUZc2s7DrpAiHB21/V+E1rHUrVNokkvB6bqMzT0VfV6/86ZNabt1k14YOIaT7nDvOX3Iiw==",
+      "dev": true
+    },
+    "globals": {
+      "version": "11.12.0",
+      "resolved": "https://registry.npmjs.org/globals/-/globals-11.12.0.tgz",
+      "integrity": "sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA=="
+    },
+    "globalthis": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/globalthis/-/globalthis-1.0.3.tgz",
+      "integrity": "sha512-sFdI5LyBiNTHjRd7cGPWapiHWMOXKyuBNX/cWJ3NfzrZQVa8GI/8cofCl74AOVqq9W5kNmguTIzJ/1s2gyI9wA==",
       "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "define-properties": "^1.1.4",
-        "es-abstract": "^1.20.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
+      "requires": {
+        "define-properties": "^1.1.3"
       }
     },
-    "node_modules/object.values": {
-      "version": "1.1.6",
+    "globby": {
+      "version": "11.1.0",
+      "resolved": "https://registry.npmjs.org/globby/-/globby-11.1.0.tgz",
+      "integrity": "sha512-jhIXaOzy1sb8IyocaruWSn1TjmnBVs8Ayhcy83rmxNJ8q2uWKCAj3CnJY+KpGSXCueAPc0i05kVvVKtP1t9S3g==",
       "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.1.4",
-        "es-abstract": "^1.20.4"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
+      "requires": {
+        "array-union": "^2.1.0",
+        "dir-glob": "^3.0.1",
+        "fast-glob": "^3.2.9",
+        "ignore": "^5.2.0",
+        "merge2": "^1.4.1",
+        "slash": "^3.0.0"
       }
     },
-    "node_modules/oblivious-set": {
-      "version": "1.0.0",
-      "license": "MIT"
+    "globrex": {
+      "version": "0.1.2",
+      "resolved": "https://registry.npmjs.org/globrex/-/globrex-0.1.2.tgz",
+      "integrity": "sha512-uHJgbwAMwNFf5mLst7IWLNg14x1CkeqglJb/K3doi4dw6q2IvAAmM/Y81kevy83wP+Sst+nutFTYOGg3d1lsxg==",
+      "dev": true
     },
-    "node_modules/obuf": {
-      "version": "1.1.2",
-      "dev": true,
-      "license": "MIT"
+    "goober": {
+      "version": "2.1.13",
+      "resolved": "https://registry.npmjs.org/goober/-/goober-2.1.13.tgz",
+      "integrity": "sha512-jFj3BQeleOoy7t93E9rZ2de+ScC4lQICLwiAQmKMg9F6roKGaLSHoCDYKkWlSafg138jejvq/mTdvmnwDQgqoQ==",
+      "requires": {}
     },
-    "node_modules/on-finished": {
-      "version": "2.4.1",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "ee-first": "1.1.1"
-      },
-      "engines": {
-        "node": ">= 0.8"
+    "gopd": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/gopd/-/gopd-1.0.1.tgz",
+      "integrity": "sha512-d65bNlIadxvpb/A2abVdlqKqV563juRnZ1Wtk6s1sIR8uNsXR70xqIzVqxVf1eTqDunwT2MkczEeaezCKTZhwA==",
+      "requires": {
+        "get-intrinsic": "^1.1.3"
       }
     },
-    "node_modules/on-headers": {
-      "version": "1.0.2",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">= 0.8"
-      }
+    "graceful-fs": {
+      "version": "4.2.11",
+      "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.11.tgz",
+      "integrity": "sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ==",
+      "dev": true
     },
-    "node_modules/once": {
+    "grapheme-splitter": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/grapheme-splitter/-/grapheme-splitter-1.0.4.tgz",
+      "integrity": "sha512-bzh50DW9kTPM00T8y4o8vQg89Di9oLJVLW/KaOGIXJWP/iqCN6WKYkbNOF04vFLJhwcpYUh9ydh/+5vpOqV4YQ==",
+      "dev": true
+    },
+    "graphemer": {
       "version": "1.4.0",
-      "license": "ISC",
-      "dependencies": {
-        "wrappy": "1"
-      }
+      "resolved": "https://registry.npmjs.org/graphemer/-/graphemer-1.4.0.tgz",
+      "integrity": "sha512-EtKwoO6kxCL9WO5xipiHTZlSzBm7WLT627TqC/uVRd0HKmq8NXyebnNYxDoBi7wt8eTWrUrKXCOVaFq9x1kgag==",
+      "dev": true
     },
-    "node_modules/onetime": {
-      "version": "5.1.2",
+    "handle-thing": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/handle-thing/-/handle-thing-2.0.1.tgz",
+      "integrity": "sha512-9Qn4yBxelxoh2Ow62nP+Ka/kMnOXRi8BXnRaUwezLNhqelnN49xKz4F/dPP8OYLxLxq6JDtZb2i9XznUQbNPTg==",
+      "dev": true
+    },
+    "has": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz",
+      "integrity": "sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==",
       "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "mimic-fn": "^2.1.0"
-      },
-      "engines": {
-        "node": ">=6"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
+      "requires": {
+        "function-bind": "^1.1.1"
       }
     },
-    "node_modules/open": {
-      "version": "8.4.2",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "define-lazy-prop": "^2.0.0",
-        "is-docker": "^2.1.1",
-        "is-wsl": "^2.2.0"
-      },
-      "engines": {
-        "node": ">=12"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
+    "has-bigints": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/has-bigints/-/has-bigints-1.0.2.tgz",
+      "integrity": "sha512-tSvCKtBr9lkF0Ex0aQiP9N+OpV4zi2r/Nee5VkRDbaqv35RLYMzbwQfFSZZH0kR+Rd6302UJZ2p/bJCEoR3VoQ==",
+      "dev": true
+    },
+    "has-flag": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
+      "integrity": "sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw=="
+    },
+    "has-own-property": {
+      "version": "0.1.0",
+      "resolved": "https://registry.npmjs.org/has-own-property/-/has-own-property-0.1.0.tgz",
+      "integrity": "sha512-14qdBKoonU99XDhWcFKZTShK+QV47qU97u8zzoVo9cL5TZ3BmBHXogItSt9qJjR0KUMFRhcCW8uGIGl8nkl7Aw==",
+      "dev": true
+    },
+    "has-property-descriptors": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/has-property-descriptors/-/has-property-descriptors-1.0.2.tgz",
+      "integrity": "sha512-55JNKuIW+vq4Ke1BjOTjM2YctQIvCT7GFzHwmfZPGo5wnrgkid0YQtnAleFSqumZm4az3n2BS+erby5ipJdgrg==",
+      "requires": {
+        "es-define-property": "^1.0.0"
       }
     },
-    "node_modules/optionator": {
-      "version": "0.9.3",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "@aashutoshrathi/word-wrap": "^1.2.3",
-        "deep-is": "^0.1.3",
-        "fast-levenshtein": "^2.0.6",
-        "levn": "^0.4.1",
-        "prelude-ls": "^1.2.1",
-        "type-check": "^0.4.0"
-      },
-      "engines": {
-        "node": ">= 0.8.0"
+    "has-proto": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/has-proto/-/has-proto-1.0.1.tgz",
+      "integrity": "sha512-7qE+iP+O+bgF9clE5+UoBFzE65mlBiVj3tKCrlNQ0Ogwm0BjpT/gK4SlLYDMybDh5I3TCTKnPPa0oMG7JDYrhg=="
+    },
+    "has-symbols": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.3.tgz",
+      "integrity": "sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A=="
+    },
+    "has-tostringtag": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/has-tostringtag/-/has-tostringtag-1.0.0.tgz",
+      "integrity": "sha512-kFjcSNhnlGV1kyoGk7OXKSawH5JOb/LzUc5w9B02hOTO0dfFRjbHQKvg1d6cf3HbeUmtU9VbbV3qzZ2Teh97WQ==",
+      "requires": {
+        "has-symbols": "^1.0.2"
       }
     },
-    "node_modules/p-limit": {
+    "hash-base": {
       "version": "3.1.0",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "yocto-queue": "^0.1.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
+      "resolved": "https://registry.npmjs.org/hash-base/-/hash-base-3.1.0.tgz",
+      "integrity": "sha512-1nmYp/rhMDiE7AYkDw+lLwlAzz0AntGIe51F3RfFfEqyQ3feY2eI/NcwC6umIQVOASPMsWJLJScWKSSvzL9IVA==",
+      "requires": {
+        "inherits": "^2.0.4",
+        "readable-stream": "^3.6.0",
+        "safe-buffer": "^5.2.0"
       }
     },
-    "node_modules/p-locate": {
-      "version": "5.0.0",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "p-limit": "^3.0.2"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
+    "hash.js": {
+      "version": "1.1.7",
+      "resolved": "https://registry.npmjs.org/hash.js/-/hash.js-1.1.7.tgz",
+      "integrity": "sha512-taOaskGt4z4SOANNseOviYDvjEJinIkRgmp7LbKP2YTTmVxWBl87s/uzK9r+44BclBSp2X7K1hqeNfz9JbBeXA==",
+      "requires": {
+        "inherits": "^2.0.3",
+        "minimalistic-assert": "^1.0.1"
       }
     },
-    "node_modules/p-map": {
-      "version": "2.1.0",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=6"
+    "hasown": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/hasown/-/hasown-2.0.2.tgz",
+      "integrity": "sha512-0hJU9SCPvmMzIBdZFqNPXWa6dqh7WdH0cII9y+CyS8rG3nL48Bclra9HmKhVVUHyPWNH5Y7xDwAB7bfgSjkUMQ==",
+      "requires": {
+        "function-bind": "^1.1.2"
       }
     },
-    "node_modules/p-queue": {
-      "version": "7.3.4",
-      "license": "MIT",
-      "dependencies": {
-        "eventemitter3": "^4.0.7",
-        "p-timeout": "^5.0.2"
-      },
-      "engines": {
-        "node": ">=12"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
+    "he": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/he/-/he-1.2.0.tgz",
+      "integrity": "sha512-F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw==",
+      "dev": true
+    },
+    "hex-rgb": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/hex-rgb/-/hex-rgb-4.3.0.tgz",
+      "integrity": "sha512-Ox1pJVrDCyGHMG9CFg1tmrRUMRPRsAWYc/PinY0XzJU4K7y7vjNoLKIQ7BR5UJMCxNN8EM1MNDmHWA/B3aZUuw=="
+    },
+    "hmac-drbg": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/hmac-drbg/-/hmac-drbg-1.0.1.tgz",
+      "integrity": "sha512-Tti3gMqLdZfhOQY1Mzf/AanLiqh1WTiJgEj26ZuYQ9fbkLomzGchCws4FyrSd4VkpBfiNhaE1On+lOz894jvXg==",
+      "requires": {
+        "hash.js": "^1.0.3",
+        "minimalistic-assert": "^1.0.0",
+        "minimalistic-crypto-utils": "^1.0.1"
       }
     },
-    "node_modules/p-retry": {
-      "version": "4.6.2",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "@types/retry": "0.12.0",
-        "retry": "^0.13.1"
+    "hoist-non-react-statics": {
+      "version": "3.3.2",
+      "resolved": "https://registry.npmjs.org/hoist-non-react-statics/-/hoist-non-react-statics-3.3.2.tgz",
+      "integrity": "sha512-/gGivxi8JPKWNm/W0jSmzcMPpfpPLc3dY/6GxhX2hQ9iGj3aDfklV4ET7NjKpSinLpJ5vafa9iiGIEZg10SfBw==",
+      "requires": {
+        "react-is": "^16.7.0"
       },
-      "engines": {
-        "node": ">=8"
+      "dependencies": {
+        "react-is": {
+          "version": "16.13.1",
+          "resolved": "https://registry.npmjs.org/react-is/-/react-is-16.13.1.tgz",
+          "integrity": "sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ=="
+        }
       }
     },
-    "node_modules/p-timeout": {
-      "version": "5.1.0",
-      "license": "MIT",
-      "engines": {
-        "node": ">=12"
+    "hpack.js": {
+      "version": "2.1.6",
+      "resolved": "https://registry.npmjs.org/hpack.js/-/hpack.js-2.1.6.tgz",
+      "integrity": "sha512-zJxVehUdMGIKsRaNt7apO2Gqp0BdqW5yaiGHXXmbpvxgBYVZnAql+BJb4RO5ad2MgpbZKn5G6nMnegrH1FcNYQ==",
+      "dev": true,
+      "requires": {
+        "inherits": "^2.0.1",
+        "obuf": "^1.0.0",
+        "readable-stream": "^2.0.1",
+        "wbuf": "^1.1.0"
       },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
+      "dependencies": {
+        "isarray": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
+          "integrity": "sha512-VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ==",
+          "dev": true
+        },
+        "readable-stream": {
+          "version": "2.3.8",
+          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.8.tgz",
+          "integrity": "sha512-8p0AUk4XODgIewSi0l8Epjs+EVnWiK7NoDIEGU0HhE7+ZyY8D1IMY7odu5lRrFXGg71L15KG8QrPmum45RTtdA==",
+          "dev": true,
+          "requires": {
+            "core-util-is": "~1.0.0",
+            "inherits": "~2.0.3",
+            "isarray": "~1.0.0",
+            "process-nextick-args": "~2.0.0",
+            "safe-buffer": "~5.1.1",
+            "string_decoder": "~1.1.1",
+            "util-deprecate": "~1.0.1"
+          }
+        },
+        "safe-buffer": {
+          "version": "5.1.2",
+          "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
+          "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==",
+          "dev": true
+        },
+        "string_decoder": {
+          "version": "1.1.1",
+          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
+          "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
+          "dev": true,
+          "requires": {
+            "safe-buffer": "~5.1.0"
+          }
+        }
       }
     },
-    "node_modules/param-case": {
-      "version": "3.0.4",
+    "html-entities": {
+      "version": "2.4.0",
+      "resolved": "https://registry.npmjs.org/html-entities/-/html-entities-2.4.0.tgz",
+      "integrity": "sha512-igBTJcNNNhvZFRtm8uA6xMY6xYleeDwn3PeBCkDz7tHttv4F2hsDI2aPgNERWzvRcNYHNT3ymRaQzllmXj4YsQ==",
+      "dev": true
+    },
+    "html-loader": {
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/html-loader/-/html-loader-4.2.0.tgz",
+      "integrity": "sha512-OxCHD3yt+qwqng2vvcaPApCEvbx+nXWu+v69TYHx1FO8bffHn/JjHtE3TTQZmHjwvnJe4xxzuecetDVBrQR1Zg==",
       "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "dot-case": "^3.0.4",
-        "tslib": "^2.0.3"
+      "requires": {
+        "html-minifier-terser": "^7.0.0",
+        "parse5": "^7.0.0"
       }
     },
-    "node_modules/parent-module": {
-      "version": "1.0.1",
+    "html-minifier-terser": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/html-minifier-terser/-/html-minifier-terser-7.2.0.tgz",
+      "integrity": "sha512-tXgn3QfqPIpGl9o+K5tpcj3/MN4SfLtsx2GWwBC3SSd0tXQGyF3gsSqad8loJgKZGM3ZxbYDd5yhiBIdWpmvLA==",
       "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "callsites": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=6"
+      "requires": {
+        "camel-case": "^4.1.2",
+        "clean-css": "~5.3.2",
+        "commander": "^10.0.0",
+        "entities": "^4.4.0",
+        "param-case": "^3.0.4",
+        "relateurl": "^0.2.7",
+        "terser": "^5.15.1"
       }
     },
-    "node_modules/parse-asn1": {
-      "version": "5.1.6",
-      "license": "ISC",
-      "dependencies": {
-        "asn1.js": "^5.2.0",
-        "browserify-aes": "^1.0.0",
-        "evp_bytestokey": "^1.0.0",
-        "pbkdf2": "^3.0.3",
-        "safe-buffer": "^5.1.1"
+    "html-parse-stringify": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/html-parse-stringify/-/html-parse-stringify-3.0.1.tgz",
+      "integrity": "sha512-KknJ50kTInJ7qIScF3jeaFRpMpE8/lfiTdzf/twXyPBLAGrLRTmkz3AdTnKeh40X8k9L2fdYwEp/42WGXIRGcg==",
+      "requires": {
+        "void-elements": "3.1.0"
       }
     },
-    "node_modules/parse-json": {
-      "version": "5.2.0",
+    "html-webpack-plugin": {
+      "version": "5.5.3",
+      "resolved": "https://registry.npmjs.org/html-webpack-plugin/-/html-webpack-plugin-5.5.3.tgz",
+      "integrity": "sha512-6YrDKTuqaP/TquFH7h4srYWsZx+x6k6+FbsTm0ziCwGHDP78Unr1r9F/H4+sGmMbX08GQcJ+K64x55b+7VM/jg==",
       "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "@babel/code-frame": "^7.0.0",
-        "error-ex": "^1.3.1",
-        "json-parse-even-better-errors": "^2.3.0",
-        "lines-and-columns": "^1.1.6"
-      },
-      "engines": {
-        "node": ">=8"
+      "requires": {
+        "@types/html-minifier-terser": "^6.0.0",
+        "html-minifier-terser": "^6.0.2",
+        "lodash": "^4.17.21",
+        "pretty-error": "^4.0.0",
+        "tapable": "^2.0.0"
       },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
+      "dependencies": {
+        "commander": {
+          "version": "8.3.0",
+          "resolved": "https://registry.npmjs.org/commander/-/commander-8.3.0.tgz",
+          "integrity": "sha512-OkTL9umf+He2DZkUq8f8J9of7yL6RJKI24dVITBmNfZBmri9zYZQrKkuXiKhyfPSu8tUhnVBB1iKXevvnlR4Ww==",
+          "dev": true
+        },
+        "html-minifier-terser": {
+          "version": "6.1.0",
+          "resolved": "https://registry.npmjs.org/html-minifier-terser/-/html-minifier-terser-6.1.0.tgz",
+          "integrity": "sha512-YXxSlJBZTP7RS3tWnQw74ooKa6L9b9i9QYXY21eUEvhZ3u9XLfv6OnFsQq6RxkhHygsaUMvYsZRV5rU/OVNZxw==",
+          "dev": true,
+          "requires": {
+            "camel-case": "^4.1.2",
+            "clean-css": "^5.2.2",
+            "commander": "^8.3.0",
+            "he": "^1.2.0",
+            "param-case": "^3.0.4",
+            "relateurl": "^0.2.7",
+            "terser": "^5.10.0"
+          }
+        }
       }
     },
-    "node_modules/parse-ms": {
-      "version": "4.0.0",
+    "htmlparser2": {
+      "version": "6.1.0",
+      "resolved": "https://registry.npmjs.org/htmlparser2/-/htmlparser2-6.1.0.tgz",
+      "integrity": "sha512-gyyPk6rgonLFEDGoeRgQNaEUvdJ4ktTmmUh/h2t7s+M8oPpIPxgNACWa+6ESR57kXstwqPiCut0V8NRpcwgU7A==",
       "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=18"
+      "requires": {
+        "domelementtype": "^2.0.1",
+        "domhandler": "^4.0.0",
+        "domutils": "^2.5.2",
+        "entities": "^2.0.0"
       },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
+      "dependencies": {
+        "entities": {
+          "version": "2.2.0",
+          "resolved": "https://registry.npmjs.org/entities/-/entities-2.2.0.tgz",
+          "integrity": "sha512-p92if5Nz619I0w+akJrLZH0MX0Pb5DX39XOwQTtXSdQQOaYH03S1uIQp4mhOZtAXrxq4ViO67YTiLBo2638o9A==",
+          "dev": true
+        }
       }
     },
-    "node_modules/parse5": {
-      "version": "7.1.2",
+    "http-deceiver": {
+      "version": "1.2.7",
+      "resolved": "https://registry.npmjs.org/http-deceiver/-/http-deceiver-1.2.7.tgz",
+      "integrity": "sha512-LmpOGxTfbpgtGVxJrj5k7asXHCgNZp5nLfp+hWc8QQRqtb7fUy6kRY3BO1h9ddF6yIPYUARgxGOwB42DnxIaNw==",
+      "dev": true
+    },
+    "http-errors": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-2.0.0.tgz",
+      "integrity": "sha512-FtwrG/euBzaEjYeRqOgly7G0qviiXoJWnvEH2Z1plBdXgbyjv34pHTSb9zoeHMyDy33+DWy5Wt9Wo+TURtOYSQ==",
       "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "entities": "^4.4.0"
-      },
-      "funding": {
-        "url": "https://github.com/inikulin/parse5?sponsor=1"
+      "requires": {
+        "depd": "2.0.0",
+        "inherits": "2.0.4",
+        "setprototypeof": "1.2.0",
+        "statuses": "2.0.1",
+        "toidentifier": "1.0.1"
       }
     },
-    "node_modules/parseurl": {
-      "version": "1.3.3",
+    "http-parser-js": {
+      "version": "0.5.8",
+      "resolved": "https://registry.npmjs.org/http-parser-js/-/http-parser-js-0.5.8.tgz",
+      "integrity": "sha512-SGeBX54F94Wgu5RH3X5jsDtf4eHyRogWX1XGT3b4HuW3tQPM4AaBzoUji/4AAJNXCEOWZ5O0DgZmJw1947gD5Q==",
+      "dev": true
+    },
+    "http-proxy": {
+      "version": "1.18.1",
+      "resolved": "https://registry.npmjs.org/http-proxy/-/http-proxy-1.18.1.tgz",
+      "integrity": "sha512-7mz/721AbnJwIVbnaSv1Cz3Am0ZLT/UBwkC92VlxhXv/k/BBQfM2fXElQNC27BVGr0uwUpplYPQM9LnaBMR5NQ==",
       "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">= 0.8"
+      "requires": {
+        "eventemitter3": "^4.0.0",
+        "follow-redirects": "^1.0.0",
+        "requires-port": "^1.0.0"
       }
     },
-    "node_modules/pascal-case": {
-      "version": "3.1.2",
+    "http-proxy-middleware": {
+      "version": "2.0.6",
+      "resolved": "https://registry.npmjs.org/http-proxy-middleware/-/http-proxy-middleware-2.0.6.tgz",
+      "integrity": "sha512-ya/UeJ6HVBYxrgYotAZo1KvPWlgB48kUJLDePFeneHsVujFaW5WNj2NgWCAE//B1Dl02BIfYlpNgBy8Kf8Rjmw==",
       "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "no-case": "^3.0.4",
-        "tslib": "^2.0.3"
+      "requires": {
+        "@types/http-proxy": "^1.17.8",
+        "http-proxy": "^1.18.1",
+        "is-glob": "^4.0.1",
+        "is-plain-obj": "^3.0.0",
+        "micromatch": "^4.0.2"
       }
     },
-    "node_modules/path": {
-      "version": "0.12.7",
-      "license": "MIT",
-      "dependencies": {
-        "process": "^0.11.1",
-        "util": "^0.10.3"
-      }
+    "human-signals": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/human-signals/-/human-signals-2.1.0.tgz",
+      "integrity": "sha512-B4FFZ6q/T2jhhksgkbEW3HBvWIfDW85snkQgawt07S7J5QXTk6BkNV+0yAeZrM5QpMAdYlocGoljn0sJ/WQkFw==",
+      "dev": true
     },
-    "node_modules/path-exists": {
-      "version": "4.0.0",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=8"
+    "husky": {
+      "version": "8.0.3",
+      "resolved": "https://registry.npmjs.org/husky/-/husky-8.0.3.tgz",
+      "integrity": "sha512-+dQSyqPh4x1hlO1swXBiNb2HzTDN1I2IGLQx1GrBuiqFJfoMrnZWwVmatvSiO+Iz8fBUnf+lekwNo4c2LlXItg==",
+      "dev": true
+    },
+    "i18next": {
+      "version": "21.10.0",
+      "resolved": "https://registry.npmjs.org/i18next/-/i18next-21.10.0.tgz",
+      "integrity": "sha512-YeuIBmFsGjUfO3qBmMOc0rQaun4mIpGKET5WDwvu8lU7gvwpcariZLNtL0Fzj+zazcHUrlXHiptcFhBMFaxzfg==",
+      "requires": {
+        "@babel/runtime": "^7.17.2"
       }
     },
-    "node_modules/path-is-absolute": {
-      "version": "1.0.1",
-      "license": "MIT",
-      "engines": {
-        "node": ">=0.10.0"
+    "iced-error": {
+      "version": "0.0.13",
+      "resolved": "https://registry.npmjs.org/iced-error/-/iced-error-0.0.13.tgz",
+      "integrity": "sha512-yEEaG8QfyyRL0SsbNNDw3rVgTyqwHFMCuV6jDvD43f/2shmdaFXkqvFLGhDlsYNSolzYHwVLM/CrXt9GygYopA=="
+    },
+    "iced-lock": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/iced-lock/-/iced-lock-1.1.0.tgz",
+      "integrity": "sha512-J9UMVitgTMYrkUil5EB9/Q4BPWiMpFH156yjDlmMoMRKs3s3PnXj/6G0UlzIOGnNi5JVNk/zVYLXVnuo+1QnqQ==",
+      "requires": {
+        "iced-runtime": "^1.0.0"
       }
     },
-    "node_modules/path-is-inside": {
-      "version": "1.0.2",
+    "iced-runtime": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/iced-runtime/-/iced-runtime-1.0.4.tgz",
+      "integrity": "sha512-rgiJXNF6ZgF2Clh/TKUlBDW3q51YPDJUXmxGQXx1b8tbZpVpTn+1RX9q1sjNkujXIIaVxZByQzPHHORg7KV51g=="
+    },
+    "icss-utils": {
+      "version": "5.1.0",
+      "resolved": "https://registry.npmjs.org/icss-utils/-/icss-utils-5.1.0.tgz",
+      "integrity": "sha512-soFhflCVWLfRNOPU3iv5Z9VUdT44xFRbzjLsEzSr5AQmgqPMTHdU3PMT1Cf1ssx8fLNJDA1juftYl+PUcv3MqA==",
       "dev": true,
-      "license": "(WTFPL OR MIT)"
+      "requires": {}
+    },
+    "identity-function": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/identity-function/-/identity-function-1.0.0.tgz",
+      "integrity": "sha512-kNrgUK0qI+9qLTBidsH85HjDLpZfrrS0ElquKKe/fJFdB3D7VeKdXXEvOPDUHSHOzdZKCAAaQIWWyp0l2yq6pw==",
+      "dev": true
+    },
+    "ieee754": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.2.1.tgz",
+      "integrity": "sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA=="
+    },
+    "ignore": {
+      "version": "5.2.4",
+      "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.2.4.tgz",
+      "integrity": "sha512-MAb38BcSbH0eHNBxn7ql2NH/kX33OkB3lZ1BNdh7ENeRChHTYsTvWrMubiIAMNS2llXEEgZ1MUOBtXChP3kaFQ==",
+      "dev": true
     },
-    "node_modules/path-key": {
-      "version": "3.1.1",
+    "import-fresh": {
+      "version": "3.3.0",
+      "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.3.0.tgz",
+      "integrity": "sha512-veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw==",
       "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=8"
+      "requires": {
+        "parent-module": "^1.0.0",
+        "resolve-from": "^4.0.0"
       }
     },
-    "node_modules/path-parse": {
-      "version": "1.0.7",
-      "dev": true,
-      "license": "MIT"
-    },
-    "node_modules/path-to-regexp": {
-      "version": "0.1.7",
-      "dev": true,
-      "license": "MIT"
+    "imurmurhash": {
+      "version": "0.1.4",
+      "resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz",
+      "integrity": "sha512-JmXMZ6wuvDmLiHEml9ykzqO6lwFbof0GG4IkcGaENdCRDDmMVnny7s5HsIgHCbaq0w2MyPhDqkhTUgS2LU2PHA==",
+      "dev": true
     },
-    "node_modules/path-type": {
+    "indent-string": {
       "version": "4.0.0",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=8"
+      "resolved": "https://registry.npmjs.org/indent-string/-/indent-string-4.0.0.tgz",
+      "integrity": "sha512-EdDDZu4A2OyIK7Lr/2zG+w5jmbuk1DVBnEwREQvBzspBJkCEbRa8GxU1lghYcaGJCnRWibjDXlq779X1/y5xwg==",
+      "dev": true
+    },
+    "inflight": {
+      "version": "1.0.6",
+      "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
+      "integrity": "sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA==",
+      "requires": {
+        "once": "^1.3.0",
+        "wrappy": "1"
       }
     },
-    "node_modules/path/node_modules/inherits": {
-      "version": "2.0.3",
-      "license": "ISC"
+    "inherits": {
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz",
+      "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ=="
     },
-    "node_modules/path/node_modules/util": {
-      "version": "0.10.4",
-      "license": "MIT",
-      "dependencies": {
-        "inherits": "2.0.3"
+    "internal-slot": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/internal-slot/-/internal-slot-1.0.5.tgz",
+      "integrity": "sha512-Y+R5hJrzs52QCG2laLn4udYVnxsfny9CpOhNhUvk/SSSVyF6T27FzRbF0sroPidSu3X8oEAkOn2K804mjpt6UQ==",
+      "dev": true,
+      "requires": {
+        "get-intrinsic": "^1.2.0",
+        "has": "^1.0.3",
+        "side-channel": "^1.0.4"
       }
     },
-    "node_modules/pathe": {
-      "version": "1.1.1",
-      "dev": true,
-      "license": "MIT"
+    "ipaddr.js": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-2.1.0.tgz",
+      "integrity": "sha512-LlbxQ7xKzfBusov6UMi4MFpEg0m+mAm9xyNGEduwXMEDuf4WfzB/RZwMVYEd7IKGvh4IUkEXYxtAVu9T3OelJQ==",
+      "dev": true
     },
-    "node_modules/pathval": {
+    "is-arguments": {
       "version": "1.1.1",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": "*"
+      "resolved": "https://registry.npmjs.org/is-arguments/-/is-arguments-1.1.1.tgz",
+      "integrity": "sha512-8Q7EARjzEnKpt/PCD7e1cgUS0a6X8u5tdSiMqXhojOdoV9TsMsiO+9VLC5vAmO8N7/GmXn7yjR8qnA6bVAEzfA==",
+      "requires": {
+        "call-bind": "^1.0.2",
+        "has-tostringtag": "^1.0.0"
       }
     },
-    "node_modules/pbkdf2": {
-      "version": "3.1.2",
-      "license": "MIT",
-      "dependencies": {
-        "create-hash": "^1.1.2",
-        "create-hmac": "^1.1.4",
-        "ripemd160": "^2.0.1",
-        "safe-buffer": "^5.0.1",
-        "sha.js": "^2.4.8"
-      },
-      "engines": {
-        "node": ">=0.12"
+    "is-array-buffer": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/is-array-buffer/-/is-array-buffer-3.0.2.tgz",
+      "integrity": "sha512-y+FyyR/w8vfIRq4eQcM1EYgSTnmHXPqaF+IgzgraytCFq5Xh8lllDVmAZolPJiZttZLeFSINPYMaEJ7/vWUa1w==",
+      "dev": true,
+      "requires": {
+        "call-bind": "^1.0.2",
+        "get-intrinsic": "^1.2.0",
+        "is-typed-array": "^1.1.10"
       }
     },
-    "node_modules/picocolors": {
-      "version": "1.0.1",
-      "license": "ISC"
+    "is-arrayish": {
+      "version": "0.2.1",
+      "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz",
+      "integrity": "sha512-zz06S8t0ozoDXMG+ube26zeCTNXcKIPJZJi8hBrF4idCLms4CG9QtK7qBl1boi5ODzFpjswb5JPmHCbMpjaYzg==",
+      "dev": true
     },
-    "node_modules/picomatch": {
-      "version": "2.3.1",
-      "license": "MIT",
-      "engines": {
-        "node": ">=8.6"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/jonschlinkert"
+    "is-bigint": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/is-bigint/-/is-bigint-1.0.4.tgz",
+      "integrity": "sha512-zB9CruMamjym81i2JZ3UMn54PKGsQzsJeo6xvN3HJJ4CAsQNB6iRutp2To77OfCNuoxspsIhzaPoO1zyCEhFOg==",
+      "dev": true,
+      "requires": {
+        "has-bigints": "^1.0.1"
       }
     },
-    "node_modules/pidtree": {
-      "version": "0.6.0",
+    "is-binary-path": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-2.1.0.tgz",
+      "integrity": "sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==",
       "dev": true,
-      "license": "MIT",
-      "bin": {
-        "pidtree": "bin/pidtree.js"
-      },
-      "engines": {
-        "node": ">=0.10"
+      "requires": {
+        "binary-extensions": "^2.0.0"
       }
     },
-    "node_modules/pify": {
-      "version": "4.0.1",
+    "is-boolean-object": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/is-boolean-object/-/is-boolean-object-1.1.2.tgz",
+      "integrity": "sha512-gDYaKHJmnj4aWxyj6YHyXVpdQawtVLHU5cb+eztPGczf6cjuTdwve5ZIEfgXqH4e57An1D1AKf8CZ3kYrQRqYA==",
       "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=6"
+      "requires": {
+        "call-bind": "^1.0.2",
+        "has-tostringtag": "^1.0.0"
       }
     },
-    "node_modules/pinkie": {
-      "version": "2.0.4",
+    "is-callable": {
+      "version": "1.2.7",
+      "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.7.tgz",
+      "integrity": "sha512-1BC0BVFhS/p0qtw6enp8e+8OD0UrK0oFLztSjNzhcKA3WDuJxxAPXzPuPtKkjEY9UUoEWlX/8fgKeu2S8i9JTA=="
+    },
+    "is-core-module": {
+      "version": "2.14.0",
+      "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.14.0.tgz",
+      "integrity": "sha512-a5dFJih5ZLYlRtDc0dZWP7RiKr6xIKzmn/oAYCDvdLThadVgyJwlaoQPmRtMSpz+rk0OGAgIu+TcM9HUF0fk1A==",
       "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=0.10.0"
+      "requires": {
+        "hasown": "^2.0.2"
       }
     },
-    "node_modules/pinkie-promise": {
-      "version": "2.0.1",
+    "is-date-object": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/is-date-object/-/is-date-object-1.0.5.tgz",
+      "integrity": "sha512-9YQaSxsAiSwcvS33MBk3wTCVnWK+HhF8VZR2jRxehM16QcVOdHqPn4VPHmRK4lSr38n9JriurInLcP90xsYNfQ==",
       "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "pinkie": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
+      "requires": {
+        "has-tostringtag": "^1.0.0"
       }
     },
-    "node_modules/pkg-types": {
-      "version": "1.0.3",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "jsonc-parser": "^3.2.0",
-        "mlly": "^1.2.0",
-        "pathe": "^1.1.0"
+    "is-docker": {
+      "version": "2.2.1",
+      "resolved": "https://registry.npmjs.org/is-docker/-/is-docker-2.2.1.tgz",
+      "integrity": "sha512-F+i2BKsFrH66iaUFc0woD8sLy8getkwTwtOBjvs56Cx4CgJDeKQeqfz8wAYiSb8JOprWhHH5p77PbmYCvvUuXQ==",
+      "dev": true
+    },
+    "is-extglob": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz",
+      "integrity": "sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==",
+      "dev": true
+    },
+    "is-fullwidth-code-point": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-4.0.0.tgz",
+      "integrity": "sha512-O4L094N2/dZ7xqVdrXhh9r1KODPJpFms8B5sGdJLPy664AgvXsreZUyCQQNItZRDlYug4xStLjNp/sz3HvBowQ==",
+      "dev": true
+    },
+    "is-generator-function": {
+      "version": "1.0.10",
+      "resolved": "https://registry.npmjs.org/is-generator-function/-/is-generator-function-1.0.10.tgz",
+      "integrity": "sha512-jsEjy9l3yiXEQ+PsXdmBwEPcOxaXWLspKdplFUVI9vq1iZgIekeC0L167qeu86czQaxed3q/Uzuw0swL0irL8A==",
+      "requires": {
+        "has-tostringtag": "^1.0.0"
       }
     },
-    "node_modules/playwright": {
-      "version": "1.45.2",
-      "license": "Apache-2.0",
-      "dependencies": {
-        "playwright-core": "1.45.2"
-      },
-      "bin": {
-        "playwright": "cli.js"
-      },
-      "engines": {
-        "node": ">=18"
-      },
-      "optionalDependencies": {
-        "fsevents": "2.3.2"
+    "is-glob": {
+      "version": "4.0.3",
+      "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz",
+      "integrity": "sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==",
+      "dev": true,
+      "requires": {
+        "is-extglob": "^2.1.1"
       }
     },
-    "node_modules/playwright-core": {
-      "version": "1.45.2",
-      "license": "Apache-2.0",
-      "bin": {
-        "playwright-core": "cli.js"
-      },
-      "engines": {
-        "node": ">=18"
+    "is-iterable": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/is-iterable/-/is-iterable-1.1.1.tgz",
+      "integrity": "sha512-EdOZCr0NsGE00Pot+x1ZFx9MJK3C6wy91geZpXwvwexDLJvA4nzYyZf7r+EIwSeVsOLDdBz7ATg9NqKTzuNYuQ==",
+      "dev": true
+    },
+    "is-map": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/is-map/-/is-map-2.0.2.tgz",
+      "integrity": "sha512-cOZFQQozTha1f4MxLFzlgKYPTyj26picdZTx82hbc/Xf4K/tZOOXSCkMvU4pKioRXGDLJRn0GM7Upe7kR721yg==",
+      "dev": true
+    },
+    "is-negative-zero": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/is-negative-zero/-/is-negative-zero-2.0.2.tgz",
+      "integrity": "sha512-dqJvarLawXsFbNDeJW7zAz8ItJ9cd28YufuuFzh0G8pNHjJMnY08Dv7sYX2uF5UpQOwieAeOExEYAWWfu7ZZUA==",
+      "dev": true
+    },
+    "is-number": {
+      "version": "7.0.0",
+      "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz",
+      "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==",
+      "dev": true
+    },
+    "is-number-object": {
+      "version": "1.0.7",
+      "resolved": "https://registry.npmjs.org/is-number-object/-/is-number-object-1.0.7.tgz",
+      "integrity": "sha512-k1U0IRzLMo7ZlYIfzRu23Oh6MiIFasgpb9X76eqfFZAqwH44UI4KTBvBYIZ1dSL9ZzChTB9ShHfLkR4pdW5krQ==",
+      "dev": true,
+      "requires": {
+        "has-tostringtag": "^1.0.0"
       }
     },
-    "node_modules/playwright/node_modules/fsevents": {
-      "version": "2.3.2",
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "darwin"
-      ],
-      "engines": {
-        "node": "^8.16.0 || ^10.6.0 || >=11.0.0"
+    "is-path-cwd": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/is-path-cwd/-/is-path-cwd-2.2.0.tgz",
+      "integrity": "sha512-w942bTcih8fdJPJmQHFzkS76NEP8Kzzvmw92cXsazb8intwLqPibPPdXf4ANdKV3rYMuuQYGIWtvz9JilB3NFQ==",
+      "dev": true
+    },
+    "is-path-in-cwd": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/is-path-in-cwd/-/is-path-in-cwd-2.1.0.tgz",
+      "integrity": "sha512-rNocXHgipO+rvnP6dk3zI20RpOtrAM/kzbB258Uw5BWr3TpXi861yzjo16Dn4hUox07iw5AyeMLHWsujkjzvRQ==",
+      "dev": true,
+      "requires": {
+        "is-path-inside": "^2.1.0"
       }
     },
-    "node_modules/postcss": {
-      "version": "8.4.39",
+    "is-path-inside": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/is-path-inside/-/is-path-inside-2.1.0.tgz",
+      "integrity": "sha512-wiyhTzfDWsvwAW53OBWF5zuvaOGlZ6PwYxAbPVDhpm+gM09xKQGjBq/8uYN12aDvMxnAnq3dxTyoSoRNmg5YFg==",
       "dev": true,
-      "funding": [
-        {
-          "type": "opencollective",
-          "url": "https://opencollective.com/postcss/"
-        },
-        {
-          "type": "tidelift",
-          "url": "https://tidelift.com/funding/github/npm/postcss"
-        },
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/ai"
-        }
-      ],
-      "license": "MIT",
-      "dependencies": {
-        "nanoid": "^3.3.7",
-        "picocolors": "^1.0.1",
-        "source-map-js": "^1.2.0"
-      },
-      "engines": {
-        "node": "^10 || ^12 || >=14"
+      "requires": {
+        "path-is-inside": "^1.0.2"
       }
     },
-    "node_modules/postcss-modules-extract-imports": {
+    "is-plain-obj": {
       "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-3.0.0.tgz",
+      "integrity": "sha512-gwsOE28k+23GP1B6vFl1oVh/WOzmawBrKwo5Ev6wMKzPkaXaCDIQKzLnvsA42DRlbVTWorkgTKIviAKCWkfUwA==",
+      "dev": true
+    },
+    "is-regex": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.1.4.tgz",
+      "integrity": "sha512-kvRdxDsxZjhzUX07ZnLydzS1TU/TJlTUHHY4YLL87e37oUA49DfkLqgy+VjFocowy29cKvcSiu+kIv728jTTVg==",
       "dev": true,
-      "license": "ISC",
-      "engines": {
-        "node": "^10 || ^12 || >= 14"
-      },
-      "peerDependencies": {
-        "postcss": "^8.1.0"
+      "requires": {
+        "call-bind": "^1.0.2",
+        "has-tostringtag": "^1.0.0"
       }
     },
-    "node_modules/postcss-modules-local-by-default": {
-      "version": "4.0.3",
+    "is-set": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/is-set/-/is-set-2.0.2.tgz",
+      "integrity": "sha512-+2cnTEZeY5z/iXGbLhPrOAaK/Mau5k5eXq9j14CpRTftq0pAJu2MwVRSZhyZWBzx3o6X795Lz6Bpb6R0GKf37g==",
+      "dev": true
+    },
+    "is-shared-array-buffer": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/is-shared-array-buffer/-/is-shared-array-buffer-1.0.2.tgz",
+      "integrity": "sha512-sqN2UDu1/0y6uvXyStCOzyhAjCSlHceFoMKJW8W9EU9cvic/QdsZ0kEU93HEy3IUEFZIiH/3w+AH/UQbPHNdhA==",
       "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "icss-utils": "^5.0.0",
-        "postcss-selector-parser": "^6.0.2",
-        "postcss-value-parser": "^4.1.0"
-      },
-      "engines": {
-        "node": "^10 || ^12 || >= 14"
-      },
-      "peerDependencies": {
-        "postcss": "^8.1.0"
+      "requires": {
+        "call-bind": "^1.0.2"
       }
     },
-    "node_modules/postcss-modules-scope": {
-      "version": "3.0.0",
+    "is-stream": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-2.0.1.tgz",
+      "integrity": "sha512-hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg==",
+      "dev": true
+    },
+    "is-string": {
+      "version": "1.0.7",
+      "resolved": "https://registry.npmjs.org/is-string/-/is-string-1.0.7.tgz",
+      "integrity": "sha512-tE2UXzivje6ofPW7l23cjDOMa09gb7xlAqG6jG5ej6uPV32TlWP3NKPigtaGeHNu9fohccRYvIiZMfOOnOYUtg==",
       "dev": true,
-      "license": "ISC",
-      "dependencies": {
-        "postcss-selector-parser": "^6.0.4"
-      },
-      "engines": {
-        "node": "^10 || ^12 || >= 14"
-      },
-      "peerDependencies": {
-        "postcss": "^8.1.0"
+      "requires": {
+        "has-tostringtag": "^1.0.0"
       }
     },
-    "node_modules/postcss-modules-values": {
-      "version": "4.0.0",
+    "is-symbol": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/is-symbol/-/is-symbol-1.0.4.tgz",
+      "integrity": "sha512-C/CPBqKWnvdcxqIARxyOh4v1UUEOCHpgDa0WYgpKDFMszcrPcffg5uhwSgPCLD2WWxmq6isisz87tzT01tuGhg==",
       "dev": true,
-      "license": "ISC",
-      "dependencies": {
-        "icss-utils": "^5.0.0"
-      },
-      "engines": {
-        "node": "^10 || ^12 || >= 14"
-      },
-      "peerDependencies": {
-        "postcss": "^8.1.0"
+      "requires": {
+        "has-symbols": "^1.0.2"
       }
     },
-    "node_modules/postcss-selector-parser": {
-      "version": "6.0.13",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "cssesc": "^3.0.0",
-        "util-deprecate": "^1.0.2"
-      },
-      "engines": {
-        "node": ">=4"
+    "is-typed-array": {
+      "version": "1.1.12",
+      "resolved": "https://registry.npmjs.org/is-typed-array/-/is-typed-array-1.1.12.tgz",
+      "integrity": "sha512-Z14TF2JNG8Lss5/HMqt0//T9JeHXttXy5pH/DBU4vi98ozO2btxzq9MwYDZYnKwU8nRsz/+GVFVRDq3DkVuSPg==",
+      "requires": {
+        "which-typed-array": "^1.1.11"
       }
     },
-    "node_modules/postcss-value-parser": {
-      "version": "4.2.0",
-      "license": "MIT"
+    "is-weakmap": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/is-weakmap/-/is-weakmap-2.0.1.tgz",
+      "integrity": "sha512-NSBR4kH5oVj1Uwvv970ruUkCV7O1mzgVFO4/rev2cLRda9Tm9HrL70ZPut4rOHgY0FNrUu9BCbXA2sdQ+x0chA==",
+      "dev": true
     },
-    "node_modules/postcss/node_modules/nanoid": {
-      "version": "3.3.7",
+    "is-weakref": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/is-weakref/-/is-weakref-1.0.2.tgz",
+      "integrity": "sha512-qctsuLZmIQ0+vSSMfoVvyFe2+GSEvnmZ2ezTup1SBse9+twCCeial6EEi3Nc2KFcf6+qz2FBPnjXsk8xhKSaPQ==",
       "dev": true,
-      "funding": [
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/ai"
-        }
-      ],
-      "license": "MIT",
-      "bin": {
-        "nanoid": "bin/nanoid.cjs"
-      },
-      "engines": {
-        "node": "^10 || ^12 || ^13.7 || ^14 || >=15.0.1"
+      "requires": {
+        "call-bind": "^1.0.2"
       }
     },
-    "node_modules/prelude-ls": {
-      "version": "1.2.1",
+    "is-weakset": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/is-weakset/-/is-weakset-2.0.2.tgz",
+      "integrity": "sha512-t2yVvttHkQktwnNNmBQ98AhENLdPUTDTE21uPqAQ0ARwQfGeQKRVS0NNurH7bTf7RrvcVn1OOge45CnBeHCSmg==",
       "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">= 0.8.0"
+      "requires": {
+        "call-bind": "^1.0.2",
+        "get-intrinsic": "^1.1.1"
       }
     },
-    "node_modules/prettier": {
-      "version": "2.8.8",
+    "is-what": {
+      "version": "4.1.15",
+      "resolved": "https://registry.npmjs.org/is-what/-/is-what-4.1.15.tgz",
+      "integrity": "sha512-uKua1wfy3Yt+YqsD6mTUEa2zSi3G1oPlqTflgaPJ7z63vUGN5pxFpnQfeSLMFnJDEsdvOtkp1rUWkYjB4YfhgA=="
+    },
+    "is-wsl": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/is-wsl/-/is-wsl-2.2.0.tgz",
+      "integrity": "sha512-fKzAra0rGJUUBwGBgNkHZuToZcn+TtXHpeCgmkMJMMYx1sQDYaCSyjJBSCa2nH1DGm7s3n1oBnohoVTBaN7Lww==",
       "dev": true,
-      "license": "MIT",
-      "bin": {
-        "prettier": "bin-prettier.js"
-      },
-      "engines": {
-        "node": ">=10.13.0"
-      },
-      "funding": {
-        "url": "https://github.com/prettier/prettier?sponsor=1"
+      "requires": {
+        "is-docker": "^2.0.0"
       }
     },
-    "node_modules/prettier-linter-helpers": {
+    "isarray": {
+      "version": "2.0.5",
+      "resolved": "https://registry.npmjs.org/isarray/-/isarray-2.0.5.tgz",
+      "integrity": "sha512-xHjhDr3cNBK0BzdUJSPXZntQUx/mwMS5Rw4A7lPJ90XGAO6ISP/ePDNuo0vhqOZU+UD5JoodwCAAoZQd3FeAKw==",
+      "dev": true
+    },
+    "isexe": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz",
+      "integrity": "sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==",
+      "dev": true
+    },
+    "iterable-lookahead": {
       "version": "1.0.0",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "fast-diff": "^1.1.2"
-      },
-      "engines": {
-        "node": ">=6.0.0"
-      }
+      "resolved": "https://registry.npmjs.org/iterable-lookahead/-/iterable-lookahead-1.0.0.tgz",
+      "integrity": "sha512-hJnEP2Xk4+44DDwJqUQGdXal5VbyeWLaPyDl2AQc242Zr7iqz4DgpQOrEzglWVMGHMDCkguLHEKxd1+rOsmgSQ==",
+      "dev": true
     },
-    "node_modules/prettier-plugin-organize-imports": {
-      "version": "3.2.3",
+    "jest-worker": {
+      "version": "27.5.1",
+      "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-27.5.1.tgz",
+      "integrity": "sha512-7vuh85V5cdDofPyxn58nrPjBktZo0u9x1g8WtjQol+jZDaE+fhN+cIvTj11GndBnMnyfrUOG1sZQxCdjKh+DKg==",
       "dev": true,
-      "license": "MIT",
-      "peerDependencies": {
-        "@volar/vue-language-plugin-pug": "^1.0.4",
-        "@volar/vue-typescript": "^1.0.4",
-        "prettier": ">=2.0",
-        "typescript": ">=2.9"
+      "requires": {
+        "@types/node": "*",
+        "merge-stream": "^2.0.0",
+        "supports-color": "^8.0.0"
       },
-      "peerDependenciesMeta": {
-        "@volar/vue-language-plugin-pug": {
-          "optional": true
+      "dependencies": {
+        "has-flag": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+          "dev": true
         },
-        "@volar/vue-typescript": {
-          "optional": true
+        "supports-color": {
+          "version": "8.1.1",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz",
+          "integrity": "sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==",
+          "dev": true,
+          "requires": {
+            "has-flag": "^4.0.0"
+          }
         }
       }
     },
-    "node_modules/pretty-error": {
+    "jiti": {
+      "version": "1.21.6",
+      "resolved": "https://registry.npmjs.org/jiti/-/jiti-1.21.6.tgz",
+      "integrity": "sha512-2yTgeWTWzMWkHu6Jp9NKgePDaYHbntiwvYuuJLbbN9vl7DC9DvXKOB2BC3ZZ92D3cvV/aflH0osDfwpHepQ53w==",
+      "dev": true
+    },
+    "js-sdsl": {
+      "version": "4.4.2",
+      "resolved": "https://registry.npmjs.org/js-sdsl/-/js-sdsl-4.4.2.tgz",
+      "integrity": "sha512-dwXFwByc/ajSV6m5bcKAPwe4yDDF6D614pxmIi5odytzxRlwqF6nwoiCek80Ixc7Cvma5awClxrzFtxCQvcM8w==",
+      "dev": true
+    },
+    "js-sha256": {
+      "version": "0.10.1",
+      "resolved": "https://registry.npmjs.org/js-sha256/-/js-sha256-0.10.1.tgz",
+      "integrity": "sha512-5obBtsz9301ULlsgggLg542s/jqtddfOpV5KJc4hajc9JV8GeY2gZHSVpYBn4nWqAUTJ9v+xwtbJ1mIBgIH5Vw=="
+    },
+    "js-sha3": {
+      "version": "0.8.0",
+      "resolved": "https://registry.npmjs.org/js-sha3/-/js-sha3-0.8.0.tgz",
+      "integrity": "sha512-gF1cRrHhIzNfToc802P800N8PpXS+evLLXfsVpowqmAFR9uwbi89WvXg2QspOmXL8QL86J4T1EpFu+yUkwJY3Q=="
+    },
+    "js-tokens": {
       "version": "4.0.0",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "lodash": "^4.17.20",
-        "renderkid": "^3.0.0"
-      }
+      "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz",
+      "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ=="
     },
-    "node_modules/pretty-ms": {
-      "version": "9.0.0",
+    "js-yaml": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz",
+      "integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==",
       "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "parse-ms": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=18"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
+      "requires": {
+        "argparse": "^2.0.1"
       }
     },
-    "node_modules/process": {
-      "version": "0.11.10",
-      "license": "MIT",
-      "engines": {
-        "node": ">= 0.6.0"
+    "jsesc": {
+      "version": "2.5.2",
+      "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-2.5.2.tgz",
+      "integrity": "sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA=="
+    },
+    "json-bigint": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/json-bigint/-/json-bigint-1.0.0.tgz",
+      "integrity": "sha512-SiPv/8VpZuWbvLSMtTDU8hEfrZWg/mH/nV/b4o0CYbSxu1UIQPLdwKOCIyLQX+VIPO5vrLX3i8qtqFyhdPSUSQ==",
+      "requires": {
+        "bignumber.js": "^9.0.0"
       }
     },
-    "node_modules/process-nextick-args": {
-      "version": "2.0.1",
-      "dev": true,
-      "license": "MIT"
+    "json-parse-even-better-errors": {
+      "version": "2.3.1",
+      "resolved": "https://registry.npmjs.org/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz",
+      "integrity": "sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w==",
+      "dev": true
     },
-    "node_modules/progress": {
-      "version": "1.1.8",
-      "resolved": "https://registry.npmjs.org/progress/-/progress-1.1.8.tgz",
-      "integrity": "sha512-UdA8mJ4weIkUBO224tIarHzuHs4HuYiJvsuGT7j/SPQiUJVjYvNDBIPa0hAorduOfjGohB/qHWRa/lrrWX/mXw==",
-      "engines": {
-        "node": ">=0.4.0"
-      }
+    "json-schema-traverse": {
+      "version": "0.4.1",
+      "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
+      "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==",
+      "dev": true
     },
-    "node_modules/prop-types": {
-      "version": "15.8.1",
-      "license": "MIT",
-      "dependencies": {
-        "loose-envify": "^1.4.0",
-        "object-assign": "^4.1.1",
-        "react-is": "^16.13.1"
-      }
+    "json-stable-stringify-without-jsonify": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz",
+      "integrity": "sha512-Bdboy+l7tA3OGW6FjyFHWkP5LuByj1Tk33Ljyq0axyzdk9//JSi2u3fP1QSmd1KNwq6VOKYGlAu87CisVir6Pw==",
+      "dev": true
     },
-    "node_modules/prop-types/node_modules/react-is": {
-      "version": "16.13.1",
-      "license": "MIT"
+    "json5": {
+      "version": "2.2.3",
+      "resolved": "https://registry.npmjs.org/json5/-/json5-2.2.3.tgz",
+      "integrity": "sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg=="
     },
-    "node_modules/proxy-addr": {
-      "version": "2.0.7",
+    "jsonc-parser": {
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/jsonc-parser/-/jsonc-parser-3.2.0.tgz",
+      "integrity": "sha512-gfFQZrcTc8CnKXp6Y4/CBT3fTc0OVuDofpre4aEeEpSBPV5X5v4+Vmx+8snU7RLPrNHPKSgLxGo9YuQzz20o+w==",
+      "dev": true
+    },
+    "jsonfile": {
+      "version": "6.1.0",
+      "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.1.0.tgz",
+      "integrity": "sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ==",
       "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "forwarded": "0.2.0",
-        "ipaddr.js": "1.9.1"
-      },
-      "engines": {
-        "node": ">= 0.10"
+      "requires": {
+        "graceful-fs": "^4.1.6",
+        "universalify": "^2.0.0"
       }
     },
-    "node_modules/proxy-addr/node_modules/ipaddr.js": {
-      "version": "1.9.1",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">= 0.10"
+    "jsontokens": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/jsontokens/-/jsontokens-4.0.1.tgz",
+      "integrity": "sha512-+MO415LEN6M+3FGsRz4wU20g7N2JA+2j9d9+pGaNJHviG4L8N0qzavGyENw6fJqsq9CcrHOIL6iWX5yeTZ86+Q==",
+      "requires": {
+        "@noble/hashes": "^1.1.2",
+        "@noble/secp256k1": "^1.6.3",
+        "base64-js": "^1.5.1"
       }
     },
-    "node_modules/proxy-from-env": {
-      "version": "1.1.0",
-      "license": "MIT"
+    "jsx-ast-utils": {
+      "version": "3.3.5",
+      "resolved": "https://registry.npmjs.org/jsx-ast-utils/-/jsx-ast-utils-3.3.5.tgz",
+      "integrity": "sha512-ZZow9HBI5O6EPgSJLUb8n2NKgmVWTwCvHGwFuJlMjvLFqlGG6pjirPhtdsseaLZjSibD8eegzmYpUZwoIlj2cQ==",
+      "dev": true,
+      "requires": {
+        "array-includes": "^3.1.6",
+        "array.prototype.flat": "^1.3.1",
+        "object.assign": "^4.1.4",
+        "object.values": "^1.1.6"
+      }
     },
-    "node_modules/public-encrypt": {
-      "version": "4.0.3",
-      "license": "MIT",
+    "knip": {
+      "version": "5.23.3",
+      "resolved": "https://registry.npmjs.org/knip/-/knip-5.23.3.tgz",
+      "integrity": "sha512-i0vFlpe3D9AZmp3Hlq3ZncjJQB2x21LeVrIV+9rnBavaKpTLhV/sLmE4iqTjEWedLtpfJsax68S68aqZzcXpsQ==",
+      "dev": true,
+      "requires": {
+        "@ericcornelissen/bash-parser": "0.5.3",
+        "@nodelib/fs.walk": "2.0.0",
+        "@snyk/github-codeowners": "1.1.0",
+        "easy-table": "1.2.0",
+        "fast-glob": "^3.3.2",
+        "jiti": "^1.21.6",
+        "js-yaml": "^4.1.0",
+        "minimist": "^1.2.8",
+        "picocolors": "^1.0.0",
+        "picomatch": "^4.0.1",
+        "pretty-ms": "^9.0.0",
+        "resolve": "^1.22.8",
+        "smol-toml": "^1.1.4",
+        "strip-json-comments": "5.0.1",
+        "summary": "2.1.0",
+        "tsconfig-paths": "^4.2.0",
+        "zod": "^3.22.4",
+        "zod-validation-error": "^3.0.3"
+      },
       "dependencies": {
-        "bn.js": "^4.1.0",
-        "browserify-rsa": "^4.0.0",
-        "create-hash": "^1.1.0",
-        "parse-asn1": "^5.0.0",
-        "randombytes": "^2.0.1",
-        "safe-buffer": "^5.1.2"
+        "@nodelib/fs.scandir": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-3.0.0.tgz",
+          "integrity": "sha512-ktI9+PxfHYtKjF3cLTUAh2N+b8MijCRPNwKJNqTVdL0gB0QxLU2rIRaZ1t71oEa3YBDE6bukH1sR0+CDnpp/Mg==",
+          "dev": true,
+          "requires": {
+            "@nodelib/fs.stat": "3.0.0",
+            "run-parallel": "^1.2.0"
+          }
+        },
+        "@nodelib/fs.stat": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-3.0.0.tgz",
+          "integrity": "sha512-2tQOI38s19P9i7X/Drt0v8iMA+KMsgdhB/dyPER+e+2Y8L1Z7QvnuRdW/uLuf5YRFUYmnj4bMA6qCuZHFI1GDQ==",
+          "dev": true
+        },
+        "@nodelib/fs.walk": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/@nodelib/fs.walk/-/fs.walk-2.0.0.tgz",
+          "integrity": "sha512-54voNDBobGdMl3BUXSu7UaDh1P85PGHWlJ5e0XhPugo1JulOyCtp2I+5ri4wplGDJ8QGwPEQW7/x3yTLU7yF1A==",
+          "dev": true,
+          "requires": {
+            "@nodelib/fs.scandir": "3.0.0",
+            "fastq": "^1.15.0"
+          }
+        },
+        "picomatch": {
+          "version": "4.0.2",
+          "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.2.tgz",
+          "integrity": "sha512-M7BAV6Rlcy5u+m6oPhAPFgJTzAioX/6B0DxyvDlo9l8+T3nLKbrczg2WLUyzd45L8RqfUMyGPzekbMvX2Ldkwg==",
+          "dev": true
+        },
+        "strip-json-comments": {
+          "version": "5.0.1",
+          "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-5.0.1.tgz",
+          "integrity": "sha512-0fk9zBqO67Nq5M/m45qHCJxylV/DhBlIOVExqgOMiCCrzrhU6tCibRXNqE3jwJLftzE9SNuZtYbpzcO+i9FiKw==",
+          "dev": true
+        },
+        "tsconfig-paths": {
+          "version": "4.2.0",
+          "resolved": "https://registry.npmjs.org/tsconfig-paths/-/tsconfig-paths-4.2.0.tgz",
+          "integrity": "sha512-NoZ4roiN7LnbKn9QqE1amc9DJfzvZXxF4xDavcOWt1BPkdx+m+0gJuPM+S0vCe7zTJMYUP0R8pO2XMr+Y8oLIg==",
+          "dev": true,
+          "requires": {
+            "json5": "^2.2.2",
+            "minimist": "^1.2.6",
+            "strip-bom": "^3.0.0"
+          }
+        }
       }
     },
-    "node_modules/public-encrypt/node_modules/bn.js": {
-      "version": "4.12.0",
-      "license": "MIT"
+    "language-subtag-registry": {
+      "version": "0.3.22",
+      "resolved": "https://registry.npmjs.org/language-subtag-registry/-/language-subtag-registry-0.3.22.tgz",
+      "integrity": "sha512-tN0MCzyWnoz/4nHS6uxdlFWoUZT7ABptwKPQ52Ea7URk6vll88bWBVhodtnlfEuCcKWNGoc+uGbw1cwa9IKh/w==",
+      "dev": true
     },
-    "node_modules/punycode": {
-      "version": "2.3.0",
+    "language-tags": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/language-tags/-/language-tags-1.0.5.tgz",
+      "integrity": "sha512-qJhlO9cGXi6hBGKoxEG/sKZDAHD5Hnu9Hs4WbOY3pCWXDhw0N8x1NenNzm2EnNLkLkk7J2SdxAkDSbb6ftT+UQ==",
       "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=6"
+      "requires": {
+        "language-subtag-registry": "~0.3.2"
       }
     },
-    "node_modules/qr-code-styling": {
-      "version": "1.5.0",
-      "license": "MIT",
-      "dependencies": {
-        "qrcode-generator": "^1.4.3"
+    "launch-editor": {
+      "version": "2.6.0",
+      "resolved": "https://registry.npmjs.org/launch-editor/-/launch-editor-2.6.0.tgz",
+      "integrity": "sha512-JpDCcQnyAAzZZaZ7vEiSqL690w7dAEyLao+KC96zBplnYbJS7TYNjvM3M7y3dGz+v7aIsJk3hllWuc0kWAjyRQ==",
+      "dev": true,
+      "requires": {
+        "picocolors": "^1.0.0",
+        "shell-quote": "^1.7.3"
       }
     },
-    "node_modules/qr.js": {
-      "version": "0.0.0",
-      "license": "MIT"
-    },
-    "node_modules/qrcode-generator": {
-      "version": "1.4.4",
-      "license": "MIT"
+    "ledger-bitcoin": {
+      "version": "0.2.3",
+      "resolved": "https://registry.npmjs.org/ledger-bitcoin/-/ledger-bitcoin-0.2.3.tgz",
+      "integrity": "sha512-sWdvMTR5CkebNlM0Mam9ROdpsD7Y4087kj4cbIaCCq8IXShCQ44vE3j0wTmt+sHp13eETgY63OWN1rkuIfMfuQ==",
+      "requires": {
+        "@bitcoinerlab/descriptors": "^1.0.2",
+        "@bitcoinerlab/secp256k1": "^1.0.5",
+        "@ledgerhq/hw-transport": "^6.20.0",
+        "bip32-path": "^0.4.2",
+        "bitcoinjs-lib": "^6.1.3"
+      }
     },
-    "node_modules/queue-microtask": {
-      "version": "1.2.3",
+    "levn": {
+      "version": "0.4.1",
+      "resolved": "https://registry.npmjs.org/levn/-/levn-0.4.1.tgz",
+      "integrity": "sha512-+bT2uH4E5LGE7h/n3evcS/sQlJXCpIp6ym8OWJ5eV6+67Dsql/LaaT7qJBAt2rzfoa/5QBGBhxDix1dMt2kQKQ==",
       "dev": true,
-      "funding": [
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/feross"
-        },
-        {
-          "type": "patreon",
-          "url": "https://www.patreon.com/feross"
-        },
-        {
-          "type": "consulting",
-          "url": "https://feross.org/support"
-        }
-      ],
-      "license": "MIT"
+      "requires": {
+        "prelude-ls": "^1.2.1",
+        "type-check": "~0.4.0"
+      }
     },
-    "node_modules/randombytes": {
+    "lilconfig": {
       "version": "2.1.0",
-      "license": "MIT",
-      "dependencies": {
-        "safe-buffer": "^5.1.0"
-      }
+      "resolved": "https://registry.npmjs.org/lilconfig/-/lilconfig-2.1.0.tgz",
+      "integrity": "sha512-utWOt/GHzuUxnLKxB6dk81RoOeoNeHgbrXiuGk4yyF5qlRz+iIVWu56E2fqGHFrXz0QNUhLB/8nKqvRH66JKGQ==",
+      "dev": true
     },
-    "node_modules/randomfill": {
-      "version": "1.0.4",
-      "license": "MIT",
-      "dependencies": {
-        "randombytes": "^2.0.5",
-        "safe-buffer": "^5.1.0"
-      }
+    "lines-and-columns": {
+      "version": "1.2.4",
+      "resolved": "https://registry.npmjs.org/lines-and-columns/-/lines-and-columns-1.2.4.tgz",
+      "integrity": "sha512-7ylylesZQ/PV29jhEDl3Ufjo6ZX7gCqJr5F7PKrqc93v7fzSymt1BpwEU8nAUXs8qzzvqhbjhK5QZg6Mt/HkBg==",
+      "dev": true
     },
-    "node_modules/range-parser": {
-      "version": "1.2.1",
+    "lint-staged": {
+      "version": "13.2.3",
+      "resolved": "https://registry.npmjs.org/lint-staged/-/lint-staged-13.2.3.tgz",
+      "integrity": "sha512-zVVEXLuQIhr1Y7R7YAWx4TZLdvuzk7DnmrsTNL0fax6Z3jrpFcas+vKbzxhhvp6TA55m1SQuWkpzI1qbfDZbAg==",
       "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">= 0.6"
+      "requires": {
+        "chalk": "5.2.0",
+        "cli-truncate": "^3.1.0",
+        "commander": "^10.0.0",
+        "debug": "^4.3.4",
+        "execa": "^7.0.0",
+        "lilconfig": "2.1.0",
+        "listr2": "^5.0.7",
+        "micromatch": "^4.0.5",
+        "normalize-path": "^3.0.0",
+        "object-inspect": "^1.12.3",
+        "pidtree": "^0.6.0",
+        "string-argv": "^0.3.1",
+        "yaml": "^2.2.2"
+      },
+      "dependencies": {
+        "chalk": {
+          "version": "5.2.0",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-5.2.0.tgz",
+          "integrity": "sha512-ree3Gqw/nazQAPuJJEy+avdl7QfZMcUvmHIKgEZkGL+xOBzRvup5Hxo6LHuMceSxOabuJLJm5Yp/92R9eMmMvA==",
+          "dev": true
+        },
+        "execa": {
+          "version": "7.2.0",
+          "resolved": "https://registry.npmjs.org/execa/-/execa-7.2.0.tgz",
+          "integrity": "sha512-UduyVP7TLB5IcAQl+OzLyLcS/l32W/GLg+AhHJ+ow40FOk2U3SAllPwR44v4vmdFwIWqpdwxxpQbF1n5ta9seA==",
+          "dev": true,
+          "requires": {
+            "cross-spawn": "^7.0.3",
+            "get-stream": "^6.0.1",
+            "human-signals": "^4.3.0",
+            "is-stream": "^3.0.0",
+            "merge-stream": "^2.0.0",
+            "npm-run-path": "^5.1.0",
+            "onetime": "^6.0.0",
+            "signal-exit": "^3.0.7",
+            "strip-final-newline": "^3.0.0"
+          }
+        },
+        "human-signals": {
+          "version": "4.3.1",
+          "resolved": "https://registry.npmjs.org/human-signals/-/human-signals-4.3.1.tgz",
+          "integrity": "sha512-nZXjEF2nbo7lIw3mgYjItAfgQXog3OjJogSbKa2CQIIvSGWcKgeJnQlNXip6NglNzYH45nSRiEVimMvYL8DDqQ==",
+          "dev": true
+        },
+        "is-stream": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-3.0.0.tgz",
+          "integrity": "sha512-LnQR4bZ9IADDRSkvpqMGvt/tEJWclzklNgSw48V5EAaAeDd6qGvN8ei6k5p0tvxSR171VmGyHuTiAOfxAbr8kA==",
+          "dev": true
+        },
+        "mimic-fn": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-4.0.0.tgz",
+          "integrity": "sha512-vqiC06CuhBTUdZH+RYl8sFrL096vA45Ok5ISO6sE/Mr1jRbGH4Csnhi8f3wKVl7x8mO4Au7Ir9D3Oyv1VYMFJw==",
+          "dev": true
+        },
+        "npm-run-path": {
+          "version": "5.1.0",
+          "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-5.1.0.tgz",
+          "integrity": "sha512-sJOdmRGrY2sjNTRMbSvluQqg+8X7ZK61yvzBEIDhz4f8z1TZFYABsqjjCBd/0PUNE9M6QDgHJXQkGUEm7Q+l9Q==",
+          "dev": true,
+          "requires": {
+            "path-key": "^4.0.0"
+          }
+        },
+        "onetime": {
+          "version": "6.0.0",
+          "resolved": "https://registry.npmjs.org/onetime/-/onetime-6.0.0.tgz",
+          "integrity": "sha512-1FlR+gjXK7X+AsAHso35MnyN5KqGwJRi/31ft6x0M194ht7S+rWAvd7PHss9xSKMzE0asv1pyIHaJYq+BbacAQ==",
+          "dev": true,
+          "requires": {
+            "mimic-fn": "^4.0.0"
+          }
+        },
+        "path-key": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/path-key/-/path-key-4.0.0.tgz",
+          "integrity": "sha512-haREypq7xkM7ErfgIyA0z+Bj4AGKlMSdlQE2jvJo6huWD1EdkKYV+G/T4nq0YEF2vgTT8kqMFKo1uHn950r4SQ==",
+          "dev": true
+        },
+        "strip-final-newline": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/strip-final-newline/-/strip-final-newline-3.0.0.tgz",
+          "integrity": "sha512-dOESqjYr96iWYylGObzd39EuNTa5VJxyvVAEm5Jnh7KGo75V43Hk1odPQkNDyXNmUR6k+gEiDVXnjB8HJ3crXw==",
+          "dev": true
+        }
       }
     },
-    "node_modules/raw-body": {
-      "version": "2.5.1",
+    "listr2": {
+      "version": "5.0.8",
+      "resolved": "https://registry.npmjs.org/listr2/-/listr2-5.0.8.tgz",
+      "integrity": "sha512-mC73LitKHj9w6v30nLNGPetZIlfpUniNSsxxrbaPcWOjDb92SHPzJPi/t+v1YC/lxKz/AJ9egOjww0qUuFxBpA==",
       "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "bytes": "3.1.2",
-        "http-errors": "2.0.0",
-        "iconv-lite": "0.4.24",
-        "unpipe": "1.0.0"
+      "requires": {
+        "cli-truncate": "^2.1.0",
+        "colorette": "^2.0.19",
+        "log-update": "^4.0.0",
+        "p-map": "^4.0.0",
+        "rfdc": "^1.3.0",
+        "rxjs": "^7.8.0",
+        "through": "^2.3.8",
+        "wrap-ansi": "^7.0.0"
       },
-      "engines": {
-        "node": ">= 0.8"
+      "dependencies": {
+        "ansi-styles": {
+          "version": "4.3.0",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+          "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+          "dev": true,
+          "requires": {
+            "color-convert": "^2.0.1"
+          }
+        },
+        "cli-truncate": {
+          "version": "2.1.0",
+          "resolved": "https://registry.npmjs.org/cli-truncate/-/cli-truncate-2.1.0.tgz",
+          "integrity": "sha512-n8fOixwDD6b/ObinzTrp1ZKFzbgvKZvuz/TvejnLn1aQfC6r52XEx85FmuC+3HI+JM7coBRXUvNqEU2PHVrHpg==",
+          "dev": true,
+          "requires": {
+            "slice-ansi": "^3.0.0",
+            "string-width": "^4.2.0"
+          }
+        },
+        "color-convert": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+          "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+          "dev": true,
+          "requires": {
+            "color-name": "~1.1.4"
+          }
+        },
+        "color-name": {
+          "version": "1.1.4",
+          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+          "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+          "dev": true
+        },
+        "emoji-regex": {
+          "version": "8.0.0",
+          "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
+          "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
+          "dev": true
+        },
+        "is-fullwidth-code-point": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
+          "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
+          "dev": true
+        },
+        "p-map": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/p-map/-/p-map-4.0.0.tgz",
+          "integrity": "sha512-/bjOqmgETBYB5BoEeGVea8dmvHb2m9GLy1E9W43yeyfP6QQCZGFNa+XRceJEuDB6zqr+gKpIAmlLebMpykw/MQ==",
+          "dev": true,
+          "requires": {
+            "aggregate-error": "^3.0.0"
+          }
+        },
+        "rxjs": {
+          "version": "7.8.1",
+          "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-7.8.1.tgz",
+          "integrity": "sha512-AA3TVj+0A2iuIoQkWEK/tqFjBq2j+6PO6Y0zJcvzLAFhEFIO3HL0vls9hWLncZbAAbK0mar7oZ4V079I/qPMxg==",
+          "dev": true,
+          "requires": {
+            "tslib": "^2.1.0"
+          }
+        },
+        "slice-ansi": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-3.0.0.tgz",
+          "integrity": "sha512-pSyv7bSTC7ig9Dcgbw9AuRNUb5k5V6oDudjZoMBSr13qpLBG7tB+zgCkARjq7xIUgdz5P1Qe8u+rSGdouOOIyQ==",
+          "dev": true,
+          "requires": {
+            "ansi-styles": "^4.0.0",
+            "astral-regex": "^2.0.0",
+            "is-fullwidth-code-point": "^3.0.0"
+          }
+        },
+        "string-width": {
+          "version": "4.2.3",
+          "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
+          "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
+          "dev": true,
+          "requires": {
+            "emoji-regex": "^8.0.0",
+            "is-fullwidth-code-point": "^3.0.0",
+            "strip-ansi": "^6.0.1"
+          }
+        }
       }
     },
-    "node_modules/raw-body/node_modules/bytes": {
-      "version": "3.1.2",
+    "loader-runner": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/loader-runner/-/loader-runner-4.3.0.tgz",
+      "integrity": "sha512-3R/1M+yS3j5ou80Me59j7F9IMs4PXs3VqRrm0TU3AbKPxlmpoY1TNscJV/oGJXo8qCatFGTfDbY6W6ipGOYXfg==",
+      "dev": true
+    },
+    "loader-utils": {
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.4.tgz",
+      "integrity": "sha512-xXqpXoINfFhgua9xiqD8fPFHgkoq1mmmpE92WlDbm9rNRd/EbRb+Gqf908T2DMfuHjjJlksiK2RbHVOdD/MqSw==",
       "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">= 0.8"
+      "requires": {
+        "big.js": "^5.2.2",
+        "emojis-list": "^3.0.0",
+        "json5": "^2.1.2"
       }
     },
-    "node_modules/raw-body/node_modules/iconv-lite": {
-      "version": "0.4.24",
+    "local-pkg": {
+      "version": "0.4.3",
+      "resolved": "https://registry.npmjs.org/local-pkg/-/local-pkg-0.4.3.tgz",
+      "integrity": "sha512-SFppqq5p42fe2qcZQqqEOiVRXl+WCP1MdT6k7BDEW1j++sp5fIY+/fdRQitvKgB5BrBcmrs5m/L0v2FrU5MY1g==",
+      "dev": true
+    },
+    "locate-path": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-6.0.0.tgz",
+      "integrity": "sha512-iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw==",
       "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "safer-buffer": ">= 2.1.2 < 3"
-      },
-      "engines": {
-        "node": ">=0.10.0"
+      "requires": {
+        "p-locate": "^5.0.0"
       }
     },
-    "node_modules/rc-dialog": {
-      "version": "9.1.0",
-      "license": "MIT",
-      "dependencies": {
-        "@babel/runtime": "^7.10.1",
-        "@rc-component/portal": "^1.0.0-8",
-        "classnames": "^2.2.6",
-        "rc-motion": "^2.3.0",
-        "rc-util": "^5.21.0"
-      },
-      "peerDependencies": {
-        "react": ">=16.9.0",
-        "react-dom": ">=16.9.0"
-      }
+    "lodash": {
+      "version": "4.17.21",
+      "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz",
+      "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg=="
     },
-    "node_modules/rc-image": {
-      "version": "5.18.1",
-      "license": "MIT",
-      "dependencies": {
-        "@babel/runtime": "^7.11.2",
-        "@rc-component/portal": "^1.0.2",
-        "classnames": "^2.2.6",
-        "rc-dialog": "~9.1.0",
-        "rc-motion": "^2.6.2",
-        "rc-util": "^5.0.6"
-      },
-      "peerDependencies": {
-        "react": ">=16.9.0",
-        "react-dom": ">=16.9.0"
-      }
+    "lodash.clonedeep": {
+      "version": "4.5.0",
+      "resolved": "https://registry.npmjs.org/lodash.clonedeep/-/lodash.clonedeep-4.5.0.tgz",
+      "integrity": "sha512-H5ZhCF25riFd9uB5UCkVKo61m3S/xZk1x4wA6yp/L3RFP6Z/eHH1ymQcGLo7J3GMPfm0V/7m1tryHuGVxpqEBQ=="
     },
-    "node_modules/rc-motion": {
-      "version": "2.7.3",
-      "license": "MIT",
-      "dependencies": {
-        "@babel/runtime": "^7.11.1",
-        "classnames": "^2.2.1",
-        "rc-util": "^5.21.0"
-      },
-      "peerDependencies": {
-        "react": ">=16.9.0",
-        "react-dom": ">=16.9.0"
-      }
+    "lodash.curry": {
+      "version": "4.1.1",
+      "resolved": "https://registry.npmjs.org/lodash.curry/-/lodash.curry-4.1.1.tgz",
+      "integrity": "sha512-/u14pXGviLaweY5JI0IUzgzF2J6Ne8INyzAZjImcryjgkZ+ebruBxy2/JaOOkTqScddcYtakjhSaeemV8lR0tA==",
+      "dev": true
     },
-    "node_modules/rc-util": {
-      "version": "5.35.0",
-      "license": "MIT",
-      "dependencies": {
-        "@babel/runtime": "^7.18.3",
-        "react-is": "^16.12.0"
-      },
-      "peerDependencies": {
-        "react": ">=16.9.0",
-        "react-dom": ">=16.9.0"
-      }
+    "lodash.get": {
+      "version": "4.4.2",
+      "resolved": "https://registry.npmjs.org/lodash.get/-/lodash.get-4.4.2.tgz",
+      "integrity": "sha512-z+Uw/vLuy6gQe8cfaFWD7p0wVv8fJl3mbzXh33RS+0oW2wvUqiRXiQ69gLWSLpgB5/6sU+r6BlQR0MBILadqTQ==",
+      "dev": true
     },
-    "node_modules/rc-util/node_modules/react-is": {
-      "version": "16.13.1",
-      "license": "MIT"
+    "lodash.merge": {
+      "version": "4.6.2",
+      "resolved": "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.2.tgz",
+      "integrity": "sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==",
+      "dev": true
     },
-    "node_modules/react": {
-      "version": "18.2.0",
-      "license": "MIT",
-      "dependencies": {
-        "loose-envify": "^1.1.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
+    "lodash.omit": {
+      "version": "4.5.0",
+      "resolved": "https://registry.npmjs.org/lodash.omit/-/lodash.omit-4.5.0.tgz",
+      "integrity": "sha512-XeqSp49hNGmlkj2EJlfrQFIzQ6lXdNro9sddtQzcJY8QaoC2GO0DT7xaIokHeyM+mIT0mPMlPvkYzg2xCuHdZg=="
     },
-    "node_modules/react-content-loader": {
-      "version": "6.2.1",
-      "license": "MIT",
-      "engines": {
-        "node": ">=10"
-      },
-      "peerDependencies": {
-        "react": ">=16.0.0"
-      }
+    "lodash.padend": {
+      "version": "4.6.1",
+      "resolved": "https://registry.npmjs.org/lodash.padend/-/lodash.padend-4.6.1.tgz",
+      "integrity": "sha512-sOQs2aqGpbl27tmCS1QNZA09Uqp01ZzWfDUoD+xzTii0E7dSQfRKcRetFwa+uXaxaqL+TKm7CgD2JdKP7aZBSw=="
     },
-    "node_modules/react-dom": {
-      "version": "18.2.0",
-      "license": "MIT",
-      "dependencies": {
-        "loose-envify": "^1.1.0",
-        "scheduler": "^0.23.0"
-      },
-      "peerDependencies": {
-        "react": "^18.2.0"
-      }
+    "lodash.trimstart": {
+      "version": "4.5.1",
+      "resolved": "https://registry.npmjs.org/lodash.trimstart/-/lodash.trimstart-4.5.1.tgz",
+      "integrity": "sha512-b/+D6La8tU76L/61/aN0jULWHkT0EeJCmVstPBn/K9MtD2qBW83AsBNrr63dKuWYwVMO7ucv13QNO/Ek/2RKaQ=="
     },
-    "node_modules/react-hot-toast": {
-      "version": "2.4.1",
-      "license": "MIT",
-      "dependencies": {
-        "goober": "^2.1.10"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "peerDependencies": {
-        "react": ">=16",
-        "react-dom": ">=16"
-      }
+    "lodash.words": {
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/lodash.words/-/lodash.words-4.2.0.tgz",
+      "integrity": "sha512-mXxqd8Yx9BGPij3lZKFSdOsjOTbL4krbCCp9slEozaN4EMppA2dFmK/f8HeohodprY6W0vOdiQ5WFgPaTI75xQ=="
     },
-    "node_modules/react-i18next": {
-      "version": "11.18.6",
-      "license": "MIT",
-      "dependencies": {
-        "@babel/runtime": "^7.14.5",
-        "html-parse-stringify": "^3.0.1"
-      },
-      "peerDependencies": {
-        "i18next": ">= 19.0.0",
-        "react": ">= 16.8.0"
+    "log-update": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/log-update/-/log-update-4.0.0.tgz",
+      "integrity": "sha512-9fkkDevMefjg0mmzWFBW8YkFP91OrizzkW3diF7CpG+S2EYdy4+TVfGwz1zeF8x7hCx1ovSPTOE9Ngib74qqUg==",
+      "dev": true,
+      "requires": {
+        "ansi-escapes": "^4.3.0",
+        "cli-cursor": "^3.1.0",
+        "slice-ansi": "^4.0.0",
+        "wrap-ansi": "^6.2.0"
       },
-      "peerDependenciesMeta": {
-        "react-dom": {
-          "optional": true
+      "dependencies": {
+        "ansi-styles": {
+          "version": "4.3.0",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+          "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+          "dev": true,
+          "requires": {
+            "color-convert": "^2.0.1"
+          }
         },
-        "react-native": {
-          "optional": true
+        "color-convert": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+          "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+          "dev": true,
+          "requires": {
+            "color-name": "~1.1.4"
+          }
+        },
+        "color-name": {
+          "version": "1.1.4",
+          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+          "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+          "dev": true
+        },
+        "emoji-regex": {
+          "version": "8.0.0",
+          "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
+          "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
+          "dev": true
+        },
+        "is-fullwidth-code-point": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
+          "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
+          "dev": true
+        },
+        "slice-ansi": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-4.0.0.tgz",
+          "integrity": "sha512-qMCMfhY040cVHT43K9BFygqYbUPFZKHOg7K73mtTWJRb8pyP3fzf4Ixd5SzdEJQ6MRUg/WBnOLxghZtKKurENQ==",
+          "dev": true,
+          "requires": {
+            "ansi-styles": "^4.0.0",
+            "astral-regex": "^2.0.0",
+            "is-fullwidth-code-point": "^3.0.0"
+          }
+        },
+        "string-width": {
+          "version": "4.2.3",
+          "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
+          "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
+          "dev": true,
+          "requires": {
+            "emoji-regex": "^8.0.0",
+            "is-fullwidth-code-point": "^3.0.0",
+            "strip-ansi": "^6.0.1"
+          }
+        },
+        "wrap-ansi": {
+          "version": "6.2.0",
+          "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-6.2.0.tgz",
+          "integrity": "sha512-r6lPcBGxZXlIcymEu7InxDMhdW0KDxpLgoFLcguasxCaJ/SOIZwINatK9KY/tf+ZrlywOKU0UDj3ATXUBfxJXA==",
+          "dev": true,
+          "requires": {
+            "ansi-styles": "^4.0.0",
+            "string-width": "^4.1.0",
+            "strip-ansi": "^6.0.0"
+          }
         }
       }
     },
-    "node_modules/react-is": {
-      "version": "18.2.0",
-      "license": "MIT"
-    },
-    "node_modules/react-is-visible": {
-      "version": "1.2.0",
-      "license": "MIT",
-      "dependencies": {
-        "@babel/runtime": "^7.12.5",
-        "hoist-non-react-statics": "3.3.2"
-      },
-      "peerDependencies": {
-        "react": ">=16.8.0",
-        "react-dom": ">=16.8.0"
+    "loose-envify": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/loose-envify/-/loose-envify-1.4.0.tgz",
+      "integrity": "sha512-lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q==",
+      "requires": {
+        "js-tokens": "^3.0.0 || ^4.0.0"
       }
     },
-    "node_modules/react-lifecycles-compat": {
-      "version": "3.0.4",
-      "license": "MIT"
+    "lottie-web": {
+      "version": "5.12.2",
+      "resolved": "https://registry.npmjs.org/lottie-web/-/lottie-web-5.12.2.tgz",
+      "integrity": "sha512-uvhvYPC8kGPjXT3MyKMrL3JitEAmDMp30lVkuq/590Mw9ok6pWcFCwXJveo0t5uqYw1UREQHofD+jVpdjBv8wg=="
     },
-    "node_modules/react-lottie": {
-      "version": "1.2.4",
-      "license": "MIT",
-      "dependencies": {
-        "babel-runtime": "^6.26.0",
-        "lottie-web": "^5.1.3"
-      },
-      "engines": {
-        "npm": "^3.0.0"
-      },
-      "peerDependencies": {
-        "react": ">=15.0.0"
+    "loupe": {
+      "version": "2.3.7",
+      "resolved": "https://registry.npmjs.org/loupe/-/loupe-2.3.7.tgz",
+      "integrity": "sha512-zSMINGVYkdpYSOBmLi0D1Uo7JU9nVdQKrHxC8eYlV+9YKK9WePqAlL7lSlorG/U2Fw1w0hTBmaa/jrQ3UbPHtA==",
+      "dev": true,
+      "requires": {
+        "get-func-name": "^2.0.1"
       }
     },
-    "node_modules/react-modal": {
-      "version": "3.16.1",
-      "license": "MIT",
-      "dependencies": {
-        "exenv": "^1.2.0",
-        "prop-types": "^15.7.2",
-        "react-lifecycles-compat": "^3.0.0",
-        "warning": "^4.0.3"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "peerDependencies": {
-        "react": "^0.14.0 || ^15.0.0 || ^16 || ^17 || ^18",
-        "react-dom": "^0.14.0 || ^15.0.0 || ^16 || ^17 || ^18"
+    "lower-case": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/lower-case/-/lower-case-2.0.2.tgz",
+      "integrity": "sha512-7fm3l3NAF9WfN6W3JOmf5drwpVqX78JtoGJ3A6W0a6ZnldM41w2fV5D490psKFTpMds8TJse/eHLFFsNHHjHgg==",
+      "dev": true,
+      "requires": {
+        "tslib": "^2.0.3"
       }
     },
-    "node_modules/react-number-format": {
-      "version": "5.2.2",
-      "license": "MIT",
-      "dependencies": {
-        "prop-types": "^15.7.2"
-      },
-      "peerDependencies": {
-        "react": "^0.14 || ^15.0.0 || ^16.0.0 || ^17.0.0 || ^18.0.0",
-        "react-dom": "^0.14 || ^15.0.0 || ^16.0.0 || ^17.0.0 || ^18.0.0"
+    "lru-cache": {
+      "version": "5.1.1",
+      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-5.1.1.tgz",
+      "integrity": "sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==",
+      "peer": true,
+      "requires": {
+        "yallist": "^3.0.2"
       }
     },
-    "node_modules/react-qr-code": {
-      "version": "2.0.11",
-      "license": "MIT",
-      "dependencies": {
-        "prop-types": "^15.8.1",
-        "qr.js": "0.0.0"
-      },
-      "peerDependencies": {
-        "react": "^16.x || ^17.x || ^18.x",
-        "react-native-svg": "*"
-      },
-      "peerDependenciesMeta": {
-        "react-native-svg": {
-          "optional": true
-        }
+    "magic-string": {
+      "version": "0.30.5",
+      "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.30.5.tgz",
+      "integrity": "sha512-7xlpfBaQaP/T6Vh8MO/EqXSW5En6INHEvEXQiuff7Gku0PWjU3uf6w/j9o7O+SpB5fOAkrI5HeoNgwjEO0pFsA==",
+      "dev": true,
+      "requires": {
+        "@jridgewell/sourcemap-codec": "^1.4.15"
       }
     },
-    "node_modules/react-redux": {
-      "version": "7.2.9",
-      "license": "MIT",
-      "dependencies": {
-        "@babel/runtime": "^7.15.4",
-        "@types/react-redux": "^7.1.20",
-        "hoist-non-react-statics": "^3.3.2",
-        "loose-envify": "^1.4.0",
-        "prop-types": "^15.7.2",
-        "react-is": "^17.0.2"
-      },
-      "peerDependencies": {
-        "react": "^16.8.3 || ^17 || ^18"
-      },
-      "peerDependenciesMeta": {
-        "react-dom": {
-          "optional": true
-        },
-        "react-native": {
-          "optional": true
-        }
+    "map-obj": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/map-obj/-/map-obj-2.0.0.tgz",
+      "integrity": "sha512-TzQSV2DiMYgoF5RycneKVUzIa9bQsj/B3tTgsE3dOGqlzHnGIDaC7XBE7grnA+8kZPnfqSGFe95VHc2oc0VFUQ==",
+      "dev": true
+    },
+    "md5.js": {
+      "version": "1.3.5",
+      "resolved": "https://registry.npmjs.org/md5.js/-/md5.js-1.3.5.tgz",
+      "integrity": "sha512-xitP+WxNPcTTOgnTJcrhM0xvdPepipPSf3I8EIpGKeFLjt3PlJLIDG3u8EX53ZIubkb+5U2+3rELYpEhHhzdkg==",
+      "requires": {
+        "hash-base": "^3.0.0",
+        "inherits": "^2.0.1",
+        "safe-buffer": "^5.1.2"
       }
     },
-    "node_modules/react-redux/node_modules/react-is": {
-      "version": "17.0.2",
-      "license": "MIT"
+    "media-typer": {
+      "version": "0.3.0",
+      "resolved": "https://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz",
+      "integrity": "sha512-dq+qelQ9akHpcOl/gUVRTxVIOkAJ1wR3QAvb4RsVjS8oVoFjDGTc679wJYmUmknUF5HwMLOgb5O+a3KxfWapPQ==",
+      "dev": true
     },
-    "node_modules/react-refresh": {
-      "version": "0.14.0",
+    "memfs": {
+      "version": "3.5.3",
+      "resolved": "https://registry.npmjs.org/memfs/-/memfs-3.5.3.tgz",
+      "integrity": "sha512-UERzLsxzllchadvbPs5aolHh65ISpKpM+ccLbOJ8/vvpBKmAWf+la7dXFy7Mr0ySHbdHrFv5kGFCUHHe6GFEmw==",
       "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=0.10.0"
+      "requires": {
+        "fs-monkey": "^1.0.4"
       }
     },
-    "node_modules/react-refresh-typescript": {
-      "version": "2.0.9",
+    "merge-descriptors": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.1.tgz",
+      "integrity": "sha512-cCi6g3/Zr1iqQi6ySbseM1Xvooa98N0w31jzUYrXPX2xqObmFGHJ0tQ5u74H3mVh7wLouTseZyYIq39g8cNp1w==",
+      "dev": true
+    },
+    "merge-stream": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/merge-stream/-/merge-stream-2.0.0.tgz",
+      "integrity": "sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w==",
+      "dev": true
+    },
+    "merge2": {
+      "version": "1.4.1",
+      "resolved": "https://registry.npmjs.org/merge2/-/merge2-1.4.1.tgz",
+      "integrity": "sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==",
+      "dev": true
+    },
+    "methods": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/methods/-/methods-1.1.2.tgz",
+      "integrity": "sha512-iclAHeNqNm68zFtnZ0e+1L2yUIdvzNoauKU4WBA3VvH/vPFieF7qfRlwUZU+DA9P9bPXIS90ulxoUoCH23sV2w==",
+      "dev": true
+    },
+    "micro-packed": {
+      "version": "0.5.1",
+      "resolved": "https://registry.npmjs.org/micro-packed/-/micro-packed-0.5.1.tgz",
+      "integrity": "sha512-VjBHcsMAVfivjCZPnqAEEkcihPBbNd39KLEMH76ksL3ORKSZE04gkrtsAmXtaTor67PmTO5h0Rq9+j3PA4zNrw==",
+      "requires": {
+        "@scure/base": "~1.1.5"
+      }
+    },
+    "micromatch": {
+      "version": "4.0.5",
+      "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.5.tgz",
+      "integrity": "sha512-DMy+ERcEW2q8Z2Po+WNXuw3c5YaUSFjAO5GsJqfEl7UjvtIuFKO6ZrKvcItdy98dwFI2N1tg3zNIdKaQT+aNdA==",
       "dev": true,
-      "license": "MIT",
-      "peerDependencies": {
-        "react-refresh": "0.10.x || 0.11.x || 0.12.x || 0.13.x || 0.14.x",
-        "typescript": "^4.8 || ^5.0"
+      "requires": {
+        "braces": "^3.0.2",
+        "picomatch": "^2.3.1"
       }
     },
-    "node_modules/react-router": {
-      "version": "6.14.2",
-      "license": "MIT",
-      "dependencies": {
-        "@remix-run/router": "1.7.2"
-      },
-      "engines": {
-        "node": ">=14"
+    "microseconds": {
+      "version": "0.1.0",
+      "resolved": "https://registry.npmjs.org/microseconds/-/microseconds-0.1.0.tgz",
+      "integrity": "sha512-yF2K4aHXKxO4OGhW7Ek2KLgKEAFbSblBLKlF6KzwQUhjK7+uAzatRr6fZ82bftdnuDQrkBHAJp5s8quj1ME3wA==",
+      "dev": true
+    },
+    "miller-rabin": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/miller-rabin/-/miller-rabin-4.0.1.tgz",
+      "integrity": "sha512-115fLhvZVqWwHPbClyntxEVfVDfl9DLLTuJvq3g2O/Oxi8AiNouAHvDSzHS0viUJc+V5vm3eq91Xwqn9dp4jRA==",
+      "requires": {
+        "bn.js": "^4.0.0",
+        "brorand": "^1.0.1"
       },
-      "peerDependencies": {
-        "react": ">=16.8"
+      "dependencies": {
+        "bn.js": {
+          "version": "4.12.0",
+          "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.0.tgz",
+          "integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA=="
+        }
       }
     },
-    "node_modules/react-router-dom": {
-      "version": "6.14.2",
-      "license": "MIT",
-      "dependencies": {
-        "@remix-run/router": "1.7.2",
-        "react-router": "6.14.2"
-      },
-      "engines": {
-        "node": ">=14"
-      },
-      "peerDependencies": {
-        "react": ">=16.8",
-        "react-dom": ">=16.8"
+    "mime": {
+      "version": "1.6.0",
+      "resolved": "https://registry.npmjs.org/mime/-/mime-1.6.0.tgz",
+      "integrity": "sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg==",
+      "dev": true
+    },
+    "mime-db": {
+      "version": "1.52.0",
+      "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.52.0.tgz",
+      "integrity": "sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg=="
+    },
+    "mime-types": {
+      "version": "2.1.35",
+      "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.35.tgz",
+      "integrity": "sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==",
+      "requires": {
+        "mime-db": "1.52.0"
       }
     },
-    "node_modules/react-switch": {
-      "version": "7.0.0",
-      "license": "MIT",
-      "dependencies": {
-        "prop-types": "^15.7.2"
-      },
-      "peerDependencies": {
-        "react": "^15.3.0 || ^16.0.0 || ^17.0.0 || ^18.0.0",
-        "react-dom": "^15.3.0 || ^16.0.0 || ^17.0.0 || ^18.0.0"
+    "mimic-fn": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-2.1.0.tgz",
+      "integrity": "sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==",
+      "dev": true
+    },
+    "minimalistic-assert": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/minimalistic-assert/-/minimalistic-assert-1.0.1.tgz",
+      "integrity": "sha512-UtJcAD4yEaGtjPezWuO9wC4nwUnVH/8/Im3yEHQP4b67cXlD/Qr9hdITCU1xDbSEXg2XKNaP8jsReV7vQd00/A=="
+    },
+    "minimalistic-crypto-utils": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/minimalistic-crypto-utils/-/minimalistic-crypto-utils-1.0.1.tgz",
+      "integrity": "sha512-JIYlbt6g8i5jKfJ3xz7rF0LXmv2TkDxBLUkiBeZ7bAx4GnnNMr8xFpGnOxn6GhTEHx3SjRrZEoU+j04prX1ktg=="
+    },
+    "minimatch": {
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
+      "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
+      "requires": {
+        "brace-expansion": "^1.1.7"
+      }
+    },
+    "minimist": {
+      "version": "1.2.8",
+      "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.8.tgz",
+      "integrity": "sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA==",
+      "dev": true
+    },
+    "mixpanel-browser": {
+      "version": "2.47.0",
+      "resolved": "https://registry.npmjs.org/mixpanel-browser/-/mixpanel-browser-2.47.0.tgz",
+      "integrity": "sha512-Ldrva0fRBEIFWmEibBQO1PulfpJVF3pf28Guk09lDirDaSQqqU/xs9zQLwN2rL5VwVtsP1aD3JaCgaa98EjojQ=="
+    },
+    "mlly": {
+      "version": "1.4.2",
+      "resolved": "https://registry.npmjs.org/mlly/-/mlly-1.4.2.tgz",
+      "integrity": "sha512-i/Ykufi2t1EZ6NaPLdfnZk2AX8cs0d+mTzVKuPfqPKPatxLApaBoxJQ9x1/uckXtrS/U5oisPMDkNs0yQTaBRg==",
+      "dev": true,
+      "requires": {
+        "acorn": "^8.10.0",
+        "pathe": "^1.1.1",
+        "pkg-types": "^1.0.3",
+        "ufo": "^1.3.0"
       }
     },
-    "node_modules/react-tabs": {
-      "version": "6.0.2",
-      "license": "MIT",
-      "dependencies": {
-        "clsx": "^2.0.0",
-        "prop-types": "^15.5.0"
-      },
-      "peerDependencies": {
-        "react": "^18.0.0"
+    "more-entropy": {
+      "version": "0.0.7",
+      "resolved": "https://registry.npmjs.org/more-entropy/-/more-entropy-0.0.7.tgz",
+      "integrity": "sha512-e0TxQtU1F6/ZA8WnEA2JLQwwDqBTtZFLJSW7rWgUsQou35wx1IOL0g2O7q7oGoMgIJto+jHMnNGHLfSiylHRrw==",
+      "requires": {
+        "iced-runtime": ">=0.0.1"
       }
     },
-    "node_modules/react-tooltip": {
-      "version": "5.19.0",
-      "license": "MIT",
-      "dependencies": {
-        "@floating-ui/dom": "^1.0.0",
-        "classnames": "^2.3.0"
-      },
-      "peerDependencies": {
-        "react": ">=16.14.0",
-        "react-dom": ">=16.14.0"
+    "ms": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
+      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w=="
+    },
+    "multicast-dns": {
+      "version": "7.2.5",
+      "resolved": "https://registry.npmjs.org/multicast-dns/-/multicast-dns-7.2.5.tgz",
+      "integrity": "sha512-2eznPJP8z2BFLX50tf0LuODrpINqP1RVIm/CObbTcBRITQgmC/TjcREF1NeTBzIcR5XO/ukWo+YHOjBbFwIupg==",
+      "dev": true,
+      "requires": {
+        "dns-packet": "^5.2.2",
+        "thunky": "^1.0.2"
       }
     },
-    "node_modules/readable-stream": {
-      "version": "3.6.2",
-      "license": "MIT",
-      "dependencies": {
-        "inherits": "^2.0.3",
-        "string_decoder": "^1.1.1",
-        "util-deprecate": "^1.0.1"
-      },
-      "engines": {
-        "node": ">= 6"
+    "nan": {
+      "version": "2.20.0",
+      "resolved": "https://registry.npmjs.org/nan/-/nan-2.20.0.tgz",
+      "integrity": "sha512-bk3gXBZDGILuuo/6sKtr0DQmSThYHLtNCdSdXk9YkxD/jK6X2vmCyyXBBxyqZ4XcnzTyYEAThfX3DCEnLf6igw=="
+    },
+    "nano-time": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/nano-time/-/nano-time-1.0.0.tgz",
+      "integrity": "sha512-flnngywOoQ0lLQOTRNexn2gGSNuM9bKj9RZAWSzhQ+UJYaAFG9bac4DW9VHjUAzrOaIcajHybCTHe/bkvozQqA==",
+      "requires": {
+        "big-integer": "^1.6.16"
       }
     },
-    "node_modules/readdirp": {
-      "version": "3.6.0",
+    "nanoid": {
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-4.0.2.tgz",
+      "integrity": "sha512-7ZtY5KTCNheRGfEFxnedV5zFiORN1+Y1N6zvPTnHQd8ENUvfaDBeuJDZb2bN/oXwXxu3qkTXDzy57W5vAmDTBw=="
+    },
+    "natural-compare": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz",
+      "integrity": "sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw==",
+      "dev": true
+    },
+    "natural-compare-lite": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/natural-compare-lite/-/natural-compare-lite-1.4.0.tgz",
+      "integrity": "sha512-Tj+HTDSJJKaZnfiuw+iaF9skdPpTo2GtEly5JHnWV/hfv2Qj/9RKsGISQtLh2ox3l5EAGw487hnBee0sIJ6v2g==",
+      "dev": true
+    },
+    "negotiator": {
+      "version": "0.6.3",
+      "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.3.tgz",
+      "integrity": "sha512-+EUsqGPLsM+j/zdChZjsnX51g4XrHFOIXwfnCVPGlQk/k5giakcKsuxCObBRu6DSm9opw/O6slWbJdghQM4bBg==",
+      "dev": true
+    },
+    "neo-async": {
+      "version": "2.6.2",
+      "resolved": "https://registry.npmjs.org/neo-async/-/neo-async-2.6.2.tgz",
+      "integrity": "sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==",
+      "dev": true
+    },
+    "no-case": {
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/no-case/-/no-case-3.0.4.tgz",
+      "integrity": "sha512-fgAN3jGAh+RoxUGZHTSOLJIqUc2wmoBwGR4tbpNAKmmovFoWq0OdRkb0VkldReO2a2iBT/OEulG9XSUc10r3zg==",
       "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "picomatch": "^2.2.1"
-      },
-      "engines": {
-        "node": ">=8.10.0"
+      "requires": {
+        "lower-case": "^2.0.2",
+        "tslib": "^2.0.3"
       }
     },
-    "node_modules/redux": {
-      "version": "4.2.1",
-      "license": "MIT",
+    "node-abort-controller": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/node-abort-controller/-/node-abort-controller-3.1.1.tgz",
+      "integrity": "sha512-AGK2yQKIjRuqnc6VkX2Xj5d+QW8xZ87pa1UK6yA6ouUyuxfHuMP6umE5QK7UmTeOAymo+Zx1Fxiuw9rVx8taHQ==",
+      "dev": true
+    },
+    "node-fetch": {
+      "version": "2.6.12",
+      "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.12.tgz",
+      "integrity": "sha512-C/fGU2E8ToujUivIO0H+tpQ6HWo4eEmchoPIoXtxCrVghxdKq+QOHqEZW7tuP3KlV3bC8FRMO5nMCC7Zm1VP6g==",
+      "requires": {
+        "whatwg-url": "^5.0.0"
+      },
       "dependencies": {
-        "@babel/runtime": "^7.9.2"
+        "tr46": {
+          "version": "0.0.3",
+          "resolved": "https://registry.npmjs.org/tr46/-/tr46-0.0.3.tgz",
+          "integrity": "sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw=="
+        },
+        "webidl-conversions": {
+          "version": "3.0.1",
+          "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-3.0.1.tgz",
+          "integrity": "sha512-2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ=="
+        },
+        "whatwg-url": {
+          "version": "5.0.0",
+          "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-5.0.0.tgz",
+          "integrity": "sha512-saE57nupxk6v3HY35+jzBwYa0rKSy0XR8JSxZPwgLr7ys0IBzhGviA1/TUGJLmSVqs8pb9AnvICXEuOHLprYTw==",
+          "requires": {
+            "tr46": "~0.0.3",
+            "webidl-conversions": "^3.0.0"
+          }
+        }
       }
     },
-    "node_modules/redux-persist": {
-      "version": "6.0.0",
-      "license": "MIT",
-      "peerDependencies": {
-        "redux": ">4.0.0"
+    "node-forge": {
+      "version": "1.3.1",
+      "resolved": "https://registry.npmjs.org/node-forge/-/node-forge-1.3.1.tgz",
+      "integrity": "sha512-dPEtOeMvF9VMcYV/1Wb8CPoVAXtp6MKMlcbAt4ddqmGqUJ6fQZFXkNZNkNlfevtNkGtaSoXf/vNNNSvgrdXwtA==",
+      "dev": true
+    },
+    "node-releases": {
+      "version": "2.0.13",
+      "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.13.tgz",
+      "integrity": "sha512-uYr7J37ae/ORWdZeQ1xxMJe3NtdmqMC/JZK+geofDrkLUApKRHPd18/TxtBOJ4A0/+uUIliorNrfYV6s1b02eQ=="
+    },
+    "normalize-path": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz",
+      "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==",
+      "dev": true
+    },
+    "npm-run-path": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-4.0.1.tgz",
+      "integrity": "sha512-S48WzZW777zhNIrn7gxOlISNAqi9ZC/uQFnRdbeIHhZhCA6UqpkOT8T1G7BvfdgP4Er8gF4sUbaS0i7QvIfCWw==",
+      "dev": true,
+      "requires": {
+        "path-key": "^3.0.0"
       }
     },
-    "node_modules/redux-state-sync": {
-      "version": "3.1.4",
-      "license": "ISC",
-      "dependencies": {
-        "broadcast-channel": "^3.1.0"
+    "nth-check": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/nth-check/-/nth-check-2.1.1.tgz",
+      "integrity": "sha512-lqjrjmaOoAnWfMmBPL+XNnynZh2+swxiX3WUE0s4yEHI6m+AwrK2UZOimIRl3X/4QctVqS8AiZjFqyOGrMXb/w==",
+      "dev": true,
+      "requires": {
+        "boolbase": "^1.0.0"
       }
     },
-    "node_modules/redux-state-sync/node_modules/broadcast-channel": {
-      "version": "3.7.0",
-      "license": "MIT",
-      "dependencies": {
-        "@babel/runtime": "^7.7.2",
-        "detect-node": "^2.1.0",
-        "js-sha3": "0.8.0",
-        "microseconds": "0.2.0",
-        "nano-time": "1.0.0",
-        "oblivious-set": "1.0.0",
-        "rimraf": "3.0.2",
-        "unload": "2.2.0"
+    "object-assign": {
+      "version": "4.1.1",
+      "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
+      "integrity": "sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg=="
+    },
+    "object-inspect": {
+      "version": "1.12.3",
+      "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.12.3.tgz",
+      "integrity": "sha512-geUvdk7c+eizMNUDkRpW1wJwgfOiOeHbxBR/hLXK1aT6zmVSO0jsQcs7fj6MGw89jC/cjGfLcNOrtMYtGqm81g==",
+      "dev": true
+    },
+    "object-is": {
+      "version": "1.1.5",
+      "resolved": "https://registry.npmjs.org/object-is/-/object-is-1.1.5.tgz",
+      "integrity": "sha512-3cyDsyHgtmi7I7DfSSI2LDp6SK2lwvtbg0p0R1e0RvTqF5ceGx+K2dfSjm1bKDMVCFEDAQvy+o8c6a7VujOddw==",
+      "dev": true,
+      "requires": {
+        "call-bind": "^1.0.2",
+        "define-properties": "^1.1.3"
       }
     },
-    "node_modules/redux-state-sync/node_modules/microseconds": {
-      "version": "0.2.0",
-      "license": "MIT"
+    "object-keys": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.1.1.tgz",
+      "integrity": "sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==",
+      "dev": true
     },
-    "node_modules/regenerator-runtime": {
-      "version": "0.13.11",
-      "license": "MIT"
+    "object-pairs": {
+      "version": "0.1.0",
+      "resolved": "https://registry.npmjs.org/object-pairs/-/object-pairs-0.1.0.tgz",
+      "integrity": "sha512-3ECr6K831I4xX/Mduxr9UC+HPOz/d6WKKYj9p4cmC8Lg8p7g8gitzsxNX5IWlSIgFWN/a4JgrJaoAMKn20oKwA==",
+      "dev": true
     },
-    "node_modules/regexp.prototype.flags": {
-      "version": "1.5.0",
+    "object-values": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/object-values/-/object-values-1.0.0.tgz",
+      "integrity": "sha512-+8hwcz/JnQ9EpLIXzN0Rs7DLsBpJNT/xYehtB/jU93tHYr5BFEO8E+JGQNOSqE7opVzz5cGksKFHt7uUJVLSjQ==",
+      "dev": true
+    },
+    "object.assign": {
+      "version": "4.1.4",
+      "resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.4.tgz",
+      "integrity": "sha512-1mxKf0e58bvyjSCtKYY4sRe9itRk3PJpquJOjeIkz885CczcI4IvJJDLPS72oowuSh+pBxUFROpX+TU++hxhZQ==",
       "dev": true,
-      "license": "MIT",
-      "dependencies": {
+      "requires": {
         "call-bind": "^1.0.2",
-        "define-properties": "^1.2.0",
-        "functions-have-names": "^1.2.3"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
+        "define-properties": "^1.1.4",
+        "has-symbols": "^1.0.3",
+        "object-keys": "^1.1.1"
       }
     },
-    "node_modules/relateurl": {
-      "version": "0.2.7",
+    "object.entries": {
+      "version": "1.1.6",
+      "resolved": "https://registry.npmjs.org/object.entries/-/object.entries-1.1.6.tgz",
+      "integrity": "sha512-leTPzo4Zvg3pmbQ3rDK69Rl8GQvIqMWubrkxONG9/ojtFE2rD9fjMKfSI5BxW3osRH1m6VdzmqK8oAY9aT4x5w==",
       "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">= 0.10"
+      "requires": {
+        "call-bind": "^1.0.2",
+        "define-properties": "^1.1.4",
+        "es-abstract": "^1.20.4"
       }
     },
-    "node_modules/remove-accents": {
-      "version": "0.4.2",
-      "license": "MIT"
+    "object.fromentries": {
+      "version": "2.0.6",
+      "resolved": "https://registry.npmjs.org/object.fromentries/-/object.fromentries-2.0.6.tgz",
+      "integrity": "sha512-VciD13dswC4j1Xt5394WR4MzmAQmlgN72phd/riNp9vtD7tp4QQWJ0R4wvclXcafgcYK8veHRed2W6XeGBvcfg==",
+      "dev": true,
+      "requires": {
+        "call-bind": "^1.0.2",
+        "define-properties": "^1.1.4",
+        "es-abstract": "^1.20.4"
+      }
     },
-    "node_modules/renderkid": {
-      "version": "3.0.0",
+    "object.groupby": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/object.groupby/-/object.groupby-1.0.0.tgz",
+      "integrity": "sha512-70MWG6NfRH9GnbZOikuhPPYzpUpof9iW2J9E4dW7FXTqPNb6rllE6u39SKwwiNh8lCwX3DDb5OgcKGiEBrTTyw==",
       "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "css-select": "^4.1.3",
-        "dom-converter": "^0.2.0",
-        "htmlparser2": "^6.1.0",
-        "lodash": "^4.17.21",
-        "strip-ansi": "^6.0.1"
+      "requires": {
+        "call-bind": "^1.0.2",
+        "define-properties": "^1.2.0",
+        "es-abstract": "^1.21.2",
+        "get-intrinsic": "^1.2.1"
       }
     },
-    "node_modules/require-directory": {
-      "version": "2.1.1",
-      "license": "MIT",
-      "engines": {
-        "node": ">=0.10.0"
+    "object.hasown": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/object.hasown/-/object.hasown-1.1.2.tgz",
+      "integrity": "sha512-B5UIT3J1W+WuWIU55h0mjlwaqxiE5vYENJXIXZ4VFe05pNYrkKuK0U/6aFcb0pKywYJh7IhfoqUfKVmrJJHZHw==",
+      "dev": true,
+      "requires": {
+        "define-properties": "^1.1.4",
+        "es-abstract": "^1.20.4"
       }
     },
-    "node_modules/require-from-string": {
-      "version": "2.0.2",
+    "object.values": {
+      "version": "1.1.6",
+      "resolved": "https://registry.npmjs.org/object.values/-/object.values-1.1.6.tgz",
+      "integrity": "sha512-FVVTkD1vENCsAcwNs9k6jea2uHC/X0+JcjG8YA60FN5CMaJmG95wT9jek/xX9nornqGRrBkKtzuAu2wuHpKqvw==",
       "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=0.10.0"
+      "requires": {
+        "call-bind": "^1.0.2",
+        "define-properties": "^1.1.4",
+        "es-abstract": "^1.20.4"
       }
     },
-    "node_modules/requires-port": {
+    "oblivious-set": {
       "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/oblivious-set/-/oblivious-set-1.0.0.tgz",
+      "integrity": "sha512-z+pI07qxo4c2CulUHCDf9lcqDlMSo72N/4rLUpRXf6fu+q8vjt8y0xS+Tlf8NTJDdTXHbdeO1n3MlbctwEoXZw=="
+    },
+    "obuf": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/obuf/-/obuf-1.1.2.tgz",
+      "integrity": "sha512-PX1wu0AmAdPqOL1mWhqmlOd8kOIZQwGZw6rh7uby9fTc5lhaOWFLX3I6R1hrF9k3zUY40e6igsLGkDXK92LJNg==",
+      "dev": true
+    },
+    "on-finished": {
+      "version": "2.4.1",
+      "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.4.1.tgz",
+      "integrity": "sha512-oVlzkg3ENAhCk2zdv7IJwd/QUD4z2RxRwpkcGY8psCVcCYZNq4wYnVWALHM+brtuJjePWiYF/ClmuDr8Ch5+kg==",
       "dev": true,
-      "license": "MIT"
+      "requires": {
+        "ee-first": "1.1.1"
+      }
     },
-    "node_modules/resolve": {
-      "version": "1.22.8",
+    "on-headers": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/on-headers/-/on-headers-1.0.2.tgz",
+      "integrity": "sha512-pZAE+FJLoyITytdqK0U5s+FIpjN0JP3OzFi/u8Rx+EV5/W+JTWGXG8xFzevE7AjBfDqHv/8vL8qQsIhHnqRkrA==",
+      "dev": true
+    },
+    "once": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
+      "integrity": "sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==",
+      "requires": {
+        "wrappy": "1"
+      }
+    },
+    "onetime": {
+      "version": "5.1.2",
+      "resolved": "https://registry.npmjs.org/onetime/-/onetime-5.1.2.tgz",
+      "integrity": "sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg==",
       "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "is-core-module": "^2.13.0",
-        "path-parse": "^1.0.7",
-        "supports-preserve-symlinks-flag": "^1.0.0"
-      },
-      "bin": {
-        "resolve": "bin/resolve"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
+      "requires": {
+        "mimic-fn": "^2.1.0"
       }
     },
-    "node_modules/resolve-from": {
-      "version": "4.0.0",
+    "open": {
+      "version": "8.4.2",
+      "resolved": "https://registry.npmjs.org/open/-/open-8.4.2.tgz",
+      "integrity": "sha512-7x81NCL719oNbsq/3mh+hVrAWmFuEYUqrq/Iw3kUzH8ReypT9QQ0BLoJS7/G9k6N81XjW4qHWtjWwe/9eLy1EQ==",
       "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=4"
+      "requires": {
+        "define-lazy-prop": "^2.0.0",
+        "is-docker": "^2.1.1",
+        "is-wsl": "^2.2.0"
+      }
+    },
+    "optionator": {
+      "version": "0.9.3",
+      "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.9.3.tgz",
+      "integrity": "sha512-JjCoypp+jKn1ttEFExxhetCKeJt9zhAgAve5FXHixTvFDW/5aEktX9bufBKLRRMdU7bNtpLfcGu94B3cdEJgjg==",
+      "dev": true,
+      "requires": {
+        "@aashutoshrathi/word-wrap": "^1.2.3",
+        "deep-is": "^0.1.3",
+        "fast-levenshtein": "^2.0.6",
+        "levn": "^0.4.1",
+        "prelude-ls": "^1.2.1",
+        "type-check": "^0.4.0"
       }
     },
-    "node_modules/restore-cursor": {
+    "p-limit": {
       "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz",
+      "integrity": "sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==",
       "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "onetime": "^5.1.0",
-        "signal-exit": "^3.0.2"
-      },
-      "engines": {
-        "node": ">=8"
+      "requires": {
+        "yocto-queue": "^0.1.0"
       }
     },
-    "node_modules/retry": {
-      "version": "0.13.1",
+    "p-locate": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-5.0.0.tgz",
+      "integrity": "sha512-LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw==",
       "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">= 4"
+      "requires": {
+        "p-limit": "^3.0.2"
       }
     },
-    "node_modules/reusify": {
-      "version": "1.0.4",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "iojs": ">=1.0.0",
-        "node": ">=0.10.0"
+    "p-map": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/p-map/-/p-map-2.1.0.tgz",
+      "integrity": "sha512-y3b8Kpd8OAN444hxfBbFfj1FY/RjtTd8tzYwhUqNYXx0fXx2iX4maP4Qr6qhIKbQXI02wTLAda4fYUbDagTUFw==",
+      "dev": true
+    },
+    "p-queue": {
+      "version": "7.3.4",
+      "resolved": "https://registry.npmjs.org/p-queue/-/p-queue-7.3.4.tgz",
+      "integrity": "sha512-esox8CWt0j9EZECFvkFl2WNPat8LN4t7WWeXq73D9ha0V96qPRufApZi4ZhPwXAln1uVVal429HVVKPa2X0yQg==",
+      "requires": {
+        "eventemitter3": "^4.0.7",
+        "p-timeout": "^5.0.2"
       }
     },
-    "node_modules/reverse-arguments": {
-      "version": "1.0.0",
+    "p-retry": {
+      "version": "4.6.2",
+      "resolved": "https://registry.npmjs.org/p-retry/-/p-retry-4.6.2.tgz",
+      "integrity": "sha512-312Id396EbJdvRONlngUx0NydfrIQ5lsYu0znKVUzVvArzEIt08V1qhtyESbGVd1FGX7UKtiFp5uwKZdM8wIuQ==",
       "dev": true,
-      "license": "MIT"
+      "requires": {
+        "@types/retry": "0.12.0",
+        "retry": "^0.13.1"
+      }
     },
-    "node_modules/rfdc": {
-      "version": "1.3.0",
-      "dev": true,
-      "license": "MIT"
+    "p-timeout": {
+      "version": "5.1.0",
+      "resolved": "https://registry.npmjs.org/p-timeout/-/p-timeout-5.1.0.tgz",
+      "integrity": "sha512-auFDyzzzGZZZdHz3BtET9VEz0SE/uMEAx7uWfGPucfzEwwe/xH0iVeZibQmANYE/hp9T2+UUZT5m+BKyrDp3Ew=="
     },
-    "node_modules/rgb-hex": {
-      "version": "3.0.0",
-      "license": "MIT",
-      "engines": {
-        "node": ">=8"
+    "param-case": {
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/param-case/-/param-case-3.0.4.tgz",
+      "integrity": "sha512-RXlj7zCYokReqWpOPH9oYivUzLYZ5vAPIfEmCTNViosC78F8F0H9y7T7gG2M39ymgutxF5gcFEsyZQSph9Bp3A==",
+      "dev": true,
+      "requires": {
+        "dot-case": "^3.0.4",
+        "tslib": "^2.0.3"
       }
     },
-    "node_modules/rimraf": {
-      "version": "3.0.2",
-      "license": "ISC",
-      "dependencies": {
-        "glob": "^7.1.3"
-      },
-      "bin": {
-        "rimraf": "bin.js"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/isaacs"
+    "parent-module": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/parent-module/-/parent-module-1.0.1.tgz",
+      "integrity": "sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g==",
+      "dev": true,
+      "requires": {
+        "callsites": "^3.0.0"
       }
     },
-    "node_modules/ripemd160": {
-      "version": "2.0.2",
-      "license": "MIT",
-      "dependencies": {
-        "hash-base": "^3.0.0",
-        "inherits": "^2.0.1"
+    "parse-asn1": {
+      "version": "5.1.6",
+      "resolved": "https://registry.npmjs.org/parse-asn1/-/parse-asn1-5.1.6.tgz",
+      "integrity": "sha512-RnZRo1EPU6JBnra2vGHj0yhp6ebyjBZpmUCLHWiFhxlzvBCCpAuZ7elsBp1PVAbQN0/04VD/19rfzlBSwLstMw==",
+      "requires": {
+        "asn1.js": "^5.2.0",
+        "browserify-aes": "^1.0.0",
+        "evp_bytestokey": "^1.0.0",
+        "pbkdf2": "^3.0.3",
+        "safe-buffer": "^5.1.1"
       }
     },
-    "node_modules/ripemd160-min": {
-      "version": "0.0.6",
-      "engines": {
-        "node": ">=8"
+    "parse-json": {
+      "version": "5.2.0",
+      "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-5.2.0.tgz",
+      "integrity": "sha512-ayCKvm/phCGxOkYRSCM82iDwct8/EonSEgCSxWxD7ve6jHggsFl4fZVQBPRNgQoKiuV/odhFrGzQXZwbifC8Rg==",
+      "dev": true,
+      "requires": {
+        "@babel/code-frame": "^7.0.0",
+        "error-ex": "^1.3.1",
+        "json-parse-even-better-errors": "^2.3.0",
+        "lines-and-columns": "^1.1.6"
       }
     },
-    "node_modules/rollup": {
-      "version": "4.18.0",
+    "parse-ms": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/parse-ms/-/parse-ms-4.0.0.tgz",
+      "integrity": "sha512-TXfryirbmq34y8QBwgqCVLi+8oA3oWx2eAnSn62ITyEhEYaWRlVZ2DvMM9eZbMs/RfxPu/PK/aBLyGj4IrqMHw==",
+      "dev": true
+    },
+    "parse5": {
+      "version": "7.1.2",
+      "resolved": "https://registry.npmjs.org/parse5/-/parse5-7.1.2.tgz",
+      "integrity": "sha512-Czj1WaSVpaoj0wbhMzLmWD69anp2WH7FXMB9n1Sy8/ZFF9jolSQVMu1Ij5WIyGmcBmhk7EOndpO4mIpihVqAXw==",
       "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "@types/estree": "1.0.5"
-      },
-      "bin": {
-        "rollup": "dist/bin/rollup"
-      },
-      "engines": {
-        "node": ">=18.0.0",
-        "npm": ">=8.0.0"
-      },
-      "optionalDependencies": {
-        "@rollup/rollup-android-arm-eabi": "4.18.0",
-        "@rollup/rollup-android-arm64": "4.18.0",
-        "@rollup/rollup-darwin-arm64": "4.18.0",
-        "@rollup/rollup-darwin-x64": "4.18.0",
-        "@rollup/rollup-linux-arm-gnueabihf": "4.18.0",
-        "@rollup/rollup-linux-arm-musleabihf": "4.18.0",
-        "@rollup/rollup-linux-arm64-gnu": "4.18.0",
-        "@rollup/rollup-linux-arm64-musl": "4.18.0",
-        "@rollup/rollup-linux-powerpc64le-gnu": "4.18.0",
-        "@rollup/rollup-linux-riscv64-gnu": "4.18.0",
-        "@rollup/rollup-linux-s390x-gnu": "4.18.0",
-        "@rollup/rollup-linux-x64-gnu": "4.18.0",
-        "@rollup/rollup-linux-x64-musl": "4.18.0",
-        "@rollup/rollup-win32-arm64-msvc": "4.18.0",
-        "@rollup/rollup-win32-ia32-msvc": "4.18.0",
-        "@rollup/rollup-win32-x64-msvc": "4.18.0",
-        "fsevents": "~2.3.2"
+      "requires": {
+        "entities": "^4.4.0"
       }
     },
-    "node_modules/run-parallel": {
-      "version": "1.2.0",
+    "parseurl": {
+      "version": "1.3.3",
+      "resolved": "https://registry.npmjs.org/parseurl/-/parseurl-1.3.3.tgz",
+      "integrity": "sha512-CiyeOxFT/JZyN5m0z9PfXw4SCBJ6Sygz1Dpl0wqjlhDEGGBP1GnsUVEL0p63hoG1fcj3fHynXi9NYO4nWOL+qQ==",
+      "dev": true
+    },
+    "pascal-case": {
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/pascal-case/-/pascal-case-3.1.2.tgz",
+      "integrity": "sha512-uWlGT3YSnK9x3BQJaOdcZwrnV6hPpd8jFH1/ucpiLRPh/2zCVJKS19E4GvYHvaCcACn3foXZ0cLB9Wrx1KGe5g==",
       "dev": true,
-      "funding": [
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/feross"
-        },
-        {
-          "type": "patreon",
-          "url": "https://www.patreon.com/feross"
-        },
-        {
-          "type": "consulting",
-          "url": "https://feross.org/support"
-        }
-      ],
-      "license": "MIT",
-      "dependencies": {
-        "queue-microtask": "^1.2.2"
+      "requires": {
+        "no-case": "^3.0.4",
+        "tslib": "^2.0.3"
       }
     },
-    "node_modules/rxjs": {
-      "version": "6.6.7",
-      "license": "Apache-2.0",
-      "dependencies": {
-        "tslib": "^1.9.0"
+    "path": {
+      "version": "0.12.7",
+      "resolved": "https://registry.npmjs.org/path/-/path-0.12.7.tgz",
+      "integrity": "sha512-aXXC6s+1w7otVF9UletFkFcDsJeO7lSZBPUQhtb5O0xJe8LtYhj/GxldoL09bBj9+ZmE2hNoHqQSFMN5fikh4Q==",
+      "requires": {
+        "process": "^0.11.1",
+        "util": "^0.10.3"
       },
-      "engines": {
-        "npm": ">=2.0.0"
+      "dependencies": {
+        "inherits": {
+          "version": "2.0.3",
+          "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
+          "integrity": "sha512-x00IRNXNy63jwGkJmzPigoySHbaqpNuzKbBOmzK+g2OdZpQ9w+sxCN+VSB3ja7IAge2OP2qpfxTjeNcyjmW1uw=="
+        },
+        "util": {
+          "version": "0.10.4",
+          "resolved": "https://registry.npmjs.org/util/-/util-0.10.4.tgz",
+          "integrity": "sha512-0Pm9hTQ3se5ll1XihRic3FDIku70C+iHUdT/W926rSgHV5QgXsYbKZN8MSC3tJtSkhuROzvsQjAaFENRXr+19A==",
+          "requires": {
+            "inherits": "2.0.3"
+          }
+        }
       }
     },
-    "node_modules/rxjs/node_modules/tslib": {
-      "version": "1.14.1",
-      "license": "0BSD"
+    "path-exists": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz",
+      "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==",
+      "dev": true
     },
-    "node_modules/safe-array-concat": {
-      "version": "1.0.0",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "call-bind": "^1.0.2",
-        "get-intrinsic": "^1.2.0",
-        "has-symbols": "^1.0.3",
-        "isarray": "^2.0.5"
-      },
-      "engines": {
-        "node": ">=0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
+    "path-is-absolute": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
+      "integrity": "sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg=="
     },
-    "node_modules/safe-buffer": {
-      "version": "5.2.1",
-      "funding": [
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/feross"
-        },
-        {
-          "type": "patreon",
-          "url": "https://www.patreon.com/feross"
-        },
-        {
-          "type": "consulting",
-          "url": "https://feross.org/support"
-        }
-      ],
-      "license": "MIT"
+    "path-is-inside": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/path-is-inside/-/path-is-inside-1.0.2.tgz",
+      "integrity": "sha512-DUWJr3+ULp4zXmol/SZkFf3JGsS9/SIv+Y3Rt93/UjPpDpklB5f1er4O3POIbUuUJ3FXgqte2Q7SrU6zAqwk8w==",
+      "dev": true
     },
-    "node_modules/safe-regex-test": {
-      "version": "1.0.0",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "call-bind": "^1.0.2",
-        "get-intrinsic": "^1.1.3",
-        "is-regex": "^1.1.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
+    "path-key": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz",
+      "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==",
+      "dev": true
+    },
+    "path-parse": {
+      "version": "1.0.7",
+      "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.7.tgz",
+      "integrity": "sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==",
+      "dev": true
+    },
+    "path-to-regexp": {
+      "version": "0.1.7",
+      "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.7.tgz",
+      "integrity": "sha512-5DFkuoqlv1uYQKxy8omFBeJPQcdoE07Kv2sferDCrAq1ohOU+MSDswDIbnx3YAM60qIOnYa53wBhXW0EbMonrQ==",
+      "dev": true
+    },
+    "path-type": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/path-type/-/path-type-4.0.0.tgz",
+      "integrity": "sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==",
+      "dev": true
+    },
+    "pathe": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/pathe/-/pathe-1.1.1.tgz",
+      "integrity": "sha512-d+RQGp0MAYTIaDBIMmOfMwz3E+LOZnxx1HZd5R18mmCZY0QBlK0LDZfPc8FW8Ed2DlvsuE6PRjroDY+wg4+j/Q==",
+      "dev": true
+    },
+    "pathval": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/pathval/-/pathval-1.1.1.tgz",
+      "integrity": "sha512-Dp6zGqpTdETdR63lehJYPeIOqpiNBNtc7BpWSLrOje7UaIsE5aY92r/AunQA7rsXvet3lrJ3JnZX29UPTKXyKQ==",
+      "dev": true
+    },
+    "pbkdf2": {
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/pbkdf2/-/pbkdf2-3.1.2.tgz",
+      "integrity": "sha512-iuh7L6jA7JEGu2WxDwtQP1ddOpaJNC4KlDEFfdQajSGgGPNi4OyDc2R7QnbY2bR9QjBVGwgvTdNJZoE7RaxUMA==",
+      "requires": {
+        "create-hash": "^1.1.2",
+        "create-hmac": "^1.1.4",
+        "ripemd160": "^2.0.1",
+        "safe-buffer": "^5.0.1",
+        "sha.js": "^2.4.8"
       }
     },
-    "node_modules/safer-buffer": {
-      "version": "2.1.2",
-      "license": "MIT"
+    "picocolors": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.0.1.tgz",
+      "integrity": "sha512-anP1Z8qwhkbmu7MFP5iTt+wQKXgwzf7zTyGlcdzabySa9vd0Xt392U0rVmz9poOaBj0uHJKyyo9/upk0HrEQew=="
+    },
+    "picomatch": {
+      "version": "2.3.1",
+      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz",
+      "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA=="
+    },
+    "pidtree": {
+      "version": "0.6.0",
+      "resolved": "https://registry.npmjs.org/pidtree/-/pidtree-0.6.0.tgz",
+      "integrity": "sha512-eG2dWTVw5bzqGRztnHExczNxt5VGsE6OwTeCG3fdUf9KBsZzO3R5OIIIzWR+iZA0NtZ+RDVdaoE2dK1cn6jH4g==",
+      "dev": true
+    },
+    "pify": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/pify/-/pify-4.0.1.tgz",
+      "integrity": "sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g==",
+      "dev": true
+    },
+    "pinkie": {
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/pinkie/-/pinkie-2.0.4.tgz",
+      "integrity": "sha512-MnUuEycAemtSaeFSjXKW/aroV7akBbY+Sv+RkyqFjgAe73F+MR0TBWKBRDkmfWq/HiFmdavfZ1G7h4SPZXaCSg==",
+      "dev": true
+    },
+    "pinkie-promise": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/pinkie-promise/-/pinkie-promise-2.0.1.tgz",
+      "integrity": "sha512-0Gni6D4UcLTbv9c57DfxDGdr41XfgUjqWZu492f0cIGr16zDU06BWP/RAEvOuo7CQ0CNjHaLlM59YJJFm3NWlw==",
+      "dev": true,
+      "requires": {
+        "pinkie": "^2.0.0"
+      }
     },
-    "node_modules/scheduler": {
-      "version": "0.23.0",
-      "license": "MIT",
-      "dependencies": {
-        "loose-envify": "^1.1.0"
+    "pkg-types": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/pkg-types/-/pkg-types-1.0.3.tgz",
+      "integrity": "sha512-nN7pYi0AQqJnoLPC9eHFQ8AcyaixBUOwvqc5TDnIKCMEE6I0y8P7OKA7fPexsXGCGxQDl/cmrLAp26LhcwxZ4A==",
+      "dev": true,
+      "requires": {
+        "jsonc-parser": "^3.2.0",
+        "mlly": "^1.2.0",
+        "pathe": "^1.1.0"
       }
     },
-    "node_modules/schema-inspector": {
-      "version": "2.1.0",
-      "license": "MIT",
+    "playwright": {
+      "version": "1.45.2",
+      "resolved": "https://registry.npmjs.org/playwright/-/playwright-1.45.2.tgz",
+      "integrity": "sha512-ReywF2t/0teRvNBpfIgh5e4wnrI/8Su8ssdo5XsQKpjxJj+jspm00jSoz9BTg91TT0c9HRjXO7LBNVrgYj9X0g==",
+      "requires": {
+        "fsevents": "2.3.2",
+        "playwright-core": "1.45.2"
+      },
       "dependencies": {
-        "async": "~2.6.3"
+        "fsevents": {
+          "version": "2.3.2",
+          "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.2.tgz",
+          "integrity": "sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==",
+          "optional": true
+        }
       }
     },
-    "node_modules/schema-utils": {
-      "version": "3.3.0",
+    "playwright-core": {
+      "version": "1.45.2",
+      "resolved": "https://registry.npmjs.org/playwright-core/-/playwright-core-1.45.2.tgz",
+      "integrity": "sha512-ha175tAWb0dTK0X4orvBIqi3jGEt701SMxMhyujxNrgd8K0Uy5wMSwwcQHtyB4om7INUkfndx02XnQ2p6dvLDw=="
+    },
+    "postcss": {
+      "version": "8.4.39",
+      "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.39.tgz",
+      "integrity": "sha512-0vzE+lAiG7hZl1/9I8yzKLx3aR9Xbof3fBHKunvMfOCYAtMhrsnccJY2iTURb9EZd5+pLuiNV9/c/GZJOHsgIw==",
       "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "@types/json-schema": "^7.0.8",
-        "ajv": "^6.12.5",
-        "ajv-keywords": "^3.5.2"
-      },
-      "engines": {
-        "node": ">= 10.13.0"
+      "requires": {
+        "nanoid": "^3.3.7",
+        "picocolors": "^1.0.1",
+        "source-map-js": "^1.2.0"
       },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/webpack"
-      }
-    },
-    "node_modules/secp256k1": {
-      "version": "3.8.0",
-      "resolved": "https://registry.npmjs.org/secp256k1/-/secp256k1-3.8.0.tgz",
-      "integrity": "sha512-k5ke5avRZbtl9Tqx/SA7CbY3NF6Ro+Sj9cZxezFzuBlLDmyqPiL8hJJ+EmzD8Ig4LUDByHJ3/iPOVoRixs/hmw==",
-      "hasInstallScript": true,
       "dependencies": {
-        "bindings": "^1.5.0",
-        "bip66": "^1.1.5",
-        "bn.js": "^4.11.8",
-        "create-hash": "^1.2.0",
-        "drbg.js": "^1.0.1",
-        "elliptic": "^6.5.2",
-        "nan": "^2.14.0",
-        "safe-buffer": "^5.1.2"
-      },
-      "engines": {
-        "node": ">=4.0.0"
+        "nanoid": {
+          "version": "3.3.7",
+          "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.7.tgz",
+          "integrity": "sha512-eSRppjcPIatRIMC1U6UngP8XFcz8MQWGQdt1MTBQ7NaAmvXDfvNxbvWV3x2y6CdEUciCSsDHDQZbhYaB8QEo2g==",
+          "dev": true
+        }
       }
     },
-    "node_modules/secp256k1/node_modules/bn.js": {
-      "version": "4.12.0",
-      "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.0.tgz",
-      "integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA=="
-    },
-    "node_modules/select-hose": {
-      "version": "2.0.0",
+    "postcss-modules-extract-imports": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/postcss-modules-extract-imports/-/postcss-modules-extract-imports-3.0.0.tgz",
+      "integrity": "sha512-bdHleFnP3kZ4NYDhuGlVK+CMrQ/pqUm8bx/oGL93K6gVwiclvX5x0n76fYMKuIGKzlABOy13zsvqjb0f92TEXw==",
       "dev": true,
-      "license": "MIT"
+      "requires": {}
     },
-    "node_modules/selfsigned": {
-      "version": "2.1.1",
+    "postcss-modules-local-by-default": {
+      "version": "4.0.3",
+      "resolved": "https://registry.npmjs.org/postcss-modules-local-by-default/-/postcss-modules-local-by-default-4.0.3.tgz",
+      "integrity": "sha512-2/u2zraspoACtrbFRnTijMiQtb4GW4BvatjaG/bCjYQo8kLTdevCUlwuBHx2sCnSyrI3x3qj4ZK1j5LQBgzmwA==",
       "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "node-forge": "^1"
-      },
-      "engines": {
-        "node": ">=10"
+      "requires": {
+        "icss-utils": "^5.0.0",
+        "postcss-selector-parser": "^6.0.2",
+        "postcss-value-parser": "^4.1.0"
       }
     },
-    "node_modules/semver": {
-      "version": "6.3.1",
-      "license": "ISC",
-      "bin": {
-        "semver": "bin/semver.js"
+    "postcss-modules-scope": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/postcss-modules-scope/-/postcss-modules-scope-3.0.0.tgz",
+      "integrity": "sha512-hncihwFA2yPath8oZ15PZqvWGkWf+XUfQgUGamS4LqoP1anQLOsOJw0vr7J7IwLpoY9fatA2qiGUGmuZL0Iqlg==",
+      "dev": true,
+      "requires": {
+        "postcss-selector-parser": "^6.0.4"
       }
     },
-    "node_modules/send": {
-      "version": "0.18.0",
+    "postcss-modules-values": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/postcss-modules-values/-/postcss-modules-values-4.0.0.tgz",
+      "integrity": "sha512-RDxHkAiEGI78gS2ofyvCsu7iycRv7oqw5xMWn9iMoR0N/7mf9D50ecQqUo5BZ9Zh2vH4bCUR/ktCqbB9m8vJjQ==",
       "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "debug": "2.6.9",
-        "depd": "2.0.0",
-        "destroy": "1.2.0",
-        "encodeurl": "~1.0.2",
-        "escape-html": "~1.0.3",
-        "etag": "~1.8.1",
-        "fresh": "0.5.2",
-        "http-errors": "2.0.0",
-        "mime": "1.6.0",
-        "ms": "2.1.3",
-        "on-finished": "2.4.1",
-        "range-parser": "~1.2.1",
-        "statuses": "2.0.1"
-      },
-      "engines": {
-        "node": ">= 0.8.0"
+      "requires": {
+        "icss-utils": "^5.0.0"
       }
     },
-    "node_modules/send/node_modules/debug": {
-      "version": "2.6.9",
+    "postcss-selector-parser": {
+      "version": "6.0.13",
+      "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.0.13.tgz",
+      "integrity": "sha512-EaV1Gl4mUEV4ddhDnv/xtj7sxwrwxdetHdWUGnT4VJQf+4d05v6lHYZr8N573k5Z0BViss7BDhfWtKS3+sfAqQ==",
       "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "ms": "2.0.0"
+      "requires": {
+        "cssesc": "^3.0.0",
+        "util-deprecate": "^1.0.2"
       }
     },
-    "node_modules/send/node_modules/debug/node_modules/ms": {
-      "version": "2.0.0",
-      "dev": true,
-      "license": "MIT"
+    "postcss-value-parser": {
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.2.0.tgz",
+      "integrity": "sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ=="
     },
-    "node_modules/send/node_modules/ms": {
-      "version": "2.1.3",
-      "dev": true,
-      "license": "MIT"
+    "prelude-ls": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.2.1.tgz",
+      "integrity": "sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==",
+      "dev": true
     },
-    "node_modules/serialize-javascript": {
-      "version": "6.0.1",
-      "dev": true,
-      "license": "BSD-3-Clause",
-      "dependencies": {
-        "randombytes": "^2.1.0"
-      }
+    "prettier": {
+      "version": "2.8.8",
+      "resolved": "https://registry.npmjs.org/prettier/-/prettier-2.8.8.tgz",
+      "integrity": "sha512-tdN8qQGvNjw4CHbY+XXk0JgCXn9QiF21a55rBe5LJAU+kDyC4WQn4+awm2Xfk2lQMk5fKup9XgzTZtGkjBdP9Q==",
+      "dev": true
     },
-    "node_modules/serve-index": {
-      "version": "1.9.1",
+    "prettier-linter-helpers": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/prettier-linter-helpers/-/prettier-linter-helpers-1.0.0.tgz",
+      "integrity": "sha512-GbK2cP9nraSSUF9N2XwUwqfzlAFlMNYYl+ShE/V+H8a9uNl/oUqB1w2EL54Jh0OlyRSd8RfWYJ3coVS4TROP2w==",
       "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "accepts": "~1.3.4",
-        "batch": "0.6.1",
-        "debug": "2.6.9",
-        "escape-html": "~1.0.3",
-        "http-errors": "~1.6.2",
-        "mime-types": "~2.1.17",
-        "parseurl": "~1.3.2"
-      },
-      "engines": {
-        "node": ">= 0.8.0"
+      "requires": {
+        "fast-diff": "^1.1.2"
       }
     },
-    "node_modules/serve-index/node_modules/debug": {
-      "version": "2.6.9",
+    "prettier-plugin-organize-imports": {
+      "version": "3.2.3",
+      "resolved": "https://registry.npmjs.org/prettier-plugin-organize-imports/-/prettier-plugin-organize-imports-3.2.3.tgz",
+      "integrity": "sha512-KFvk8C/zGyvUaE3RvxN2MhCLwzV6OBbFSkwZ2OamCrs9ZY4i5L77jQ/w4UmUr+lqX8qbaqVq6bZZkApn+IgJSg==",
       "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "ms": "2.0.0"
-      }
+      "requires": {}
     },
-    "node_modules/serve-index/node_modules/depd": {
-      "version": "1.1.2",
+    "pretty-error": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/pretty-error/-/pretty-error-4.0.0.tgz",
+      "integrity": "sha512-AoJ5YMAcXKYxKhuJGdcvse+Voc6v1RgnsR3nWcYU7q4t6z0Q6T86sv5Zq8VIRbOWWFpvdGE83LtdSMNd+6Y0xw==",
       "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">= 0.6"
+      "requires": {
+        "lodash": "^4.17.20",
+        "renderkid": "^3.0.0"
       }
     },
-    "node_modules/serve-index/node_modules/http-errors": {
-      "version": "1.6.3",
+    "pretty-ms": {
+      "version": "9.0.0",
+      "resolved": "https://registry.npmjs.org/pretty-ms/-/pretty-ms-9.0.0.tgz",
+      "integrity": "sha512-E9e9HJ9R9NasGOgPaPE8VMeiPKAyWR5jcFpNnwIejslIhWqdqOrb2wShBsncMPUb+BcCd2OPYfh7p2W6oemTng==",
       "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "depd": "~1.1.2",
-        "inherits": "2.0.3",
-        "setprototypeof": "1.1.0",
-        "statuses": ">= 1.4.0 < 2"
-      },
-      "engines": {
-        "node": ">= 0.6"
+      "requires": {
+        "parse-ms": "^4.0.0"
       }
     },
-    "node_modules/serve-index/node_modules/inherits": {
-      "version": "2.0.3",
-      "dev": true,
-      "license": "ISC"
+    "process": {
+      "version": "0.11.10",
+      "resolved": "https://registry.npmjs.org/process/-/process-0.11.10.tgz",
+      "integrity": "sha512-cdGef/drWFoydD1JsMzuFf8100nZl+GT+yacc2bEced5f9Rjk4z+WtFUTBu9PhOi9j/jfmBPu0mMEY4wIdAF8A=="
     },
-    "node_modules/serve-index/node_modules/ms": {
-      "version": "2.0.0",
-      "dev": true,
-      "license": "MIT"
+    "process-nextick-args": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.1.tgz",
+      "integrity": "sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag==",
+      "dev": true
     },
-    "node_modules/serve-index/node_modules/setprototypeof": {
-      "version": "1.1.0",
-      "dev": true,
-      "license": "ISC"
+    "progress": {
+      "version": "1.1.8",
+      "resolved": "https://registry.npmjs.org/progress/-/progress-1.1.8.tgz",
+      "integrity": "sha512-UdA8mJ4weIkUBO224tIarHzuHs4HuYiJvsuGT7j/SPQiUJVjYvNDBIPa0hAorduOfjGohB/qHWRa/lrrWX/mXw=="
     },
-    "node_modules/serve-index/node_modules/statuses": {
-      "version": "1.5.0",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">= 0.6"
+    "prop-types": {
+      "version": "15.8.1",
+      "resolved": "https://registry.npmjs.org/prop-types/-/prop-types-15.8.1.tgz",
+      "integrity": "sha512-oj87CgZICdulUohogVAR7AjlC0327U4el4L6eAvOqCeudMDVU0NThNaV+b9Df4dXgSP1gXMTnPdhfe/2qDH5cg==",
+      "requires": {
+        "loose-envify": "^1.4.0",
+        "object-assign": "^4.1.1",
+        "react-is": "^16.13.1"
+      },
+      "dependencies": {
+        "react-is": {
+          "version": "16.13.1",
+          "resolved": "https://registry.npmjs.org/react-is/-/react-is-16.13.1.tgz",
+          "integrity": "sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ=="
+        }
       }
     },
-    "node_modules/serve-static": {
-      "version": "1.15.0",
+    "proxy-addr": {
+      "version": "2.0.7",
+      "resolved": "https://registry.npmjs.org/proxy-addr/-/proxy-addr-2.0.7.tgz",
+      "integrity": "sha512-llQsMLSUDUPT44jdrU/O37qlnifitDP+ZwrmmZcoSKyLKvtZxpyV0n2/bD/N4tBAAZ/gJEdZU7KMraoK1+XYAg==",
       "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "encodeurl": "~1.0.2",
-        "escape-html": "~1.0.3",
-        "parseurl": "~1.3.3",
-        "send": "0.18.0"
+      "requires": {
+        "forwarded": "0.2.0",
+        "ipaddr.js": "1.9.1"
       },
-      "engines": {
-        "node": ">= 0.8.0"
+      "dependencies": {
+        "ipaddr.js": {
+          "version": "1.9.1",
+          "resolved": "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.9.1.tgz",
+          "integrity": "sha512-0KI/607xoxSToH7GjN1FfSbLoU0+btTicjsQSWQlh/hZykN8KpmMf7uYwPW3R+akZ6R/w18ZlXSHBYXiYUPO3g==",
+          "dev": true
+        }
       }
     },
-    "node_modules/set-function-length": {
-      "version": "1.2.2",
-      "license": "MIT",
-      "dependencies": {
-        "define-data-property": "^1.1.4",
-        "es-errors": "^1.3.0",
-        "function-bind": "^1.1.2",
-        "get-intrinsic": "^1.2.4",
-        "gopd": "^1.0.1",
-        "has-property-descriptors": "^1.0.2"
+    "proxy-from-env": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/proxy-from-env/-/proxy-from-env-1.1.0.tgz",
+      "integrity": "sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg=="
+    },
+    "public-encrypt": {
+      "version": "4.0.3",
+      "resolved": "https://registry.npmjs.org/public-encrypt/-/public-encrypt-4.0.3.tgz",
+      "integrity": "sha512-zVpa8oKZSz5bTMTFClc1fQOnyyEzpl5ozpi1B5YcvBrdohMjH2rfsBtyXcuNuwjsDIXmBYlF2N5FlJYhR29t8Q==",
+      "requires": {
+        "bn.js": "^4.1.0",
+        "browserify-rsa": "^4.0.0",
+        "create-hash": "^1.1.0",
+        "parse-asn1": "^5.0.0",
+        "randombytes": "^2.0.1",
+        "safe-buffer": "^5.1.2"
       },
-      "engines": {
-        "node": ">= 0.4"
+      "dependencies": {
+        "bn.js": {
+          "version": "4.12.0",
+          "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.0.tgz",
+          "integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA=="
+        }
       }
     },
-    "node_modules/setprototypeof": {
-      "version": "1.2.0",
-      "dev": true,
-      "license": "ISC"
+    "punycode": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.3.0.tgz",
+      "integrity": "sha512-rRV+zQD8tVFys26lAGR9WUuS4iUAngJScM+ZRSKtvl5tKeZ2t5bvdNFdNHBW9FWR4guGHlgmsZ1G7BSm2wTbuA==",
+      "dev": true
+    },
+    "qr-code-styling": {
+      "version": "1.5.0",
+      "resolved": "https://registry.npmjs.org/qr-code-styling/-/qr-code-styling-1.5.0.tgz",
+      "integrity": "sha512-7C+1cZGsZWH0BIRtv24faKZJwkxdYlynXktP9dDxKNSik2bqaUZck3B3MpQod/wqm9i3l4q7QsPGkRGKvcuqZw==",
+      "requires": {
+        "qrcode-generator": "^1.4.3"
+      }
+    },
+    "qr.js": {
+      "version": "0.0.0",
+      "resolved": "https://registry.npmjs.org/qr.js/-/qr.js-0.0.0.tgz",
+      "integrity": "sha512-c4iYnWb+k2E+vYpRimHqSu575b1/wKl4XFeJGpFmrJQz5I88v9aY2czh7s0w36srfCM1sXgC/xpoJz5dJfq+OQ=="
+    },
+    "qrcode-generator": {
+      "version": "1.4.4",
+      "resolved": "https://registry.npmjs.org/qrcode-generator/-/qrcode-generator-1.4.4.tgz",
+      "integrity": "sha512-HM7yY8O2ilqhmULxGMpcHSF1EhJJ9yBj8gvDEuZ6M+KGJ0YY2hKpnXvRD+hZPLrDVck3ExIGhmPtSdcjC+guuw=="
     },
-    "node_modules/sha.js": {
-      "version": "2.4.11",
-      "license": "(MIT AND BSD-3-Clause)",
-      "dependencies": {
-        "inherits": "^2.0.1",
-        "safe-buffer": "^5.0.1"
-      },
-      "bin": {
-        "sha.js": "bin.js"
+    "queue-microtask": {
+      "version": "1.2.3",
+      "resolved": "https://registry.npmjs.org/queue-microtask/-/queue-microtask-1.2.3.tgz",
+      "integrity": "sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A==",
+      "dev": true
+    },
+    "randombytes": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/randombytes/-/randombytes-2.1.0.tgz",
+      "integrity": "sha512-vYl3iOX+4CKUWuxGi9Ukhie6fsqXqS9FE2Zaic4tNFD2N2QQaXOMFbuKK4QmDHC0JO6B1Zp41J0LpT0oR68amQ==",
+      "requires": {
+        "safe-buffer": "^5.1.0"
       }
     },
-    "node_modules/sha256-uint8array": {
-      "version": "0.10.7",
-      "license": "MIT"
+    "randomfill": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/randomfill/-/randomfill-1.0.4.tgz",
+      "integrity": "sha512-87lcbR8+MhcWcUiQ+9e+Rwx8MyR2P7qnt15ynUlbm3TU/fjbgz4GsvfSUDTemtCCtVCqb4ZcEFlyPNTh9bBTLw==",
+      "requires": {
+        "randombytes": "^2.0.5",
+        "safe-buffer": "^5.1.0"
+      }
     },
-    "node_modules/shallowequal": {
-      "version": "1.1.0",
-      "license": "MIT"
+    "range-parser": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/range-parser/-/range-parser-1.2.1.tgz",
+      "integrity": "sha512-Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg==",
+      "dev": true
     },
-    "node_modules/shebang-command": {
-      "version": "2.0.0",
+    "raw-body": {
+      "version": "2.5.1",
+      "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.5.1.tgz",
+      "integrity": "sha512-qqJBtEyVgS0ZmPGdCFPWJ3FreoqvG4MVQln/kCgF7Olq95IbOp0/BWyMwbdtn4VTvkM8Y7khCQ2Xgk/tcrCXig==",
       "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "shebang-regex": "^3.0.0"
+      "requires": {
+        "bytes": "3.1.2",
+        "http-errors": "2.0.0",
+        "iconv-lite": "0.4.24",
+        "unpipe": "1.0.0"
       },
-      "engines": {
-        "node": ">=8"
+      "dependencies": {
+        "bytes": {
+          "version": "3.1.2",
+          "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.1.2.tgz",
+          "integrity": "sha512-/Nf7TyzTx6S3yRJObOAV7956r8cr2+Oj8AC5dt8wSP3BQAoeX58NoHyCU8P8zGkNXStjTSi6fzO6F0pBdcYbEg==",
+          "dev": true
+        },
+        "iconv-lite": {
+          "version": "0.4.24",
+          "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz",
+          "integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==",
+          "dev": true,
+          "requires": {
+            "safer-buffer": ">= 2.1.2 < 3"
+          }
+        }
       }
     },
-    "node_modules/shebang-regex": {
-      "version": "3.0.0",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=8"
+    "rc-dialog": {
+      "version": "9.1.0",
+      "resolved": "https://registry.npmjs.org/rc-dialog/-/rc-dialog-9.1.0.tgz",
+      "integrity": "sha512-5ry+JABAWEbaKyYsmITtrJbZbJys8CtMyzV8Xn4LYuXMeUx5XVHNyJRoqLFE4AzBuXXzOWeaC49cg+XkxK6kHA==",
+      "requires": {
+        "@babel/runtime": "^7.10.1",
+        "@rc-component/portal": "^1.0.0-8",
+        "classnames": "^2.2.6",
+        "rc-motion": "^2.3.0",
+        "rc-util": "^5.21.0"
       }
     },
-    "node_modules/shell-quote": {
-      "version": "1.8.1",
-      "dev": true,
-      "license": "MIT",
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
+    "rc-image": {
+      "version": "5.18.1",
+      "resolved": "https://registry.npmjs.org/rc-image/-/rc-image-5.18.1.tgz",
+      "integrity": "sha512-xdr5zHpSJ6sGdV5oIkHWbttc21LlGKZZjWXVXxSS0sNmqSn97WzOKQBNrTA85UP7oBPPThZAGGGNmGnTkx2qYQ==",
+      "requires": {
+        "@babel/runtime": "^7.11.2",
+        "@rc-component/portal": "^1.0.2",
+        "classnames": "^2.2.6",
+        "rc-dialog": "~9.1.0",
+        "rc-motion": "^2.6.2",
+        "rc-util": "^5.0.6"
       }
     },
-    "node_modules/shell-quote-word": {
-      "version": "1.0.1",
-      "dev": true,
-      "license": "MIT"
+    "rc-motion": {
+      "version": "2.7.3",
+      "resolved": "https://registry.npmjs.org/rc-motion/-/rc-motion-2.7.3.tgz",
+      "integrity": "sha512-2xUvo8yGHdOHeQbdI8BtBsCIrWKchEmFEIskf0nmHtJsou+meLd/JE+vnvSX2JxcBrJtXY2LuBpxAOxrbY/wMQ==",
+      "requires": {
+        "@babel/runtime": "^7.11.1",
+        "classnames": "^2.2.1",
+        "rc-util": "^5.21.0"
+      }
     },
-    "node_modules/side-channel": {
-      "version": "1.0.4",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "call-bind": "^1.0.0",
-        "get-intrinsic": "^1.0.2",
-        "object-inspect": "^1.9.0"
+    "rc-util": {
+      "version": "5.35.0",
+      "resolved": "https://registry.npmjs.org/rc-util/-/rc-util-5.35.0.tgz",
+      "integrity": "sha512-MTXlixb3EoSTEchsOc7XWsVyoUQqoCsh2Z1a2IptwNgqleMF6ZgQeY52UzUbNj5CcVBg9YljOWjuOV07jSSm4Q==",
+      "requires": {
+        "@babel/runtime": "^7.18.3",
+        "react-is": "^16.12.0"
       },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
+      "dependencies": {
+        "react-is": {
+          "version": "16.13.1",
+          "resolved": "https://registry.npmjs.org/react-is/-/react-is-16.13.1.tgz",
+          "integrity": "sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ=="
+        }
       }
     },
-    "node_modules/siginfo": {
-      "version": "2.0.0",
-      "dev": true,
-      "license": "ISC"
+    "react": {
+      "version": "18.2.0",
+      "resolved": "https://registry.npmjs.org/react/-/react-18.2.0.tgz",
+      "integrity": "sha512-/3IjMdb2L9QbBdWiW5e3P2/npwMBaU9mHCSCUzNln0ZCYbcfTsGbTJrU/kGemdH2IWmB2ioZ+zkxtmq6g09fGQ==",
+      "requires": {
+        "loose-envify": "^1.1.0"
+      }
     },
-    "node_modules/signal-exit": {
-      "version": "3.0.7",
-      "dev": true,
-      "license": "ISC"
+    "react-content-loader": {
+      "version": "6.2.1",
+      "resolved": "https://registry.npmjs.org/react-content-loader/-/react-content-loader-6.2.1.tgz",
+      "integrity": "sha512-6ONbFX+Hi3SHuP66JB8CPvJn372pj+qwltJV0J8z/8MFrq98I1cbFdZuhDWeQXu3CFxiiDTXJn7DFxx2ZvrO7g==",
+      "requires": {}
     },
-    "node_modules/slash": {
-      "version": "3.0.0",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=8"
+    "react-dom": {
+      "version": "18.2.0",
+      "resolved": "https://registry.npmjs.org/react-dom/-/react-dom-18.2.0.tgz",
+      "integrity": "sha512-6IMTriUmvsjHUjNtEDudZfuDQUoWXVxKHhlEGSk81n4YFS+r/Kl99wXiwlVXtPBtJenozv2P+hxDsw9eA7Xo6g==",
+      "requires": {
+        "loose-envify": "^1.1.0",
+        "scheduler": "^0.23.0"
       }
     },
-    "node_modules/slice-ansi": {
-      "version": "5.0.0",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "ansi-styles": "^6.0.0",
-        "is-fullwidth-code-point": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=12"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/slice-ansi?sponsor=1"
+    "react-hot-toast": {
+      "version": "2.4.1",
+      "resolved": "https://registry.npmjs.org/react-hot-toast/-/react-hot-toast-2.4.1.tgz",
+      "integrity": "sha512-j8z+cQbWIM5LY37pR6uZR6D4LfseplqnuAO4co4u8917hBUvXlEqyP1ZzqVLcqoyUesZZv/ImreoCeHVDpE5pQ==",
+      "requires": {
+        "goober": "^2.1.10"
       }
     },
-    "node_modules/slice-ansi/node_modules/ansi-styles": {
-      "version": "6.2.1",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=12"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
+    "react-i18next": {
+      "version": "11.18.6",
+      "resolved": "https://registry.npmjs.org/react-i18next/-/react-i18next-11.18.6.tgz",
+      "integrity": "sha512-yHb2F9BiT0lqoQDt8loZ5gWP331GwctHz9tYQ8A2EIEUu+CcEdjBLQWli1USG3RdWQt3W+jqQLg/d4rrQR96LA==",
+      "requires": {
+        "@babel/runtime": "^7.14.5",
+        "html-parse-stringify": "^3.0.1"
       }
     },
-    "node_modules/smart-buffer": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/smart-buffer/-/smart-buffer-4.2.0.tgz",
-      "integrity": "sha512-94hK0Hh8rPqQl2xXc3HsaBoOXKV20MToPkcXvwbISWLEs+64sBq5kFgn2kJDHb1Pry9yrP0dxrCI9RRci7RXKg==",
-      "engines": {
-        "node": ">= 6.0.0",
-        "npm": ">= 3.0.0"
+    "react-is": {
+      "version": "18.2.0",
+      "resolved": "https://registry.npmjs.org/react-is/-/react-is-18.2.0.tgz",
+      "integrity": "sha512-xWGDIW6x921xtzPkhiULtthJHoJvBbF3q26fzloPCK0hsvxtPVelvftw3zjbHWSkR2km9Z+4uxbDDK/6Zw9B8w=="
+    },
+    "react-is-visible": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/react-is-visible/-/react-is-visible-1.2.0.tgz",
+      "integrity": "sha512-052RH7aHdKrABOBH12wvS2zTAzJ8MnaswPvX2AQGq5wxvD8BnQ5vcnf0cA0cj2g4bjH0+qXz1AIkEL9ZlnN23A==",
+      "requires": {
+        "@babel/runtime": "^7.12.5",
+        "hoist-non-react-statics": "3.3.2"
       }
     },
-    "node_modules/smol-toml": {
-      "version": "1.2.2",
-      "dev": true,
-      "license": "BSD-3-Clause",
-      "engines": {
-        "node": ">= 18"
+    "react-lifecycles-compat": {
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/react-lifecycles-compat/-/react-lifecycles-compat-3.0.4.tgz",
+      "integrity": "sha512-fBASbA6LnOU9dOU2eW7aQ8xmYBSXUIWr+UmF9b1efZBazGNO+rcXT/icdKnYm2pTwcRylVUYwW7H1PHfLekVzA=="
+    },
+    "react-lottie": {
+      "version": "1.2.4",
+      "resolved": "https://registry.npmjs.org/react-lottie/-/react-lottie-1.2.4.tgz",
+      "integrity": "sha512-kBGxI+MIZGBf4wZhNCWwHkMcVP+kbpmrLWH/SkO0qCKc7D7eSPcxQbfpsmsCo8v2KCBYjuGSou+xTqK44D/jMg==",
+      "requires": {
+        "babel-runtime": "^6.26.0",
+        "lottie-web": "^5.1.3"
       }
     },
-    "node_modules/sockjs": {
-      "version": "0.3.24",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "faye-websocket": "^0.11.3",
-        "uuid": "^8.3.2",
-        "websocket-driver": "^0.7.4"
+    "react-modal": {
+      "version": "3.16.1",
+      "resolved": "https://registry.npmjs.org/react-modal/-/react-modal-3.16.1.tgz",
+      "integrity": "sha512-VStHgI3BVcGo7OXczvnJN7yT2TWHJPDXZWyI/a0ssFNhGZWsPmB8cF0z33ewDXq4VfYMO1vXgiv/g8Nj9NDyWg==",
+      "requires": {
+        "exenv": "^1.2.0",
+        "prop-types": "^15.7.2",
+        "react-lifecycles-compat": "^3.0.0",
+        "warning": "^4.0.3"
       }
     },
-    "node_modules/source-map": {
-      "version": "0.7.4",
-      "dev": true,
-      "license": "BSD-3-Clause",
-      "engines": {
-        "node": ">= 8"
+    "react-number-format": {
+      "version": "5.2.2",
+      "resolved": "https://registry.npmjs.org/react-number-format/-/react-number-format-5.2.2.tgz",
+      "integrity": "sha512-wCh64Z1HCwXcO2dbgkeYIaB+Rmp/fcsH8kAeRtUkc46dv1pIrgDjie2WkOqKBw8YqyqhwNdYgNFNQuuY+iGJ/g==",
+      "requires": {
+        "prop-types": "^15.7.2"
       }
     },
-    "node_modules/source-map-js": {
-      "version": "1.2.0",
-      "dev": true,
-      "license": "BSD-3-Clause",
-      "engines": {
-        "node": ">=0.10.0"
+    "react-qr-code": {
+      "version": "2.0.11",
+      "resolved": "https://registry.npmjs.org/react-qr-code/-/react-qr-code-2.0.11.tgz",
+      "integrity": "sha512-P7mvVM5vk9NjGdHMt4Z0KWeeJYwRAtonHTghZT2r+AASinLUUKQ9wfsGH2lPKsT++gps7hXmaiMGRvwTDEL9OA==",
+      "requires": {
+        "prop-types": "^15.8.1",
+        "qr.js": "0.0.0"
       }
     },
-    "node_modules/spdy": {
-      "version": "4.0.2",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "debug": "^4.1.0",
-        "handle-thing": "^2.0.0",
-        "http-deceiver": "^1.2.7",
-        "select-hose": "^2.0.0",
-        "spdy-transport": "^3.0.0"
+    "react-redux": {
+      "version": "7.2.9",
+      "resolved": "https://registry.npmjs.org/react-redux/-/react-redux-7.2.9.tgz",
+      "integrity": "sha512-Gx4L3uM182jEEayZfRbI/G11ZpYdNAnBs70lFVMNdHJI76XYtR+7m0MN+eAs7UHBPhWXcnFPaS+9owSCJQHNpQ==",
+      "requires": {
+        "@babel/runtime": "^7.15.4",
+        "@types/react-redux": "^7.1.20",
+        "hoist-non-react-statics": "^3.3.2",
+        "loose-envify": "^1.4.0",
+        "prop-types": "^15.7.2",
+        "react-is": "^17.0.2"
       },
-      "engines": {
-        "node": ">=6.0.0"
+      "dependencies": {
+        "react-is": {
+          "version": "17.0.2",
+          "resolved": "https://registry.npmjs.org/react-is/-/react-is-17.0.2.tgz",
+          "integrity": "sha512-w2GsyukL62IJnlaff/nRegPQR94C/XXamvMWmSHRJ4y7Ts/4ocGRmTHvOs8PSE6pB3dWOrD/nueuU5sduBsQ4w=="
+        }
       }
     },
-    "node_modules/spdy-transport": {
-      "version": "3.0.0",
+    "react-refresh": {
+      "version": "0.14.0",
+      "resolved": "https://registry.npmjs.org/react-refresh/-/react-refresh-0.14.0.tgz",
+      "integrity": "sha512-wViHqhAd8OHeLS/IRMJjTSDHF3U9eWi62F/MledQGPdJGDhodXJ9PBLNGr6WWL7qlH12Mt3TyTpbS+hGXMjCzQ==",
+      "dev": true
+    },
+    "react-refresh-typescript": {
+      "version": "2.0.9",
+      "resolved": "https://registry.npmjs.org/react-refresh-typescript/-/react-refresh-typescript-2.0.9.tgz",
+      "integrity": "sha512-chAnOO4vpxm/3WkgOVmti+eN8yUtkJzeGkOigV6UA9eDFz12W34e/SsYe2H5+RwYJ3+sfSZkVbiXcG1chEBxlg==",
       "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "debug": "^4.1.0",
-        "detect-node": "^2.0.4",
-        "hpack.js": "^2.1.6",
-        "obuf": "^1.1.2",
-        "readable-stream": "^3.0.6",
-        "wbuf": "^1.7.3"
+      "requires": {}
+    },
+    "react-router": {
+      "version": "6.14.2",
+      "resolved": "https://registry.npmjs.org/react-router/-/react-router-6.14.2.tgz",
+      "integrity": "sha512-09Zss2dE2z+T1D03IheqAFtK4UzQyX8nFPWx6jkwdYzGLXd5ie06A6ezS2fO6zJfEb/SpG6UocN2O1hfD+2urQ==",
+      "requires": {
+        "@remix-run/router": "1.7.2"
       }
     },
-    "node_modules/stackback": {
-      "version": "0.0.2",
-      "dev": true,
-      "license": "MIT"
+    "react-router-dom": {
+      "version": "6.14.2",
+      "resolved": "https://registry.npmjs.org/react-router-dom/-/react-router-dom-6.14.2.tgz",
+      "integrity": "sha512-5pWX0jdKR48XFZBuJqHosX3AAHjRAzygouMTyimnBPOLdY3WjzUSKhus2FVMihUFWzeLebDgr4r8UeQFAct7Bg==",
+      "requires": {
+        "@remix-run/router": "1.7.2",
+        "react-router": "6.14.2"
+      }
     },
-    "node_modules/stackframe": {
-      "version": "1.3.4",
-      "dev": true,
-      "license": "MIT"
+    "react-switch": {
+      "version": "7.0.0",
+      "resolved": "https://registry.npmjs.org/react-switch/-/react-switch-7.0.0.tgz",
+      "integrity": "sha512-KkDeW+cozZXI6knDPyUt3KBN1rmhoVYgAdCJqAh7st7tk8YE6N0iR89zjCWO8T8dUTeJGTR0KU+5CHCRMRffiA==",
+      "requires": {
+        "prop-types": "^15.7.2"
+      }
     },
-    "node_modules/statuses": {
-      "version": "2.0.1",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">= 0.8"
+    "react-tabs": {
+      "version": "6.0.2",
+      "resolved": "https://registry.npmjs.org/react-tabs/-/react-tabs-6.0.2.tgz",
+      "integrity": "sha512-aQXTKolnM28k3KguGDBSAbJvcowOQr23A+CUJdzJtOSDOtTwzEaJA+1U4KwhNL9+Obe+jFS7geuvA7ICQPXOnQ==",
+      "requires": {
+        "clsx": "^2.0.0",
+        "prop-types": "^15.5.0"
+      }
+    },
+    "react-tooltip": {
+      "version": "5.19.0",
+      "resolved": "https://registry.npmjs.org/react-tooltip/-/react-tooltip-5.19.0.tgz",
+      "integrity": "sha512-NSUk77GMpxYKHFKJVNHL++QQXRuH2QW1qDrXPtJnp2s/MJvUnU73N5TTADwDyrO2+xGlr0xHhjvQphkF60cMEA==",
+      "requires": {
+        "@floating-ui/dom": "^1.0.0",
+        "classnames": "^2.3.0"
       }
     },
-    "node_modules/std-env": {
-      "version": "3.5.0",
-      "dev": true,
-      "license": "MIT"
+    "readable-stream": {
+      "version": "3.6.2",
+      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.2.tgz",
+      "integrity": "sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA==",
+      "requires": {
+        "inherits": "^2.0.3",
+        "string_decoder": "^1.1.1",
+        "util-deprecate": "^1.0.1"
+      }
     },
-    "node_modules/stop-iteration-iterator": {
-      "version": "1.0.0",
+    "readdirp": {
+      "version": "3.6.0",
+      "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.6.0.tgz",
+      "integrity": "sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA==",
       "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "internal-slot": "^1.0.4"
-      },
-      "engines": {
-        "node": ">= 0.4"
+      "requires": {
+        "picomatch": "^2.2.1"
       }
     },
-    "node_modules/stream-browserify": {
-      "version": "3.0.0",
-      "license": "MIT",
-      "dependencies": {
-        "inherits": "~2.0.4",
-        "readable-stream": "^3.5.0"
+    "redux": {
+      "version": "4.2.1",
+      "resolved": "https://registry.npmjs.org/redux/-/redux-4.2.1.tgz",
+      "integrity": "sha512-LAUYz4lc+Do8/g7aeRa8JkyDErK6ekstQaqWQrNRW//MY1TvCEpMtpTWvlQ+FPbWCx+Xixu/6SHt5N0HR+SB4w==",
+      "requires": {
+        "@babel/runtime": "^7.9.2"
       }
     },
-    "node_modules/string_decoder": {
-      "version": "1.3.0",
-      "license": "MIT",
+    "redux-persist": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/redux-persist/-/redux-persist-6.0.0.tgz",
+      "integrity": "sha512-71LLMbUq2r02ng2We9S215LtPu3fY0KgaGE0k8WRgl6RkqxtGfl7HUozz1Dftwsb0D/5mZ8dwAaPbtnzfvbEwQ==",
+      "requires": {}
+    },
+    "redux-state-sync": {
+      "version": "3.1.4",
+      "resolved": "https://registry.npmjs.org/redux-state-sync/-/redux-state-sync-3.1.4.tgz",
+      "integrity": "sha512-nhJBzaXVXPXvUhQJ7m0LdoXBnrcw+cTYQ8bzW9DeJKdq6UNYynXwQWAlVUvsbT/hDV+vB6BC4DMLXkUVGpF2yQ==",
+      "requires": {
+        "broadcast-channel": "^3.1.0"
+      },
       "dependencies": {
-        "safe-buffer": "~5.2.0"
+        "broadcast-channel": {
+          "version": "3.7.0",
+          "resolved": "https://registry.npmjs.org/broadcast-channel/-/broadcast-channel-3.7.0.tgz",
+          "integrity": "sha512-cIAKJXAxGJceNZGTZSBzMxzyOn72cVgPnKx4dc6LRjQgbaJUQqhy5rzL3zbMxkMWsGKkv2hSFkPRMEXfoMZ2Mg==",
+          "requires": {
+            "@babel/runtime": "^7.7.2",
+            "detect-node": "^2.1.0",
+            "js-sha3": "0.8.0",
+            "microseconds": "0.2.0",
+            "nano-time": "1.0.0",
+            "oblivious-set": "1.0.0",
+            "rimraf": "3.0.2",
+            "unload": "2.2.0"
+          }
+        },
+        "microseconds": {
+          "version": "0.2.0",
+          "resolved": "https://registry.npmjs.org/microseconds/-/microseconds-0.2.0.tgz",
+          "integrity": "sha512-n7DHHMjR1avBbSpsTBj6fmMGh2AGrifVV4e+WYc3Q9lO+xnSZ3NyhcBND3vzzatt05LFhoKFRxrIyklmLlUtyA=="
+        }
       }
     },
-    "node_modules/string-argv": {
-      "version": "0.3.2",
+    "regenerator-runtime": {
+      "version": "0.13.11",
+      "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.11.tgz",
+      "integrity": "sha512-kY1AZVr2Ra+t+piVaJ4gxaFaReZVH40AKNo7UCX6W+dEwBo/2oZJzqfuN1qLq1oL45o56cPaTXELwrTh8Fpggg=="
+    },
+    "regexp.prototype.flags": {
+      "version": "1.5.0",
+      "resolved": "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.5.0.tgz",
+      "integrity": "sha512-0SutC3pNudRKgquxGoRGIz946MZVHqbNfPjBdxeOhBrdgDKlRoXmYLQN9xRbrR09ZXWeGAdPuif7egofn6v5LA==",
       "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=0.6.19"
+      "requires": {
+        "call-bind": "^1.0.2",
+        "define-properties": "^1.2.0",
+        "functions-have-names": "^1.2.3"
       }
     },
-    "node_modules/string-to-color": {
-      "version": "2.2.2",
-      "license": "MIT",
-      "dependencies": {
-        "colornames": "^1.1.1",
-        "hex-rgb": "^4.1.0",
-        "lodash.padend": "^4.6.1",
-        "lodash.trimstart": "^4.5.1",
-        "lodash.words": "^4.2.0",
-        "rgb-hex": "^3.0.0"
-      }
+    "relateurl": {
+      "version": "0.2.7",
+      "resolved": "https://registry.npmjs.org/relateurl/-/relateurl-0.2.7.tgz",
+      "integrity": "sha512-G08Dxvm4iDN3MLM0EsP62EDV9IuhXPR6blNz6Utcp7zyV3tr4HVNINt6MpaRWbxoOHT3Q7YN2P+jaHX8vUbgog==",
+      "dev": true
     },
-    "node_modules/string-width": {
-      "version": "5.1.2",
+    "remove-accents": {
+      "version": "0.4.2",
+      "resolved": "https://registry.npmjs.org/remove-accents/-/remove-accents-0.4.2.tgz",
+      "integrity": "sha512-7pXIJqJOq5tFgG1A2Zxti3Ht8jJF337m4sowbuHsW30ZnkQFnDzy9qBNhgzX8ZLW4+UBcXiiR7SwR6pokHsxiA=="
+    },
+    "renderkid": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/renderkid/-/renderkid-3.0.0.tgz",
+      "integrity": "sha512-q/7VIQA8lmM1hF+jn+sFSPWGlMkSAeNYcPLmDQx2zzuiDfaLrOmumR8iaUKlenFgh0XRPIUeSPlH3A+AW3Z5pg==",
       "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "eastasianwidth": "^0.2.0",
-        "emoji-regex": "^9.2.2",
-        "strip-ansi": "^7.0.1"
-      },
-      "engines": {
-        "node": ">=12"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
+      "requires": {
+        "css-select": "^4.1.3",
+        "dom-converter": "^0.2.0",
+        "htmlparser2": "^6.1.0",
+        "lodash": "^4.17.21",
+        "strip-ansi": "^6.0.1"
       }
     },
-    "node_modules/string-width/node_modules/ansi-regex": {
-      "version": "6.0.1",
+    "require-directory": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz",
+      "integrity": "sha512-fGxEI7+wsG9xrvdjsrlmL22OMTTiHRwAMroiEeMgq8gzoLC/PQr7RsRDSTLUg/bZAZtF+TVIkHc6/4RIKrui+Q=="
+    },
+    "require-from-string": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/require-from-string/-/require-from-string-2.0.2.tgz",
+      "integrity": "sha512-Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw==",
+      "dev": true
+    },
+    "requires-port": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/requires-port/-/requires-port-1.0.0.tgz",
+      "integrity": "sha512-KigOCHcocU3XODJxsu8i/j8T9tzT4adHiecwORRQ0ZZFcp7ahwXuRU1m+yuO90C5ZUyGeGfocHDI14M3L3yDAQ==",
+      "dev": true
+    },
+    "resolve": {
+      "version": "1.22.8",
+      "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.8.tgz",
+      "integrity": "sha512-oKWePCxqpd6FlLvGV1VU0x7bkPmmCNolxzjMf4NczoDnQcIWrAF+cPtZn5i6n+RfD2d9i0tzpKnG6Yk168yIyw==",
       "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=12"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-regex?sponsor=1"
+      "requires": {
+        "is-core-module": "^2.13.0",
+        "path-parse": "^1.0.7",
+        "supports-preserve-symlinks-flag": "^1.0.0"
       }
     },
-    "node_modules/string-width/node_modules/strip-ansi": {
-      "version": "7.1.0",
+    "resolve-from": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz",
+      "integrity": "sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==",
+      "dev": true
+    },
+    "restore-cursor": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-3.1.0.tgz",
+      "integrity": "sha512-l+sSefzHpj5qimhFSE5a8nufZYAM3sBSVMAPtYkmC+4EH2anSGaEMXSD0izRQbu9nfyQ9y5JrVmp7E8oZrUjvA==",
       "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "ansi-regex": "^6.0.1"
-      },
-      "engines": {
-        "node": ">=12"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/strip-ansi?sponsor=1"
+      "requires": {
+        "onetime": "^5.1.0",
+        "signal-exit": "^3.0.2"
       }
     },
-    "node_modules/string.fromcodepoint": {
-      "version": "0.2.1",
+    "retry": {
+      "version": "0.13.1",
+      "resolved": "https://registry.npmjs.org/retry/-/retry-0.13.1.tgz",
+      "integrity": "sha512-XQBQ3I8W1Cge0Seh+6gjj03LbmRFWuoszgK9ooCpwYIrhhoO80pfq4cUkU5DkknwfOfFteRwlZ56PYOGYyFWdg==",
       "dev": true
     },
-    "node_modules/string.prototype.matchall": {
-      "version": "4.0.8",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.1.4",
-        "es-abstract": "^1.20.4",
-        "get-intrinsic": "^1.1.3",
-        "has-symbols": "^1.0.3",
-        "internal-slot": "^1.0.3",
-        "regexp.prototype.flags": "^1.4.3",
-        "side-channel": "^1.0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
+    "reusify": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/reusify/-/reusify-1.0.4.tgz",
+      "integrity": "sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw==",
+      "dev": true
+    },
+    "reverse-arguments": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/reverse-arguments/-/reverse-arguments-1.0.0.tgz",
+      "integrity": "sha512-/x8uIPdTafBqakK0TmPNJzgkLP+3H+yxpUJhCQHsLBg1rYEVNR2D8BRYNWQhVBjyOd7oo1dZRVzIkwMY2oqfYQ==",
+      "dev": true
+    },
+    "rfdc": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/rfdc/-/rfdc-1.3.0.tgz",
+      "integrity": "sha512-V2hovdzFbOi77/WajaSMXk2OLm+xNIeQdMMuB7icj7bk6zi2F8GGAxigcnDFpJHbNyNcgyJDiP+8nOrY5cZGrA==",
+      "dev": true
+    },
+    "rgb-hex": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/rgb-hex/-/rgb-hex-3.0.0.tgz",
+      "integrity": "sha512-8h7ZcwxCBDKvchSWbWngJuSCqJGQ6nDuLLg+QcRyQDbX9jMWt+PpPeXAhSla0GOooEomk3lCprUpGkMdsLjKyg=="
+    },
+    "rimraf": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz",
+      "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==",
+      "requires": {
+        "glob": "^7.1.3"
       }
     },
-    "node_modules/string.prototype.trim": {
-      "version": "1.2.7",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.1.4",
-        "es-abstract": "^1.20.4"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
+    "ripemd160": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/ripemd160/-/ripemd160-2.0.2.tgz",
+      "integrity": "sha512-ii4iagi25WusVoiC4B4lq7pbXfAp3D9v5CwfkY33vffw2+pkDjY1D8GaN7spsxvCSx8dkPqOZCEZyfxcmJG2IA==",
+      "requires": {
+        "hash-base": "^3.0.0",
+        "inherits": "^2.0.1"
       }
     },
-    "node_modules/string.prototype.trimend": {
-      "version": "1.0.6",
+    "ripemd160-min": {
+      "version": "0.0.6",
+      "resolved": "https://registry.npmjs.org/ripemd160-min/-/ripemd160-min-0.0.6.tgz",
+      "integrity": "sha512-+GcJgQivhs6S9qvLogusiTcS9kQUfgR75whKuy5jIhuiOfQuJ8fjqxV6EGD5duH1Y/FawFUMtMhyeq3Fbnib8A=="
+    },
+    "rollup": {
+      "version": "4.18.0",
+      "resolved": "https://registry.npmjs.org/rollup/-/rollup-4.18.0.tgz",
+      "integrity": "sha512-QmJz14PX3rzbJCN1SG4Xe/bAAX2a6NpCP8ab2vfu2GiUr8AQcr2nCV/oEO3yneFarB67zk8ShlIyWb2LGTb3Sg==",
       "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.1.4",
-        "es-abstract": "^1.20.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
+      "requires": {
+        "@rollup/rollup-android-arm-eabi": "4.18.0",
+        "@rollup/rollup-android-arm64": "4.18.0",
+        "@rollup/rollup-darwin-arm64": "4.18.0",
+        "@rollup/rollup-darwin-x64": "4.18.0",
+        "@rollup/rollup-linux-arm-gnueabihf": "4.18.0",
+        "@rollup/rollup-linux-arm-musleabihf": "4.18.0",
+        "@rollup/rollup-linux-arm64-gnu": "4.18.0",
+        "@rollup/rollup-linux-arm64-musl": "4.18.0",
+        "@rollup/rollup-linux-powerpc64le-gnu": "4.18.0",
+        "@rollup/rollup-linux-riscv64-gnu": "4.18.0",
+        "@rollup/rollup-linux-s390x-gnu": "4.18.0",
+        "@rollup/rollup-linux-x64-gnu": "4.18.0",
+        "@rollup/rollup-linux-x64-musl": "4.18.0",
+        "@rollup/rollup-win32-arm64-msvc": "4.18.0",
+        "@rollup/rollup-win32-ia32-msvc": "4.18.0",
+        "@rollup/rollup-win32-x64-msvc": "4.18.0",
+        "@types/estree": "1.0.5",
+        "fsevents": "~2.3.2"
       }
     },
-    "node_modules/string.prototype.trimstart": {
-      "version": "1.0.6",
+    "run-parallel": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/run-parallel/-/run-parallel-1.2.0.tgz",
+      "integrity": "sha512-5l4VyZR86LZ/lDxZTR6jqL8AFE2S0IFLMP26AbjsLVADxHdhB/c0GUsH+y39UfCi3dzz8OlQuPmnaJOMoDHQBA==",
       "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.1.4",
-        "es-abstract": "^1.20.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
+      "requires": {
+        "queue-microtask": "^1.2.2"
       }
     },
-    "node_modules/strip-ansi": {
-      "version": "6.0.1",
-      "license": "MIT",
-      "dependencies": {
-        "ansi-regex": "^5.0.1"
+    "rxjs": {
+      "version": "6.6.7",
+      "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.6.7.tgz",
+      "integrity": "sha512-hTdwr+7yYNIT5n4AMYp85KA6yw2Va0FLa3Rguvbpa4W3I5xynaBZo41cM3XM+4Q6fRMj3sBYIR1VAmZMXYJvRQ==",
+      "requires": {
+        "tslib": "^1.9.0"
       },
-      "engines": {
-        "node": ">=8"
+      "dependencies": {
+        "tslib": {
+          "version": "1.14.1",
+          "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz",
+          "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg=="
+        }
       }
     },
-    "node_modules/strip-bom": {
-      "version": "3.0.0",
+    "safe-array-concat": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/safe-array-concat/-/safe-array-concat-1.0.0.tgz",
+      "integrity": "sha512-9dVEFruWIsnie89yym+xWTAYASdpw3CJV7Li/6zBewGf9z2i1j31rP6jnY0pHEO4QZh6N0K11bFjWmdR8UGdPQ==",
       "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=4"
+      "requires": {
+        "call-bind": "^1.0.2",
+        "get-intrinsic": "^1.2.0",
+        "has-symbols": "^1.0.3",
+        "isarray": "^2.0.5"
       }
     },
-    "node_modules/strip-final-newline": {
-      "version": "2.0.0",
+    "safe-buffer": {
+      "version": "5.2.1",
+      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz",
+      "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ=="
+    },
+    "safe-regex-test": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/safe-regex-test/-/safe-regex-test-1.0.0.tgz",
+      "integrity": "sha512-JBUUzyOgEwXQY1NuPtvcj/qcBDbDmEvWufhlnXZIm75DEHp+afM1r1ujJpJsV/gSM4t59tpDyPi1sd6ZaPFfsA==",
       "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=6"
+      "requires": {
+        "call-bind": "^1.0.2",
+        "get-intrinsic": "^1.1.3",
+        "is-regex": "^1.1.4"
       }
     },
-    "node_modules/strip-json-comments": {
-      "version": "3.1.1",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
+    "safer-buffer": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz",
+      "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg=="
+    },
+    "scheduler": {
+      "version": "0.23.0",
+      "resolved": "https://registry.npmjs.org/scheduler/-/scheduler-0.23.0.tgz",
+      "integrity": "sha512-CtuThmgHNg7zIZWAXi3AsyIzA3n4xx7aNyjwC2VJldO2LMVDhFK+63xGqq6CsJH4rTAt6/M+N4GhZiDYPx9eUw==",
+      "requires": {
+        "loose-envify": "^1.1.0"
       }
     },
-    "node_modules/strip-literal": {
-      "version": "1.3.0",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "acorn": "^8.10.0"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/antfu"
+    "schema-inspector": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/schema-inspector/-/schema-inspector-2.1.0.tgz",
+      "integrity": "sha512-3bmQVhbA01/EW8cZin4vIpqlpNU2SIy4BhKCfCgogJ3T/L76dLx3QAE+++4o+dNT33sa+SN9vOJL7iHiHFjiNg==",
+      "requires": {
+        "async": "~2.6.3"
       }
     },
-    "node_modules/style-loader": {
-      "version": "3.3.3",
+    "schema-utils": {
+      "version": "3.3.0",
+      "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.3.0.tgz",
+      "integrity": "sha512-pN/yOAvcC+5rQ5nERGuwrjLlYvLTbCibnZ1I7B1LaiAz9BRBlE9GMgE/eqV30P7aJQUf7Ddimy/RsbYO/GrVGg==",
       "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">= 12.13.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/webpack"
-      },
-      "peerDependencies": {
-        "webpack": "^5.0.0"
+      "requires": {
+        "@types/json-schema": "^7.0.8",
+        "ajv": "^6.12.5",
+        "ajv-keywords": "^3.5.2"
       }
     },
-    "node_modules/styled-components": {
-      "version": "5.3.11",
-      "license": "MIT",
-      "dependencies": {
-        "@babel/helper-module-imports": "^7.0.0",
-        "@babel/traverse": "^7.4.5",
-        "@emotion/is-prop-valid": "^1.1.0",
-        "@emotion/stylis": "^0.8.4",
-        "@emotion/unitless": "^0.7.4",
-        "babel-plugin-styled-components": ">= 1.12.0",
-        "css-to-react-native": "^3.0.0",
-        "hoist-non-react-statics": "^3.0.0",
-        "shallowequal": "^1.1.0",
-        "supports-color": "^5.5.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/styled-components"
+    "secp256k1": {
+      "version": "3.8.0",
+      "resolved": "https://registry.npmjs.org/secp256k1/-/secp256k1-3.8.0.tgz",
+      "integrity": "sha512-k5ke5avRZbtl9Tqx/SA7CbY3NF6Ro+Sj9cZxezFzuBlLDmyqPiL8hJJ+EmzD8Ig4LUDByHJ3/iPOVoRixs/hmw==",
+      "requires": {
+        "bindings": "^1.5.0",
+        "bip66": "^1.1.5",
+        "bn.js": "^4.11.8",
+        "create-hash": "^1.2.0",
+        "drbg.js": "^1.0.1",
+        "elliptic": "^6.5.2",
+        "nan": "^2.14.0",
+        "safe-buffer": "^5.1.2"
       },
-      "peerDependencies": {
-        "react": ">= 16.8.0",
-        "react-dom": ">= 16.8.0",
-        "react-is": ">= 16.8.0"
+      "dependencies": {
+        "bn.js": {
+          "version": "4.12.0",
+          "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.0.tgz",
+          "integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA=="
+        }
       }
     },
-    "node_modules/styled-components/node_modules/@emotion/unitless": {
-      "version": "0.7.5",
-      "license": "MIT"
+    "select-hose": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/select-hose/-/select-hose-2.0.0.tgz",
+      "integrity": "sha512-mEugaLK+YfkijB4fx0e6kImuJdCIt2LxCRcbEYPqRGCs4F2ogyfZU5IAZRdjCP8JPq2AtdNoC/Dux63d9Kiryg==",
+      "dev": true
     },
-    "node_modules/summary": {
-      "version": "2.1.0",
+    "selfsigned": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/selfsigned/-/selfsigned-2.1.1.tgz",
+      "integrity": "sha512-GSL3aowiF7wa/WtSFwnUrludWFoNhftq8bUkH9pkzjpN2XSPOAYEgg6e0sS9s0rZwgJzJiQRPU18A6clnoW5wQ==",
       "dev": true,
-      "license": "MIT"
-    },
-    "node_modules/superjson": {
-      "version": "2.2.1",
-      "license": "MIT",
-      "dependencies": {
-        "copy-anything": "^3.0.2"
-      },
-      "engines": {
-        "node": ">=16"
+      "requires": {
+        "node-forge": "^1"
       }
     },
-    "node_modules/supports-color": {
-      "version": "5.5.0",
-      "license": "MIT",
-      "dependencies": {
-        "has-flag": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
+    "semver": {
+      "version": "6.3.1",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
+      "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA=="
     },
-    "node_modules/supports-preserve-symlinks-flag": {
-      "version": "1.0.0",
+    "send": {
+      "version": "0.18.0",
+      "resolved": "https://registry.npmjs.org/send/-/send-0.18.0.tgz",
+      "integrity": "sha512-qqWzuOjSFOuqPjFe4NOsMLafToQQwBSOEpS+FwEt3A2V3vKubTquT3vmLTQpFgMXp8AlFWFuP1qKaJZOtPpVXg==",
       "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">= 0.4"
+      "requires": {
+        "debug": "2.6.9",
+        "depd": "2.0.0",
+        "destroy": "1.2.0",
+        "encodeurl": "~1.0.2",
+        "escape-html": "~1.0.3",
+        "etag": "~1.8.1",
+        "fresh": "0.5.2",
+        "http-errors": "2.0.0",
+        "mime": "1.6.0",
+        "ms": "2.1.3",
+        "on-finished": "2.4.1",
+        "range-parser": "~1.2.1",
+        "statuses": "2.0.1"
       },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/swiper": {
-      "version": "11.0.6",
-      "funding": [
-        {
-          "type": "patreon",
-          "url": "https://www.patreon.com/swiperjs"
+      "dependencies": {
+        "debug": {
+          "version": "2.6.9",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+          "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+          "dev": true,
+          "requires": {
+            "ms": "2.0.0"
+          },
+          "dependencies": {
+            "ms": {
+              "version": "2.0.0",
+              "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+              "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==",
+              "dev": true
+            }
+          }
         },
-        {
-          "type": "open_collective",
-          "url": "http://opencollective.com/swiper"
+        "ms": {
+          "version": "2.1.3",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz",
+          "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==",
+          "dev": true
         }
-      ],
-      "license": "MIT",
-      "engines": {
-        "node": ">= 4.7.0"
       }
     },
-    "node_modules/tapable": {
-      "version": "2.2.1",
+    "serialize-javascript": {
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-6.0.1.tgz",
+      "integrity": "sha512-owoXEFjWRllis8/M1Q+Cw5k8ZH40e3zhp/ovX+Xr/vi1qj6QesbyXXViFbpNvWvPNAD62SutwEXavefrLJWj7w==",
       "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=6"
+      "requires": {
+        "randombytes": "^2.1.0"
       }
     },
-    "node_modules/terser": {
-      "version": "5.19.2",
+    "serve-index": {
+      "version": "1.9.1",
+      "resolved": "https://registry.npmjs.org/serve-index/-/serve-index-1.9.1.tgz",
+      "integrity": "sha512-pXHfKNP4qujrtteMrSBb0rc8HJ9Ms/GrXwcUtUtD5s4ewDJI8bT3Cz2zTVRMKtri49pLx2e0Ya8ziP5Ya2pZZw==",
       "dev": true,
-      "license": "BSD-2-Clause",
-      "dependencies": {
-        "@jridgewell/source-map": "^0.3.3",
-        "acorn": "^8.8.2",
-        "commander": "^2.20.0",
-        "source-map-support": "~0.5.20"
-      },
-      "bin": {
-        "terser": "bin/terser"
+      "requires": {
+        "accepts": "~1.3.4",
+        "batch": "0.6.1",
+        "debug": "2.6.9",
+        "escape-html": "~1.0.3",
+        "http-errors": "~1.6.2",
+        "mime-types": "~2.1.17",
+        "parseurl": "~1.3.2"
       },
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/terser-webpack-plugin": {
-      "version": "5.3.9",
-      "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "@jridgewell/trace-mapping": "^0.3.17",
-        "jest-worker": "^27.4.5",
-        "schema-utils": "^3.1.1",
-        "serialize-javascript": "^6.0.1",
-        "terser": "^5.16.8"
-      },
-      "engines": {
-        "node": ">= 10.13.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/webpack"
-      },
-      "peerDependencies": {
-        "webpack": "^5.1.0"
-      },
-      "peerDependenciesMeta": {
-        "@swc/core": {
-          "optional": true
+        "debug": {
+          "version": "2.6.9",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+          "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+          "dev": true,
+          "requires": {
+            "ms": "2.0.0"
+          }
         },
-        "esbuild": {
-          "optional": true
+        "depd": {
+          "version": "1.1.2",
+          "resolved": "https://registry.npmjs.org/depd/-/depd-1.1.2.tgz",
+          "integrity": "sha512-7emPTl6Dpo6JRXOXjLRxck+FlLRX5847cLKEn00PLAgc3g2hTZZgr+e4c2v6QpSmLeFP3n5yUo7ft6avBK/5jQ==",
+          "dev": true
         },
-        "uglify-js": {
-          "optional": true
+        "http-errors": {
+          "version": "1.6.3",
+          "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.6.3.tgz",
+          "integrity": "sha512-lks+lVC8dgGyh97jxvxeYTWQFvh4uw4yC12gVl63Cg30sjPX4wuGcdkICVXDAESr6OJGjqGA8Iz5mkeN6zlD7A==",
+          "dev": true,
+          "requires": {
+            "depd": "~1.1.2",
+            "inherits": "2.0.3",
+            "setprototypeof": "1.1.0",
+            "statuses": ">= 1.4.0 < 2"
+          }
+        },
+        "inherits": {
+          "version": "2.0.3",
+          "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
+          "integrity": "sha512-x00IRNXNy63jwGkJmzPigoySHbaqpNuzKbBOmzK+g2OdZpQ9w+sxCN+VSB3ja7IAge2OP2qpfxTjeNcyjmW1uw==",
+          "dev": true
+        },
+        "ms": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+          "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==",
+          "dev": true
+        },
+        "setprototypeof": {
+          "version": "1.1.0",
+          "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.1.0.tgz",
+          "integrity": "sha512-BvE/TwpZX4FXExxOxZyRGQQv651MSwmWKZGqvmPcRIjDqWub67kTKuIMx43cZZrS/cBBzwBcNDWoFxt2XEFIpQ==",
+          "dev": true
+        },
+        "statuses": {
+          "version": "1.5.0",
+          "resolved": "https://registry.npmjs.org/statuses/-/statuses-1.5.0.tgz",
+          "integrity": "sha512-OpZ3zP+jT1PI7I8nemJX4AKmAX070ZkYPVWV/AaKTJl+tXCTGyVdC1a4SL8RUQYEwk/f34ZX8UTykN68FwrqAA==",
+          "dev": true
         }
       }
     },
-    "node_modules/terser/node_modules/commander": {
-      "version": "2.20.3",
+    "serve-static": {
+      "version": "1.15.0",
+      "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.15.0.tgz",
+      "integrity": "sha512-XGuRDNjXUijsUL0vl6nSD7cwURuzEgglbOaFuZM9g3kwDXOWVTck0jLzjPzGD+TazWbboZYu52/9/XPdUgne9g==",
       "dev": true,
-      "license": "MIT"
+      "requires": {
+        "encodeurl": "~1.0.2",
+        "escape-html": "~1.0.3",
+        "parseurl": "~1.3.3",
+        "send": "0.18.0"
+      }
     },
-    "node_modules/terser/node_modules/source-map": {
-      "version": "0.6.1",
+    "set-function-length": {
+      "version": "1.2.2",
+      "resolved": "https://registry.npmjs.org/set-function-length/-/set-function-length-1.2.2.tgz",
+      "integrity": "sha512-pgRc4hJ4/sNjWCSS9AmnS40x3bNMDTknHgL5UaMBTMyJnU90EgWh1Rz+MC9eFu4BuN/UwZjKQuY/1v3rM7HMfg==",
+      "requires": {
+        "define-data-property": "^1.1.4",
+        "es-errors": "^1.3.0",
+        "function-bind": "^1.1.2",
+        "get-intrinsic": "^1.2.4",
+        "gopd": "^1.0.1",
+        "has-property-descriptors": "^1.0.2"
+      }
+    },
+    "setprototypeof": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.2.0.tgz",
+      "integrity": "sha512-E5LDX7Wrp85Kil5bhZv46j8jOeboKq5JMmYM3gVGdGH8xFpPWXUMsNrlODCrkoxMEeNi/XZIwuRvY4XNwYMJpw==",
+      "dev": true
+    },
+    "sha.js": {
+      "version": "2.4.11",
+      "resolved": "https://registry.npmjs.org/sha.js/-/sha.js-2.4.11.tgz",
+      "integrity": "sha512-QMEp5B7cftE7APOjk5Y6xgrbWu+WkLVQwk8JNjZ8nKRciZaByEW6MubieAiToS7+dwvrjGhH8jRXz3MVd0AYqQ==",
+      "requires": {
+        "inherits": "^2.0.1",
+        "safe-buffer": "^5.0.1"
+      }
+    },
+    "sha256-uint8array": {
+      "version": "0.10.7",
+      "resolved": "https://registry.npmjs.org/sha256-uint8array/-/sha256-uint8array-0.10.7.tgz",
+      "integrity": "sha512-1Q6JQU4tX9NqsDGodej6pkrUVQVNapLZnvkwIhddH/JqzBZF1fSaxSWNY6sziXBE8aEa2twtGkXUrwzGeZCMpQ=="
+    },
+    "shallowequal": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/shallowequal/-/shallowequal-1.1.0.tgz",
+      "integrity": "sha512-y0m1JoUZSlPAjXVtPPW70aZWfIL/dSP7AFkRnniLCrK/8MDKog3TySTBmckD+RObVxH0v4Tox67+F14PdED2oQ=="
+    },
+    "shebang-command": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz",
+      "integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==",
       "dev": true,
-      "license": "BSD-3-Clause",
-      "engines": {
-        "node": ">=0.10.0"
+      "requires": {
+        "shebang-regex": "^3.0.0"
       }
     },
-    "node_modules/terser/node_modules/source-map-support": {
-      "version": "0.5.21",
+    "shebang-regex": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz",
+      "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==",
+      "dev": true
+    },
+    "shell-quote": {
+      "version": "1.8.1",
+      "resolved": "https://registry.npmjs.org/shell-quote/-/shell-quote-1.8.1.tgz",
+      "integrity": "sha512-6j1W9l1iAs/4xYBI1SYOVZyFcCis9b4KCLQ8fgAGG07QvzaRLVVRQvAy85yNmmZSjYjg4MWh4gNvlPujU/5LpA==",
+      "dev": true
+    },
+    "shell-quote-word": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/shell-quote-word/-/shell-quote-word-1.0.1.tgz",
+      "integrity": "sha512-lT297f1WLAdq0A4O+AknIFRP6kkiI3s8C913eJ0XqBxJbZPGWUNkRQk2u8zk4bEAjUJ5i+fSLwB6z1HzeT+DEg==",
+      "dev": true
+    },
+    "side-channel": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.0.4.tgz",
+      "integrity": "sha512-q5XPytqFEIKHkGdiMIrY10mvLRvnQh42/+GoBlFW3b2LXLE2xxJpZFdm94we0BaoV3RwJyGqg5wS7epxTv0Zvw==",
+      "dev": true,
+      "requires": {
+        "call-bind": "^1.0.0",
+        "get-intrinsic": "^1.0.2",
+        "object-inspect": "^1.9.0"
+      }
+    },
+    "siginfo": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/siginfo/-/siginfo-2.0.0.tgz",
+      "integrity": "sha512-ybx0WO1/8bSBLEWXZvEd7gMW3Sn3JFlW3TvX1nREbDLRNQNaeNN8WK0meBwPdAaOI7TtRRRJn/Es1zhrrCHu7g==",
+      "dev": true
+    },
+    "signal-exit": {
+      "version": "3.0.7",
+      "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.7.tgz",
+      "integrity": "sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==",
+      "dev": true
+    },
+    "slash": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz",
+      "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==",
+      "dev": true
+    },
+    "slice-ansi": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-5.0.0.tgz",
+      "integrity": "sha512-FC+lgizVPfie0kkhqUScwRu1O/lF6NOgJmlCgK+/LYxDCTk8sGelYaHDhFcDN+Sn3Cv+3VSa4Byeo+IMCzpMgQ==",
       "dev": true,
-      "license": "MIT",
+      "requires": {
+        "ansi-styles": "^6.0.0",
+        "is-fullwidth-code-point": "^4.0.0"
+      },
       "dependencies": {
-        "buffer-from": "^1.0.0",
-        "source-map": "^0.6.0"
+        "ansi-styles": {
+          "version": "6.2.1",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-6.2.1.tgz",
+          "integrity": "sha512-bN798gFfQX+viw3R7yrGWRqnrN2oRkEkUjjl4JNn4E8GxxbjtG3FbrEIIY3l8/hrwUwIeCZvi4QuOTP4MErVug==",
+          "dev": true
+        }
       }
     },
-    "node_modules/text-table": {
-      "version": "0.2.0",
-      "dev": true,
-      "license": "MIT"
+    "smart-buffer": {
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/smart-buffer/-/smart-buffer-4.2.0.tgz",
+      "integrity": "sha512-94hK0Hh8rPqQl2xXc3HsaBoOXKV20MToPkcXvwbISWLEs+64sBq5kFgn2kJDHb1Pry9yrP0dxrCI9RRci7RXKg=="
     },
-    "node_modules/through": {
-      "version": "2.3.8",
-      "dev": true,
-      "license": "MIT"
+    "smol-toml": {
+      "version": "1.2.2",
+      "resolved": "https://registry.npmjs.org/smol-toml/-/smol-toml-1.2.2.tgz",
+      "integrity": "sha512-fVEjX2ybKdJKzFL46VshQbj9PuA4IUKivalgp48/3zwS9vXzyykzQ6AX92UxHSvWJagziMRLeHMgEzoGO7A8hQ==",
+      "dev": true
     },
-    "node_modules/thunky": {
-      "version": "1.1.0",
+    "sockjs": {
+      "version": "0.3.24",
+      "resolved": "https://registry.npmjs.org/sockjs/-/sockjs-0.3.24.tgz",
+      "integrity": "sha512-GJgLTZ7vYb/JtPSSZ10hsOYIvEYsjbNU+zPdIHcUaWVNUEPivzxku31865sSSud0Da0W4lEeOPlmw93zLQchuQ==",
       "dev": true,
-      "license": "MIT"
+      "requires": {
+        "faye-websocket": "^0.11.3",
+        "uuid": "^8.3.2",
+        "websocket-driver": "^0.7.4"
+      }
     },
-    "node_modules/tinybench": {
-      "version": "2.5.1",
-      "dev": true,
-      "license": "MIT"
+    "source-map": {
+      "version": "0.7.4",
+      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.7.4.tgz",
+      "integrity": "sha512-l3BikUxvPOcn5E74dZiq5BGsTb5yEwhaTSzccU6t4sDOH8NWJCstKO5QT2CvtFoK6F0saL7p9xHAqHOlCPJygA==",
+      "dev": true
     },
-    "node_modules/tinypool": {
-      "version": "0.7.0",
+    "source-map-js": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.2.0.tgz",
+      "integrity": "sha512-itJW8lvSA0TXEphiRoawsCksnlf8SyvmFzIhltqAHluXd88pkCd+cXJVHTDwdCr0IzwptSm035IHQktUu1QUMg==",
+      "dev": true
+    },
+    "spdy": {
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/spdy/-/spdy-4.0.2.tgz",
+      "integrity": "sha512-r46gZQZQV+Kl9oItvl1JZZqJKGr+oEkB08A6BzkiR7593/7IbtuncXHd2YoYeTsG4157ZssMu9KYvUHLcjcDoA==",
       "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=14.0.0"
+      "requires": {
+        "debug": "^4.1.0",
+        "handle-thing": "^2.0.0",
+        "http-deceiver": "^1.2.7",
+        "select-hose": "^2.0.0",
+        "spdy-transport": "^3.0.0"
       }
     },
-    "node_modules/tinyspy": {
-      "version": "2.2.0",
+    "spdy-transport": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/spdy-transport/-/spdy-transport-3.0.0.tgz",
+      "integrity": "sha512-hsLVFE5SjA6TCisWeJXFKniGGOpBgMLmerfO2aCyCU5s7nJ/rpAepqmFifv/GCbSbueEeAJJnmSQ2rKC/g8Fcw==",
       "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=14.0.0"
+      "requires": {
+        "debug": "^4.1.0",
+        "detect-node": "^2.0.4",
+        "hpack.js": "^2.1.6",
+        "obuf": "^1.1.2",
+        "readable-stream": "^3.0.6",
+        "wbuf": "^1.7.3"
       }
     },
-    "node_modules/to-fast-properties": {
-      "version": "2.0.0",
-      "license": "MIT",
-      "engines": {
-        "node": ">=4"
-      }
+    "stackback": {
+      "version": "0.0.2",
+      "resolved": "https://registry.npmjs.org/stackback/-/stackback-0.0.2.tgz",
+      "integrity": "sha512-1XMJE5fQo1jGH6Y/7ebnwPOBEkIEnT4QF32d5R1+VXdXveM0IBMJt8zfaxX1P3QhVwrYe+576+jkANtSS2mBbw==",
+      "dev": true
     },
-    "node_modules/to-no-case": {
-      "version": "1.0.2",
-      "dev": true,
-      "license": "MIT"
+    "stackframe": {
+      "version": "1.3.4",
+      "resolved": "https://registry.npmjs.org/stackframe/-/stackframe-1.3.4.tgz",
+      "integrity": "sha512-oeVtt7eWQS+Na6F//S4kJ2K2VbRlS9D43mAlMyVpVWovy9o+jfgH8O9agzANzaiLjclA0oYzUXEM4PurhSUChw==",
+      "dev": true
     },
-    "node_modules/to-pascal-case": {
-      "version": "1.0.0",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "to-space-case": "^1.0.0"
-      }
+    "statuses": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/statuses/-/statuses-2.0.1.tgz",
+      "integrity": "sha512-RwNA9Z/7PrK06rYLIzFMlaF+l73iwpzsqRIFgbMLbTcLD6cOao82TaWefPXQvB2fOC4AjuYSEndS7N/mTCbkdQ==",
+      "dev": true
     },
-    "node_modules/to-regex-range": {
-      "version": "5.0.1",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "is-number": "^7.0.0"
-      },
-      "engines": {
-        "node": ">=8.0"
-      }
+    "std-env": {
+      "version": "3.5.0",
+      "resolved": "https://registry.npmjs.org/std-env/-/std-env-3.5.0.tgz",
+      "integrity": "sha512-JGUEaALvL0Mf6JCfYnJOTcobY+Nc7sG/TemDRBqCA0wEr4DER7zDchaaixTlmOxAjG1uRJmX82EQcxwTQTkqVA==",
+      "dev": true
     },
-    "node_modules/to-space-case": {
+    "stop-iteration-iterator": {
       "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/stop-iteration-iterator/-/stop-iteration-iterator-1.0.0.tgz",
+      "integrity": "sha512-iCGQj+0l0HOdZ2AEeBADlsRC+vsnDsZsbdSiH1yNSjcfKM7fdpCMfqAL/dwF5BLiw/XhRft/Wax6zQbhq2BcjQ==",
       "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "to-no-case": "^1.0.0"
+      "requires": {
+        "internal-slot": "^1.0.4"
       }
     },
-    "node_modules/toidentifier": {
-      "version": "1.0.1",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=0.6"
+    "stream-browserify": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/stream-browserify/-/stream-browserify-3.0.0.tgz",
+      "integrity": "sha512-H73RAHsVBapbim0tU2JwwOiXUj+fikfiaoYAKHF3VJfA0pe2BCzkhAHBlLG6REzE+2WNZcxOXjK7lkso+9euLA==",
+      "requires": {
+        "inherits": "~2.0.4",
+        "readable-stream": "^3.5.0"
       }
     },
-    "node_modules/triplesec": {
-      "version": "4.0.3",
-      "resolved": "https://registry.npmjs.org/triplesec/-/triplesec-4.0.3.tgz",
-      "integrity": "sha512-fug70e1nJoCMxsXQJlETisAALohm84vl++IiTTHEqM7Lgqwz62jrlwqOC/gJEAJjO/ByN127sEcioB56HW3wIw==",
-      "dependencies": {
-        "iced-error": ">=0.0.9",
-        "iced-lock": "^1.0.1",
-        "iced-runtime": "^1.0.2",
-        "more-entropy": ">=0.0.7",
-        "progress": "~1.1.2",
-        "uglify-js": "^3.1.9"
+    "string_decoder": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.3.0.tgz",
+      "integrity": "sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==",
+      "requires": {
+        "safe-buffer": "~5.2.0"
       }
     },
-    "node_modules/ts-loader": {
-      "version": "9.5.1",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "chalk": "^4.1.0",
-        "enhanced-resolve": "^5.0.0",
-        "micromatch": "^4.0.0",
-        "semver": "^7.3.4",
-        "source-map": "^0.7.4"
-      },
-      "engines": {
-        "node": ">=12.0.0"
-      },
-      "peerDependencies": {
-        "typescript": "*",
-        "webpack": "^5.0.0"
+    "string-argv": {
+      "version": "0.3.2",
+      "resolved": "https://registry.npmjs.org/string-argv/-/string-argv-0.3.2.tgz",
+      "integrity": "sha512-aqD2Q0144Z+/RqG52NeHEkZauTAUWJO8c6yTftGJKO3Tja5tUgIfmIl6kExvhtxSDP7fXB6DvzkfMpCd/F3G+Q==",
+      "dev": true
+    },
+    "string-to-color": {
+      "version": "2.2.2",
+      "resolved": "https://registry.npmjs.org/string-to-color/-/string-to-color-2.2.2.tgz",
+      "integrity": "sha512-XeA2goP7PNsSlz8RRn6KhYswnMf5Tl+38ajfy8n4oZJyMGC4qqKgHNHsZ/3qwvr42NRIjf9eSr721SyetDeMkA==",
+      "requires": {
+        "colornames": "^1.1.1",
+        "hex-rgb": "^4.1.0",
+        "lodash.padend": "^4.6.1",
+        "lodash.trimstart": "^4.5.1",
+        "lodash.words": "^4.2.0",
+        "rgb-hex": "^3.0.0"
       }
     },
-    "node_modules/ts-loader/node_modules/ansi-styles": {
-      "version": "4.3.0",
+    "string-width": {
+      "version": "5.1.2",
+      "resolved": "https://registry.npmjs.org/string-width/-/string-width-5.1.2.tgz",
+      "integrity": "sha512-HnLOCR3vjcY8beoNLtcjZ5/nxn2afmME6lhrDrebokqMap+XbeW8n9TXpPDOqdGK5qcI3oT0GKTW6wC7EMiVqA==",
       "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "color-convert": "^2.0.1"
-      },
-      "engines": {
-        "node": ">=8"
+      "requires": {
+        "eastasianwidth": "^0.2.0",
+        "emoji-regex": "^9.2.2",
+        "strip-ansi": "^7.0.1"
       },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
+      "dependencies": {
+        "ansi-regex": {
+          "version": "6.0.1",
+          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.0.1.tgz",
+          "integrity": "sha512-n5M855fKb2SsfMIiFFoVrABHJC8QtHwVx+mHWP3QcEqBHYienj5dHSgjbxtC0WEZXYt4wcD6zrQElDPhFuZgfA==",
+          "dev": true
+        },
+        "strip-ansi": {
+          "version": "7.1.0",
+          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.1.0.tgz",
+          "integrity": "sha512-iq6eVVI64nQQTRYq2KtEg2d2uU7LElhTJwsH4YzIHZshxlgZms/wIc4VoDQTlG/IvVIrBKG06CrZnp0qv7hkcQ==",
+          "dev": true,
+          "requires": {
+            "ansi-regex": "^6.0.1"
+          }
+        }
       }
     },
-    "node_modules/ts-loader/node_modules/chalk": {
-      "version": "4.1.2",
+    "string.fromcodepoint": {
+      "version": "0.2.1",
+      "resolved": "https://registry.npmjs.org/string.fromcodepoint/-/string.fromcodepoint-0.2.1.tgz",
+      "integrity": "sha512-n69H31OnxSGSZyZbgBlvYIXlrMhJQ0dQAX1js1QDhpaUH6zmU3QYlj07bCwCNlPOu3oRXIubGPl2gDGnHsiCqg==",
+      "dev": true
+    },
+    "string.prototype.matchall": {
+      "version": "4.0.8",
+      "resolved": "https://registry.npmjs.org/string.prototype.matchall/-/string.prototype.matchall-4.0.8.tgz",
+      "integrity": "sha512-6zOCOcJ+RJAQshcTvXPHoxoQGONa3e/Lqx90wUA+wEzX78sg5Bo+1tQo4N0pohS0erG9qtCqJDjNCQBjeWVxyg==",
       "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "ansi-styles": "^4.1.0",
-        "supports-color": "^7.1.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/chalk?sponsor=1"
+      "requires": {
+        "call-bind": "^1.0.2",
+        "define-properties": "^1.1.4",
+        "es-abstract": "^1.20.4",
+        "get-intrinsic": "^1.1.3",
+        "has-symbols": "^1.0.3",
+        "internal-slot": "^1.0.3",
+        "regexp.prototype.flags": "^1.4.3",
+        "side-channel": "^1.0.4"
       }
     },
-    "node_modules/ts-loader/node_modules/color-convert": {
-      "version": "2.0.1",
+    "string.prototype.trim": {
+      "version": "1.2.7",
+      "resolved": "https://registry.npmjs.org/string.prototype.trim/-/string.prototype.trim-1.2.7.tgz",
+      "integrity": "sha512-p6TmeT1T3411M8Cgg9wBTMRtY2q9+PNy9EV1i2lIXUN/btt763oIfxwN3RR8VU6wHX8j/1CFy0L+YuThm6bgOg==",
       "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "color-name": "~1.1.4"
-      },
-      "engines": {
-        "node": ">=7.0.0"
+      "requires": {
+        "call-bind": "^1.0.2",
+        "define-properties": "^1.1.4",
+        "es-abstract": "^1.20.4"
       }
     },
-    "node_modules/ts-loader/node_modules/color-name": {
-      "version": "1.1.4",
+    "string.prototype.trimend": {
+      "version": "1.0.6",
+      "resolved": "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.6.tgz",
+      "integrity": "sha512-JySq+4mrPf9EsDBEDYMOb/lM7XQLulwg5R/m1r0PXEFqrV0qHvl58sdTilSXtKOflCsK2E8jxf+GKC0T07RWwQ==",
       "dev": true,
-      "license": "MIT"
+      "requires": {
+        "call-bind": "^1.0.2",
+        "define-properties": "^1.1.4",
+        "es-abstract": "^1.20.4"
+      }
     },
-    "node_modules/ts-loader/node_modules/has-flag": {
-      "version": "4.0.0",
+    "string.prototype.trimstart": {
+      "version": "1.0.6",
+      "resolved": "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.6.tgz",
+      "integrity": "sha512-omqjMDaY92pbn5HOX7f9IccLA+U1tA9GvtU4JrodiXFfYB7jPzzHpRzpglLAjtUV6bB557zwClJezTqnAiYnQA==",
       "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=8"
+      "requires": {
+        "call-bind": "^1.0.2",
+        "define-properties": "^1.1.4",
+        "es-abstract": "^1.20.4"
       }
     },
-    "node_modules/ts-loader/node_modules/lru-cache": {
-      "version": "6.0.0",
-      "dev": true,
-      "license": "ISC",
-      "dependencies": {
-        "yallist": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=10"
+    "strip-ansi": {
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
+      "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
+      "requires": {
+        "ansi-regex": "^5.0.1"
       }
     },
-    "node_modules/ts-loader/node_modules/semver": {
-      "version": "7.5.4",
+    "strip-bom": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz",
+      "integrity": "sha512-vavAMRXOgBVNF6nyEEmL3DBK19iRpDcoIwW+swQ+CbGiu7lju6t+JklA1MHweoWtadgt4ISVUsXLyDq34ddcwA==",
+      "dev": true
+    },
+    "strip-final-newline": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/strip-final-newline/-/strip-final-newline-2.0.0.tgz",
+      "integrity": "sha512-BrpvfNAE3dcvq7ll3xVumzjKjZQ5tI1sEUIKr3Uoks0XUl45St3FlatVqef9prk4jRDzhW6WZg+3bk93y6pLjA==",
+      "dev": true
+    },
+    "strip-json-comments": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz",
+      "integrity": "sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==",
+      "dev": true
+    },
+    "strip-literal": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/strip-literal/-/strip-literal-1.3.0.tgz",
+      "integrity": "sha512-PugKzOsyXpArk0yWmUwqOZecSO0GH0bPoctLcqNDH9J04pVW3lflYE0ujElBGTloevcxF5MofAOZ7C5l2b+wLg==",
       "dev": true,
-      "license": "ISC",
-      "dependencies": {
-        "lru-cache": "^6.0.0"
-      },
-      "bin": {
-        "semver": "bin/semver.js"
-      },
-      "engines": {
-        "node": ">=10"
+      "requires": {
+        "acorn": "^8.10.0"
       }
-    },
-    "node_modules/ts-loader/node_modules/supports-color": {
-      "version": "7.2.0",
+    },
+    "style-loader": {
+      "version": "3.3.3",
+      "resolved": "https://registry.npmjs.org/style-loader/-/style-loader-3.3.3.tgz",
+      "integrity": "sha512-53BiGLXAcll9maCYtZi2RCQZKa8NQQai5C4horqKyRmHj9H7QmcUyucrH+4KW/gBQbXM2AsB0axoEcFZPlfPcw==",
       "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "has-flag": "^4.0.0"
+      "requires": {}
+    },
+    "styled-components": {
+      "version": "5.3.11",
+      "resolved": "https://registry.npmjs.org/styled-components/-/styled-components-5.3.11.tgz",
+      "integrity": "sha512-uuzIIfnVkagcVHv9nE0VPlHPSCmXIUGKfJ42LNjxCCTDTL5sgnJ8Z7GZBq0EnLYGln77tPpEpExt2+qa+cZqSw==",
+      "requires": {
+        "@babel/helper-module-imports": "^7.0.0",
+        "@babel/traverse": "^7.4.5",
+        "@emotion/is-prop-valid": "^1.1.0",
+        "@emotion/stylis": "^0.8.4",
+        "@emotion/unitless": "^0.7.4",
+        "babel-plugin-styled-components": ">= 1.12.0",
+        "css-to-react-native": "^3.0.0",
+        "hoist-non-react-statics": "^3.0.0",
+        "shallowequal": "^1.1.0",
+        "supports-color": "^5.5.0"
       },
-      "engines": {
-        "node": ">=8"
+      "dependencies": {
+        "@emotion/unitless": {
+          "version": "0.7.5",
+          "resolved": "https://registry.npmjs.org/@emotion/unitless/-/unitless-0.7.5.tgz",
+          "integrity": "sha512-OWORNpfjMsSSUBVrRBVGECkhWcULOAJz9ZW8uK9qgxD+87M7jHRcvh/A96XXNhXTLmKcoYSQtBEX7lHMO7YRwg=="
+        }
       }
     },
-    "node_modules/ts-loader/node_modules/yallist": {
-      "version": "4.0.0",
-      "dev": true,
-      "license": "ISC"
+    "summary": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/summary/-/summary-2.1.0.tgz",
+      "integrity": "sha512-nMIjMrd5Z2nuB2RZCKJfFMjgS3fygbeyGk9PxPPaJR1RIcyN9yn4A63Isovzm3ZtQuEkLBVgMdPup8UeLH7aQw==",
+      "dev": true
     },
-    "node_modules/ts-transformer-keys": {
-      "version": "0.4.4",
-      "license": "MIT",
-      "peerDependencies": {
-        "typescript": ">=2.4.1"
+    "superjson": {
+      "version": "2.2.1",
+      "resolved": "https://registry.npmjs.org/superjson/-/superjson-2.2.1.tgz",
+      "integrity": "sha512-8iGv75BYOa0xRJHK5vRLEjE2H/i4lulTjzpUXic3Eg8akftYjkmQDa8JARQ42rlczXyFR3IeRoeFCc7RxHsYZA==",
+      "requires": {
+        "copy-anything": "^3.0.2"
       }
     },
-    "node_modules/tsc-files": {
-      "version": "1.1.4",
-      "dev": true,
-      "license": "MIT",
-      "bin": {
-        "tsc-files": "cli.js"
-      },
-      "peerDependencies": {
-        "typescript": ">=3"
+    "supports-color": {
+      "version": "5.5.0",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
+      "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
+      "requires": {
+        "has-flag": "^3.0.0"
       }
     },
-    "node_modules/tsconfck": {
-      "version": "3.1.0",
+    "supports-preserve-symlinks-flag": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz",
+      "integrity": "sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w==",
+      "dev": true
+    },
+    "swiper": {
+      "version": "11.0.6",
+      "resolved": "https://registry.npmjs.org/swiper/-/swiper-11.0.6.tgz",
+      "integrity": "sha512-W/Me7MQl5rNgdM5x9i3Gll76WsyVpnHn91GhBOyL7RCFUeg62aVnflzlVfIpXzZ/87FtJOfAoDH79ZH2Yq76zA=="
+    },
+    "tapable": {
+      "version": "2.2.1",
+      "resolved": "https://registry.npmjs.org/tapable/-/tapable-2.2.1.tgz",
+      "integrity": "sha512-GNzQvQTOIP6RyTfE2Qxb8ZVlNmw0n88vp1szwWRimP02mnTsx3Wtn5qRdqY9w2XduFNUgvOwhNnQsjwCp+kqaQ==",
+      "dev": true
+    },
+    "terser": {
+      "version": "5.19.2",
+      "resolved": "https://registry.npmjs.org/terser/-/terser-5.19.2.tgz",
+      "integrity": "sha512-qC5+dmecKJA4cpYxRa5aVkKehYsQKc+AHeKl0Oe62aYjBL8ZA33tTljktDHJSaxxMnbI5ZYw+o/S2DxxLu8OfA==",
       "dev": true,
-      "license": "MIT",
-      "bin": {
-        "tsconfck": "bin/tsconfck.js"
-      },
-      "engines": {
-        "node": "^18 || >=20"
-      },
-      "peerDependencies": {
-        "typescript": "^5.0.0"
+      "requires": {
+        "@jridgewell/source-map": "^0.3.3",
+        "acorn": "^8.8.2",
+        "commander": "^2.20.0",
+        "source-map-support": "~0.5.20"
       },
-      "peerDependenciesMeta": {
-        "typescript": {
-          "optional": true
+      "dependencies": {
+        "commander": {
+          "version": "2.20.3",
+          "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz",
+          "integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==",
+          "dev": true
+        },
+        "source-map": {
+          "version": "0.6.1",
+          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+          "dev": true
+        },
+        "source-map-support": {
+          "version": "0.5.21",
+          "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.21.tgz",
+          "integrity": "sha512-uBHU3L3czsIyYXKX88fdrGovxdSCoTGDRZ6SYXtSRxLZUzHg5P/66Ht6uoUlHu9EZod+inXhKo3qQgwXUT/y1w==",
+          "dev": true,
+          "requires": {
+            "buffer-from": "^1.0.0",
+            "source-map": "^0.6.0"
+          }
         }
       }
     },
-    "node_modules/tsconfig-paths": {
-      "version": "3.14.2",
+    "terser-webpack-plugin": {
+      "version": "5.3.9",
+      "resolved": "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-5.3.9.tgz",
+      "integrity": "sha512-ZuXsqE07EcggTWQjXUj+Aot/OMcD0bMKGgF63f7UxYcu5/AJF53aIpK1YoP5xR9l6s/Hy2b+t1AM0bLNPRuhwA==",
       "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "@types/json5": "^0.0.29",
-        "json5": "^1.0.2",
-        "minimist": "^1.2.6",
-        "strip-bom": "^3.0.0"
+      "requires": {
+        "@jridgewell/trace-mapping": "^0.3.17",
+        "jest-worker": "^27.4.5",
+        "schema-utils": "^3.1.1",
+        "serialize-javascript": "^6.0.1",
+        "terser": "^5.16.8"
       }
     },
-    "node_modules/tsconfig-paths-webpack-plugin": {
-      "version": "4.1.0",
+    "text-table": {
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz",
+      "integrity": "sha512-N+8UisAXDGk8PFXP4HAzVR9nbfmVJ3zYLAWiTIoqC5v5isinhr+r5uaO8+7r3BMfuNIufIsA7RdpVgacC2cSpw==",
+      "dev": true
+    },
+    "through": {
+      "version": "2.3.8",
+      "resolved": "https://registry.npmjs.org/through/-/through-2.3.8.tgz",
+      "integrity": "sha512-w89qg7PI8wAdvX60bMDP+bFoD5Dvhm9oLheFp5O4a2QF0cSBGsBX4qZmadPMvVqlLJBBci+WqGGOAPvcDeNSVg==",
+      "dev": true
+    },
+    "thunky": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/thunky/-/thunky-1.1.0.tgz",
+      "integrity": "sha512-eHY7nBftgThBqOyHGVN+l8gF0BucP09fMo0oO/Lb0w1OF80dJv+lDVpXG60WMQvkcxAkNybKsrEIE3ZtKGmPrA==",
+      "dev": true
+    },
+    "tinybench": {
+      "version": "2.5.1",
+      "resolved": "https://registry.npmjs.org/tinybench/-/tinybench-2.5.1.tgz",
+      "integrity": "sha512-65NKvSuAVDP/n4CqH+a9w2kTlLReS9vhsAP06MWx+/89nMinJyB2icyl58RIcqCmIggpojIGeuJGhjU1aGMBSg==",
+      "dev": true
+    },
+    "tinypool": {
+      "version": "0.7.0",
+      "resolved": "https://registry.npmjs.org/tinypool/-/tinypool-0.7.0.tgz",
+      "integrity": "sha512-zSYNUlYSMhJ6Zdou4cJwo/p7w5nmAH17GRfU/ui3ctvjXFErXXkruT4MWW6poDeXgCaIBlGLrfU6TbTXxyGMww==",
+      "dev": true
+    },
+    "tinyspy": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/tinyspy/-/tinyspy-2.2.0.tgz",
+      "integrity": "sha512-d2eda04AN/cPOR89F7Xv5bK/jrQEhmcLFe6HFldoeO9AJtps+fqEnh486vnT/8y4bw38pSyxDcTCAq+Ks2aJTg==",
+      "dev": true
+    },
+    "to-fast-properties": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-2.0.0.tgz",
+      "integrity": "sha512-/OaKK0xYrs3DmxRYqL/yDc+FxFUVYhDlXMhRmv3z915w2HF1tnN1omB354j8VUGO/hbRzyD6Y3sA7v7GS/ceog=="
+    },
+    "to-no-case": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/to-no-case/-/to-no-case-1.0.2.tgz",
+      "integrity": "sha512-Z3g735FxuZY8rodxV4gH7LxClE4H0hTIyHNIHdk+vpQxjLm0cwnKXq/OFVZ76SOQmto7txVcwSCwkU5kqp+FKg==",
+      "dev": true
+    },
+    "to-pascal-case": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/to-pascal-case/-/to-pascal-case-1.0.0.tgz",
+      "integrity": "sha512-QGMWHqM6xPrcQW57S23c5/3BbYb0Tbe9p+ur98ckRnGDwD4wbbtDiYI38CfmMKNB5Iv0REjs5SNDntTwvDxzZA==",
       "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "chalk": "^4.1.0",
-        "enhanced-resolve": "^5.7.0",
-        "tsconfig-paths": "^4.1.2"
-      },
-      "engines": {
-        "node": ">=10.13.0"
+      "requires": {
+        "to-space-case": "^1.0.0"
       }
     },
-    "node_modules/tsconfig-paths-webpack-plugin/node_modules/ansi-styles": {
-      "version": "4.3.0",
+    "to-regex-range": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz",
+      "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==",
       "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "color-convert": "^2.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
+      "requires": {
+        "is-number": "^7.0.0"
       }
     },
-    "node_modules/tsconfig-paths-webpack-plugin/node_modules/chalk": {
-      "version": "4.1.2",
+    "to-space-case": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/to-space-case/-/to-space-case-1.0.0.tgz",
+      "integrity": "sha512-rLdvwXZ39VOn1IxGL3V6ZstoTbwLRckQmn/U8ZDLuWwIXNpuZDhQ3AiRUlhTbOXFVE9C+dR51wM0CBDhk31VcA==",
       "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "ansi-styles": "^4.1.0",
-        "supports-color": "^7.1.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/chalk?sponsor=1"
+      "requires": {
+        "to-no-case": "^1.0.0"
       }
     },
-    "node_modules/tsconfig-paths-webpack-plugin/node_modules/color-convert": {
-      "version": "2.0.1",
+    "toidentifier": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/toidentifier/-/toidentifier-1.0.1.tgz",
+      "integrity": "sha512-o5sSPKEkg/DIQNmH43V0/uerLrpzVedkUh8tGNvaeXpfpuwjKenlSox/2O/BTlZUtEe+JG7s5YhEz608PlAHRA==",
+      "dev": true
+    },
+    "triplesec": {
+      "version": "4.0.3",
+      "resolved": "https://registry.npmjs.org/triplesec/-/triplesec-4.0.3.tgz",
+      "integrity": "sha512-fug70e1nJoCMxsXQJlETisAALohm84vl++IiTTHEqM7Lgqwz62jrlwqOC/gJEAJjO/ByN127sEcioB56HW3wIw==",
+      "requires": {
+        "iced-error": ">=0.0.9",
+        "iced-lock": "^1.0.1",
+        "iced-runtime": "^1.0.2",
+        "more-entropy": ">=0.0.7",
+        "progress": "~1.1.2",
+        "uglify-js": "^3.1.9"
+      }
+    },
+    "ts-loader": {
+      "version": "9.5.1",
+      "resolved": "https://registry.npmjs.org/ts-loader/-/ts-loader-9.5.1.tgz",
+      "integrity": "sha512-rNH3sK9kGZcH9dYzC7CewQm4NtxJTjSEVRJ2DyBZR7f8/wcta+iV44UPCXc5+nzDzivKtlzV6c9P4e+oFhDLYg==",
       "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "color-name": "~1.1.4"
+      "requires": {
+        "chalk": "^4.1.0",
+        "enhanced-resolve": "^5.0.0",
+        "micromatch": "^4.0.0",
+        "semver": "^7.3.4",
+        "source-map": "^0.7.4"
       },
-      "engines": {
-        "node": ">=7.0.0"
+      "dependencies": {
+        "ansi-styles": {
+          "version": "4.3.0",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+          "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+          "dev": true,
+          "requires": {
+            "color-convert": "^2.0.1"
+          }
+        },
+        "chalk": {
+          "version": "4.1.2",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
+          "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+          "dev": true,
+          "requires": {
+            "ansi-styles": "^4.1.0",
+            "supports-color": "^7.1.0"
+          }
+        },
+        "color-convert": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+          "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+          "dev": true,
+          "requires": {
+            "color-name": "~1.1.4"
+          }
+        },
+        "color-name": {
+          "version": "1.1.4",
+          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+          "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+          "dev": true
+        },
+        "has-flag": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+          "dev": true
+        },
+        "lru-cache": {
+          "version": "6.0.0",
+          "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
+          "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
+          "dev": true,
+          "requires": {
+            "yallist": "^4.0.0"
+          }
+        },
+        "semver": {
+          "version": "7.5.4",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz",
+          "integrity": "sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==",
+          "dev": true,
+          "requires": {
+            "lru-cache": "^6.0.0"
+          }
+        },
+        "supports-color": {
+          "version": "7.2.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+          "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+          "dev": true,
+          "requires": {
+            "has-flag": "^4.0.0"
+          }
+        },
+        "yallist": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
+          "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==",
+          "dev": true
+        }
       }
     },
-    "node_modules/tsconfig-paths-webpack-plugin/node_modules/color-name": {
-      "version": "1.1.4",
-      "dev": true,
-      "license": "MIT"
+    "ts-transformer-keys": {
+      "version": "0.4.4",
+      "resolved": "https://registry.npmjs.org/ts-transformer-keys/-/ts-transformer-keys-0.4.4.tgz",
+      "integrity": "sha512-LrqgvaFvar01/5mbunRyeLTSIkqoC2xfcpL/90aDY6vR07DGyH+UaYGdIEsUudnlAw2Sr0pxFgdZvE0QIyI4qA==",
+      "requires": {}
     },
-    "node_modules/tsconfig-paths-webpack-plugin/node_modules/has-flag": {
-      "version": "4.0.0",
+    "tsc-files": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/tsc-files/-/tsc-files-1.1.4.tgz",
+      "integrity": "sha512-RePsRsOLru3BPpnf237y1Xe1oCGta8rmSYzM76kYo5tLGsv5R2r3s64yapYorGTPuuLyfS9NVbh9ydzmvNie2w==",
       "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=8"
-      }
+      "requires": {}
     },
-    "node_modules/tsconfig-paths-webpack-plugin/node_modules/supports-color": {
-      "version": "7.2.0",
+    "tsconfck": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/tsconfck/-/tsconfck-3.1.0.tgz",
+      "integrity": "sha512-CMjc5zMnyAjcS9sPLytrbFmj89st2g+JYtY/c02ug4Q+CZaAtCgbyviI0n1YvjZE/pzoc6FbNsINS13DOL1B9w==",
       "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "has-flag": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
+      "requires": {}
     },
-    "node_modules/tsconfig-paths-webpack-plugin/node_modules/tsconfig-paths": {
-      "version": "4.2.0",
+    "tsconfig-paths": {
+      "version": "3.14.2",
+      "resolved": "https://registry.npmjs.org/tsconfig-paths/-/tsconfig-paths-3.14.2.tgz",
+      "integrity": "sha512-o/9iXgCYc5L/JxCHPe3Hvh8Q/2xm5Z+p18PESBU6Ff33695QnCHBEjcytY2q19ua7Mbl/DavtBOLq+oG0RCL+g==",
       "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "json5": "^2.2.2",
+      "requires": {
+        "@types/json5": "^0.0.29",
+        "json5": "^1.0.2",
         "minimist": "^1.2.6",
         "strip-bom": "^3.0.0"
       },
-      "engines": {
-        "node": ">=6"
+      "dependencies": {
+        "json5": {
+          "version": "1.0.2",
+          "resolved": "https://registry.npmjs.org/json5/-/json5-1.0.2.tgz",
+          "integrity": "sha512-g1MWMLBiz8FKi1e4w0UyVL3w+iJceWAFBAaBnnGKOpNa5f8TLktkbre1+s6oICydWAm+HRUGTmI+//xv2hvXYA==",
+          "dev": true,
+          "requires": {
+            "minimist": "^1.2.0"
+          }
+        }
       }
     },
-    "node_modules/tsconfig-paths/node_modules/json5": {
-      "version": "1.0.2",
+    "tsconfig-paths-webpack-plugin": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/tsconfig-paths-webpack-plugin/-/tsconfig-paths-webpack-plugin-4.1.0.tgz",
+      "integrity": "sha512-xWFISjviPydmtmgeUAuXp4N1fky+VCtfhOkDUFIv5ea7p4wuTomI4QTrXvFBX2S4jZsmyTSrStQl+E+4w+RzxA==",
       "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "minimist": "^1.2.0"
+      "requires": {
+        "chalk": "^4.1.0",
+        "enhanced-resolve": "^5.7.0",
+        "tsconfig-paths": "^4.1.2"
       },
-      "bin": {
-        "json5": "lib/cli.js"
+      "dependencies": {
+        "ansi-styles": {
+          "version": "4.3.0",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+          "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+          "dev": true,
+          "requires": {
+            "color-convert": "^2.0.1"
+          }
+        },
+        "chalk": {
+          "version": "4.1.2",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
+          "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+          "dev": true,
+          "requires": {
+            "ansi-styles": "^4.1.0",
+            "supports-color": "^7.1.0"
+          }
+        },
+        "color-convert": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+          "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+          "dev": true,
+          "requires": {
+            "color-name": "~1.1.4"
+          }
+        },
+        "color-name": {
+          "version": "1.1.4",
+          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+          "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+          "dev": true
+        },
+        "has-flag": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+          "dev": true
+        },
+        "supports-color": {
+          "version": "7.2.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+          "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+          "dev": true,
+          "requires": {
+            "has-flag": "^4.0.0"
+          }
+        },
+        "tsconfig-paths": {
+          "version": "4.2.0",
+          "resolved": "https://registry.npmjs.org/tsconfig-paths/-/tsconfig-paths-4.2.0.tgz",
+          "integrity": "sha512-NoZ4roiN7LnbKn9QqE1amc9DJfzvZXxF4xDavcOWt1BPkdx+m+0gJuPM+S0vCe7zTJMYUP0R8pO2XMr+Y8oLIg==",
+          "dev": true,
+          "requires": {
+            "json5": "^2.2.2",
+            "minimist": "^1.2.6",
+            "strip-bom": "^3.0.0"
+          }
+        }
       }
     },
-    "node_modules/tslib": {
+    "tslib": {
       "version": "2.6.1",
-      "license": "0BSD"
+      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.1.tgz",
+      "integrity": "sha512-t0hLfiEKfMUoqhG+U1oid7Pva4bbDPHYfJNiB7BiIjRkj1pyC++4N3huJfqY6aRH6VTB0rvtzQwjM4K6qpfOig=="
     },
-    "node_modules/tsutils": {
+    "tsutils": {
       "version": "3.21.0",
+      "resolved": "https://registry.npmjs.org/tsutils/-/tsutils-3.21.0.tgz",
+      "integrity": "sha512-mHKK3iUXL+3UF6xL5k0PEhKRUBKPBCv/+RkEOpjRWxxx27KKRBmmA60A9pgOUvMi8GKhRMPEmjBRPzs2W7O1OA==",
       "dev": true,
-      "license": "MIT",
-      "dependencies": {
+      "requires": {
         "tslib": "^1.8.1"
       },
-      "engines": {
-        "node": ">= 6"
-      },
-      "peerDependencies": {
-        "typescript": ">=2.8.0 || >= 3.2.0-dev || >= 3.3.0-dev || >= 3.4.0-dev || >= 3.5.0-dev || >= 3.6.0-dev || >= 3.6.0-beta || >= 3.7.0-dev || >= 3.7.0-beta"
-      }
-    },
-    "node_modules/tsutils/node_modules/tslib": {
-      "version": "1.14.1",
-      "dev": true,
-      "license": "0BSD"
+      "dependencies": {
+        "tslib": {
+          "version": "1.14.1",
+          "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz",
+          "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==",
+          "dev": true
+        }
+      }
     },
-    "node_modules/type-check": {
+    "type-check": {
       "version": "0.4.0",
+      "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.4.0.tgz",
+      "integrity": "sha512-XleUoc9uwGXqjWwXaUTZAmzMcFZ5858QA2vvx1Ur5xIcixXIP+8LnFDgRplU30us6teqdlskFfu+ae4K79Ooew==",
       "dev": true,
-      "license": "MIT",
-      "dependencies": {
+      "requires": {
         "prelude-ls": "^1.2.1"
-      },
-      "engines": {
-        "node": ">= 0.8.0"
       }
     },
-    "node_modules/type-detect": {
+    "type-detect": {
       "version": "4.0.8",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=4"
-      }
+      "resolved": "https://registry.npmjs.org/type-detect/-/type-detect-4.0.8.tgz",
+      "integrity": "sha512-0fr/mIH1dlO+x7TlcMy+bIDqKPsw/70tVyeHW787goQjhmqaZe10uwLujubK9q9Lg6Fiho1KUKDYz0Z7k7g5/g==",
+      "dev": true
     },
-    "node_modules/type-fest": {
+    "type-fest": {
       "version": "2.19.0",
-      "dev": true,
-      "license": "(MIT OR CC0-1.0)",
-      "engines": {
-        "node": ">=12.20"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
+      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-2.19.0.tgz",
+      "integrity": "sha512-RAH822pAdBgcNMAfWnCBU3CFZcfZ/i1eZjwFU/dsLKumyuuP3niueg2UAukXYF0E2AAoc82ZSSf9J0WQBinzHA==",
+      "dev": true
     },
-    "node_modules/type-is": {
+    "type-is": {
       "version": "1.6.18",
+      "resolved": "https://registry.npmjs.org/type-is/-/type-is-1.6.18.tgz",
+      "integrity": "sha512-TkRKr9sUTxEH8MdfuCSP7VizJyzRNMjj2J2do2Jr3Kym598JVdEksuzPQCnlFPW4ky9Q+iA+ma9BGm06XQBy8g==",
       "dev": true,
-      "license": "MIT",
-      "dependencies": {
+      "requires": {
         "media-typer": "0.3.0",
         "mime-types": "~2.1.24"
-      },
-      "engines": {
-        "node": ">= 0.6"
       }
     },
-    "node_modules/typed-array-buffer": {
+    "typed-array-buffer": {
       "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/typed-array-buffer/-/typed-array-buffer-1.0.0.tgz",
+      "integrity": "sha512-Y8KTSIglk9OZEr8zywiIHG/kmQ7KWyjseXs1CbSo8vC42w7hg2HgYTxSWwP0+is7bWDc1H+Fo026CpHFwm8tkw==",
       "dev": true,
-      "license": "MIT",
-      "dependencies": {
+      "requires": {
         "call-bind": "^1.0.2",
         "get-intrinsic": "^1.2.1",
         "is-typed-array": "^1.1.10"
-      },
-      "engines": {
-        "node": ">= 0.4"
       }
     },
-    "node_modules/typed-array-byte-length": {
+    "typed-array-byte-length": {
       "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/typed-array-byte-length/-/typed-array-byte-length-1.0.0.tgz",
+      "integrity": "sha512-Or/+kvLxNpeQ9DtSydonMxCx+9ZXOswtwJn17SNLvhptaXYDJvkFFP5zbfU/uLmvnBJlI4yrnXRxpdWH/M5tNA==",
       "dev": true,
-      "license": "MIT",
-      "dependencies": {
+      "requires": {
         "call-bind": "^1.0.2",
         "for-each": "^0.3.3",
         "has-proto": "^1.0.1",
         "is-typed-array": "^1.1.10"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/typed-array-byte-offset": {
+    "typed-array-byte-offset": {
       "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/typed-array-byte-offset/-/typed-array-byte-offset-1.0.0.tgz",
+      "integrity": "sha512-RD97prjEt9EL8YgAgpOkf3O4IF9lhJFr9g0htQkm0rchFp/Vx7LW5Q8fSXXub7BXAODyUQohRMyOc3faCPd0hg==",
       "dev": true,
-      "license": "MIT",
-      "dependencies": {
+      "requires": {
         "available-typed-arrays": "^1.0.5",
         "call-bind": "^1.0.2",
         "for-each": "^0.3.3",
         "has-proto": "^1.0.1",
         "is-typed-array": "^1.1.10"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/typed-array-length": {
+    "typed-array-length": {
       "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/typed-array-length/-/typed-array-length-1.0.4.tgz",
+      "integrity": "sha512-KjZypGq+I/H7HI5HlOoGHkWUUGq+Q0TPhQurLbyrVrvnKTBgzLhIJ7j6J/XTQOi0d1RjyZ0wdas8bKs2p0x3Ng==",
       "dev": true,
-      "license": "MIT",
-      "dependencies": {
+      "requires": {
         "call-bind": "^1.0.2",
         "for-each": "^0.3.3",
         "is-typed-array": "^1.1.9"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/typeforce": {
+    "typeforce": {
       "version": "1.18.0",
       "resolved": "https://registry.npmjs.org/typeforce/-/typeforce-1.18.0.tgz",
       "integrity": "sha512-7uc1O8h1M1g0rArakJdf0uLRSSgFcYexrVoKo+bzJd32gd4gDy2L/Z+8/FjPnU9ydY3pEnVPtr9FyscYY60K1g=="
     },
-    "node_modules/typescript": {
+    "typescript": {
       "version": "5.5.4",
       "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.5.4.tgz",
-      "integrity": "sha512-Mtq29sKDAEYP7aljRgtPOpTvOfbwRWlS6dPRzwjdE+C0R4brX/GUyhHSecbHMFLNBLcJIPt9nl9yG5TZ1weH+Q==",
-      "bin": {
-        "tsc": "bin/tsc",
-        "tsserver": "bin/tsserver"
-      },
-      "engines": {
-        "node": ">=14.17"
-      }
+      "integrity": "sha512-Mtq29sKDAEYP7aljRgtPOpTvOfbwRWlS6dPRzwjdE+C0R4brX/GUyhHSecbHMFLNBLcJIPt9nl9yG5TZ1weH+Q=="
     },
-    "node_modules/typescript-plugin-styled-components": {
+    "typescript-plugin-styled-components": {
       "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/typescript-plugin-styled-components/-/typescript-plugin-styled-components-3.0.0.tgz",
+      "integrity": "sha512-QWlhTl6NqsFxtJyxn7pJjm3RhgzXSByUftZ3AoQClrMMpa4yAaHuJKTN1gFpH3Ti+Rwm56fNUfG9pXSBU+WW3A==",
       "dev": true,
-      "license": "MIT",
-      "peerDependencies": {
-        "typescript": "~4.8 || 5"
-      }
+      "requires": {}
     },
-    "node_modules/ufo": {
+    "ufo": {
       "version": "1.3.2",
-      "dev": true,
-      "license": "MIT"
+      "resolved": "https://registry.npmjs.org/ufo/-/ufo-1.3.2.tgz",
+      "integrity": "sha512-o+ORpgGwaYQXgqGDwd+hkS4PuZ3QnmqMMxRuajK/a38L6fTpcE5GPIfrf+L/KemFzfUpeUQc1rRS1iDBozvnFA==",
+      "dev": true
     },
-    "node_modules/uglify-js": {
-      "version": "3.19.2",
-      "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.19.2.tgz",
-      "integrity": "sha512-S8KA6DDI47nQXJSi2ctQ629YzwOVs+bQML6DAtvy0wgNdpi+0ySpQK0g2pxBq2xfF2z3YCscu7NNA8nXT9PlIQ==",
-      "bin": {
-        "uglifyjs": "bin/uglifyjs"
-      },
-      "engines": {
-        "node": ">=0.8.0"
-      }
+    "uglify-js": {
+      "version": "3.19.1",
+      "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.19.1.tgz",
+      "integrity": "sha512-y/2wiW+ceTYR2TSSptAhfnEtpLaQ4Ups5zrjB2d3kuVxHj16j/QJwPl5PvuGy9uARb39J0+iKxcRPvtpsx4A4A=="
     },
-    "node_modules/unbox-primitive": {
+    "unbox-primitive": {
       "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/unbox-primitive/-/unbox-primitive-1.0.2.tgz",
+      "integrity": "sha512-61pPlCD9h51VoreyJ0BReideM3MDKMKnh6+V9L08331ipq6Q8OFXZYiqP6n/tbHx4s5I9uRhcye6BrbkizkBDw==",
       "dev": true,
-      "license": "MIT",
-      "dependencies": {
+      "requires": {
         "call-bind": "^1.0.2",
         "has-bigints": "^1.0.2",
         "has-symbols": "^1.0.3",
         "which-boxed-primitive": "^1.0.2"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/undici-types": {
+    "undici-types": {
       "version": "5.26.5",
-      "license": "MIT"
+      "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-5.26.5.tgz",
+      "integrity": "sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA=="
     },
-    "node_modules/unescape-js": {
+    "unescape-js": {
       "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/unescape-js/-/unescape-js-1.1.4.tgz",
+      "integrity": "sha512-42SD8NOQEhdYntEiUQdYq/1V/YHwr1HLwlHuTJB5InVVdOSbgI6xu8jK5q65yIzuFCfczzyDF/7hbGzVbyCw0g==",
       "dev": true,
-      "license": "MIT",
-      "dependencies": {
+      "requires": {
         "string.fromcodepoint": "^0.2.1"
       }
     },
-    "node_modules/universalify": {
+    "universalify": {
       "version": "2.0.1",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">= 10.0.0"
-      }
+      "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.1.tgz",
+      "integrity": "sha512-gptHNQghINnc/vTGIk0SOFGFNXw7JVrlRUtConJRlvaw6DuX0wO5Jeko9sWrMBhh+PsYAZ7oXAiOnf/UKogyiw==",
+      "dev": true
     },
-    "node_modules/unload": {
+    "unload": {
       "version": "2.2.0",
-      "license": "Apache-2.0",
-      "dependencies": {
+      "resolved": "https://registry.npmjs.org/unload/-/unload-2.2.0.tgz",
+      "integrity": "sha512-B60uB5TNBLtN6/LsgAf3udH9saB5p7gqJwcFfbOEZ8BcBHnGwCf6G/TGiEqkRAxX7zAFIUtzdrXQSdL3Q/wqNA==",
+      "requires": {
         "@babel/runtime": "^7.6.2",
         "detect-node": "^2.0.4"
       }
     },
-    "node_modules/unpipe": {
+    "unpipe": {
       "version": "1.0.0",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">= 0.8"
-      }
+      "resolved": "https://registry.npmjs.org/unpipe/-/unpipe-1.0.0.tgz",
+      "integrity": "sha512-pjy2bYhSsufwWlKwPc+l3cN7+wuJlK6uz0YdJEOlQDbl6jo/YlPi4mb8agUkVC8BF7V8NuzeyPNqRksA3hztKQ==",
+      "dev": true
     },
-    "node_modules/update-browserslist-db": {
+    "update-browserslist-db": {
       "version": "1.0.13",
-      "funding": [
-        {
-          "type": "opencollective",
-          "url": "https://opencollective.com/browserslist"
-        },
-        {
-          "type": "tidelift",
-          "url": "https://tidelift.com/funding/github/npm/browserslist"
-        },
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/ai"
-        }
-      ],
-      "license": "MIT",
-      "dependencies": {
+      "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.0.13.tgz",
+      "integrity": "sha512-xebP81SNcPuNpPP3uzeW1NYXxI3rxyJzF3pD6sH4jE7o/IX+WtSpwnVU+qIsDPyk0d3hmFQ7mjqc6AtV604hbg==",
+      "requires": {
         "escalade": "^3.1.1",
         "picocolors": "^1.0.0"
-      },
-      "bin": {
-        "update-browserslist-db": "cli.js"
-      },
-      "peerDependencies": {
-        "browserslist": ">= 4.21.0"
       }
     },
-    "node_modules/uri-js": {
+    "uri-js": {
       "version": "4.4.1",
+      "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.4.1.tgz",
+      "integrity": "sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==",
       "dev": true,
-      "license": "BSD-2-Clause",
-      "dependencies": {
+      "requires": {
         "punycode": "^2.1.0"
       }
     },
-    "node_modules/use-sync-external-store": {
+    "use-sync-external-store": {
       "version": "1.2.0",
-      "license": "MIT",
-      "peerDependencies": {
-        "react": "^16.8.0 || ^17.0.0 || ^18.0.0"
-      }
+      "resolved": "https://registry.npmjs.org/use-sync-external-store/-/use-sync-external-store-1.2.0.tgz",
+      "integrity": "sha512-eEgnFxGQ1Ife9bzYs6VLi8/4X6CObHMw9Qr9tPY43iKwsPw8xE8+EFsf/2cFZ5S3esXgpWgtSCtLNS41F+sKPA==",
+      "requires": {}
     },
-    "node_modules/util": {
+    "util": {
       "version": "0.12.5",
       "resolved": "https://registry.npmjs.org/util/-/util-0.12.5.tgz",
       "integrity": "sha512-kZf/K6hEIrWHI6XqOFUiiMa+79wE/D8Q+NCNAWclkyg3b4d2k7s0QGepNjiABc+aR3N1PAyHL7p6UcLY6LmrnA==",
-      "dependencies": {
+      "requires": {
         "inherits": "^2.0.3",
         "is-arguments": "^1.0.4",
         "is-generator-function": "^1.0.7",
@@ -11686,160 +24029,104 @@
         "which-typed-array": "^1.1.2"
       }
     },
-    "node_modules/util-deprecate": {
+    "util-deprecate": {
       "version": "1.0.2",
-      "license": "MIT"
+      "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
+      "integrity": "sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw=="
     },
-    "node_modules/utila": {
+    "utila": {
       "version": "0.4.0",
-      "dev": true,
-      "license": "MIT"
+      "resolved": "https://registry.npmjs.org/utila/-/utila-0.4.0.tgz",
+      "integrity": "sha512-Z0DbgELS9/L/75wZbro8xAnT50pBVFQZ+hUEueGDU5FN51YSCYM+jdxsfCiHjwNP/4LCDD0i/graKpeBnOXKRA==",
+      "dev": true
     },
-    "node_modules/utils-merge": {
+    "utils-merge": {
       "version": "1.0.1",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">= 0.4.0"
-      }
+      "resolved": "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.1.tgz",
+      "integrity": "sha512-pMZTvIkT1d+TFGvDOqodOclx0QWkkgi6Tdoa8gC8ffGAAqz9pzPTZWAybbsHHoED/ztMtkv/VoYTYyShUn81hA==",
+      "dev": true
     },
-    "node_modules/uuid": {
+    "uuid": {
       "version": "8.3.2",
-      "license": "MIT",
-      "bin": {
-        "uuid": "dist/bin/uuid"
-      }
+      "resolved": "https://registry.npmjs.org/uuid/-/uuid-8.3.2.tgz",
+      "integrity": "sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg=="
     },
-    "node_modules/uuidv4": {
+    "uuidv4": {
       "version": "6.2.13",
       "resolved": "https://registry.npmjs.org/uuidv4/-/uuidv4-6.2.13.tgz",
       "integrity": "sha512-AXyzMjazYB3ovL3q051VLH06Ixj//Knx7QnUSi1T//Ie3io6CpsPu9nVMOx5MoLWh6xV0B9J0hIaxungxXUbPQ==",
-      "dependencies": {
+      "requires": {
         "@types/uuid": "8.3.4",
         "uuid": "8.3.2"
       }
     },
-    "node_modules/valibot": {
+    "valibot": {
       "version": "0.33.2",
-      "license": "MIT"
+      "resolved": "https://registry.npmjs.org/valibot/-/valibot-0.33.2.tgz",
+      "integrity": "sha512-ZpFWuI+bs5+PP66q4zVFn4e4t/s5jmMw5iPBZmGUoi8iQqXyU9YY/BLCAyk62Z/bNS8qdUNBEyx52952qdqW3w=="
     },
-    "node_modules/valid-url": {
-      "version": "1.0.9"
+    "valid-url": {
+      "version": "1.0.9",
+      "resolved": "https://registry.npmjs.org/valid-url/-/valid-url-1.0.9.tgz",
+      "integrity": "sha512-QQDsV8OnSf5Uc30CKSwG9lnhMPe6exHtTXLRYX8uMwKENy640pU+2BgBL0LRbDh/eYRahNCS7aewCx0wf3NYVA=="
     },
-    "node_modules/varuint-bitcoin": {
+    "varuint-bitcoin": {
       "version": "1.1.2",
-      "license": "MIT",
-      "dependencies": {
+      "resolved": "https://registry.npmjs.org/varuint-bitcoin/-/varuint-bitcoin-1.1.2.tgz",
+      "integrity": "sha512-4EVb+w4rx+YfVM32HQX42AbbT7/1f5zwAYhIujKXKk8NQK+JfRVl3pqT3hjNn/L+RstigmGGKVwHA/P0wgITZw==",
+      "requires": {
         "safe-buffer": "^5.1.1"
       }
     },
-    "node_modules/vary": {
+    "vary": {
       "version": "1.1.2",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">= 0.8"
-      }
+      "resolved": "https://registry.npmjs.org/vary/-/vary-1.1.2.tgz",
+      "integrity": "sha512-BNGbWLfd0eUPabhkXUVm0j8uuvREyTh5ovRa/dyow/BqAbZJyC+5fU+IzQOzmAKzYqYRAISoRhdQr3eIZ/PXqg==",
+      "dev": true
     },
-    "node_modules/vite": {
+    "vite": {
       "version": "5.3.2",
+      "resolved": "https://registry.npmjs.org/vite/-/vite-5.3.2.tgz",
+      "integrity": "sha512-6lA7OBHBlXUxiJxbO5aAY2fsHHzDr1q7DvXYnyZycRs2Dz+dXBWuhpWHvmljTRTpQC2uvGmUFFkSHF2vGo90MA==",
       "dev": true,
-      "license": "MIT",
-      "dependencies": {
+      "requires": {
         "esbuild": "^0.21.3",
+        "fsevents": "~2.3.3",
         "postcss": "^8.4.38",
         "rollup": "^4.13.0"
-      },
-      "bin": {
-        "vite": "bin/vite.js"
-      },
-      "engines": {
-        "node": "^18.0.0 || >=20.0.0"
-      },
-      "funding": {
-        "url": "https://github.com/vitejs/vite?sponsor=1"
-      },
-      "optionalDependencies": {
-        "fsevents": "~2.3.3"
-      },
-      "peerDependencies": {
-        "@types/node": "^18.0.0 || >=20.0.0",
-        "less": "*",
-        "lightningcss": "^1.21.0",
-        "sass": "*",
-        "stylus": "*",
-        "sugarss": "*",
-        "terser": "^5.4.0"
-      },
-      "peerDependenciesMeta": {
-        "@types/node": {
-          "optional": true
-        },
-        "less": {
-          "optional": true
-        },
-        "lightningcss": {
-          "optional": true
-        },
-        "sass": {
-          "optional": true
-        },
-        "stylus": {
-          "optional": true
-        },
-        "sugarss": {
-          "optional": true
-        },
-        "terser": {
-          "optional": true
-        }
       }
     },
-    "node_modules/vite-node": {
+    "vite-node": {
       "version": "0.34.6",
+      "resolved": "https://registry.npmjs.org/vite-node/-/vite-node-0.34.6.tgz",
+      "integrity": "sha512-nlBMJ9x6n7/Amaz6F3zJ97EBwR2FkzhBRxF5e+jE6LA3yi6Wtc2lyTij1OnDMIr34v5g/tVQtsVAzhT0jc5ygA==",
       "dev": true,
-      "license": "MIT",
-      "dependencies": {
+      "requires": {
         "cac": "^6.7.14",
         "debug": "^4.3.4",
         "mlly": "^1.4.0",
         "pathe": "^1.1.1",
         "picocolors": "^1.0.0",
         "vite": "^3.0.0 || ^4.0.0 || ^5.0.0-0"
-      },
-      "bin": {
-        "vite-node": "vite-node.mjs"
-      },
-      "engines": {
-        "node": ">=v14.18.0"
-      },
-      "funding": {
-        "url": "https://opencollective.com/vitest"
       }
-    },
-    "node_modules/vite-tsconfig-paths": {
-      "version": "4.3.2",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "debug": "^4.1.1",
-        "globrex": "^0.1.2",
-        "tsconfck": "^3.0.3"
-      },
-      "peerDependencies": {
-        "vite": "*"
-      },
-      "peerDependenciesMeta": {
-        "vite": {
-          "optional": true
-        }
+    },
+    "vite-tsconfig-paths": {
+      "version": "4.3.2",
+      "resolved": "https://registry.npmjs.org/vite-tsconfig-paths/-/vite-tsconfig-paths-4.3.2.tgz",
+      "integrity": "sha512-0Vd/a6po6Q+86rPlntHye7F31zA2URZMbH8M3saAZ/xR9QoGN/L21bxEGfXdWmFdNkqPpRdxFT7nmNe12e9/uA==",
+      "dev": true,
+      "requires": {
+        "debug": "^4.1.1",
+        "globrex": "^0.1.2",
+        "tsconfck": "^3.0.3"
       }
     },
-    "node_modules/vitest": {
+    "vitest": {
       "version": "0.34.6",
+      "resolved": "https://registry.npmjs.org/vitest/-/vitest-0.34.6.tgz",
+      "integrity": "sha512-+5CALsOvbNKnS+ZHMXtuUC7nL8/7F1F2DnHGjSsszX8zCjWSSviphCb/NuS9Nzf4Q03KyyDRBAXhF/8lffME4Q==",
       "dev": true,
-      "license": "MIT",
-      "dependencies": {
+      "requires": {
         "@types/chai": "^4.3.5",
         "@types/chai-subset": "^1.3.3",
         "@types/node": "*",
@@ -11864,110 +24151,67 @@
         "vite": "^3.1.0 || ^4.0.0 || ^5.0.0-0",
         "vite-node": "0.34.6",
         "why-is-node-running": "^2.2.2"
-      },
-      "bin": {
-        "vitest": "vitest.mjs"
-      },
-      "engines": {
-        "node": ">=v14.18.0"
-      },
-      "funding": {
-        "url": "https://opencollective.com/vitest"
-      },
-      "peerDependencies": {
-        "@edge-runtime/vm": "*",
-        "@vitest/browser": "*",
-        "@vitest/ui": "*",
-        "happy-dom": "*",
-        "jsdom": "*",
-        "playwright": "*",
-        "safaridriver": "*",
-        "webdriverio": "*"
-      },
-      "peerDependenciesMeta": {
-        "@edge-runtime/vm": {
-          "optional": true
-        },
-        "@vitest/browser": {
-          "optional": true
-        },
-        "@vitest/ui": {
-          "optional": true
-        },
-        "happy-dom": {
-          "optional": true
-        },
-        "jsdom": {
-          "optional": true
-        },
-        "playwright": {
-          "optional": true
-        },
-        "safaridriver": {
-          "optional": true
-        },
-        "webdriverio": {
-          "optional": true
-        }
       }
     },
-    "node_modules/vlq": {
+    "vlq": {
       "version": "0.2.3",
-      "dev": true,
-      "license": "MIT"
+      "resolved": "https://registry.npmjs.org/vlq/-/vlq-0.2.3.tgz",
+      "integrity": "sha512-DRibZL6DsNhIgYQ+wNdWDL2SL3bKPlVrRiBqV5yuMm++op8W4kGFtaQfCs4KEJn0wBZcHVHJ3eoywX8983k1ow==",
+      "dev": true
     },
-    "node_modules/void-elements": {
+    "void-elements": {
       "version": "3.1.0",
-      "license": "MIT",
-      "engines": {
-        "node": ">=0.10.0"
-      }
+      "resolved": "https://registry.npmjs.org/void-elements/-/void-elements-3.1.0.tgz",
+      "integrity": "sha512-Dhxzh5HZuiHQhbvTW9AMetFfBHDMYpo23Uo9btPXgdYP+3T5S+p+jgNy7spra+veYhBP2dCSgxR/i2Y02h5/6w=="
     },
-    "node_modules/warning": {
+    "warning": {
       "version": "4.0.3",
-      "license": "MIT",
-      "dependencies": {
+      "resolved": "https://registry.npmjs.org/warning/-/warning-4.0.3.tgz",
+      "integrity": "sha512-rpJyN222KWIvHJ/F53XSZv0Zl/accqHR8et1kpaMTD/fLCRxtV8iX8czMzY7sVZupTI3zcUTg8eycS2kNF9l6w==",
+      "requires": {
         "loose-envify": "^1.0.0"
       }
     },
-    "node_modules/watchpack": {
+    "watchpack": {
       "version": "2.4.0",
+      "resolved": "https://registry.npmjs.org/watchpack/-/watchpack-2.4.0.tgz",
+      "integrity": "sha512-Lcvm7MGST/4fup+ifyKi2hjyIAwcdI4HRgtvTpIUxBRhB+RFtUh8XtDOxUfctVCnhVi+QQj49i91OyvzkJl6cg==",
       "dev": true,
-      "license": "MIT",
-      "dependencies": {
+      "requires": {
         "glob-to-regexp": "^0.4.1",
         "graceful-fs": "^4.1.2"
-      },
-      "engines": {
-        "node": ">=10.13.0"
       }
     },
-    "node_modules/wbuf": {
+    "wbuf": {
       "version": "1.7.3",
+      "resolved": "https://registry.npmjs.org/wbuf/-/wbuf-1.7.3.tgz",
+      "integrity": "sha512-O84QOnr0icsbFGLS0O3bI5FswxzRr8/gHwWkDlQFskhSPryQXvrTMxjxGP4+iWYoauLoBvfDpkrOauZ+0iZpDA==",
       "dev": true,
-      "license": "MIT",
-      "dependencies": {
+      "requires": {
         "minimalistic-assert": "^1.0.0"
       }
     },
-    "node_modules/wcwidth": {
+    "wcwidth": {
       "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/wcwidth/-/wcwidth-1.0.1.tgz",
+      "integrity": "sha512-XHPEwS0q6TaxcvG85+8EYkbiCux2XtWG2mkc47Ng2A77BQu9+DqIOJldST4HgPkuea7dvKSj5VgX3P1d4rW8Tg==",
       "dev": true,
-      "license": "MIT",
       "optional": true,
-      "dependencies": {
+      "requires": {
         "defaults": "^1.0.3"
       }
     },
-    "node_modules/webextension-polyfill": {
+    "webextension-polyfill": {
       "version": "0.10.0",
-      "license": "MPL-2.0"
+      "resolved": "https://registry.npmjs.org/webextension-polyfill/-/webextension-polyfill-0.10.0.tgz",
+      "integrity": "sha512-c5s35LgVa5tFaHhrZDnr3FpQpjj1BB+RXhLTYUxGqBVN460HkbM8TBtEqdXWbpTKfzwCcjAZVF7zXCYSKtcp9g=="
     },
-    "node_modules/webpack": {
+    "webpack": {
       "version": "5.89.0",
+      "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.89.0.tgz",
+      "integrity": "sha512-qyfIC10pOr70V+jkmud8tMfajraGCZMBWJtrmuBymQKCrLTRejBI8STDp1MCyZu/QTdZSeacCQYpYNQVOzX5kw==",
       "dev": true,
-      "license": "MIT",
-      "dependencies": {
+      "requires": {
         "@types/eslint-scope": "^3.7.3",
         "@types/estree": "^1.0.0",
         "@webassemblyjs/ast": "^1.11.5",
@@ -11992,99 +24236,68 @@
         "terser-webpack-plugin": "^5.3.7",
         "watchpack": "^2.4.0",
         "webpack-sources": "^3.2.3"
-      },
-      "bin": {
-        "webpack": "bin/webpack.js"
-      },
-      "engines": {
-        "node": ">=10.13.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/webpack"
-      },
-      "peerDependenciesMeta": {
-        "webpack-cli": {
-          "optional": true
-        }
       }
     },
-    "node_modules/webpack-dev-middleware": {
+    "webpack-dev-middleware": {
       "version": "5.3.3",
+      "resolved": "https://registry.npmjs.org/webpack-dev-middleware/-/webpack-dev-middleware-5.3.3.tgz",
+      "integrity": "sha512-hj5CYrY0bZLB+eTO+x/j67Pkrquiy7kWepMHmUMoPsmcUaeEnQJqFzHJOyxgWlq746/wUuA64p9ta34Kyb01pA==",
       "dev": true,
-      "license": "MIT",
-      "dependencies": {
+      "requires": {
         "colorette": "^2.0.10",
         "memfs": "^3.4.3",
         "mime-types": "^2.1.31",
         "range-parser": "^1.2.1",
         "schema-utils": "^4.0.0"
       },
-      "engines": {
-        "node": ">= 12.13.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/webpack"
-      },
-      "peerDependencies": {
-        "webpack": "^4.0.0 || ^5.0.0"
-      }
-    },
-    "node_modules/webpack-dev-middleware/node_modules/ajv": {
-      "version": "8.12.0",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "fast-deep-equal": "^3.1.1",
-        "json-schema-traverse": "^1.0.0",
-        "require-from-string": "^2.0.2",
-        "uri-js": "^4.2.2"
-      },
-      "funding": {
-        "type": "github",
-        "url": "https://github.com/sponsors/epoberezkin"
-      }
-    },
-    "node_modules/webpack-dev-middleware/node_modules/ajv-keywords": {
-      "version": "5.1.0",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "fast-deep-equal": "^3.1.3"
-      },
-      "peerDependencies": {
-        "ajv": "^8.8.2"
-      }
-    },
-    "node_modules/webpack-dev-middleware/node_modules/json-schema-traverse": {
-      "version": "1.0.0",
-      "dev": true,
-      "license": "MIT"
-    },
-    "node_modules/webpack-dev-middleware/node_modules/schema-utils": {
-      "version": "4.2.0",
-      "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "@types/json-schema": "^7.0.9",
-        "ajv": "^8.9.0",
-        "ajv-formats": "^2.1.1",
-        "ajv-keywords": "^5.1.0"
-      },
-      "engines": {
-        "node": ">= 12.13.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/webpack"
+        "ajv": {
+          "version": "8.12.0",
+          "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.12.0.tgz",
+          "integrity": "sha512-sRu1kpcO9yLtYxBKvqfTeh9KzZEwO3STyX1HT+4CaDzC6HpTGYhIhPIzj9XuKU7KYDwnaeh5hcOwjy1QuJzBPA==",
+          "dev": true,
+          "requires": {
+            "fast-deep-equal": "^3.1.1",
+            "json-schema-traverse": "^1.0.0",
+            "require-from-string": "^2.0.2",
+            "uri-js": "^4.2.2"
+          }
+        },
+        "ajv-keywords": {
+          "version": "5.1.0",
+          "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-5.1.0.tgz",
+          "integrity": "sha512-YCS/JNFAUyr5vAuhk1DWm1CBxRHW9LbJ2ozWeemrIqpbsqKjHVxYPyi5GC0rjZIT5JxJ3virVTS8wk4i/Z+krw==",
+          "dev": true,
+          "requires": {
+            "fast-deep-equal": "^3.1.3"
+          }
+        },
+        "json-schema-traverse": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz",
+          "integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==",
+          "dev": true
+        },
+        "schema-utils": {
+          "version": "4.2.0",
+          "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-4.2.0.tgz",
+          "integrity": "sha512-L0jRsrPpjdckP3oPug3/VxNKt2trR8TcabrM6FOAAlvC/9Phcmm+cuAgTlxBqdBR1WJx7Naj9WHw+aOmheSVbw==",
+          "dev": true,
+          "requires": {
+            "@types/json-schema": "^7.0.9",
+            "ajv": "^8.9.0",
+            "ajv-formats": "^2.1.1",
+            "ajv-keywords": "^5.1.0"
+          }
+        }
       }
     },
-    "node_modules/webpack-dev-server": {
+    "webpack-dev-server": {
       "version": "4.15.1",
+      "resolved": "https://registry.npmjs.org/webpack-dev-server/-/webpack-dev-server-4.15.1.tgz",
+      "integrity": "sha512-5hbAst3h3C3L8w6W4P96L5vaV0PxSmJhxZvWKYIdgxOQm8pNZ5dEOmmSLBVpP85ReeyRt6AS1QJNyo/oFFPeVA==",
       "dev": true,
-      "license": "MIT",
-      "dependencies": {
+      "requires": {
         "@types/bonjour": "^3.5.9",
         "@types/connect-history-api-fallback": "^1.3.5",
         "@types/express": "^4.17.13",
@@ -12106,338 +24319,260 @@
         "ipaddr.js": "^2.0.1",
         "launch-editor": "^2.6.0",
         "open": "^8.0.9",
-        "p-retry": "^4.5.0",
-        "rimraf": "^3.0.2",
-        "schema-utils": "^4.0.0",
-        "selfsigned": "^2.1.1",
-        "serve-index": "^1.9.1",
-        "sockjs": "^0.3.24",
-        "spdy": "^4.0.2",
-        "webpack-dev-middleware": "^5.3.1",
-        "ws": "^8.13.0"
-      },
-      "bin": {
-        "webpack-dev-server": "bin/webpack-dev-server.js"
-      },
-      "engines": {
-        "node": ">= 12.13.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/webpack"
-      },
-      "peerDependencies": {
-        "webpack": "^4.37.0 || ^5.0.0"
-      },
-      "peerDependenciesMeta": {
-        "webpack": {
-          "optional": true
-        },
-        "webpack-cli": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/webpack-dev-server/node_modules/ajv": {
-      "version": "8.12.0",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "fast-deep-equal": "^3.1.1",
-        "json-schema-traverse": "^1.0.0",
-        "require-from-string": "^2.0.2",
-        "uri-js": "^4.2.2"
-      },
-      "funding": {
-        "type": "github",
-        "url": "https://github.com/sponsors/epoberezkin"
-      }
-    },
-    "node_modules/webpack-dev-server/node_modules/ajv-keywords": {
-      "version": "5.1.0",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "fast-deep-equal": "^3.1.3"
-      },
-      "peerDependencies": {
-        "ajv": "^8.8.2"
-      }
-    },
-    "node_modules/webpack-dev-server/node_modules/json-schema-traverse": {
-      "version": "1.0.0",
-      "dev": true,
-      "license": "MIT"
-    },
-    "node_modules/webpack-dev-server/node_modules/schema-utils": {
-      "version": "4.2.0",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "@types/json-schema": "^7.0.9",
-        "ajv": "^8.9.0",
-        "ajv-formats": "^2.1.1",
-        "ajv-keywords": "^5.1.0"
-      },
-      "engines": {
-        "node": ">= 12.13.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/webpack"
-      }
-    },
-    "node_modules/webpack-dev-server/node_modules/ws": {
-      "version": "8.13.0",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=10.0.0"
-      },
-      "peerDependencies": {
-        "bufferutil": "^4.0.1",
-        "utf-8-validate": ">=5.0.2"
+        "p-retry": "^4.5.0",
+        "rimraf": "^3.0.2",
+        "schema-utils": "^4.0.0",
+        "selfsigned": "^2.1.1",
+        "serve-index": "^1.9.1",
+        "sockjs": "^0.3.24",
+        "spdy": "^4.0.2",
+        "webpack-dev-middleware": "^5.3.1",
+        "ws": "^8.13.0"
       },
-      "peerDependenciesMeta": {
-        "bufferutil": {
-          "optional": true
+      "dependencies": {
+        "ajv": {
+          "version": "8.12.0",
+          "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.12.0.tgz",
+          "integrity": "sha512-sRu1kpcO9yLtYxBKvqfTeh9KzZEwO3STyX1HT+4CaDzC6HpTGYhIhPIzj9XuKU7KYDwnaeh5hcOwjy1QuJzBPA==",
+          "dev": true,
+          "requires": {
+            "fast-deep-equal": "^3.1.1",
+            "json-schema-traverse": "^1.0.0",
+            "require-from-string": "^2.0.2",
+            "uri-js": "^4.2.2"
+          }
         },
-        "utf-8-validate": {
-          "optional": true
+        "ajv-keywords": {
+          "version": "5.1.0",
+          "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-5.1.0.tgz",
+          "integrity": "sha512-YCS/JNFAUyr5vAuhk1DWm1CBxRHW9LbJ2ozWeemrIqpbsqKjHVxYPyi5GC0rjZIT5JxJ3virVTS8wk4i/Z+krw==",
+          "dev": true,
+          "requires": {
+            "fast-deep-equal": "^3.1.3"
+          }
+        },
+        "json-schema-traverse": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz",
+          "integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==",
+          "dev": true
+        },
+        "schema-utils": {
+          "version": "4.2.0",
+          "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-4.2.0.tgz",
+          "integrity": "sha512-L0jRsrPpjdckP3oPug3/VxNKt2trR8TcabrM6FOAAlvC/9Phcmm+cuAgTlxBqdBR1WJx7Naj9WHw+aOmheSVbw==",
+          "dev": true,
+          "requires": {
+            "@types/json-schema": "^7.0.9",
+            "ajv": "^8.9.0",
+            "ajv-formats": "^2.1.1",
+            "ajv-keywords": "^5.1.0"
+          }
+        },
+        "ws": {
+          "version": "8.13.0",
+          "resolved": "https://registry.npmjs.org/ws/-/ws-8.13.0.tgz",
+          "integrity": "sha512-x9vcZYTrFPC7aSIbj7sRCYo7L/Xb8Iy+pW0ng0wt2vCJv7M9HOMy0UoN3rr+IFC7hb7vXoqS+P9ktyLLLhO+LA==",
+          "dev": true,
+          "requires": {}
         }
       }
     },
-    "node_modules/webpack-sources": {
+    "webpack-sources": {
       "version": "3.2.3",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=10.13.0"
-      }
+      "resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-3.2.3.tgz",
+      "integrity": "sha512-/DyMEOrDgLKKIG0fmvtz+4dUX/3Ghozwgm6iPp8KRhvn+eQf9+Q7GWxVNMk3+uCPWfdXYC4ExGBckIXdFEfH1w==",
+      "dev": true
     },
-    "node_modules/websocket-driver": {
+    "websocket-driver": {
       "version": "0.7.4",
+      "resolved": "https://registry.npmjs.org/websocket-driver/-/websocket-driver-0.7.4.tgz",
+      "integrity": "sha512-b17KeDIQVjvb0ssuSDF2cYXSg2iztliJ4B9WdsuB6J952qCPKmnVq4DyW5motImXHDC1cBT/1UezrJVsKw5zjg==",
       "dev": true,
-      "license": "Apache-2.0",
-      "dependencies": {
+      "requires": {
         "http-parser-js": ">=0.5.1",
         "safe-buffer": ">=5.1.0",
         "websocket-extensions": ">=0.1.1"
-      },
-      "engines": {
-        "node": ">=0.8.0"
       }
     },
-    "node_modules/websocket-extensions": {
+    "websocket-extensions": {
       "version": "0.1.4",
-      "dev": true,
-      "license": "Apache-2.0",
-      "engines": {
-        "node": ">=0.8.0"
-      }
+      "resolved": "https://registry.npmjs.org/websocket-extensions/-/websocket-extensions-0.1.4.tgz",
+      "integrity": "sha512-OqedPIGOfsDlo31UNwYbCFMSaO9m9G/0faIHj5/dZFDMFqPTcx6UwqyOy3COEaEOg/9VsGIpdqn62W5KhoKSpg==",
+      "dev": true
     },
-    "node_modules/which": {
+    "which": {
       "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",
+      "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==",
       "dev": true,
-      "license": "ISC",
-      "dependencies": {
+      "requires": {
         "isexe": "^2.0.0"
-      },
-      "bin": {
-        "node-which": "bin/node-which"
-      },
-      "engines": {
-        "node": ">= 8"
       }
     },
-    "node_modules/which-boxed-primitive": {
+    "which-boxed-primitive": {
       "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/which-boxed-primitive/-/which-boxed-primitive-1.0.2.tgz",
+      "integrity": "sha512-bwZdv0AKLpplFY2KZRX6TvyuN7ojjr7lwkg6ml0roIy9YeuSr7JS372qlNW18UQYzgYK9ziGcerWqZOmEn9VNg==",
       "dev": true,
-      "license": "MIT",
-      "dependencies": {
+      "requires": {
         "is-bigint": "^1.0.1",
         "is-boolean-object": "^1.1.0",
         "is-number-object": "^1.0.4",
         "is-string": "^1.0.5",
         "is-symbol": "^1.0.3"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/which-collection": {
+    "which-collection": {
       "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/which-collection/-/which-collection-1.0.1.tgz",
+      "integrity": "sha512-W8xeTUwaln8i3K/cY1nGXzdnVZlidBcagyNFtBdD5kxnb4TvGKR7FfSIS3mYpwWS1QUCutfKz8IY8RjftB0+1A==",
       "dev": true,
-      "license": "MIT",
-      "dependencies": {
+      "requires": {
         "is-map": "^2.0.1",
         "is-set": "^2.0.1",
         "is-weakmap": "^2.0.1",
         "is-weakset": "^2.0.1"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/which-typed-array": {
+    "which-typed-array": {
       "version": "1.1.11",
-      "license": "MIT",
-      "dependencies": {
+      "resolved": "https://registry.npmjs.org/which-typed-array/-/which-typed-array-1.1.11.tgz",
+      "integrity": "sha512-qe9UWWpkeG5yzZ0tNYxDmd7vo58HDBc39mZ0xWWpolAGADdFOzkfamWLDxkOWcvHQKVmdTyQdLD4NOfjLWTKew==",
+      "requires": {
         "available-typed-arrays": "^1.0.5",
         "call-bind": "^1.0.2",
         "for-each": "^0.3.3",
         "gopd": "^1.0.1",
         "has-tostringtag": "^1.0.0"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/why-is-node-running": {
+    "why-is-node-running": {
       "version": "2.2.2",
+      "resolved": "https://registry.npmjs.org/why-is-node-running/-/why-is-node-running-2.2.2.tgz",
+      "integrity": "sha512-6tSwToZxTOcotxHeA+qGCq1mVzKR3CwcJGmVcY+QE8SHy6TnpFnh8PAvPNHYr7EcuVeG0QSMxtYCuO1ta/G/oA==",
       "dev": true,
-      "license": "MIT",
-      "dependencies": {
+      "requires": {
         "siginfo": "^2.0.0",
         "stackback": "0.0.2"
-      },
-      "bin": {
-        "why-is-node-running": "cli.js"
-      },
-      "engines": {
-        "node": ">=8"
       }
     },
-    "node_modules/wif": {
+    "wif": {
       "version": "2.0.6",
       "resolved": "https://registry.npmjs.org/wif/-/wif-2.0.6.tgz",
       "integrity": "sha512-HIanZn1zmduSF+BQhkE+YXIbEiH0xPr1012QbFEGB0xsKqJii0/SqJjyn8dFv6y36kOznMgMB+LGcbZTJ1xACQ==",
-      "dependencies": {
+      "requires": {
         "bs58check": "<3.0.0"
-      }
-    },
-    "node_modules/wif/node_modules/base-x": {
-      "version": "3.0.10",
-      "resolved": "https://registry.npmjs.org/base-x/-/base-x-3.0.10.tgz",
-      "integrity": "sha512-7d0s06rR9rYaIWHkpfLIFICM/tkSVdoPC9qYAQRpxn9DdKNWNsKC0uk++akckyLq16Tx2WIinnZ6WRriAt6njQ==",
-      "dependencies": {
-        "safe-buffer": "^5.0.1"
-      }
-    },
-    "node_modules/wif/node_modules/bs58": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/bs58/-/bs58-4.0.1.tgz",
-      "integrity": "sha512-Ok3Wdf5vOIlBrgCvTq96gBkJw+JUEzdBgyaza5HLtPm7yTHkjRy8+JzNyHF7BHa0bNWOQIp3m5YF0nnFcOIKLw==",
-      "dependencies": {
-        "base-x": "^3.0.2"
-      }
-    },
-    "node_modules/wif/node_modules/bs58check": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/bs58check/-/bs58check-2.1.2.tgz",
-      "integrity": "sha512-0TS1jicxdU09dwJMNZtVAfzPi6Q6QeN0pM1Fkzrjn+XYHvzMKPU3pHVpva+769iNVSfIYWf7LJ6WR+BuuMf8cA==",
+      },
       "dependencies": {
-        "bs58": "^4.0.0",
-        "create-hash": "^1.1.0",
-        "safe-buffer": "^5.1.2"
+        "base-x": {
+          "version": "3.0.10",
+          "resolved": "https://registry.npmjs.org/base-x/-/base-x-3.0.10.tgz",
+          "integrity": "sha512-7d0s06rR9rYaIWHkpfLIFICM/tkSVdoPC9qYAQRpxn9DdKNWNsKC0uk++akckyLq16Tx2WIinnZ6WRriAt6njQ==",
+          "requires": {
+            "safe-buffer": "^5.0.1"
+          }
+        },
+        "bs58": {
+          "version": "4.0.1",
+          "resolved": "https://registry.npmjs.org/bs58/-/bs58-4.0.1.tgz",
+          "integrity": "sha512-Ok3Wdf5vOIlBrgCvTq96gBkJw+JUEzdBgyaza5HLtPm7yTHkjRy8+JzNyHF7BHa0bNWOQIp3m5YF0nnFcOIKLw==",
+          "requires": {
+            "base-x": "^3.0.2"
+          }
+        },
+        "bs58check": {
+          "version": "2.1.2",
+          "resolved": "https://registry.npmjs.org/bs58check/-/bs58check-2.1.2.tgz",
+          "integrity": "sha512-0TS1jicxdU09dwJMNZtVAfzPi6Q6QeN0pM1Fkzrjn+XYHvzMKPU3pHVpva+769iNVSfIYWf7LJ6WR+BuuMf8cA==",
+          "requires": {
+            "bs58": "^4.0.0",
+            "create-hash": "^1.1.0",
+            "safe-buffer": "^5.1.2"
+          }
+        }
       }
     },
-    "node_modules/wrap-ansi": {
+    "wrap-ansi": {
       "version": "7.0.0",
-      "license": "MIT",
-      "dependencies": {
+      "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz",
+      "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==",
+      "requires": {
         "ansi-styles": "^4.0.0",
         "string-width": "^4.1.0",
         "strip-ansi": "^6.0.0"
       },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/wrap-ansi?sponsor=1"
-      }
-    },
-    "node_modules/wrap-ansi/node_modules/ansi-styles": {
-      "version": "4.3.0",
-      "license": "MIT",
-      "dependencies": {
-        "color-convert": "^2.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
-      }
-    },
-    "node_modules/wrap-ansi/node_modules/color-convert": {
-      "version": "2.0.1",
-      "license": "MIT",
-      "dependencies": {
-        "color-name": "~1.1.4"
-      },
-      "engines": {
-        "node": ">=7.0.0"
-      }
-    },
-    "node_modules/wrap-ansi/node_modules/color-name": {
-      "version": "1.1.4",
-      "license": "MIT"
-    },
-    "node_modules/wrap-ansi/node_modules/emoji-regex": {
-      "version": "8.0.0",
-      "license": "MIT"
-    },
-    "node_modules/wrap-ansi/node_modules/is-fullwidth-code-point": {
-      "version": "3.0.0",
-      "license": "MIT",
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/wrap-ansi/node_modules/string-width": {
-      "version": "4.2.3",
-      "license": "MIT",
       "dependencies": {
-        "emoji-regex": "^8.0.0",
-        "is-fullwidth-code-point": "^3.0.0",
-        "strip-ansi": "^6.0.1"
-      },
-      "engines": {
-        "node": ">=8"
+        "ansi-styles": {
+          "version": "4.3.0",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+          "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+          "requires": {
+            "color-convert": "^2.0.1"
+          }
+        },
+        "color-convert": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+          "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+          "requires": {
+            "color-name": "~1.1.4"
+          }
+        },
+        "color-name": {
+          "version": "1.1.4",
+          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+          "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="
+        },
+        "emoji-regex": {
+          "version": "8.0.0",
+          "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
+          "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A=="
+        },
+        "is-fullwidth-code-point": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
+          "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg=="
+        },
+        "string-width": {
+          "version": "4.2.3",
+          "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
+          "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
+          "requires": {
+            "emoji-regex": "^8.0.0",
+            "is-fullwidth-code-point": "^3.0.0",
+            "strip-ansi": "^6.0.1"
+          }
+        }
       }
     },
-    "node_modules/wrappy": {
+    "wrappy": {
       "version": "1.0.2",
-      "license": "ISC"
+      "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
+      "integrity": "sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ=="
     },
-    "node_modules/y18n": {
+    "y18n": {
       "version": "5.0.8",
-      "license": "ISC",
-      "engines": {
-        "node": ">=10"
-      }
+      "resolved": "https://registry.npmjs.org/y18n/-/y18n-5.0.8.tgz",
+      "integrity": "sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA=="
     },
-    "node_modules/yallist": {
+    "yallist": {
       "version": "3.1.1",
-      "license": "ISC",
+      "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.1.1.tgz",
+      "integrity": "sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==",
       "peer": true
     },
-    "node_modules/yaml": {
+    "yaml": {
       "version": "2.3.1",
-      "dev": true,
-      "license": "ISC",
-      "engines": {
-        "node": ">= 14"
-      }
+      "resolved": "https://registry.npmjs.org/yaml/-/yaml-2.3.1.tgz",
+      "integrity": "sha512-2eHWfjaoXgTBC2jNM1LRef62VQa0umtvRiDSk6HSzW7RvS5YtkabJrwYLLEKWBc8a5U2PTSCs+dJjUTJdlHsWQ==",
+      "dev": true
     },
-    "node_modules/yargs": {
+    "yargs": {
       "version": "17.7.2",
-      "license": "MIT",
-      "dependencies": {
+      "resolved": "https://registry.npmjs.org/yargs/-/yargs-17.7.2.tgz",
+      "integrity": "sha512-7dSzzRQ++CKnNI/krKnYRV7JKKPUXMEh61soaHKg9mrWEhzFWhFnxPxGl+69cD1Ou63C13NUPCnmIcrvqCuM6w==",
+      "requires": {
         "cliui": "^8.0.1",
         "escalade": "^3.1.1",
         "get-caller-file": "^2.0.5",
@@ -12446,83 +24581,66 @@
         "y18n": "^5.0.5",
         "yargs-parser": "^21.1.1"
       },
-      "engines": {
-        "node": ">=12"
+      "dependencies": {
+        "emoji-regex": {
+          "version": "8.0.0",
+          "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
+          "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A=="
+        },
+        "is-fullwidth-code-point": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
+          "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg=="
+        },
+        "string-width": {
+          "version": "4.2.3",
+          "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
+          "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
+          "requires": {
+            "emoji-regex": "^8.0.0",
+            "is-fullwidth-code-point": "^3.0.0",
+            "strip-ansi": "^6.0.1"
+          }
+        }
       }
     },
-    "node_modules/yargs-parser": {
+    "yargs-parser": {
       "version": "21.1.1",
-      "license": "ISC",
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/yargs/node_modules/emoji-regex": {
-      "version": "8.0.0",
-      "license": "MIT"
-    },
-    "node_modules/yargs/node_modules/is-fullwidth-code-point": {
-      "version": "3.0.0",
-      "license": "MIT",
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/yargs/node_modules/string-width": {
-      "version": "4.2.3",
-      "license": "MIT",
-      "dependencies": {
-        "emoji-regex": "^8.0.0",
-        "is-fullwidth-code-point": "^3.0.0",
-        "strip-ansi": "^6.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      }
+      "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-21.1.1.tgz",
+      "integrity": "sha512-tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw=="
     },
-    "node_modules/yocto-queue": {
+    "yocto-queue": {
       "version": "0.1.0",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
+      "resolved": "https://registry.npmjs.org/yocto-queue/-/yocto-queue-0.1.0.tgz",
+      "integrity": "sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==",
+      "dev": true
     },
-    "node_modules/yqueue": {
+    "yqueue": {
       "version": "1.0.1",
-      "license": "MIT"
+      "resolved": "https://registry.npmjs.org/yqueue/-/yqueue-1.0.1.tgz",
+      "integrity": "sha512-DBxJZBRafFLA/tCc5uO8ZTGFr+sQgn1FRJkZ4cVrIQIk6bv2bInraE3mbpLAJw9z93JGrLkqDoyTLrrZaCNq5w=="
     },
-    "node_modules/zod": {
+    "zod": {
       "version": "3.22.4",
-      "license": "MIT",
-      "funding": {
-        "url": "https://github.com/sponsors/colinhacks"
-      }
+      "resolved": "https://registry.npmjs.org/zod/-/zod-3.22.4.tgz",
+      "integrity": "sha512-iC+8Io04lddc+mVqQ9AZ7OQ2MrUKGN+oIQyq1vemgt46jwCwLfhq7/pwnBnNXXXZb8VTVLKwp9EDkx+ryxIWmg=="
     },
-    "node_modules/zod-validation-error": {
+    "zod-validation-error": {
       "version": "3.3.0",
+      "resolved": "https://registry.npmjs.org/zod-validation-error/-/zod-validation-error-3.3.0.tgz",
+      "integrity": "sha512-Syib9oumw1NTqEv4LT0e6U83Td9aVRk9iTXPUQr1otyV1PuXQKOvOwhMNqZIq5hluzHP2pMgnOmHEo7kPdI2mw==",
       "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=18.0.0"
-      },
-      "peerDependencies": {
-        "zod": "^3.18.0"
-      }
+      "requires": {}
     },
-    "node_modules/zone-file": {
+    "zone-file": {
       "version": "2.0.0-beta.3",
-      "license": "ISC",
-      "engines": {
-        "node": ">=10"
-      }
+      "resolved": "https://registry.npmjs.org/zone-file/-/zone-file-2.0.0-beta.3.tgz",
+      "integrity": "sha512-6tE3PSRcpN5lbTTLlkLez40WkNPc9vw/u1J2j6DBiy0jcVX48nCkWrx2EC+bWHqC2SLp069Xw4AdnYn/qp/W5g=="
     },
-    "node_modules/zxcvbn": {
+    "zxcvbn": {
       "version": "4.4.2",
-      "license": "MIT"
+      "resolved": "https://registry.npmjs.org/zxcvbn/-/zxcvbn-4.4.2.tgz",
+      "integrity": "sha512-Bq0B+ixT/DMyG8kgX2xWcI5jUvCwqrMxSFam7m0lAf78nf04hv6lNCsyLYdyYTrCVMqNDY/206K7eExYCeSyUQ=="
     }
   }
 }

From 407a9f031d6dae254b6c80273030b6e9ef5ec000 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Eduard=20Bardaj=C3=AD=20Puig?= <ebardaji@gmail.com>
Date: Tue, 27 Aug 2024 15:32:30 +0200
Subject: [PATCH 039/227] Use synchronous listener registration

---
 package-lock.json            |  64 +++++++++++----------
 package.json                 |   4 +-
 playwright.config.ts         |   8 +--
 src/background/background.ts | 105 +++++++++++++++++++++++------------
 tests/fixtures/base.ts       |   2 +-
 5 files changed, 111 insertions(+), 72 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 142c5bdb1..d55c83fda 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -11,7 +11,7 @@
         "@aryzing/superqs": "0.0.6",
         "@ledgerhq/hw-transport-webusb": "^6.27.13",
         "@phosphor-icons/react": "^2.0.10",
-        "@playwright/test": "1.45.2",
+        "@playwright/test": "1.46.1",
         "@react-spring/web": "^9.6.1",
         "@sats-connect/core": "0.2.1",
         "@scure/btc-signer": "1.2.1",
@@ -101,7 +101,7 @@
         "eslint-plugin-import": "^2.26.0",
         "eslint-plugin-jsx-a11y": "^6.6.1",
         "eslint-plugin-no-inline-styles": "^1.0.5",
-        "eslint-plugin-playwright": "^1.6.0",
+        "eslint-plugin-playwright": "^1.6.2",
         "eslint-plugin-prettier": "^4.2.1",
         "eslint-plugin-react": "^7.31.8",
         "eslint-plugin-react-hooks": "^4.6.0",
@@ -1394,12 +1394,12 @@
       }
     },
     "node_modules/@playwright/test": {
-      "version": "1.45.2",
-      "resolved": "https://registry.npmjs.org/@playwright/test/-/test-1.45.2.tgz",
-      "integrity": "sha512-JxG9eq92ET75EbVi3s+4sYbcG7q72ECeZNbdBlaMkGcNbiDQ4cAi8U2QP5oKkOx+1gpaiL1LDStmzCaEM1Z6fQ==",
+      "version": "1.46.1",
+      "resolved": "https://registry.npmjs.org/@playwright/test/-/test-1.46.1.tgz",
+      "integrity": "sha512-Fq6SwLujA/DOIvNC2EL/SojJnkKf/rAwJ//APpJJHRyMi1PdKrY3Az+4XNQ51N4RTbItbIByQ0jgd1tayq1aeA==",
       "license": "Apache-2.0",
       "dependencies": {
-        "playwright": "1.45.2"
+        "playwright": "1.46.1"
       },
       "bin": {
         "playwright": "cli.js"
@@ -6514,10 +6514,14 @@
       }
     },
     "node_modules/eslint-plugin-playwright": {
-      "version": "1.6.0",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-playwright/-/eslint-plugin-playwright-1.6.0.tgz",
-      "integrity": "sha512-tI1E/EDbHT4Fx5KvukUG3RTIT0gk44gvTP8bNwxLCFsUXVM98ZJG5zWU6Om5JOzH9FrmN4AhMu/UKyEsu0ZoDA==",
+      "version": "1.6.2",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-playwright/-/eslint-plugin-playwright-1.6.2.tgz",
+      "integrity": "sha512-mraN4Em3b5jLt01q7qWPyLg0Q5v3KAWfJSlEWwldyUXoa7DSPrBR4k6B6LROLqipsG8ndkwWMdjl1Ffdh15tag==",
       "dev": true,
+      "license": "MIT",
+      "workspaces": [
+        "examples"
+      ],
       "dependencies": {
         "globals": "^13.23.0"
       },
@@ -10632,12 +10636,12 @@
       }
     },
     "node_modules/playwright": {
-      "version": "1.45.2",
-      "resolved": "https://registry.npmjs.org/playwright/-/playwright-1.45.2.tgz",
-      "integrity": "sha512-ReywF2t/0teRvNBpfIgh5e4wnrI/8Su8ssdo5XsQKpjxJj+jspm00jSoz9BTg91TT0c9HRjXO7LBNVrgYj9X0g==",
+      "version": "1.46.1",
+      "resolved": "https://registry.npmjs.org/playwright/-/playwright-1.46.1.tgz",
+      "integrity": "sha512-oPcr1yqoXLCkgKtD5eNUPLiN40rYEM39odNpIb6VE6S7/15gJmA1NzVv6zJYusV0e7tzvkU/utBFNa/Kpxmwng==",
       "license": "Apache-2.0",
       "dependencies": {
-        "playwright-core": "1.45.2"
+        "playwright-core": "1.46.1"
       },
       "bin": {
         "playwright": "cli.js"
@@ -10650,9 +10654,9 @@
       }
     },
     "node_modules/playwright-core": {
-      "version": "1.45.2",
-      "resolved": "https://registry.npmjs.org/playwright-core/-/playwright-core-1.45.2.tgz",
-      "integrity": "sha512-ha175tAWb0dTK0X4orvBIqi3jGEt701SMxMhyujxNrgd8K0Uy5wMSwwcQHtyB4om7INUkfndx02XnQ2p6dvLDw==",
+      "version": "1.46.1",
+      "resolved": "https://registry.npmjs.org/playwright-core/-/playwright-core-1.46.1.tgz",
+      "integrity": "sha512-h9LqIQaAv+CYvWzsZ+h3RsrqCStkBHlgo6/TJlFst3cOTlLghBQlJwPOZKQJTKNaD3QIB7aAVQ+gfWbN3NXB7A==",
       "license": "Apache-2.0",
       "bin": {
         "playwright-core": "cli.js"
@@ -15053,11 +15057,11 @@
       "requires": {}
     },
     "@playwright/test": {
-      "version": "1.45.2",
-      "resolved": "https://registry.npmjs.org/@playwright/test/-/test-1.45.2.tgz",
-      "integrity": "sha512-JxG9eq92ET75EbVi3s+4sYbcG7q72ECeZNbdBlaMkGcNbiDQ4cAi8U2QP5oKkOx+1gpaiL1LDStmzCaEM1Z6fQ==",
+      "version": "1.46.1",
+      "resolved": "https://registry.npmjs.org/@playwright/test/-/test-1.46.1.tgz",
+      "integrity": "sha512-Fq6SwLujA/DOIvNC2EL/SojJnkKf/rAwJ//APpJJHRyMi1PdKrY3Az+4XNQ51N4RTbItbIByQ0jgd1tayq1aeA==",
       "requires": {
-        "playwright": "1.45.2"
+        "playwright": "1.46.1"
       }
     },
     "@pmmmwh/react-refresh-webpack-plugin": {
@@ -19140,9 +19144,9 @@
       }
     },
     "eslint-plugin-playwright": {
-      "version": "1.6.0",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-playwright/-/eslint-plugin-playwright-1.6.0.tgz",
-      "integrity": "sha512-tI1E/EDbHT4Fx5KvukUG3RTIT0gk44gvTP8bNwxLCFsUXVM98ZJG5zWU6Om5JOzH9FrmN4AhMu/UKyEsu0ZoDA==",
+      "version": "1.6.2",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-playwright/-/eslint-plugin-playwright-1.6.2.tgz",
+      "integrity": "sha512-mraN4Em3b5jLt01q7qWPyLg0Q5v3KAWfJSlEWwldyUXoa7DSPrBR4k6B6LROLqipsG8ndkwWMdjl1Ffdh15tag==",
       "dev": true,
       "requires": {
         "globals": "^13.23.0"
@@ -22038,12 +22042,12 @@
       }
     },
     "playwright": {
-      "version": "1.45.2",
-      "resolved": "https://registry.npmjs.org/playwright/-/playwright-1.45.2.tgz",
-      "integrity": "sha512-ReywF2t/0teRvNBpfIgh5e4wnrI/8Su8ssdo5XsQKpjxJj+jspm00jSoz9BTg91TT0c9HRjXO7LBNVrgYj9X0g==",
+      "version": "1.46.1",
+      "resolved": "https://registry.npmjs.org/playwright/-/playwright-1.46.1.tgz",
+      "integrity": "sha512-oPcr1yqoXLCkgKtD5eNUPLiN40rYEM39odNpIb6VE6S7/15gJmA1NzVv6zJYusV0e7tzvkU/utBFNa/Kpxmwng==",
       "requires": {
         "fsevents": "2.3.2",
-        "playwright-core": "1.45.2"
+        "playwright-core": "1.46.1"
       },
       "dependencies": {
         "fsevents": {
@@ -22055,9 +22059,9 @@
       }
     },
     "playwright-core": {
-      "version": "1.45.2",
-      "resolved": "https://registry.npmjs.org/playwright-core/-/playwright-core-1.45.2.tgz",
-      "integrity": "sha512-ha175tAWb0dTK0X4orvBIqi3jGEt701SMxMhyujxNrgd8K0Uy5wMSwwcQHtyB4om7INUkfndx02XnQ2p6dvLDw=="
+      "version": "1.46.1",
+      "resolved": "https://registry.npmjs.org/playwright-core/-/playwright-core-1.46.1.tgz",
+      "integrity": "sha512-h9LqIQaAv+CYvWzsZ+h3RsrqCStkBHlgo6/TJlFst3cOTlLghBQlJwPOZKQJTKNaD3QIB7aAVQ+gfWbN3NXB7A=="
     },
     "postcss": {
       "version": "8.4.39",
diff --git a/package.json b/package.json
index f71f44a8e..b05d2c569 100644
--- a/package.json
+++ b/package.json
@@ -40,7 +40,7 @@
     "@aryzing/superqs": "0.0.6",
     "@ledgerhq/hw-transport-webusb": "^6.27.13",
     "@phosphor-icons/react": "^2.0.10",
-    "@playwright/test": "1.45.2",
+    "@playwright/test": "1.46.1",
     "@react-spring/web": "^9.6.1",
     "@sats-connect/core": "0.2.1",
     "@scure/btc-signer": "1.2.1",
@@ -130,7 +130,7 @@
     "eslint-plugin-import": "^2.26.0",
     "eslint-plugin-jsx-a11y": "^6.6.1",
     "eslint-plugin-no-inline-styles": "^1.0.5",
-    "eslint-plugin-playwright": "^1.6.0",
+    "eslint-plugin-playwright": "^1.6.2",
     "eslint-plugin-prettier": "^4.2.1",
     "eslint-plugin-react": "^7.31.8",
     "eslint-plugin-react-hooks": "^4.6.0",
diff --git a/playwright.config.ts b/playwright.config.ts
index 288391240..e7774b2c6 100644
--- a/playwright.config.ts
+++ b/playwright.config.ts
@@ -18,10 +18,10 @@ export default defineConfig({
   forbidOnly: !!process.env.CI,
   /* Retry on CI only */
   retries: process.env.CI ? 1 : 0,
-  /* Opt to only 2 tests parallel on CI.
-   Note that you may want to change the non-ci amount to a lower number depending on
-   the specs of your computer or if the number of tests increases over time.
-  */
+  /* Opt to only 2 tests parallel on CI. Note that you may want to change the
+   * non-ci amount to a lower number depending on the specs of your computer or
+   * if the number of tests increases over time.
+   */
   workers: process.env.CI ? 2 : 5,
   /* Reporter to use. See https://playwright.dev/docs/test-reporters */
   reporter: process.env.CI ? 'blob' : 'html',
diff --git a/src/background/background.ts b/src/background/background.ts
index 4db6eec8b..6fd3dfa5f 100755
--- a/src/background/background.ts
+++ b/src/background/background.ts
@@ -7,49 +7,84 @@ import { initPermissionsStore, permissionsStoreMutex } from '@components/permiss
 import { rpcRequestMessageSchema } from '@sats-connect/core';
 import * as v from 'valibot';
 
-async function init() {
-  const [error] = await permissionsStoreMutex.runExclusive(initPermissionsStore);
-  if (error) {
-    // eslint-disable-next-line no-console
-    console.error('Failed to load permissions store:', error);
-  }
-
-  // Listen for connection to the content-script - port for two-way communication
-  chrome.runtime.onConnect.addListener((port) => {
-    if (port.name !== CONTENT_SCRIPT_PORT) return;
-    port.onMessage.addListener((message, messagingPort) => {
-      const parseResult = v.safeParse(rpcRequestMessageSchema, message);
+let hasInitializationFinished = false;
+permissionsStoreMutex
+  .runExclusive(initPermissionsStore)
+  .catch(([error]) => {
+    if (error) {
+      // eslint-disable-next-line no-console
+      console.error('Failed to load permissions store:', error);
+    }
+  })
+  // Even if the store initialization fails, the initialization is considered to
+  // have finished. This allows the app to continue running after a failure
+  // since many of the app's features are not dependent on the permissions
+  // store.
+  .finally(() => {
+    hasInitializationFinished = true;
+  });
 
-      if (!parseResult.success) {
-        // Assume it's a legacy message when parsing fails.
-        handleLegacyExternalMethodFormat(message, messagingPort);
-        return;
+// All event handlers that could potentially lead to the permissions store
+// being accessed should wait for the store to be initialized before
+// proceeding.
+async function waitForStoreInitialization() {
+  if (hasInitializationFinished) return;
+  await new Promise((resolve) => {
+    const interval = setInterval(() => {
+      if (hasInitializationFinished) {
+        clearInterval(interval);
+        resolve(undefined);
       }
-
-      handleRPCRequest(parseResult.output, port);
-    });
+    }, 10);
   });
+}
 
-  chrome.runtime.onMessage.addListener((message, sender, sendResponse) => {
-    void internalBackgroundMessageHandler(message, sender, sendResponse);
-    // Listener fn must return `true` to indicate the response will be async
-    return true;
-  });
+// Listen for connection to the content-script - port for two-way communication
+chrome.runtime.onConnect.addListener((port) => {
+  if (port.name !== CONTENT_SCRIPT_PORT) return;
 
-  chrome.runtime.onInstalled.addListener((details) => {
-    if (details.reason === 'install') {
-      chrome.tabs.create({ url: chrome.runtime.getURL('options.html#/landing') });
+  async function onMessageListener(message: any, messagingPort: chrome.runtime.Port) {
+    await waitForStoreInitialization();
+    const parseResult = v.safeParse(rpcRequestMessageSchema, message);
+
+    if (!parseResult.success) {
+      // Assume it's a legacy message when parsing fails.
+      handleLegacyExternalMethodFormat(message, messagingPort);
+      return;
     }
+
+    handleRPCRequest(parseResult.output, port);
+  }
+
+  port.onMessage.addListener((message, messagingPort) => {
+    onMessageListener(message, messagingPort).catch((error) => {
+      // eslint-disable-next-line no-console
+      console.error('Failed to handle message:', error);
+    });
   });
+});
+
+chrome.runtime.onMessage.addListener((message, sender, sendResponse) => {
+  void internalBackgroundMessageHandler(message, sender, sendResponse);
+  // Listener fn must return `true` to indicate the response will be async
+  return true;
+});
 
-  if (process.env.WALLET_LABEL) {
-    chrome.action.setBadgeText({ text: process.env.WALLET_LABEL });
-  } else if (process.env.NODE_ENV === 'development') {
-    chrome.action.setBadgeText({ text: 'DEV' });
+async function onInstalledListener(details: chrome.runtime.InstalledDetails) {
+  await waitForStoreInitialization();
+  if (details.reason === 'install') {
+    chrome.tabs.create({ url: chrome.runtime.getURL('options.html#/landing') });
   }
 }
-
-await init().catch((e) => {
-  // eslint-disable-next-line no-console
-  console.error('Failed to initialize background script:', e);
+chrome.runtime.onInstalled.addListener((details) => {
+  onInstalledListener(details).catch((error) => {
+    // eslint-disable-next-line no-console
+    console.error('Failed to handle onInstalled event:', error);
+  });
 });
+
+if (process.env.WALLET_LABEL) {
+  chrome.action.setBadgeText({ text: process.env.WALLET_LABEL });
+} else if (process.env.NODE_ENV === 'development') {
+  chrome.action.setBadgeText({ text: 'DEV' });
+}
diff --git a/tests/fixtures/base.ts b/tests/fixtures/base.ts
index fc3da8f9f..7a50fc870 100644
--- a/tests/fixtures/base.ts
+++ b/tests/fixtures/base.ts
@@ -32,7 +32,7 @@ export const test = baseTest.extend<{
     // Xverse opens the landing page on install. Wait for it to load and
     // use it as the main page by closing the default page.
     // we give it 5 secs to start up
-    const MAX_STARTUP_TIME = 5000;
+    const MAX_STARTUP_TIME = 5_000;
     const startTime = Date.now();
     while (context.pages().length === 1) {
       if (Date.now() - startTime > MAX_STARTUP_TIME) {

From 1ee3d09034196d59fe4261a34bc3c42068b9f33c Mon Sep 17 00:00:00 2001
From: Terence Ng <ngtere@live.com.sg>
Date: Wed, 28 Aug 2024 18:35:05 +0800
Subject: [PATCH 040/227] Terence/ledger recover runes (#530)

* commit fix

* fix enable ledger support for runes recovery
---
 src/app/screens/sendRune/index.tsx             |  1 -
 .../settings/advanced/restoreFunds/index.tsx   | 18 ++++++------------
 .../restoreFunds/recoverRunes/index.tsx        | 14 ++++++++++++--
 3 files changed, 18 insertions(+), 15 deletions(-)

diff --git a/src/app/screens/sendRune/index.tsx b/src/app/screens/sendRune/index.tsx
index 94d1771f6..842e4ac33 100644
--- a/src/app/screens/sendRune/index.tsx
+++ b/src/app/screens/sendRune/index.tsx
@@ -181,7 +181,6 @@ function SendRuneScreen() {
     try {
       setIsSubmitting(true);
       const txnId = await transaction?.broadcast({ ledgerTransport, rbfEnabled: true });
-
       trackMixPanel(AnalyticsEvents.TransactionConfirmed, {
         protocol: 'runes',
         action: 'transfer',
diff --git a/src/app/screens/settings/advanced/restoreFunds/index.tsx b/src/app/screens/settings/advanced/restoreFunds/index.tsx
index 455ac110f..17797fbd4 100644
--- a/src/app/screens/settings/advanced/restoreFunds/index.tsx
+++ b/src/app/screens/settings/advanced/restoreFunds/index.tsx
@@ -2,17 +2,14 @@ import OrdinalsIcon from '@assets/img/nftDashboard/ordinals_icon.svg';
 import RuneIcon from '@assets/img/nftDashboard/rune_icon.svg';
 import BottomTabBar from '@components/tabBar';
 import TopRow from '@components/topRow';
-import useSelectedAccount from '@hooks/useSelectedAccount';
 import useWalletSelector from '@hooks/useWalletSelector';
 import { Container, SubTitle, Title } from '@screens/settings/index.styles';
-import { isHardwareAccount } from '@utils/helper';
 import { useTranslation } from 'react-i18next';
 import { useNavigate } from 'react-router-dom';
 import FundsRow from './fundsRow';
 
 function RestoreFunds() {
   const { t } = useTranslation('translation', { keyPrefix: 'RESTORE_FUND_SCREEN' });
-  const selectedAccount = useSelectedAccount();
   const { hasActivatedOrdinalsKey } = useWalletSelector();
   const navigate = useNavigate();
 
@@ -41,15 +38,12 @@ function RestoreFunds() {
           description={t('RECOVER_ORDINALS_DESC')}
           onClick={handleOnRestoreOrdinalClick}
         />
-        {/* TODO: Fix the runes recovery for ledger and then enable it */}
-        {!isHardwareAccount(selectedAccount) && (
-          <FundsRow
-            image={RuneIcon}
-            title={t('RECOVER_RUNES')}
-            description={t('RECOVER_RUNES_DESC')}
-            onClick={onRecoverRunesClick}
-          />
-        )}
+        <FundsRow
+          image={RuneIcon}
+          title={t('RECOVER_RUNES')}
+          description={t('RECOVER_RUNES_DESC')}
+          onClick={onRecoverRunesClick}
+        />
       </Container>
       <BottomTabBar tab="settings" />
     </>
diff --git a/src/app/screens/settings/advanced/restoreFunds/recoverRunes/index.tsx b/src/app/screens/settings/advanced/restoreFunds/recoverRunes/index.tsx
index 42e2ee89c..c78f8efb2 100644
--- a/src/app/screens/settings/advanced/restoreFunds/recoverRunes/index.tsx
+++ b/src/app/screens/settings/advanced/restoreFunds/recoverRunes/index.tsx
@@ -3,17 +3,21 @@ import RuneAmount from '@components/confirmBtcTransaction/itemRow/runeAmount';
 import BottomTabBar from '@components/tabBar';
 import TopRow from '@components/topRow';
 import useBtcFeeRate from '@hooks/useBtcFeeRate';
+import useSelectedAccount from '@hooks/useSelectedAccount';
 import useTransactionContext from '@hooks/useTransactionContext';
 import type { TransactionSummary } from '@screens/sendBtc/helpers';
 import {
+  AnalyticsEvents,
   btcTransaction,
   parseSummaryForRunes,
   runesTransaction,
   type RuneSummary,
+  type Transport,
 } from '@secretkeylabs/xverse-core';
 import Button from '@ui-library/button';
 import { StyledP } from '@ui-library/common.styled';
 import Spinner from '@ui-library/spinner';
+import { trackMixPanel } from '@utils/mixpanel';
 import { useEffect, useState } from 'react';
 import { useTranslation } from 'react-i18next';
 import { useNavigate } from 'react-router-dom';
@@ -74,6 +78,7 @@ function RecoverRunes() {
   const [summary, setSummary] = useState<TransactionSummary>();
   const [runeSummary, setRuneSummary] = useState<RuneSummary>();
   const [isConfirmTx, setIsConfirmTx] = useState(false);
+  const selectedAccount = useSelectedAccount();
 
   const { data: btcFeeRates } = useBtcFeeRate();
   const context = useTransactionContext();
@@ -134,10 +139,15 @@ function RecoverRunes() {
   const handleToggleConfirmTx = () => setIsConfirmTx(!isConfirmTx);
   const handleOnNavigateBack = () => navigate(-1);
 
-  const onClickTransfer = async () => {
+  const onClickTransfer = async (ledgerTransport?: Transport) => {
     setIsBroadcasting(true);
     try {
-      const txnId = await enhancedTxn?.broadcast();
+      const txnId = await enhancedTxn?.broadcast({ ledgerTransport, rbfEnabled: true });
+      trackMixPanel(AnalyticsEvents.TransactionConfirmed, {
+        protocol: 'runes',
+        action: 'transfer',
+        wallet_type: selectedAccount?.accountType || 'software',
+      });
       navigate('/tx-status', {
         state: {
           txid: txnId,

From 6d1650765cfb48f2113acdc2c28bfa375d07eb86 Mon Sep 17 00:00:00 2001
From: Mahmoud Aboelenein <mahmoud@secretkeylabs.com>
Date: Wed, 28 Aug 2024 17:13:25 +0300
Subject: [PATCH 041/227] only check if the tx-hashes match on mainnet

---
 package-lock.json       | 14 +++++++-------
 package.json            |  2 +-
 src/app/utils/helper.ts | 16 ++++++++++------
 3 files changed, 18 insertions(+), 14 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index e680cf123..961407976 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -15,7 +15,7 @@
         "@react-spring/web": "^9.6.1",
         "@sats-connect/core": "0.2.1",
         "@scure/btc-signer": "1.2.1",
-        "@secretkeylabs/xverse-core": "18.7.1-0c4c676",
+        "@secretkeylabs/xverse-core": "18.7.1-a6f25dc",
         "@stacks/connect": "7.4.1",
         "@stacks/stacks-blockchain-api-types": "6.1.1",
         "@stacks/transactions": "6.13.1",
@@ -1862,9 +1862,9 @@
       }
     },
     "node_modules/@secretkeylabs/xverse-core": {
-      "version": "18.7.1-0c4c676",
-      "resolved": "https://npm.pkg.github.com/download/@secretkeylabs/xverse-core/18.7.1-0c4c676/8f5d618f3b1acffd30f36e87a9f8cf82dac3443c",
-      "integrity": "sha512-xbzCGqcEx2bg0Nk7MA2CdmB0eVoJniCn/4U4SvS8sUqJxqY0oo0vzaNUnoOyHs8GNeFhUZaPJmnu7PU7k+9veA==",
+      "version": "18.7.1-a6f25dc",
+      "resolved": "https://npm.pkg.github.com/download/@secretkeylabs/xverse-core/18.7.1-a6f25dc/007bf16623c34b95151262828f4b2e7ba2e36243",
+      "integrity": "sha512-/l6oif+25y20CJ/PJXY1V1ZutfByFU4efPumthyje6c8AJGabclfdGLNyFx3z8gXTaEZYBqCNanP+DT0+ZTrGQ==",
       "license": "ISC",
       "dependencies": {
         "@bitcoinerlab/secp256k1": "^1.0.2",
@@ -15333,9 +15333,9 @@
       }
     },
     "@secretkeylabs/xverse-core": {
-      "version": "18.7.1-0c4c676",
-      "resolved": "https://npm.pkg.github.com/download/@secretkeylabs/xverse-core/18.7.1-0c4c676/8f5d618f3b1acffd30f36e87a9f8cf82dac3443c",
-      "integrity": "sha512-xbzCGqcEx2bg0Nk7MA2CdmB0eVoJniCn/4U4SvS8sUqJxqY0oo0vzaNUnoOyHs8GNeFhUZaPJmnu7PU7k+9veA==",
+      "version": "18.7.1-a6f25dc",
+      "resolved": "https://npm.pkg.github.com/download/@secretkeylabs/xverse-core/18.7.1-a6f25dc/007bf16623c34b95151262828f4b2e7ba2e36243",
+      "integrity": "sha512-/l6oif+25y20CJ/PJXY1V1ZutfByFU4efPumthyje6c8AJGabclfdGLNyFx3z8gXTaEZYBqCNanP+DT0+ZTrGQ==",
       "requires": {
         "@bitcoinerlab/secp256k1": "^1.0.2",
         "@noble/curves": "^1.2.0",
diff --git a/package.json b/package.json
index 716dfc7b7..026fb77d7 100644
--- a/package.json
+++ b/package.json
@@ -44,7 +44,7 @@
     "@react-spring/web": "^9.6.1",
     "@sats-connect/core": "0.2.1",
     "@scure/btc-signer": "1.2.1",
-    "@secretkeylabs/xverse-core": "18.7.1-0c4c676",
+    "@secretkeylabs/xverse-core": "18.7.1-a6f25dc",
     "@stacks/connect": "7.4.1",
     "@stacks/stacks-blockchain-api-types": "6.1.1",
     "@stacks/transactions": "6.13.1",
diff --git a/src/app/utils/helper.ts b/src/app/utils/helper.ts
index b6eee0a4d..263add537 100644
--- a/src/app/utils/helper.ts
+++ b/src/app/utils/helper.ts
@@ -170,12 +170,16 @@ export const isValidBtcApi = async (url: string, network: NetworkType) => {
   });
 
   try {
-    const [customHash, defaultHash] = await Promise.all([
-      btcClient.getBlockHash(1),
-      defaultBtcClient.getBlockHash(1),
-    ]);
-    // this ensures the URL is for correct network
-    return customHash === defaultHash;
+    if (network === 'Mainnet') {
+      const [customHash, defaultHash] = await Promise.all([
+        btcClient.getBlockHash(1),
+        defaultBtcClient.getBlockHash(1),
+      ]);
+      // this ensures the URL is for correct network
+      return customHash === defaultHash;
+    }
+    const blockHash = await btcClient.getBlockHash(1);
+    return !!blockHash;
   } catch (e) {
     return false;
   }

From 536ec03aecc6045ea4ef9d60b3f04f9faeed1adc Mon Sep 17 00:00:00 2001
From: Den <36603049+dhriaznov@users.noreply.github.com>
Date: Thu, 29 Aug 2024 10:34:39 +0200
Subject: [PATCH 042/227] [ENG-4651] fix: Difficult to differentiate selected
 vs not selected accounts (#525)

* [ENG-4651] fix: Difficult to differentiate selected vs not selected accounts

* Fix the html props for styling

* Add a separate Props type
---
 src/app/components/accountRow/index.styled.ts | 145 +++++++++++++++
 src/app/components/accountRow/index.tsx       | 176 +++---------------
 .../components/accountRow/lazyAccountRow.tsx  |   6 +-
 src/app/screens/accountList/index.tsx         |  35 ++--
 4 files changed, 193 insertions(+), 169 deletions(-)
 create mode 100644 src/app/components/accountRow/index.styled.ts

diff --git a/src/app/components/accountRow/index.styled.ts b/src/app/components/accountRow/index.styled.ts
new file mode 100644
index 000000000..d4d6757d3
--- /dev/null
+++ b/src/app/components/accountRow/index.styled.ts
@@ -0,0 +1,145 @@
+import Button from '@ui-library/button';
+import styled from 'styled-components';
+
+export const GradientCircle = styled.div<{
+  $firstGradient: string;
+  $secondGradient: string;
+  $thirdGradient: string;
+  $isBig: boolean;
+  $isSelected: boolean;
+}>((props) => ({
+  width: props.$isBig ? 32 : 20,
+  height: props.$isBig ? 32 : 20,
+  borderRadius: 25,
+  background: `linear-gradient(to bottom, ${props.$firstGradient}, ${props.$secondGradient}, ${props.$thirdGradient})`,
+  opacity: props.$isSelected ? 1 : 0.5,
+}));
+
+export const TopSectionContainer = styled.div<{ disableClick?: boolean }>((props) => ({
+  position: 'relative',
+  display: 'flex',
+  alignItems: 'center',
+  justifyContent: 'space-between',
+  backgroundColor: 'transparent',
+  cursor: props.disableClick ? 'initial' : 'pointer',
+}));
+
+export const AccountInfoContainer = styled.div({
+  width: '100%',
+  display: 'flex',
+  alignItems: 'center',
+});
+
+export const CurrentAccountContainer = styled.div((props) => ({
+  display: 'flex',
+  flexDirection: 'column',
+  paddingLeft: props.theme.space.s,
+}));
+
+export const CurrentAccountTextContainer = styled.div((props) => ({
+  display: 'flex',
+  flexDirection: 'row',
+  alignItems: 'center',
+  gap: props.theme.space.xs,
+}));
+
+export const AccountName = styled.span<{ $isSelected: boolean }>((props) => ({
+  ...props.theme.typography.body_bold_m,
+  color: props.$isSelected ? props.theme.colors.white_0 : props.theme.colors.white_400,
+  textAlign: 'start',
+  maxWidth: 160,
+  overflow: 'hidden',
+  textOverflow: 'ellipsis',
+  whiteSpace: 'nowrap',
+}));
+
+export const BarLoaderContainer = styled.div((props) => ({
+  width: 200,
+  paddingTop: props.theme.space.xxs,
+  backgroundColor: 'transparent',
+}));
+
+export const TransparentSpan = styled.span`
+  background: transparent;
+`;
+
+export const OptionsButton = styled.button({
+  display: 'flex',
+  alignItems: 'center',
+  justifyContent: 'flex-end',
+  background: 'transparent',
+});
+
+export const ModalContent = styled.form((props) => ({
+  paddingBottom: props.theme.space.xxl,
+}));
+
+export const ModalDescription = styled.div((props) => ({
+  ...props.theme.typography.body_m,
+  color: props.theme.colors.white_200,
+}));
+
+export const ModalControlsContainer = styled.div<{
+  $bigSpacing?: boolean;
+}>((props) => ({
+  display: 'flex',
+  columnGap: props.theme.space.s,
+  marginTop: props.$bigSpacing ? props.theme.space.l : props.theme.space.m,
+}));
+
+export const ModalButtonContainer = styled.div({
+  width: '100%',
+});
+
+export const ButtonRow = styled.button`
+  display: flex;
+  align-items: center;
+  background-color: transparent;
+  justify-content: flex-start;
+  padding: ${(props) => props.theme.space.l};
+  padding-top: ${(props) => props.theme.space.s};
+  padding-bottom: ${(props) => props.theme.space.s};
+  font: ${(props) => props.theme.typography.body_medium_m};
+  color: ${(props) => props.theme.colors.white_0};
+  transition: background-color 0.2s ease;
+  :hover {
+    background-color: ${(props) => props.theme.colors.elevation3};
+  }
+  :active {
+    background-color: ${(props) => props.theme.colors.elevation3};
+  }
+`;
+
+export const InputLabel = styled.div((props) => ({
+  ...props.theme.typography.body_medium_m,
+  display: 'flex',
+  justifyContent: 'space-between',
+  alignItems: 'center',
+  color: props.theme.colors.white_200,
+  marginTop: props.theme.space.m,
+  marginBottom: props.theme.space.xs,
+}));
+
+export const Balance = styled.div<{ $isSelected?: boolean }>((props) => ({
+  ...props.theme.typography.body_medium_m,
+  marginTop: props.theme.space.xxs,
+  color: props.$isSelected ? props.theme.colors.white_200 : props.theme.colors.white_600,
+  display: 'flex',
+  alignItems: 'center',
+  columnGap: props.theme.space.xs,
+}));
+
+export const StyledButton = styled(Button)((props) => ({
+  padding: 0,
+  width: 'auto',
+  transition: 'opacity 0.1s ease',
+  div: {
+    color: props.theme.colors.tangerine,
+  },
+  ':hover:enabled': {
+    opacity: 0.8,
+  },
+  ':active:enabled': {
+    opacity: 0.6,
+  },
+}));
diff --git a/src/app/components/accountRow/index.tsx b/src/app/components/accountRow/index.tsx
index 273cd0a6f..5f873694a 100644
--- a/src/app/components/accountRow/index.tsx
+++ b/src/app/components/accountRow/index.tsx
@@ -16,148 +16,25 @@ import { useEffect, useRef, useState } from 'react';
 import { useTranslation } from 'react-i18next';
 import { NumericFormat } from 'react-number-format';
 import 'react-tooltip/dist/react-tooltip.css';
-import styled from 'styled-components';
-
-const GradientCircle = styled.div<{
-  firstGradient: string;
-  secondGradient: string;
-  thirdGradient: string;
-  isBig: boolean;
-}>((props) => ({
-  width: props.isBig ? 32 : 20,
-  height: props.isBig ? 32 : 20,
-  borderRadius: 25,
-  background: `linear-gradient(to bottom,${props.firstGradient}, ${props.secondGradient},${props.thirdGradient} )`,
-}));
-
-const TopSectionContainer = styled.div<{ disableClick?: boolean }>((props) => ({
-  position: 'relative',
-  display: 'flex',
-  alignItems: 'center',
-  justifyContent: 'space-between',
-  backgroundColor: 'transparent',
-  cursor: props.disableClick ? 'initial' : 'pointer',
-}));
-
-const AccountInfoContainer = styled.div({
-  width: '100%',
-  display: 'flex',
-  alignItems: 'center',
-});
-
-const CurrentAccountContainer = styled.div((props) => ({
-  display: 'flex',
-  flexDirection: 'column',
-  paddingLeft: props.theme.space.s,
-}));
-
-const CurrentAccountTextContainer = styled.div((props) => ({
-  display: 'flex',
-  flexDirection: 'row',
-  alignItems: 'center',
-  gap: props.theme.space.xs,
-}));
-
-const AccountName = styled.span<{ isSelected: boolean }>((props) => ({
-  ...props.theme.typography.body_bold_m,
-  color: props.isSelected ? props.theme.colors.white_0 : props.theme.colors.white_400,
-  textAlign: 'start',
-  maxWidth: 160,
-  overflow: 'hidden',
-  textOverflow: 'ellipsis',
-  whiteSpace: 'nowrap',
-}));
-
-const BarLoaderContainer = styled.div((props) => ({
-  width: 200,
-  paddingTop: props.theme.space.xxs,
-  backgroundColor: 'transparent',
-}));
-
-const TransparentSpan = styled.span`
-  background: transparent;
-`;
-
-const OptionsButton = styled.button({
-  display: 'flex',
-  alignItems: 'center',
-  justifyContent: 'flex-end',
-  background: 'transparent',
-});
-
-const ModalContent = styled.form((props) => ({
-  paddingBottom: props.theme.space.xxl,
-}));
-
-const ModalDescription = styled.div((props) => ({
-  ...props.theme.typography.body_m,
-  color: props.theme.colors.white_200,
-}));
-
-const ModalControlsContainer = styled.div<{
-  $bigSpacing?: boolean;
-}>((props) => ({
-  display: 'flex',
-  columnGap: props.theme.space.s,
-  marginTop: props.$bigSpacing ? props.theme.space.l : props.theme.space.m,
-}));
-
-const ModalButtonContainer = styled.div({
-  width: '100%',
-});
-
-const ButtonRow = styled.button`
-  display: flex;
-  align-items: center;
-  background-color: transparent;
-  justify-content: flex-start;
-  padding: ${(props) => props.theme.space.l};
-  padding-top: ${(props) => props.theme.space.s};
-  padding-bottom: ${(props) => props.theme.space.s};
-  font: ${(props) => props.theme.typography.body_medium_m};
-  color: ${(props) => props.theme.colors.white_0};
-  transition: background-color 0.2s ease;
-  :hover {
-    background-color: ${(props) => props.theme.colors.elevation3};
-  }
-  :active {
-    background-color: ${(props) => props.theme.colors.elevation3};
-  }
-`;
-
-const InputLabel = styled.div((props) => ({
-  ...props.theme.typography.body_medium_m,
-  display: 'flex',
-  justifyContent: 'space-between',
-  alignItems: 'center',
-  color: props.theme.colors.white_200,
-  marginTop: props.theme.space.m,
-  marginBottom: props.theme.space.xs,
-}));
-
-const Balance = styled.div<{ isSelected?: boolean }>((props) => ({
-  ...props.theme.typography.body_medium_m,
-  marginTop: props.theme.space.xxs,
-  color: props.isSelected ? props.theme.colors.white_200 : props.theme.colors.white_400,
-  display: 'flex',
-  alignItems: 'center',
-  columnGap: props.theme.space.xs,
-}));
-
-const StyledButton = styled(Button)((props) => ({
-  padding: 0,
-  width: 'auto',
-  transition: 'opacity 0.1s ease',
-  div: {
-    color: props.theme.colors.tangerine,
-  },
-  ':hover:enabled': {
-    opacity: 0.8,
-  },
-  ':active:enabled': {
-    opacity: 0.6,
-  },
-}));
+import {
+  AccountInfoContainer,
+  AccountName,
+  Balance,
+  BarLoaderContainer,
+  ButtonRow,
+  CurrentAccountContainer,
+  CurrentAccountTextContainer,
+  GradientCircle,
+  InputLabel,
+  ModalButtonContainer,
+  ModalContent,
+  ModalControlsContainer,
+  ModalDescription,
+  OptionsButton,
+  StyledButton,
+  TopSectionContainer,
+  TransparentSpan,
+} from './index.styled';
 
 function AccountRow({
   account,
@@ -319,16 +196,17 @@ function AccountRow({
     <TopSectionContainer disableClick={disabledAccountSelect}>
       <AccountInfoContainer onClick={handleClick}>
         <GradientCircle
-          firstGradient={gradient[0]}
-          secondGradient={gradient[1]}
-          thirdGradient={gradient[2]}
-          isBig={isAccountListView}
+          $firstGradient={gradient[0]}
+          $secondGradient={gradient[1]}
+          $thirdGradient={gradient[2]}
+          $isBig={isAccountListView}
+          $isSelected={isSelected}
         />
         <CurrentAccountContainer>
           {account && (
             <TransparentSpan>
               <CurrentAccountTextContainer>
-                <AccountName aria-label="Account Name" isSelected={isSelected}>
+                <AccountName aria-label="Account Name" $isSelected={isSelected}>
                   {account?.accountName ??
                     account?.bnsName ??
                     `${t('ACCOUNT_NAME')} ${`${(account?.id ?? 0) + 1}`}`}
@@ -345,14 +223,14 @@ function AccountRow({
                   prefix={`${currencySymbolMap[fiatCurrency]}`}
                   thousandSeparator
                   renderText={(value: string) => (
-                    <Balance data-testid="account-balance" isSelected={isSelected}>
+                    <Balance data-testid="account-balance" $isSelected={isSelected}>
                       {value}
                     </Balance>
                   )}
                 />
               )}
               {isAccountListView && !totalBalance && (
-                <Balance isSelected={isSelected}>
+                <Balance $isSelected={isSelected}>
                   {EMPTY_LABEL}
                   <Spinner color="white" size={12} />
                 </Balance>
diff --git a/src/app/components/accountRow/lazyAccountRow.tsx b/src/app/components/accountRow/lazyAccountRow.tsx
index e88332884..486b71d5f 100644
--- a/src/app/components/accountRow/lazyAccountRow.tsx
+++ b/src/app/components/accountRow/lazyAccountRow.tsx
@@ -4,14 +4,16 @@ import type { Account } from '@secretkeylabs/xverse-core';
 import { useEffect, useRef, useState } from 'react';
 import AccountRow from '.';
 
-function LazyAccountRow(props: {
+type Props = {
   account: Account | null;
   isSelected: boolean;
   onAccountSelected: (account: Account, goBack?: boolean) => void;
   isAccountListView?: boolean;
   disabledAccountSelect?: boolean;
   fetchBalance?: (account: Account | null) => void;
-}) {
+};
+
+function LazyAccountRow(props: Props) {
   const { fetchBalance, account } = props;
   const { accountBalances } = useWalletSelector();
   const totalBalance = accountBalances[account?.btcAddress ?? ''];
diff --git a/src/app/screens/accountList/index.tsx b/src/app/screens/accountList/index.tsx
index 461415a28..1fb8a50ff 100644
--- a/src/app/screens/accountList/index.tsx
+++ b/src/app/screens/accountList/index.tsx
@@ -1,7 +1,6 @@
 import ConnectLedger from '@assets/img/dashboard/connect_ledger.svg';
 import { filterLedgerAccounts } from '@common/utils/ledger';
 import LazyAccountRow from '@components/accountRow/lazyAccountRow';
-import ActionButton from '@components/button';
 import Separator from '@components/separator';
 import TopRow from '@components/topRow';
 import useAccountBalance from '@hooks/queries/useAccountBalance';
@@ -11,6 +10,7 @@ import useWalletReducer from '@hooks/useWalletReducer';
 import useWalletSelector from '@hooks/useWalletSelector';
 import { Plus } from '@phosphor-icons/react';
 import type { Account } from '@secretkeylabs/xverse-core';
+import Button from '@ui-library/button';
 import { useMemo } from 'react';
 import { useTranslation } from 'react-i18next';
 import { useLocation, useNavigate } from 'react-router-dom';
@@ -30,10 +30,9 @@ const Container = styled.div({
 const AccountContainer = styled.div((props) => ({
   display: 'flex',
   flexDirection: 'column',
-  paddingLeft: props.theme.spacing(11),
-  paddingRight: props.theme.spacing(11),
-  paddingTop: props.theme.spacing(8),
-  gap: props.theme.spacing(8),
+  gap: props.theme.space.m,
+  padding: props.theme.space.m,
+  paddingBottom: 0,
 }));
 
 const ButtonsWrapper = styled.div(
@@ -72,11 +71,15 @@ function AccountList(): JSX.Element {
     return [...networkLedgerAccounts, ...accountsList];
   }, [accountsList, ledgerAccountsList, network]);
 
+  const handleBackButtonClick = () => {
+    navigate(-1);
+  };
+
   const handleAccountSelect = async (account: Account, goBack = true) => {
     await switchAccount(account);
     broadcastResetUserFlow();
     if (goBack) {
-      navigate(-1);
+      handleBackButtonClick();
     }
   };
 
@@ -84,10 +87,6 @@ function AccountList(): JSX.Element {
     account.btcAddress === selectedAccount?.btcAddress &&
     account.stxAddress === selectedAccount?.stxAddress;
 
-  const handleBackButtonClick = () => {
-    navigate(-1);
-  };
-
   const onCreateAccount = async () => {
     await createAccount();
   };
@@ -121,17 +120,17 @@ function AccountList(): JSX.Element {
         </div>
         {!hideListActions ? (
           <ButtonsWrapper>
-            <ActionButton
+            <Button
               icon={<Plus size={16} fill="white" />}
-              onPress={onCreateAccount}
-              text={t('NEW_ACCOUNT')}
-              transparent
+              onClick={onCreateAccount}
+              title={t('NEW_ACCOUNT')}
+              variant="secondary"
             />
-            <ActionButton
+            <Button
               icon={<img src={ConnectLedger} width={16} height={16} alt="" />}
-              onPress={onImportLedgerAccount}
-              text={t('LEDGER_ACCOUNT')}
-              transparent
+              onClick={onImportLedgerAccount}
+              title={t('LEDGER_ACCOUNT')}
+              variant="secondary"
             />
           </ButtonsWrapper>
         ) : null}

From 7106a1b88200089c00c1e7aa7306e57d5ee21932 Mon Sep 17 00:00:00 2001
From: Den <36603049+dhriaznov@users.noreply.github.com>
Date: Thu, 29 Aug 2024 10:35:18 +0200
Subject: [PATCH 043/227] [ENG-4722] fix: Naming disappeared after clicking on
 the account (#510)

---
 src/app/hooks/useWalletReducer.ts | 37 ++++++++++++++++++++++++++-----
 1 file changed, 31 insertions(+), 6 deletions(-)

diff --git a/src/app/hooks/useWalletReducer.ts b/src/app/hooks/useWalletReducer.ts
index 2fcb62330..3afd0e8b9 100644
--- a/src/app/hooks/useWalletReducer.ts
+++ b/src/app/hooks/useWalletReducer.ts
@@ -181,12 +181,14 @@ const useWalletReducer = () => {
 
     // Load custom account names for the new network
     const savedCustomAccountNames = savedNames[currentNetwork.type];
-    walletAccounts.forEach((account) => {
-      const savedAccount = savedCustomAccountNames?.find((acc) => acc.id === account.id);
-      if (savedAccount) {
-        account.accountName = savedAccount.name;
-      }
-    });
+    if (savedCustomAccountNames?.length) {
+      walletAccounts.forEach((account) => {
+        const savedAccount = savedCustomAccountNames.find((acc) => acc.id === account.id);
+        if (savedAccount) {
+          account.accountName = savedAccount.name;
+        }
+      });
+    }
 
     // ledger accounts initially didn't have a deviceAccountIndex
     // this is a migration to add the deviceAccountIndex to the ledger accounts without them
@@ -221,6 +223,19 @@ const useWalletReducer = () => {
     });
   };
 
+  const loadAccountNames = () => {
+    const updatedSavedNames = softwareAccountsList.reduce<{ id: number; name: string }[]>(
+      (acc, account) => {
+        if (account.accountName) {
+          acc.push({ id: account.id, name: account.accountName });
+        }
+        return acc;
+      },
+      [],
+    );
+    dispatch(updateSavedNamesAction(network.type, updatedSavedNames));
+  };
+
   const loadWallet = async () => {
     const seedPhrase = await seedVault.getSeed();
     const currentAccounts = softwareAccountsList || [];
@@ -244,6 +259,16 @@ const useWalletReducer = () => {
 
     await ensureSelectedAccountValid();
 
+    if (
+      !savedNames[network.type]?.length &&
+      softwareAccountsList.some((account) => !!account.accountName)
+    ) {
+      // there was no savedNames store object initially
+      // this is a migration to add the savedNames if there are custom account names that are not saved
+      // it should only fire once if ever
+      loadAccountNames();
+    }
+
     dispatch(setWalletUnlockedAction(true));
     setSessionStartTimeAndMigrate();
   };

From 94419635fdb464fbbf1d8ce739e094234edd4b1c Mon Sep 17 00:00:00 2001
From: jordankzf <jordan@secretkeylabs.com>
Date: Thu, 29 Aug 2024 17:31:02 +0800
Subject: [PATCH 044/227] Remove vite

---
 .github/workflows/build.yml |    1 -
 package-lock.json           | 2086 +----------------------------------
 package.json                |    4 -
 vitest.config.js            |    7 -
 4 files changed, 31 insertions(+), 2067 deletions(-)
 delete mode 100644 vitest.config.js

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index a706c7343..2e265923a 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -31,7 +31,6 @@ jobs:
           npm run knip
           npx eslint .
           npx tsc --noEmit
-          npm test
       - name: Build
         env:
           TRANSAC_API_KEY: ${{ secrets.TRANSAC_API_KEY }}
diff --git a/package-lock.json b/package-lock.json
index 8b0517cbc..a234c6208 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -124,9 +124,6 @@
         "type-fest": "^2.19.0",
         "typescript": "^5.5.4",
         "typescript-plugin-styled-components": "^3.0.0",
-        "vite": "5.3.2",
-        "vite-tsconfig-paths": "4.3.2",
-        "vitest": "0.34.6",
         "webpack": "^5.89.0",
         "webpack-dev-server": "^4.11.0"
       },
@@ -659,374 +656,6 @@
         "vlq": "^0.2.1"
       }
     },
-    "node_modules/@esbuild/aix-ppc64": {
-      "version": "0.21.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/aix-ppc64/-/aix-ppc64-0.21.5.tgz",
-      "integrity": "sha512-1SDgH6ZSPTlggy1yI6+Dbkiz8xzpHJEVAlF/AM1tHPLsf5STom9rwtjE4hKAF20FfXXNTFqEYXyJNWh1GiZedQ==",
-      "cpu": [
-        "ppc64"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "aix"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/@esbuild/android-arm": {
-      "version": "0.21.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.21.5.tgz",
-      "integrity": "sha512-vCPvzSjpPHEi1siZdlvAlsPxXl7WbOVUBBAowWug4rJHb68Ox8KualB+1ocNvT5fjv6wpkX6o/iEpbDrf68zcg==",
-      "cpu": [
-        "arm"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "android"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/@esbuild/android-arm64": {
-      "version": "0.21.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.21.5.tgz",
-      "integrity": "sha512-c0uX9VAUBQ7dTDCjq+wdyGLowMdtR/GoC2U5IYk/7D1H1JYC0qseD7+11iMP2mRLN9RcCMRcjC4YMclCzGwS/A==",
-      "cpu": [
-        "arm64"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "android"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/@esbuild/android-x64": {
-      "version": "0.21.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.21.5.tgz",
-      "integrity": "sha512-D7aPRUUNHRBwHxzxRvp856rjUHRFW1SdQATKXH2hqA0kAZb1hKmi02OpYRacl0TxIGz/ZmXWlbZgjwWYaCakTA==",
-      "cpu": [
-        "x64"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "android"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/@esbuild/darwin-arm64": {
-      "version": "0.21.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.21.5.tgz",
-      "integrity": "sha512-DwqXqZyuk5AiWWf3UfLiRDJ5EDd49zg6O9wclZ7kUMv2WRFr4HKjXp/5t8JZ11QbQfUS6/cRCKGwYhtNAY88kQ==",
-      "cpu": [
-        "arm64"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "darwin"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/@esbuild/darwin-x64": {
-      "version": "0.21.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.21.5.tgz",
-      "integrity": "sha512-se/JjF8NlmKVG4kNIuyWMV/22ZaerB+qaSi5MdrXtd6R08kvs2qCN4C09miupktDitvh8jRFflwGFBQcxZRjbw==",
-      "cpu": [
-        "x64"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "darwin"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/@esbuild/freebsd-arm64": {
-      "version": "0.21.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.21.5.tgz",
-      "integrity": "sha512-5JcRxxRDUJLX8JXp/wcBCy3pENnCgBR9bN6JsY4OmhfUtIHe3ZW0mawA7+RDAcMLrMIZaf03NlQiX9DGyB8h4g==",
-      "cpu": [
-        "arm64"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "freebsd"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/@esbuild/freebsd-x64": {
-      "version": "0.21.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.21.5.tgz",
-      "integrity": "sha512-J95kNBj1zkbMXtHVH29bBriQygMXqoVQOQYA+ISs0/2l3T9/kj42ow2mpqerRBxDJnmkUDCaQT/dfNXWX/ZZCQ==",
-      "cpu": [
-        "x64"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "freebsd"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/@esbuild/linux-arm": {
-      "version": "0.21.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.21.5.tgz",
-      "integrity": "sha512-bPb5AHZtbeNGjCKVZ9UGqGwo8EUu4cLq68E95A53KlxAPRmUyYv2D6F0uUI65XisGOL1hBP5mTronbgo+0bFcA==",
-      "cpu": [
-        "arm"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/@esbuild/linux-arm64": {
-      "version": "0.21.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.21.5.tgz",
-      "integrity": "sha512-ibKvmyYzKsBeX8d8I7MH/TMfWDXBF3db4qM6sy+7re0YXya+K1cem3on9XgdT2EQGMu4hQyZhan7TeQ8XkGp4Q==",
-      "cpu": [
-        "arm64"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/@esbuild/linux-ia32": {
-      "version": "0.21.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.21.5.tgz",
-      "integrity": "sha512-YvjXDqLRqPDl2dvRODYmmhz4rPeVKYvppfGYKSNGdyZkA01046pLWyRKKI3ax8fbJoK5QbxblURkwK/MWY18Tg==",
-      "cpu": [
-        "ia32"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/@esbuild/linux-loong64": {
-      "version": "0.21.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.21.5.tgz",
-      "integrity": "sha512-uHf1BmMG8qEvzdrzAqg2SIG/02+4/DHB6a9Kbya0XDvwDEKCoC8ZRWI5JJvNdUjtciBGFQ5PuBlpEOXQj+JQSg==",
-      "cpu": [
-        "loong64"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/@esbuild/linux-mips64el": {
-      "version": "0.21.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.21.5.tgz",
-      "integrity": "sha512-IajOmO+KJK23bj52dFSNCMsz1QP1DqM6cwLUv3W1QwyxkyIWecfafnI555fvSGqEKwjMXVLokcV5ygHW5b3Jbg==",
-      "cpu": [
-        "mips64el"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/@esbuild/linux-ppc64": {
-      "version": "0.21.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.21.5.tgz",
-      "integrity": "sha512-1hHV/Z4OEfMwpLO8rp7CvlhBDnjsC3CttJXIhBi+5Aj5r+MBvy4egg7wCbe//hSsT+RvDAG7s81tAvpL2XAE4w==",
-      "cpu": [
-        "ppc64"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/@esbuild/linux-riscv64": {
-      "version": "0.21.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.21.5.tgz",
-      "integrity": "sha512-2HdXDMd9GMgTGrPWnJzP2ALSokE/0O5HhTUvWIbD3YdjME8JwvSCnNGBnTThKGEB91OZhzrJ4qIIxk/SBmyDDA==",
-      "cpu": [
-        "riscv64"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/@esbuild/linux-s390x": {
-      "version": "0.21.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.21.5.tgz",
-      "integrity": "sha512-zus5sxzqBJD3eXxwvjN1yQkRepANgxE9lgOW2qLnmr8ikMTphkjgXu1HR01K4FJg8h1kEEDAqDcZQtbrRnB41A==",
-      "cpu": [
-        "s390x"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/@esbuild/linux-x64": {
-      "version": "0.21.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.21.5.tgz",
-      "integrity": "sha512-1rYdTpyv03iycF1+BhzrzQJCdOuAOtaqHTWJZCWvijKD2N5Xu0TtVC8/+1faWqcP9iBCWOmjmhoH94dH82BxPQ==",
-      "cpu": [
-        "x64"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/@esbuild/netbsd-x64": {
-      "version": "0.21.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.21.5.tgz",
-      "integrity": "sha512-Woi2MXzXjMULccIwMnLciyZH4nCIMpWQAs049KEeMvOcNADVxo0UBIQPfSmxB3CWKedngg7sWZdLvLczpe0tLg==",
-      "cpu": [
-        "x64"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "netbsd"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/@esbuild/openbsd-x64": {
-      "version": "0.21.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.21.5.tgz",
-      "integrity": "sha512-HLNNw99xsvx12lFBUwoT8EVCsSvRNDVxNpjZ7bPn947b8gJPzeHWyNVhFsaerc0n3TsbOINvRP2byTZ5LKezow==",
-      "cpu": [
-        "x64"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "openbsd"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/@esbuild/sunos-x64": {
-      "version": "0.21.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.21.5.tgz",
-      "integrity": "sha512-6+gjmFpfy0BHU5Tpptkuh8+uw3mnrvgs+dSPQXQOv3ekbordwnzTVEb4qnIvQcYXq6gzkyTnoZ9dZG+D4garKg==",
-      "cpu": [
-        "x64"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "sunos"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/@esbuild/win32-arm64": {
-      "version": "0.21.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.21.5.tgz",
-      "integrity": "sha512-Z0gOTd75VvXqyq7nsl93zwahcTROgqvuAcYDUr+vOv8uHhNSKROyU961kgtCD1e95IqPKSQKH7tBTslnS3tA8A==",
-      "cpu": [
-        "arm64"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "win32"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/@esbuild/win32-ia32": {
-      "version": "0.21.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.21.5.tgz",
-      "integrity": "sha512-SWXFF1CL2RVNMaVs+BBClwtfZSvDgtL//G/smwAc5oVK/UPu2Gu9tIaRgFmYFFKrmg3SyAjSrElf0TiJ1v8fYA==",
-      "cpu": [
-        "ia32"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "win32"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/@esbuild/win32-x64": {
-      "version": "0.21.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.21.5.tgz",
-      "integrity": "sha512-tQd/1efJuzPC6rCFwEvLtci/xNFcTZknmXs98FYDfGE4wP9ClFV98nyKrzJKVPMhdDnjzLhdUyMX4PsQAPjwIw==",
-      "cpu": [
-        "x64"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "win32"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
     "node_modules/@eslint-community/eslint-utils": {
       "version": "4.4.0",
       "resolved": "https://registry.npmjs.org/@eslint-community/eslint-utils/-/eslint-utils-4.4.0.tgz",
@@ -1165,18 +794,6 @@
       "integrity": "sha512-6EwiSjwWYP7pTckG6I5eyFANjPhmPjUX9JRLUSfNPC7FX7zK9gyZAfUEaECL6ALTpGX5AjnBq3C9XmVWPitNpw==",
       "dev": true
     },
-    "node_modules/@jest/schemas": {
-      "version": "29.6.3",
-      "resolved": "https://registry.npmjs.org/@jest/schemas/-/schemas-29.6.3.tgz",
-      "integrity": "sha512-mo5j5X+jIZmJQveBKeS/clAueipV7KgiX1vMgCxam1RNYiqE1w62n0/tJJnHtjW8ZHcQco5gY85jA3mi0L+nSA==",
-      "dev": true,
-      "dependencies": {
-        "@sinclair/typebox": "^0.27.8"
-      },
-      "engines": {
-        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
-      }
-    },
     "node_modules/@jridgewell/gen-mapping": {
       "version": "0.3.3",
       "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.3.tgz",
@@ -1543,214 +1160,6 @@
         "node": ">=14"
       }
     },
-    "node_modules/@rollup/rollup-android-arm-eabi": {
-      "version": "4.18.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.18.0.tgz",
-      "integrity": "sha512-Tya6xypR10giZV1XzxmH5wr25VcZSncG0pZIjfePT0OVBvqNEurzValetGNarVrGiq66EBVAFn15iYX4w6FKgQ==",
-      "cpu": [
-        "arm"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "android"
-      ]
-    },
-    "node_modules/@rollup/rollup-android-arm64": {
-      "version": "4.18.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.18.0.tgz",
-      "integrity": "sha512-avCea0RAP03lTsDhEyfy+hpfr85KfyTctMADqHVhLAF3MlIkq83CP8UfAHUssgXTYd+6er6PaAhx/QGv4L1EiA==",
-      "cpu": [
-        "arm64"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "android"
-      ]
-    },
-    "node_modules/@rollup/rollup-darwin-arm64": {
-      "version": "4.18.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.18.0.tgz",
-      "integrity": "sha512-IWfdwU7KDSm07Ty0PuA/W2JYoZ4iTj3TUQjkVsO/6U+4I1jN5lcR71ZEvRh52sDOERdnNhhHU57UITXz5jC1/w==",
-      "cpu": [
-        "arm64"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "darwin"
-      ]
-    },
-    "node_modules/@rollup/rollup-darwin-x64": {
-      "version": "4.18.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.18.0.tgz",
-      "integrity": "sha512-n2LMsUz7Ynu7DoQrSQkBf8iNrjOGyPLrdSg802vk6XT3FtsgX6JbE8IHRvposskFm9SNxzkLYGSq9QdpLYpRNA==",
-      "cpu": [
-        "x64"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "darwin"
-      ]
-    },
-    "node_modules/@rollup/rollup-linux-arm-gnueabihf": {
-      "version": "4.18.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.18.0.tgz",
-      "integrity": "sha512-C/zbRYRXFjWvz9Z4haRxcTdnkPt1BtCkz+7RtBSuNmKzMzp3ZxdM28Mpccn6pt28/UWUCTXa+b0Mx1k3g6NOMA==",
-      "cpu": [
-        "arm"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "linux"
-      ]
-    },
-    "node_modules/@rollup/rollup-linux-arm-musleabihf": {
-      "version": "4.18.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-musleabihf/-/rollup-linux-arm-musleabihf-4.18.0.tgz",
-      "integrity": "sha512-l3m9ewPgjQSXrUMHg93vt0hYCGnrMOcUpTz6FLtbwljo2HluS4zTXFy2571YQbisTnfTKPZ01u/ukJdQTLGh9A==",
-      "cpu": [
-        "arm"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "linux"
-      ]
-    },
-    "node_modules/@rollup/rollup-linux-arm64-gnu": {
-      "version": "4.18.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.18.0.tgz",
-      "integrity": "sha512-rJ5D47d8WD7J+7STKdCUAgmQk49xuFrRi9pZkWoRD1UeSMakbcepWXPF8ycChBoAqs1pb2wzvbY6Q33WmN2ftw==",
-      "cpu": [
-        "arm64"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "linux"
-      ]
-    },
-    "node_modules/@rollup/rollup-linux-arm64-musl": {
-      "version": "4.18.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.18.0.tgz",
-      "integrity": "sha512-be6Yx37b24ZwxQ+wOQXXLZqpq4jTckJhtGlWGZs68TgdKXJgw54lUUoFYrg6Zs/kjzAQwEwYbp8JxZVzZLRepQ==",
-      "cpu": [
-        "arm64"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "linux"
-      ]
-    },
-    "node_modules/@rollup/rollup-linux-powerpc64le-gnu": {
-      "version": "4.18.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-powerpc64le-gnu/-/rollup-linux-powerpc64le-gnu-4.18.0.tgz",
-      "integrity": "sha512-hNVMQK+qrA9Todu9+wqrXOHxFiD5YmdEi3paj6vP02Kx1hjd2LLYR2eaN7DsEshg09+9uzWi2W18MJDlG0cxJA==",
-      "cpu": [
-        "ppc64"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "linux"
-      ]
-    },
-    "node_modules/@rollup/rollup-linux-riscv64-gnu": {
-      "version": "4.18.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-gnu/-/rollup-linux-riscv64-gnu-4.18.0.tgz",
-      "integrity": "sha512-ROCM7i+m1NfdrsmvwSzoxp9HFtmKGHEqu5NNDiZWQtXLA8S5HBCkVvKAxJ8U+CVctHwV2Gb5VUaK7UAkzhDjlg==",
-      "cpu": [
-        "riscv64"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "linux"
-      ]
-    },
-    "node_modules/@rollup/rollup-linux-s390x-gnu": {
-      "version": "4.18.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-s390x-gnu/-/rollup-linux-s390x-gnu-4.18.0.tgz",
-      "integrity": "sha512-0UyyRHyDN42QL+NbqevXIIUnKA47A+45WyasO+y2bGJ1mhQrfrtXUpTxCOrfxCR4esV3/RLYyucGVPiUsO8xjg==",
-      "cpu": [
-        "s390x"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "linux"
-      ]
-    },
-    "node_modules/@rollup/rollup-linux-x64-gnu": {
-      "version": "4.18.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.18.0.tgz",
-      "integrity": "sha512-xuglR2rBVHA5UsI8h8UbX4VJ470PtGCf5Vpswh7p2ukaqBGFTnsfzxUBetoWBWymHMxbIG0Cmx7Y9qDZzr648w==",
-      "cpu": [
-        "x64"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "linux"
-      ]
-    },
-    "node_modules/@rollup/rollup-linux-x64-musl": {
-      "version": "4.18.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.18.0.tgz",
-      "integrity": "sha512-LKaqQL9osY/ir2geuLVvRRs+utWUNilzdE90TpyoX0eNqPzWjRm14oMEE+YLve4k/NAqCdPkGYDaDF5Sw+xBfg==",
-      "cpu": [
-        "x64"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "linux"
-      ]
-    },
-    "node_modules/@rollup/rollup-win32-arm64-msvc": {
-      "version": "4.18.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.18.0.tgz",
-      "integrity": "sha512-7J6TkZQFGo9qBKH0pk2cEVSRhJbL6MtfWxth7Y5YmZs57Pi+4x6c2dStAUvaQkHQLnEQv1jzBUW43GvZW8OFqA==",
-      "cpu": [
-        "arm64"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "win32"
-      ]
-    },
-    "node_modules/@rollup/rollup-win32-ia32-msvc": {
-      "version": "4.18.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.18.0.tgz",
-      "integrity": "sha512-Txjh+IxBPbkUB9+SXZMpv+b/vnTEtFyfWZgJ6iyCmt2tdx0OF5WhFowLmnh8ENGNpfUlUZkdI//4IEmhwPieNg==",
-      "cpu": [
-        "ia32"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "win32"
-      ]
-    },
-    "node_modules/@rollup/rollup-win32-x64-msvc": {
-      "version": "4.18.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.18.0.tgz",
-      "integrity": "sha512-UOo5FdvOL0+eIVTgS4tIdbW+TtnBLWg1YBCcU2KWM7nuNwRz9bksDX1bekJJCpu25N1DVWaCwnT39dVQxzqS8g==",
-      "cpu": [
-        "x64"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "win32"
-      ]
-    },
     "node_modules/@sats-connect/core": {
       "version": "0.2.1",
       "resolved": "https://registry.npmjs.org/@sats-connect/core/-/core-0.2.1.tgz",
@@ -1985,12 +1394,6 @@
         "randombytes": "^2.0.1"
       }
     },
-    "node_modules/@sinclair/typebox": {
-      "version": "0.27.8",
-      "resolved": "https://registry.npmjs.org/@sinclair/typebox/-/typebox-0.27.8.tgz",
-      "integrity": "sha512-+Fj43pSMwJs4KRrH/938Uf+uAELIgVBmQzg/q1YG10djyfA3TnrU8N8XzqCh/okZdszqBQTZf96idMfE5lnwTA==",
-      "dev": true
-    },
     "node_modules/@snyk/github-codeowners": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/@snyk/github-codeowners/-/github-codeowners-1.1.0.tgz",
@@ -2446,21 +1849,6 @@
         "@types/node": "*"
       }
     },
-    "node_modules/@types/chai": {
-      "version": "4.3.11",
-      "resolved": "https://registry.npmjs.org/@types/chai/-/chai-4.3.11.tgz",
-      "integrity": "sha512-qQR1dr2rGIHYlJulmr8Ioq3De0Le9E4MJ5AiaeAETJJpndT1uUNHsGFK3L/UIu+rbkQSdj8J/w2bCsBZc/Y5fQ==",
-      "dev": true
-    },
-    "node_modules/@types/chai-subset": {
-      "version": "1.3.5",
-      "resolved": "https://registry.npmjs.org/@types/chai-subset/-/chai-subset-1.3.5.tgz",
-      "integrity": "sha512-c2mPnw+xHtXDoHmdtcCXGwyLMiauiAyxWMzhGpqHC4nqI/Y5G2XhTampslK2rb59kpcuHon03UH8W6iYUzw88A==",
-      "dev": true,
-      "dependencies": {
-        "@types/chai": "*"
-      }
-    },
     "node_modules/@types/chrome": {
       "version": "0.0.237",
       "resolved": "https://registry.npmjs.org/@types/chrome/-/chrome-0.0.237.tgz",
@@ -3102,162 +2490,6 @@
         "url": "https://opencollective.com/typescript-eslint"
       }
     },
-    "node_modules/@vitest/expect": {
-      "version": "0.34.6",
-      "resolved": "https://registry.npmjs.org/@vitest/expect/-/expect-0.34.6.tgz",
-      "integrity": "sha512-QUzKpUQRc1qC7qdGo7rMK3AkETI7w18gTCUrsNnyjjJKYiuUB9+TQK3QnR1unhCnWRC0AbKv2omLGQDF/mIjOw==",
-      "dev": true,
-      "dependencies": {
-        "@vitest/spy": "0.34.6",
-        "@vitest/utils": "0.34.6",
-        "chai": "^4.3.10"
-      },
-      "funding": {
-        "url": "https://opencollective.com/vitest"
-      }
-    },
-    "node_modules/@vitest/runner": {
-      "version": "0.34.6",
-      "resolved": "https://registry.npmjs.org/@vitest/runner/-/runner-0.34.6.tgz",
-      "integrity": "sha512-1CUQgtJSLF47NnhN+F9X2ycxUP0kLHQ/JWvNHbeBfwW8CzEGgeskzNnHDyv1ieKTltuR6sdIHV+nmR6kPxQqzQ==",
-      "dev": true,
-      "dependencies": {
-        "@vitest/utils": "0.34.6",
-        "p-limit": "^4.0.0",
-        "pathe": "^1.1.1"
-      },
-      "funding": {
-        "url": "https://opencollective.com/vitest"
-      }
-    },
-    "node_modules/@vitest/runner/node_modules/p-limit": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-4.0.0.tgz",
-      "integrity": "sha512-5b0R4txpzjPWVw/cXXUResoD4hb6U/x9BH08L7nw+GN1sezDzPdxeRvpc9c433fZhBan/wusjbCsqwqm4EIBIQ==",
-      "dev": true,
-      "dependencies": {
-        "yocto-queue": "^1.0.0"
-      },
-      "engines": {
-        "node": "^12.20.0 || ^14.13.1 || >=16.0.0"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/@vitest/runner/node_modules/yocto-queue": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/yocto-queue/-/yocto-queue-1.0.0.tgz",
-      "integrity": "sha512-9bnSc/HEW2uRy67wc+T8UwauLuPJVn28jb+GtJY16iiKWyvmYJRXVT4UamsAEGQfPohgr2q4Tq0sQbQlxTfi1g==",
-      "dev": true,
-      "engines": {
-        "node": ">=12.20"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/@vitest/snapshot": {
-      "version": "0.34.6",
-      "resolved": "https://registry.npmjs.org/@vitest/snapshot/-/snapshot-0.34.6.tgz",
-      "integrity": "sha512-B3OZqYn6k4VaN011D+ve+AA4whM4QkcwcrwaKwAbyyvS/NB1hCWjFIBQxAQQSQir9/RtyAAGuq+4RJmbn2dH4w==",
-      "dev": true,
-      "dependencies": {
-        "magic-string": "^0.30.1",
-        "pathe": "^1.1.1",
-        "pretty-format": "^29.5.0"
-      },
-      "funding": {
-        "url": "https://opencollective.com/vitest"
-      }
-    },
-    "node_modules/@vitest/snapshot/node_modules/ansi-styles": {
-      "version": "5.2.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-5.2.0.tgz",
-      "integrity": "sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==",
-      "dev": true,
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
-      }
-    },
-    "node_modules/@vitest/snapshot/node_modules/pretty-format": {
-      "version": "29.7.0",
-      "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-29.7.0.tgz",
-      "integrity": "sha512-Pdlw/oPxN+aXdmM9R00JVC9WVFoCLTKJvDVLgmJ+qAffBMxsV85l/Lu7sNx4zSzPyoL2euImuEwHhOXdEgNFZQ==",
-      "dev": true,
-      "dependencies": {
-        "@jest/schemas": "^29.6.3",
-        "ansi-styles": "^5.0.0",
-        "react-is": "^18.0.0"
-      },
-      "engines": {
-        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
-      }
-    },
-    "node_modules/@vitest/spy": {
-      "version": "0.34.6",
-      "resolved": "https://registry.npmjs.org/@vitest/spy/-/spy-0.34.6.tgz",
-      "integrity": "sha512-xaCvneSaeBw/cz8ySmF7ZwGvL0lBjfvqc1LpQ/vcdHEvpLn3Ff1vAvjw+CoGn0802l++5L/pxb7whwcWAw+DUQ==",
-      "dev": true,
-      "dependencies": {
-        "tinyspy": "^2.1.1"
-      },
-      "funding": {
-        "url": "https://opencollective.com/vitest"
-      }
-    },
-    "node_modules/@vitest/utils": {
-      "version": "0.34.6",
-      "resolved": "https://registry.npmjs.org/@vitest/utils/-/utils-0.34.6.tgz",
-      "integrity": "sha512-IG5aDD8S6zlvloDsnzHw0Ut5xczlF+kv2BOTo+iXfPr54Yhi5qbVOgGB1hZaVq4iJ4C/MZ2J0y15IlsV/ZcI0A==",
-      "dev": true,
-      "dependencies": {
-        "diff-sequences": "^29.4.3",
-        "loupe": "^2.3.6",
-        "pretty-format": "^29.5.0"
-      },
-      "funding": {
-        "url": "https://opencollective.com/vitest"
-      }
-    },
-    "node_modules/@vitest/utils/node_modules/ansi-styles": {
-      "version": "5.2.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-5.2.0.tgz",
-      "integrity": "sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==",
-      "dev": true,
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
-      }
-    },
-    "node_modules/@vitest/utils/node_modules/diff-sequences": {
-      "version": "29.6.3",
-      "resolved": "https://registry.npmjs.org/diff-sequences/-/diff-sequences-29.6.3.tgz",
-      "integrity": "sha512-EjePK1srD3P08o2j4f0ExnylqRs5B9tJjcp9t1krH2qRi8CCdsYfwe9JgSLurFBWwq4uOlipzfk5fHNvwFKr8Q==",
-      "dev": true,
-      "engines": {
-        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
-      }
-    },
-    "node_modules/@vitest/utils/node_modules/pretty-format": {
-      "version": "29.7.0",
-      "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-29.7.0.tgz",
-      "integrity": "sha512-Pdlw/oPxN+aXdmM9R00JVC9WVFoCLTKJvDVLgmJ+qAffBMxsV85l/Lu7sNx4zSzPyoL2euImuEwHhOXdEgNFZQ==",
-      "dev": true,
-      "dependencies": {
-        "@jest/schemas": "^29.6.3",
-        "ansi-styles": "^5.0.0",
-        "react-is": "^18.0.0"
-      },
-      "engines": {
-        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
-      }
-    },
     "node_modules/@webassemblyjs/ast": {
       "version": "1.11.6",
       "resolved": "https://registry.npmjs.org/@webassemblyjs/ast/-/ast-1.11.6.tgz",
@@ -3536,15 +2768,6 @@
         "acorn": "^6.0.0 || ^7.0.0 || ^8.0.0"
       }
     },
-    "node_modules/acorn-walk": {
-      "version": "8.3.0",
-      "resolved": "https://registry.npmjs.org/acorn-walk/-/acorn-walk-8.3.0.tgz",
-      "integrity": "sha512-FS7hV565M5l1R08MXqo8odwMTB02C2UqzB17RVgu9EyuYFBqJZ3/ZY97sQD5FewVu1UyDFc1yztUDrAwT0EypA==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.4.0"
-      }
-    },
     "node_modules/aggregate-error": {
       "version": "3.1.0",
       "resolved": "https://registry.npmjs.org/aggregate-error/-/aggregate-error-3.1.0.tgz",
@@ -3915,15 +3138,6 @@
       "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.0.tgz",
       "integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA=="
     },
-    "node_modules/assertion-error": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/assertion-error/-/assertion-error-1.1.0.tgz",
-      "integrity": "sha512-jgsaNduz+ndvGyFt3uSuWqvy4lCnIJiovtouQN5JZHOKCS2QuhEdbcQHFhVksz2N2U9hXJo8odG7ETyWlEeuDw==",
-      "dev": true,
-      "engines": {
-        "node": "*"
-      }
-    },
     "node_modules/ast-types-flow": {
       "version": "0.0.7",
       "resolved": "https://registry.npmjs.org/ast-types-flow/-/ast-types-flow-0.0.7.tgz",
@@ -4589,15 +3803,6 @@
         "node": ">=8"
       }
     },
-    "node_modules/cac": {
-      "version": "6.7.14",
-      "resolved": "https://registry.npmjs.org/cac/-/cac-6.7.14.tgz",
-      "integrity": "sha512-b6Ilus+c3RrdDk+JhLKUAQfzzgLEPy6wcXqS7f/xe1EETvsDP6GORG7SFuOs6cID5YkqchW/LXZbX5bc8j7ZcQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
     "node_modules/call-bind": {
       "version": "1.0.7",
       "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.7.tgz",
@@ -4662,24 +3867,6 @@
         }
       ]
     },
-    "node_modules/chai": {
-      "version": "4.3.10",
-      "resolved": "https://registry.npmjs.org/chai/-/chai-4.3.10.tgz",
-      "integrity": "sha512-0UXG04VuVbruMUYbJ6JctvH0YnC/4q3/AkT18q4NaITo91CUm0liMS9VqzT9vZhVQ/1eqPanMWjBM+Juhfb/9g==",
-      "dev": true,
-      "dependencies": {
-        "assertion-error": "^1.1.0",
-        "check-error": "^1.0.3",
-        "deep-eql": "^4.1.3",
-        "get-func-name": "^2.0.2",
-        "loupe": "^2.3.6",
-        "pathval": "^1.1.1",
-        "type-detect": "^4.0.8"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
     "node_modules/chalk": {
       "version": "2.4.2",
       "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
@@ -4693,18 +3880,6 @@
         "node": ">=4"
       }
     },
-    "node_modules/check-error": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/check-error/-/check-error-1.0.3.tgz",
-      "integrity": "sha512-iKEoDYaRmd1mxM90a2OEfWhjsjPpYPuQ+lMYsoxB126+t8fw7ySEO48nmDg5COTjxDI65/Y2OWpeEHk3ZOe8zg==",
-      "dev": true,
-      "dependencies": {
-        "get-func-name": "^2.0.2"
-      },
-      "engines": {
-        "node": "*"
-      }
-    },
     "node_modules/chokidar": {
       "version": "3.5.3",
       "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.5.3.tgz",
@@ -5481,18 +4656,6 @@
         }
       }
     },
-    "node_modules/deep-eql": {
-      "version": "4.1.3",
-      "resolved": "https://registry.npmjs.org/deep-eql/-/deep-eql-4.1.3.tgz",
-      "integrity": "sha512-WaEtAOpRA1MQ0eohqZjpGD8zdI0Ovsm8mmFhaDN8dvDZzyoUMcYDnf5Y6iu7HTXxf8JDS23qWa4a+hKCDyOPzw==",
-      "dev": true,
-      "dependencies": {
-        "type-detect": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
     "node_modules/deep-equal": {
       "version": "2.2.2",
       "resolved": "https://registry.npmjs.org/deep-equal/-/deep-equal-2.2.2.tgz",
@@ -6191,44 +5354,6 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/esbuild": {
-      "version": "0.21.5",
-      "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.21.5.tgz",
-      "integrity": "sha512-mg3OPMV4hXywwpoDxu3Qda5xCKQi+vCTZq8S9J/EpkhB2HzKXq4SNFZE3+NK93JYxc8VMSep+lOUSC/RVKaBqw==",
-      "dev": true,
-      "hasInstallScript": true,
-      "bin": {
-        "esbuild": "bin/esbuild"
-      },
-      "engines": {
-        "node": ">=12"
-      },
-      "optionalDependencies": {
-        "@esbuild/aix-ppc64": "0.21.5",
-        "@esbuild/android-arm": "0.21.5",
-        "@esbuild/android-arm64": "0.21.5",
-        "@esbuild/android-x64": "0.21.5",
-        "@esbuild/darwin-arm64": "0.21.5",
-        "@esbuild/darwin-x64": "0.21.5",
-        "@esbuild/freebsd-arm64": "0.21.5",
-        "@esbuild/freebsd-x64": "0.21.5",
-        "@esbuild/linux-arm": "0.21.5",
-        "@esbuild/linux-arm64": "0.21.5",
-        "@esbuild/linux-ia32": "0.21.5",
-        "@esbuild/linux-loong64": "0.21.5",
-        "@esbuild/linux-mips64el": "0.21.5",
-        "@esbuild/linux-ppc64": "0.21.5",
-        "@esbuild/linux-riscv64": "0.21.5",
-        "@esbuild/linux-s390x": "0.21.5",
-        "@esbuild/linux-x64": "0.21.5",
-        "@esbuild/netbsd-x64": "0.21.5",
-        "@esbuild/openbsd-x64": "0.21.5",
-        "@esbuild/sunos-x64": "0.21.5",
-        "@esbuild/win32-arm64": "0.21.5",
-        "@esbuild/win32-ia32": "0.21.5",
-        "@esbuild/win32-x64": "0.21.5"
-      }
-    },
     "node_modules/escalade": {
       "version": "3.1.1",
       "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.1.tgz",
@@ -7505,15 +6630,6 @@
         "node": "6.* || 8.* || >= 10.*"
       }
     },
-    "node_modules/get-func-name": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/get-func-name/-/get-func-name-2.0.2.tgz",
-      "integrity": "sha512-8vXOvuE167CtIc3OyItco7N/dpRtBbYOsPsXCz7X/PMnlGjYjSGuZJgM1Y7mmew7BKf9BqvLX2tnOVy1BBUsxQ==",
-      "dev": true,
-      "engines": {
-        "node": "*"
-      }
-    },
     "node_modules/get-intrinsic": {
       "version": "1.2.4",
       "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.2.4.tgz",
@@ -7640,12 +6756,6 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/globrex": {
-      "version": "0.1.2",
-      "resolved": "https://registry.npmjs.org/globrex/-/globrex-0.1.2.tgz",
-      "integrity": "sha512-uHJgbwAMwNFf5mLst7IWLNg14x1CkeqglJb/K3doi4dw6q2IvAAmM/Y81kevy83wP+Sst+nutFTYOGg3d1lsxg==",
-      "dev": true
-    },
     "node_modules/goober": {
       "version": "2.1.13",
       "resolved": "https://registry.npmjs.org/goober/-/goober-2.1.13.tgz",
@@ -8868,12 +7978,6 @@
         "node": ">=6"
       }
     },
-    "node_modules/jsonc-parser": {
-      "version": "3.2.0",
-      "resolved": "https://registry.npmjs.org/jsonc-parser/-/jsonc-parser-3.2.0.tgz",
-      "integrity": "sha512-gfFQZrcTc8CnKXp6Y4/CBT3fTc0OVuDofpre4aEeEpSBPV5X5v4+Vmx+8snU7RLPrNHPKSgLxGo9YuQzz20o+w==",
-      "dev": true
-    },
     "node_modules/jsonfile": {
       "version": "6.1.0",
       "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.1.0.tgz",
@@ -9421,18 +8525,6 @@
         "node": ">=8.9.0"
       }
     },
-    "node_modules/local-pkg": {
-      "version": "0.4.3",
-      "resolved": "https://registry.npmjs.org/local-pkg/-/local-pkg-0.4.3.tgz",
-      "integrity": "sha512-SFppqq5p42fe2qcZQqqEOiVRXl+WCP1MdT6k7BDEW1j++sp5fIY+/fdRQitvKgB5BrBcmrs5m/L0v2FrU5MY1g==",
-      "dev": true,
-      "engines": {
-        "node": ">=14"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/antfu"
-      }
-    },
     "node_modules/locate-path": {
       "version": "6.0.0",
       "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-6.0.0.tgz",
@@ -9624,15 +8716,6 @@
       "resolved": "https://registry.npmjs.org/lottie-web/-/lottie-web-5.12.2.tgz",
       "integrity": "sha512-uvhvYPC8kGPjXT3MyKMrL3JitEAmDMp30lVkuq/590Mw9ok6pWcFCwXJveo0t5uqYw1UREQHofD+jVpdjBv8wg=="
     },
-    "node_modules/loupe": {
-      "version": "2.3.7",
-      "resolved": "https://registry.npmjs.org/loupe/-/loupe-2.3.7.tgz",
-      "integrity": "sha512-zSMINGVYkdpYSOBmLi0D1Uo7JU9nVdQKrHxC8eYlV+9YKK9WePqAlL7lSlorG/U2Fw1w0hTBmaa/jrQ3UbPHtA==",
-      "dev": true,
-      "dependencies": {
-        "get-func-name": "^2.0.1"
-      }
-    },
     "node_modules/lower-case": {
       "version": "2.0.2",
       "resolved": "https://registry.npmjs.org/lower-case/-/lower-case-2.0.2.tgz",
@@ -9651,18 +8734,6 @@
         "yallist": "^3.0.2"
       }
     },
-    "node_modules/magic-string": {
-      "version": "0.30.5",
-      "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.30.5.tgz",
-      "integrity": "sha512-7xlpfBaQaP/T6Vh8MO/EqXSW5En6INHEvEXQiuff7Gku0PWjU3uf6w/j9o7O+SpB5fOAkrI5HeoNgwjEO0pFsA==",
-      "dev": true,
-      "dependencies": {
-        "@jridgewell/sourcemap-codec": "^1.4.15"
-      },
-      "engines": {
-        "node": ">=12"
-      }
-    },
     "node_modules/map-obj": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/map-obj/-/map-obj-2.0.0.tgz",
@@ -9855,18 +8926,6 @@
       "resolved": "https://registry.npmjs.org/mixpanel-browser/-/mixpanel-browser-2.47.0.tgz",
       "integrity": "sha512-Ldrva0fRBEIFWmEibBQO1PulfpJVF3pf28Guk09lDirDaSQqqU/xs9zQLwN2rL5VwVtsP1aD3JaCgaa98EjojQ=="
     },
-    "node_modules/mlly": {
-      "version": "1.4.2",
-      "resolved": "https://registry.npmjs.org/mlly/-/mlly-1.4.2.tgz",
-      "integrity": "sha512-i/Ykufi2t1EZ6NaPLdfnZk2AX8cs0d+mTzVKuPfqPKPatxLApaBoxJQ9x1/uckXtrS/U5oisPMDkNs0yQTaBRg==",
-      "dev": true,
-      "dependencies": {
-        "acorn": "^8.10.0",
-        "pathe": "^1.1.1",
-        "pkg-types": "^1.0.3",
-        "ufo": "^1.3.0"
-      }
-    },
     "node_modules/more-entropy": {
       "version": "0.0.7",
       "resolved": "https://registry.npmjs.org/more-entropy/-/more-entropy-0.0.7.tgz",
@@ -10536,21 +9595,6 @@
         "inherits": "2.0.3"
       }
     },
-    "node_modules/pathe": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/pathe/-/pathe-1.1.1.tgz",
-      "integrity": "sha512-d+RQGp0MAYTIaDBIMmOfMwz3E+LOZnxx1HZd5R18mmCZY0QBlK0LDZfPc8FW8Ed2DlvsuE6PRjroDY+wg4+j/Q==",
-      "dev": true
-    },
-    "node_modules/pathval": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/pathval/-/pathval-1.1.1.tgz",
-      "integrity": "sha512-Dp6zGqpTdETdR63lehJYPeIOqpiNBNtc7BpWSLrOje7UaIsE5aY92r/AunQA7rsXvet3lrJ3JnZX29UPTKXyKQ==",
-      "dev": true,
-      "engines": {
-        "node": "*"
-      }
-    },
     "node_modules/pbkdf2": {
       "version": "3.1.2",
       "resolved": "https://registry.npmjs.org/pbkdf2/-/pbkdf2-3.1.2.tgz",
@@ -10618,21 +9662,10 @@
       "integrity": "sha512-0Gni6D4UcLTbv9c57DfxDGdr41XfgUjqWZu492f0cIGr16zDU06BWP/RAEvOuo7CQ0CNjHaLlM59YJJFm3NWlw==",
       "dev": true,
       "dependencies": {
-        "pinkie": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/pkg-types": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/pkg-types/-/pkg-types-1.0.3.tgz",
-      "integrity": "sha512-nN7pYi0AQqJnoLPC9eHFQ8AcyaixBUOwvqc5TDnIKCMEE6I0y8P7OKA7fPexsXGCGxQDl/cmrLAp26LhcwxZ4A==",
-      "dev": true,
-      "dependencies": {
-        "jsonc-parser": "^3.2.0",
-        "mlly": "^1.2.0",
-        "pathe": "^1.1.0"
+        "pinkie": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
       }
     },
     "node_modules/playwright": {
@@ -11211,7 +10244,8 @@
     "node_modules/react-is": {
       "version": "18.2.0",
       "resolved": "https://registry.npmjs.org/react-is/-/react-is-18.2.0.tgz",
-      "integrity": "sha512-xWGDIW6x921xtzPkhiULtthJHoJvBbF3q26fzloPCK0hsvxtPVelvftw3zjbHWSkR2km9Z+4uxbDDK/6Zw9B8w=="
+      "integrity": "sha512-xWGDIW6x921xtzPkhiULtthJHoJvBbF3q26fzloPCK0hsvxtPVelvftw3zjbHWSkR2km9Z+4uxbDDK/6Zw9B8w==",
+      "peer": true
     },
     "node_modules/react-is-visible": {
       "version": "1.2.0",
@@ -11659,41 +10693,6 @@
         "node": ">=8"
       }
     },
-    "node_modules/rollup": {
-      "version": "4.18.0",
-      "resolved": "https://registry.npmjs.org/rollup/-/rollup-4.18.0.tgz",
-      "integrity": "sha512-QmJz14PX3rzbJCN1SG4Xe/bAAX2a6NpCP8ab2vfu2GiUr8AQcr2nCV/oEO3yneFarB67zk8ShlIyWb2LGTb3Sg==",
-      "dev": true,
-      "dependencies": {
-        "@types/estree": "1.0.5"
-      },
-      "bin": {
-        "rollup": "dist/bin/rollup"
-      },
-      "engines": {
-        "node": ">=18.0.0",
-        "npm": ">=8.0.0"
-      },
-      "optionalDependencies": {
-        "@rollup/rollup-android-arm-eabi": "4.18.0",
-        "@rollup/rollup-android-arm64": "4.18.0",
-        "@rollup/rollup-darwin-arm64": "4.18.0",
-        "@rollup/rollup-darwin-x64": "4.18.0",
-        "@rollup/rollup-linux-arm-gnueabihf": "4.18.0",
-        "@rollup/rollup-linux-arm-musleabihf": "4.18.0",
-        "@rollup/rollup-linux-arm64-gnu": "4.18.0",
-        "@rollup/rollup-linux-arm64-musl": "4.18.0",
-        "@rollup/rollup-linux-powerpc64le-gnu": "4.18.0",
-        "@rollup/rollup-linux-riscv64-gnu": "4.18.0",
-        "@rollup/rollup-linux-s390x-gnu": "4.18.0",
-        "@rollup/rollup-linux-x64-gnu": "4.18.0",
-        "@rollup/rollup-linux-x64-musl": "4.18.0",
-        "@rollup/rollup-win32-arm64-msvc": "4.18.0",
-        "@rollup/rollup-win32-ia32-msvc": "4.18.0",
-        "@rollup/rollup-win32-x64-msvc": "4.18.0",
-        "fsevents": "~2.3.2"
-      }
-    },
     "node_modules/run-parallel": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/run-parallel/-/run-parallel-1.2.0.tgz",
@@ -12114,12 +11113,6 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/siginfo": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/siginfo/-/siginfo-2.0.0.tgz",
-      "integrity": "sha512-ybx0WO1/8bSBLEWXZvEd7gMW3Sn3JFlW3TvX1nREbDLRNQNaeNN8WK0meBwPdAaOI7TtRRRJn/Es1zhrrCHu7g==",
-      "dev": true
-    },
     "node_modules/signal-exit": {
       "version": "3.0.7",
       "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.7.tgz",
@@ -12240,12 +11233,6 @@
         "wbuf": "^1.7.3"
       }
     },
-    "node_modules/stackback": {
-      "version": "0.0.2",
-      "resolved": "https://registry.npmjs.org/stackback/-/stackback-0.0.2.tgz",
-      "integrity": "sha512-1XMJE5fQo1jGH6Y/7ebnwPOBEkIEnT4QF32d5R1+VXdXveM0IBMJt8zfaxX1P3QhVwrYe+576+jkANtSS2mBbw==",
-      "dev": true
-    },
     "node_modules/stackframe": {
       "version": "1.3.4",
       "resolved": "https://registry.npmjs.org/stackframe/-/stackframe-1.3.4.tgz",
@@ -12261,12 +11248,6 @@
         "node": ">= 0.8"
       }
     },
-    "node_modules/std-env": {
-      "version": "3.5.0",
-      "resolved": "https://registry.npmjs.org/std-env/-/std-env-3.5.0.tgz",
-      "integrity": "sha512-JGUEaALvL0Mf6JCfYnJOTcobY+Nc7sG/TemDRBqCA0wEr4DER7zDchaaixTlmOxAjG1uRJmX82EQcxwTQTkqVA==",
-      "dev": true
-    },
     "node_modules/stop-iteration-iterator": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/stop-iteration-iterator/-/stop-iteration-iterator-1.0.0.tgz",
@@ -12473,18 +11454,6 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/strip-literal": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/strip-literal/-/strip-literal-1.3.0.tgz",
-      "integrity": "sha512-PugKzOsyXpArk0yWmUwqOZecSO0GH0bPoctLcqNDH9J04pVW3lflYE0ujElBGTloevcxF5MofAOZ7C5l2b+wLg==",
-      "dev": true,
-      "dependencies": {
-        "acorn": "^8.10.0"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/antfu"
-      }
-    },
     "node_modules/style-loader": {
       "version": "3.3.3",
       "resolved": "https://registry.npmjs.org/style-loader/-/style-loader-3.3.3.tgz",
@@ -12697,30 +11666,6 @@
       "integrity": "sha512-eHY7nBftgThBqOyHGVN+l8gF0BucP09fMo0oO/Lb0w1OF80dJv+lDVpXG60WMQvkcxAkNybKsrEIE3ZtKGmPrA==",
       "dev": true
     },
-    "node_modules/tinybench": {
-      "version": "2.5.1",
-      "resolved": "https://registry.npmjs.org/tinybench/-/tinybench-2.5.1.tgz",
-      "integrity": "sha512-65NKvSuAVDP/n4CqH+a9w2kTlLReS9vhsAP06MWx+/89nMinJyB2icyl58RIcqCmIggpojIGeuJGhjU1aGMBSg==",
-      "dev": true
-    },
-    "node_modules/tinypool": {
-      "version": "0.7.0",
-      "resolved": "https://registry.npmjs.org/tinypool/-/tinypool-0.7.0.tgz",
-      "integrity": "sha512-zSYNUlYSMhJ6Zdou4cJwo/p7w5nmAH17GRfU/ui3ctvjXFErXXkruT4MWW6poDeXgCaIBlGLrfU6TbTXxyGMww==",
-      "dev": true,
-      "engines": {
-        "node": ">=14.0.0"
-      }
-    },
-    "node_modules/tinyspy": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/tinyspy/-/tinyspy-2.2.0.tgz",
-      "integrity": "sha512-d2eda04AN/cPOR89F7Xv5bK/jrQEhmcLFe6HFldoeO9AJtps+fqEnh486vnT/8y4bw38pSyxDcTCAq+Ks2aJTg==",
-      "dev": true,
-      "engines": {
-        "node": ">=14.0.0"
-      }
-    },
     "node_modules/to-fast-properties": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-2.0.0.tgz",
@@ -12930,26 +11875,6 @@
         "typescript": ">=3"
       }
     },
-    "node_modules/tsconfck": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/tsconfck/-/tsconfck-3.1.0.tgz",
-      "integrity": "sha512-CMjc5zMnyAjcS9sPLytrbFmj89st2g+JYtY/c02ug4Q+CZaAtCgbyviI0n1YvjZE/pzoc6FbNsINS13DOL1B9w==",
-      "dev": true,
-      "bin": {
-        "tsconfck": "bin/tsconfck.js"
-      },
-      "engines": {
-        "node": "^18 || >=20"
-      },
-      "peerDependencies": {
-        "typescript": "^5.0.0"
-      },
-      "peerDependenciesMeta": {
-        "typescript": {
-          "optional": true
-        }
-      }
-    },
     "node_modules/tsconfig-paths": {
       "version": "3.14.2",
       "resolved": "https://registry.npmjs.org/tsconfig-paths/-/tsconfig-paths-3.14.2.tgz",
@@ -13110,15 +12035,6 @@
         "node": ">= 0.8.0"
       }
     },
-    "node_modules/type-detect": {
-      "version": "4.0.8",
-      "resolved": "https://registry.npmjs.org/type-detect/-/type-detect-4.0.8.tgz",
-      "integrity": "sha512-0fr/mIH1dlO+x7TlcMy+bIDqKPsw/70tVyeHW787goQjhmqaZe10uwLujubK9q9Lg6Fiho1KUKDYz0Z7k7g5/g==",
-      "dev": true,
-      "engines": {
-        "node": ">=4"
-      }
-    },
     "node_modules/type-fest": {
       "version": "2.19.0",
       "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-2.19.0.tgz",
@@ -13236,12 +12152,6 @@
         "typescript": "~4.8 || 5"
       }
     },
-    "node_modules/ufo": {
-      "version": "1.3.2",
-      "resolved": "https://registry.npmjs.org/ufo/-/ufo-1.3.2.tgz",
-      "integrity": "sha512-o+ORpgGwaYQXgqGDwd+hkS4PuZ3QnmqMMxRuajK/a38L6fTpcE5GPIfrf+L/KemFzfUpeUQc1rRS1iDBozvnFA==",
-      "dev": true
-    },
     "node_modules/uglify-js": {
       "version": "3.19.1",
       "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.19.1.tgz",
@@ -13431,180 +12341,6 @@
         "node": ">= 0.8"
       }
     },
-    "node_modules/vite": {
-      "version": "5.3.2",
-      "resolved": "https://registry.npmjs.org/vite/-/vite-5.3.2.tgz",
-      "integrity": "sha512-6lA7OBHBlXUxiJxbO5aAY2fsHHzDr1q7DvXYnyZycRs2Dz+dXBWuhpWHvmljTRTpQC2uvGmUFFkSHF2vGo90MA==",
-      "dev": true,
-      "dependencies": {
-        "esbuild": "^0.21.3",
-        "postcss": "^8.4.38",
-        "rollup": "^4.13.0"
-      },
-      "bin": {
-        "vite": "bin/vite.js"
-      },
-      "engines": {
-        "node": "^18.0.0 || >=20.0.0"
-      },
-      "funding": {
-        "url": "https://github.com/vitejs/vite?sponsor=1"
-      },
-      "optionalDependencies": {
-        "fsevents": "~2.3.3"
-      },
-      "peerDependencies": {
-        "@types/node": "^18.0.0 || >=20.0.0",
-        "less": "*",
-        "lightningcss": "^1.21.0",
-        "sass": "*",
-        "stylus": "*",
-        "sugarss": "*",
-        "terser": "^5.4.0"
-      },
-      "peerDependenciesMeta": {
-        "@types/node": {
-          "optional": true
-        },
-        "less": {
-          "optional": true
-        },
-        "lightningcss": {
-          "optional": true
-        },
-        "sass": {
-          "optional": true
-        },
-        "stylus": {
-          "optional": true
-        },
-        "sugarss": {
-          "optional": true
-        },
-        "terser": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/vite-node": {
-      "version": "0.34.6",
-      "resolved": "https://registry.npmjs.org/vite-node/-/vite-node-0.34.6.tgz",
-      "integrity": "sha512-nlBMJ9x6n7/Amaz6F3zJ97EBwR2FkzhBRxF5e+jE6LA3yi6Wtc2lyTij1OnDMIr34v5g/tVQtsVAzhT0jc5ygA==",
-      "dev": true,
-      "dependencies": {
-        "cac": "^6.7.14",
-        "debug": "^4.3.4",
-        "mlly": "^1.4.0",
-        "pathe": "^1.1.1",
-        "picocolors": "^1.0.0",
-        "vite": "^3.0.0 || ^4.0.0 || ^5.0.0-0"
-      },
-      "bin": {
-        "vite-node": "vite-node.mjs"
-      },
-      "engines": {
-        "node": ">=v14.18.0"
-      },
-      "funding": {
-        "url": "https://opencollective.com/vitest"
-      }
-    },
-    "node_modules/vite-tsconfig-paths": {
-      "version": "4.3.2",
-      "resolved": "https://registry.npmjs.org/vite-tsconfig-paths/-/vite-tsconfig-paths-4.3.2.tgz",
-      "integrity": "sha512-0Vd/a6po6Q+86rPlntHye7F31zA2URZMbH8M3saAZ/xR9QoGN/L21bxEGfXdWmFdNkqPpRdxFT7nmNe12e9/uA==",
-      "dev": true,
-      "dependencies": {
-        "debug": "^4.1.1",
-        "globrex": "^0.1.2",
-        "tsconfck": "^3.0.3"
-      },
-      "peerDependencies": {
-        "vite": "*"
-      },
-      "peerDependenciesMeta": {
-        "vite": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/vitest": {
-      "version": "0.34.6",
-      "resolved": "https://registry.npmjs.org/vitest/-/vitest-0.34.6.tgz",
-      "integrity": "sha512-+5CALsOvbNKnS+ZHMXtuUC7nL8/7F1F2DnHGjSsszX8zCjWSSviphCb/NuS9Nzf4Q03KyyDRBAXhF/8lffME4Q==",
-      "dev": true,
-      "dependencies": {
-        "@types/chai": "^4.3.5",
-        "@types/chai-subset": "^1.3.3",
-        "@types/node": "*",
-        "@vitest/expect": "0.34.6",
-        "@vitest/runner": "0.34.6",
-        "@vitest/snapshot": "0.34.6",
-        "@vitest/spy": "0.34.6",
-        "@vitest/utils": "0.34.6",
-        "acorn": "^8.9.0",
-        "acorn-walk": "^8.2.0",
-        "cac": "^6.7.14",
-        "chai": "^4.3.10",
-        "debug": "^4.3.4",
-        "local-pkg": "^0.4.3",
-        "magic-string": "^0.30.1",
-        "pathe": "^1.1.1",
-        "picocolors": "^1.0.0",
-        "std-env": "^3.3.3",
-        "strip-literal": "^1.0.1",
-        "tinybench": "^2.5.0",
-        "tinypool": "^0.7.0",
-        "vite": "^3.1.0 || ^4.0.0 || ^5.0.0-0",
-        "vite-node": "0.34.6",
-        "why-is-node-running": "^2.2.2"
-      },
-      "bin": {
-        "vitest": "vitest.mjs"
-      },
-      "engines": {
-        "node": ">=v14.18.0"
-      },
-      "funding": {
-        "url": "https://opencollective.com/vitest"
-      },
-      "peerDependencies": {
-        "@edge-runtime/vm": "*",
-        "@vitest/browser": "*",
-        "@vitest/ui": "*",
-        "happy-dom": "*",
-        "jsdom": "*",
-        "playwright": "*",
-        "safaridriver": "*",
-        "webdriverio": "*"
-      },
-      "peerDependenciesMeta": {
-        "@edge-runtime/vm": {
-          "optional": true
-        },
-        "@vitest/browser": {
-          "optional": true
-        },
-        "@vitest/ui": {
-          "optional": true
-        },
-        "happy-dom": {
-          "optional": true
-        },
-        "jsdom": {
-          "optional": true
-        },
-        "playwright": {
-          "optional": true
-        },
-        "safaridriver": {
-          "optional": true
-        },
-        "webdriverio": {
-          "optional": true
-        }
-      }
-    },
     "node_modules/vlq": {
       "version": "0.2.3",
       "resolved": "https://registry.npmjs.org/vlq/-/vlq-0.2.3.tgz",
@@ -14016,22 +12752,6 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/why-is-node-running": {
-      "version": "2.2.2",
-      "resolved": "https://registry.npmjs.org/why-is-node-running/-/why-is-node-running-2.2.2.tgz",
-      "integrity": "sha512-6tSwToZxTOcotxHeA+qGCq1mVzKR3CwcJGmVcY+QE8SHy6TnpFnh8PAvPNHYr7EcuVeG0QSMxtYCuO1ta/G/oA==",
-      "dev": true,
-      "dependencies": {
-        "siginfo": "^2.0.0",
-        "stackback": "0.0.2"
-      },
-      "bin": {
-        "why-is-node-running": "cli.js"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
     "node_modules/wif": {
       "version": "2.0.6",
       "resolved": "https://registry.npmjs.org/wif/-/wif-2.0.6.tgz",
@@ -14590,190 +13310,29 @@
         "filter-obj": "^1.1.0",
         "has-own-property": "^0.1.0",
         "identity-function": "^1.0.0",
-        "is-iterable": "^1.1.0",
-        "iterable-lookahead": "^1.0.0",
-        "lodash.curry": "^4.1.1",
-        "magic-string": "^0.16.0",
-        "map-obj": "^2.0.0",
-        "object-pairs": "^0.1.0",
-        "object-values": "^1.0.0",
-        "reverse-arguments": "^1.0.0",
-        "shell-quote-word": "^1.0.1",
-        "to-pascal-case": "^1.0.0",
-        "unescape-js": "^1.0.5"
-      },
-      "dependencies": {
-        "magic-string": {
-          "version": "0.16.0",
-          "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.16.0.tgz",
-          "integrity": "sha512-c4BEos3y6G2qO0B9X7K0FVLOPT9uGrjYwYRLFmDqyl5YMboUviyecnXWp94fJTSMwPw2/sf+CEYt5AGpmklkkQ==",
-          "dev": true,
-          "requires": {
-            "vlq": "^0.2.1"
-          }
-        }
-      }
-    },
-    "@esbuild/aix-ppc64": {
-      "version": "0.21.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/aix-ppc64/-/aix-ppc64-0.21.5.tgz",
-      "integrity": "sha512-1SDgH6ZSPTlggy1yI6+Dbkiz8xzpHJEVAlF/AM1tHPLsf5STom9rwtjE4hKAF20FfXXNTFqEYXyJNWh1GiZedQ==",
-      "dev": true,
-      "optional": true
-    },
-    "@esbuild/android-arm": {
-      "version": "0.21.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.21.5.tgz",
-      "integrity": "sha512-vCPvzSjpPHEi1siZdlvAlsPxXl7WbOVUBBAowWug4rJHb68Ox8KualB+1ocNvT5fjv6wpkX6o/iEpbDrf68zcg==",
-      "dev": true,
-      "optional": true
-    },
-    "@esbuild/android-arm64": {
-      "version": "0.21.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.21.5.tgz",
-      "integrity": "sha512-c0uX9VAUBQ7dTDCjq+wdyGLowMdtR/GoC2U5IYk/7D1H1JYC0qseD7+11iMP2mRLN9RcCMRcjC4YMclCzGwS/A==",
-      "dev": true,
-      "optional": true
-    },
-    "@esbuild/android-x64": {
-      "version": "0.21.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.21.5.tgz",
-      "integrity": "sha512-D7aPRUUNHRBwHxzxRvp856rjUHRFW1SdQATKXH2hqA0kAZb1hKmi02OpYRacl0TxIGz/ZmXWlbZgjwWYaCakTA==",
-      "dev": true,
-      "optional": true
-    },
-    "@esbuild/darwin-arm64": {
-      "version": "0.21.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.21.5.tgz",
-      "integrity": "sha512-DwqXqZyuk5AiWWf3UfLiRDJ5EDd49zg6O9wclZ7kUMv2WRFr4HKjXp/5t8JZ11QbQfUS6/cRCKGwYhtNAY88kQ==",
-      "dev": true,
-      "optional": true
-    },
-    "@esbuild/darwin-x64": {
-      "version": "0.21.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.21.5.tgz",
-      "integrity": "sha512-se/JjF8NlmKVG4kNIuyWMV/22ZaerB+qaSi5MdrXtd6R08kvs2qCN4C09miupktDitvh8jRFflwGFBQcxZRjbw==",
-      "dev": true,
-      "optional": true
-    },
-    "@esbuild/freebsd-arm64": {
-      "version": "0.21.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.21.5.tgz",
-      "integrity": "sha512-5JcRxxRDUJLX8JXp/wcBCy3pENnCgBR9bN6JsY4OmhfUtIHe3ZW0mawA7+RDAcMLrMIZaf03NlQiX9DGyB8h4g==",
-      "dev": true,
-      "optional": true
-    },
-    "@esbuild/freebsd-x64": {
-      "version": "0.21.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.21.5.tgz",
-      "integrity": "sha512-J95kNBj1zkbMXtHVH29bBriQygMXqoVQOQYA+ISs0/2l3T9/kj42ow2mpqerRBxDJnmkUDCaQT/dfNXWX/ZZCQ==",
-      "dev": true,
-      "optional": true
-    },
-    "@esbuild/linux-arm": {
-      "version": "0.21.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.21.5.tgz",
-      "integrity": "sha512-bPb5AHZtbeNGjCKVZ9UGqGwo8EUu4cLq68E95A53KlxAPRmUyYv2D6F0uUI65XisGOL1hBP5mTronbgo+0bFcA==",
-      "dev": true,
-      "optional": true
-    },
-    "@esbuild/linux-arm64": {
-      "version": "0.21.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.21.5.tgz",
-      "integrity": "sha512-ibKvmyYzKsBeX8d8I7MH/TMfWDXBF3db4qM6sy+7re0YXya+K1cem3on9XgdT2EQGMu4hQyZhan7TeQ8XkGp4Q==",
-      "dev": true,
-      "optional": true
-    },
-    "@esbuild/linux-ia32": {
-      "version": "0.21.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.21.5.tgz",
-      "integrity": "sha512-YvjXDqLRqPDl2dvRODYmmhz4rPeVKYvppfGYKSNGdyZkA01046pLWyRKKI3ax8fbJoK5QbxblURkwK/MWY18Tg==",
-      "dev": true,
-      "optional": true
-    },
-    "@esbuild/linux-loong64": {
-      "version": "0.21.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.21.5.tgz",
-      "integrity": "sha512-uHf1BmMG8qEvzdrzAqg2SIG/02+4/DHB6a9Kbya0XDvwDEKCoC8ZRWI5JJvNdUjtciBGFQ5PuBlpEOXQj+JQSg==",
-      "dev": true,
-      "optional": true
-    },
-    "@esbuild/linux-mips64el": {
-      "version": "0.21.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.21.5.tgz",
-      "integrity": "sha512-IajOmO+KJK23bj52dFSNCMsz1QP1DqM6cwLUv3W1QwyxkyIWecfafnI555fvSGqEKwjMXVLokcV5ygHW5b3Jbg==",
-      "dev": true,
-      "optional": true
-    },
-    "@esbuild/linux-ppc64": {
-      "version": "0.21.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.21.5.tgz",
-      "integrity": "sha512-1hHV/Z4OEfMwpLO8rp7CvlhBDnjsC3CttJXIhBi+5Aj5r+MBvy4egg7wCbe//hSsT+RvDAG7s81tAvpL2XAE4w==",
-      "dev": true,
-      "optional": true
-    },
-    "@esbuild/linux-riscv64": {
-      "version": "0.21.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.21.5.tgz",
-      "integrity": "sha512-2HdXDMd9GMgTGrPWnJzP2ALSokE/0O5HhTUvWIbD3YdjME8JwvSCnNGBnTThKGEB91OZhzrJ4qIIxk/SBmyDDA==",
-      "dev": true,
-      "optional": true
-    },
-    "@esbuild/linux-s390x": {
-      "version": "0.21.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.21.5.tgz",
-      "integrity": "sha512-zus5sxzqBJD3eXxwvjN1yQkRepANgxE9lgOW2qLnmr8ikMTphkjgXu1HR01K4FJg8h1kEEDAqDcZQtbrRnB41A==",
-      "dev": true,
-      "optional": true
-    },
-    "@esbuild/linux-x64": {
-      "version": "0.21.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.21.5.tgz",
-      "integrity": "sha512-1rYdTpyv03iycF1+BhzrzQJCdOuAOtaqHTWJZCWvijKD2N5Xu0TtVC8/+1faWqcP9iBCWOmjmhoH94dH82BxPQ==",
-      "dev": true,
-      "optional": true
-    },
-    "@esbuild/netbsd-x64": {
-      "version": "0.21.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.21.5.tgz",
-      "integrity": "sha512-Woi2MXzXjMULccIwMnLciyZH4nCIMpWQAs049KEeMvOcNADVxo0UBIQPfSmxB3CWKedngg7sWZdLvLczpe0tLg==",
-      "dev": true,
-      "optional": true
-    },
-    "@esbuild/openbsd-x64": {
-      "version": "0.21.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.21.5.tgz",
-      "integrity": "sha512-HLNNw99xsvx12lFBUwoT8EVCsSvRNDVxNpjZ7bPn947b8gJPzeHWyNVhFsaerc0n3TsbOINvRP2byTZ5LKezow==",
-      "dev": true,
-      "optional": true
-    },
-    "@esbuild/sunos-x64": {
-      "version": "0.21.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.21.5.tgz",
-      "integrity": "sha512-6+gjmFpfy0BHU5Tpptkuh8+uw3mnrvgs+dSPQXQOv3ekbordwnzTVEb4qnIvQcYXq6gzkyTnoZ9dZG+D4garKg==",
-      "dev": true,
-      "optional": true
-    },
-    "@esbuild/win32-arm64": {
-      "version": "0.21.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.21.5.tgz",
-      "integrity": "sha512-Z0gOTd75VvXqyq7nsl93zwahcTROgqvuAcYDUr+vOv8uHhNSKROyU961kgtCD1e95IqPKSQKH7tBTslnS3tA8A==",
-      "dev": true,
-      "optional": true
-    },
-    "@esbuild/win32-ia32": {
-      "version": "0.21.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.21.5.tgz",
-      "integrity": "sha512-SWXFF1CL2RVNMaVs+BBClwtfZSvDgtL//G/smwAc5oVK/UPu2Gu9tIaRgFmYFFKrmg3SyAjSrElf0TiJ1v8fYA==",
-      "dev": true,
-      "optional": true
-    },
-    "@esbuild/win32-x64": {
-      "version": "0.21.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.21.5.tgz",
-      "integrity": "sha512-tQd/1efJuzPC6rCFwEvLtci/xNFcTZknmXs98FYDfGE4wP9ClFV98nyKrzJKVPMhdDnjzLhdUyMX4PsQAPjwIw==",
-      "dev": true,
-      "optional": true
+        "is-iterable": "^1.1.0",
+        "iterable-lookahead": "^1.0.0",
+        "lodash.curry": "^4.1.1",
+        "magic-string": "^0.16.0",
+        "map-obj": "^2.0.0",
+        "object-pairs": "^0.1.0",
+        "object-values": "^1.0.0",
+        "reverse-arguments": "^1.0.0",
+        "shell-quote-word": "^1.0.1",
+        "to-pascal-case": "^1.0.0",
+        "unescape-js": "^1.0.5"
+      },
+      "dependencies": {
+        "magic-string": {
+          "version": "0.16.0",
+          "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.16.0.tgz",
+          "integrity": "sha512-c4BEos3y6G2qO0B9X7K0FVLOPT9uGrjYwYRLFmDqyl5YMboUviyecnXWp94fJTSMwPw2/sf+CEYt5AGpmklkkQ==",
+          "dev": true,
+          "requires": {
+            "vlq": "^0.2.1"
+          }
+        }
+      }
     },
     "@eslint-community/eslint-utils": {
       "version": "4.4.0",
@@ -14875,15 +13434,6 @@
       "integrity": "sha512-6EwiSjwWYP7pTckG6I5eyFANjPhmPjUX9JRLUSfNPC7FX7zK9gyZAfUEaECL6ALTpGX5AjnBq3C9XmVWPitNpw==",
       "dev": true
     },
-    "@jest/schemas": {
-      "version": "29.6.3",
-      "resolved": "https://registry.npmjs.org/@jest/schemas/-/schemas-29.6.3.tgz",
-      "integrity": "sha512-mo5j5X+jIZmJQveBKeS/clAueipV7KgiX1vMgCxam1RNYiqE1w62n0/tJJnHtjW8ZHcQco5gY85jA3mi0L+nSA==",
-      "dev": true,
-      "requires": {
-        "@sinclair/typebox": "^0.27.8"
-      }
-    },
     "@jridgewell/gen-mapping": {
       "version": "0.3.3",
       "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.3.tgz",
@@ -15139,118 +13689,6 @@
       "resolved": "https://registry.npmjs.org/@remix-run/router/-/router-1.7.2.tgz",
       "integrity": "sha512-7Lcn7IqGMV+vizMPoEl5F0XDshcdDYtMI6uJLQdQz5CfZAwy3vvGKYSUk789qndt5dEC4HfSjviSYlSoHGL2+A=="
     },
-    "@rollup/rollup-android-arm-eabi": {
-      "version": "4.18.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.18.0.tgz",
-      "integrity": "sha512-Tya6xypR10giZV1XzxmH5wr25VcZSncG0pZIjfePT0OVBvqNEurzValetGNarVrGiq66EBVAFn15iYX4w6FKgQ==",
-      "dev": true,
-      "optional": true
-    },
-    "@rollup/rollup-android-arm64": {
-      "version": "4.18.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.18.0.tgz",
-      "integrity": "sha512-avCea0RAP03lTsDhEyfy+hpfr85KfyTctMADqHVhLAF3MlIkq83CP8UfAHUssgXTYd+6er6PaAhx/QGv4L1EiA==",
-      "dev": true,
-      "optional": true
-    },
-    "@rollup/rollup-darwin-arm64": {
-      "version": "4.18.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.18.0.tgz",
-      "integrity": "sha512-IWfdwU7KDSm07Ty0PuA/W2JYoZ4iTj3TUQjkVsO/6U+4I1jN5lcR71ZEvRh52sDOERdnNhhHU57UITXz5jC1/w==",
-      "dev": true,
-      "optional": true
-    },
-    "@rollup/rollup-darwin-x64": {
-      "version": "4.18.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.18.0.tgz",
-      "integrity": "sha512-n2LMsUz7Ynu7DoQrSQkBf8iNrjOGyPLrdSg802vk6XT3FtsgX6JbE8IHRvposskFm9SNxzkLYGSq9QdpLYpRNA==",
-      "dev": true,
-      "optional": true
-    },
-    "@rollup/rollup-linux-arm-gnueabihf": {
-      "version": "4.18.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.18.0.tgz",
-      "integrity": "sha512-C/zbRYRXFjWvz9Z4haRxcTdnkPt1BtCkz+7RtBSuNmKzMzp3ZxdM28Mpccn6pt28/UWUCTXa+b0Mx1k3g6NOMA==",
-      "dev": true,
-      "optional": true
-    },
-    "@rollup/rollup-linux-arm-musleabihf": {
-      "version": "4.18.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-musleabihf/-/rollup-linux-arm-musleabihf-4.18.0.tgz",
-      "integrity": "sha512-l3m9ewPgjQSXrUMHg93vt0hYCGnrMOcUpTz6FLtbwljo2HluS4zTXFy2571YQbisTnfTKPZ01u/ukJdQTLGh9A==",
-      "dev": true,
-      "optional": true
-    },
-    "@rollup/rollup-linux-arm64-gnu": {
-      "version": "4.18.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.18.0.tgz",
-      "integrity": "sha512-rJ5D47d8WD7J+7STKdCUAgmQk49xuFrRi9pZkWoRD1UeSMakbcepWXPF8ycChBoAqs1pb2wzvbY6Q33WmN2ftw==",
-      "dev": true,
-      "optional": true
-    },
-    "@rollup/rollup-linux-arm64-musl": {
-      "version": "4.18.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.18.0.tgz",
-      "integrity": "sha512-be6Yx37b24ZwxQ+wOQXXLZqpq4jTckJhtGlWGZs68TgdKXJgw54lUUoFYrg6Zs/kjzAQwEwYbp8JxZVzZLRepQ==",
-      "dev": true,
-      "optional": true
-    },
-    "@rollup/rollup-linux-powerpc64le-gnu": {
-      "version": "4.18.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-powerpc64le-gnu/-/rollup-linux-powerpc64le-gnu-4.18.0.tgz",
-      "integrity": "sha512-hNVMQK+qrA9Todu9+wqrXOHxFiD5YmdEi3paj6vP02Kx1hjd2LLYR2eaN7DsEshg09+9uzWi2W18MJDlG0cxJA==",
-      "dev": true,
-      "optional": true
-    },
-    "@rollup/rollup-linux-riscv64-gnu": {
-      "version": "4.18.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-gnu/-/rollup-linux-riscv64-gnu-4.18.0.tgz",
-      "integrity": "sha512-ROCM7i+m1NfdrsmvwSzoxp9HFtmKGHEqu5NNDiZWQtXLA8S5HBCkVvKAxJ8U+CVctHwV2Gb5VUaK7UAkzhDjlg==",
-      "dev": true,
-      "optional": true
-    },
-    "@rollup/rollup-linux-s390x-gnu": {
-      "version": "4.18.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-s390x-gnu/-/rollup-linux-s390x-gnu-4.18.0.tgz",
-      "integrity": "sha512-0UyyRHyDN42QL+NbqevXIIUnKA47A+45WyasO+y2bGJ1mhQrfrtXUpTxCOrfxCR4esV3/RLYyucGVPiUsO8xjg==",
-      "dev": true,
-      "optional": true
-    },
-    "@rollup/rollup-linux-x64-gnu": {
-      "version": "4.18.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.18.0.tgz",
-      "integrity": "sha512-xuglR2rBVHA5UsI8h8UbX4VJ470PtGCf5Vpswh7p2ukaqBGFTnsfzxUBetoWBWymHMxbIG0Cmx7Y9qDZzr648w==",
-      "dev": true,
-      "optional": true
-    },
-    "@rollup/rollup-linux-x64-musl": {
-      "version": "4.18.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.18.0.tgz",
-      "integrity": "sha512-LKaqQL9osY/ir2geuLVvRRs+utWUNilzdE90TpyoX0eNqPzWjRm14oMEE+YLve4k/NAqCdPkGYDaDF5Sw+xBfg==",
-      "dev": true,
-      "optional": true
-    },
-    "@rollup/rollup-win32-arm64-msvc": {
-      "version": "4.18.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.18.0.tgz",
-      "integrity": "sha512-7J6TkZQFGo9qBKH0pk2cEVSRhJbL6MtfWxth7Y5YmZs57Pi+4x6c2dStAUvaQkHQLnEQv1jzBUW43GvZW8OFqA==",
-      "dev": true,
-      "optional": true
-    },
-    "@rollup/rollup-win32-ia32-msvc": {
-      "version": "4.18.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.18.0.tgz",
-      "integrity": "sha512-Txjh+IxBPbkUB9+SXZMpv+b/vnTEtFyfWZgJ6iyCmt2tdx0OF5WhFowLmnh8ENGNpfUlUZkdI//4IEmhwPieNg==",
-      "dev": true,
-      "optional": true
-    },
-    "@rollup/rollup-win32-x64-msvc": {
-      "version": "4.18.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.18.0.tgz",
-      "integrity": "sha512-UOo5FdvOL0+eIVTgS4tIdbW+TtnBLWg1YBCcU2KWM7nuNwRz9bksDX1bekJJCpu25N1DVWaCwnT39dVQxzqS8g==",
-      "dev": true,
-      "optional": true
-    },
     "@sats-connect/core": {
       "version": "0.2.1",
       "resolved": "https://registry.npmjs.org/@sats-connect/core/-/core-0.2.1.tgz",
@@ -15439,12 +13877,6 @@
         }
       }
     },
-    "@sinclair/typebox": {
-      "version": "0.27.8",
-      "resolved": "https://registry.npmjs.org/@sinclair/typebox/-/typebox-0.27.8.tgz",
-      "integrity": "sha512-+Fj43pSMwJs4KRrH/938Uf+uAELIgVBmQzg/q1YG10djyfA3TnrU8N8XzqCh/okZdszqBQTZf96idMfE5lnwTA==",
-      "dev": true
-    },
     "@snyk/github-codeowners": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/@snyk/github-codeowners/-/github-codeowners-1.1.0.tgz",
@@ -15797,21 +14229,6 @@
         "@types/node": "*"
       }
     },
-    "@types/chai": {
-      "version": "4.3.11",
-      "resolved": "https://registry.npmjs.org/@types/chai/-/chai-4.3.11.tgz",
-      "integrity": "sha512-qQR1dr2rGIHYlJulmr8Ioq3De0Le9E4MJ5AiaeAETJJpndT1uUNHsGFK3L/UIu+rbkQSdj8J/w2bCsBZc/Y5fQ==",
-      "dev": true
-    },
-    "@types/chai-subset": {
-      "version": "1.3.5",
-      "resolved": "https://registry.npmjs.org/@types/chai-subset/-/chai-subset-1.3.5.tgz",
-      "integrity": "sha512-c2mPnw+xHtXDoHmdtcCXGwyLMiauiAyxWMzhGpqHC4nqI/Y5G2XhTampslK2rb59kpcuHon03UH8W6iYUzw88A==",
-      "dev": true,
-      "requires": {
-        "@types/chai": "*"
-      }
-    },
     "@types/chrome": {
       "version": "0.0.237",
       "resolved": "https://registry.npmjs.org/@types/chrome/-/chrome-0.0.237.tgz",
@@ -16343,120 +14760,6 @@
         "eslint-visitor-keys": "^3.3.0"
       }
     },
-    "@vitest/expect": {
-      "version": "0.34.6",
-      "resolved": "https://registry.npmjs.org/@vitest/expect/-/expect-0.34.6.tgz",
-      "integrity": "sha512-QUzKpUQRc1qC7qdGo7rMK3AkETI7w18gTCUrsNnyjjJKYiuUB9+TQK3QnR1unhCnWRC0AbKv2omLGQDF/mIjOw==",
-      "dev": true,
-      "requires": {
-        "@vitest/spy": "0.34.6",
-        "@vitest/utils": "0.34.6",
-        "chai": "^4.3.10"
-      }
-    },
-    "@vitest/runner": {
-      "version": "0.34.6",
-      "resolved": "https://registry.npmjs.org/@vitest/runner/-/runner-0.34.6.tgz",
-      "integrity": "sha512-1CUQgtJSLF47NnhN+F9X2ycxUP0kLHQ/JWvNHbeBfwW8CzEGgeskzNnHDyv1ieKTltuR6sdIHV+nmR6kPxQqzQ==",
-      "dev": true,
-      "requires": {
-        "@vitest/utils": "0.34.6",
-        "p-limit": "^4.0.0",
-        "pathe": "^1.1.1"
-      },
-      "dependencies": {
-        "p-limit": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-4.0.0.tgz",
-          "integrity": "sha512-5b0R4txpzjPWVw/cXXUResoD4hb6U/x9BH08L7nw+GN1sezDzPdxeRvpc9c433fZhBan/wusjbCsqwqm4EIBIQ==",
-          "dev": true,
-          "requires": {
-            "yocto-queue": "^1.0.0"
-          }
-        },
-        "yocto-queue": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/yocto-queue/-/yocto-queue-1.0.0.tgz",
-          "integrity": "sha512-9bnSc/HEW2uRy67wc+T8UwauLuPJVn28jb+GtJY16iiKWyvmYJRXVT4UamsAEGQfPohgr2q4Tq0sQbQlxTfi1g==",
-          "dev": true
-        }
-      }
-    },
-    "@vitest/snapshot": {
-      "version": "0.34.6",
-      "resolved": "https://registry.npmjs.org/@vitest/snapshot/-/snapshot-0.34.6.tgz",
-      "integrity": "sha512-B3OZqYn6k4VaN011D+ve+AA4whM4QkcwcrwaKwAbyyvS/NB1hCWjFIBQxAQQSQir9/RtyAAGuq+4RJmbn2dH4w==",
-      "dev": true,
-      "requires": {
-        "magic-string": "^0.30.1",
-        "pathe": "^1.1.1",
-        "pretty-format": "^29.5.0"
-      },
-      "dependencies": {
-        "ansi-styles": {
-          "version": "5.2.0",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-5.2.0.tgz",
-          "integrity": "sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==",
-          "dev": true
-        },
-        "pretty-format": {
-          "version": "29.7.0",
-          "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-29.7.0.tgz",
-          "integrity": "sha512-Pdlw/oPxN+aXdmM9R00JVC9WVFoCLTKJvDVLgmJ+qAffBMxsV85l/Lu7sNx4zSzPyoL2euImuEwHhOXdEgNFZQ==",
-          "dev": true,
-          "requires": {
-            "@jest/schemas": "^29.6.3",
-            "ansi-styles": "^5.0.0",
-            "react-is": "^18.0.0"
-          }
-        }
-      }
-    },
-    "@vitest/spy": {
-      "version": "0.34.6",
-      "resolved": "https://registry.npmjs.org/@vitest/spy/-/spy-0.34.6.tgz",
-      "integrity": "sha512-xaCvneSaeBw/cz8ySmF7ZwGvL0lBjfvqc1LpQ/vcdHEvpLn3Ff1vAvjw+CoGn0802l++5L/pxb7whwcWAw+DUQ==",
-      "dev": true,
-      "requires": {
-        "tinyspy": "^2.1.1"
-      }
-    },
-    "@vitest/utils": {
-      "version": "0.34.6",
-      "resolved": "https://registry.npmjs.org/@vitest/utils/-/utils-0.34.6.tgz",
-      "integrity": "sha512-IG5aDD8S6zlvloDsnzHw0Ut5xczlF+kv2BOTo+iXfPr54Yhi5qbVOgGB1hZaVq4iJ4C/MZ2J0y15IlsV/ZcI0A==",
-      "dev": true,
-      "requires": {
-        "diff-sequences": "^29.4.3",
-        "loupe": "^2.3.6",
-        "pretty-format": "^29.5.0"
-      },
-      "dependencies": {
-        "ansi-styles": {
-          "version": "5.2.0",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-5.2.0.tgz",
-          "integrity": "sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==",
-          "dev": true
-        },
-        "diff-sequences": {
-          "version": "29.6.3",
-          "resolved": "https://registry.npmjs.org/diff-sequences/-/diff-sequences-29.6.3.tgz",
-          "integrity": "sha512-EjePK1srD3P08o2j4f0ExnylqRs5B9tJjcp9t1krH2qRi8CCdsYfwe9JgSLurFBWwq4uOlipzfk5fHNvwFKr8Q==",
-          "dev": true
-        },
-        "pretty-format": {
-          "version": "29.7.0",
-          "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-29.7.0.tgz",
-          "integrity": "sha512-Pdlw/oPxN+aXdmM9R00JVC9WVFoCLTKJvDVLgmJ+qAffBMxsV85l/Lu7sNx4zSzPyoL2euImuEwHhOXdEgNFZQ==",
-          "dev": true,
-          "requires": {
-            "@jest/schemas": "^29.6.3",
-            "ansi-styles": "^5.0.0",
-            "react-is": "^18.0.0"
-          }
-        }
-      }
-    },
     "@webassemblyjs/ast": {
       "version": "1.11.6",
       "resolved": "https://registry.npmjs.org/@webassemblyjs/ast/-/ast-1.11.6.tgz",
@@ -16721,12 +15024,6 @@
       "dev": true,
       "requires": {}
     },
-    "acorn-walk": {
-      "version": "8.3.0",
-      "resolved": "https://registry.npmjs.org/acorn-walk/-/acorn-walk-8.3.0.tgz",
-      "integrity": "sha512-FS7hV565M5l1R08MXqo8odwMTB02C2UqzB17RVgu9EyuYFBqJZ3/ZY97sQD5FewVu1UyDFc1yztUDrAwT0EypA==",
-      "dev": true
-    },
     "aggregate-error": {
       "version": "3.1.0",
       "resolved": "https://registry.npmjs.org/aggregate-error/-/aggregate-error-3.1.0.tgz",
@@ -17005,12 +15302,6 @@
         }
       }
     },
-    "assertion-error": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/assertion-error/-/assertion-error-1.1.0.tgz",
-      "integrity": "sha512-jgsaNduz+ndvGyFt3uSuWqvy4lCnIJiovtouQN5JZHOKCS2QuhEdbcQHFhVksz2N2U9hXJo8odG7ETyWlEeuDw==",
-      "dev": true
-    },
     "ast-types-flow": {
       "version": "0.0.7",
       "resolved": "https://registry.npmjs.org/ast-types-flow/-/ast-types-flow-0.0.7.tgz",
@@ -17551,12 +15842,6 @@
         "base-x": "^4.0.0"
       }
     },
-    "cac": {
-      "version": "6.7.14",
-      "resolved": "https://registry.npmjs.org/cac/-/cac-6.7.14.tgz",
-      "integrity": "sha512-b6Ilus+c3RrdDk+JhLKUAQfzzgLEPy6wcXqS7f/xe1EETvsDP6GORG7SFuOs6cID5YkqchW/LXZbX5bc8j7ZcQ==",
-      "dev": true
-    },
     "call-bind": {
       "version": "1.0.7",
       "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.7.tgz",
@@ -17595,21 +15880,6 @@
       "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001559.tgz",
       "integrity": "sha512-cPiMKZgqgkg5LY3/ntGeLFUpi6tzddBNS58A4tnTgQw1zON7u2sZMU7SzOeVH4tj20++9ggL+V6FDOFMTaFFYA=="
     },
-    "chai": {
-      "version": "4.3.10",
-      "resolved": "https://registry.npmjs.org/chai/-/chai-4.3.10.tgz",
-      "integrity": "sha512-0UXG04VuVbruMUYbJ6JctvH0YnC/4q3/AkT18q4NaITo91CUm0liMS9VqzT9vZhVQ/1eqPanMWjBM+Juhfb/9g==",
-      "dev": true,
-      "requires": {
-        "assertion-error": "^1.1.0",
-        "check-error": "^1.0.3",
-        "deep-eql": "^4.1.3",
-        "get-func-name": "^2.0.2",
-        "loupe": "^2.3.6",
-        "pathval": "^1.1.1",
-        "type-detect": "^4.0.8"
-      }
-    },
     "chalk": {
       "version": "2.4.2",
       "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
@@ -17620,15 +15890,6 @@
         "supports-color": "^5.3.0"
       }
     },
-    "check-error": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/check-error/-/check-error-1.0.3.tgz",
-      "integrity": "sha512-iKEoDYaRmd1mxM90a2OEfWhjsjPpYPuQ+lMYsoxB126+t8fw7ySEO48nmDg5COTjxDI65/Y2OWpeEHk3ZOe8zg==",
-      "dev": true,
-      "requires": {
-        "get-func-name": "^2.0.2"
-      }
-    },
     "chokidar": {
       "version": "3.5.3",
       "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.5.3.tgz",
@@ -18228,15 +16489,6 @@
         "ms": "2.1.2"
       }
     },
-    "deep-eql": {
-      "version": "4.1.3",
-      "resolved": "https://registry.npmjs.org/deep-eql/-/deep-eql-4.1.3.tgz",
-      "integrity": "sha512-WaEtAOpRA1MQ0eohqZjpGD8zdI0Ovsm8mmFhaDN8dvDZzyoUMcYDnf5Y6iu7HTXxf8JDS23qWa4a+hKCDyOPzw==",
-      "dev": true,
-      "requires": {
-        "type-detect": "^4.0.0"
-      }
-    },
     "deep-equal": {
       "version": "2.2.2",
       "resolved": "https://registry.npmjs.org/deep-equal/-/deep-equal-2.2.2.tgz",
@@ -18800,37 +17052,6 @@
         "is-symbol": "^1.0.2"
       }
     },
-    "esbuild": {
-      "version": "0.21.5",
-      "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.21.5.tgz",
-      "integrity": "sha512-mg3OPMV4hXywwpoDxu3Qda5xCKQi+vCTZq8S9J/EpkhB2HzKXq4SNFZE3+NK93JYxc8VMSep+lOUSC/RVKaBqw==",
-      "dev": true,
-      "requires": {
-        "@esbuild/aix-ppc64": "0.21.5",
-        "@esbuild/android-arm": "0.21.5",
-        "@esbuild/android-arm64": "0.21.5",
-        "@esbuild/android-x64": "0.21.5",
-        "@esbuild/darwin-arm64": "0.21.5",
-        "@esbuild/darwin-x64": "0.21.5",
-        "@esbuild/freebsd-arm64": "0.21.5",
-        "@esbuild/freebsd-x64": "0.21.5",
-        "@esbuild/linux-arm": "0.21.5",
-        "@esbuild/linux-arm64": "0.21.5",
-        "@esbuild/linux-ia32": "0.21.5",
-        "@esbuild/linux-loong64": "0.21.5",
-        "@esbuild/linux-mips64el": "0.21.5",
-        "@esbuild/linux-ppc64": "0.21.5",
-        "@esbuild/linux-riscv64": "0.21.5",
-        "@esbuild/linux-s390x": "0.21.5",
-        "@esbuild/linux-x64": "0.21.5",
-        "@esbuild/netbsd-x64": "0.21.5",
-        "@esbuild/openbsd-x64": "0.21.5",
-        "@esbuild/sunos-x64": "0.21.5",
-        "@esbuild/win32-arm64": "0.21.5",
-        "@esbuild/win32-ia32": "0.21.5",
-        "@esbuild/win32-x64": "0.21.5"
-      }
-    },
     "escalade": {
       "version": "3.1.1",
       "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.1.tgz",
@@ -19771,12 +17992,6 @@
       "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz",
       "integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg=="
     },
-    "get-func-name": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/get-func-name/-/get-func-name-2.0.2.tgz",
-      "integrity": "sha512-8vXOvuE167CtIc3OyItco7N/dpRtBbYOsPsXCz7X/PMnlGjYjSGuZJgM1Y7mmew7BKf9BqvLX2tnOVy1BBUsxQ==",
-      "dev": true
-    },
     "get-intrinsic": {
       "version": "1.2.4",
       "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.2.4.tgz",
@@ -19861,12 +18076,6 @@
         "slash": "^3.0.0"
       }
     },
-    "globrex": {
-      "version": "0.1.2",
-      "resolved": "https://registry.npmjs.org/globrex/-/globrex-0.1.2.tgz",
-      "integrity": "sha512-uHJgbwAMwNFf5mLst7IWLNg14x1CkeqglJb/K3doi4dw6q2IvAAmM/Y81kevy83wP+Sst+nutFTYOGg3d1lsxg==",
-      "dev": true
-    },
     "goober": {
       "version": "2.1.13",
       "resolved": "https://registry.npmjs.org/goober/-/goober-2.1.13.tgz",
@@ -20718,12 +18927,6 @@
       "resolved": "https://registry.npmjs.org/json5/-/json5-2.2.3.tgz",
       "integrity": "sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg=="
     },
-    "jsonc-parser": {
-      "version": "3.2.0",
-      "resolved": "https://registry.npmjs.org/jsonc-parser/-/jsonc-parser-3.2.0.tgz",
-      "integrity": "sha512-gfFQZrcTc8CnKXp6Y4/CBT3fTc0OVuDofpre4aEeEpSBPV5X5v4+Vmx+8snU7RLPrNHPKSgLxGo9YuQzz20o+w==",
-      "dev": true
-    },
     "jsonfile": {
       "version": "6.1.0",
       "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.1.0.tgz",
@@ -21107,12 +19310,6 @@
         "json5": "^2.1.2"
       }
     },
-    "local-pkg": {
-      "version": "0.4.3",
-      "resolved": "https://registry.npmjs.org/local-pkg/-/local-pkg-0.4.3.tgz",
-      "integrity": "sha512-SFppqq5p42fe2qcZQqqEOiVRXl+WCP1MdT6k7BDEW1j++sp5fIY+/fdRQitvKgB5BrBcmrs5m/L0v2FrU5MY1g==",
-      "dev": true
-    },
     "locate-path": {
       "version": "6.0.0",
       "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-6.0.0.tgz",
@@ -21266,15 +19463,6 @@
       "resolved": "https://registry.npmjs.org/lottie-web/-/lottie-web-5.12.2.tgz",
       "integrity": "sha512-uvhvYPC8kGPjXT3MyKMrL3JitEAmDMp30lVkuq/590Mw9ok6pWcFCwXJveo0t5uqYw1UREQHofD+jVpdjBv8wg=="
     },
-    "loupe": {
-      "version": "2.3.7",
-      "resolved": "https://registry.npmjs.org/loupe/-/loupe-2.3.7.tgz",
-      "integrity": "sha512-zSMINGVYkdpYSOBmLi0D1Uo7JU9nVdQKrHxC8eYlV+9YKK9WePqAlL7lSlorG/U2Fw1w0hTBmaa/jrQ3UbPHtA==",
-      "dev": true,
-      "requires": {
-        "get-func-name": "^2.0.1"
-      }
-    },
     "lower-case": {
       "version": "2.0.2",
       "resolved": "https://registry.npmjs.org/lower-case/-/lower-case-2.0.2.tgz",
@@ -21293,15 +19481,6 @@
         "yallist": "^3.0.2"
       }
     },
-    "magic-string": {
-      "version": "0.30.5",
-      "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.30.5.tgz",
-      "integrity": "sha512-7xlpfBaQaP/T6Vh8MO/EqXSW5En6INHEvEXQiuff7Gku0PWjU3uf6w/j9o7O+SpB5fOAkrI5HeoNgwjEO0pFsA==",
-      "dev": true,
-      "requires": {
-        "@jridgewell/sourcemap-codec": "^1.4.15"
-      }
-    },
     "map-obj": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/map-obj/-/map-obj-2.0.0.tgz",
@@ -21451,18 +19630,6 @@
       "resolved": "https://registry.npmjs.org/mixpanel-browser/-/mixpanel-browser-2.47.0.tgz",
       "integrity": "sha512-Ldrva0fRBEIFWmEibBQO1PulfpJVF3pf28Guk09lDirDaSQqqU/xs9zQLwN2rL5VwVtsP1aD3JaCgaa98EjojQ=="
     },
-    "mlly": {
-      "version": "1.4.2",
-      "resolved": "https://registry.npmjs.org/mlly/-/mlly-1.4.2.tgz",
-      "integrity": "sha512-i/Ykufi2t1EZ6NaPLdfnZk2AX8cs0d+mTzVKuPfqPKPatxLApaBoxJQ9x1/uckXtrS/U5oisPMDkNs0yQTaBRg==",
-      "dev": true,
-      "requires": {
-        "acorn": "^8.10.0",
-        "pathe": "^1.1.1",
-        "pkg-types": "^1.0.3",
-        "ufo": "^1.3.0"
-      }
-    },
     "more-entropy": {
       "version": "0.0.7",
       "resolved": "https://registry.npmjs.org/more-entropy/-/more-entropy-0.0.7.tgz",
@@ -21969,18 +20136,6 @@
       "integrity": "sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==",
       "dev": true
     },
-    "pathe": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/pathe/-/pathe-1.1.1.tgz",
-      "integrity": "sha512-d+RQGp0MAYTIaDBIMmOfMwz3E+LOZnxx1HZd5R18mmCZY0QBlK0LDZfPc8FW8Ed2DlvsuE6PRjroDY+wg4+j/Q==",
-      "dev": true
-    },
-    "pathval": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/pathval/-/pathval-1.1.1.tgz",
-      "integrity": "sha512-Dp6zGqpTdETdR63lehJYPeIOqpiNBNtc7BpWSLrOje7UaIsE5aY92r/AunQA7rsXvet3lrJ3JnZX29UPTKXyKQ==",
-      "dev": true
-    },
     "pbkdf2": {
       "version": "3.1.2",
       "resolved": "https://registry.npmjs.org/pbkdf2/-/pbkdf2-3.1.2.tgz",
@@ -22030,17 +20185,6 @@
         "pinkie": "^2.0.0"
       }
     },
-    "pkg-types": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/pkg-types/-/pkg-types-1.0.3.tgz",
-      "integrity": "sha512-nN7pYi0AQqJnoLPC9eHFQ8AcyaixBUOwvqc5TDnIKCMEE6I0y8P7OKA7fPexsXGCGxQDl/cmrLAp26LhcwxZ4A==",
-      "dev": true,
-      "requires": {
-        "jsonc-parser": "^3.2.0",
-        "mlly": "^1.2.0",
-        "pathe": "^1.1.0"
-      }
-    },
     "playwright": {
       "version": "1.46.1",
       "resolved": "https://registry.npmjs.org/playwright/-/playwright-1.46.1.tgz",
@@ -22432,7 +20576,8 @@
     "react-is": {
       "version": "18.2.0",
       "resolved": "https://registry.npmjs.org/react-is/-/react-is-18.2.0.tgz",
-      "integrity": "sha512-xWGDIW6x921xtzPkhiULtthJHoJvBbF3q26fzloPCK0hsvxtPVelvftw3zjbHWSkR2km9Z+4uxbDDK/6Zw9B8w=="
+      "integrity": "sha512-xWGDIW6x921xtzPkhiULtthJHoJvBbF3q26fzloPCK0hsvxtPVelvftw3zjbHWSkR2km9Z+4uxbDDK/6Zw9B8w==",
+      "peer": true
     },
     "react-is-visible": {
       "version": "1.2.0",
@@ -22759,32 +20904,6 @@
       "resolved": "https://registry.npmjs.org/ripemd160-min/-/ripemd160-min-0.0.6.tgz",
       "integrity": "sha512-+GcJgQivhs6S9qvLogusiTcS9kQUfgR75whKuy5jIhuiOfQuJ8fjqxV6EGD5duH1Y/FawFUMtMhyeq3Fbnib8A=="
     },
-    "rollup": {
-      "version": "4.18.0",
-      "resolved": "https://registry.npmjs.org/rollup/-/rollup-4.18.0.tgz",
-      "integrity": "sha512-QmJz14PX3rzbJCN1SG4Xe/bAAX2a6NpCP8ab2vfu2GiUr8AQcr2nCV/oEO3yneFarB67zk8ShlIyWb2LGTb3Sg==",
-      "dev": true,
-      "requires": {
-        "@rollup/rollup-android-arm-eabi": "4.18.0",
-        "@rollup/rollup-android-arm64": "4.18.0",
-        "@rollup/rollup-darwin-arm64": "4.18.0",
-        "@rollup/rollup-darwin-x64": "4.18.0",
-        "@rollup/rollup-linux-arm-gnueabihf": "4.18.0",
-        "@rollup/rollup-linux-arm-musleabihf": "4.18.0",
-        "@rollup/rollup-linux-arm64-gnu": "4.18.0",
-        "@rollup/rollup-linux-arm64-musl": "4.18.0",
-        "@rollup/rollup-linux-powerpc64le-gnu": "4.18.0",
-        "@rollup/rollup-linux-riscv64-gnu": "4.18.0",
-        "@rollup/rollup-linux-s390x-gnu": "4.18.0",
-        "@rollup/rollup-linux-x64-gnu": "4.18.0",
-        "@rollup/rollup-linux-x64-musl": "4.18.0",
-        "@rollup/rollup-win32-arm64-msvc": "4.18.0",
-        "@rollup/rollup-win32-ia32-msvc": "4.18.0",
-        "@rollup/rollup-win32-x64-msvc": "4.18.0",
-        "@types/estree": "1.0.5",
-        "fsevents": "~2.3.2"
-      }
-    },
     "run-parallel": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/run-parallel/-/run-parallel-1.2.0.tgz",
@@ -23122,12 +21241,6 @@
         "object-inspect": "^1.9.0"
       }
     },
-    "siginfo": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/siginfo/-/siginfo-2.0.0.tgz",
-      "integrity": "sha512-ybx0WO1/8bSBLEWXZvEd7gMW3Sn3JFlW3TvX1nREbDLRNQNaeNN8WK0meBwPdAaOI7TtRRRJn/Es1zhrrCHu7g==",
-      "dev": true
-    },
     "signal-exit": {
       "version": "3.0.7",
       "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.7.tgz",
@@ -23219,12 +21332,6 @@
         "wbuf": "^1.7.3"
       }
     },
-    "stackback": {
-      "version": "0.0.2",
-      "resolved": "https://registry.npmjs.org/stackback/-/stackback-0.0.2.tgz",
-      "integrity": "sha512-1XMJE5fQo1jGH6Y/7ebnwPOBEkIEnT4QF32d5R1+VXdXveM0IBMJt8zfaxX1P3QhVwrYe+576+jkANtSS2mBbw==",
-      "dev": true
-    },
     "stackframe": {
       "version": "1.3.4",
       "resolved": "https://registry.npmjs.org/stackframe/-/stackframe-1.3.4.tgz",
@@ -23237,12 +21344,6 @@
       "integrity": "sha512-RwNA9Z/7PrK06rYLIzFMlaF+l73iwpzsqRIFgbMLbTcLD6cOao82TaWefPXQvB2fOC4AjuYSEndS7N/mTCbkdQ==",
       "dev": true
     },
-    "std-env": {
-      "version": "3.5.0",
-      "resolved": "https://registry.npmjs.org/std-env/-/std-env-3.5.0.tgz",
-      "integrity": "sha512-JGUEaALvL0Mf6JCfYnJOTcobY+Nc7sG/TemDRBqCA0wEr4DER7zDchaaixTlmOxAjG1uRJmX82EQcxwTQTkqVA==",
-      "dev": true
-    },
     "stop-iteration-iterator": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/stop-iteration-iterator/-/stop-iteration-iterator-1.0.0.tgz",
@@ -23397,15 +21498,6 @@
       "integrity": "sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==",
       "dev": true
     },
-    "strip-literal": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/strip-literal/-/strip-literal-1.3.0.tgz",
-      "integrity": "sha512-PugKzOsyXpArk0yWmUwqOZecSO0GH0bPoctLcqNDH9J04pVW3lflYE0ujElBGTloevcxF5MofAOZ7C5l2b+wLg==",
-      "dev": true,
-      "requires": {
-        "acorn": "^8.10.0"
-      }
-    },
     "style-loader": {
       "version": "3.3.3",
       "resolved": "https://registry.npmjs.org/style-loader/-/style-loader-3.3.3.tgz",
@@ -23543,24 +21635,6 @@
       "integrity": "sha512-eHY7nBftgThBqOyHGVN+l8gF0BucP09fMo0oO/Lb0w1OF80dJv+lDVpXG60WMQvkcxAkNybKsrEIE3ZtKGmPrA==",
       "dev": true
     },
-    "tinybench": {
-      "version": "2.5.1",
-      "resolved": "https://registry.npmjs.org/tinybench/-/tinybench-2.5.1.tgz",
-      "integrity": "sha512-65NKvSuAVDP/n4CqH+a9w2kTlLReS9vhsAP06MWx+/89nMinJyB2icyl58RIcqCmIggpojIGeuJGhjU1aGMBSg==",
-      "dev": true
-    },
-    "tinypool": {
-      "version": "0.7.0",
-      "resolved": "https://registry.npmjs.org/tinypool/-/tinypool-0.7.0.tgz",
-      "integrity": "sha512-zSYNUlYSMhJ6Zdou4cJwo/p7w5nmAH17GRfU/ui3ctvjXFErXXkruT4MWW6poDeXgCaIBlGLrfU6TbTXxyGMww==",
-      "dev": true
-    },
-    "tinyspy": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/tinyspy/-/tinyspy-2.2.0.tgz",
-      "integrity": "sha512-d2eda04AN/cPOR89F7Xv5bK/jrQEhmcLFe6HFldoeO9AJtps+fqEnh486vnT/8y4bw38pSyxDcTCAq+Ks2aJTg==",
-      "dev": true
-    },
     "to-fast-properties": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-2.0.0.tgz",
@@ -23719,13 +21793,6 @@
       "dev": true,
       "requires": {}
     },
-    "tsconfck": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/tsconfck/-/tsconfck-3.1.0.tgz",
-      "integrity": "sha512-CMjc5zMnyAjcS9sPLytrbFmj89st2g+JYtY/c02ug4Q+CZaAtCgbyviI0n1YvjZE/pzoc6FbNsINS13DOL1B9w==",
-      "dev": true,
-      "requires": {}
-    },
     "tsconfig-paths": {
       "version": "3.14.2",
       "resolved": "https://registry.npmjs.org/tsconfig-paths/-/tsconfig-paths-3.14.2.tgz",
@@ -23853,12 +21920,6 @@
         "prelude-ls": "^1.2.1"
       }
     },
-    "type-detect": {
-      "version": "4.0.8",
-      "resolved": "https://registry.npmjs.org/type-detect/-/type-detect-4.0.8.tgz",
-      "integrity": "sha512-0fr/mIH1dlO+x7TlcMy+bIDqKPsw/70tVyeHW787goQjhmqaZe10uwLujubK9q9Lg6Fiho1KUKDYz0Z7k7g5/g==",
-      "dev": true
-    },
     "type-fest": {
       "version": "2.19.0",
       "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-2.19.0.tgz",
@@ -23939,12 +22000,6 @@
       "dev": true,
       "requires": {}
     },
-    "ufo": {
-      "version": "1.3.2",
-      "resolved": "https://registry.npmjs.org/ufo/-/ufo-1.3.2.tgz",
-      "integrity": "sha512-o+ORpgGwaYQXgqGDwd+hkS4PuZ3QnmqMMxRuajK/a38L6fTpcE5GPIfrf+L/KemFzfUpeUQc1rRS1iDBozvnFA==",
-      "dev": true
-    },
     "uglify-js": {
       "version": "3.19.1",
       "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.19.1.tgz",
@@ -24088,75 +22143,6 @@
       "integrity": "sha512-BNGbWLfd0eUPabhkXUVm0j8uuvREyTh5ovRa/dyow/BqAbZJyC+5fU+IzQOzmAKzYqYRAISoRhdQr3eIZ/PXqg==",
       "dev": true
     },
-    "vite": {
-      "version": "5.3.2",
-      "resolved": "https://registry.npmjs.org/vite/-/vite-5.3.2.tgz",
-      "integrity": "sha512-6lA7OBHBlXUxiJxbO5aAY2fsHHzDr1q7DvXYnyZycRs2Dz+dXBWuhpWHvmljTRTpQC2uvGmUFFkSHF2vGo90MA==",
-      "dev": true,
-      "requires": {
-        "esbuild": "^0.21.3",
-        "fsevents": "~2.3.3",
-        "postcss": "^8.4.38",
-        "rollup": "^4.13.0"
-      }
-    },
-    "vite-node": {
-      "version": "0.34.6",
-      "resolved": "https://registry.npmjs.org/vite-node/-/vite-node-0.34.6.tgz",
-      "integrity": "sha512-nlBMJ9x6n7/Amaz6F3zJ97EBwR2FkzhBRxF5e+jE6LA3yi6Wtc2lyTij1OnDMIr34v5g/tVQtsVAzhT0jc5ygA==",
-      "dev": true,
-      "requires": {
-        "cac": "^6.7.14",
-        "debug": "^4.3.4",
-        "mlly": "^1.4.0",
-        "pathe": "^1.1.1",
-        "picocolors": "^1.0.0",
-        "vite": "^3.0.0 || ^4.0.0 || ^5.0.0-0"
-      }
-    },
-    "vite-tsconfig-paths": {
-      "version": "4.3.2",
-      "resolved": "https://registry.npmjs.org/vite-tsconfig-paths/-/vite-tsconfig-paths-4.3.2.tgz",
-      "integrity": "sha512-0Vd/a6po6Q+86rPlntHye7F31zA2URZMbH8M3saAZ/xR9QoGN/L21bxEGfXdWmFdNkqPpRdxFT7nmNe12e9/uA==",
-      "dev": true,
-      "requires": {
-        "debug": "^4.1.1",
-        "globrex": "^0.1.2",
-        "tsconfck": "^3.0.3"
-      }
-    },
-    "vitest": {
-      "version": "0.34.6",
-      "resolved": "https://registry.npmjs.org/vitest/-/vitest-0.34.6.tgz",
-      "integrity": "sha512-+5CALsOvbNKnS+ZHMXtuUC7nL8/7F1F2DnHGjSsszX8zCjWSSviphCb/NuS9Nzf4Q03KyyDRBAXhF/8lffME4Q==",
-      "dev": true,
-      "requires": {
-        "@types/chai": "^4.3.5",
-        "@types/chai-subset": "^1.3.3",
-        "@types/node": "*",
-        "@vitest/expect": "0.34.6",
-        "@vitest/runner": "0.34.6",
-        "@vitest/snapshot": "0.34.6",
-        "@vitest/spy": "0.34.6",
-        "@vitest/utils": "0.34.6",
-        "acorn": "^8.9.0",
-        "acorn-walk": "^8.2.0",
-        "cac": "^6.7.14",
-        "chai": "^4.3.10",
-        "debug": "^4.3.4",
-        "local-pkg": "^0.4.3",
-        "magic-string": "^0.30.1",
-        "pathe": "^1.1.1",
-        "picocolors": "^1.0.0",
-        "std-env": "^3.3.3",
-        "strip-literal": "^1.0.1",
-        "tinybench": "^2.5.0",
-        "tinypool": "^0.7.0",
-        "vite": "^3.1.0 || ^4.0.0 || ^5.0.0-0",
-        "vite-node": "0.34.6",
-        "why-is-node-running": "^2.2.2"
-      }
-    },
     "vlq": {
       "version": "0.2.3",
       "resolved": "https://registry.npmjs.org/vlq/-/vlq-0.2.3.tgz",
@@ -24451,16 +22437,6 @@
         "has-tostringtag": "^1.0.0"
       }
     },
-    "why-is-node-running": {
-      "version": "2.2.2",
-      "resolved": "https://registry.npmjs.org/why-is-node-running/-/why-is-node-running-2.2.2.tgz",
-      "integrity": "sha512-6tSwToZxTOcotxHeA+qGCq1mVzKR3CwcJGmVcY+QE8SHy6TnpFnh8PAvPNHYr7EcuVeG0QSMxtYCuO1ta/G/oA==",
-      "dev": true,
-      "requires": {
-        "siginfo": "^2.0.0",
-        "stackback": "0.0.2"
-      }
-    },
     "wif": {
       "version": "2.0.6",
       "resolved": "https://registry.npmjs.org/wif/-/wif-2.0.6.tgz",
diff --git a/package.json b/package.json
index ea7f76948..770833278 100644
--- a/package.json
+++ b/package.json
@@ -11,7 +11,6 @@
     "build-named": "npm run clean && NODE_ENV=production node scripts/build-named.js",
     "start": "npx node webpack/utils/devServer.js",
     "clean": "rimraf build",
-    "test": "vitest ./src",
     "style": "prettier --write \"src/**/*.{ts,tsx}\"",
     "prepare": "husky install",
     "e2etest": "npx playwright test -g \"\" --grep-invert \"#localexecution\"",
@@ -153,9 +152,6 @@
     "type-fest": "^2.19.0",
     "typescript": "^5.5.4",
     "typescript-plugin-styled-components": "^3.0.0",
-    "vite": "5.3.2",
-    "vite-tsconfig-paths": "4.3.2",
-    "vitest": "0.34.6",
     "webpack": "^5.89.0",
     "webpack-dev-server": "^4.11.0"
   }
diff --git a/vitest.config.js b/vitest.config.js
deleted file mode 100644
index 43d27dc46..000000000
--- a/vitest.config.js
+++ /dev/null
@@ -1,7 +0,0 @@
-/// <reference types="vitest" />
-import { defineConfig } from 'vite';
-import tsconfigPaths from 'vite-tsconfig-paths';
-
-export default defineConfig({
-  plugins: [tsconfigPaths()],
-});

From e3005eb88f6126d7a934f199b5cd59740bea24f0 Mon Sep 17 00:00:00 2001
From: Den <36603049+dhriaznov@users.noreply.github.com>
Date: Thu, 29 Aug 2024 12:23:00 +0200
Subject: [PATCH 045/227] [ENG-4848] fix: Navbar UI glitch on the Update
 Password screen (#516)

* [ENG-4848] fix: Navbar UI glitch on the Update Password screen

* Update the UI of the Update password screen

* Change the password error message element role

* Change the error element role in e2e

---------

Co-authored-by: Terence Ng <ngtere@live.com.sg>
---
 .../components/passwordInput/index.styled.ts  |  91 +++++++
 src/app/components/passwordInput/index.tsx    | 238 +++++-------------
 src/app/screens/buy/index.tsx                 |   2 +-
 .../security/changePassword/index.tsx         |  68 ++---
 src/app/ui-library/input.tsx                  |   2 +-
 src/locales/en.json                           |   1 -
 tests/pages/onboarding.ts                     |   4 +-
 7 files changed, 175 insertions(+), 231 deletions(-)
 create mode 100644 src/app/components/passwordInput/index.styled.ts

diff --git a/src/app/components/passwordInput/index.styled.ts b/src/app/components/passwordInput/index.styled.ts
new file mode 100644
index 000000000..d99a5b785
--- /dev/null
+++ b/src/app/components/passwordInput/index.styled.ts
@@ -0,0 +1,91 @@
+import { animated } from '@react-spring/web';
+import styled from 'styled-components';
+
+export const Container = styled.div({
+  display: 'flex',
+  flexDirection: 'column',
+  flex: 1,
+});
+
+export const HeaderText = styled.h1((props) => ({
+  ...props.theme.typography.body_medium_l,
+  textAlign: 'center',
+  marginTop: props.theme.spacing(15),
+}));
+
+export const HeaderContainer = styled.div({
+  display: 'flex',
+  flexDirection: 'column',
+  alignItems: 'center',
+});
+
+export const PasswordInputLabel = styled.h2((props) => ({
+  ...props.theme.typography.body_medium_m,
+  marginTop: props.theme.spacing(24),
+  marginBottom: props.theme.space.xs,
+  textAlign: 'left',
+}));
+
+export const ButtonsContainer = styled.div<{
+  stackButtonAlignment: boolean;
+  ifError: boolean;
+}>((props) => ({
+  display: 'flex',
+  flexDirection: props.stackButtonAlignment ? 'column-reverse' : 'row',
+  alignItems: props.stackButtonAlignment ? 'center' : 'flex-end',
+  flex: 1,
+  marginTop: props.ifError ? props.theme.spacing(30) : props.theme.spacing(40),
+  marginBottom: props.theme.spacing(8),
+}));
+
+export const StyledButton = styled.button({
+  background: 'none',
+  display: 'flex',
+  transition: 'opacity 0.1s ease',
+  '&:hover, &:focus': {
+    opacity: 0.8,
+  },
+});
+
+export const PasswordStrengthContainer = styled.div((props) => ({
+  ...props.theme.body_medium_m,
+  display: 'flex',
+  alignItems: 'center',
+  width: '100%',
+  marginTop: props.theme.spacing(8),
+  span: {
+    opacity: 0.6,
+  },
+  p: {
+    justifySelf: 'flex-end',
+  },
+}));
+
+export const StrengthBar = styled(animated.div)<{
+  $strengthColor: string;
+  $strengthWidth: string;
+}>((props) => ({
+  display: 'flex',
+  flex: '1 0',
+  alignItems: 'center',
+  backgroundColor: props.theme.colors.white_600,
+  marginLeft: props.theme.spacing(6),
+  marginRight: props.theme.spacing(9),
+  borderRadius: props.theme.radius(1),
+  width: '50%',
+  div: {
+    width: props.$strengthWidth,
+    height: 4,
+    backgroundColor: props.$strengthColor,
+    borderRadius: props.theme.radius(1),
+  },
+}));
+
+export const ButtonContainer = styled.div<{
+  stackButtonAlignment: boolean;
+}>((props) => ({
+  marginLeft: props.stackButtonAlignment ? 0 : 3,
+  marginRight: props.stackButtonAlignment ? 0 : 3,
+  marginTop: props.theme.spacing(4),
+  width: '100%',
+}));
diff --git a/src/app/components/passwordInput/index.tsx b/src/app/components/passwordInput/index.tsx
index 7d6ec021b..26adcae7d 100644
--- a/src/app/components/passwordInput/index.tsx
+++ b/src/app/components/passwordInput/index.tsx
@@ -3,14 +3,38 @@ import EyeSlash from '@assets/img/createPassword/EyeSlash.svg';
 import PasswordIcon from '@assets/img/createPassword/Password.svg';
 import { animated, useTransition } from '@react-spring/web';
 import Button from '@ui-library/button';
+import Input from '@ui-library/input';
 import { useEffect, useState } from 'react';
 import { useTranslation } from 'react-i18next';
-import styled, { useTheme } from 'styled-components';
+import { useTheme } from 'styled-components';
 import zxcvbn from 'zxcvbn';
+import {
+  ButtonContainer,
+  ButtonsContainer,
+  Container,
+  HeaderContainer,
+  HeaderText,
+  PasswordInputLabel,
+  PasswordStrengthContainer,
+  StrengthBar,
+  StyledButton,
+} from './index.styled';
 
-interface PasswordInputProps {
+const REQUIRED_PASSWORD_LENGTH = 5;
+
+enum PasswordStrength {
+  NoScore,
+  PoorScore,
+  WeakScore,
+  AverageScore,
+  StrongScore,
+  MeetsAllRequirements,
+}
+
+type Props = {
   title: string;
   inputLabel: string;
+  submitButtonText?: string;
   enteredPassword: string;
   setEnteredPassword: (enteredPassword: string) => void;
   handleContinue: () => void;
@@ -21,162 +45,26 @@ interface PasswordInputProps {
   loading?: boolean;
   createPasswordFlow?: boolean;
   autoFocus?: boolean;
-}
-
-interface StrengthBarProps {
-  $strengthColor: string;
-  $strengthWidth: string;
-}
-
-const Container = styled.div({
-  display: 'flex',
-  flexDirection: 'column',
-  flex: 1,
-});
-
-const HeaderText = styled.h1((props) => ({
-  ...props.theme.body_bold_l,
-  textAlign: 'center',
-  marginTop: props.theme.spacing(15),
-}));
-
-const HeaderContainer = styled.div({
-  display: 'flex',
-  flexDirection: 'column',
-  alignItems: 'center',
-});
-
-interface PasswordInputContainerProps {
-  hasError: boolean;
-}
-
-const PasswordInputContainer = styled.div<PasswordInputContainerProps>((props) => ({
-  display: 'flex',
-  alignItems: 'center',
-  width: '100%',
-  border: `1px solid ${props.hasError ? 'rgba(211, 60, 60, 0.3)' : props.theme.colors.elevation3}`,
-  backgroundColor: props.theme.colors.elevation_n1,
-  borderRadius: props.theme.radius(1),
-  paddingLeft: props.theme.spacing(4),
-  paddingRight: props.theme.spacing(4),
-  marginTop: props.theme.spacing(4),
-  marginBottom: props.theme.spacing(3),
-}));
-
-const PasswordInputLabel = styled.h2((props) => ({
-  ...props.theme.body_medium_m,
-  marginTop: props.theme.spacing(24),
-  textAlign: 'left',
-}));
-
-const Input = styled.input((props) => ({
-  ...props.theme.body_medium_m,
-  height: 44,
-  backgroundColor: props.theme.colors.elevation_n1,
-  color: props.theme.colors.white_0,
-  width: '100%',
-  border: 'none',
-}));
-
-interface ButtonContainerProps {
-  stackButtonAlignment: boolean;
-  ifError: boolean;
-}
-const ButtonsContainer = styled.div<ButtonContainerProps>((props) => ({
-  display: 'flex',
-  flexDirection: props.stackButtonAlignment ? 'column-reverse' : 'row',
-  alignItems: props.stackButtonAlignment ? 'center' : 'flex-end',
-  flex: 1,
-  marginTop: props.ifError ? props.theme.spacing(30) : props.theme.spacing(40),
-  marginBottom: props.theme.spacing(8),
-}));
-
-const StyledButton = styled.button({
-  background: 'none',
-  display: 'flex',
-  transition: 'opacity 0.1s ease',
-  '&:hover, &:focus': {
-    opacity: 0.8,
-  },
-});
-
-const ErrorMessage = styled.h2((props) => ({
-  ...props.theme.body_xs,
-  textAlign: 'left',
-  color: props.theme.colors.feedback.error,
-}));
-
-const PasswordStrengthContainer = styled.div((props) => ({
-  ...props.theme.body_medium_m,
-  display: 'flex',
-  alignItems: 'center',
-  width: '100%',
-  marginTop: props.theme.spacing(8),
-  span: {
-    opacity: 0.6,
-  },
-  p: {
-    justifySelf: 'flex-end',
-  },
-}));
-
-const StrengthBar = styled(animated.div)<StrengthBarProps>((props) => ({
-  display: 'flex',
-  flex: '1 0',
-  alignItems: 'center',
-  backgroundColor: props.theme.colors.white_600,
-  marginLeft: props.theme.spacing(6),
-  marginRight: props.theme.spacing(9),
-  borderRadius: props.theme.radius(1),
-  width: '50%',
-  div: {
-    width: props.$strengthWidth,
-    height: 4,
-    backgroundColor: props.$strengthColor,
-    borderRadius: props.theme.radius(1),
-  },
-}));
-
-const REQUIRED_PASSWORD_LENGTH = 5;
-
-enum PasswordStrength {
-  NoScore,
-  PoorScore,
-  WeakScore,
-  AverageScore,
-  StrongScore,
-  MeetsAllRequirements,
-}
-
-interface TransparentButtonContainerProps {
-  stackButtonAlignment: boolean;
-}
-const ButtonContainer = styled.div<TransparentButtonContainerProps>((props) => ({
-  marginLeft: props.stackButtonAlignment ? 0 : 3,
-  marginRight: props.stackButtonAlignment ? 0 : 3,
-  marginTop: props.theme.spacing(4),
-  width: '100%',
-}));
-
-function PasswordInput(props: PasswordInputProps): JSX.Element {
-  const {
-    title,
-    inputLabel,
-    enteredPassword,
-    passwordError,
-    setEnteredPassword,
-    handleContinue,
-    handleBack,
-    checkPasswordStrength,
-    stackButtonAlignment = false,
-    loading,
-    createPasswordFlow,
-    autoFocus = false,
-  } = props;
-
+};
+
+function PasswordInput({
+  title,
+  inputLabel,
+  submitButtonText,
+  enteredPassword,
+  passwordError,
+  setEnteredPassword,
+  handleContinue,
+  handleBack,
+  checkPasswordStrength,
+  stackButtonAlignment = false,
+  loading,
+  createPasswordFlow,
+  autoFocus = false,
+}: Props): JSX.Element {
   const { t } = useTranslation('translation', { keyPrefix: 'CREATE_PASSWORD_SCREEN' });
   const theme = useTheme();
-  const [isPasswordVisible, setIsPasswordVisible] = useState<boolean>(false);
+  const [isPasswordVisible, setIsPasswordVisible] = useState(false);
   const [passwordStrength, setPasswordStrength] = useState<PasswordStrength>(
     PasswordStrength.NoScore,
   );
@@ -304,26 +192,24 @@ function PasswordInput(props: PasswordInputProps): JSX.Element {
         <HeaderText>{title}</HeaderText>
       </HeaderContainer>
       <PasswordInputLabel>{inputLabel}</PasswordInputLabel>
-      <PasswordInputContainer
-        hasError={
-          !!error ||
-          (!!createPasswordFlow &&
-            enteredPassword !== '' &&
-            enteredPasswordLength <= REQUIRED_PASSWORD_LENGTH)
+      <Input
+        key={`${title}-${inputLabel}`}
+        type={isPasswordVisible ? 'text' : 'password'}
+        value={enteredPassword}
+        onChange={handlePasswordChange}
+        autoFocus={autoFocus}
+        complications={
+          <StyledButton onClick={handleTogglePasswordView}>
+            <img
+              src={isPasswordVisible ? Eye : EyeSlash}
+              alt="toggle password visibility"
+              height={24}
+            />
+          </StyledButton>
         }
-      >
-        <Input
-          key={`${title}-${inputLabel}`}
-          type={isPasswordVisible ? 'text' : 'password'}
-          value={enteredPassword}
-          onChange={handlePasswordChange}
-          autoFocus={autoFocus}
-        />
-        <StyledButton onClick={handleTogglePasswordView}>
-          <img src={isPasswordVisible ? Eye : EyeSlash} alt="show-password" height={24} />
-        </StyledButton>
-      </PasswordInputContainer>
-      {error && <ErrorMessage>{error}</ErrorMessage>}
+        feedback={error !== '' ? [{ message: error, variant: 'danger' }] : undefined}
+        hideClear
+      />
       {checkPasswordStrength ? renderStrengthBar() : null}
       <ButtonsContainer stackButtonAlignment={stackButtonAlignment} ifError={error !== ''}>
         <ButtonContainer stackButtonAlignment={stackButtonAlignment}>
@@ -335,7 +221,7 @@ function PasswordInput(props: PasswordInputProps): JSX.Element {
             disabled={
               !enteredPassword || (!!checkPasswordStrength && score <= PasswordStrength.WeakScore)
             }
-            title={t('CONTINUE_BUTTON')}
+            title={submitButtonText || t('CONTINUE_BUTTON')}
             onClick={handleContinue}
           />
         </ButtonContainer>
diff --git a/src/app/screens/buy/index.tsx b/src/app/screens/buy/index.tsx
index ef302015b..4753fd87f 100644
--- a/src/app/screens/buy/index.tsx
+++ b/src/app/screens/buy/index.tsx
@@ -10,7 +10,7 @@ import useWalletSelector from '@hooks/useWalletSelector';
 import { FeatureId, getMoonPaySignedUrl } from '@secretkeylabs/xverse-core';
 import Spinner from '@ui-library/spinner';
 import { MOON_PAY_API_KEY, MOON_PAY_URL, TRANSAC_API_KEY, TRANSAC_URL } from '@utils/constants';
-import { useEffect, useState } from 'react';
+import { useState } from 'react';
 import { useTranslation } from 'react-i18next';
 import { useNavigate, useParams } from 'react-router-dom';
 import styled from 'styled-components';
diff --git a/src/app/screens/settings/security/changePassword/index.tsx b/src/app/screens/settings/security/changePassword/index.tsx
index b21e0d743..b99d64f9a 100644
--- a/src/app/screens/settings/security/changePassword/index.tsx
+++ b/src/app/screens/settings/security/changePassword/index.tsx
@@ -1,4 +1,3 @@
-import Check from '@assets/img/settings/check_circle.svg';
 import PasswordInput from '@components/passwordInput';
 import BottomBar from '@components/tabBar';
 import TopRow from '@components/topRow';
@@ -9,57 +8,30 @@ import { useTranslation } from 'react-i18next';
 import { useNavigate } from 'react-router-dom';
 import styled from 'styled-components';
 
-const PasswordContainer = styled.div((props) => ({
+const Container = styled.div((props) => ({
+  ...props.theme.scrollbar,
   display: 'flex',
   flexDirection: 'column',
   flex: 1,
-  marginTop: props.theme.spacing(20),
-  paddingLeft: props.theme.spacing(8),
-  paddingRight: props.theme.spacing(8),
-}));
-
-const ToastContainer = styled.div((props) => ({
-  display: 'flex',
-  flexDirection: 'row',
-  background: props.theme.colors.feedback.success,
-  borderRadius: 12,
-  boxShadow: '0px 7px 16px -4px rgba(25, 25, 48, 0.25)',
-  height: 44,
-  padding: '12px 20px 12px 16px',
-  width: 306,
-  flex: 1,
-}));
-
-const ToastMessage = styled.h1((props) => ({
-  ...props.theme.body_medium_m,
-  color: props.theme.colors.elevation0,
-  marginLeft: props.theme.spacing(7),
-}));
-
-const ToastDismissButton = styled.button((props) => ({
-  background: 'transparent',
-  marginLeft: props.theme.spacing(12),
+  padding: `0 ${props.theme.space.s}`,
+  paddingTop: props.theme.space.xxl,
 }));
 
 function ChangePasswordScreen() {
   const { t } = useTranslation('translation');
   const { unlockVault, changePassword } = useSeedVault();
-  const [password, setPassword] = useState<string>('');
-  const [oldPassword, setOldPassword] = useState<string>('');
-  const [confirmPassword, setConfirmPassword] = useState<string>('');
-  const [error, setError] = useState<string>('');
-  const [loading, setLoading] = useState<boolean>(false);
-  const [currentStepIndex, setCurrentStepIndex] = useState<number>(0);
+  const [password, setPassword] = useState('');
+  const [oldPassword, setOldPassword] = useState('');
+  const [confirmPassword, setConfirmPassword] = useState('');
+  const [error, setError] = useState('');
+  const [loading, setLoading] = useState(false);
+  const [currentStepIndex, setCurrentStepIndex] = useState(0);
   const navigate = useNavigate();
 
   const handleBackButtonClick = () => {
     navigate(-1);
   };
 
-  const dismissToast = () => {
-    toast.dismiss();
-  };
-
   const handleConfirmCurrentPasswordNextClick = async () => {
     try {
       setLoading(true);
@@ -74,14 +46,6 @@ function ChangePasswordScreen() {
     }
   };
 
-  const ToastContent = (
-    <ToastContainer>
-      <img src={Check} alt="Check" />
-      <ToastMessage>{t('SETTING_SCREEN.UPDATE_PASSWORD_SUCCESS')}</ToastMessage>
-      <ToastDismissButton onClick={dismissToast}>{t('OK')}</ToastDismissButton>
-    </ToastContainer>
-  );
-
   const handleEnterNewPasswordNextClick = () => {
     setCurrentStepIndex(2);
   };
@@ -90,7 +54,7 @@ function ChangePasswordScreen() {
     if (confirmPassword === password) {
       setError('');
       await changePassword(oldPassword, confirmPassword);
-      toast.custom(ToastContent);
+      toast.success(t('SETTING_SCREEN.UPDATE_PASSWORD_SUCCESS'));
       navigate('/settings');
     } else {
       setError(t('CREATE_PASSWORD_SCREEN.CONFIRM_PASSWORD_MATCH_ERROR'));
@@ -104,11 +68,11 @@ function ChangePasswordScreen() {
   return (
     <>
       <TopRow onClick={handleBackButtonClick} />
-      <PasswordContainer>
+      <Container>
         {currentStepIndex === 0 && (
           <PasswordInput
             title={t('CREATE_PASSWORD_SCREEN.ENTER_PASSWORD')}
-            inputLabel={t('CREATE_PASSWORD_SCREEN.TEXT_INPUT_ENTER_PASSWORD_LABEL')}
+            inputLabel={t('LOGIN_SCREEN.PASSWORD_INPUT_LABEL')}
             enteredPassword={oldPassword}
             setEnteredPassword={setOldPassword}
             handleContinue={handleConfirmCurrentPasswordNextClick}
@@ -116,6 +80,7 @@ function ChangePasswordScreen() {
             passwordError={error}
             stackButtonAlignment
             loading={loading}
+            autoFocus
           />
         )}
         {currentStepIndex === 1 && (
@@ -129,21 +94,24 @@ function ChangePasswordScreen() {
             checkPasswordStrength
             stackButtonAlignment
             createPasswordFlow
+            autoFocus
           />
         )}
         {currentStepIndex === 2 && (
           <PasswordInput
             title={t('SETTING_SCREEN.CONFIRM_YOUR_NEW_PASSWORD')}
             inputLabel={t('SETTING_SCREEN.TEXT_INPUT_NEW_PASSWORD_LABEL')}
+            submitButtonText={t('COMMON.CONFIRM')}
             enteredPassword={confirmPassword}
             setEnteredPassword={setConfirmPassword}
             handleContinue={handleConfirmNewPasswordNextClick}
             handleBack={handleConfirmNewPasswordBackClick}
             passwordError={error}
             stackButtonAlignment
+            autoFocus
           />
         )}
-      </PasswordContainer>
+      </Container>
       <BottomBar tab="settings" />
     </>
   );
diff --git a/src/app/ui-library/input.tsx b/src/app/ui-library/input.tsx
index 77edf4757..1ce68ee64 100644
--- a/src/app/ui-library/input.tsx
+++ b/src/app/ui-library/input.tsx
@@ -180,7 +180,7 @@ type Props = {
   dataTestID?: string;
   onChange: (event: ChangeEvent<HTMLInputElement>) => void;
   onBlur?: (event: ChangeEvent<HTMLInputElement>) => void;
-  type?: 'text' | 'number';
+  type?: 'text' | 'number' | 'password';
   hideClear?: boolean;
   infoPanel?: React.ReactNode;
   complications?: React.ReactNode;
diff --git a/src/locales/en.json b/src/locales/en.json
index 328ccb63b..36a3ea2e2 100644
--- a/src/locales/en.json
+++ b/src/locales/en.json
@@ -550,7 +550,6 @@
     "CONFIRM_PASSWORD_TITLE": "Confirm your password",
     "ENTER_PASSWORD": "Enter your current password",
     "TEXT_INPUT_NEW_PASSWORD_LABEL": "Password",
-    "TEXT_INPUT_ENTER_PASSWORD_LABEL": "Enter your current password",
     "TEXT_INPUT_CONFIRM_PASSWORD_LABEL": "Confirm Password",
     "CONTINUE_BUTTON": "Continue",
     "BACK_BUTTON": "Back",
diff --git a/tests/pages/onboarding.ts b/tests/pages/onboarding.ts
index e1748a0bb..0fdbe194c 100644
--- a/tests/pages/onboarding.ts
+++ b/tests/pages/onboarding.ts
@@ -89,8 +89,8 @@ export default class Onboarding {
     this.buttonSeedWords = page.locator('button[value]:not([value=""])');
     this.header = page.locator('#app h3');
     this.inputPassword = page.locator('input[type="password"]');
-    this.errorMessage = page.getByRole('heading', { name: 'Your password should be at' });
-    this.errorMessage2 = page.getByRole('heading', { name: 'Please make sure your' });
+    this.errorMessage = page.locator('p').filter({ hasText: 'Your password should be at' });
+    this.errorMessage2 = page.locator('p').filter({ hasText: 'Please make sure your' });
     this.errorMessageSeedPhrase = page.locator('p').filter({ hasText: 'Invalid seed phrase' });
     this.labelSecurityLevelWeak = page.locator('p').filter({ hasText: 'Weak' });
     this.labelSecurityLevelMedium = page.locator('p').filter({ hasText: 'Medium' });

From 8a26894bb823f331cd935eb8fe338ff17efa4f6d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Eduard=20Bardaj=C3=AD=20Puig?= <ebardaji@gmail.com>
Date: Thu, 29 Aug 2024 15:44:34 +0200
Subject: [PATCH 046/227] Ensure unsigned transactions use latest nonce (#534)

* Ensure unsigned transactions use latest nonce

* Update @stacks/transactions

* Fix missing rune ID
---
 package-lock.json                             | 403 +++++++++++-------
 package.json                                  |   4 +-
 .../confirmStxTransactionComponent/index.tsx  |   8 +-
 src/app/screens/mintRune/index.tsx            |   1 +
 4 files changed, 248 insertions(+), 168 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index a234c6208..7efd6dc38 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -15,10 +15,10 @@
         "@react-spring/web": "^9.6.1",
         "@sats-connect/core": "0.2.1",
         "@scure/btc-signer": "1.2.1",
-        "@secretkeylabs/xverse-core": "18.7.2",
+        "@secretkeylabs/xverse-core": "18.8.0",
         "@stacks/connect": "7.4.1",
         "@stacks/stacks-blockchain-api-types": "6.1.1",
-        "@stacks/transactions": "6.13.1",
+        "@stacks/transactions": "6.16.1",
         "@tanstack/query-sync-storage-persister": "^4.29.1",
         "@tanstack/react-query": "^4.29.3",
         "@tanstack/react-query-devtools": "^4.29.3",
@@ -568,6 +568,7 @@
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/@bitcoinerlab/descriptors/-/descriptors-1.1.1.tgz",
       "integrity": "sha512-AMFkbBBg9T1iWtEmWB23oADk7zaOQix6wUPLXalhTyFDjhkFXDd6pCRfto/HAdaPg/ccM4GMTVgYLee9WdYFyQ==",
+      "license": "MIT",
       "dependencies": {
         "@bitcoinerlab/miniscript": "^1.2.1",
         "@bitcoinerlab/secp256k1": "^1.0.5",
@@ -588,6 +589,7 @@
       "version": "1.4.0",
       "resolved": "https://registry.npmjs.org/@bitcoinerlab/miniscript/-/miniscript-1.4.0.tgz",
       "integrity": "sha512-BsG3dmwQmgKHnRZecDgUsPjwcpnf1wgaZbolcMTByS10k1zYzIx97W51LzG7GvokRJ+wnzTX/GhC8Y3L2X0CQA==",
+      "license": "MIT",
       "dependencies": {
         "bip68": "^1.0.4"
       }
@@ -596,6 +598,7 @@
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/@bitcoinerlab/secp256k1/-/secp256k1-1.1.1.tgz",
       "integrity": "sha512-uhjW51WfVLpnHN7+G0saDcM/k9IqcyTbZ+bDgLF3AX8V/a3KXSE9vn7UPBrcdU72tp0J4YPR7BHp2m7MLAZ/1Q==",
+      "license": "MIT",
       "dependencies": {
         "@noble/hashes": "^1.1.5",
         "@noble/secp256k1": "^1.7.1"
@@ -1199,6 +1202,7 @@
       "version": "1.4.0",
       "resolved": "https://registry.npmjs.org/@scure/bip32/-/bip32-1.4.0.tgz",
       "integrity": "sha512-sVUpc0Vq3tXCkDGYVWGIZTRfnvu8LoTDaev7vbwh0omSvVORONr960MQWdKqJDCReIEmTj3PAr73O3aoxz7OPg==",
+      "license": "MIT",
       "dependencies": {
         "@noble/curves": "~1.4.0",
         "@noble/hashes": "~1.4.0",
@@ -1212,6 +1216,7 @@
       "version": "1.4.2",
       "resolved": "https://registry.npmjs.org/@noble/curves/-/curves-1.4.2.tgz",
       "integrity": "sha512-TavHr8qycMChk8UwMld0ZDRvatedkzWfH8IiaeGCfymOP5i0hSCozz9vHOL0nkwk7HRMlFnAiKpS2jrUmSybcw==",
+      "license": "MIT",
       "dependencies": {
         "@noble/hashes": "1.4.0"
       },
@@ -1223,6 +1228,7 @@
       "version": "1.4.0",
       "resolved": "https://registry.npmjs.org/@noble/hashes/-/hashes-1.4.0.tgz",
       "integrity": "sha512-V1JJ1WTRUqHHrOSh597hURcMqVKVGL/ea3kv0gSnEdsEZ0/+VyPghM1lMNGc00z7CIQorSvbKpuJkxvuHbvdbg==",
+      "license": "MIT",
       "engines": {
         "node": ">= 16"
       },
@@ -1240,6 +1246,7 @@
           "url": "https://paulmillr.com/funding/"
         }
       ],
+      "license": "MIT",
       "dependencies": {
         "@noble/hashes": "~1.1.1",
         "@scure/base": "~1.1.0"
@@ -1254,7 +1261,8 @@
           "type": "individual",
           "url": "https://paulmillr.com/funding/"
         }
-      ]
+      ],
+      "license": "MIT"
     },
     "node_modules/@scure/btc-signer": {
       "version": "1.2.1",
@@ -1271,9 +1279,9 @@
       }
     },
     "node_modules/@secretkeylabs/xverse-core": {
-      "version": "18.7.2",
-      "resolved": "https://npm.pkg.github.com/download/@secretkeylabs/xverse-core/18.7.2/0dc4ba04ad9b58f27031a976faf112a6648ea945",
-      "integrity": "sha512-B07GqC77UFeelKAjnpW0ZNjv7jc/m12PdVJJhRJdB7PRhsl+KHD8Z33JMHazdR6P3VbNlzUeEZ5R8WX+eBQWaA==",
+      "version": "18.8.0",
+      "resolved": "https://npm.pkg.github.com/download/@secretkeylabs/xverse-core/18.8.0/ddb1e79eace136115e86ca0952613efb900e4501",
+      "integrity": "sha512-BgWjO5TQiHteiFqb5pAjxFcgU0mSo8XhT9CxXkWV3YnjEb+Z9l9MX0wTrJMKEwswyFpTE8WJEtKU3bWR4uuyJA==",
       "license": "ISC",
       "dependencies": {
         "@bitcoinerlab/secp256k1": "^1.0.2",
@@ -1283,14 +1291,14 @@
         "@scure/bip32": "^1.4.0",
         "@scure/bip39": "^1.3.0",
         "@scure/btc-signer": "1.2.1",
-        "@stacks/auth": "6.13.1",
+        "@stacks/auth": "6.16.1",
         "@stacks/connect": "7.7.1",
-        "@stacks/encryption": "6.13.1",
-        "@stacks/network": "6.13.0",
-        "@stacks/stacking": "6.13.2",
-        "@stacks/storage": "6.13.1",
-        "@stacks/transactions": "6.13.1",
-        "@stacks/wallet-sdk": "6.13.1",
+        "@stacks/encryption": "6.16.1",
+        "@stacks/network": "6.16.0",
+        "@stacks/stacking": "6.16.1",
+        "@stacks/storage": "6.16.1",
+        "@stacks/transactions": "6.16.1",
+        "@stacks/wallet-sdk": "6.16.1",
         "@tanstack/react-query": "^4.29.3",
         "@zondax/ledger-stacks": "^1.0.4",
         "async-mutex": "^0.4.0",
@@ -1330,6 +1338,7 @@
       "version": "1.4.0",
       "resolved": "https://registry.npmjs.org/@noble/hashes/-/hashes-1.4.0.tgz",
       "integrity": "sha512-V1JJ1WTRUqHHrOSh597hURcMqVKVGL/ea3kv0gSnEdsEZ0/+VyPghM1lMNGc00z7CIQorSvbKpuJkxvuHbvdbg==",
+      "license": "MIT",
       "engines": {
         "node": ">= 16"
       },
@@ -1341,6 +1350,7 @@
       "version": "1.3.0",
       "resolved": "https://registry.npmjs.org/@scure/bip39/-/bip39-1.3.0.tgz",
       "integrity": "sha512-disdg7gHuTDZtY+ZdkmLpPCk7fxZSu3gBiEGuoC1XYxv9cGx3Z6cpTggCgW6odSOOIXCiDjuGejW+aJKCY/pIQ==",
+      "license": "MIT",
       "dependencies": {
         "@noble/hashes": "~1.4.0",
         "@scure/base": "~1.1.6"
@@ -1353,6 +1363,7 @@
       "version": "7.7.1",
       "resolved": "https://registry.npmjs.org/@stacks/connect/-/connect-7.7.1.tgz",
       "integrity": "sha512-MwLRhgRLOGo0Y4IDC0qp9RUX2SZubgse1aI2TN/fz2abNIh1LgmOKUua3w17YiBEZxDD9nyQ4KW1c33bdnrOPw==",
+      "license": "MIT",
       "dependencies": {
         "@stacks/auth": "^6.1.1",
         "@stacks/connect-ui": "6.4.1",
@@ -1366,6 +1377,7 @@
       "version": "6.4.1",
       "resolved": "https://registry.npmjs.org/@stacks/connect-ui/-/connect-ui-6.4.1.tgz",
       "integrity": "sha512-Y6Fp26MUsMQq08zFSWus40rS7RNHrHj6VDJrFUqM9VsksV3wftpsRcy7psQusUvW1DS7fPza67IlM1dcN4rvSg==",
+      "license": "MIT",
       "dependencies": {
         "@stencil/core": "^2.17.1"
       }
@@ -1373,12 +1385,14 @@
     "node_modules/@secretkeylabs/xverse-core/node_modules/@types/node": {
       "version": "11.11.6",
       "resolved": "https://registry.npmjs.org/@types/node/-/node-11.11.6.tgz",
-      "integrity": "sha512-Exw4yUWMBXM3X+8oqzJNRqZSwUAaS4+7NdvHqQuFi/d+synz++xmX3QIf+BFqneW8N31R8Ky+sikfZUXq07ggQ=="
+      "integrity": "sha512-Exw4yUWMBXM3X+8oqzJNRqZSwUAaS4+7NdvHqQuFi/d+synz++xmX3QIf+BFqneW8N31R8Ky+sikfZUXq07ggQ==",
+      "license": "MIT"
     },
     "node_modules/@secretkeylabs/xverse-core/node_modules/async-mutex": {
       "version": "0.4.1",
       "resolved": "https://registry.npmjs.org/async-mutex/-/async-mutex-0.4.1.tgz",
       "integrity": "sha512-WfoBo4E/TbCX1G95XTjbWTE3X2XLG0m1Xbv2cwOtuPdyH9CZvnaA5nCt1ucjaKEgW2A5IF71hxrRhr83Je5xjA==",
+      "license": "MIT",
       "dependencies": {
         "tslib": "^2.4.0"
       }
@@ -1387,6 +1401,7 @@
       "version": "3.0.3",
       "resolved": "https://registry.npmjs.org/bip39/-/bip39-3.0.3.tgz",
       "integrity": "sha512-P0dKrz4g0V0BjXfx7d9QNkJ/Txcz/k+hM9TnjqjUaXtuOfAvxXSw2rJw8DX0e3ZPwnK/IgDxoRqf0bvoVCqbMg==",
+      "license": "ISC",
       "dependencies": {
         "@types/node": "11.11.6",
         "create-hash": "^1.1.0",
@@ -1436,22 +1451,24 @@
       }
     },
     "node_modules/@stacks/auth": {
-      "version": "6.13.1",
-      "resolved": "https://registry.npmjs.org/@stacks/auth/-/auth-6.13.1.tgz",
-      "integrity": "sha512-nr5VeLIJBVI72eWYs/oQ7nrmuZxe89AlS5Lt/WxCcUDK9Z+oqQR1qsxBo86yVDlmrxoNWncHWD38LX54HsOEzA==",
-      "dependencies": {
-        "@stacks/common": "^6.13.0",
-        "@stacks/encryption": "^6.13.1",
-        "@stacks/network": "^6.13.0",
-        "@stacks/profile": "^6.13.1",
+      "version": "6.16.1",
+      "resolved": "https://registry.npmjs.org/@stacks/auth/-/auth-6.16.1.tgz",
+      "integrity": "sha512-6Co7VZTlfvWVKEYXh+x2TD1e+3XmCPumJut1jRgW6pYPGruZ4Dz/R4xfkf9qX3MEJabLe4AfasSfoqftg0twTg==",
+      "license": "MIT",
+      "dependencies": {
+        "@stacks/common": "^6.16.0",
+        "@stacks/encryption": "^6.16.1",
+        "@stacks/network": "^6.16.0",
+        "@stacks/profile": "^6.16.1",
         "cross-fetch": "^3.1.5",
         "jsontokens": "^4.0.1"
       }
     },
     "node_modules/@stacks/common": {
-      "version": "6.13.0",
-      "resolved": "https://registry.npmjs.org/@stacks/common/-/common-6.13.0.tgz",
-      "integrity": "sha512-wwzyihjaSdmL6NxKvDeayy3dqM0L0Q2sawmdNtzJDi0FnXuJGm5PeapJj7bEfcI9XwI7Bw5jZoC6mCn9nc5YIw==",
+      "version": "6.16.0",
+      "resolved": "https://registry.npmjs.org/@stacks/common/-/common-6.16.0.tgz",
+      "integrity": "sha512-PnzvhrdGRMVZvxTulitlYafSK4l02gPCBBoI9QEoTqgSnv62oaOXhYAUUkTMFKxdHW1seVEwZsrahuXiZPIAwg==",
+      "license": "MIT",
       "dependencies": {
         "@types/bn.js": "^5.1.0",
         "@types/node": "^18.0.4"
@@ -1487,14 +1504,15 @@
       }
     },
     "node_modules/@stacks/encryption": {
-      "version": "6.13.1",
-      "resolved": "https://registry.npmjs.org/@stacks/encryption/-/encryption-6.13.1.tgz",
-      "integrity": "sha512-y5IFX3/nGI3fCk70gE0JwH70GpshD8RhUfvhMLcL96oNaec1cCdj1ZUiQupeicfYTHuraaVBYU9xLls4TRmypg==",
+      "version": "6.16.1",
+      "resolved": "https://registry.npmjs.org/@stacks/encryption/-/encryption-6.16.1.tgz",
+      "integrity": "sha512-DtVNNW/iipyxxRDz73S9DbLfRmBMqQCCog89F1Q1i6JUnl2kBB1PR9SPQfYv9zcAJ37oHoNB4i4b2tJWYr01vg==",
+      "license": "MIT",
       "dependencies": {
         "@noble/hashes": "1.1.5",
         "@noble/secp256k1": "1.7.1",
         "@scure/bip39": "1.1.0",
-        "@stacks/common": "^6.13.0",
+        "@stacks/common": "^6.16.0",
         "@types/node": "^18.0.4",
         "base64-js": "^1.5.1",
         "bs58": "^5.0.0",
@@ -1511,50 +1529,55 @@
           "type": "individual",
           "url": "https://paulmillr.com/funding/"
         }
-      ]
+      ],
+      "license": "MIT"
     },
     "node_modules/@stacks/encryption/node_modules/@types/node": {
-      "version": "18.19.31",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-18.19.31.tgz",
-      "integrity": "sha512-ArgCD39YpyyrtFKIqMDvjz79jto5fcI/SVUs2HwB+f0dAzq68yqOdyaSivLiLugSziTpNXLQrVb7RZFmdZzbhA==",
+      "version": "18.19.47",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-18.19.47.tgz",
+      "integrity": "sha512-1f7dB3BL/bpd9tnDJrrHb66Y+cVrhxSOTGorRNdHwYTUlTay3HuTDPKo9a/4vX9pMQkhYBcAbL4jQdNlhCFP9A==",
+      "license": "MIT",
       "dependencies": {
         "undici-types": "~5.26.4"
       }
     },
     "node_modules/@stacks/network": {
-      "version": "6.13.0",
-      "resolved": "https://registry.npmjs.org/@stacks/network/-/network-6.13.0.tgz",
-      "integrity": "sha512-Ss/Da4BNyPBBj1OieM981fJ7SkevKqLPkzoI1+Yo7cYR2df+0FipIN++Z4RfpJpc8ne60vgcx7nJZXQsiGhKBQ==",
+      "version": "6.16.0",
+      "resolved": "https://registry.npmjs.org/@stacks/network/-/network-6.16.0.tgz",
+      "integrity": "sha512-uqz9Nb6uf+SeyCKENJN+idt51HAfEeggQKrOMfGjpAeFgZV2CR66soB/ci9+OVQR/SURvasncAz2ScI1blfS8A==",
+      "license": "MIT",
       "dependencies": {
-        "@stacks/common": "^6.13.0",
+        "@stacks/common": "^6.16.0",
         "cross-fetch": "^3.1.5"
       }
     },
     "node_modules/@stacks/profile": {
-      "version": "6.13.1",
-      "resolved": "https://registry.npmjs.org/@stacks/profile/-/profile-6.13.1.tgz",
-      "integrity": "sha512-GCDE13hwoUYZvZKTb5c0Tr74DcxIP/n4bffcYrKa5UabITPQ7JwsJIOyDoAwdtl3lu7fi9aBsKrdfHpBBUSQIQ==",
+      "version": "6.16.1",
+      "resolved": "https://registry.npmjs.org/@stacks/profile/-/profile-6.16.1.tgz",
+      "integrity": "sha512-FJcwKN6oVDfmwymivkZfm1PcO7gv5fcWN4HI+jtYdMftrl6yxAB4/XD63FSvshIeLPzBJjnCmaZSnPAV2mtdeA==",
+      "license": "MIT",
       "dependencies": {
-        "@stacks/common": "^6.13.0",
-        "@stacks/network": "^6.13.0",
-        "@stacks/transactions": "^6.13.1",
+        "@stacks/common": "^6.16.0",
+        "@stacks/network": "^6.16.0",
+        "@stacks/transactions": "^6.16.1",
         "jsontokens": "^4.0.1",
         "schema-inspector": "^2.0.2",
         "zone-file": "^2.0.0-beta.3"
       }
     },
     "node_modules/@stacks/stacking": {
-      "version": "6.13.2",
-      "resolved": "https://registry.npmjs.org/@stacks/stacking/-/stacking-6.13.2.tgz",
-      "integrity": "sha512-4h1UQuL2+Xdra9zMqzUElvKG9X9fenuNE7hD9sIqyxyLFxeQ7gRqczmTYPsmaj4wY5004JNj+efzGJ0VmpOcAA==",
+      "version": "6.16.1",
+      "resolved": "https://registry.npmjs.org/@stacks/stacking/-/stacking-6.16.1.tgz",
+      "integrity": "sha512-Bv7TSyoMrb1wYOfKrPxwDQPSjsohyKCduN1HYMlKL9hHF0J8+MvlJFw9eIj1c2SEOyYaElT+Ly3CI56J/acVxw==",
+      "license": "MIT",
       "dependencies": {
         "@noble/hashes": "1.1.5",
         "@scure/base": "1.1.1",
-        "@stacks/common": "^6.13.0",
-        "@stacks/encryption": "^6.13.1",
-        "@stacks/network": "^6.13.0",
+        "@stacks/common": "^6.16.0",
+        "@stacks/encryption": "^6.16.1",
+        "@stacks/network": "^6.16.0",
         "@stacks/stacks-blockchain-api-types": "^0.61.0",
-        "@stacks/transactions": "^6.13.1",
+        "@stacks/transactions": "^6.16.1",
         "bs58": "^5.0.0"
       }
     },
@@ -1567,7 +1590,8 @@
           "type": "individual",
           "url": "https://paulmillr.com/funding/"
         }
-      ]
+      ],
+      "license": "MIT"
     },
     "node_modules/@stacks/stacking/node_modules/@scure/base": {
       "version": "1.1.1",
@@ -1578,12 +1602,14 @@
           "type": "individual",
           "url": "https://paulmillr.com/funding/"
         }
-      ]
+      ],
+      "license": "MIT"
     },
     "node_modules/@stacks/stacking/node_modules/@stacks/stacks-blockchain-api-types": {
       "version": "0.61.0",
       "resolved": "https://registry.npmjs.org/@stacks/stacks-blockchain-api-types/-/stacks-blockchain-api-types-0.61.0.tgz",
-      "integrity": "sha512-yPOfTUboo5eA9BZL/hqMcM71GstrFs9YWzOrJFPeP4cOO1wgYvAcckgBRbgiE3NqeX0A7SLZLDAXLZbATuRq9w=="
+      "integrity": "sha512-yPOfTUboo5eA9BZL/hqMcM71GstrFs9YWzOrJFPeP4cOO1wgYvAcckgBRbgiE3NqeX0A7SLZLDAXLZbATuRq9w==",
+      "license": "ISC"
     },
     "node_modules/@stacks/stacks-blockchain-api-types": {
       "version": "6.1.1",
@@ -1591,27 +1617,29 @@
       "integrity": "sha512-Mw5dBPx3DySPupwaq0iBdm1WdEVXIfhjUVaTjI2iSyzWz4Fgs3U7JCaAezLbgNu7Q69c/ZN4JUDWuo9FVjy7oA=="
     },
     "node_modules/@stacks/storage": {
-      "version": "6.13.1",
-      "resolved": "https://registry.npmjs.org/@stacks/storage/-/storage-6.13.1.tgz",
-      "integrity": "sha512-XnzRAETDKW7Ij3cuUNllrrnLOCwctV/XrIHgVWnD04LNL5R9apkwp9IkzaFbyJZ+XrkUBKwtdCgVYype2XgT6w==",
-      "dependencies": {
-        "@stacks/auth": "^6.13.1",
-        "@stacks/common": "^6.13.0",
-        "@stacks/encryption": "^6.13.1",
-        "@stacks/network": "^6.13.0",
+      "version": "6.16.1",
+      "resolved": "https://registry.npmjs.org/@stacks/storage/-/storage-6.16.1.tgz",
+      "integrity": "sha512-bElxB03dg3XGTX8r/J8Os2tIsodcTglg7zeq6RU4FVUU7tUA+Agpmn9FKl8MmnsWfO4ls5UgeujyBaxUJ//yAw==",
+      "license": "MIT",
+      "dependencies": {
+        "@stacks/auth": "^6.16.1",
+        "@stacks/common": "^6.16.0",
+        "@stacks/encryption": "^6.16.1",
+        "@stacks/network": "^6.16.0",
         "base64-js": "^1.5.1",
         "jsontokens": "^4.0.1"
       }
     },
     "node_modules/@stacks/transactions": {
-      "version": "6.13.1",
-      "resolved": "https://registry.npmjs.org/@stacks/transactions/-/transactions-6.13.1.tgz",
-      "integrity": "sha512-PWw2I+2Fj3CaFYQIoVcqQN6E2qGHNhFv03nuR0CxMq0sx8stPgYZbdzUlnlBcJQdsFiHrw3sPeqnXDZt+Hg5YQ==",
+      "version": "6.16.1",
+      "resolved": "https://registry.npmjs.org/@stacks/transactions/-/transactions-6.16.1.tgz",
+      "integrity": "sha512-yCtUM+8IN0QJbnnlFhY1wBW7Q30Cxje3Zmy8DgqdBoM/EPPWadez/8wNWFANVAMyUZeQ9V/FY+8MAw4E+pCReA==",
+      "license": "MIT",
       "dependencies": {
         "@noble/hashes": "1.1.5",
         "@noble/secp256k1": "1.7.1",
-        "@stacks/common": "^6.13.0",
-        "@stacks/network": "^6.13.0",
+        "@stacks/common": "^6.16.0",
+        "@stacks/network": "^6.16.0",
         "c32check": "^2.0.0",
         "lodash.clonedeep": "^4.5.0"
       }
@@ -1628,19 +1656,20 @@
       ]
     },
     "node_modules/@stacks/wallet-sdk": {
-      "version": "6.13.1",
-      "resolved": "https://registry.npmjs.org/@stacks/wallet-sdk/-/wallet-sdk-6.13.1.tgz",
-      "integrity": "sha512-262CYKAm1j8oVxfGUIJrHp867j9gm5NrqPM85s0TfCv2QhfLDkvme6nKgmvtL2TecAZkBa5tu8M5DQ7z92WvAQ==",
+      "version": "6.16.1",
+      "resolved": "https://registry.npmjs.org/@stacks/wallet-sdk/-/wallet-sdk-6.16.1.tgz",
+      "integrity": "sha512-QYm/BfRpHZfD5FjvaOJp0hy8yeqde6qrEmSrcIl06IC2SNr4R5NOy0xK/RPUgJFB1/Gd16HbqS9EdyV3o6ybwg==",
+      "license": "MIT",
       "dependencies": {
         "@scure/bip32": "1.1.3",
         "@scure/bip39": "1.1.0",
-        "@stacks/auth": "^6.13.1",
-        "@stacks/common": "^6.13.0",
-        "@stacks/encryption": "^6.13.1",
-        "@stacks/network": "^6.13.0",
-        "@stacks/profile": "^6.13.1",
-        "@stacks/storage": "^6.13.1",
-        "@stacks/transactions": "^6.13.1",
+        "@stacks/auth": "^6.16.1",
+        "@stacks/common": "^6.16.0",
+        "@stacks/encryption": "^6.16.1",
+        "@stacks/network": "^6.16.0",
+        "@stacks/profile": "^6.16.1",
+        "@stacks/storage": "^6.16.1",
+        "@stacks/transactions": "^6.16.1",
         "buffer": "^6.0.3",
         "c32check": "^2.0.0",
         "jsontokens": "^4.0.1",
@@ -1657,7 +1686,8 @@
           "type": "individual",
           "url": "https://paulmillr.com/funding/"
         }
-      ]
+      ],
+      "license": "MIT"
     },
     "node_modules/@stacks/wallet-sdk/node_modules/@scure/bip32": {
       "version": "1.1.3",
@@ -1669,6 +1699,7 @@
           "url": "https://paulmillr.com/funding/"
         }
       ],
+      "license": "MIT",
       "dependencies": {
         "@noble/hashes": "~1.1.3",
         "@noble/secp256k1": "~1.7.0",
@@ -2153,6 +2184,7 @@
       "version": "2.4.4",
       "resolved": "https://registry.npmjs.org/@types/sha.js/-/sha.js-2.4.4.tgz",
       "integrity": "sha512-Qukd+D6S2Hm0wLVt2Vh+/eWBIoUt+wF8jWjBsG4F8EFQRwKtYvtXCPcNl2OEUQ1R+eTr3xuSaBYUyM3WD1x/Qw==",
+      "license": "MIT",
       "dependencies": {
         "@types/node": "*"
       }
@@ -2180,7 +2212,8 @@
     "node_modules/@types/uuid": {
       "version": "8.3.4",
       "resolved": "https://registry.npmjs.org/@types/uuid/-/uuid-8.3.4.tgz",
-      "integrity": "sha512-c/I8ZRb51j+pYGAu5CrFMRxqZ2ke4y2grEBO5AUjgSkSk+qT2Ea+OdWElz/OiMf5MNpn2b17kuVBwZLQJXzihw=="
+      "integrity": "sha512-c/I8ZRb51j+pYGAu5CrFMRxqZ2ke4y2grEBO5AUjgSkSk+qT2Ea+OdWElz/OiMf5MNpn2b17kuVBwZLQJXzihw==",
+      "license": "MIT"
     },
     "node_modules/@types/webextension-polyfill": {
       "version": "0.9.2",
@@ -2652,6 +2685,7 @@
       "version": "1.0.4",
       "resolved": "https://registry.npmjs.org/@zondax/ledger-stacks/-/ledger-stacks-1.0.4.tgz",
       "integrity": "sha512-R8CB0CZ2poTzpcG0jhzzXZvXF7axIsmZFhp06aHCUjgz+1df63YbC4tUzyzmseekwqNWnaebWFejQKJ99WiHZA==",
+      "license": "Apache-2.0",
       "dependencies": {
         "@babel/runtime": "^7.12.5",
         "@ledgerhq/hw-transport": "^6.28.1",
@@ -2663,6 +2697,7 @@
       "version": "4.3.5",
       "resolved": "https://registry.npmjs.org/@stacks/common/-/common-4.3.5.tgz",
       "integrity": "sha512-UuViiQ7fn3vdtTe3739aRzbl+wbukekeQuXgqt8d7nB2HC2HodD7GcHhpUga165cO35CD6lQUtj3vXxJb5Ga+A==",
+      "license": "MIT",
       "dependencies": {
         "@types/bn.js": "^5.1.0",
         "@types/node": "^18.0.4",
@@ -2673,6 +2708,7 @@
       "version": "4.3.5",
       "resolved": "https://registry.npmjs.org/@stacks/network/-/network-4.3.5.tgz",
       "integrity": "sha512-TC4+AkuT6qi3MoEGxTftA+4BNp99QvGnI+qtKQkoA1m0KDr8b9hSBUhugJHRhQbWuo7D6q0+JagYEGxLID29Kw==",
+      "license": "MIT",
       "dependencies": {
         "@stacks/common": "^4.3.5",
         "cross-fetch": "^3.1.5"
@@ -2682,6 +2718,7 @@
       "version": "4.3.8",
       "resolved": "https://registry.npmjs.org/@stacks/transactions/-/transactions-4.3.8.tgz",
       "integrity": "sha512-5xYYv2TdXXM9PVixB79Pr99symQ8fhbVATjempGUxtL23/XUiRiLvJZohDxIE4VQ2EzbB4g4j8Y7oqPjj0h09Q==",
+      "license": "MIT",
       "dependencies": {
         "@noble/hashes": "^1.0.0",
         "@noble/secp256k1": "^1.5.5",
@@ -2697,9 +2734,10 @@
       }
     },
     "node_modules/@zondax/ledger-stacks/node_modules/@types/node": {
-      "version": "18.19.42",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-18.19.42.tgz",
-      "integrity": "sha512-d2ZFc/3lnK2YCYhos8iaNIYu9Vfhr92nHiyJHRltXWjXUBjEE+A4I58Tdbnw4VhggSW+2j5y5gTrLs4biNnubg==",
+      "version": "18.19.47",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-18.19.47.tgz",
+      "integrity": "sha512-1f7dB3BL/bpd9tnDJrrHb66Y+cVrhxSOTGorRNdHwYTUlTay3HuTDPKo9a/4vX9pMQkhYBcAbL4jQdNlhCFP9A==",
+      "license": "MIT",
       "dependencies": {
         "undici-types": "~5.26.4"
       }
@@ -2708,6 +2746,7 @@
       "version": "3.0.10",
       "resolved": "https://registry.npmjs.org/base-x/-/base-x-3.0.10.tgz",
       "integrity": "sha512-7d0s06rR9rYaIWHkpfLIFICM/tkSVdoPC9qYAQRpxn9DdKNWNsKC0uk++akckyLq16Tx2WIinnZ6WRriAt6njQ==",
+      "license": "MIT",
       "dependencies": {
         "safe-buffer": "^5.0.1"
       }
@@ -2716,6 +2755,7 @@
       "version": "1.1.3",
       "resolved": "https://registry.npmjs.org/c32check/-/c32check-1.1.3.tgz",
       "integrity": "sha512-ADADE/PjAbJRlwpG3ShaOMbBUlJJZO7xaYSRD5Tub6PixQlgR4s36y9cvMf/YRGpkqX+QOxIdMw216iC320q9A==",
+      "license": "MIT",
       "dependencies": {
         "base-x": "^3.0.8",
         "buffer": "^5.6.0",
@@ -3298,6 +3338,7 @@
       "version": "3.0.1",
       "resolved": "https://registry.npmjs.org/base64url/-/base64url-3.0.1.tgz",
       "integrity": "sha512-ir1UPr3dkwexU7FdV8qBBbNDRUhMmIekYMFZfi+C/sLNnRESKPl23nB9b2pltqfOQNnGzsDdId90AEtG5tCx4A==",
+      "license": "MIT",
       "engines": {
         "node": ">=6.0.0"
       }
@@ -3351,6 +3392,7 @@
       "version": "1.5.0",
       "resolved": "https://registry.npmjs.org/bindings/-/bindings-1.5.0.tgz",
       "integrity": "sha512-p2q/t/mhvuOj/UeLlV6566GD/guowlr0hHxClI0W9m7MWYkL1F0hLo+0Aexs9HSPCtR1SXQ0TD3MMKrXZajbiQ==",
+      "license": "MIT",
       "dependencies": {
         "file-uri-to-path": "1.0.0"
       }
@@ -3359,6 +3401,7 @@
       "version": "2.1.1",
       "resolved": "https://registry.npmjs.org/bip174/-/bip174-2.1.1.tgz",
       "integrity": "sha512-mdFV5+/v0XyNYXjBS6CQPLo9ekCx4gtKZFnJm5PMto7Fs9hTTDpkkzOB7/FtluRI6JbUUAu+snTYfJRgHLZbZQ==",
+      "license": "MIT",
       "engines": {
         "node": ">=8.0.0"
       }
@@ -3367,6 +3410,7 @@
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/bip32/-/bip32-4.0.0.tgz",
       "integrity": "sha512-aOGy88DDlVUhspIXJN+dVEtclhIsfAUppD43V0j40cPTld3pv/0X/MlrZSZ6jowIaQQzFwP8M6rFU2z2mVYjDQ==",
+      "license": "MIT",
       "dependencies": {
         "@noble/hashes": "^1.2.0",
         "@scure/base": "^1.1.1",
@@ -3380,7 +3424,8 @@
     "node_modules/bip32-path": {
       "version": "0.4.2",
       "resolved": "https://registry.npmjs.org/bip32-path/-/bip32-path-0.4.2.tgz",
-      "integrity": "sha512-ZBMCELjJfcNMkz5bDuJ1WrYvjlhEF5k6mQ8vUr4N7MbVRsXei7ZOg8VhhwMfNiW68NWmLkgkc6WvTickrLGprQ=="
+      "integrity": "sha512-ZBMCELjJfcNMkz5bDuJ1WrYvjlhEF5k6mQ8vUr4N7MbVRsXei7ZOg8VhhwMfNiW68NWmLkgkc6WvTickrLGprQ==",
+      "license": "MIT"
     },
     "node_modules/bip39": {
       "version": "3.1.0",
@@ -3394,6 +3439,7 @@
       "version": "1.1.5",
       "resolved": "https://registry.npmjs.org/bip66/-/bip66-1.1.5.tgz",
       "integrity": "sha512-nemMHz95EmS38a26XbbdxIYj5csHd3RMP3H5bwQknX0WYHF01qhpufP42mLOwVICuH2JmhIhXiWs89MfUGL7Xw==",
+      "license": "MIT",
       "dependencies": {
         "safe-buffer": "^5.0.1"
       }
@@ -3402,6 +3448,7 @@
       "version": "1.0.4",
       "resolved": "https://registry.npmjs.org/bip68/-/bip68-1.0.4.tgz",
       "integrity": "sha512-O1htyufFTYy3EO0JkHg2CLykdXEtV2ssqw47Gq9A0WByp662xpJnMEB9m43LZjsSDjIAOozWRExlFQk2hlV1XQ==",
+      "license": "ISC",
       "engines": {
         "node": ">=4.5.0"
       }
@@ -3420,6 +3467,7 @@
       "version": "6.1.6",
       "resolved": "https://registry.npmjs.org/bitcoinjs-lib/-/bitcoinjs-lib-6.1.6.tgz",
       "integrity": "sha512-Fk8+Vc+e2rMoDU5gXkW9tD+313rhkm5h6N9HfZxXvYU9LedttVvmXKTgd9k5rsQJjkSfsv6XRM8uhJv94SrvcA==",
+      "license": "MIT",
       "dependencies": {
         "@noble/hashes": "^1.2.0",
         "bech32": "^2.0.0",
@@ -3436,6 +3484,7 @@
       "version": "2.2.0",
       "resolved": "https://registry.npmjs.org/bitcoinjs-message/-/bitcoinjs-message-2.2.0.tgz",
       "integrity": "sha512-103Wy3xg8Y9o+pdhGP4M3/mtQQuUWs6sPuOp1mYphSUoSMHjHTlkj32K4zxU8qMH0Ckv23emfkGlFWtoWZ7YFA==",
+      "license": "MIT",
       "dependencies": {
         "bech32": "^1.1.3",
         "bs58check": "^2.1.2",
@@ -3452,6 +3501,7 @@
       "version": "3.0.10",
       "resolved": "https://registry.npmjs.org/base-x/-/base-x-3.0.10.tgz",
       "integrity": "sha512-7d0s06rR9rYaIWHkpfLIFICM/tkSVdoPC9qYAQRpxn9DdKNWNsKC0uk++akckyLq16Tx2WIinnZ6WRriAt6njQ==",
+      "license": "MIT",
       "dependencies": {
         "safe-buffer": "^5.0.1"
       }
@@ -3459,12 +3509,14 @@
     "node_modules/bitcoinjs-message/node_modules/bech32": {
       "version": "1.1.4",
       "resolved": "https://registry.npmjs.org/bech32/-/bech32-1.1.4.tgz",
-      "integrity": "sha512-s0IrSOzLlbvX7yp4WBfPITzpAU8sqQcpsmwXDiKwrG4r491vwCO/XpejasRNl0piBMe/DvP4Tz0mIS/X1DPJBQ=="
+      "integrity": "sha512-s0IrSOzLlbvX7yp4WBfPITzpAU8sqQcpsmwXDiKwrG4r491vwCO/XpejasRNl0piBMe/DvP4Tz0mIS/X1DPJBQ==",
+      "license": "MIT"
     },
     "node_modules/bitcoinjs-message/node_modules/bs58": {
       "version": "4.0.1",
       "resolved": "https://registry.npmjs.org/bs58/-/bs58-4.0.1.tgz",
       "integrity": "sha512-Ok3Wdf5vOIlBrgCvTq96gBkJw+JUEzdBgyaza5HLtPm7yTHkjRy8+JzNyHF7BHa0bNWOQIp3m5YF0nnFcOIKLw==",
+      "license": "MIT",
       "dependencies": {
         "base-x": "^3.0.2"
       }
@@ -3473,6 +3525,7 @@
       "version": "2.1.2",
       "resolved": "https://registry.npmjs.org/bs58check/-/bs58check-2.1.2.tgz",
       "integrity": "sha512-0TS1jicxdU09dwJMNZtVAfzPi6Q6QeN0pM1Fkzrjn+XYHvzMKPU3pHVpva+769iNVSfIYWf7LJ6WR+BuuMf8cA==",
+      "license": "MIT",
       "dependencies": {
         "bs58": "^4.0.0",
         "create-hash": "^1.1.0",
@@ -3735,6 +3788,7 @@
       "version": "3.0.1",
       "resolved": "https://registry.npmjs.org/bs58check/-/bs58check-3.0.1.tgz",
       "integrity": "sha512-hjuuJvoWEybo7Hn/0xOrczQKKEKD63WguEjlhLExYs2wUBcebDC1jDNK17eEAD2lYfw82d5ASC1d7K3SWszjaQ==",
+      "license": "MIT",
       "dependencies": {
         "@noble/hashes": "^1.2.0",
         "bs58": "^5.0.0"
@@ -3767,6 +3821,7 @@
       "version": "1.0.4",
       "resolved": "https://registry.npmjs.org/buffer-equals/-/buffer-equals-1.0.4.tgz",
       "integrity": "sha512-99MsCq0j5+RhubVEtKQgKaD6EM+UP3xJgIvQqwJ3SOLDUekzxMX1ylXBng+Wa2sh7mGT0W6RUly8ojjr1Tt6nA==",
+      "license": "MIT",
       "engines": {
         "node": ">=0.10.0"
       }
@@ -4458,6 +4513,7 @@
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/cross-sha256/-/cross-sha256-1.2.0.tgz",
       "integrity": "sha512-KViLNMDZKV7jwFqjFx+rNhG26amnFYYQ0S+VaFlVvpk8tM+2XbFia/don/SjGHg9WQxnFVi6z64CGPuF3T+nNw==",
+      "license": "(MIT AND BSD-3-Clause)",
       "dependencies": {
         "buffer": "^5.6.0"
       }
@@ -5071,6 +5127,7 @@
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/drbg.js/-/drbg.js-1.0.1.tgz",
       "integrity": "sha512-F4wZ06PvqxYLFEZKkFxTDcns9oFNk34hvmJSEwdzsxVQ8YI5YaxtACgQatkYgv2VI2CFkUd2Y+xosPQnHv809g==",
+      "license": "MIT",
       "dependencies": {
         "browserify-aes": "^1.0.6",
         "create-hash": "^1.1.2",
@@ -5102,6 +5159,7 @@
       "version": "1.0.11",
       "resolved": "https://registry.npmjs.org/ecdsa-sig-formatter/-/ecdsa-sig-formatter-1.0.11.tgz",
       "integrity": "sha512-nagl3RYrbNv6kQkeJIpt6NJZy8twLB/2vtz6yN9Z4vRKHN4/QZJIEbqohALSgwKdnksuY3k5Addp5lg8sVoVcQ==",
+      "license": "Apache-2.0",
       "dependencies": {
         "safe-buffer": "^5.0.1"
       }
@@ -5110,6 +5168,7 @@
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/ecpair/-/ecpair-2.1.0.tgz",
       "integrity": "sha512-cL/mh3MtJutFOvFc27GPZE2pWL3a3k4YvzUWEOvilnfZVlH3Jwgx/7d6tlD7/75tNk8TG2m+7Kgtz0SI1tWcqw==",
+      "license": "MIT",
       "dependencies": {
         "randombytes": "^2.1.0",
         "typeforce": "^1.18.0",
@@ -6233,7 +6292,8 @@
     "node_modules/file-uri-to-path": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/file-uri-to-path/-/file-uri-to-path-1.0.0.tgz",
-      "integrity": "sha512-0Zt+s3L7Vf1biwWZ29aARiVYLx7iMGnEUl9x33fbB/j3jR81u/O2LbqK+Bm1CDSNDKVtJ/YjwY7TUd5SkeLQLw=="
+      "integrity": "sha512-0Zt+s3L7Vf1biwWZ29aARiVYLx7iMGnEUl9x33fbB/j3jR81u/O2LbqK+Bm1CDSNDKVtJ/YjwY7TUd5SkeLQLw==",
+      "license": "MIT"
     },
     "node_modules/fill-range": {
       "version": "7.0.1",
@@ -7554,6 +7614,7 @@
       "version": "1.0.10",
       "resolved": "https://registry.npmjs.org/is-generator-function/-/is-generator-function-1.0.10.tgz",
       "integrity": "sha512-jsEjy9l3yiXEQ+PsXdmBwEPcOxaXWLspKdplFUVI9vq1iZgIekeC0L167qeu86czQaxed3q/Uzuw0swL0irL8A==",
+      "license": "MIT",
       "dependencies": {
         "has-tostringtag": "^1.0.0"
       },
@@ -7945,6 +8006,7 @@
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/json-bigint/-/json-bigint-1.0.0.tgz",
       "integrity": "sha512-SiPv/8VpZuWbvLSMtTDU8hEfrZWg/mH/nV/b4o0CYbSxu1UIQPLdwKOCIyLQX+VIPO5vrLX3i8qtqFyhdPSUSQ==",
+      "license": "MIT",
       "dependencies": {
         "bignumber.js": "^9.0.0"
       }
@@ -8168,6 +8230,7 @@
       "version": "0.2.3",
       "resolved": "https://registry.npmjs.org/ledger-bitcoin/-/ledger-bitcoin-0.2.3.tgz",
       "integrity": "sha512-sWdvMTR5CkebNlM0Mam9ROdpsD7Y4087kj4cbIaCCq8IXShCQ44vE3j0wTmt+sHp13eETgY63OWN1rkuIfMfuQ==",
+      "license": "Apache-2.0",
       "dependencies": {
         "@bitcoinerlab/descriptors": "^1.0.2",
         "@bitcoinerlab/secp256k1": "^1.0.5",
@@ -8955,7 +9018,8 @@
     "node_modules/nan": {
       "version": "2.20.0",
       "resolved": "https://registry.npmjs.org/nan/-/nan-2.20.0.tgz",
-      "integrity": "sha512-bk3gXBZDGILuuo/6sKtr0DQmSThYHLtNCdSdXk9YkxD/jK6X2vmCyyXBBxyqZ4XcnzTyYEAThfX3DCEnLf6igw=="
+      "integrity": "sha512-bk3gXBZDGILuuo/6sKtr0DQmSThYHLtNCdSdXk9YkxD/jK6X2vmCyyXBBxyqZ4XcnzTyYEAThfX3DCEnLf6igw==",
+      "license": "MIT"
     },
     "node_modules/nano-time": {
       "version": "1.0.0",
@@ -10827,6 +10891,7 @@
       "resolved": "https://registry.npmjs.org/secp256k1/-/secp256k1-3.8.0.tgz",
       "integrity": "sha512-k5ke5avRZbtl9Tqx/SA7CbY3NF6Ro+Sj9cZxezFzuBlLDmyqPiL8hJJ+EmzD8Ig4LUDByHJ3/iPOVoRixs/hmw==",
       "hasInstallScript": true,
+      "license": "MIT",
       "dependencies": {
         "bindings": "^1.5.0",
         "bip66": "^1.1.5",
@@ -10844,7 +10909,8 @@
     "node_modules/secp256k1/node_modules/bn.js": {
       "version": "4.12.0",
       "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.0.tgz",
-      "integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA=="
+      "integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA==",
+      "license": "MIT"
     },
     "node_modules/select-hose": {
       "version": "2.0.0",
@@ -11160,6 +11226,7 @@
       "version": "4.2.0",
       "resolved": "https://registry.npmjs.org/smart-buffer/-/smart-buffer-4.2.0.tgz",
       "integrity": "sha512-94hK0Hh8rPqQl2xXc3HsaBoOXKV20MToPkcXvwbISWLEs+64sBq5kFgn2kJDHb1Pry9yrP0dxrCI9RRci7RXKg==",
+      "license": "MIT",
       "engines": {
         "node": ">= 6.0.0",
         "npm": ">= 3.0.0"
@@ -12128,7 +12195,8 @@
     "node_modules/typeforce": {
       "version": "1.18.0",
       "resolved": "https://registry.npmjs.org/typeforce/-/typeforce-1.18.0.tgz",
-      "integrity": "sha512-7uc1O8h1M1g0rArakJdf0uLRSSgFcYexrVoKo+bzJd32gd4gDy2L/Z+8/FjPnU9ydY3pEnVPtr9FyscYY60K1g=="
+      "integrity": "sha512-7uc1O8h1M1g0rArakJdf0uLRSSgFcYexrVoKo+bzJd32gd4gDy2L/Z+8/FjPnU9ydY3pEnVPtr9FyscYY60K1g==",
+      "license": "MIT"
     },
     "node_modules/typescript": {
       "version": "5.5.4",
@@ -12153,9 +12221,10 @@
       }
     },
     "node_modules/uglify-js": {
-      "version": "3.19.1",
-      "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.19.1.tgz",
-      "integrity": "sha512-y/2wiW+ceTYR2TSSptAhfnEtpLaQ4Ups5zrjB2d3kuVxHj16j/QJwPl5PvuGy9uARb39J0+iKxcRPvtpsx4A4A==",
+      "version": "3.19.2",
+      "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.19.2.tgz",
+      "integrity": "sha512-S8KA6DDI47nQXJSi2ctQ629YzwOVs+bQML6DAtvy0wgNdpi+0ySpQK0g2pxBq2xfF2z3YCscu7NNA8nXT9PlIQ==",
+      "license": "BSD-2-Clause",
       "bin": {
         "uglifyjs": "bin/uglifyjs"
       },
@@ -12269,6 +12338,7 @@
       "version": "0.12.5",
       "resolved": "https://registry.npmjs.org/util/-/util-0.12.5.tgz",
       "integrity": "sha512-kZf/K6hEIrWHI6XqOFUiiMa+79wE/D8Q+NCNAWclkyg3b4d2k7s0QGepNjiABc+aR3N1PAyHL7p6UcLY6LmrnA==",
+      "license": "MIT",
       "dependencies": {
         "inherits": "^2.0.3",
         "is-arguments": "^1.0.4",
@@ -12309,6 +12379,7 @@
       "version": "6.2.13",
       "resolved": "https://registry.npmjs.org/uuidv4/-/uuidv4-6.2.13.tgz",
       "integrity": "sha512-AXyzMjazYB3ovL3q051VLH06Ixj//Knx7QnUSi1T//Ie3io6CpsPu9nVMOx5MoLWh6xV0B9J0hIaxungxXUbPQ==",
+      "license": "MIT",
       "dependencies": {
         "@types/uuid": "8.3.4",
         "uuid": "8.3.2"
@@ -12756,6 +12827,7 @@
       "version": "2.0.6",
       "resolved": "https://registry.npmjs.org/wif/-/wif-2.0.6.tgz",
       "integrity": "sha512-HIanZn1zmduSF+BQhkE+YXIbEiH0xPr1012QbFEGB0xsKqJii0/SqJjyn8dFv6y36kOznMgMB+LGcbZTJ1xACQ==",
+      "license": "MIT",
       "dependencies": {
         "bs58check": "<3.0.0"
       }
@@ -12764,6 +12836,7 @@
       "version": "3.0.10",
       "resolved": "https://registry.npmjs.org/base-x/-/base-x-3.0.10.tgz",
       "integrity": "sha512-7d0s06rR9rYaIWHkpfLIFICM/tkSVdoPC9qYAQRpxn9DdKNWNsKC0uk++akckyLq16Tx2WIinnZ6WRriAt6njQ==",
+      "license": "MIT",
       "dependencies": {
         "safe-buffer": "^5.0.1"
       }
@@ -12772,6 +12845,7 @@
       "version": "4.0.1",
       "resolved": "https://registry.npmjs.org/bs58/-/bs58-4.0.1.tgz",
       "integrity": "sha512-Ok3Wdf5vOIlBrgCvTq96gBkJw+JUEzdBgyaza5HLtPm7yTHkjRy8+JzNyHF7BHa0bNWOQIp3m5YF0nnFcOIKLw==",
+      "license": "MIT",
       "dependencies": {
         "base-x": "^3.0.2"
       }
@@ -12780,6 +12854,7 @@
       "version": "2.1.2",
       "resolved": "https://registry.npmjs.org/bs58check/-/bs58check-2.1.2.tgz",
       "integrity": "sha512-0TS1jicxdU09dwJMNZtVAfzPi6Q6QeN0pM1Fkzrjn+XYHvzMKPU3pHVpva+769iNVSfIYWf7LJ6WR+BuuMf8cA==",
+      "license": "MIT",
       "dependencies": {
         "bs58": "^4.0.0",
         "create-hash": "^1.1.0",
@@ -13771,9 +13846,9 @@
       }
     },
     "@secretkeylabs/xverse-core": {
-      "version": "18.7.2",
-      "resolved": "https://npm.pkg.github.com/download/@secretkeylabs/xverse-core/18.7.2/0dc4ba04ad9b58f27031a976faf112a6648ea945",
-      "integrity": "sha512-B07GqC77UFeelKAjnpW0ZNjv7jc/m12PdVJJhRJdB7PRhsl+KHD8Z33JMHazdR6P3VbNlzUeEZ5R8WX+eBQWaA==",
+      "version": "18.8.0",
+      "resolved": "https://npm.pkg.github.com/download/@secretkeylabs/xverse-core/18.8.0/ddb1e79eace136115e86ca0952613efb900e4501",
+      "integrity": "sha512-BgWjO5TQiHteiFqb5pAjxFcgU0mSo8XhT9CxXkWV3YnjEb+Z9l9MX0wTrJMKEwswyFpTE8WJEtKU3bWR4uuyJA==",
       "requires": {
         "@bitcoinerlab/secp256k1": "^1.0.2",
         "@noble/curves": "^1.2.0",
@@ -13782,14 +13857,14 @@
         "@scure/bip32": "^1.4.0",
         "@scure/bip39": "^1.3.0",
         "@scure/btc-signer": "1.2.1",
-        "@stacks/auth": "6.13.1",
+        "@stacks/auth": "6.16.1",
         "@stacks/connect": "7.7.1",
-        "@stacks/encryption": "6.13.1",
-        "@stacks/network": "6.13.0",
-        "@stacks/stacking": "6.13.2",
-        "@stacks/storage": "6.13.1",
-        "@stacks/transactions": "6.13.1",
-        "@stacks/wallet-sdk": "6.13.1",
+        "@stacks/encryption": "6.16.1",
+        "@stacks/network": "6.16.0",
+        "@stacks/stacking": "6.16.1",
+        "@stacks/storage": "6.16.1",
+        "@stacks/transactions": "6.16.1",
+        "@stacks/wallet-sdk": "6.16.1",
         "@tanstack/react-query": "^4.29.3",
         "@zondax/ledger-stacks": "^1.0.4",
         "async-mutex": "^0.4.0",
@@ -13906,22 +13981,22 @@
       }
     },
     "@stacks/auth": {
-      "version": "6.13.1",
-      "resolved": "https://registry.npmjs.org/@stacks/auth/-/auth-6.13.1.tgz",
-      "integrity": "sha512-nr5VeLIJBVI72eWYs/oQ7nrmuZxe89AlS5Lt/WxCcUDK9Z+oqQR1qsxBo86yVDlmrxoNWncHWD38LX54HsOEzA==",
-      "requires": {
-        "@stacks/common": "^6.13.0",
-        "@stacks/encryption": "^6.13.1",
-        "@stacks/network": "^6.13.0",
-        "@stacks/profile": "^6.13.1",
+      "version": "6.16.1",
+      "resolved": "https://registry.npmjs.org/@stacks/auth/-/auth-6.16.1.tgz",
+      "integrity": "sha512-6Co7VZTlfvWVKEYXh+x2TD1e+3XmCPumJut1jRgW6pYPGruZ4Dz/R4xfkf9qX3MEJabLe4AfasSfoqftg0twTg==",
+      "requires": {
+        "@stacks/common": "^6.16.0",
+        "@stacks/encryption": "^6.16.1",
+        "@stacks/network": "^6.16.0",
+        "@stacks/profile": "^6.16.1",
         "cross-fetch": "^3.1.5",
         "jsontokens": "^4.0.1"
       }
     },
     "@stacks/common": {
-      "version": "6.13.0",
-      "resolved": "https://registry.npmjs.org/@stacks/common/-/common-6.13.0.tgz",
-      "integrity": "sha512-wwzyihjaSdmL6NxKvDeayy3dqM0L0Q2sawmdNtzJDi0FnXuJGm5PeapJj7bEfcI9XwI7Bw5jZoC6mCn9nc5YIw==",
+      "version": "6.16.0",
+      "resolved": "https://registry.npmjs.org/@stacks/common/-/common-6.16.0.tgz",
+      "integrity": "sha512-PnzvhrdGRMVZvxTulitlYafSK4l02gPCBBoI9QEoTqgSnv62oaOXhYAUUkTMFKxdHW1seVEwZsrahuXiZPIAwg==",
       "requires": {
         "@types/bn.js": "^5.1.0",
         "@types/node": "^18.0.4"
@@ -13959,14 +14034,14 @@
       }
     },
     "@stacks/encryption": {
-      "version": "6.13.1",
-      "resolved": "https://registry.npmjs.org/@stacks/encryption/-/encryption-6.13.1.tgz",
-      "integrity": "sha512-y5IFX3/nGI3fCk70gE0JwH70GpshD8RhUfvhMLcL96oNaec1cCdj1ZUiQupeicfYTHuraaVBYU9xLls4TRmypg==",
+      "version": "6.16.1",
+      "resolved": "https://registry.npmjs.org/@stacks/encryption/-/encryption-6.16.1.tgz",
+      "integrity": "sha512-DtVNNW/iipyxxRDz73S9DbLfRmBMqQCCog89F1Q1i6JUnl2kBB1PR9SPQfYv9zcAJ37oHoNB4i4b2tJWYr01vg==",
       "requires": {
         "@noble/hashes": "1.1.5",
         "@noble/secp256k1": "1.7.1",
         "@scure/bip39": "1.1.0",
-        "@stacks/common": "^6.13.0",
+        "@stacks/common": "^6.16.0",
         "@types/node": "^18.0.4",
         "base64-js": "^1.5.1",
         "bs58": "^5.0.0",
@@ -13980,9 +14055,9 @@
           "integrity": "sha512-LTMZiiLc+V4v1Yi16TD6aX2gmtKszNye0pQgbaLqkvhIqP7nVsSaJsWloGQjJfJ8offaoP5GtX3yY5swbcJxxQ=="
         },
         "@types/node": {
-          "version": "18.19.31",
-          "resolved": "https://registry.npmjs.org/@types/node/-/node-18.19.31.tgz",
-          "integrity": "sha512-ArgCD39YpyyrtFKIqMDvjz79jto5fcI/SVUs2HwB+f0dAzq68yqOdyaSivLiLugSziTpNXLQrVb7RZFmdZzbhA==",
+          "version": "18.19.47",
+          "resolved": "https://registry.npmjs.org/@types/node/-/node-18.19.47.tgz",
+          "integrity": "sha512-1f7dB3BL/bpd9tnDJrrHb66Y+cVrhxSOTGorRNdHwYTUlTay3HuTDPKo9a/4vX9pMQkhYBcAbL4jQdNlhCFP9A==",
           "requires": {
             "undici-types": "~5.26.4"
           }
@@ -13990,39 +14065,39 @@
       }
     },
     "@stacks/network": {
-      "version": "6.13.0",
-      "resolved": "https://registry.npmjs.org/@stacks/network/-/network-6.13.0.tgz",
-      "integrity": "sha512-Ss/Da4BNyPBBj1OieM981fJ7SkevKqLPkzoI1+Yo7cYR2df+0FipIN++Z4RfpJpc8ne60vgcx7nJZXQsiGhKBQ==",
+      "version": "6.16.0",
+      "resolved": "https://registry.npmjs.org/@stacks/network/-/network-6.16.0.tgz",
+      "integrity": "sha512-uqz9Nb6uf+SeyCKENJN+idt51HAfEeggQKrOMfGjpAeFgZV2CR66soB/ci9+OVQR/SURvasncAz2ScI1blfS8A==",
       "requires": {
-        "@stacks/common": "^6.13.0",
+        "@stacks/common": "^6.16.0",
         "cross-fetch": "^3.1.5"
       }
     },
     "@stacks/profile": {
-      "version": "6.13.1",
-      "resolved": "https://registry.npmjs.org/@stacks/profile/-/profile-6.13.1.tgz",
-      "integrity": "sha512-GCDE13hwoUYZvZKTb5c0Tr74DcxIP/n4bffcYrKa5UabITPQ7JwsJIOyDoAwdtl3lu7fi9aBsKrdfHpBBUSQIQ==",
+      "version": "6.16.1",
+      "resolved": "https://registry.npmjs.org/@stacks/profile/-/profile-6.16.1.tgz",
+      "integrity": "sha512-FJcwKN6oVDfmwymivkZfm1PcO7gv5fcWN4HI+jtYdMftrl6yxAB4/XD63FSvshIeLPzBJjnCmaZSnPAV2mtdeA==",
       "requires": {
-        "@stacks/common": "^6.13.0",
-        "@stacks/network": "^6.13.0",
-        "@stacks/transactions": "^6.13.1",
+        "@stacks/common": "^6.16.0",
+        "@stacks/network": "^6.16.0",
+        "@stacks/transactions": "^6.16.1",
         "jsontokens": "^4.0.1",
         "schema-inspector": "^2.0.2",
         "zone-file": "^2.0.0-beta.3"
       }
     },
     "@stacks/stacking": {
-      "version": "6.13.2",
-      "resolved": "https://registry.npmjs.org/@stacks/stacking/-/stacking-6.13.2.tgz",
-      "integrity": "sha512-4h1UQuL2+Xdra9zMqzUElvKG9X9fenuNE7hD9sIqyxyLFxeQ7gRqczmTYPsmaj4wY5004JNj+efzGJ0VmpOcAA==",
+      "version": "6.16.1",
+      "resolved": "https://registry.npmjs.org/@stacks/stacking/-/stacking-6.16.1.tgz",
+      "integrity": "sha512-Bv7TSyoMrb1wYOfKrPxwDQPSjsohyKCduN1HYMlKL9hHF0J8+MvlJFw9eIj1c2SEOyYaElT+Ly3CI56J/acVxw==",
       "requires": {
         "@noble/hashes": "1.1.5",
         "@scure/base": "1.1.1",
-        "@stacks/common": "^6.13.0",
-        "@stacks/encryption": "^6.13.1",
-        "@stacks/network": "^6.13.0",
+        "@stacks/common": "^6.16.0",
+        "@stacks/encryption": "^6.16.1",
+        "@stacks/network": "^6.16.0",
         "@stacks/stacks-blockchain-api-types": "^0.61.0",
-        "@stacks/transactions": "^6.13.1",
+        "@stacks/transactions": "^6.16.1",
         "bs58": "^5.0.0"
       },
       "dependencies": {
@@ -14049,27 +14124,27 @@
       "integrity": "sha512-Mw5dBPx3DySPupwaq0iBdm1WdEVXIfhjUVaTjI2iSyzWz4Fgs3U7JCaAezLbgNu7Q69c/ZN4JUDWuo9FVjy7oA=="
     },
     "@stacks/storage": {
-      "version": "6.13.1",
-      "resolved": "https://registry.npmjs.org/@stacks/storage/-/storage-6.13.1.tgz",
-      "integrity": "sha512-XnzRAETDKW7Ij3cuUNllrrnLOCwctV/XrIHgVWnD04LNL5R9apkwp9IkzaFbyJZ+XrkUBKwtdCgVYype2XgT6w==",
-      "requires": {
-        "@stacks/auth": "^6.13.1",
-        "@stacks/common": "^6.13.0",
-        "@stacks/encryption": "^6.13.1",
-        "@stacks/network": "^6.13.0",
+      "version": "6.16.1",
+      "resolved": "https://registry.npmjs.org/@stacks/storage/-/storage-6.16.1.tgz",
+      "integrity": "sha512-bElxB03dg3XGTX8r/J8Os2tIsodcTglg7zeq6RU4FVUU7tUA+Agpmn9FKl8MmnsWfO4ls5UgeujyBaxUJ//yAw==",
+      "requires": {
+        "@stacks/auth": "^6.16.1",
+        "@stacks/common": "^6.16.0",
+        "@stacks/encryption": "^6.16.1",
+        "@stacks/network": "^6.16.0",
         "base64-js": "^1.5.1",
         "jsontokens": "^4.0.1"
       }
     },
     "@stacks/transactions": {
-      "version": "6.13.1",
-      "resolved": "https://registry.npmjs.org/@stacks/transactions/-/transactions-6.13.1.tgz",
-      "integrity": "sha512-PWw2I+2Fj3CaFYQIoVcqQN6E2qGHNhFv03nuR0CxMq0sx8stPgYZbdzUlnlBcJQdsFiHrw3sPeqnXDZt+Hg5YQ==",
+      "version": "6.16.1",
+      "resolved": "https://registry.npmjs.org/@stacks/transactions/-/transactions-6.16.1.tgz",
+      "integrity": "sha512-yCtUM+8IN0QJbnnlFhY1wBW7Q30Cxje3Zmy8DgqdBoM/EPPWadez/8wNWFANVAMyUZeQ9V/FY+8MAw4E+pCReA==",
       "requires": {
         "@noble/hashes": "1.1.5",
         "@noble/secp256k1": "1.7.1",
-        "@stacks/common": "^6.13.0",
-        "@stacks/network": "^6.13.0",
+        "@stacks/common": "^6.16.0",
+        "@stacks/network": "^6.16.0",
         "c32check": "^2.0.0",
         "lodash.clonedeep": "^4.5.0"
       },
@@ -14082,19 +14157,19 @@
       }
     },
     "@stacks/wallet-sdk": {
-      "version": "6.13.1",
-      "resolved": "https://registry.npmjs.org/@stacks/wallet-sdk/-/wallet-sdk-6.13.1.tgz",
-      "integrity": "sha512-262CYKAm1j8oVxfGUIJrHp867j9gm5NrqPM85s0TfCv2QhfLDkvme6nKgmvtL2TecAZkBa5tu8M5DQ7z92WvAQ==",
+      "version": "6.16.1",
+      "resolved": "https://registry.npmjs.org/@stacks/wallet-sdk/-/wallet-sdk-6.16.1.tgz",
+      "integrity": "sha512-QYm/BfRpHZfD5FjvaOJp0hy8yeqde6qrEmSrcIl06IC2SNr4R5NOy0xK/RPUgJFB1/Gd16HbqS9EdyV3o6ybwg==",
       "requires": {
         "@scure/bip32": "1.1.3",
         "@scure/bip39": "1.1.0",
-        "@stacks/auth": "^6.13.1",
-        "@stacks/common": "^6.13.0",
-        "@stacks/encryption": "^6.13.1",
-        "@stacks/network": "^6.13.0",
-        "@stacks/profile": "^6.13.1",
-        "@stacks/storage": "^6.13.1",
-        "@stacks/transactions": "^6.13.1",
+        "@stacks/auth": "^6.16.1",
+        "@stacks/common": "^6.16.0",
+        "@stacks/encryption": "^6.16.1",
+        "@stacks/network": "^6.16.0",
+        "@stacks/profile": "^6.16.1",
+        "@stacks/storage": "^6.16.1",
+        "@stacks/transactions": "^6.16.1",
         "buffer": "6.0.3",
         "c32check": "^2.0.0",
         "jsontokens": "^4.0.1",
@@ -14967,9 +15042,9 @@
           }
         },
         "@types/node": {
-          "version": "18.19.42",
-          "resolved": "https://registry.npmjs.org/@types/node/-/node-18.19.42.tgz",
-          "integrity": "sha512-d2ZFc/3lnK2YCYhos8iaNIYu9Vfhr92nHiyJHRltXWjXUBjEE+A4I58Tdbnw4VhggSW+2j5y5gTrLs4biNnubg==",
+          "version": "18.19.47",
+          "resolved": "https://registry.npmjs.org/@types/node/-/node-18.19.47.tgz",
+          "integrity": "sha512-1f7dB3BL/bpd9tnDJrrHb66Y+cVrhxSOTGorRNdHwYTUlTay3HuTDPKo9a/4vX9pMQkhYBcAbL4jQdNlhCFP9A==",
           "requires": {
             "undici-types": "~5.26.4"
           }
@@ -22001,9 +22076,9 @@
       "requires": {}
     },
     "uglify-js": {
-      "version": "3.19.1",
-      "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.19.1.tgz",
-      "integrity": "sha512-y/2wiW+ceTYR2TSSptAhfnEtpLaQ4Ups5zrjB2d3kuVxHj16j/QJwPl5PvuGy9uARb39J0+iKxcRPvtpsx4A4A=="
+      "version": "3.19.2",
+      "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.19.2.tgz",
+      "integrity": "sha512-S8KA6DDI47nQXJSi2ctQ629YzwOVs+bQML6DAtvy0wgNdpi+0ySpQK0g2pxBq2xfF2z3YCscu7NNA8nXT9PlIQ=="
     },
     "unbox-primitive": {
       "version": "1.0.2",
diff --git a/package.json b/package.json
index 770833278..330e06879 100644
--- a/package.json
+++ b/package.json
@@ -43,10 +43,10 @@
     "@react-spring/web": "^9.6.1",
     "@sats-connect/core": "0.2.1",
     "@scure/btc-signer": "1.2.1",
-    "@secretkeylabs/xverse-core": "18.7.2",
+    "@secretkeylabs/xverse-core": "18.8.0",
     "@stacks/connect": "7.4.1",
     "@stacks/stacks-blockchain-api-types": "6.1.1",
-    "@stacks/transactions": "6.13.1",
+    "@stacks/transactions": "6.16.1",
     "@tanstack/query-sync-storage-persister": "^4.29.1",
     "@tanstack/react-query": "^4.29.3",
     "@tanstack/react-query-devtools": "^4.29.3",
diff --git a/src/app/components/confirmStxTransactionComponent/index.tsx b/src/app/components/confirmStxTransactionComponent/index.tsx
index e1c4c6531..5b53921cf 100644
--- a/src/app/components/confirmStxTransactionComponent/index.tsx
+++ b/src/app/components/confirmStxTransactionComponent/index.tsx
@@ -18,6 +18,7 @@ import {
   getNonce,
   getStxFiatEquivalent,
   microstacksToStx,
+  possiblNexteNonce,
   signLedgerStxTransaction,
   signMultiStxTransactions,
   signTransaction,
@@ -99,7 +100,7 @@ function ConfirmStxTransactionComponent({
   const { getSeed } = useSeedVault();
   const [showFeeSettings, setShowFeeSettings] = useState(false);
   const selectedAccount = useSelectedAccount();
-  const { feeMultipliers, fiatCurrency } = useWalletSelector();
+  const { feeMultipliers, fiatCurrency, network } = useWalletSelector();
   const [openTransactionSettingModal, setOpenTransactionSettingModal] = useState(false);
   const [buttonLoading, setButtonLoading] = useState(loading);
   const [isModalVisible, setIsModalVisible] = useState(false);
@@ -220,8 +221,11 @@ function ConfirmStxTransactionComponent({
     }
 
     if (initialStxTransactions.length === 1) {
+      const transaction = initialStxTransactions[0];
+      const nonce = await possiblNexteNonce(selectedAccount.stxAddress, network);
+      transaction.setNonce(nonce);
       const signedContractCall = await signTransaction(
-        initialStxTransactions[0],
+        transaction,
         seed,
         selectedAccount?.id ?? 0,
         selectedNetwork,
diff --git a/src/app/screens/mintRune/index.tsx b/src/app/screens/mintRune/index.tsx
index 69c43d161..019ae1c96 100644
--- a/src/app/screens/mintRune/index.tsx
+++ b/src/app/screens/mintRune/index.tsx
@@ -81,6 +81,7 @@ function MintRune() {
             receipts: [],
             transfers: [],
             mint: {
+              runeId: runeInfo.id,
               runeName: runeInfo.entry.spaced_rune,
               amount: BigInt(runeInfo.entry.terms.amount?.toNumber() ?? 0),
               divisibility: runeInfo.entry.divisibility.toNumber(),

From f8276766528c3090d2e600b0911b2c7721f71a0c Mon Sep 17 00:00:00 2001
From: Terence Ng <ngtere@live.com.sg>
Date: Thu, 29 Aug 2024 22:08:36 +0800
Subject: [PATCH 047/227] Rune Fiat Amount Selector (#533)

* commit fix

* commit fixes

* fix state

* remove redundant code

* fix lock

* commit new method using query

* touchup conditional

* resolve

* fix up logic

---------

Co-authored-by: Den <36603049+dhriaznov@users.noreply.github.com>
---
 .../itemRow/runeAmount.tsx                    |  31 ++--
 .../queries/runes/useRuneFiatRateQuery.ts     |  27 +++
 src/app/screens/listRune/index.tsx            |  36 +++-
 src/app/screens/listRune/reducer.tsx          |  12 +-
 .../screens/listRune/setCustomPriceModal.tsx  |  14 +-
 src/app/screens/mintRune/index.tsx            |   2 +-
 src/app/screens/sendRune/amountSelector.tsx   |   6 +
 src/app/screens/sendRune/index.tsx            |   3 +
 .../screens/sendRune/runeAmountSelector.tsx   | 155 +++++++++++++++---
 src/app/screens/sendRune/stepDisplay.tsx      |   6 +
 10 files changed, 246 insertions(+), 46 deletions(-)
 create mode 100644 src/app/hooks/queries/runes/useRuneFiatRateQuery.ts

diff --git a/src/app/components/confirmBtcTransaction/itemRow/runeAmount.tsx b/src/app/components/confirmBtcTransaction/itemRow/runeAmount.tsx
index 76aa9d1ad..3c88ac06f 100644
--- a/src/app/components/confirmBtcTransaction/itemRow/runeAmount.tsx
+++ b/src/app/components/confirmBtcTransaction/itemRow/runeAmount.tsx
@@ -1,8 +1,12 @@
 import { mapRuneNameToPlaceholder } from '@components/confirmBtcTransaction/utils';
+import { StyledFiatAmountText } from '@components/fiatAmountText';
 import TokenImage from '@components/tokenImage';
+import useRuneFiatRateQuery from '@hooks/queries/runes/useRuneFiatRateQuery';
+import useWalletSelector from '@hooks/useWalletSelector';
 import type { RuneBase } from '@secretkeylabs/xverse-core';
 import { StyledP } from '@ui-library/common.styled';
 import { ftDecimals } from '@utils/helper';
+import BigNumber from 'bignumber.js';
 import { useTranslation } from 'react-i18next';
 import { NumericFormat } from 'react-number-format';
 import styled from 'styled-components';
@@ -36,11 +40,6 @@ const Column = styled.div`
   overflow: hidden;
 `;
 
-const StyledPRight = styled(StyledP)`
-  word-break: break-all;
-  text-align: end;
-`;
-
 type Props = {
   rune: RuneBase;
   hasSufficientBalance?: boolean;
@@ -55,6 +54,8 @@ export default function RuneAmount({
   const { t } = useTranslation('translation', { keyPrefix: 'CONFIRM_TRANSACTION' });
   const { runeName, amount, divisibility, symbol, inscriptionId } = rune;
   const amountWithDecimals = ftDecimals(String(amount), divisibility);
+  const { fiatCurrency } = useWalletSelector();
+  const { data: runeFiatRate } = useRuneFiatRateQuery(rune);
   return (
     <Container topMargin={topMargin}>
       <AvatarContainer>
@@ -77,19 +78,29 @@ export default function RuneAmount({
             thousandSeparator
             suffix={` ${symbol}`}
             renderText={(value: string) => (
-              <StyledPRight
+              <StyledP
                 data-testid="send-rune-amount"
                 typography="body_medium_m"
                 color={hasSufficientBalance ? 'white_0' : 'danger_light'}
               >
                 {value}
-              </StyledPRight>
+              </StyledP>
             )}
           />
         </Row>
-        <StyledP data-testid="rune-name" typography="body_medium_s" color="white_400">
-          {runeName}
-        </StyledP>
+        <Row>
+          <StyledP data-testid="rune-name" typography="body_medium_s" color="white_400">
+            {runeName}
+          </StyledP>
+          {typeof runeFiatRate === 'number' && runeFiatRate > 0 && (
+            <StyledFiatAmountText
+              fiatAmount={
+                new BigNumber(BigNumber(amountWithDecimals).multipliedBy(runeFiatRate).toFixed(2))
+              }
+              fiatCurrency={fiatCurrency}
+            />
+          )}
+        </Row>
       </Column>
     </Container>
   );
diff --git a/src/app/hooks/queries/runes/useRuneFiatRateQuery.ts b/src/app/hooks/queries/runes/useRuneFiatRateQuery.ts
new file mode 100644
index 000000000..0526db632
--- /dev/null
+++ b/src/app/hooks/queries/runes/useRuneFiatRateQuery.ts
@@ -0,0 +1,27 @@
+import useRunesApi from '@hooks/apiClients/useRunesApi';
+import { useRuneFungibleTokensQuery } from '@hooks/queries/runes/useRuneFungibleTokensQuery';
+import useWalletSelector from '@hooks/useWalletSelector';
+import type { RuneBase } from '@secretkeylabs/xverse-core';
+import { useQuery } from '@tanstack/react-query';
+import { useCallback } from 'react';
+
+export default function useRuneFiatRateQuery(rune: RuneBase) {
+  const { fiatCurrency } = useWalletSelector();
+  const { data: runesCoinsList } = useRuneFungibleTokensQuery();
+  const runesApi = useRunesApi();
+  const queryFn = useCallback(async (): Promise<number> => {
+    if (runesCoinsList) {
+      const fungibleToken = runesCoinsList.find((coin) => coin.principal === rune.runeId);
+      if (fungibleToken && fungibleToken.tokenFiatRate) {
+        return fungibleToken.tokenFiatRate;
+      }
+    }
+    const runeFiatRates = await runesApi.getRuneFiatRatesByRuneIds([rune.runeId], fiatCurrency);
+    return runeFiatRates[rune.runeId]?.[fiatCurrency] ?? 0;
+  }, [runesCoinsList, runesApi, rune.runeId, fiatCurrency]);
+  return useQuery({
+    queryKey: ['get-rune-fiat-rate', rune.runeId, fiatCurrency],
+    enabled: Boolean(rune),
+    queryFn,
+  });
+}
diff --git a/src/app/screens/listRune/index.tsx b/src/app/screens/listRune/index.tsx
index cbfa4fe0f..258a5d06c 100644
--- a/src/app/screens/listRune/index.tsx
+++ b/src/app/screens/listRune/index.tsx
@@ -418,7 +418,13 @@ export default function ListRuneScreen() {
                       <StyledButton
                         title="Custom"
                         onClick={() =>
-                          dispatch({ type: 'SET_TOGGLE_CUSTOM_PRICE_MODAL', payload: true })
+                          dispatch({
+                            type: 'SET_TOGGLE_CUSTOM_PRICE_MODAL',
+                            payload: {
+                              title: t('SET_PRICES'),
+                              visible: true,
+                            },
+                          })
                         }
                         variant={
                           runePriceOption === 'custom' && !individualCustomPriceUsed
@@ -458,7 +464,13 @@ export default function ListRuneScreen() {
                             }
                             handleShowCustomPriceModal={() => {
                               dispatch({ type: 'SET_INDIVIDUAL_CUSTOM_ITEM', payload: fullTxId });
-                              dispatch({ type: 'SET_TOGGLE_CUSTOM_PRICE_MODAL', payload: true });
+                              dispatch({
+                                type: 'SET_TOGGLE_CUSTOM_PRICE_MODAL',
+                                payload: {
+                                  title: t('EDIT_PRICE'),
+                                  visible: true,
+                                },
+                              });
                             }}
                           />
                         ))}
@@ -539,8 +551,8 @@ export default function ListRuneScreen() {
                 </PaddingContainer>
                 <SetCustomPriceModal
                   runeSymbol={selectedRune?.runeSymbol ?? ''}
-                  visible={toggleCustomPriceModal}
-                  title={t('EDIT_PRICE')}
+                  visible={toggleCustomPriceModal.visible}
+                  title={toggleCustomPriceModal.title}
                   floorPriceSats={runeFloorPrice}
                   minPriceSats={
                     individualCustomItem
@@ -554,7 +566,13 @@ export default function ListRuneScreen() {
                   }
                   onClose={() => {
                     dispatch({ type: 'SET_INDIVIDUAL_CUSTOM_ITEM', payload: null });
-                    dispatch({ type: 'SET_TOGGLE_CUSTOM_PRICE_MODAL', payload: false });
+                    dispatch({
+                      type: 'SET_TOGGLE_CUSTOM_PRICE_MODAL',
+                      payload: {
+                        ...toggleCustomPriceModal,
+                        visible: false,
+                      },
+                    });
                   }}
                   onApplyPrice={(priceSats: number) => {
                     if (individualCustomItem) {
@@ -565,7 +583,13 @@ export default function ListRuneScreen() {
                       dispatch({ type: 'SET_RUNE_PRICE_OPTION', payload: 'custom' });
                     }
                     dispatch({ type: 'SET_INDIVIDUAL_CUSTOM_ITEM', payload: null });
-                    dispatch({ type: 'SET_TOGGLE_CUSTOM_PRICE_MODAL', payload: false });
+                    dispatch({
+                      type: 'SET_TOGGLE_CUSTOM_PRICE_MODAL',
+                      payload: {
+                        ...toggleCustomPriceModal,
+                        visible: false,
+                      },
+                    });
                   }}
                 />
               </>
diff --git a/src/app/screens/listRune/reducer.tsx b/src/app/screens/listRune/reducer.tsx
index 3867f8d45..bbc1454c0 100644
--- a/src/app/screens/listRune/reducer.tsx
+++ b/src/app/screens/listRune/reducer.tsx
@@ -7,7 +7,10 @@ interface ListRunesState {
   runePriceOption: 1 | 1.05 | 1.1 | 1.2 | 'custom';
   customRunePrice: number | null;
   individualCustomItem: string | null;
-  toggleCustomPriceModal: boolean;
+  toggleCustomPriceModal: {
+    title: string;
+    visible: boolean;
+  };
 }
 
 type Action =
@@ -20,7 +23,7 @@ type Action =
   | { type: 'SET_RUNE_PRICE_OPTION'; payload: 1 | 1.05 | 1.1 | 1.2 | 'custom' }
   | { type: 'SET_CUSTOM_RUNE_PRICE'; payload: number | null }
   | { type: 'SET_INDIVIDUAL_CUSTOM_ITEM'; payload: string | null }
-  | { type: 'SET_TOGGLE_CUSTOM_PRICE_MODAL'; payload: boolean }
+  | { type: 'SET_TOGGLE_CUSTOM_PRICE_MODAL'; payload: { title: string; visible: boolean } }
   | { type: 'RESTORE_STATE_FROM_PSBT'; payload: ListRunesState };
 
 export const initialListRunesState: ListRunesState = {
@@ -30,7 +33,10 @@ export const initialListRunesState: ListRunesState = {
   runePriceOption: 1,
   customRunePrice: null,
   individualCustomItem: null,
-  toggleCustomPriceModal: false,
+  toggleCustomPriceModal: {
+    title: '',
+    visible: false,
+  },
 };
 
 export function ListRunesReducer(state: ListRunesState, action: Action): ListRunesState {
diff --git a/src/app/screens/listRune/setCustomPriceModal.tsx b/src/app/screens/listRune/setCustomPriceModal.tsx
index 09e1853ee..bbd8f094d 100644
--- a/src/app/screens/listRune/setCustomPriceModal.tsx
+++ b/src/app/screens/listRune/setCustomPriceModal.tsx
@@ -4,7 +4,7 @@ import { StyledP } from '@ui-library/common.styled';
 import Input from '@ui-library/input';
 import Sheet from '@ui-library/sheet';
 import { formatToXDecimalPlaces } from '@utils/helper';
-import { useState } from 'react';
+import { useMemo, useState } from 'react';
 import { useTranslation } from 'react-i18next';
 import styled from 'styled-components';
 
@@ -61,6 +61,17 @@ function SetCustomPriceModal({
   const lowError: boolean = priceSats.length !== 0 && Number(priceSats) < minPriceSats;
   const highError: boolean = priceSats.length !== 0 && Number(priceSats) > maxPriceSats;
 
+  const inputFeedback = useMemo(() => {
+    if (lowError || highError) {
+      return [
+        {
+          variant: 'danger' as const,
+          message: '',
+        },
+      ];
+    }
+  }, [highError, lowError]);
+
   return (
     <Sheet
       visible={visible}
@@ -92,6 +103,7 @@ function SetCustomPriceModal({
                 sats/{runeSymbol}
               </StyledP>
             }
+            feedback={inputFeedback}
             hideClear
             autoFocus
           />
diff --git a/src/app/screens/mintRune/index.tsx b/src/app/screens/mintRune/index.tsx
index 019ae1c96..134ccb7c8 100644
--- a/src/app/screens/mintRune/index.tsx
+++ b/src/app/screens/mintRune/index.tsx
@@ -81,8 +81,8 @@ function MintRune() {
             receipts: [],
             transfers: [],
             mint: {
-              runeId: runeInfo.id,
               runeName: runeInfo.entry.spaced_rune,
+              runeId: runeInfo.id,
               amount: BigInt(runeInfo.entry.terms.amount?.toNumber() ?? 0),
               divisibility: runeInfo.entry.divisibility.toNumber(),
               symbol: runeInfo.entry.symbol,
diff --git a/src/app/screens/sendRune/amountSelector.tsx b/src/app/screens/sendRune/amountSelector.tsx
index 2be6d04f1..877d2a9bf 100644
--- a/src/app/screens/sendRune/amountSelector.tsx
+++ b/src/app/screens/sendRune/amountSelector.tsx
@@ -31,6 +31,8 @@ type Props = {
   token: FungibleToken;
   amountToSend: string;
   setAmountToSend: (amount: string) => void;
+  useTokenValue: boolean;
+  setUseTokenValue: (toggle: boolean) => void;
   amountError: string;
   feeRate: string;
   setFeeRate: (feeRate: string) => void;
@@ -49,6 +51,8 @@ function AmountSelector({
   token,
   amountToSend,
   setAmountToSend,
+  useTokenValue,
+  setUseTokenValue,
   amountError,
   feeRate,
   setFeeRate,
@@ -86,6 +90,8 @@ function AmountSelector({
           token={token}
           amountToSend={amountToSend}
           setAmountToSend={setAmountToSend}
+          useTokenValue={useTokenValue}
+          setUseTokenValue={setUseTokenValue}
           amountError={amountError}
           sendMax={sendMax}
           setSendMax={setSendMax}
diff --git a/src/app/screens/sendRune/index.tsx b/src/app/screens/sendRune/index.tsx
index 842e4ac33..7507b4c22 100644
--- a/src/app/screens/sendRune/index.tsx
+++ b/src/app/screens/sendRune/index.tsx
@@ -42,6 +42,7 @@ function SendRuneScreen() {
   );
   const [amountError, setAmountError] = useState('');
   const [amountToSend, setAmountToSend] = useState<string>(location.state?.amount || '');
+  const [useTokenValue, setUseTokenValue] = useState(true);
   const [feeRate, setFeeRate] = useState('');
   const [sendMax, setSendMax] = useState(false);
   const [currentStep, setCurrentStep] = useState<Step>(Step.SelectRecipient);
@@ -235,6 +236,8 @@ function SendRuneScreen() {
       token={fungibleToken}
       amountToSend={amountToSend}
       setAmountToSend={setAmount}
+      useTokenValue={useTokenValue}
+      setUseTokenValue={setUseTokenValue}
       amountError={amountError}
       currentStep={currentStep}
       setCurrentStep={setCurrentStep}
diff --git a/src/app/screens/sendRune/runeAmountSelector.tsx b/src/app/screens/sendRune/runeAmountSelector.tsx
index e99fc02f3..fea1e4543 100644
--- a/src/app/screens/sendRune/runeAmountSelector.tsx
+++ b/src/app/screens/sendRune/runeAmountSelector.tsx
@@ -1,26 +1,58 @@
-import type { FungibleToken } from '@secretkeylabs/xverse-core';
-import Input, { MaxButton, VertRule } from '@ui-library/input';
-import { getFtBalance } from '@utils/tokens';
-import { useEffect } from 'react';
+import FiatAmountText from '@components/fiatAmountText';
+import useWalletSelector from '@hooks/useWalletSelector';
+import { ArrowsDownUp } from '@phosphor-icons/react';
+import { currencySymbolMap, type FungibleToken } from '@secretkeylabs/xverse-core';
+import { StyledP } from '@ui-library/common.styled';
+import Input, { ConvertComplication, MaxButton, VertRule } from '@ui-library/input';
+import { ftDecimals } from '@utils/helper';
+import { getFtTicker } from '@utils/tokens';
+import BigNumber from 'bignumber.js';
+import { useEffect, useState } from 'react';
 import { useTranslation } from 'react-i18next';
 import { NumericFormat } from 'react-number-format';
 import styled from 'styled-components';
+import Theme from 'theme';
+
+const BalanceTextWrapper = styled.div`
+  text-align: right;
+`;
 
 const BalanceText = styled.span`
   ${(props) => props.theme.typography.body_medium_m}
   color: ${(props) => props.theme.colors.white_200};
 `;
 
-const BalanceDiv = styled.div`
-  white-space: nowrap;
-  overflow: hidden;
-  text-overflow: ellipsis;
+const AmountText = styled(StyledP)`
+  margin-right: ${(props) => props.theme.space.xxs};
+`;
+
+const StyledFiatAmountText = styled(FiatAmountText)`
+  ${(props) => props.theme.typography.body_medium_s}
+  color: ${(props) => props.theme.colors.white_200};
 `;
 
+const fiatInputValidator = /^[0-9]+[.]?[0-9]{0,2}$/;
+const tokenInputValidator = (decimals: number) => {
+  // If no decimals are allowed, only allow whole numbers (no decimal point)
+  if (decimals === 0) {
+    return /^[0-9]*$/; // Match only whole numbers
+  }
+  // Otherwise, allow numbers with the specified number of decimal places
+  return new RegExp(`^[0-9]+([.][0-9]{0,${decimals}})?$`);
+};
+
+const getTokenFiatEquivalent = (amount: BigNumber, fungibleToken: FungibleToken): BigNumber =>
+  amount.multipliedBy(fungibleToken.tokenFiatRate ?? 0);
+
+const getFiatTokenEquivalent = (fiatAmount: BigNumber, fungibleToken: FungibleToken): BigNumber =>
+  fiatAmount.dividedBy(fungibleToken.tokenFiatRate ?? 1);
+
 type Props = {
   token: FungibleToken;
   amountToSend: string;
   setAmountToSend: (amount: string) => void;
+  useTokenValue: boolean;
+  setUseTokenValue: (toggle: boolean) => void;
   sendMax: boolean;
   setSendMax: (sendMax: boolean) => void;
   amountError: string;
@@ -30,26 +62,68 @@ function RuneAmountSelector({
   token,
   amountToSend,
   setAmountToSend,
+  useTokenValue,
+  setUseTokenValue,
   sendMax,
   setSendMax,
   amountError,
 }: Props) {
   const { t } = useTranslation('translation', { keyPrefix: 'SEND' });
-  // construct regex based on runes divisibility (decimals)
-  const tokenInputValidator = new RegExp(`^(?:[0-9]+(?:\\.[0-9]{0,${token.decimals}})?)?$`);
-  const balance = getFtBalance(token);
+  const { fiatCurrency } = useWalletSelector();
+  const [displayAmount, setDisplayAmount] = useState(amountToSend);
+  const tokenDecimals = Number(token.decimals ?? 0);
+  const tokenBalance = new BigNumber(ftDecimals(token.balance, tokenDecimals));
+  const displayBalance = useTokenValue
+    ? Number(tokenBalance)
+    : getTokenFiatEquivalent(tokenBalance, token).toNumber().toFixed(2);
 
   useEffect(() => {
-    if (sendMax) {
-      setAmountToSend(String(balance));
-    }
-  }, [sendMax]); // eslint-disable-line react-hooks/exhaustive-deps
+    if (!sendMax) return;
+    setDisplayAmount(
+      useTokenValue
+        ? tokenBalance.toString()
+        : getTokenFiatEquivalent(tokenBalance, token).toNumber().toFixed(2),
+    );
+    setAmountToSend(tokenBalance.toString());
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, [sendMax]);
 
   const handleAmountChange = (newAmount: string) => {
-    const isValidInput = tokenInputValidator.test(newAmount);
-    if (isValidInput) {
-      setAmountToSend(newAmount);
+    if (!newAmount) {
+      setAmountToSend('0');
+      setDisplayAmount('');
       setSendMax(false);
+      return;
+    }
+    const isValidInput = useTokenValue
+      ? tokenInputValidator(tokenDecimals).test(newAmount)
+      : fiatInputValidator.test(newAmount);
+
+    if (!isValidInput) return;
+    setDisplayAmount(newAmount);
+    setSendMax(false);
+    if (useTokenValue) {
+      setAmountToSend(BigNumber(newAmount).toString());
+    } else {
+      // strip to exact decimals the rune support
+      const runeAmount = getFiatTokenEquivalent(BigNumber(newAmount), token)
+        .toNumber()
+        .toFixed(tokenDecimals);
+      setAmountToSend(runeAmount);
+    }
+  };
+
+  const handleUseTokenValueChange = () => {
+    const shouldUseTokenValue = !useTokenValue;
+    setUseTokenValue(shouldUseTokenValue);
+    if (!displayAmount || Number.isNaN(+displayAmount)) return;
+    if (shouldUseTokenValue) {
+      setDisplayAmount(amountToSend);
+    } else {
+      const fiatAmount = getTokenFiatEquivalent(BigNumber(amountToSend), token)
+        .toNumber()
+        .toFixed(2);
+      setDisplayAmount(fiatAmount);
     }
   };
 
@@ -57,19 +131,50 @@ function RuneAmountSelector({
 
   return (
     <Input
-      title={t('AMOUNT', { currency: token.ticker })}
-      dataTestID="send-input"
-      value={amountToSend}
+      title={t('BTC.AMOUNT', { currency: useTokenValue ? getFtTicker(token) : fiatCurrency })}
+      value={displayAmount}
       onChange={(e) => handleAmountChange(e.target.value)}
       placeholder="0"
       infoPanel={
-        <BalanceDiv data-testid="balance-label">
-          <BalanceText>{t('BALANCE')} </BalanceText>
-          <NumericFormat value={balance} displayType="text" thousandSeparator />
-        </BalanceDiv>
+        <NumericFormat
+          value={displayBalance}
+          displayType="text"
+          thousandSeparator
+          prefix={useTokenValue ? '' : `~ ${currencySymbolMap[fiatCurrency]}`}
+          renderText={(value: string) => (
+            <BalanceTextWrapper data-testid="balance-label">
+              <BalanceText>{t('BALANCE')}</BalanceText> {value}{' '}
+              {useTokenValue ? getFtTicker(token) : fiatCurrency}
+            </BalanceTextWrapper>
+          )}
+        />
       }
       complications={
         <>
+          {token.tokenFiatRate && (
+            <ConvertComplication onClick={handleUseTokenValueChange}>
+              {useTokenValue ? (
+                <StyledFiatAmountText
+                  fiatAmount={getTokenFiatEquivalent(BigNumber(amountToSend), token)}
+                  fiatCurrency={fiatCurrency}
+                />
+              ) : (
+                <NumericFormat
+                  value={Number(amountToSend)}
+                  displayType="text"
+                  thousandSeparator
+                  renderText={(value: string) => (
+                    <div>
+                      <AmountText typography="body_medium_s" color="white_200">
+                        {value} {getFtTicker(token)}
+                      </AmountText>
+                    </div>
+                  )}
+                />
+              )}
+              <ArrowsDownUp size={16} color={Theme.colors.white_200} />
+            </ConvertComplication>
+          )}
           <VertRule />
           <MaxButton disabled={sendMax} onClick={handleMaxClick}>
             MAX
diff --git a/src/app/screens/sendRune/stepDisplay.tsx b/src/app/screens/sendRune/stepDisplay.tsx
index 7d8d9fe57..34335609d 100644
--- a/src/app/screens/sendRune/stepDisplay.tsx
+++ b/src/app/screens/sendRune/stepDisplay.tsx
@@ -34,6 +34,8 @@ type Props = {
   runeSummary: RuneSummary | undefined;
   amountToSend: string;
   setAmountToSend: (amount: string) => void;
+  useTokenValue: boolean;
+  setUseTokenValue: (toggle: boolean) => void;
   amountError: string;
   currentStep: Step;
   setCurrentStep: (step: Step) => void;
@@ -57,6 +59,8 @@ function StepDisplay({
   runeSummary,
   amountToSend,
   setAmountToSend,
+  useTokenValue,
+  setUseTokenValue,
   amountError,
   currentStep,
   setCurrentStep,
@@ -106,6 +110,8 @@ function StepDisplay({
               header={header}
               amountToSend={amountToSend}
               setAmountToSend={setAmountToSend}
+              useTokenValue={useTokenValue}
+              setUseTokenValue={setUseTokenValue}
               amountError={amountError}
               feeRate={feeRate}
               setFeeRate={setFeeRate}

From 85c7f7512142dd10f32016ed1676d9c59a07f41d Mon Sep 17 00:00:00 2001
From: Terence Ng <ngtere@live.com.sg>
Date: Thu, 29 Aug 2024 22:35:17 +0800
Subject: [PATCH 048/227] Terence/fix bug (#539)

* commit fix

* fix bug
---
 src/app/components/confirmBtcTransaction/itemRow/runeAmount.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/app/components/confirmBtcTransaction/itemRow/runeAmount.tsx b/src/app/components/confirmBtcTransaction/itemRow/runeAmount.tsx
index 3c88ac06f..97d9bf939 100644
--- a/src/app/components/confirmBtcTransaction/itemRow/runeAmount.tsx
+++ b/src/app/components/confirmBtcTransaction/itemRow/runeAmount.tsx
@@ -92,7 +92,7 @@ export default function RuneAmount({
           <StyledP data-testid="rune-name" typography="body_medium_s" color="white_400">
             {runeName}
           </StyledP>
-          {typeof runeFiatRate === 'number' && runeFiatRate > 0 && (
+          {runeFiatRate !== undefined && runeFiatRate > 0 && (
             <StyledFiatAmountText
               fiatAmount={
                 new BigNumber(BigNumber(amountWithDecimals).multipliedBy(runeFiatRate).toFixed(2))

From ce90e01c3f44840ec56b6d5c4924d6e5b4827583 Mon Sep 17 00:00:00 2001
From: fede erbes <fedeerbes@gmail.com>
Date: Thu, 29 Aug 2024 16:35:35 +0200
Subject: [PATCH 049/227] fix: version (#538)

---
 package-lock.json | 4 ++--
 package.json      | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 7efd6dc38..3a18c7e62 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "xverse-web-extension",
-  "version": "0.41.0",
+  "version": "0.40.1",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "xverse-web-extension",
-      "version": "0.41.0",
+      "version": "0.40.1",
       "dependencies": {
         "@aryzing/superqs": "0.0.6",
         "@ledgerhq/hw-transport-webusb": "^6.27.13",
diff --git a/package.json b/package.json
index 330e06879..ac07bbf0b 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "xverse-web-extension",
   "description": "A Bitcoin wallet for Web3",
-  "version": "0.41.0",
+  "version": "0.40.1",
   "private": true,
   "engines": {
     "node": "^18.18.2"

From 396dc6b89fbce64a0ede5340af0479bf819b51e6 Mon Sep 17 00:00:00 2001
From: GitHub Actions Bot <>
Date: Thu, 29 Aug 2024 14:43:03 +0000
Subject: [PATCH 050/227] release: v0.41.0

---
 package-lock.json | 4 ++--
 package.json      | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 3a18c7e62..7efd6dc38 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "xverse-web-extension",
-  "version": "0.40.1",
+  "version": "0.41.0",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "xverse-web-extension",
-      "version": "0.40.1",
+      "version": "0.41.0",
       "dependencies": {
         "@aryzing/superqs": "0.0.6",
         "@ledgerhq/hw-transport-webusb": "^6.27.13",
diff --git a/package.json b/package.json
index ac07bbf0b..330e06879 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "xverse-web-extension",
   "description": "A Bitcoin wallet for Web3",
-  "version": "0.40.1",
+  "version": "0.41.0",
   "private": true,
   "engines": {
     "node": "^18.18.2"

From fda4bb21fb20c4ea5b4f51737a787b708514371e Mon Sep 17 00:00:00 2001
From: fede erbes <fedeerbes@gmail.com>
Date: Thu, 29 Aug 2024 16:52:03 +0200
Subject: [PATCH 051/227] fix: remove test step which is not longer used (#542)

---
 .github/workflows/build-rc.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.github/workflows/build-rc.yml b/.github/workflows/build-rc.yml
index b2a30ffc1..29ba056be 100644
--- a/.github/workflows/build-rc.yml
+++ b/.github/workflows/build-rc.yml
@@ -34,7 +34,6 @@ jobs:
           npm run knip
           npx eslint .
           npx tsc --noEmit
-          npm test
       - name: Build
         env:
           TRANSAC_API_KEY: ${{ secrets.TRANSAC_API_KEY }}

From a42247c4c134ef80d4bd8789321e8c5d18ae24cd Mon Sep 17 00:00:00 2001
From: fede erbes <fedeerbes@gmail.com>
Date: Thu, 29 Aug 2024 18:26:48 +0200
Subject: [PATCH 052/227] fix: e2e v0.41.0 (#543)

* fix: missing send-input

* fixed selectors for update password flow

---------

Co-authored-by: DuskaT021 <aleksa2601@gmail.com>
---
 src/app/screens/sendRune/runeAmountSelector.tsx | 1 +
 tests/pages/wallet.ts                           | 4 ++--
 tests/specs/tabSettings.spec.ts                 | 6 +++---
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/app/screens/sendRune/runeAmountSelector.tsx b/src/app/screens/sendRune/runeAmountSelector.tsx
index fea1e4543..86b36c135 100644
--- a/src/app/screens/sendRune/runeAmountSelector.tsx
+++ b/src/app/screens/sendRune/runeAmountSelector.tsx
@@ -133,6 +133,7 @@ function RuneAmountSelector({
     <Input
       title={t('BTC.AMOUNT', { currency: useTokenValue ? getFtTicker(token) : fiatCurrency })}
       value={displayAmount}
+      dataTestID="send-input"
       onChange={(e) => handleAmountChange(e.target.value)}
       placeholder="0"
       infoPanel={
diff --git a/tests/pages/wallet.ts b/tests/pages/wallet.ts
index 2b2ffe8f7..5c7725849 100644
--- a/tests/pages/wallet.ts
+++ b/tests/pages/wallet.ts
@@ -428,9 +428,9 @@ export default class Wallet {
     this.inputBTCURL = page.getByTestId('BTC URL');
     this.inputFallbackBTCURL = page.getByTestId('Fallback BTC URL');
     this.buttonUpdatePassword = page.getByRole('button', { name: 'Update Password' });
-    this.errorMessage = page.getByRole('heading', { name: 'Incorrect password' });
+    this.errorMessage = page.getByText(/incorrect password/i);
     this.headerNewPassword = page.getByRole('heading', { name: 'Enter your new password' });
-    this.infoUpdatePassword = page.getByRole('heading', { name: 'Password successfully updated' });
+    this.infoUpdatePassword = page.getByText(/password successfully updated/i);
     this.buttonCurrency = page.getByRole('button', { name: 'Fiat Currency' });
     this.buttonShowSeedphrase = page.getByRole('button', { name: 'Show Seedphrase' });
     this.selectCurrency = page.getByTestId('currency-button');
diff --git a/tests/specs/tabSettings.spec.ts b/tests/specs/tabSettings.spec.ts
index fef6ccd37..d814122cc 100644
--- a/tests/specs/tabSettings.spec.ts
+++ b/tests/specs/tabSettings.spec.ts
@@ -90,10 +90,10 @@ test.describe('Settings Tab', () => {
     await expect(onboardingPage.buttonContinue).toBeEnabled();
     await onboardingPage.buttonContinue.click();
     await expect(onboardingPage.inputPassword).toBeVisible();
-    await expect(onboardingPage.buttonContinue).toBeDisabled();
+    await expect(wallet.buttonConfirm).toBeDisabled();
     await onboardingPage.inputPassword.fill(`${strongPW}ABC`);
-    await expect(onboardingPage.buttonContinue).toBeEnabled();
-    await onboardingPage.buttonContinue.click();
+    await expect(wallet.buttonConfirm).toBeEnabled();
+    await wallet.buttonConfirm.click();
     await expect(wallet.infoUpdatePassword).toBeVisible();
   });
   test('Show Seedphrase', async ({ page, extensionId }) => {

From dad818a49f3a4008dc4a0548be952752ea19b9bc Mon Sep 17 00:00:00 2001
From: Terence Ng <ngtere@live.com.sg>
Date: Fri, 30 Aug 2024 11:38:55 +0800
Subject: [PATCH 053/227] commit

---
 src/app/components/tokenImage/index.tsx | 47 +++++++++----------------
 1 file changed, 17 insertions(+), 30 deletions(-)

diff --git a/src/app/components/tokenImage/index.tsx b/src/app/components/tokenImage/index.tsx
index 3243ed5f5..378a737c7 100644
--- a/src/app/components/tokenImage/index.tsx
+++ b/src/app/components/tokenImage/index.tsx
@@ -94,6 +94,17 @@ export default function TokenImage({
     }
   }, [currency]);
 
+  const ticker =
+    fungibleToken?.runeSymbol ||
+    fungibleToken?.ticker ||
+    (fungibleToken?.name ? getTicker(fungibleToken.name) : fungibleToken?.assetName || '');
+
+  const tickerComponent = () => (
+    <TickerIconContainer size={size} round={round}>
+      <TickerIconText data-testid="token-image">{ticker.substring(0, 4)}</TickerIconText>
+    </TickerIconContainer>
+  );
+
   const getProtocolIcon = () => {
     if (!ftProtocol) {
       return null;
@@ -111,18 +122,6 @@ export default function TokenImage({
   };
 
   const renderIcon = () => {
-    const ticker =
-      fungibleToken?.ticker ||
-      (fungibleToken?.name ? getTicker(fungibleToken.name) : fungibleToken?.assetName || '');
-
-    if (imageError) {
-      return (
-        <TickerIconContainer size={size} round={round}>
-          <TickerIconText data-testid="token-image">{ticker.substring(0, 4)}</TickerIconText>
-        </TickerIconContainer>
-      );
-    }
-
     if (!fungibleToken) {
       return (
         <TickerImage
@@ -133,39 +132,27 @@ export default function TokenImage({
         />
       );
     }
-    if (fungibleToken?.image) {
+    if (fungibleToken.runeInscriptionId) {
       return (
         <TickerImage
           data-testid="token-image"
           size={size}
-          src={fungibleToken.image}
+          src={`${XVERSE_ORDIVIEW_URL(network.type)}/thumbnail/${fungibleToken.runeInscriptionId}`}
           onError={() => setImageError(true)}
         />
       );
     }
-    if (fungibleToken.runeInscriptionId) {
+    if (fungibleToken?.image) {
       return (
         <TickerImage
           data-testid="token-image"
           size={size}
-          src={`${XVERSE_ORDIVIEW_URL(network.type)}/thumbnail/${fungibleToken.runeInscriptionId}`}
+          src={fungibleToken.image}
           onError={() => setImageError(true)}
         />
       );
     }
-    if (fungibleToken.runeSymbol) {
-      return (
-        <TickerIconContainer size={size} round={round}>
-          <TickerIconText data-testid="token-image">{fungibleToken.runeSymbol}</TickerIconText>
-        </TickerIconContainer>
-      );
-    }
-
-    return (
-      <TickerIconContainer size={size} round={round}>
-        <TickerIconText data-testid="token-image">{ticker.substring(0, 4)}</TickerIconText>
-      </TickerIconContainer>
-    );
+    return tickerComponent();
   };
 
   if (loading) {
@@ -180,7 +167,7 @@ export default function TokenImage({
 
   return (
     <TickerProtocolContainer>
-      {renderIcon()}
+      {imageError ? tickerComponent() : renderIcon()}
       {ftProtocol && showProtocolIcon && (
         <ProtocolIcon isSquare={ftProtocol === 'runes'}>{getProtocolIcon()}</ProtocolIcon>
       )}

From f1a0069c50f618576bbdcd8e1839369e91033f3c Mon Sep 17 00:00:00 2001
From: Terence Ng <ngtere@live.com.sg>
Date: Fri, 30 Aug 2024 12:23:12 +0800
Subject: [PATCH 054/227] fix logic for non-runes

---
 src/app/components/tokenImage/index.tsx | 30 ++++++++++++++++---------
 1 file changed, 20 insertions(+), 10 deletions(-)

diff --git a/src/app/components/tokenImage/index.tsx b/src/app/components/tokenImage/index.tsx
index 378a737c7..933d78c83 100644
--- a/src/app/components/tokenImage/index.tsx
+++ b/src/app/components/tokenImage/index.tsx
@@ -95,7 +95,6 @@ export default function TokenImage({
   }, [currency]);
 
   const ticker =
-    fungibleToken?.runeSymbol ||
     fungibleToken?.ticker ||
     (fungibleToken?.name ? getTicker(fungibleToken.name) : fungibleToken?.assetName || '');
 
@@ -132,15 +131,26 @@ export default function TokenImage({
         />
       );
     }
-    if (fungibleToken.runeInscriptionId) {
-      return (
-        <TickerImage
-          data-testid="token-image"
-          size={size}
-          src={`${XVERSE_ORDIVIEW_URL(network.type)}/thumbnail/${fungibleToken.runeInscriptionId}`}
-          onError={() => setImageError(true)}
-        />
-      );
+    if (fungibleToken.protocol === 'runes') {
+      if (fungibleToken.runeInscriptionId) {
+        return (
+          <TickerImage
+            data-testid="token-image"
+            size={size}
+            src={`${XVERSE_ORDIVIEW_URL(network.type)}/thumbnail/${
+              fungibleToken.runeInscriptionId
+            }`}
+            onError={() => setImageError(true)}
+          />
+        );
+      }
+      if (fungibleToken?.runeSymbol) {
+        return (
+          <TickerIconContainer size={size} round={round}>
+            <TickerIconText data-testid="token-image">{fungibleToken.runeSymbol}</TickerIconText>
+          </TickerIconContainer>
+        );
+      }
     }
     if (fungibleToken?.image) {
       return (

From 11bce92c3c0aa3416e4fe86fb7857ac008d142bc Mon Sep 17 00:00:00 2001
From: Terence Ng <ngtere@live.com.sg>
Date: Fri, 30 Aug 2024 12:51:27 +0800
Subject: [PATCH 055/227] fix

---
 .../components/confirmBtcTransaction/itemRow/runeAmount.tsx   | 4 ++--
 src/app/components/fiatAmountText/index.tsx                   | 4 ++++
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/app/components/confirmBtcTransaction/itemRow/runeAmount.tsx b/src/app/components/confirmBtcTransaction/itemRow/runeAmount.tsx
index 97d9bf939..d10e0072d 100644
--- a/src/app/components/confirmBtcTransaction/itemRow/runeAmount.tsx
+++ b/src/app/components/confirmBtcTransaction/itemRow/runeAmount.tsx
@@ -1,5 +1,5 @@
 import { mapRuneNameToPlaceholder } from '@components/confirmBtcTransaction/utils';
-import { StyledFiatAmountText } from '@components/fiatAmountText';
+import { RightAlignedStyledFiatAmountText } from '@components/fiatAmountText';
 import TokenImage from '@components/tokenImage';
 import useRuneFiatRateQuery from '@hooks/queries/runes/useRuneFiatRateQuery';
 import useWalletSelector from '@hooks/useWalletSelector';
@@ -93,7 +93,7 @@ export default function RuneAmount({
             {runeName}
           </StyledP>
           {runeFiatRate !== undefined && runeFiatRate > 0 && (
-            <StyledFiatAmountText
+            <RightAlignedStyledFiatAmountText
               fiatAmount={
                 new BigNumber(BigNumber(amountWithDecimals).multipliedBy(runeFiatRate).toFixed(2))
               }
diff --git a/src/app/components/fiatAmountText/index.tsx b/src/app/components/fiatAmountText/index.tsx
index 46b197585..128cc7f69 100644
--- a/src/app/components/fiatAmountText/index.tsx
+++ b/src/app/components/fiatAmountText/index.tsx
@@ -46,4 +46,8 @@ export const StyledFiatAmountText = styled(FiatAmountText)`
   color: ${(props) => props.theme.colors.white_400};
 `;
 
+export const RightAlignedStyledFiatAmountText = styled(StyledFiatAmountText)`
+  text-align: right;
+`;
+
 export default FiatAmountText;

From ed2d360968d4f2c95adad6d2c20bbff42b1c9792 Mon Sep 17 00:00:00 2001
From: "Jordan K." <65149726+jordankzf@users.noreply.github.com>
Date: Fri, 30 Aug 2024 18:18:33 +0800
Subject: [PATCH 056/227] Stacks Swaps Fixes (#535)

* Remove fee rate for SIP-10 swaps

* Remove feature flag hardcode

* Add Mixpanel tracking

* Bump xverse-core

* hide fee rate if not btc/runes

* small tweak

* small tweak

* Improve mixpanel tracking

---------

Co-authored-by: Terence Ng <ngtere@live.com.sg>
---
 package-lock.json                             | 14 ++--
 package.json                                  |  2 +-
 .../itemRow/runeAmount.tsx                    |  6 +-
 .../components/confirmBtcTransaction/utils.ts | 21 +++---
 src/app/hooks/useHasFeature.ts                |  4 -
 src/app/screens/coinDashboard/coinHeader.tsx  |  7 +-
 .../psbtConfirmation/useExecuteOrder.tsx      |  1 +
 .../components/tokenFromBottomSheet/index.tsx |  2 +
 .../components/tokenToBottomSheet/index.tsx   |  4 +
 src/app/screens/swap/index.tsx                | 14 +++-
 src/app/screens/swap/mixpanel.ts              | 75 +++++++++++++++----
 src/app/screens/swap/quoteSummary/index.tsx   | 61 ++++++++-------
 src/app/screens/swap/utils.ts                 | 24 ++++++
 13 files changed, 163 insertions(+), 72 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 7efd6dc38..28aa9806f 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -15,7 +15,7 @@
         "@react-spring/web": "^9.6.1",
         "@sats-connect/core": "0.2.1",
         "@scure/btc-signer": "1.2.1",
-        "@secretkeylabs/xverse-core": "18.8.0",
+        "@secretkeylabs/xverse-core": "18.8.1",
         "@stacks/connect": "7.4.1",
         "@stacks/stacks-blockchain-api-types": "6.1.1",
         "@stacks/transactions": "6.16.1",
@@ -1279,9 +1279,9 @@
       }
     },
     "node_modules/@secretkeylabs/xverse-core": {
-      "version": "18.8.0",
-      "resolved": "https://npm.pkg.github.com/download/@secretkeylabs/xverse-core/18.8.0/ddb1e79eace136115e86ca0952613efb900e4501",
-      "integrity": "sha512-BgWjO5TQiHteiFqb5pAjxFcgU0mSo8XhT9CxXkWV3YnjEb+Z9l9MX0wTrJMKEwswyFpTE8WJEtKU3bWR4uuyJA==",
+      "version": "18.8.1",
+      "resolved": "https://npm.pkg.github.com/download/@secretkeylabs/xverse-core/18.8.1/537d8964f3673681cfe0e1afe5c0acecb83729d4",
+      "integrity": "sha512-NEy5LN1+oj8acsqRGkOmuDfVFfoe1Inwt7wNBaqZQGGSaMac6mgYlaaxwrZUsyOtLZ9e1kzbht1ng3Lzjq/ynQ==",
       "license": "ISC",
       "dependencies": {
         "@bitcoinerlab/secp256k1": "^1.0.2",
@@ -13846,9 +13846,9 @@
       }
     },
     "@secretkeylabs/xverse-core": {
-      "version": "18.8.0",
-      "resolved": "https://npm.pkg.github.com/download/@secretkeylabs/xverse-core/18.8.0/ddb1e79eace136115e86ca0952613efb900e4501",
-      "integrity": "sha512-BgWjO5TQiHteiFqb5pAjxFcgU0mSo8XhT9CxXkWV3YnjEb+Z9l9MX0wTrJMKEwswyFpTE8WJEtKU3bWR4uuyJA==",
+      "version": "18.8.1",
+      "resolved": "https://npm.pkg.github.com/download/@secretkeylabs/xverse-core/18.8.1/537d8964f3673681cfe0e1afe5c0acecb83729d4",
+      "integrity": "sha512-NEy5LN1+oj8acsqRGkOmuDfVFfoe1Inwt7wNBaqZQGGSaMac6mgYlaaxwrZUsyOtLZ9e1kzbht1ng3Lzjq/ynQ==",
       "requires": {
         "@bitcoinerlab/secp256k1": "^1.0.2",
         "@noble/curves": "^1.2.0",
diff --git a/package.json b/package.json
index 330e06879..fede151db 100644
--- a/package.json
+++ b/package.json
@@ -43,7 +43,7 @@
     "@react-spring/web": "^9.6.1",
     "@sats-connect/core": "0.2.1",
     "@scure/btc-signer": "1.2.1",
-    "@secretkeylabs/xverse-core": "18.8.0",
+    "@secretkeylabs/xverse-core": "18.8.1",
     "@stacks/connect": "7.4.1",
     "@stacks/stacks-blockchain-api-types": "6.1.1",
     "@stacks/transactions": "6.16.1",
diff --git a/src/app/components/confirmBtcTransaction/itemRow/runeAmount.tsx b/src/app/components/confirmBtcTransaction/itemRow/runeAmount.tsx
index d10e0072d..979f1849b 100644
--- a/src/app/components/confirmBtcTransaction/itemRow/runeAmount.tsx
+++ b/src/app/components/confirmBtcTransaction/itemRow/runeAmount.tsx
@@ -1,4 +1,4 @@
-import { mapRuneNameToPlaceholder } from '@components/confirmBtcTransaction/utils';
+import { mapRuneBaseToFungibleToken } from '@components/confirmBtcTransaction/utils';
 import { RightAlignedStyledFiatAmountText } from '@components/fiatAmountText';
 import TokenImage from '@components/tokenImage';
 import useRuneFiatRateQuery from '@hooks/queries/runes/useRuneFiatRateQuery';
@@ -52,7 +52,7 @@ export default function RuneAmount({
   topMargin = false,
 }: Props) {
   const { t } = useTranslation('translation', { keyPrefix: 'CONFIRM_TRANSACTION' });
-  const { runeName, amount, divisibility, symbol, inscriptionId } = rune;
+  const { runeName, amount, divisibility, symbol } = rune;
   const amountWithDecimals = ftDecimals(String(amount), divisibility);
   const { fiatCurrency } = useWalletSelector();
   const { data: runeFiatRate } = useRuneFiatRateQuery(rune);
@@ -61,7 +61,7 @@ export default function RuneAmount({
       <AvatarContainer>
         <TokenImage
           currency="FT"
-          fungibleToken={mapRuneNameToPlaceholder(runeName, symbol, inscriptionId)}
+          fungibleToken={mapRuneBaseToFungibleToken(rune)}
           showProtocolIcon
           loading={false}
           size={32}
diff --git a/src/app/components/confirmBtcTransaction/utils.ts b/src/app/components/confirmBtcTransaction/utils.ts
index 93147f812..c7ec80165 100644
--- a/src/app/components/confirmBtcTransaction/utils.ts
+++ b/src/app/components/confirmBtcTransaction/utils.ts
@@ -1,4 +1,9 @@
-import type { btcTransaction, BundleSatRange, FungibleToken } from '@secretkeylabs/xverse-core';
+import type {
+  btcTransaction,
+  BundleSatRange,
+  FungibleToken,
+  RuneBase,
+} from '@secretkeylabs/xverse-core';
 
 // TODO this should all be in core and unit tested
 
@@ -298,18 +303,14 @@ export const getSatRangesWithInscriptions = ({
   return { satRanges: satRangesArray, totalExoticSats };
 };
 
-export const mapRuneNameToPlaceholder = (
-  runeName: string,
-  symbol: string,
-  inscriptionId: string,
-): FungibleToken => ({
+export const mapRuneBaseToFungibleToken = (rune: RuneBase): FungibleToken => ({
   protocol: 'runes',
-  name: runeName,
+  name: rune.runeName,
+  principal: rune.runeId,
   assetName: '',
   balance: '',
-  principal: '',
   total_received: '',
   total_sent: '',
-  runeSymbol: symbol,
-  runeInscriptionId: inscriptionId,
+  runeSymbol: rune.symbol,
+  runeInscriptionId: rune.inscriptionId,
 });
diff --git a/src/app/hooks/useHasFeature.ts b/src/app/hooks/useHasFeature.ts
index 298ace532..9435a0198 100644
--- a/src/app/hooks/useHasFeature.ts
+++ b/src/app/hooks/useHasFeature.ts
@@ -17,9 +17,5 @@ const useAppFeatures = () => {
 
 export default function useHasFeature(feature: FeatureId): boolean {
   const { data } = useAppFeatures();
-
-  // Remove before merging
-  if (feature === FeatureId.STACKS_SWAPS) return true;
-
   return data?.[feature]?.enabled ?? false;
 }
diff --git a/src/app/screens/coinDashboard/coinHeader.tsx b/src/app/screens/coinDashboard/coinHeader.tsx
index a523f9f35..2f0f56e8f 100644
--- a/src/app/screens/coinDashboard/coinHeader.tsx
+++ b/src/app/screens/coinDashboard/coinHeader.tsx
@@ -182,7 +182,12 @@ export default function CoinHeader({ currency, fungibleToken }: Props) {
       return;
     }
     trackMixPanel(AnalyticsEvents.InitiateSwapFlow, {
-      selectedToken: fungibleToken ? fungibleToken.name ?? fungibleToken.principal : currency,
+      selectedToken: fungibleToken ? fungibleToken.name : currency,
+      principal: fungibleToken
+        ? fungibleToken?.principal
+        : currency === 'STX'
+        ? currency
+        : undefined,
     });
     navigate(`/swap?from=${fungibleToken ? fungibleToken.principal : currency}`);
   };
diff --git a/src/app/screens/swap/components/psbtConfirmation/useExecuteOrder.tsx b/src/app/screens/swap/components/psbtConfirmation/useExecuteOrder.tsx
index afce53d08..94e99675b 100644
--- a/src/app/screens/swap/components/psbtConfirmation/useExecuteOrder.tsx
+++ b/src/app/screens/swap/components/psbtConfirmation/useExecuteOrder.tsx
@@ -35,6 +35,7 @@ const useExecuteOrder = () => {
     try {
       const response = await xverseApiClient.swaps.executeStxOrder(request);
       setOrder(response);
+
       return response;
     } catch (err: any) {
       setError(err?.response?.data?.message ?? 'Failed to execute order');
diff --git a/src/app/screens/swap/components/tokenFromBottomSheet/index.tsx b/src/app/screens/swap/components/tokenFromBottomSheet/index.tsx
index 4dbbe6566..05234fa21 100644
--- a/src/app/screens/swap/components/tokenFromBottomSheet/index.tsx
+++ b/src/app/screens/swap/components/tokenFromBottomSheet/index.tsx
@@ -62,6 +62,7 @@ export default function TokenFromBottomSheet({ visible, title, onSelectCoin, onC
                   onSelectCoin(token);
                   trackMixPanel(AnalyticsEvents.SelectTokenToSwapFrom, {
                     selectedToken: 'Stacks',
+                    principal: 'STX',
                   });
                   onClose();
                 }}
@@ -78,6 +79,7 @@ export default function TokenFromBottomSheet({ visible, title, onSelectCoin, onC
                   onSelectCoin(token);
                   trackMixPanel(AnalyticsEvents.SelectTokenToSwapFrom, {
                     selectedToken: token.name,
+                    principal: token.protocol === 'stacks' ? token.principal : undefined,
                   });
                   onClose();
                 }}
diff --git a/src/app/screens/swap/components/tokenToBottomSheet/index.tsx b/src/app/screens/swap/components/tokenToBottomSheet/index.tsx
index 4d914d140..2953d0f5a 100644
--- a/src/app/screens/swap/components/tokenToBottomSheet/index.tsx
+++ b/src/app/screens/swap/components/tokenToBottomSheet/index.tsx
@@ -2,8 +2,10 @@ import TokenTile from '@components/tokenTile';
 import useDebounce from '@hooks/useDebounce';
 import { MagnifyingGlass } from '@phosphor-icons/react';
 import {
+  isStxTx,
   mapFTMotherProtocolToSwapProtocol,
   mapFTProtocolToSwapProtocol,
+  mapSwapProtocolToFTProtocol,
   mapSwapTokenToFT,
 } from '@screens/swap/utils';
 import {
@@ -194,6 +196,7 @@ export default function TokenToBottomSheet({
                     onSelectCoin(token);
                     trackMixPanel(AnalyticsEvents.SelectTokenToSwapTo, {
                       selectedToken: 'Stacks',
+                      principal: 'STX',
                     });
                     handleClose();
                   }}
@@ -211,6 +214,7 @@ export default function TokenToBottomSheet({
                     onSelectCoin(token);
                     trackMixPanel(AnalyticsEvents.SelectTokenToSwapTo, {
                       selectedToken: token.name ?? token.ticker,
+                      principal: isStxTx({ toToken: token }) ? token.ticker : undefined,
                     });
                     handleClose();
                   }}
diff --git a/src/app/screens/swap/index.tsx b/src/app/screens/swap/index.tsx
index cafe50622..f01e5941e 100644
--- a/src/app/screens/swap/index.tsx
+++ b/src/app/screens/swap/index.tsx
@@ -46,7 +46,9 @@ import QuoteSummary from './quoteSummary';
 import QuotesModal from './quotesModal';
 import type { OrderInfo, Side, StxOrderInfo } from './types';
 import useMasterCoinsList from './useMasterCoinsList';
+import { useStxCurrencyConversion } from './useStxCurrencyConversion';
 import {
+  isStxTx,
   mapFTNativeSwapTokenToTokenBasic,
   mapFTProtocolToSwapProtocol,
   mapFtToSwapToken,
@@ -136,6 +138,7 @@ export default function SwapScreen() {
   const { quotes, loading: quotesLoading, error: quotesError, fetchQuotes } = useGetQuotes();
   const { data: runeFloorPrice } = useRuneFloorPriceQuery(toToken?.name ?? '');
   const coinsMasterList = useMasterCoinsList();
+  const { acceptableCoinList: sip10CoinsList } = useStxCurrencyConversion();
 
   useEffect(() => {
     if (defaultFrom) {
@@ -178,6 +181,8 @@ export default function SwapScreen() {
       quote,
       btcUsdRate,
       runeFloorPrice,
+      stxBtcRate,
+      sip10CoinsList,
     });
 
     fetchQuotes({
@@ -213,7 +218,6 @@ export default function SwapScreen() {
     if (isSwapRouteDisabled) {
       return;
     }
-
     setInputError('');
     setAmount('');
     setHasQuoteError(false);
@@ -356,8 +360,10 @@ export default function SwapScreen() {
 
     trackMixPanel(AnalyticsEvents.SelectSwapQuote, {
       provider: provider.provider.name,
-      from: fromToken.principal === 'BTC' ? 'BTC' : fromToken.name,
-      to: toToken.protocol === 'btc' ? 'BTC' : toToken.name ?? toToken.ticker,
+      from: fromToken.name,
+      to: toToken.name ?? toToken.ticker,
+      fromPrincipal: isStxTx({ fromToken, toToken }) ? fromToken.principal : undefined,
+      toPrincipal: isStxTx({ fromToken, toToken }) ? toToken.ticker : undefined,
     });
 
     if (isAmm) {
@@ -393,6 +399,8 @@ export default function SwapScreen() {
       quote,
       btcUsdRate,
       runeFloorPrice,
+      stxBtcRate,
+      sip10CoinsList,
     });
   };
 
diff --git a/src/app/screens/swap/mixpanel.ts b/src/app/screens/swap/mixpanel.ts
index aace8675d..32da62cf4 100644
--- a/src/app/screens/swap/mixpanel.ts
+++ b/src/app/screens/swap/mixpanel.ts
@@ -1,5 +1,7 @@
 import {
   getBtcFiatEquivalent,
+  getStxFiatEquivalent,
+  stxToMicrostacks,
   type FungibleToken,
   type Provider,
   type Quote,
@@ -7,6 +9,7 @@ import {
 } from '@secretkeylabs/xverse-core';
 import { trackMixPanel } from '@utils/mixpanel';
 import BigNumber from 'bignumber.js';
+import { isRunesTx } from './utils';
 
 function trackSwapMixPanel(
   eventName,
@@ -18,6 +21,8 @@ function trackSwapMixPanel(
     quote,
     btcUsdRate,
     runeFloorPrice,
+    stxBtcRate,
+    sip10CoinsList,
   }: {
     provider?: Provider;
     fromToken?: FungibleToken;
@@ -26,30 +31,68 @@ function trackSwapMixPanel(
     quote?: Quote;
     btcUsdRate: string;
     runeFloorPrice?: number;
+    stxBtcRate?: string;
+    sip10CoinsList?: any;
   },
 ) {
+  let fromAmount;
+  let receiveAmount;
+  let toAmount;
+  let fromPrincipal;
+  let toPrincipal;
+
   const from = fromToken?.name;
-  const to = toToken?.protocol === 'btc' ? 'BTC' : toToken?.name ?? toToken?.ticker;
-
-  const fromAmount =
-    fromToken?.principal === 'BTC'
-      ? getBtcFiatEquivalent(new BigNumber(amount), new BigNumber(btcUsdRate)).toFixed(2)
-      : new BigNumber(fromToken?.tokenFiatRate ?? 0).multipliedBy(amount).toFixed(2);
-
-  const receiveAmount = quote?.receiveAmount ? new BigNumber(quote?.receiveAmount) : undefined;
-  const toAmount = receiveAmount
-    ? getBtcFiatEquivalent(
-        toToken?.protocol === 'btc'
-          ? receiveAmount
-          : receiveAmount.multipliedBy(runeFloorPrice ?? 0),
-        new BigNumber(btcUsdRate),
-      ).toFixed(2)
-    : undefined;
+  const to = toToken?.name ?? toToken?.ticker;
+
+  if (isRunesTx({ fromToken, toToken })) {
+    fromAmount =
+      fromToken?.principal === 'BTC'
+        ? getBtcFiatEquivalent(new BigNumber(amount), new BigNumber(btcUsdRate)).toFixed(2)
+        : new BigNumber(fromToken?.tokenFiatRate ?? 0).multipliedBy(amount).toFixed(2);
+
+    receiveAmount = quote?.receiveAmount ? new BigNumber(quote?.receiveAmount) : undefined;
+    toAmount = receiveAmount
+      ? getBtcFiatEquivalent(
+          toToken?.protocol === 'btc'
+            ? receiveAmount
+            : receiveAmount.multipliedBy(runeFloorPrice ?? 0),
+          new BigNumber(btcUsdRate),
+        ).toFixed(2)
+      : undefined;
+  } else if (stxBtcRate) {
+    fromPrincipal = fromToken?.principal;
+    toPrincipal = toToken?.ticker;
+
+    fromAmount =
+      fromToken?.principal === 'STX'
+        ? getStxFiatEquivalent(
+            stxToMicrostacks(new BigNumber(amount)),
+            new BigNumber(stxBtcRate),
+            new BigNumber(btcUsdRate),
+          ).toFixed(2)
+        : new BigNumber(fromToken?.tokenFiatRate ?? 0).multipliedBy(amount).toFixed(2);
+
+    receiveAmount = quote?.receiveAmount ? new BigNumber(quote?.receiveAmount) : undefined;
+    toAmount =
+      toToken?.protocol === 'stx'
+        ? getStxFiatEquivalent(
+            stxToMicrostacks(receiveAmount),
+            new BigNumber(stxBtcRate),
+            new BigNumber(btcUsdRate),
+          ).toFixed(2)
+        : new BigNumber(
+            sip10CoinsList?.find((s) => s.principal === toToken?.ticker)?.tokenFiatRate ?? 0,
+          )
+            .multipliedBy(receiveAmount)
+            .toFixed(2);
+  }
 
   trackMixPanel(eventName, {
     ...(provider ? { provider: provider?.name } : {}),
     ...(from ? { from } : {}),
     ...(to ? { to } : {}),
+    ...(fromPrincipal ? { fromPrincipal } : {}),
+    ...(toPrincipal ? { toPrincipal } : {}),
     fromAmount,
     ...(toAmount ? { toAmount } : {}),
   });
diff --git a/src/app/screens/swap/quoteSummary/index.tsx b/src/app/screens/swap/quoteSummary/index.tsx
index e9f8c522c..3debaf0b5 100644
--- a/src/app/screens/swap/quoteSummary/index.tsx
+++ b/src/app/screens/swap/quoteSummary/index.tsx
@@ -33,8 +33,10 @@ import trackSwapMixPanel from '../mixpanel';
 import QuoteTile from '../quotesModal/quoteTile';
 import { SlippageModalContent } from '../slippageModal';
 import type { OrderInfo, StxOrderInfo } from '../types';
+import { useStxCurrencyConversion } from '../useStxCurrencyConversion';
 import {
   BAD_QUOTE_PERCENTAGE,
+  isRunesTx,
   mapFTNativeSwapTokenToTokenBasic,
   mapFtToCurrencyType,
   mapSwapTokenToFT,
@@ -175,6 +177,7 @@ export default function QuoteSummary({
   const { btcFiatRate, btcUsdRate, stxBtcRate } = useCoinRates();
   const { btcAddress, ordinalsAddress, btcPublicKey, ordinalsPublicKey, stxAddress, stxPublicKey } =
     useSelectedAccount();
+
   const {
     loading: isPlaceOrderLoading,
     error: placeOrderError,
@@ -255,6 +258,8 @@ export default function QuoteSummary({
       quote,
       btcUsdRate,
       runeFloorPrice,
+      stxBtcRate,
+      sip10CoinsList,
     });
 
     if (selectedIdentifiers) {
@@ -524,33 +529,35 @@ export default function QuoteSummary({
                 </RouteContainer>
               </StyledP>
             </ListingDescriptionRow>
-            <ListingDescriptionRow>
-              <StyledP typography="body_medium_m" color="white_200">
-                {t('TRANSACTION_SETTING.FEE_RATE')}
-                <EditFeeRateContainer>
-                  <EditFee
-                    feeUnits={feeUnits}
-                    feeRate={feeRate}
-                    feeRateUnits={t('UNITS.SATS_PER_VB')}
-                    setFeeRate={setFeeRate}
-                    // We only know the rate, not the absolute amount
-                    // It is impossible to determine the fiat value
-                    baseToFiat={() => ''}
-                    fiatUnit={fiatCurrency}
-                    getFeeForFeeRate={(fee) => Promise.resolve(fee)}
-                    feeRates={{
-                      medium: recommendedFees?.regular,
-                      high: recommendedFees?.priority,
-                    }}
-                    feeRateLimits={{ ...recommendedFees?.limits, min: recommendedFees?.regular }}
-                    onFeeChange={setFeeRate}
-                  />
-                </EditFeeRateContainer>
-              </StyledP>
-              <FeeRate data-testid="fee-amount">
-                {feeRate} {t('UNITS.SATS_PER_VB')}
-              </FeeRate>
-            </ListingDescriptionRow>
+            {isRunesTx({ toToken }) && (
+              <ListingDescriptionRow>
+                <StyledP typography="body_medium_m" color="white_200">
+                  {t('TRANSACTION_SETTING.FEE_RATE')}
+                  <EditFeeRateContainer>
+                    <EditFee
+                      feeUnits={feeUnits}
+                      feeRate={feeRate}
+                      feeRateUnits={t('UNITS.SATS_PER_VB')}
+                      setFeeRate={setFeeRate}
+                      // We only know the rate, not the absolute amount
+                      // It is impossible to determine the fiat value
+                      baseToFiat={() => ''}
+                      fiatUnit={fiatCurrency}
+                      getFeeForFeeRate={(fee) => Promise.resolve(fee)}
+                      feeRates={{
+                        medium: recommendedFees?.regular,
+                        high: recommendedFees?.priority,
+                      }}
+                      feeRateLimits={{ ...recommendedFees?.limits, min: recommendedFees?.regular }}
+                      onFeeChange={setFeeRate}
+                    />
+                  </EditFeeRateContainer>
+                </StyledP>
+                <FeeRate data-testid="fee-amount">
+                  {feeRate} {t('UNITS.SATS_PER_VB')}
+                </FeeRate>
+              </ListingDescriptionRow>
+            )}
           </ListingDescContainer>
         </Flex1>
         <SendButtonContainer>
diff --git a/src/app/screens/swap/utils.ts b/src/app/screens/swap/utils.ts
index 21e82cbba..283d6d0d9 100644
--- a/src/app/screens/swap/utils.ts
+++ b/src/app/screens/swap/utils.ts
@@ -103,3 +103,27 @@ export const mapFtToSwapToken = (st: FungibleToken): Token => {
     symbol: st.runeSymbol ?? '',
   };
 };
+
+export const isRunesTx = ({
+  fromToken,
+  toToken,
+}: {
+  fromToken?: FungibleToken;
+  toToken?: Token;
+}): boolean =>
+  fromToken?.protocol === 'runes' ||
+  fromToken?.principal === 'BTC' ||
+  toToken?.protocol === 'runes' ||
+  toToken?.ticker === 'BTC';
+
+export const isStxTx = ({
+  fromToken,
+  toToken,
+}: {
+  fromToken?: FungibleToken;
+  toToken?: Token;
+}): boolean =>
+  fromToken?.protocol === 'stacks' ||
+  fromToken?.principal === 'STX' ||
+  toToken?.protocol === 'sip10' ||
+  toToken?.ticker === 'STX';

From 153754d1c563ea8431f930537c6ea29f241c76d1 Mon Sep 17 00:00:00 2001
From: "Jordan K." <65149726+jordankzf@users.noreply.github.com>
Date: Fri, 30 Aug 2024 19:32:55 +0800
Subject: [PATCH 057/227] Fix mixpanel crash (#549)

* Remove fee rate for SIP-10 swaps

* Remove feature flag hardcode

* Add Mixpanel tracking

* Bump xverse-core

* hide fee rate if not btc/runes

* small tweak

* small tweak

* Improve mixpanel tracking

* Fix MixPanel crash

---------

Co-authored-by: Terence Ng <ngtere@live.com.sg>
---
 src/app/screens/swap/mixpanel.ts | 26 ++++++++++++++------------
 1 file changed, 14 insertions(+), 12 deletions(-)

diff --git a/src/app/screens/swap/mixpanel.ts b/src/app/screens/swap/mixpanel.ts
index 32da62cf4..a66e35ad1 100644
--- a/src/app/screens/swap/mixpanel.ts
+++ b/src/app/screens/swap/mixpanel.ts
@@ -73,18 +73,20 @@ function trackSwapMixPanel(
         : new BigNumber(fromToken?.tokenFiatRate ?? 0).multipliedBy(amount).toFixed(2);
 
     receiveAmount = quote?.receiveAmount ? new BigNumber(quote?.receiveAmount) : undefined;
-    toAmount =
-      toToken?.protocol === 'stx'
-        ? getStxFiatEquivalent(
-            stxToMicrostacks(receiveAmount),
-            new BigNumber(stxBtcRate),
-            new BigNumber(btcUsdRate),
-          ).toFixed(2)
-        : new BigNumber(
-            sip10CoinsList?.find((s) => s.principal === toToken?.ticker)?.tokenFiatRate ?? 0,
-          )
-            .multipliedBy(receiveAmount)
-            .toFixed(2);
+    if (receiveAmount) {
+      toAmount =
+        toToken?.protocol === 'stx'
+          ? getStxFiatEquivalent(
+              stxToMicrostacks(receiveAmount),
+              new BigNumber(stxBtcRate),
+              new BigNumber(btcUsdRate),
+            ).toFixed(2)
+          : new BigNumber(
+              sip10CoinsList?.find((s) => s.principal === toToken?.ticker)?.tokenFiatRate ?? 0,
+            )
+              .multipliedBy(receiveAmount)
+              .toFixed(2);
+    }
   }
 
   trackMixPanel(eventName, {

From bb181422cab18d7e393b84f26640bec445d5568f Mon Sep 17 00:00:00 2001
From: Mahmoud Aboelenein <mahmoud@secretkeylabs.com>
Date: Fri, 30 Aug 2024 17:17:31 +0300
Subject: [PATCH 058/227] update core version

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

diff --git a/package-lock.json b/package-lock.json
index 28aa9806f..ff7f4a308 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -15,7 +15,7 @@
         "@react-spring/web": "^9.6.1",
         "@sats-connect/core": "0.2.1",
         "@scure/btc-signer": "1.2.1",
-        "@secretkeylabs/xverse-core": "18.8.1",
+        "@secretkeylabs/xverse-core": "18.8.1-7f289bb",
         "@stacks/connect": "7.4.1",
         "@stacks/stacks-blockchain-api-types": "6.1.1",
         "@stacks/transactions": "6.16.1",
@@ -1279,9 +1279,9 @@
       }
     },
     "node_modules/@secretkeylabs/xverse-core": {
-      "version": "18.8.1",
-      "resolved": "https://npm.pkg.github.com/download/@secretkeylabs/xverse-core/18.8.1/537d8964f3673681cfe0e1afe5c0acecb83729d4",
-      "integrity": "sha512-NEy5LN1+oj8acsqRGkOmuDfVFfoe1Inwt7wNBaqZQGGSaMac6mgYlaaxwrZUsyOtLZ9e1kzbht1ng3Lzjq/ynQ==",
+      "version": "18.8.1-7f289bb",
+      "resolved": "https://npm.pkg.github.com/download/@secretkeylabs/xverse-core/18.8.1-7f289bb/c769239023b0c763dd84649a661b80d47111cc54",
+      "integrity": "sha512-4DcpbvTDXEPIp/TXz1w6bJflgsaYheipsZkOl4Lf5pAM5rtbzDzIoCobRBwPgBUtF46matrVxAex4Mo77nfPJQ==",
       "license": "ISC",
       "dependencies": {
         "@bitcoinerlab/secp256k1": "^1.0.2",
@@ -13846,9 +13846,9 @@
       }
     },
     "@secretkeylabs/xverse-core": {
-      "version": "18.8.1",
-      "resolved": "https://npm.pkg.github.com/download/@secretkeylabs/xverse-core/18.8.1/537d8964f3673681cfe0e1afe5c0acecb83729d4",
-      "integrity": "sha512-NEy5LN1+oj8acsqRGkOmuDfVFfoe1Inwt7wNBaqZQGGSaMac6mgYlaaxwrZUsyOtLZ9e1kzbht1ng3Lzjq/ynQ==",
+      "version": "18.8.1-7f289bb",
+      "resolved": "https://npm.pkg.github.com/download/@secretkeylabs/xverse-core/18.8.1-7f289bb/c769239023b0c763dd84649a661b80d47111cc54",
+      "integrity": "sha512-4DcpbvTDXEPIp/TXz1w6bJflgsaYheipsZkOl4Lf5pAM5rtbzDzIoCobRBwPgBUtF46matrVxAex4Mo77nfPJQ==",
       "requires": {
         "@bitcoinerlab/secp256k1": "^1.0.2",
         "@noble/curves": "^1.2.0",
diff --git a/package.json b/package.json
index fede151db..92d60002c 100644
--- a/package.json
+++ b/package.json
@@ -43,7 +43,7 @@
     "@react-spring/web": "^9.6.1",
     "@sats-connect/core": "0.2.1",
     "@scure/btc-signer": "1.2.1",
-    "@secretkeylabs/xverse-core": "18.8.1",
+    "@secretkeylabs/xverse-core": "18.8.1-7f289bb",
     "@stacks/connect": "7.4.1",
     "@stacks/stacks-blockchain-api-types": "6.1.1",
     "@stacks/transactions": "6.16.1",

From 7603deba41d5fc2a98941866abdf9f43007d0820 Mon Sep 17 00:00:00 2001
From: Mahmoud Aboelenein <mahmoud@secretkeylabs.com>
Date: Fri, 30 Aug 2024 19:43:07 +0300
Subject: [PATCH 059/227] fix-incorrect fee showing and update estimate api

---
 package-lock.json                             | 98 +++++++++++++------
 package.json                                  |  2 +-
 .../confirmStxTransactionComponent/index.tsx  |  4 +-
 src/app/hooks/apiClients/useStacksApi.ts      | 19 ++++
 src/app/hooks/queries/useFeeMultipliers.ts    |  5 +-
 src/app/hooks/queries/useStxWalletData.ts     | 17 ++--
 src/app/utils/transactions/transactions.ts    |  2 +-
 7 files changed, 103 insertions(+), 44 deletions(-)
 create mode 100644 src/app/hooks/apiClients/useStacksApi.ts

diff --git a/package-lock.json b/package-lock.json
index 28aa9806f..e7f4a673e 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -15,7 +15,7 @@
         "@react-spring/web": "^9.6.1",
         "@sats-connect/core": "0.2.1",
         "@scure/btc-signer": "1.2.1",
-        "@secretkeylabs/xverse-core": "18.8.1",
+        "@secretkeylabs/xverse-core": "18.8.1-95f903a",
         "@stacks/connect": "7.4.1",
         "@stacks/stacks-blockchain-api-types": "6.1.1",
         "@stacks/transactions": "6.16.1",
@@ -1279,9 +1279,9 @@
       }
     },
     "node_modules/@secretkeylabs/xverse-core": {
-      "version": "18.8.1",
-      "resolved": "https://npm.pkg.github.com/download/@secretkeylabs/xverse-core/18.8.1/537d8964f3673681cfe0e1afe5c0acecb83729d4",
-      "integrity": "sha512-NEy5LN1+oj8acsqRGkOmuDfVFfoe1Inwt7wNBaqZQGGSaMac6mgYlaaxwrZUsyOtLZ9e1kzbht1ng3Lzjq/ynQ==",
+      "version": "18.8.1-95f903a",
+      "resolved": "https://npm.pkg.github.com/download/@secretkeylabs/xverse-core/18.8.1-95f903a/2253e7fbd54a34d53a196032b3120be0819938fe",
+      "integrity": "sha512-57NGEcdZnywDUBwkghffvlztaZRDOwSPmTReEUktN+gVc/EhLQG0S+68XZZVCf3M4h4KGLwCZPCRE3a6R07wAQ==",
       "license": "ISC",
       "dependencies": {
         "@bitcoinerlab/secp256k1": "^1.0.2",
@@ -1293,12 +1293,13 @@
         "@scure/btc-signer": "1.2.1",
         "@stacks/auth": "6.16.1",
         "@stacks/connect": "7.7.1",
-        "@stacks/encryption": "6.16.1",
+        "@stacks/encryption": "6.16.1 ",
         "@stacks/network": "6.16.0",
-        "@stacks/stacking": "6.16.1",
-        "@stacks/storage": "6.16.1",
+        "@stacks/stacking": "6.16.0",
+        "@stacks/stacks-blockchain-api-types": "^7.14.1",
+        "@stacks/storage": "6.16.0",
         "@stacks/transactions": "6.16.1",
-        "@stacks/wallet-sdk": "6.16.1",
+        "@stacks/wallet-sdk": "6.16.1 ",
         "@tanstack/react-query": "^4.29.3",
         "@zondax/ledger-stacks": "^1.0.4",
         "async-mutex": "^0.4.0",
@@ -1382,6 +1383,24 @@
         "@stencil/core": "^2.17.1"
       }
     },
+    "node_modules/@secretkeylabs/xverse-core/node_modules/@stacks/stacks-blockchain-api-types": {
+      "version": "7.14.1",
+      "resolved": "https://registry.npmjs.org/@stacks/stacks-blockchain-api-types/-/stacks-blockchain-api-types-7.14.1.tgz",
+      "integrity": "sha512-65hvhXxC+EUqHJAQsqlBCqXB+zwfxZICSKYJugdg6BCp9I9qniyfz5XyQeC4RMVo0tgEoRdS/b5ZCFo5kLWmxA=="
+    },
+    "node_modules/@secretkeylabs/xverse-core/node_modules/@stacks/storage": {
+      "version": "6.16.0",
+      "resolved": "https://registry.npmjs.org/@stacks/storage/-/storage-6.16.0.tgz",
+      "integrity": "sha512-MLOMddIKyOcbzZo7ViW9tm6dhFMfLKf38yhNXpWohCnoxHRaUkCHP1prIT7hd9oLMI22vwtOvWgboJ+/e2uxKg==",
+      "dependencies": {
+        "@stacks/auth": "^6.16.0",
+        "@stacks/common": "^6.16.0",
+        "@stacks/encryption": "^6.16.0",
+        "@stacks/network": "^6.16.0",
+        "base64-js": "^1.5.1",
+        "jsontokens": "^4.0.1"
+      }
+    },
     "node_modules/@secretkeylabs/xverse-core/node_modules/@types/node": {
       "version": "11.11.6",
       "resolved": "https://registry.npmjs.org/@types/node/-/node-11.11.6.tgz",
@@ -1566,18 +1585,17 @@
       }
     },
     "node_modules/@stacks/stacking": {
-      "version": "6.16.1",
-      "resolved": "https://registry.npmjs.org/@stacks/stacking/-/stacking-6.16.1.tgz",
-      "integrity": "sha512-Bv7TSyoMrb1wYOfKrPxwDQPSjsohyKCduN1HYMlKL9hHF0J8+MvlJFw9eIj1c2SEOyYaElT+Ly3CI56J/acVxw==",
-      "license": "MIT",
+      "version": "6.16.0",
+      "resolved": "https://registry.npmjs.org/@stacks/stacking/-/stacking-6.16.0.tgz",
+      "integrity": "sha512-FjhKYyaCu/KytP/khWB9KhNOOrZdqM56xn9yxvZCR6McGSZ+hBeLud1E2WugIOzRX0muZbygCz9c1GBTz+pLiA==",
       "dependencies": {
         "@noble/hashes": "1.1.5",
         "@scure/base": "1.1.1",
         "@stacks/common": "^6.16.0",
-        "@stacks/encryption": "^6.16.1",
+        "@stacks/encryption": "^6.16.0",
         "@stacks/network": "^6.16.0",
         "@stacks/stacks-blockchain-api-types": "^0.61.0",
-        "@stacks/transactions": "^6.16.1",
+        "@stacks/transactions": "^6.16.0",
         "bs58": "^5.0.0"
       }
     },
@@ -1590,8 +1608,7 @@
           "type": "individual",
           "url": "https://paulmillr.com/funding/"
         }
-      ],
-      "license": "MIT"
+      ]
     },
     "node_modules/@stacks/stacking/node_modules/@scure/base": {
       "version": "1.1.1",
@@ -1602,14 +1619,12 @@
           "type": "individual",
           "url": "https://paulmillr.com/funding/"
         }
-      ],
-      "license": "MIT"
+      ]
     },
     "node_modules/@stacks/stacking/node_modules/@stacks/stacks-blockchain-api-types": {
       "version": "0.61.0",
       "resolved": "https://registry.npmjs.org/@stacks/stacks-blockchain-api-types/-/stacks-blockchain-api-types-0.61.0.tgz",
-      "integrity": "sha512-yPOfTUboo5eA9BZL/hqMcM71GstrFs9YWzOrJFPeP4cOO1wgYvAcckgBRbgiE3NqeX0A7SLZLDAXLZbATuRq9w==",
-      "license": "ISC"
+      "integrity": "sha512-yPOfTUboo5eA9BZL/hqMcM71GstrFs9YWzOrJFPeP4cOO1wgYvAcckgBRbgiE3NqeX0A7SLZLDAXLZbATuRq9w=="
     },
     "node_modules/@stacks/stacks-blockchain-api-types": {
       "version": "6.1.1",
@@ -13846,9 +13861,9 @@
       }
     },
     "@secretkeylabs/xverse-core": {
-      "version": "18.8.1",
-      "resolved": "https://npm.pkg.github.com/download/@secretkeylabs/xverse-core/18.8.1/537d8964f3673681cfe0e1afe5c0acecb83729d4",
-      "integrity": "sha512-NEy5LN1+oj8acsqRGkOmuDfVFfoe1Inwt7wNBaqZQGGSaMac6mgYlaaxwrZUsyOtLZ9e1kzbht1ng3Lzjq/ynQ==",
+      "version": "18.8.1-95f903a",
+      "resolved": "https://npm.pkg.github.com/download/@secretkeylabs/xverse-core/18.8.1-95f903a/2253e7fbd54a34d53a196032b3120be0819938fe",
+      "integrity": "sha512-57NGEcdZnywDUBwkghffvlztaZRDOwSPmTReEUktN+gVc/EhLQG0S+68XZZVCf3M4h4KGLwCZPCRE3a6R07wAQ==",
       "requires": {
         "@bitcoinerlab/secp256k1": "^1.0.2",
         "@noble/curves": "^1.2.0",
@@ -13859,12 +13874,13 @@
         "@scure/btc-signer": "1.2.1",
         "@stacks/auth": "6.16.1",
         "@stacks/connect": "7.7.1",
-        "@stacks/encryption": "6.16.1",
+        "@stacks/encryption": "6.16.1 ",
         "@stacks/network": "6.16.0",
-        "@stacks/stacking": "6.16.1",
-        "@stacks/storage": "6.16.1",
+        "@stacks/stacking": "6.16.0",
+        "@stacks/stacks-blockchain-api-types": "^7.14.1",
+        "@stacks/storage": "6.16.0",
         "@stacks/transactions": "6.16.1",
-        "@stacks/wallet-sdk": "6.16.1",
+        "@stacks/wallet-sdk": "6.16.1 ",
         "@tanstack/react-query": "^4.29.3",
         "@zondax/ledger-stacks": "^1.0.4",
         "async-mutex": "^0.4.0",
@@ -13926,6 +13942,24 @@
             "@stencil/core": "^2.17.1"
           }
         },
+        "@stacks/stacks-blockchain-api-types": {
+          "version": "7.14.1",
+          "resolved": "https://registry.npmjs.org/@stacks/stacks-blockchain-api-types/-/stacks-blockchain-api-types-7.14.1.tgz",
+          "integrity": "sha512-65hvhXxC+EUqHJAQsqlBCqXB+zwfxZICSKYJugdg6BCp9I9qniyfz5XyQeC4RMVo0tgEoRdS/b5ZCFo5kLWmxA=="
+        },
+        "@stacks/storage": {
+          "version": "6.16.0",
+          "resolved": "https://registry.npmjs.org/@stacks/storage/-/storage-6.16.0.tgz",
+          "integrity": "sha512-MLOMddIKyOcbzZo7ViW9tm6dhFMfLKf38yhNXpWohCnoxHRaUkCHP1prIT7hd9oLMI22vwtOvWgboJ+/e2uxKg==",
+          "requires": {
+            "@stacks/auth": "^6.16.0",
+            "@stacks/common": "^6.16.0",
+            "@stacks/encryption": "^6.16.0",
+            "@stacks/network": "^6.16.0",
+            "base64-js": "^1.5.1",
+            "jsontokens": "^4.0.1"
+          }
+        },
         "@types/node": {
           "version": "11.11.6",
           "resolved": "https://registry.npmjs.org/@types/node/-/node-11.11.6.tgz",
@@ -14087,17 +14121,17 @@
       }
     },
     "@stacks/stacking": {
-      "version": "6.16.1",
-      "resolved": "https://registry.npmjs.org/@stacks/stacking/-/stacking-6.16.1.tgz",
-      "integrity": "sha512-Bv7TSyoMrb1wYOfKrPxwDQPSjsohyKCduN1HYMlKL9hHF0J8+MvlJFw9eIj1c2SEOyYaElT+Ly3CI56J/acVxw==",
+      "version": "6.16.0",
+      "resolved": "https://registry.npmjs.org/@stacks/stacking/-/stacking-6.16.0.tgz",
+      "integrity": "sha512-FjhKYyaCu/KytP/khWB9KhNOOrZdqM56xn9yxvZCR6McGSZ+hBeLud1E2WugIOzRX0muZbygCz9c1GBTz+pLiA==",
       "requires": {
         "@noble/hashes": "1.1.5",
         "@scure/base": "1.1.1",
         "@stacks/common": "^6.16.0",
-        "@stacks/encryption": "^6.16.1",
+        "@stacks/encryption": "^6.16.0",
         "@stacks/network": "^6.16.0",
         "@stacks/stacks-blockchain-api-types": "^0.61.0",
-        "@stacks/transactions": "^6.16.1",
+        "@stacks/transactions": "^6.16.0",
         "bs58": "^5.0.0"
       },
       "dependencies": {
diff --git a/package.json b/package.json
index fede151db..a1b885ad3 100644
--- a/package.json
+++ b/package.json
@@ -43,7 +43,7 @@
     "@react-spring/web": "^9.6.1",
     "@sats-connect/core": "0.2.1",
     "@scure/btc-signer": "1.2.1",
-    "@secretkeylabs/xverse-core": "18.8.1",
+    "@secretkeylabs/xverse-core": "18.8.1-95f903a",
     "@stacks/connect": "7.4.1",
     "@stacks/stacks-blockchain-api-types": "6.1.1",
     "@stacks/transactions": "6.16.1",
diff --git a/src/app/components/confirmStxTransactionComponent/index.tsx b/src/app/components/confirmStxTransactionComponent/index.tsx
index 5b53921cf..b9d9bafbc 100644
--- a/src/app/components/confirmStxTransactionComponent/index.tsx
+++ b/src/app/components/confirmStxTransactionComponent/index.tsx
@@ -148,7 +148,7 @@ function ConfirmStxTransactionComponent({
           medium: microstacksToStx(BigNumber(modifiedFees.medium)).toNumber(),
           high: microstacksToStx(BigNumber(modifiedFees.high)).toNumber(),
         });
-        if (!fee) setFeeRate?.(Number(microstacksToStx(BigNumber(medium.fee))).toString());
+        if (!fee) setFeeRate?.(Number(microstacksToStx(BigNumber(modifiedFees.low))).toString());
       } catch (e) {
         console.error(e);
       } finally {
@@ -157,7 +157,7 @@ function ConfirmStxTransactionComponent({
     };
 
     fetchStxFees();
-  }, [selectedNetwork, initialStxTransactions]);
+  }, [selectedNetwork, initialStxTransactions, feeMultipliers, fee, setFeeRate]);
 
   useEffect(() => {
     const stxTxFee = BigNumber(initialStxTransactions[0].auth.spendingCondition.fee.toString());
diff --git a/src/app/hooks/apiClients/useStacksApi.ts b/src/app/hooks/apiClients/useStacksApi.ts
new file mode 100644
index 000000000..a0051e7b9
--- /dev/null
+++ b/src/app/hooks/apiClients/useStacksApi.ts
@@ -0,0 +1,19 @@
+import useNetworkSelector from '@hooks/useNetwork';
+import { StacksApiProvider } from '@secretkeylabs/xverse-core';
+import { useMemo } from 'react';
+
+const useStacksAPI = () => {
+  const network = useNetworkSelector();
+
+  const StacksAPI = useMemo(
+    () =>
+      new StacksApiProvider({
+        network,
+      }),
+    [network],
+  );
+
+  return StacksAPI;
+};
+
+export default useStacksAPI;
diff --git a/src/app/hooks/queries/useFeeMultipliers.ts b/src/app/hooks/queries/useFeeMultipliers.ts
index 7a5430932..14ca0543c 100644
--- a/src/app/hooks/queries/useFeeMultipliers.ts
+++ b/src/app/hooks/queries/useFeeMultipliers.ts
@@ -1,16 +1,17 @@
 import useWalletSelector from '@hooks/useWalletSelector';
 import type { AppInfo } from '@secretkeylabs/xverse-core';
-import { fetchAppInfo } from '@secretkeylabs/xverse-core';
+import { getXverseApiClient } from '@secretkeylabs/xverse-core';
 import { setFeeMultiplierAction } from '@stores/wallet/actions/actionCreators';
 import { useQuery } from '@tanstack/react-query';
 import { useDispatch } from 'react-redux';
 
 const useFeeMultipliers = () => {
   const { network } = useWalletSelector();
+  const xverseApi = getXverseApiClient(network.type);
   const dispatch = useDispatch();
 
   const fetchFeeMultiplierData = async (): Promise<AppInfo> => {
-    const response = await fetchAppInfo(network.type);
+    const response = await xverseApi.fetchAppInfo();
     if (!response) throw new Error('Failed to fetch fee multipliers');
 
     dispatch(setFeeMultiplierAction(response));
diff --git a/src/app/hooks/queries/useStxWalletData.ts b/src/app/hooks/queries/useStxWalletData.ts
index c12ec2362..2759e1242 100644
--- a/src/app/hooks/queries/useStxWalletData.ts
+++ b/src/app/hooks/queries/useStxWalletData.ts
@@ -1,15 +1,20 @@
+import useStacksAPI from '@hooks/apiClients/useStacksApi';
 import useSelectedAccount from '@hooks/useSelectedAccount';
 import type { StxAddressData } from '@secretkeylabs/xverse-core';
-import { fetchStxAddressData } from '@secretkeylabs/xverse-core';
 import { useQuery } from '@tanstack/react-query';
-import { PAGINATION_LIMIT } from '@utils/constants';
-import useNetworkSelector from '../useNetwork';
 
 const useStxWalletData = () => {
   const { stxAddress } = useSelectedAccount();
-  const currentNetworkInstance = useNetworkSelector();
-  const fetchStxWalletData = async (): Promise<StxAddressData> =>
-    fetchStxAddressData(stxAddress, currentNetworkInstance, 0, PAGINATION_LIMIT);
+  const StacksAPI = useStacksAPI();
+  const fetchStxWalletData = async (): Promise<StxAddressData> => {
+    const response = await StacksAPI.getAddressBalance(stxAddress);
+    return {
+      ...response,
+      balance: response.totalBalance,
+      locked: response.lockedBalance,
+      transactions: [],
+    };
+  };
 
   return useQuery({
     queryKey: ['stx-wallet-data', stxAddress],
diff --git a/src/app/utils/transactions/transactions.ts b/src/app/utils/transactions/transactions.ts
index b0a0cb8c1..72f03b068 100644
--- a/src/app/utils/transactions/transactions.ts
+++ b/src/app/utils/transactions/transactions.ts
@@ -146,7 +146,7 @@ export const modifyRecommendedStxFees = (
   },
   appInfo: AppInfo | undefined | null,
 ): { low: number; medium: number; high: number } => {
-  const multiplier = appInfo?.stxSendTxMultiplier || 1;
+  const multiplier = appInfo?.otherTxMultiplier || 1;
   const highCap = appInfo?.thresholdHighStacksFee;
 
   let adjustedLow = Math.round(baseFees.low * multiplier);

From 809a1bb1ee5729af30d46f2c106e32d1634ae4c5 Mon Sep 17 00:00:00 2001
From: Mahmoud Aboelenein <mahmoud@secretkeylabs.com>
Date: Sun, 1 Sep 2024 17:31:06 +0300
Subject: [PATCH 060/227] apply multiplier based on txType

---
 .../components/confirmStxTransactionComponent/index.tsx   | 1 +
 src/app/screens/sendStx/steps/Step2SelectAmount.tsx       | 6 +++++-
 src/app/utils/transactions/transactions.ts                | 8 +++++++-
 3 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/src/app/components/confirmStxTransactionComponent/index.tsx b/src/app/components/confirmStxTransactionComponent/index.tsx
index b9d9bafbc..e7e865990 100644
--- a/src/app/components/confirmStxTransactionComponent/index.tsx
+++ b/src/app/components/confirmStxTransactionComponent/index.tsx
@@ -141,6 +141,7 @@ function ConfirmStxTransactionComponent({
             high: high.fee,
           },
           feeMultipliers,
+          initialStxTransactions[0].payload.payloadType,
         );
 
         setFeeRates({
diff --git a/src/app/screens/sendStx/steps/Step2SelectAmount.tsx b/src/app/screens/sendStx/steps/Step2SelectAmount.tsx
index dfadfe07a..511d8e056 100644
--- a/src/app/screens/sendStx/steps/Step2SelectAmount.tsx
+++ b/src/app/screens/sendStx/steps/Step2SelectAmount.tsx
@@ -218,7 +218,11 @@ function Step2SelectAmount({
         };
 
         if (feeMultipliers?.thresholdHighStacksFee) {
-          stxFees = modifyRecommendedStxFees(stxFees, feeMultipliers);
+          stxFees = modifyRecommendedStxFees(
+            stxFees,
+            feeMultipliers,
+            unsignedTx.payload.payloadType,
+          );
         }
         setFees({
           low: Number(microstacksToStx(new BigNumber(stxFees.low))),
diff --git a/src/app/utils/transactions/transactions.ts b/src/app/utils/transactions/transactions.ts
index 72f03b068..2111d8b01 100644
--- a/src/app/utils/transactions/transactions.ts
+++ b/src/app/utils/transactions/transactions.ts
@@ -15,6 +15,7 @@ import {
   type MempoolTransactionListResponse,
   type Transaction,
 } from '@stacks/stacks-blockchain-api-types';
+import { PayloadType } from '@stacks/transactions';
 import axios from 'axios';
 
 interface PaginatedResults<T> {
@@ -145,8 +146,13 @@ export const modifyRecommendedStxFees = (
     high: number;
   },
   appInfo: AppInfo | undefined | null,
+  txType: PayloadType,
 ): { low: number; medium: number; high: number } => {
-  const multiplier = appInfo?.otherTxMultiplier || 1;
+  const multiplier = appInfo
+    ? txType === PayloadType.ContractCall
+      ? appInfo.otherTxMultiplier
+      : appInfo.stxSendTxMultiplier
+    : 1;
   const highCap = appInfo?.thresholdHighStacksFee;
 
   let adjustedLow = Math.round(baseFees.low * multiplier);

From c9821bd9045dd8ab70d4603f20bffa39f39f383a Mon Sep 17 00:00:00 2001
From: jordankzf <jordan@secretkeylabs.com>
Date: Mon, 2 Sep 2024 18:49:18 +0800
Subject: [PATCH 061/227] Remove Alex filtering

---
 src/app/screens/swap/index.tsx              | 3 ++-
 src/app/screens/swap/useMasterCoinsList.tsx | 6 +++---
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/app/screens/swap/index.tsx b/src/app/screens/swap/index.tsx
index f01e5941e..25d6044a5 100644
--- a/src/app/screens/swap/index.tsx
+++ b/src/app/screens/swap/index.tsx
@@ -3,6 +3,7 @@ import RequestsRoutes from '@common/utils/route-urls';
 import BottomBar from '@components/tabBar';
 import TopRow from '@components/topRow';
 import useRuneFloorPriceQuery from '@hooks/queries/runes/useRuneFloorPriceQuery';
+import { useGetSip10FungibleTokens } from '@hooks/queries/stx/useGetSip10FungibleTokens';
 import useGetQuotes from '@hooks/queries/swaps/useGetQuotes';
 import useBtcWalletData from '@hooks/queries/useBtcWalletData';
 import useCoinRates from '@hooks/queries/useCoinRates';
@@ -138,7 +139,7 @@ export default function SwapScreen() {
   const { quotes, loading: quotesLoading, error: quotesError, fetchQuotes } = useGetQuotes();
   const { data: runeFloorPrice } = useRuneFloorPriceQuery(toToken?.name ?? '');
   const coinsMasterList = useMasterCoinsList();
-  const { acceptableCoinList: sip10CoinsList } = useStxCurrencyConversion();
+  const { data: sip10CoinsList } = useGetSip10FungibleTokens();
 
   useEffect(() => {
     if (defaultFrom) {
diff --git a/src/app/screens/swap/useMasterCoinsList.tsx b/src/app/screens/swap/useMasterCoinsList.tsx
index 891046ff6..51cfd440e 100644
--- a/src/app/screens/swap/useMasterCoinsList.tsx
+++ b/src/app/screens/swap/useMasterCoinsList.tsx
@@ -1,11 +1,11 @@
 import IconBitcoin from '@assets/img/dashboard/bitcoin_icon.svg';
 import IconStacks from '@assets/img/dashboard/stx_icon.svg';
 import { useRuneFungibleTokensQuery } from '@hooks/queries/runes/useRuneFungibleTokensQuery';
+import { useGetSip10FungibleTokens } from '@hooks/queries/stx/useGetSip10FungibleTokens';
 import useHasFeature from '@hooks/useHasFeature';
 import useWalletSelector from '@hooks/useWalletSelector';
 import { FeatureId, type FungibleToken } from '@secretkeylabs/xverse-core';
 import { useMemo } from 'react';
-import { useStxCurrencyConversion } from './useStxCurrencyConversion';
 
 export const btcFt: FungibleToken = {
   name: 'Bitcoin',
@@ -30,7 +30,7 @@ export const stxFt: FungibleToken = {
 };
 
 const useMasterCoinsList = () => {
-  const { acceptableCoinList: sip10FtList } = useStxCurrencyConversion();
+  const { data: sip10FtList } = useGetSip10FungibleTokens();
   const { unfilteredData: runesFtList } = useRuneFungibleTokensQuery();
   const { hideStx } = useWalletSelector();
   const isStacksSwapsEnabled = useHasFeature(FeatureId.STACKS_SWAPS);
@@ -40,7 +40,7 @@ const useMasterCoinsList = () => {
       [
         ...(runesFtList || []),
         btcFt,
-        ...(!hideStx && isStacksSwapsEnabled ? [stxFt, ...sip10FtList] : []),
+        ...(!hideStx && isStacksSwapsEnabled ? [stxFt, ...(sip10FtList ?? [])] : []),
       ] ?? [],
     [runesFtList, hideStx, isStacksSwapsEnabled, sip10FtList],
   );

From d68f2018c5dad8aa14294ded065acdbd31522e6e Mon Sep 17 00:00:00 2001
From: Mahmoud Aboelenein <mahmoud@secretkeylabs.com>
Date: Mon, 2 Sep 2024 19:02:51 +0300
Subject: [PATCH 062/227] fix fee cap warning doesn't show

---
 .../confirmStxTransactionComponent/index.tsx          | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/app/components/confirmStxTransactionComponent/index.tsx b/src/app/components/confirmStxTransactionComponent/index.tsx
index e7e865990..75dab0db7 100644
--- a/src/app/components/confirmStxTransactionComponent/index.tsx
+++ b/src/app/components/confirmStxTransactionComponent/index.tsx
@@ -161,12 +161,13 @@ function ConfirmStxTransactionComponent({
   }, [selectedNetwork, initialStxTransactions, feeMultipliers, fee, setFeeRate]);
 
   useEffect(() => {
-    const stxTxFee = BigNumber(initialStxTransactions[0].auth.spendingCondition.fee.toString());
+    if (!feeMultipliers || !fee) return;
 
-    if (
-      feeMultipliers &&
-      stxTxFee.isGreaterThan(BigNumber(feeMultipliers.thresholdHighStacksFee))
-    ) {
+    const feeExceedsThreshold = stxToMicrostacks(new BigNumber(fee)).isGreaterThan(
+      BigNumber(feeMultipliers.thresholdHighStacksFee),
+    );
+
+    if (feeExceedsThreshold) {
       setShowFeeWarning(true);
     } else if (showFeeWarning) {
       setShowFeeWarning(false);

From d6a249299920b5346d65b34d4fd7457bd1258776 Mon Sep 17 00:00:00 2001
From: Mahmoud Aboelenein <mahmoud@secretkeylabs.com>
Date: Mon, 2 Sep 2024 20:27:12 +0300
Subject: [PATCH 063/227] update core version

---
 package-lock.json | 76 ++++++++++++++++-------------------------------
 package.json      |  2 +-
 2 files changed, 26 insertions(+), 52 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index e7f4a673e..b16ca1e4f 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -15,7 +15,7 @@
         "@react-spring/web": "^9.6.1",
         "@sats-connect/core": "0.2.1",
         "@scure/btc-signer": "1.2.1",
-        "@secretkeylabs/xverse-core": "18.8.1-95f903a",
+        "@secretkeylabs/xverse-core": "18.9.0",
         "@stacks/connect": "7.4.1",
         "@stacks/stacks-blockchain-api-types": "6.1.1",
         "@stacks/transactions": "6.16.1",
@@ -1279,9 +1279,9 @@
       }
     },
     "node_modules/@secretkeylabs/xverse-core": {
-      "version": "18.8.1-95f903a",
-      "resolved": "https://npm.pkg.github.com/download/@secretkeylabs/xverse-core/18.8.1-95f903a/2253e7fbd54a34d53a196032b3120be0819938fe",
-      "integrity": "sha512-57NGEcdZnywDUBwkghffvlztaZRDOwSPmTReEUktN+gVc/EhLQG0S+68XZZVCf3M4h4KGLwCZPCRE3a6R07wAQ==",
+      "version": "18.9.0",
+      "resolved": "https://npm.pkg.github.com/download/@secretkeylabs/xverse-core/18.9.0/d25852a70a53ae29de94773ab01883e1350cbd5f",
+      "integrity": "sha512-v0r+eFHezlBmdlms13KH6et6QHFhEBqxGGnI7cyA0oFgL8vtEt94Rkq0SnRwARYXG2yyAH0VRdCp+l/lKVJ6fQ==",
       "license": "ISC",
       "dependencies": {
         "@bitcoinerlab/secp256k1": "^1.0.2",
@@ -1293,13 +1293,13 @@
         "@scure/btc-signer": "1.2.1",
         "@stacks/auth": "6.16.1",
         "@stacks/connect": "7.7.1",
-        "@stacks/encryption": "6.16.1 ",
+        "@stacks/encryption": "6.16.1",
         "@stacks/network": "6.16.0",
-        "@stacks/stacking": "6.16.0",
+        "@stacks/stacking": "6.16.1",
         "@stacks/stacks-blockchain-api-types": "^7.14.1",
-        "@stacks/storage": "6.16.0",
+        "@stacks/storage": "6.16.1",
         "@stacks/transactions": "6.16.1",
-        "@stacks/wallet-sdk": "6.16.1 ",
+        "@stacks/wallet-sdk": "6.16.1",
         "@tanstack/react-query": "^4.29.3",
         "@zondax/ledger-stacks": "^1.0.4",
         "async-mutex": "^0.4.0",
@@ -1388,19 +1388,6 @@
       "resolved": "https://registry.npmjs.org/@stacks/stacks-blockchain-api-types/-/stacks-blockchain-api-types-7.14.1.tgz",
       "integrity": "sha512-65hvhXxC+EUqHJAQsqlBCqXB+zwfxZICSKYJugdg6BCp9I9qniyfz5XyQeC4RMVo0tgEoRdS/b5ZCFo5kLWmxA=="
     },
-    "node_modules/@secretkeylabs/xverse-core/node_modules/@stacks/storage": {
-      "version": "6.16.0",
-      "resolved": "https://registry.npmjs.org/@stacks/storage/-/storage-6.16.0.tgz",
-      "integrity": "sha512-MLOMddIKyOcbzZo7ViW9tm6dhFMfLKf38yhNXpWohCnoxHRaUkCHP1prIT7hd9oLMI22vwtOvWgboJ+/e2uxKg==",
-      "dependencies": {
-        "@stacks/auth": "^6.16.0",
-        "@stacks/common": "^6.16.0",
-        "@stacks/encryption": "^6.16.0",
-        "@stacks/network": "^6.16.0",
-        "base64-js": "^1.5.1",
-        "jsontokens": "^4.0.1"
-      }
-    },
     "node_modules/@secretkeylabs/xverse-core/node_modules/@types/node": {
       "version": "11.11.6",
       "resolved": "https://registry.npmjs.org/@types/node/-/node-11.11.6.tgz",
@@ -1585,17 +1572,17 @@
       }
     },
     "node_modules/@stacks/stacking": {
-      "version": "6.16.0",
-      "resolved": "https://registry.npmjs.org/@stacks/stacking/-/stacking-6.16.0.tgz",
-      "integrity": "sha512-FjhKYyaCu/KytP/khWB9KhNOOrZdqM56xn9yxvZCR6McGSZ+hBeLud1E2WugIOzRX0muZbygCz9c1GBTz+pLiA==",
+      "version": "6.16.1",
+      "resolved": "https://registry.npmjs.org/@stacks/stacking/-/stacking-6.16.1.tgz",
+      "integrity": "sha512-Bv7TSyoMrb1wYOfKrPxwDQPSjsohyKCduN1HYMlKL9hHF0J8+MvlJFw9eIj1c2SEOyYaElT+Ly3CI56J/acVxw==",
       "dependencies": {
         "@noble/hashes": "1.1.5",
         "@scure/base": "1.1.1",
         "@stacks/common": "^6.16.0",
-        "@stacks/encryption": "^6.16.0",
+        "@stacks/encryption": "^6.16.1",
         "@stacks/network": "^6.16.0",
         "@stacks/stacks-blockchain-api-types": "^0.61.0",
-        "@stacks/transactions": "^6.16.0",
+        "@stacks/transactions": "^6.16.1",
         "bs58": "^5.0.0"
       }
     },
@@ -13861,9 +13848,9 @@
       }
     },
     "@secretkeylabs/xverse-core": {
-      "version": "18.8.1-95f903a",
-      "resolved": "https://npm.pkg.github.com/download/@secretkeylabs/xverse-core/18.8.1-95f903a/2253e7fbd54a34d53a196032b3120be0819938fe",
-      "integrity": "sha512-57NGEcdZnywDUBwkghffvlztaZRDOwSPmTReEUktN+gVc/EhLQG0S+68XZZVCf3M4h4KGLwCZPCRE3a6R07wAQ==",
+      "version": "18.9.0",
+      "resolved": "https://npm.pkg.github.com/download/@secretkeylabs/xverse-core/18.9.0/d25852a70a53ae29de94773ab01883e1350cbd5f",
+      "integrity": "sha512-v0r+eFHezlBmdlms13KH6et6QHFhEBqxGGnI7cyA0oFgL8vtEt94Rkq0SnRwARYXG2yyAH0VRdCp+l/lKVJ6fQ==",
       "requires": {
         "@bitcoinerlab/secp256k1": "^1.0.2",
         "@noble/curves": "^1.2.0",
@@ -13874,13 +13861,13 @@
         "@scure/btc-signer": "1.2.1",
         "@stacks/auth": "6.16.1",
         "@stacks/connect": "7.7.1",
-        "@stacks/encryption": "6.16.1 ",
+        "@stacks/encryption": "6.16.1",
         "@stacks/network": "6.16.0",
-        "@stacks/stacking": "6.16.0",
+        "@stacks/stacking": "6.16.1",
         "@stacks/stacks-blockchain-api-types": "^7.14.1",
-        "@stacks/storage": "6.16.0",
+        "@stacks/storage": "6.16.1",
         "@stacks/transactions": "6.16.1",
-        "@stacks/wallet-sdk": "6.16.1 ",
+        "@stacks/wallet-sdk": "6.16.1",
         "@tanstack/react-query": "^4.29.3",
         "@zondax/ledger-stacks": "^1.0.4",
         "async-mutex": "^0.4.0",
@@ -13947,19 +13934,6 @@
           "resolved": "https://registry.npmjs.org/@stacks/stacks-blockchain-api-types/-/stacks-blockchain-api-types-7.14.1.tgz",
           "integrity": "sha512-65hvhXxC+EUqHJAQsqlBCqXB+zwfxZICSKYJugdg6BCp9I9qniyfz5XyQeC4RMVo0tgEoRdS/b5ZCFo5kLWmxA=="
         },
-        "@stacks/storage": {
-          "version": "6.16.0",
-          "resolved": "https://registry.npmjs.org/@stacks/storage/-/storage-6.16.0.tgz",
-          "integrity": "sha512-MLOMddIKyOcbzZo7ViW9tm6dhFMfLKf38yhNXpWohCnoxHRaUkCHP1prIT7hd9oLMI22vwtOvWgboJ+/e2uxKg==",
-          "requires": {
-            "@stacks/auth": "^6.16.0",
-            "@stacks/common": "^6.16.0",
-            "@stacks/encryption": "^6.16.0",
-            "@stacks/network": "^6.16.0",
-            "base64-js": "^1.5.1",
-            "jsontokens": "^4.0.1"
-          }
-        },
         "@types/node": {
           "version": "11.11.6",
           "resolved": "https://registry.npmjs.org/@types/node/-/node-11.11.6.tgz",
@@ -14121,17 +14095,17 @@
       }
     },
     "@stacks/stacking": {
-      "version": "6.16.0",
-      "resolved": "https://registry.npmjs.org/@stacks/stacking/-/stacking-6.16.0.tgz",
-      "integrity": "sha512-FjhKYyaCu/KytP/khWB9KhNOOrZdqM56xn9yxvZCR6McGSZ+hBeLud1E2WugIOzRX0muZbygCz9c1GBTz+pLiA==",
+      "version": "6.16.1",
+      "resolved": "https://registry.npmjs.org/@stacks/stacking/-/stacking-6.16.1.tgz",
+      "integrity": "sha512-Bv7TSyoMrb1wYOfKrPxwDQPSjsohyKCduN1HYMlKL9hHF0J8+MvlJFw9eIj1c2SEOyYaElT+Ly3CI56J/acVxw==",
       "requires": {
         "@noble/hashes": "1.1.5",
         "@scure/base": "1.1.1",
         "@stacks/common": "^6.16.0",
-        "@stacks/encryption": "^6.16.0",
+        "@stacks/encryption": "^6.16.1",
         "@stacks/network": "^6.16.0",
         "@stacks/stacks-blockchain-api-types": "^0.61.0",
-        "@stacks/transactions": "^6.16.0",
+        "@stacks/transactions": "^6.16.1",
         "bs58": "^5.0.0"
       },
       "dependencies": {
diff --git a/package.json b/package.json
index a1b885ad3..9d7ef2988 100644
--- a/package.json
+++ b/package.json
@@ -43,7 +43,7 @@
     "@react-spring/web": "^9.6.1",
     "@sats-connect/core": "0.2.1",
     "@scure/btc-signer": "1.2.1",
-    "@secretkeylabs/xverse-core": "18.8.1-95f903a",
+    "@secretkeylabs/xverse-core": "18.9.0",
     "@stacks/connect": "7.4.1",
     "@stacks/stacks-blockchain-api-types": "6.1.1",
     "@stacks/transactions": "6.16.1",

From 00436ee2ca91197adbc067764e8d248cc4949faf Mon Sep 17 00:00:00 2001
From: GitHub Actions Bot <>
Date: Mon, 2 Sep 2024 17:46:15 +0000
Subject: [PATCH 064/227] release: v0.41.1

---
 package-lock.json | 4 ++--
 package.json      | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index b16ca1e4f..c3f119e2a 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "xverse-web-extension",
-  "version": "0.41.0",
+  "version": "0.41.1",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "xverse-web-extension",
-      "version": "0.41.0",
+      "version": "0.41.1",
       "dependencies": {
         "@aryzing/superqs": "0.0.6",
         "@ledgerhq/hw-transport-webusb": "^6.27.13",
diff --git a/package.json b/package.json
index 9d7ef2988..057a6678b 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "xverse-web-extension",
   "description": "A Bitcoin wallet for Web3",
-  "version": "0.41.0",
+  "version": "0.41.1",
   "private": true,
   "engines": {
     "node": "^18.18.2"

From e6c82b6c138353058c864262d8335ea60c0bb96c Mon Sep 17 00:00:00 2001
From: Den <36603049+dhriaznov@users.noreply.github.com>
Date: Tue, 3 Sep 2024 15:14:18 +0200
Subject: [PATCH 065/227] Add the E2E test result section to the PR template
 and updated the readme (#544)

* Add the E2E test result section to the PR template

* updated the pr description for running e2e tests

* moved the E2E section from readme to PR description

* updated the node version in the readme to 18

---------

Co-authored-by: DuskaT021 <aleksa2601@gmail.com>
---
 .github/PULL_REQUEST_TEMPLATE.md | 23 +++++++++++++++++++++++
 README.md                        | 29 +----------------------------
 2 files changed, 24 insertions(+), 28 deletions(-)

diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
index 0aa70c0a1..504fed181 100644
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -1,4 +1,5 @@
 # 🔘 PR Type
+
 What kind of change does this PR introduce?
 
 <!-- Please check the one that applies to this PR using "x". -->
@@ -13,22 +14,44 @@ What kind of change does this PR introduce?
 - [ ] Other... Please describe:
 
 # 📜 Background
+
 Provide a brief explanation of why this pull request is needed. Include the problem you are solving or the functionality you are adding. Reference any related issues.
 
 Issue Link: #[issue_number]
 Context Link (if applicable):
 
 # 🔄 Changes
+
 Enumerate the changes made in this pull request, detailing what has been modified, added, or removed. Include technical details and implications if necessary.
 
 Impact:
+
 - Explain the broader impact of these changes.
 - How it improves performance, fixes bugs, adds functionality, etc.
 
+# 🧪 E2E Test Result
+
+Include a screenshot of the e2e test result.
+
+`Run E2E Tests`
+Our End-to-end (E2E) test suite is build with Playwright. To run the whole E2E test suite, run:
+`npm run e2etest`
+
+If you only want to run the smoke test suite, run
+`npm run e2etest:smoketest`
+
+If you want to run the e2e test in UI Mode:
+`npm run e2etest:ui`
+
+To generate test report, run:
+`npm run e2etest:report`
+
 # 🖼 Screenshot / 📹 Video
+
 Include screenshots or a video demonstrating the changes. This is especially helpful for UI changes.
 
 # ✅ Review checklist
+
 Please ensure the following are true before merging:
 
 - [ ] Code Style is consistent with the project guidelines.
diff --git a/README.md b/README.md
index 1bca9fcc6..3237ba9bc 100644
--- a/README.md
+++ b/README.md
@@ -4,7 +4,7 @@
 
 ### Procedures
 
-1. Check if your [Node.js](https://nodejs.org/) version is >= **14**.
+1. Check if your [Node.js](https://nodejs.org/) version is >= **18**.
 2. Clone this repository.
 3. Make sure you're logged in to the @secretkeylabs scope on the GitHub NPM package registry. See the [Guide](https://docs.github.com/en/packages/working-with-a-github-packages-registry/working-with-the-npm-registry#authenticating-with-a-personal-access-token)
    1. Create a GitHub personal access token (classic)
@@ -32,30 +32,3 @@ make or pull your local changes to xverse-core, then:
 cd ../xverse-core && npm i && npm run build:esm && \
 cd $OLDPWD && npm i --legacy-peer-deps @secretkeylabs/xverse-core@../xverse-core && npm start
 ```
-
-### Run E2E Tests
-
-Our End-to-end (E2E) test suite is build with Playwright.
-To run the whole E2E test suite, run:
-
-```
-npm run e2etest
-```
-
-If you only want to run the smoke test suite, run
-
-```
-npm run e2etest:smoketest
-```
-
-If you want to run the e2e test in UI Mode:
-
-```
-npm run e2etest:ui
-```
-
-To generate test report, run:
-
-```
-npm run e2etest:report
-```

From 4314523ddb1c2757205be2c51ef8ecee668a662d Mon Sep 17 00:00:00 2001
From: Den <36603049+dhriaznov@users.noreply.github.com>
Date: Tue, 3 Sep 2024 16:47:49 +0200
Subject: [PATCH 066/227] [ENG-5094] Remove the Reset wallet option from the
 Home screen three dots menu (#557)

* [ENG-5094] Remove the Reset wallet option from the Home screen three dots menu

* Update e2e tests

* Update e2e tests
---
 src/app/components/accountHeader/index.tsx | 125 ++++-----------------
 tests/pages/wallet.ts                      |   3 -
 tests/specs/createWallet.spec.ts           |  19 ++--
 3 files changed, 33 insertions(+), 114 deletions(-)

diff --git a/src/app/components/accountHeader/index.tsx b/src/app/components/accountHeader/index.tsx
index 477418fee..17ba73762 100644
--- a/src/app/components/accountHeader/index.tsx
+++ b/src/app/components/accountHeader/index.tsx
@@ -1,6 +1,4 @@
 import AccountRow from '@components/accountRow';
-import PasswordInput from '@components/passwordInput';
-import ResetWalletPrompt from '@components/resetWallet';
 import useWalletReducer from '@hooks/useWalletReducer';
 import { useState } from 'react';
 import { useTranslation } from 'react-i18next';
@@ -8,7 +6,6 @@ import { useNavigate } from 'react-router-dom';
 import styled from 'styled-components';
 
 import OptionsDialog from '@components/optionsDialog/optionsDialog';
-import useSeedVault from '@hooks/useSeedVault';
 import useSelectedAccount from '@hooks/useSelectedAccount';
 import { DotsThreeVertical } from '@phosphor-icons/react';
 import { OPTIONS_DIALOG_WIDTH } from '@utils/constants';
@@ -25,21 +22,6 @@ const SelectedAccountContainer = styled.div<{ showBorderBottom?: boolean }>((pro
     : 'none',
 }));
 
-const ResetWalletContainer = styled.div((props) => ({
-  width: '100%',
-  height: '100%',
-  top: 0,
-  left: 0,
-  bottom: 0,
-  right: 0,
-  position: 'fixed',
-  zIndex: 10,
-  background: 'rgba(25, 25, 48, 0.5)',
-  backdropFilter: 'blur(16px)',
-  padding: props.theme.spacing(8),
-  paddingTop: props.theme.spacing(30),
-}));
-
 const OptionsButton = styled.button(() => ({
   display: 'flex',
   alignItems: 'center',
@@ -67,10 +49,6 @@ const ButtonRow = styled.button`
   }
 `;
 
-const WarningButton = styled(ButtonRow)`
-  color: ${(props) => props.theme.colors.feedback.error};
-`;
-
 type Props = {
   disableMenuOption?: boolean;
   disableAccountSwitch?: boolean;
@@ -85,49 +63,15 @@ function AccountHeaderComponent({
   const navigate = useNavigate();
   const selectedAccount = useSelectedAccount();
 
-  const { t } = useTranslation('translation', { keyPrefix: 'SETTING_SCREEN' });
   const { t: optionsDialogTranslation } = useTranslation('translation', {
     keyPrefix: 'OPTIONS_DIALOG',
   });
   const [showOptionsDialog, setShowOptionsDialog] = useState(false);
-  const [showResetWalletPrompt, setShowResetWalletPrompt] = useState(false);
-  const [showResetWalletDisplay, setShowResetWalletDisplay] = useState(false);
-  const [password, setPassword] = useState('');
-  const { lockWallet, resetWallet } = useWalletReducer();
-  const { unlockVault } = useSeedVault();
-  const [error, setError] = useState('');
+  const { lockWallet } = useWalletReducer();
   const [optionsDialogIndents, setOptionsDialogIndents] = useState<
     { top: string; left: string } | undefined
   >();
 
-  const handlePasswordNextClick = async () => {
-    try {
-      await unlockVault(password);
-      setPassword('');
-      setError('');
-      await resetWallet();
-    } catch (e) {
-      setError(t('INCORRECT_PASSWORD_ERROR'));
-    }
-  };
-
-  const onGoBack = () => {
-    navigate(0);
-  };
-
-  const onResetWalletPromptClose = () => {
-    setShowResetWalletPrompt(false);
-  };
-
-  const handleResetWalletPromptOpen = () => {
-    setShowResetWalletPrompt(true);
-  };
-
-  const openResetWalletScreen = () => {
-    setShowResetWalletPrompt(false);
-    setShowResetWalletDisplay(true);
-  };
-
   const handleAccountSelect = () => {
     if (!disableAccountSwitch) {
       navigate('/account-list');
@@ -152,54 +96,27 @@ function AccountHeaderComponent({
   };
 
   return (
-    <>
-      {showResetWalletDisplay && (
-        <ResetWalletContainer>
-          <PasswordInput
-            title={t('ENTER_PASSWORD')}
-            inputLabel={t('PASSWORD')}
-            enteredPassword={password}
-            setEnteredPassword={setPassword}
-            handleContinue={handlePasswordNextClick}
-            handleBack={onGoBack}
-            passwordError={error}
-            stackButtonAlignment
-          />
-        </ResetWalletContainer>
-      )}
-      <SelectedAccountContainer showBorderBottom={showBorderBottom}>
-        <AccountRow
-          account={selectedAccount!}
-          isSelected
-          onAccountSelected={handleAccountSelect}
-          disabledAccountSelect={disableAccountSwitch}
-        />
-        {!disableMenuOption && (
-          <OptionsButton aria-label="Open Header Options" onClick={openOptionsDialog}>
-            <DotsThreeVertical size={20} fill="white" />
-          </OptionsButton>
-        )}
-        {showOptionsDialog && (
-          <OptionsDialog
-            closeDialog={closeOptionsDialog}
-            optionsDialogIndents={optionsDialogIndents}
-          >
-            <ButtonRow onClick={handleAccountSelect}>
-              {optionsDialogTranslation('SWITCH_ACCOUNT')}
-            </ButtonRow>
-            <ButtonRow onClick={handleLockWallet}>{optionsDialogTranslation('LOCK')}</ButtonRow>
-            <WarningButton onClick={handleResetWalletPromptOpen}>
-              {optionsDialogTranslation('RESET_WALLET')}
-            </WarningButton>
-          </OptionsDialog>
-        )}
-      </SelectedAccountContainer>
-      <ResetWalletPrompt
-        showResetWalletPrompt={showResetWalletPrompt}
-        onResetWalletPromptClose={onResetWalletPromptClose}
-        openResetWalletScreen={openResetWalletScreen}
+    <SelectedAccountContainer showBorderBottom={showBorderBottom}>
+      <AccountRow
+        account={selectedAccount!}
+        isSelected
+        onAccountSelected={handleAccountSelect}
+        disabledAccountSelect={disableAccountSwitch}
       />
-    </>
+      {!disableMenuOption && (
+        <OptionsButton aria-label="Open Header Options" onClick={openOptionsDialog}>
+          <DotsThreeVertical size={20} fill="white" />
+        </OptionsButton>
+      )}
+      {showOptionsDialog && (
+        <OptionsDialog closeDialog={closeOptionsDialog} optionsDialogIndents={optionsDialogIndents}>
+          <ButtonRow onClick={handleAccountSelect}>
+            {optionsDialogTranslation('SWITCH_ACCOUNT')}
+          </ButtonRow>
+          <ButtonRow onClick={handleLockWallet}>{optionsDialogTranslation('LOCK')}</ButtonRow>
+        </OptionsDialog>
+      )}
+    </SelectedAccountContainer>
   );
 }
 
diff --git a/tests/pages/wallet.ts b/tests/pages/wallet.ts
index 5c7725849..1e4d13aa8 100644
--- a/tests/pages/wallet.ts
+++ b/tests/pages/wallet.ts
@@ -36,8 +36,6 @@ export default class Wallet {
 
   readonly buttonConfirm: Locator;
 
-  readonly buttonResetWallet: Locator;
-
   readonly buttonDenyDataCollection: Locator;
 
   readonly buttonNetwork: Locator;
@@ -385,7 +383,6 @@ export default class Wallet {
     this.buttonMenu = page.getByRole('button', { name: 'Open Header Options' });
     this.buttonLock = page.getByRole('button', { name: 'Lock' });
     this.buttonConfirm = page.getByRole('button', { name: 'Confirm' });
-    this.buttonResetWallet = page.getByRole('button', { name: 'Reset Wallet' });
     this.buttonDenyDataCollection = page.getByRole('button', { name: 'Deny' });
     this.labelBalanceAmountSelector = page.getByTestId('balance-label');
     this.buttonClose = page.getByRole('button', { name: 'Close' });
diff --git a/tests/specs/createWallet.spec.ts b/tests/specs/createWallet.spec.ts
index d38d57bfc..e0f530738 100644
--- a/tests/specs/createWallet.spec.ts
+++ b/tests/specs/createWallet.spec.ts
@@ -90,16 +90,21 @@ test.describe('Create and Restore Wallet Flow', () => {
       // Write the file
       fs.writeFileSync(filePathAddresses, dataAddress, 'utf8');
     });
-    await test.step('reset Wallet via Menu', async () => {
-      await expect(wallet.buttonMenu).toBeVisible();
-      await wallet.buttonMenu.click();
-      await expect(wallet.buttonResetWallet).toBeVisible();
-      await wallet.buttonResetWallet.click();
-      await wallet.buttonResetWallet.click();
-      await expect(onboardingPage.inputPassword).toBeVisible();
+
+    await test.step('Reset Wallet via Settings', async () => {
+      // Go to Settings -> Security
+      await wallet.navigationSettings.click();
+      await wallet.buttonSecurity.click();
+
+      // Confirm reset
+      await page.getByRole('button', { name: 'Reset Wallet' }).first().click();
+      await page.getByRole('dialog').getByRole('button', { name: 'Reset Wallet' }).click();
+
+      // Enter password to confirm reset
       await onboardingPage.inputPassword.fill(strongPW);
       await onboardingPage.buttonContinue.click();
     });
+
     await test.step('Restore wallet with 12 word seed phrase', async () => {
       const landingPage = new Landing(page);
       await expect(landingPage.buttonRestoreWallet).toBeVisible();

From 0588fee5cde2fdaa42c748d3b1c3cf36d3dbfca3 Mon Sep 17 00:00:00 2001
From: Den <36603049+dhriaznov@users.noreply.github.com>
Date: Tue, 3 Sep 2024 17:28:17 +0200
Subject: [PATCH 067/227] Add timeouts in e2e before changing network to avoid
 rate limiting (#558)

---
 tests/pages/wallet.ts | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/tests/pages/wallet.ts b/tests/pages/wallet.ts
index 1e4d13aa8..dfdcdaee7 100644
--- a/tests/pages/wallet.ts
+++ b/tests/pages/wallet.ts
@@ -1097,6 +1097,9 @@ export default class Wallet {
 
     await this.checkTestnetUrls(true);
 
+    // Wait for the network to be switched so that API doesn't fail because of the rate limiting
+    await this.page.waitForTimeout(15000);
+
     await this.buttonSave.click();
     await expect(this.buttonNetwork).toBeVisible({ timeout: 30000 });
     await expect(this.buttonNetwork).toHaveText('NetworkTestnet');
@@ -1116,6 +1119,9 @@ export default class Wallet {
 
     await this.checkTestnetUrls(false);
 
+    // Wait for the network to be switched so that API doesn't fail because of the rate limiting
+    await this.page.waitForTimeout(15000);
+
     await this.buttonSave.click();
     await expect(this.buttonNetwork).toBeVisible({ timeout: 30000 });
     await expect(this.buttonNetwork).toHaveText('NetworkMainnet');

From c972cfb299f14decf3ae63377e8ad56deabd1ef0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Eduard=20Bardaj=C3=AD=20Puig?= <ebardaji@gmail.com>
Date: Wed, 4 Sep 2024 07:49:49 +0200
Subject: [PATCH 068/227] Use better nonce (#553)

Co-authored-by: Tim Man <tim@secretkeylabs.com>
---
 package-lock.json                                      | 10 +++++-----
 package.json                                           |  2 +-
 .../confirmStxTransactionComponent/index.tsx           |  4 ++--
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index ff7f4a308..297e0e7d0 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -15,7 +15,7 @@
         "@react-spring/web": "^9.6.1",
         "@sats-connect/core": "0.2.1",
         "@scure/btc-signer": "1.2.1",
-        "@secretkeylabs/xverse-core": "18.8.1-7f289bb",
+        "@secretkeylabs/xverse-core": "19.0.0",
         "@stacks/connect": "7.4.1",
         "@stacks/stacks-blockchain-api-types": "6.1.1",
         "@stacks/transactions": "6.16.1",
@@ -1279,9 +1279,9 @@
       }
     },
     "node_modules/@secretkeylabs/xverse-core": {
-      "version": "18.8.1-7f289bb",
-      "resolved": "https://npm.pkg.github.com/download/@secretkeylabs/xverse-core/18.8.1-7f289bb/c769239023b0c763dd84649a661b80d47111cc54",
-      "integrity": "sha512-4DcpbvTDXEPIp/TXz1w6bJflgsaYheipsZkOl4Lf5pAM5rtbzDzIoCobRBwPgBUtF46matrVxAex4Mo77nfPJQ==",
+      "version": "19.0.0",
+      "resolved": "https://npm.pkg.github.com/download/@secretkeylabs/xverse-core/18.8.1-e391063/57c20779656abba3cdc7b17becba1ac2334c0355",
+      "integrity": "sha512-Cuj0ZSY+RBGiW2mjKsih67vs5wf2Qj5mql8i3E3KeRkfyYP2r6PtsFgBnTxR9vIhYgqx27PUjRHWpbGEz9M5pQ==",
       "license": "ISC",
       "dependencies": {
         "@bitcoinerlab/secp256k1": "^1.0.2",
@@ -13846,7 +13846,7 @@
       }
     },
     "@secretkeylabs/xverse-core": {
-      "version": "18.8.1-7f289bb",
+      "version": "19.0.0",
       "resolved": "https://npm.pkg.github.com/download/@secretkeylabs/xverse-core/18.8.1-7f289bb/c769239023b0c763dd84649a661b80d47111cc54",
       "integrity": "sha512-4DcpbvTDXEPIp/TXz1w6bJflgsaYheipsZkOl4Lf5pAM5rtbzDzIoCobRBwPgBUtF46matrVxAex4Mo77nfPJQ==",
       "requires": {
diff --git a/package.json b/package.json
index 92d60002c..3c24e8085 100644
--- a/package.json
+++ b/package.json
@@ -43,7 +43,7 @@
     "@react-spring/web": "^9.6.1",
     "@sats-connect/core": "0.2.1",
     "@scure/btc-signer": "1.2.1",
-    "@secretkeylabs/xverse-core": "18.8.1-7f289bb",
+    "@secretkeylabs/xverse-core": "19.0.0",
     "@stacks/connect": "7.4.1",
     "@stacks/stacks-blockchain-api-types": "6.1.1",
     "@stacks/transactions": "6.16.1",
diff --git a/src/app/components/confirmStxTransactionComponent/index.tsx b/src/app/components/confirmStxTransactionComponent/index.tsx
index 5b53921cf..d27dc7f65 100644
--- a/src/app/components/confirmStxTransactionComponent/index.tsx
+++ b/src/app/components/confirmStxTransactionComponent/index.tsx
@@ -18,7 +18,7 @@ import {
   getNonce,
   getStxFiatEquivalent,
   microstacksToStx,
-  possiblNexteNonce,
+  nextBestNonce,
   signLedgerStxTransaction,
   signMultiStxTransactions,
   signTransaction,
@@ -222,7 +222,7 @@ function ConfirmStxTransactionComponent({
 
     if (initialStxTransactions.length === 1) {
       const transaction = initialStxTransactions[0];
-      const nonce = await possiblNexteNonce(selectedAccount.stxAddress, network);
+      const nonce = await nextBestNonce(selectedAccount.stxAddress, network);
       transaction.setNonce(nonce);
       const signedContractCall = await signTransaction(
         transaction,

From 7f15a2c674c0acd22c335feabca1da0a749cdcd5 Mon Sep 17 00:00:00 2001
From: Tim Man <tim@secretkeylabs.com>
Date: Wed, 4 Sep 2024 13:55:12 +0800
Subject: [PATCH 069/227] chore: run npm i for core 19.0.0

---
 package-lock.json | 21 ++++++++++++++++-----
 1 file changed, 16 insertions(+), 5 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 297e0e7d0..ce9a8666c 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1280,9 +1280,8 @@
     },
     "node_modules/@secretkeylabs/xverse-core": {
       "version": "19.0.0",
-      "resolved": "https://npm.pkg.github.com/download/@secretkeylabs/xverse-core/18.8.1-e391063/57c20779656abba3cdc7b17becba1ac2334c0355",
-      "integrity": "sha512-Cuj0ZSY+RBGiW2mjKsih67vs5wf2Qj5mql8i3E3KeRkfyYP2r6PtsFgBnTxR9vIhYgqx27PUjRHWpbGEz9M5pQ==",
-      "license": "ISC",
+      "resolved": "https://npm.pkg.github.com/download/@secretkeylabs/xverse-core/19.0.0/7b2d47d225739051b88873932cd373fa5672b647",
+      "integrity": "sha512-3TBd/JeH0PCvqmPKsFJee8XwvBTAUWkrqNgkA3jUCmj1lpdBn6Uw6MTAsTdMBIiOvT8A4PdNf44BrPplTgHZdw==",
       "dependencies": {
         "@bitcoinerlab/secp256k1": "^1.0.2",
         "@noble/curves": "^1.2.0",
@@ -1296,6 +1295,7 @@
         "@stacks/encryption": "6.16.1",
         "@stacks/network": "6.16.0",
         "@stacks/stacking": "6.16.1",
+        "@stacks/stacks-blockchain-api-types": "^7.14.1",
         "@stacks/storage": "6.16.1",
         "@stacks/transactions": "6.16.1",
         "@stacks/wallet-sdk": "6.16.1",
@@ -1382,6 +1382,11 @@
         "@stencil/core": "^2.17.1"
       }
     },
+    "node_modules/@secretkeylabs/xverse-core/node_modules/@stacks/stacks-blockchain-api-types": {
+      "version": "7.14.1",
+      "resolved": "https://registry.npmjs.org/@stacks/stacks-blockchain-api-types/-/stacks-blockchain-api-types-7.14.1.tgz",
+      "integrity": "sha512-65hvhXxC+EUqHJAQsqlBCqXB+zwfxZICSKYJugdg6BCp9I9qniyfz5XyQeC4RMVo0tgEoRdS/b5ZCFo5kLWmxA=="
+    },
     "node_modules/@secretkeylabs/xverse-core/node_modules/@types/node": {
       "version": "11.11.6",
       "resolved": "https://registry.npmjs.org/@types/node/-/node-11.11.6.tgz",
@@ -13847,8 +13852,8 @@
     },
     "@secretkeylabs/xverse-core": {
       "version": "19.0.0",
-      "resolved": "https://npm.pkg.github.com/download/@secretkeylabs/xverse-core/18.8.1-7f289bb/c769239023b0c763dd84649a661b80d47111cc54",
-      "integrity": "sha512-4DcpbvTDXEPIp/TXz1w6bJflgsaYheipsZkOl4Lf5pAM5rtbzDzIoCobRBwPgBUtF46matrVxAex4Mo77nfPJQ==",
+      "resolved": "https://npm.pkg.github.com/download/@secretkeylabs/xverse-core/19.0.0/7b2d47d225739051b88873932cd373fa5672b647",
+      "integrity": "sha512-3TBd/JeH0PCvqmPKsFJee8XwvBTAUWkrqNgkA3jUCmj1lpdBn6Uw6MTAsTdMBIiOvT8A4PdNf44BrPplTgHZdw==",
       "requires": {
         "@bitcoinerlab/secp256k1": "^1.0.2",
         "@noble/curves": "^1.2.0",
@@ -13862,6 +13867,7 @@
         "@stacks/encryption": "6.16.1",
         "@stacks/network": "6.16.0",
         "@stacks/stacking": "6.16.1",
+        "@stacks/stacks-blockchain-api-types": "^7.14.1",
         "@stacks/storage": "6.16.1",
         "@stacks/transactions": "6.16.1",
         "@stacks/wallet-sdk": "6.16.1",
@@ -13926,6 +13932,11 @@
             "@stencil/core": "^2.17.1"
           }
         },
+        "@stacks/stacks-blockchain-api-types": {
+          "version": "7.14.1",
+          "resolved": "https://registry.npmjs.org/@stacks/stacks-blockchain-api-types/-/stacks-blockchain-api-types-7.14.1.tgz",
+          "integrity": "sha512-65hvhXxC+EUqHJAQsqlBCqXB+zwfxZICSKYJugdg6BCp9I9qniyfz5XyQeC4RMVo0tgEoRdS/b5ZCFo5kLWmxA=="
+        },
         "@types/node": {
           "version": "11.11.6",
           "resolved": "https://registry.npmjs.org/@types/node/-/node-11.11.6.tgz",

From 9ac72fd34d60ee7c192ea6cfcf00da2047126a05 Mon Sep 17 00:00:00 2001
From: jordankzf <jordan@secretkeylabs.com>
Date: Wed, 4 Sep 2024 15:44:44 +0800
Subject: [PATCH 070/227] Fix Slippage rounding issue

---
 src/app/screens/swap/index.tsx              | 1 -
 src/app/screens/swap/quoteSummary/index.tsx | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/app/screens/swap/index.tsx b/src/app/screens/swap/index.tsx
index 25d6044a5..072d25d1d 100644
--- a/src/app/screens/swap/index.tsx
+++ b/src/app/screens/swap/index.tsx
@@ -47,7 +47,6 @@ import QuoteSummary from './quoteSummary';
 import QuotesModal from './quotesModal';
 import type { OrderInfo, Side, StxOrderInfo } from './types';
 import useMasterCoinsList from './useMasterCoinsList';
-import { useStxCurrencyConversion } from './useStxCurrencyConversion';
 import {
   isStxTx,
   mapFTNativeSwapTokenToTokenBasic,
diff --git a/src/app/screens/swap/quoteSummary/index.tsx b/src/app/screens/swap/quoteSummary/index.tsx
index 3debaf0b5..0d849098c 100644
--- a/src/app/screens/swap/quoteSummary/index.tsx
+++ b/src/app/screens/swap/quoteSummary/index.tsx
@@ -484,7 +484,7 @@ export default function QuoteSummary({
                   {showSlippageWarning && (
                     <WarningOctagon weight="fill" color={theme.colors.caution} size={16} />
                   )}
-                  {slippage * 100}%
+                  {formatNumber(slippage * 100)}%
                   <img alt={t('SLIPPAGE')} src={SlippageEditIcon} />
                 </SlippageButton>
               </ListingDescriptionRow>

From e40e10d220c94d5bb719ce3fcc5eec7e1aeae7c4 Mon Sep 17 00:00:00 2001
From: "Duska.T" <55587184+DuskaT021@users.noreply.github.com>
Date: Wed, 4 Sep 2024 10:07:53 +0200
Subject: [PATCH 071/227] Added the e2e test for stacks swap test on mainnet -
 velar (#559)

* added the first stacks swap test on mainnet - velar

* improve after review

* improved locator
---
 tests/specs/swapVelar.spec.ts | 57 +++++++++++++++++++++++++++++++++++
 1 file changed, 57 insertions(+)
 create mode 100644 tests/specs/swapVelar.spec.ts

diff --git a/tests/specs/swapVelar.spec.ts b/tests/specs/swapVelar.spec.ts
new file mode 100644
index 000000000..733a9fe34
--- /dev/null
+++ b/tests/specs/swapVelar.spec.ts
@@ -0,0 +1,57 @@
+import { expect, test } from '../fixtures/base';
+import { enableCrossChainSwaps } from '../fixtures/helpers';
+import Wallet from '../pages/wallet';
+//* swap STX for runes using Velar on mainnet(not supported on testnet)
+
+test.describe('Velar sip-10 swap flow', () => {
+  test.beforeAll(async ({ page }) => {
+    await enableCrossChainSwaps(page);
+  });
+  test('Check the Velar sip-10 flow on mainnet #localexecution', async ({ page, extensionId }) => {
+    // set up the testing wallet
+    const wallet = new Wallet(page);
+    await wallet.setupTest(extensionId, 'SEED_WORDS1', false);
+
+    // click the swap button and choose STX->Velar route
+    await page.getByRole('button', { name: 'Swap' }).click();
+
+    await page
+      .getByRole('button', { name: /select asset/i })
+      .first()
+      .click();
+    await page.getByText(/stacks/i).click();
+    page
+      .getByRole('button', { name: /select asset/i })
+      .last()
+      .click();
+
+    await page.getByText(/velar/i).first().click();
+    page.getByRole('textbox', { name: '0' }).fill('0.1');
+    page.getByRole('button', { name: /get quotes/i }).click();
+    page.getByRole('heading', { name: /rates/i }).isVisible();
+    await page.getByText(/^\d+\.\d+\s+Velar$/i).click();
+
+    // Arrive to Quotes page
+    await expect(page.getByText(/quote/i)).toBeVisible();
+    await expect(page.getByText(/4%/i)).toBeVisible();
+
+    page.getByRole('img', { name: /velar logo/i }).isVisible();
+    page.getByRole('button', { name: /swap/i }).click();
+
+    // Arrive to the final step - swap contract page
+    await expect(page.getByText(/swap-exact-tokens-for-tokens/i)).toHaveCount(2);
+    page
+      .getByText(/network fee/i)
+      .getByText(/^\d+\.\d+\s+STX$/i)
+      .isVisible();
+    page.getByRole('button', { name: /edit nonce/i }).isVisible();
+
+    // User clicks confirm
+    page.getByRole('button', { name: /confirm/i }).click();
+    await expect(page.getByText(/transaction broadcasted/i)).toBeVisible();
+    page.getByRole('button', { name: /close/i }).click();
+
+    // After closing user should arrive to homepage
+    await expect(page).toHaveURL(/popup\.html/);
+  });
+});

From 09d6ec4c391f4a94a497ac0d03e585166ac1370b Mon Sep 17 00:00:00 2001
From: jordankzf <jordan@secretkeylabs.com>
Date: Wed, 4 Sep 2024 16:47:30 +0800
Subject: [PATCH 072/227] Use BigNumber

---
 src/app/screens/swap/quoteSummary/index.tsx  |  3 +--
 src/app/screens/swap/slippageModal/index.tsx | 25 +++++++++++++-------
 2 files changed, 17 insertions(+), 11 deletions(-)

diff --git a/src/app/screens/swap/quoteSummary/index.tsx b/src/app/screens/swap/quoteSummary/index.tsx
index 0d849098c..1fdc543e4 100644
--- a/src/app/screens/swap/quoteSummary/index.tsx
+++ b/src/app/screens/swap/quoteSummary/index.tsx
@@ -31,9 +31,8 @@ import { useTranslation } from 'react-i18next';
 import styled, { useTheme } from 'styled-components';
 import trackSwapMixPanel from '../mixpanel';
 import QuoteTile from '../quotesModal/quoteTile';
-import { SlippageModalContent } from '../slippageModal';
+import SlippageModalContent from '../slippageModal';
 import type { OrderInfo, StxOrderInfo } from '../types';
-import { useStxCurrencyConversion } from '../useStxCurrencyConversion';
 import {
   BAD_QUOTE_PERCENTAGE,
   isRunesTx,
diff --git a/src/app/screens/swap/slippageModal/index.tsx b/src/app/screens/swap/slippageModal/index.tsx
index d4aa86be4..52efc39c3 100644
--- a/src/app/screens/swap/slippageModal/index.tsx
+++ b/src/app/screens/swap/slippageModal/index.tsx
@@ -1,7 +1,7 @@
-/* eslint-disable import/prefer-default-export */
 import ActionButton from '@components/button';
 import { StyledP } from '@ui-library/common.styled';
 import Input from '@ui-library/input';
+import BigNumber from 'bignumber.js';
 import { useState, type ChangeEvent } from 'react';
 import { useTranslation } from 'react-i18next';
 import styled from 'styled-components';
@@ -16,6 +16,7 @@ const TitleRow = styled.div`
   display: flex;
   justify-content: space-between;
 `;
+
 const ResetButton = styled.button((props) => ({
   display: 'inline',
   background: 'transparent',
@@ -36,7 +37,7 @@ const Description = styled.p((props) => ({
   color: props.theme.colors.white_400,
 }));
 
-export function SlippageModalContent({
+function SlippageModalContent({
   defaultSlippage,
   slippage,
   slippageThreshold,
@@ -50,11 +51,15 @@ export function SlippageModalContent({
   onChange: (slippage: number) => void;
 }) {
   const { t } = useTranslation('translation', { keyPrefix: 'SWAP_SCREEN' });
-  const [percentage, setPercentage] = useState(`${(slippage * 100).toString()}`);
-  const result = Number(percentage);
-  const invalid = !Number.isNaN(result) && result >= 100;
-  const showSlippageWarning = slippageThreshold ? result > slippageThreshold * 100 : false;
-  const DEFAULT_SLIPPAGE = (defaultSlippage * 100).toString();
+  const [percentage, setPercentage] = useState(new BigNumber(slippage).times(100).toString());
+
+  const result = new BigNumber(percentage);
+  const invalid = result.isNaN() || result.gte(100);
+  const showSlippageWarning = slippageThreshold
+    ? result.gt(new BigNumber(slippageThreshold).times(100))
+    : false;
+
+  const DEFAULT_SLIPPAGE = new BigNumber(defaultSlippage).times(100).toString();
 
   const allowDecimalsNumber = slippageDecimals ?? 2;
 
@@ -108,11 +113,13 @@ export function SlippageModalContent({
       />
       <Description>{t('SLIPPAGE_DESC')}</Description>
       <ActionButton
-        disabled={invalid || !result}
+        disabled={invalid || result.isZero()}
         warning={invalid}
         text={t('APPLY')}
-        onPress={() => onChange(result / 100)}
+        onPress={() => onChange(result.div(100).toNumber())}
       />
     </Container>
   );
 }
+
+export default SlippageModalContent;

From aba9ec090bddd828d29e9e804e7cd0ae25118b20 Mon Sep 17 00:00:00 2001
From: Den <36603049+dhriaznov@users.noreply.github.com>
Date: Wed, 4 Sep 2024 11:19:28 +0200
Subject: [PATCH 073/227] [ENG-4652] Add keyboard navigation throughout the app
 (#532)

* [ENG-4651] fix: Difficult to differentiate selected vs not selected accounts

* Fix the html props for styling

* Add a separate Props type

* [ENG-4652] Add keyboard navigation throughout the app

* Add elements focus for keyboard on full screen

* Move tabs component to ui-library, use it on the Collectibles screen

* Refactor the SquareButton component

* Update the ordinal detail screen action buttons

* Refactor the resetWallet component

* Refactor tabBar component to improve accessibility

* Improve the scrollbar indent on the Home screen

* Improve accessibility for the fee Edit button

* Make Home screen banner clickable via keyboard

* Improve accessibility on the Swap flow

* Update the Save button on the ChangeNetworkScreen

* Update the Modal component on the ReceiveNftModal screen

* Make Sheet component accessible via keyboard

* Make input clear button accessible via keyboard

* Add accessibility for the AlertMessage component

* Improve the Forgot password flow accessibility

* Fix caret icon color in the header

* Remove the unused styles

* Improve the ledger account import flow accessibility

* Fix value submit on Enter when other buttons are in focus

* Add Toggle component to ui-library, replace and remove react-switch package, update e2e

* Update the toggle and settings buttons

* Fix the converted value overflow in the amount inputs

* Update e2e tests
---
 package-lock.json                             |  21 ----
 package.json                                  |   1 -
 src/app/components/accountHeader/index.tsx    |   8 +-
 src/app/components/accountRow/index.styled.ts |  31 +++---
 src/app/components/accountRow/index.tsx       |  11 +-
 src/app/components/alertMessage/index.tsx     |  27 ++++-
 .../index.styled.ts                           |   4 -
 src/app/components/explore/FeaturedCard.tsx   |   6 +-
 .../components/explore/RecommendedApps.tsx    |  13 ++-
 .../ledger/ledgerAssetSelectCard/index.tsx    |  51 ++++-----
 .../components/passwordInput/index.styled.ts  |  24 ++--
 src/app/components/passwordInput/index.tsx    |  11 +-
 .../components/receiveCardComponent/index.tsx |   4 +-
 src/app/components/resetWallet/index.tsx      |  48 +++-----
 src/app/components/squareButton/index.tsx     |  64 +++++------
 src/app/components/tabBar/index.tsx           |  50 ++++++---
 .../components/updatedBottomModal/index.tsx   | 101 -----------------
 src/app/components/webGalleryButton/index.tsx |   1 +
 src/app/screens/explore/index.tsx             |   5 +-
 src/app/screens/forgotPassword/index.tsx      |  36 +++---
 src/app/screens/home/banner.tsx               |   5 +-
 src/app/screens/home/index.styled.ts          |  28 +++--
 src/app/screens/home/index.tsx                |   2 +-
 .../ledger/importLedgerAccount/index.tsx      |   4 +-
 .../importLedgerAccount/stepControls.tsx      |  87 ++++++++-------
 .../importLedgerAccount/steps/index.styled.ts |  13 +--
 .../importLedgerAccount/steps/index.tsx       |  24 ++--
 src/app/screens/legal/index.tsx               |  11 +-
 src/app/screens/login/index.tsx               |  32 +++---
 .../screens/manageTokens/coinItem/index.tsx   |  21 +---
 .../screens/nftDashboard/collectiblesTabs.tsx |  27 +++--
 src/app/screens/nftDashboard/index.tsx        |  10 +-
 .../screens/nftDashboard/receiveNft/index.tsx |  24 ++--
 .../screens/nftDashboard/useNftDashboard.tsx  |  12 +-
 src/app/screens/ordinalDetail/index.styled.ts |  47 +++-----
 src/app/screens/ordinalDetail/index.tsx       |  47 ++++----
 src/app/screens/ordinalsCollection/index.tsx  |  12 +-
 src/app/screens/sendStx/stxAmountSelector.tsx |  47 ++++----
 .../screens/settings/changeNetwork/index.tsx  |  10 +-
 .../preferences/privacyPreferences/index.tsx  |  22 +---
 src/app/screens/settings/security/index.tsx   |   2 +-
 .../settings/settingComponent/index.tsx       |  30 ++---
 src/app/screens/stacking/index.tsx            |   4 +-
 .../stackingProgress/components/index.tsx     |  21 ++--
 .../stacking/stackingProgress/index.tsx       |  13 ++-
 .../screens/stacking/startStacking/index.tsx  |   5 +-
 .../swap/components/amountInput/index.tsx     |   8 +-
 .../swap/components/routeItem/index.tsx       |   5 +-
 src/app/screens/swap/quoteSummary/EditFee.tsx |  25 +----
 src/app/ui-components/btcAmountSelector.tsx   |  11 +-
 src/app/ui-components/selectFeeRate/index.tsx |  32 +++---
 src/app/ui-library/button.tsx                 |  10 +-
 src/app/ui-library/common.styled.ts           |  26 +----
 src/app/ui-library/input.tsx                  |  26 +++--
 src/app/ui-library/sheet.tsx                  |   2 +-
 .../tabs/index.tsx => ui-library/tabs.tsx}    |  12 +-
 src/app/ui-library/toggle.tsx                 | 104 ++++++++++++++++++
 src/locales/en.json                           |   1 +
 src/pages/Options/index.css                   |  15 +++
 src/pages/Popup/index.css                     |  15 +++
 tests/pages/onboarding.ts                     |   2 +-
 tests/pages/wallet.ts                         |  14 +--
 62 files changed, 685 insertions(+), 700 deletions(-)
 delete mode 100644 src/app/components/updatedBottomModal/index.tsx
 rename src/app/{components/tabs/index.tsx => ui-library/tabs.tsx} (86%)
 create mode 100644 src/app/ui-library/toggle.tsx

diff --git a/package-lock.json b/package-lock.json
index c3f119e2a..28949fb56 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -54,7 +54,6 @@
         "react-qr-code": "^2.0.8",
         "react-redux": "^7.2.1",
         "react-router-dom": "^6.4.0",
-        "react-switch": "^7.0.0",
         "react-tabs": "^6.0.2",
         "react-tooltip": "^5.4.0",
         "redux": "^4.0.5",
@@ -10472,18 +10471,6 @@
         "react-dom": ">=16.8"
       }
     },
-    "node_modules/react-switch": {
-      "version": "7.0.0",
-      "resolved": "https://registry.npmjs.org/react-switch/-/react-switch-7.0.0.tgz",
-      "integrity": "sha512-KkDeW+cozZXI6knDPyUt3KBN1rmhoVYgAdCJqAh7st7tk8YE6N0iR89zjCWO8T8dUTeJGTR0KU+5CHCRMRffiA==",
-      "dependencies": {
-        "prop-types": "^15.7.2"
-      },
-      "peerDependencies": {
-        "react": "^15.3.0 || ^16.0.0 || ^17.0.0 || ^18.0.0",
-        "react-dom": "^15.3.0 || ^16.0.0 || ^17.0.0 || ^18.0.0"
-      }
-    },
     "node_modules/react-tabs": {
       "version": "6.0.2",
       "resolved": "https://registry.npmjs.org/react-tabs/-/react-tabs-6.0.2.tgz",
@@ -20763,14 +20750,6 @@
         "react-router": "6.14.2"
       }
     },
-    "react-switch": {
-      "version": "7.0.0",
-      "resolved": "https://registry.npmjs.org/react-switch/-/react-switch-7.0.0.tgz",
-      "integrity": "sha512-KkDeW+cozZXI6knDPyUt3KBN1rmhoVYgAdCJqAh7st7tk8YE6N0iR89zjCWO8T8dUTeJGTR0KU+5CHCRMRffiA==",
-      "requires": {
-        "prop-types": "^15.7.2"
-      }
-    },
     "react-tabs": {
       "version": "6.0.2",
       "resolved": "https://registry.npmjs.org/react-tabs/-/react-tabs-6.0.2.tgz",
diff --git a/package.json b/package.json
index 057a6678b..a9f15f516 100644
--- a/package.json
+++ b/package.json
@@ -82,7 +82,6 @@
     "react-qr-code": "^2.0.8",
     "react-redux": "^7.2.1",
     "react-router-dom": "^6.4.0",
-    "react-switch": "^7.0.0",
     "react-tabs": "^6.0.2",
     "react-tooltip": "^5.4.0",
     "redux": "^4.0.5",
diff --git a/src/app/components/accountHeader/index.tsx b/src/app/components/accountHeader/index.tsx
index 17ba73762..4a77ed6b6 100644
--- a/src/app/components/accountHeader/index.tsx
+++ b/src/app/components/accountHeader/index.tsx
@@ -16,10 +16,8 @@ const SelectedAccountContainer = styled.div<{ showBorderBottom?: boolean }>((pro
   position: 'relative',
   alignItems: 'center',
   justifyContent: 'space-between',
-  padding: `${props.theme.spacing(10)}px ${props.theme.spacing(8)}px`,
-  borderBottom: props.showBorderBottom
-    ? `0.5px solid ${props.theme.colors.background.elevation3}`
-    : 'none',
+  padding: `${props.theme.spacing(10)}px ${props.theme.space.m}`,
+  borderBottom: props.showBorderBottom ? `0.5px solid ${props.theme.colors.elevation3}` : 'none',
 }));
 
 const OptionsButton = styled.button(() => ({
@@ -38,7 +36,7 @@ const ButtonRow = styled.button`
   padding-bottom: ${(props) => props.theme.space.s};
   padding-left: ${(props) => props.theme.space.l};
   padding-right: ${(props) => props.theme.space.l};
-  font: ${(props) => props.theme.body_medium_m};
+  font: ${(props) => props.theme.typography.body_medium_m};
   color: ${(props) => props.theme.colors.white_0};
   transition: background-color 0.2s ease;
   :hover {
diff --git a/src/app/components/accountRow/index.styled.ts b/src/app/components/accountRow/index.styled.ts
index d4d6757d3..2d969fdc1 100644
--- a/src/app/components/accountRow/index.styled.ts
+++ b/src/app/components/accountRow/index.styled.ts
@@ -1,6 +1,22 @@
 import Button from '@ui-library/button';
 import styled from 'styled-components';
 
+export const Container = styled.div({
+  position: 'relative',
+  display: 'flex',
+  alignItems: 'center',
+  justifyContent: 'space-between',
+  backgroundColor: 'transparent',
+});
+
+export const AccountInfoContainer = styled.button<{ $disableClick?: boolean }>((props) => ({
+  width: '100%',
+  display: 'flex',
+  alignItems: 'center',
+  backgroundColor: 'transparent',
+  cursor: props.$disableClick ? 'initial' : 'pointer',
+}));
+
 export const GradientCircle = styled.div<{
   $firstGradient: string;
   $secondGradient: string;
@@ -15,21 +31,6 @@ export const GradientCircle = styled.div<{
   opacity: props.$isSelected ? 1 : 0.5,
 }));
 
-export const TopSectionContainer = styled.div<{ disableClick?: boolean }>((props) => ({
-  position: 'relative',
-  display: 'flex',
-  alignItems: 'center',
-  justifyContent: 'space-between',
-  backgroundColor: 'transparent',
-  cursor: props.disableClick ? 'initial' : 'pointer',
-}));
-
-export const AccountInfoContainer = styled.div({
-  width: '100%',
-  display: 'flex',
-  alignItems: 'center',
-});
-
 export const CurrentAccountContainer = styled.div((props) => ({
   display: 'flex',
   flexDirection: 'column',
diff --git a/src/app/components/accountRow/index.tsx b/src/app/components/accountRow/index.tsx
index 5f873694a..6e8354717 100644
--- a/src/app/components/accountRow/index.tsx
+++ b/src/app/components/accountRow/index.tsx
@@ -16,12 +16,14 @@ import { useEffect, useRef, useState } from 'react';
 import { useTranslation } from 'react-i18next';
 import { NumericFormat } from 'react-number-format';
 import 'react-tooltip/dist/react-tooltip.css';
+import Theme from 'theme';
 import {
   AccountInfoContainer,
   AccountName,
   Balance,
   BarLoaderContainer,
   ButtonRow,
+  Container,
   CurrentAccountContainer,
   CurrentAccountTextContainer,
   GradientCircle,
@@ -32,7 +34,6 @@ import {
   ModalDescription,
   OptionsButton,
   StyledButton,
-  TopSectionContainer,
   TransparentSpan,
 } from './index.styled';
 
@@ -193,8 +194,8 @@ function AccountRow({
   };
 
   return (
-    <TopSectionContainer disableClick={disabledAccountSelect}>
-      <AccountInfoContainer onClick={handleClick}>
+    <Container>
+      <AccountInfoContainer $disableClick={disabledAccountSelect} onClick={handleClick}>
         <GradientCircle
           $firstGradient={gradient[0]}
           $secondGradient={gradient[1]}
@@ -213,7 +214,7 @@ function AccountRow({
                 </AccountName>
                 {isLedgerAccount(account) && <img src={LedgerBadge} alt="Ledger icon" />}
                 {isSelected && !disabledAccountSelect && !isAccountListView && (
-                  <CaretDown weight="bold" size={16} />
+                  <CaretDown color={Theme.colors.white_0} weight="bold" size={16} />
                 )}
               </CurrentAccountTextContainer>
               {isAccountListView && totalBalance && (
@@ -337,7 +338,7 @@ function AccountRow({
           </ModalContent>
         </Sheet>
       )}
-    </TopSectionContainer>
+    </Container>
   );
 }
 
diff --git a/src/app/components/alertMessage/index.tsx b/src/app/components/alertMessage/index.tsx
index 6287416aa..1621bdbdf 100644
--- a/src/app/components/alertMessage/index.tsx
+++ b/src/app/components/alertMessage/index.tsx
@@ -1,6 +1,8 @@
 import Cross from '@assets/img/dashboard/X.svg';
 import ActionButton from '@components/button';
+import Button from '@ui-library/button';
 import Checkbox from '@ui-library/checkbox';
+import { useEffect, useRef } from 'react';
 import styled from 'styled-components';
 
 const Container = styled.div((props) => ({
@@ -75,7 +77,7 @@ const OuterContainer = styled.div((props) => ({
   opacity: 0.6,
 }));
 
-interface Props {
+type Props = {
   onClose: () => void;
   title: string;
   description: string;
@@ -87,7 +89,7 @@ interface Props {
   onSecondButtonClick?: () => void;
   tickMarkButtonClick?: (e: React.ChangeEvent<HTMLInputElement>) => void;
   tickMarkButtonChecked?: boolean;
-}
+};
 
 function AlertMessage({
   onClose,
@@ -102,13 +104,30 @@ function AlertMessage({
   tickMarkButtonClick,
   tickMarkButtonChecked,
 }: Props) {
+  const buttonRef = useRef<HTMLButtonElement>(null);
+  const previousFocusRef = useRef<HTMLElement | null>(null);
+
+  useEffect(() => {
+    previousFocusRef.current = document.activeElement as HTMLElement;
+
+    if (buttonRef.current) {
+      buttonRef.current.focus();
+    }
+
+    return () => {
+      if (previousFocusRef.current) {
+        previousFocusRef.current.focus();
+      }
+    };
+  }, []);
+
   return (
     <>
       <OuterContainer />
       <Container>
         <RowContainer>
           <HeaderText>{title}</HeaderText>
-          <ButtonImage onClick={onClose}>
+          <ButtonImage onClick={onClose} ref={buttonRef}>
             <img src={Cross} alt="cross" />
           </ButtonImage>
         </RowContainer>
@@ -127,7 +146,7 @@ function AlertMessage({
         )}
         {!onSecondButtonClick && onButtonClick && (
           <ButtonContainer>
-            <ActionButton text={buttonText ?? 'Yes'} onPress={onButtonClick} />
+            <Button title={buttonText ?? 'Yes'} onClick={onButtonClick} />
           </ButtonContainer>
         )}
         {tickMarkButtonText && tickMarkButtonClick && (
diff --git a/src/app/components/confirmStxTransactionComponent/index.styled.ts b/src/app/components/confirmStxTransactionComponent/index.styled.ts
index 8de1152e3..967e2faea 100644
--- a/src/app/components/confirmStxTransactionComponent/index.styled.ts
+++ b/src/app/components/confirmStxTransactionComponent/index.styled.ts
@@ -26,10 +26,6 @@ export const EditNonceButton = styled(Button)((props) => ({
   padding: props.theme.space.xxs,
   '&.tertiary': {
     color: props.theme.colors.tangerine,
-    '&:focus-visible': {
-      color: props.theme.colors.tangerine,
-      opacity: 0.8,
-    },
     '&:hover:enabled': {
       color: props.theme.colors.tangerine,
       opacity: 0.8,
diff --git a/src/app/components/explore/FeaturedCard.tsx b/src/app/components/explore/FeaturedCard.tsx
index 144c9d06a..003120375 100644
--- a/src/app/components/explore/FeaturedCard.tsx
+++ b/src/app/components/explore/FeaturedCard.tsx
@@ -2,14 +2,16 @@ import { AnalyticsEvents } from '@secretkeylabs/xverse-core';
 import { trackMixPanel } from '@utils/mixpanel';
 import styled from 'styled-components';
 
-const Card = styled.div`
+const Card = styled.button`
   cursor: pointer;
-  display: block;
+  display: flex;
+  flex-direction: column;
   border-radius: 12px;
   background-color: ${({ theme }) => theme.colors.elevation2};
   height: 182px;
   width: 212px;
   color: ${({ theme }) => theme.colors.white_0};
+  text-align: left;
   transition: opacity 0.1s ease;
 
   &:hover {
diff --git a/src/app/components/explore/RecommendedApps.tsx b/src/app/components/explore/RecommendedApps.tsx
index e33899518..f997883ba 100644
--- a/src/app/components/explore/RecommendedApps.tsx
+++ b/src/app/components/explore/RecommendedApps.tsx
@@ -10,13 +10,15 @@ const Container = styled.div`
   width: 100%;
 `;
 
-const Card = styled.div`
+const Card = styled.button`
   cursor: pointer;
   display: flex;
   align-items: center;
   column-gap: ${({ theme }) => theme.space.m};
   width: 100%;
   color: ${({ theme }) => theme.colors.white_0};
+  background-color: transparent;
+  text-align: left;
   transition: opacity 0.1s ease;
 
   &:hover {
@@ -47,7 +49,14 @@ const CardText = styled.div`
   overflow: hidden;
 `;
 
-type Props = { items: { url: string; icon: string; name: string; description: string }[] };
+type Props = {
+  items: {
+    url: string;
+    icon: string;
+    name: string;
+    description: string;
+  }[];
+};
 
 function RecommendedApps({ items }: Props) {
   return (
diff --git a/src/app/components/ledger/ledgerAssetSelectCard/index.tsx b/src/app/components/ledger/ledgerAssetSelectCard/index.tsx
index decc0e47d..686000cf3 100644
--- a/src/app/components/ledger/ledgerAssetSelectCard/index.tsx
+++ b/src/app/components/ledger/ledgerAssetSelectCard/index.tsx
@@ -1,15 +1,17 @@
 import styled from 'styled-components';
 
-const CardContainer = styled.label((props) => ({
+const CardContainer = styled.button((props) => ({
   display: 'flex',
-  flexDirection: 'row',
-  gap: props.theme.spacing(6),
+  gap: props.theme.space.s,
   justifyContent: 'flex-start',
+  alignItems: 'center',
   padding: props.theme.spacing(7),
-  paddingLeft: props.theme.spacing(8),
-  paddingRight: props.theme.spacing(8),
+  paddingLeft: props.theme.space.m,
+  paddingRight: props.theme.space.m,
   cursor: 'pointer',
-  transition: 'background 0.2s ease, border 0.2s ease',
+  transition: 'background 0.1s ease, border 0.1s ease',
+  textAlign: 'left',
+  color: props.theme.colors.white_0,
   background:
     props.className === 'checked' ? props.theme.colors.background.selectBackground : 'transparent',
   borderRadius: props.theme.radius(2),
@@ -19,10 +21,6 @@ const CardContainer = styled.label((props) => ({
   userSelect: 'none',
 }));
 
-const CardInput = styled.input({
-  display: 'none',
-});
-
 const CardIconContainer = styled.div((props) => ({
   display: 'flex',
   width: props.theme.spacing(24),
@@ -46,38 +44,35 @@ const CardText = styled.p((props) => ({
   color: props.theme.colors.white_400,
 }));
 
-interface Props {
+type Props = {
   icon: string;
   title: string;
   text: string;
-  id: string;
+  name: 'Bitcoin' | 'Stacks';
   isChecked: boolean;
-  onChange: (e: React.ChangeEvent<HTMLInputElement>) => void;
+  onClick: (selectedAsset: 'Bitcoin' | 'Stacks') => void;
   squareIcon?: boolean;
-}
+};
 
 function LedgerAssetSelectCard({
   icon,
   title,
   text,
-  id,
+  name,
   isChecked,
-  onChange: handleChange,
+  onClick: handleClick,
   squareIcon = false,
 }: Props) {
   return (
-    <div>
-      <CardContainer htmlFor={id} className={isChecked ? 'checked' : ''}>
-        <CardIconContainer>
-          <CardIcon src={icon} alt={`${title} icon`} $squareIcon={squareIcon} />
-        </CardIconContainer>
-        <div>
-          <CardTitle>{title}</CardTitle>
-          <CardText>{text}</CardText>
-        </div>
-      </CardContainer>
-      <CardInput id={id} type="checkbox" checked={isChecked} onChange={handleChange} />
-    </div>
+    <CardContainer className={isChecked ? 'checked' : ''} onClick={() => handleClick(name)}>
+      <CardIconContainer>
+        <CardIcon src={icon} alt={`${title} icon`} $squareIcon={squareIcon} />
+      </CardIconContainer>
+      <div>
+        <CardTitle>{title}</CardTitle>
+        <CardText>{text}</CardText>
+      </div>
+    </CardContainer>
   );
 }
 
diff --git a/src/app/components/passwordInput/index.styled.ts b/src/app/components/passwordInput/index.styled.ts
index d99a5b785..dfdca4914 100644
--- a/src/app/components/passwordInput/index.styled.ts
+++ b/src/app/components/passwordInput/index.styled.ts
@@ -27,15 +27,15 @@ export const PasswordInputLabel = styled.h2((props) => ({
 }));
 
 export const ButtonsContainer = styled.div<{
-  stackButtonAlignment: boolean;
-  ifError: boolean;
+  $stackButtonAlignment: boolean;
+  $ifError: boolean;
 }>((props) => ({
   display: 'flex',
-  flexDirection: props.stackButtonAlignment ? 'column-reverse' : 'row',
-  alignItems: props.stackButtonAlignment ? 'center' : 'flex-end',
+  flexDirection: props.$stackButtonAlignment ? 'column-reverse' : 'row',
+  alignItems: props.$stackButtonAlignment ? 'center' : 'flex-end',
   flex: 1,
-  marginTop: props.ifError ? props.theme.spacing(30) : props.theme.spacing(40),
-  marginBottom: props.theme.spacing(8),
+  marginTop: props.$ifError ? props.theme.spacing(30) : props.theme.spacing(40),
+  marginBottom: props.theme.space.m,
 }));
 
 export const StyledButton = styled.button({
@@ -48,11 +48,11 @@ export const StyledButton = styled.button({
 });
 
 export const PasswordStrengthContainer = styled.div((props) => ({
-  ...props.theme.body_medium_m,
+  ...props.theme.typography.body_medium_m,
   display: 'flex',
   alignItems: 'center',
   width: '100%',
-  marginTop: props.theme.spacing(8),
+  marginTop: props.theme.space.m,
   span: {
     opacity: 0.6,
   },
@@ -82,10 +82,10 @@ export const StrengthBar = styled(animated.div)<{
 }));
 
 export const ButtonContainer = styled.div<{
-  stackButtonAlignment: boolean;
+  $stackButtonAlignment: boolean;
 }>((props) => ({
-  marginLeft: props.stackButtonAlignment ? 0 : 3,
-  marginRight: props.stackButtonAlignment ? 0 : 3,
-  marginTop: props.theme.spacing(4),
+  marginLeft: props.$stackButtonAlignment ? 0 : 3,
+  marginRight: props.$stackButtonAlignment ? 0 : 3,
+  marginTop: props.theme.space.xs,
   width: '100%',
 }));
diff --git a/src/app/components/passwordInput/index.tsx b/src/app/components/passwordInput/index.tsx
index 26adcae7d..dfbeab673 100644
--- a/src/app/components/passwordInput/index.tsx
+++ b/src/app/components/passwordInput/index.tsx
@@ -84,6 +84,7 @@ function PasswordInput({
     const keyDownHandler = (event) => {
       if (
         event.key === 'Enter' &&
+        document.activeElement?.id === 'password-input' &&
         !!enteredPassword &&
         enteredPasswordLength >= REQUIRED_PASSWORD_LENGTH &&
         (checkPasswordStrength ? score >= PasswordStrength.AverageScore : true)
@@ -194,6 +195,7 @@ function PasswordInput({
       <PasswordInputLabel>{inputLabel}</PasswordInputLabel>
       <Input
         key={`${title}-${inputLabel}`}
+        id="password-input"
         type={isPasswordVisible ? 'text' : 'password'}
         value={enteredPassword}
         onChange={handlePasswordChange}
@@ -211,11 +213,11 @@ function PasswordInput({
         hideClear
       />
       {checkPasswordStrength ? renderStrengthBar() : null}
-      <ButtonsContainer stackButtonAlignment={stackButtonAlignment} ifError={error !== ''}>
-        <ButtonContainer stackButtonAlignment={stackButtonAlignment}>
-          <Button title={t('BACK_BUTTON')} onClick={handleBack} variant="secondary" />
+      <ButtonsContainer $stackButtonAlignment={stackButtonAlignment} $ifError={error !== ''}>
+        <ButtonContainer $stackButtonAlignment={stackButtonAlignment}>
+          <Button title={t('BACK_BUTTON')} onClick={handleBack} variant="secondary" type="button" />
         </ButtonContainer>
-        <ButtonContainer stackButtonAlignment={stackButtonAlignment}>
+        <ButtonContainer $stackButtonAlignment={stackButtonAlignment}>
           <Button
             loading={loading}
             disabled={
@@ -223,6 +225,7 @@ function PasswordInput({
             }
             title={submitButtonText || t('CONTINUE_BUTTON')}
             onClick={handleContinue}
+            type="submit"
           />
         </ButtonContainer>
       </ButtonsContainer>
diff --git a/src/app/components/receiveCardComponent/index.tsx b/src/app/components/receiveCardComponent/index.tsx
index 8e3e3348f..5cf14d3e0 100644
--- a/src/app/components/receiveCardComponent/index.tsx
+++ b/src/app/components/receiveCardComponent/index.tsx
@@ -71,7 +71,7 @@ const VerifyButtonContainer = styled.div({
   width: 68,
 });
 
-interface Props {
+type Props = {
   className?: string;
   title: string;
   address: string;
@@ -80,7 +80,7 @@ interface Props {
   onCopyAddressClick?: () => void;
   showVerifyButton?: boolean;
   currency?: string;
-}
+};
 
 function ReceiveCardComponent({
   className,
diff --git a/src/app/components/resetWallet/index.tsx b/src/app/components/resetWallet/index.tsx
index da1f389cc..d90dda642 100644
--- a/src/app/components/resetWallet/index.tsx
+++ b/src/app/components/resetWallet/index.tsx
@@ -1,15 +1,13 @@
-import BottomModal from '@components/bottomModal';
-import ActionButton from '@components/button';
+import Button from '@ui-library/button';
+import Sheet from '@ui-library/sheet';
 import { useTranslation } from 'react-i18next';
 import styled from 'styled-components';
 
-const ResetWalletText = styled.h1((props) => ({
-  ...props.theme.body_l,
+const ResetWalletText = styled.div((props) => ({
+  ...props.theme.typography.body_l,
   color: props.theme.colors.white_200,
-  paddingLeft: props.theme.spacing(8),
-  paddingRight: props.theme.spacing(8),
-  paddingTop: props.theme.spacing(12),
-  paddingBottom: props.theme.spacing(12),
+  paddingTop: props.theme.space.xs,
+  paddingBottom: props.theme.space.l,
 }));
 
 const ButtonContainer = styled.div((props) => ({
@@ -17,26 +15,16 @@ const ButtonContainer = styled.div((props) => ({
   flexDirection: 'row',
   alignItems: 'center',
   justifyContent: 'space-between',
-  paddingLeft: props.theme.spacing(8),
-  paddingRight: props.theme.spacing(8),
-  paddingBottom: props.theme.spacing(16),
+  gap: props.theme.space.xs,
+  paddingBottom: props.theme.space.xl,
 }));
 
-const TransparentButtonContainer = styled.div((props) => ({
-  marginRight: props.theme.spacing(2),
-  width: '100%',
-}));
-
-const ResetButtonContainer = styled.div((props) => ({
-  marginLeft: props.theme.spacing(2),
-  width: '100%',
-}));
-
-interface Props {
+type Props = {
   showResetWalletPrompt: boolean;
   onResetWalletPromptClose: () => void;
   openResetWalletScreen: () => void;
-}
+};
+
 function ResetWalletPrompt({
   showResetWalletPrompt,
   onResetWalletPromptClose,
@@ -44,21 +32,17 @@ function ResetWalletPrompt({
 }: Props) {
   const { t } = useTranslation('translation', { keyPrefix: 'SETTING_SCREEN' });
   return (
-    <BottomModal
+    <Sheet
       visible={showResetWalletPrompt}
-      header={t('RESET_WALLET')}
+      title={t('RESET_WALLET')}
       onClose={onResetWalletPromptClose}
     >
       <ResetWalletText>{t('RESET_WALLET_DESCRIPTION')}</ResetWalletText>
       <ButtonContainer>
-        <TransparentButtonContainer>
-          <ActionButton text={t('CANCEL')} transparent onPress={onResetWalletPromptClose} />
-        </TransparentButtonContainer>
-        <ResetButtonContainer>
-          <ActionButton text={t('RESET_WALLET')} warning onPress={openResetWalletScreen} />
-        </ResetButtonContainer>
+        <Button title={t('CANCEL')} variant="secondary" onClick={onResetWalletPromptClose} />
+        <Button title={t('RESET_WALLET')} variant="danger" onClick={openResetWalletScreen} />
       </ButtonContainer>
-    </BottomModal>
+    </Sheet>
   );
 }
 
diff --git a/src/app/components/squareButton/index.tsx b/src/app/components/squareButton/index.tsx
index ade5f6413..8620cf6c5 100644
--- a/src/app/components/squareButton/index.tsx
+++ b/src/app/components/squareButton/index.tsx
@@ -1,71 +1,71 @@
 import styled from 'styled-components';
 
+const Button = styled.button<{ $isTransparent?: boolean }>((props) => ({
+  display: 'flex',
+  flexDirection: 'column',
+  alignItems: 'center',
+  borderRadius: '16px',
+  rowGap: '8px',
+  backgroundColor: 'transparent',
+  ':hover > div': {
+    backgroundColor: props.$isTransparent
+      ? props.theme.colors.background.elevation6_800
+      : props.theme.colors.action.classicLight,
+    opacity: 0.6,
+  },
+}));
+
 const Icon = styled.img`
   width: 20px;
   height: 20px;
 `;
 
-interface ButtonProps {
-  isTransparent?: boolean;
-}
-
-const Button = styled.button<ButtonProps>((props) => ({
+const Wrapper = styled.div<{
+  $isTransparent?: boolean;
+}>((props) => ({
   display: 'flex',
   width: 48,
   height: 48,
-  borderRadius: 16,
   justifyContent: 'center',
   alignItems: 'center',
   transition: 'background-color 0.2s ease, opacity 0.2s ease',
-  backgroundColor: props.isTransparent ? 'transparent' : props.theme.colors.action.classic,
+  borderRadius: 'inherit',
+  backgroundColor: props.$isTransparent ? 'transparent' : props.theme.colors.action.classic,
   border: `1px solid ${
-    props.isTransparent ? props.theme.colors.white_800 : props.theme.colors.action.classic
+    props.$isTransparent ? props.theme.colors.white_800 : props.theme.colors.action.classic
   }`,
-  ':hover': {
-    backgroundColor: props.isTransparent
-      ? props.theme.colors.background.elevation6_800
-      : props.theme.colors.action.classicLight,
-    opacity: 0.6,
-  },
 }));
 
-const ButtonText = styled.div((props) => ({
-  ...props.theme.body_medium_s,
+const Title = styled.span((props) => ({
+  ...props.theme.typography.body_medium_s,
   color: props.theme.colors.white_0,
   textAlign: 'center',
 }));
 
-const ButtonIconContainer = styled.div({
+const IconContainer = styled.div({
   display: 'flex',
   justifyContent: 'center',
   alignItems: 'center',
 });
 
-const Container = styled.div`
-  display: flex;
-  flex-direction: column;
-  align-items: center;
-  row-gap: 8px;
-`;
-
-interface Props {
+type Props = {
   text: string;
   onPress: () => void;
   src?: string;
   icon?: JSX.Element;
   isTransparent?: boolean;
   hoverDialogId?: string;
-}
+};
 
 function SquareButton({ src, text, icon, onPress, isTransparent, hoverDialogId }: Props) {
   return (
-    <Container>
-      <Button id={hoverDialogId} onClick={onPress} isTransparent={isTransparent}>
+    <Button onClick={onPress} $isTransparent={isTransparent}>
+      <Wrapper id={hoverDialogId} $isTransparent={isTransparent}>
         {src && <Icon src={src} alt={text} />}
-        {icon && <ButtonIconContainer>{icon}</ButtonIconContainer>}
-      </Button>
-      <ButtonText>{text}</ButtonText>
-    </Container>
+        {icon && <IconContainer>{icon}</IconContainer>}
+      </Wrapper>
+      <Title>{text}</Title>
+    </Button>
   );
 }
 
diff --git a/src/app/components/tabBar/index.tsx b/src/app/components/tabBar/index.tsx
index 64846f5dc..28b71659e 100644
--- a/src/app/components/tabBar/index.tsx
+++ b/src/app/components/tabBar/index.tsx
@@ -4,6 +4,9 @@ import { isInOptions } from '@utils/helper';
 import { useNavigate } from 'react-router-dom';
 import styled, { useTheme } from 'styled-components';
 
+const BUTTON_WIDTH = 56;
+const BUTTON_HEIGHT = 32;
+
 const RowContainer = styled.div((props) => ({
   display: 'flex',
   flexDirection: 'row',
@@ -11,46 +14,61 @@ const RowContainer = styled.div((props) => ({
   width: '100%',
   minHeight: 64,
   justifyContent: 'space-between',
-  paddingLeft: props.theme.spacing(30),
-  paddingRight: props.theme.spacing(30),
+  paddingLeft: props.theme.space.xl,
+  paddingRight: props.theme.space.xl,
   borderTop: `1px solid ${props.theme.colors.elevation3}`,
 }));
 
 const MovingDiv = styled(animated.div)((props) => ({
-  width: 56,
-  height: 32,
+  width: BUTTON_WIDTH,
+  height: BUTTON_HEIGHT,
   backgroundColor: props.theme.colors.white_900,
   position: 'absolute',
-  bottom: 18,
-  left: 20,
+  bottom: BUTTON_HEIGHT / 2,
   borderRadius: 16,
 }));
 
 const Button = styled.button({
-  backgroundColor: 'transparent',
   zIndex: 2,
+  width: BUTTON_WIDTH,
+  height: BUTTON_HEIGHT,
+  display: 'flex',
+  justifyContent: 'center',
+  alignItems: 'center',
+  borderRadius: 16,
+  backgroundColor: 'transparent',
 });
 
 export type Tab = 'dashboard' | 'nft' | 'stacking' | 'explore' | 'settings';
 
-interface Props {
+type Props = {
   tab: Tab;
-}
+};
+
 function BottomTabBar({ tab }: Props) {
   const navigate = useNavigate();
   const theme = useTheme();
 
   const getPosition = () => {
-    if (tab === 'nft') return 78;
-    if (tab === 'stacking') return 132;
-    if (tab === 'explore') return 186;
-    if (tab === 'settings') return 239;
-    return 25;
+    const containerPadding = parseInt(theme.space.xl, 10);
+    const gap = (window.innerWidth - 2 * containerPadding - 5 * BUTTON_WIDTH) / 4;
+
+    switch (tab) {
+      case 'nft':
+        return containerPadding + BUTTON_WIDTH + gap;
+      case 'stacking':
+        return containerPadding + 2 * (BUTTON_WIDTH + gap);
+      case 'explore':
+        return containerPadding + 3 * (BUTTON_WIDTH + gap);
+      case 'settings':
+        return containerPadding + 4 * (BUTTON_WIDTH + gap);
+      default: // 'dashboard'
+        return containerPadding;
+    }
   };
 
   const styles = useSpring({
-    from: { x: getPosition() }, // TODO: enable slide animation
-    to: { x: getPosition() },
+    left: getPosition(), // TODO: enable slide animation
     config: {
       duration: 200,
       easing: easings.easeOutCirc,
diff --git a/src/app/components/updatedBottomModal/index.tsx b/src/app/components/updatedBottomModal/index.tsx
deleted file mode 100644
index 5040b69ea..000000000
--- a/src/app/components/updatedBottomModal/index.tsx
+++ /dev/null
@@ -1,101 +0,0 @@
-import { XCircle } from '@phosphor-icons/react';
-import Modal from 'react-modal';
-import styled, { useTheme } from 'styled-components';
-
-const BottomModalHeaderText = styled.h1((props) => ({
-  ...props.theme.typography.body_bold_l,
-  flex: 1,
-}));
-
-const RowContainer = styled.div((props) => ({
-  display: 'flex',
-  flexDirection: 'row',
-  alignItems: 'center',
-  justifyContent: 'center',
-  padding: props.theme.space.m,
-}));
-
-const ButtonImage = styled.button((props) => ({
-  display: 'flex',
-  alignItems: 'center',
-  color: props.theme.colors.white_400,
-  background: 'transparent',
-}));
-
-interface Props {
-  header: string;
-  visible: boolean;
-  children: React.ReactNode;
-  onClose: () => void;
-  overlayStylesOverriding?: {};
-  contentStylesOverriding?: {};
-}
-
-const CustomisedModal = styled(Modal)`
-  overflow-y: auto;
-  &::-webkit-scrollbar {
-    display: none;
-  }
-  position: absolute;
-`;
-
-function UpdatedBottomModal({
-  header,
-  children,
-  visible,
-  onClose,
-  overlayStylesOverriding,
-  contentStylesOverriding,
-}: Props) {
-  const theme = useTheme();
-  const isGalleryOpen: boolean = document.documentElement.clientWidth > 360;
-  const customStyles = {
-    overlay: {
-      backgroundColor: isGalleryOpen ? 'transparent' : theme.colors.background.modalBackdrop,
-      height: '100%',
-      width: 360,
-      margin: 'auto',
-      zIndex: 4,
-      ...overlayStylesOverriding,
-    },
-    content: {
-      inset: 'auto auto 0px auto',
-      width: '100%',
-      maxWidth: 360,
-      maxHeight: '90%',
-      border: 'transparent',
-      background: theme.colors.elevation6_600,
-      backdropFilter: 'blur(24px)',
-      margin: 0,
-      padding: 0,
-      borderTopLeftRadius: isGalleryOpen ? 12 : 16,
-      borderTopRightRadius: isGalleryOpen ? 12 : 16,
-      borderBottomRightRadius: isGalleryOpen ? 12 : 0,
-      borderBottomLeftRadius: isGalleryOpen ? 12 : 0,
-      ...contentStylesOverriding,
-    },
-  };
-
-  return (
-    <CustomisedModal
-      isOpen={visible}
-      parentSelector={() => document.getElementById('app') as HTMLElement}
-      ariaHideApp={false}
-      style={customStyles}
-      contentLabel="Example Modal"
-    >
-      <RowContainer>
-        <BottomModalHeaderText>{header}</BottomModalHeaderText>
-        <ButtonImage onClick={onClose}>
-          <XCircle color="currentColor" size={22} weight="fill" />
-        </ButtonImage>
-      </RowContainer>
-      {children}
-    </CustomisedModal>
-  );
-}
-
-/**
- * @deprecated use @ui-library/sheet
- */
-export default UpdatedBottomModal;
diff --git a/src/app/components/webGalleryButton/index.tsx b/src/app/components/webGalleryButton/index.tsx
index 5d62f4e8a..ce1f9b6a1 100644
--- a/src/app/components/webGalleryButton/index.tsx
+++ b/src/app/components/webGalleryButton/index.tsx
@@ -10,6 +10,7 @@ const StyledButton = styled.button`
   gap: ${(props) => props.theme.space.xs};
   background-color: transparent;
   color: ${(props) => props.theme.colors.white_0};
+  transition: color 0.1s ease;
   :hover:enabled {
     color: ${(props) => props.theme.colors.white_200};
   }
diff --git a/src/app/screens/explore/index.tsx b/src/app/screens/explore/index.tsx
index 9b6c78380..924b9dabb 100644
--- a/src/app/screens/explore/index.tsx
+++ b/src/app/screens/explore/index.tsx
@@ -2,11 +2,11 @@ import FeaturedCardCarousel from '@components/explore/FeaturedCarousel';
 import RecommendedApps from '@components/explore/RecommendedApps';
 import SwiperNavigation from '@components/explore/SwiperNavigation';
 import BottomBar from '@components/tabBar';
-import Tabs from '@components/tabs';
 import useFeaturedDapps from '@hooks/useFeaturedDapps';
 import { ArrowsOut } from '@phosphor-icons/react';
 import { StyledHeading } from '@ui-library/common.styled';
 import Spinner from '@ui-library/spinner';
+import Tabs from '@ui-library/tabs';
 import { XVERSE_EXPLORE_URL } from '@utils/constants';
 import { useEffect, useState } from 'react';
 import { useTranslation } from 'react-i18next';
@@ -38,6 +38,7 @@ const ExternalLink = styled.a`
   ${({ theme }) => theme.typography.body_medium_m};
   display: flex;
   align-items: center;
+  align-self: flex-start;
   column-gap: ${({ theme }) => theme.space.xs};
   color: ${({ theme }) => theme.colors.white_0};
   margin-top: ${({ theme }) => theme.space.s};
@@ -58,7 +59,7 @@ const LoaderContainer = styled.div((props) => ({
   flex: 1,
   justifyContent: 'center',
   alignItems: 'center',
-  marginTop: props.theme.spacing(12),
+  marginTop: props.theme.space.l,
 }));
 
 function ExploreScreen() {
diff --git a/src/app/screens/forgotPassword/index.tsx b/src/app/screens/forgotPassword/index.tsx
index 93e2c5303..860719d34 100644
--- a/src/app/screens/forgotPassword/index.tsx
+++ b/src/app/screens/forgotPassword/index.tsx
@@ -1,7 +1,7 @@
-import ActionButton from '@components/button';
-import CheckBox from '@components/checkBox';
 import TopRow from '@components/topRow';
 import useWalletReducer from '@hooks/useWalletReducer';
+import Button from '@ui-library/button';
+import Checkbox from '@ui-library/checkbox';
 import { useState } from 'react';
 import { useTranslation } from 'react-i18next';
 import { useNavigate } from 'react-router-dom';
@@ -12,14 +12,14 @@ const Container = styled.div((props) => ({
   flexDirection: 'column',
   height: '100%',
   backgroundColor: props.theme.colors.elevation0,
-  padding: `0 ${props.theme.spacing(8)}px 0 ${props.theme.spacing(8)}px`,
+  padding: `0 ${props.theme.space.m}`,
 }));
 
 const Paragraph = styled.p((props) => ({
-  ...props.theme.body_l,
+  ...props.theme.typography.body_l,
   color: props.theme.colors.white_200,
   textAlign: 'left',
-  marginTop: props.theme.spacing(12),
+  marginTop: props.theme.space.l,
 }));
 
 const BottomContainer = styled.div((props) => ({
@@ -30,8 +30,8 @@ const ButtonsContainer = styled.div((props) => ({
   display: 'flex',
   alignItems: 'center',
   justifyContent: 'space-between',
-  marginTop: props.theme.spacing(16),
-  columnGap: props.theme.spacing(8),
+  marginTop: props.theme.space.xl,
+  columnGap: props.theme.space.xs,
 }));
 
 const StyledTopRow = styled(TopRow)({
@@ -54,7 +54,7 @@ function ForgotPassword(): JSX.Element {
 
   const handleResetWallet = async () => {
     await resetWallet();
-    navigate('/');
+    onBack();
   };
 
   return (
@@ -63,19 +63,19 @@ function ForgotPassword(): JSX.Element {
       <Paragraph>{t('PARAGRAPH1')}</Paragraph>
       <Paragraph>{t('PARAGRAPH2')}</Paragraph>
       <BottomContainer>
-        <CheckBox
-          checkBoxLabel={t('BACKUP_CHECKBOX_LABEL')}
-          isChecked={hasBackedUp}
-          checkBoxId="backup"
-          onCheck={handleToggleBackUp}
+        <Checkbox
+          checkboxId="backed-up-seedphrase-checkbox"
+          text={t('BACKUP_CHECKBOX_LABEL')}
+          checked={hasBackedUp}
+          onChange={handleToggleBackUp}
         />
         <ButtonsContainer>
-          <ActionButton text={t('CANCEL')} onPress={onBack} transparent />
-          <ActionButton
-            text={t('RESET')}
+          <Button title={t('CANCEL')} onClick={onBack} variant="secondary" />
+          <Button
+            title={t('RESET')}
             disabled={!hasBackedUp}
-            onPress={handleResetWallet}
-            warning
+            onClick={handleResetWallet}
+            variant="danger"
           />
         </ButtonsContainer>
       </BottomContainer>
diff --git a/src/app/screens/home/banner.tsx b/src/app/screens/home/banner.tsx
index bab3a7d79..71c5426bc 100644
--- a/src/app/screens/home/banner.tsx
+++ b/src/app/screens/home/banner.tsx
@@ -15,13 +15,16 @@ const Container = styled.div`
   padding-bottom: ${({ theme }) => theme.space.m};
 `;
 
-const BannerContent = styled.div`
+const BannerContent = styled.button`
   cursor: pointer;
   display: flex;
   align-items: center;
   column-gap: ${({ theme }) => theme.space.m};
   padding-left: ${({ theme }) => theme.space.m};
   padding-right: ${({ theme }) => theme.space.m};
+  color: ${({ theme }) => theme.colors.white_0};
+  background-color: transparent;
+  text-align: left;
   transition: opacity 0.1s ease;
 
   &:hover {
diff --git a/src/app/screens/home/index.styled.ts b/src/app/screens/home/index.styled.ts
index 5f34e3d64..7bcbfc822 100644
--- a/src/app/screens/home/index.styled.ts
+++ b/src/app/screens/home/index.styled.ts
@@ -2,12 +2,20 @@ import TokenTile from '@components/tokenTile';
 import Divider from '@ui-library/divider';
 import styled from 'styled-components';
 
-export const Container = styled.div`
+export const Container = styled.div<{ $applyIndent?: boolean }>`
   display: flex;
   flex-direction: column;
   flex: 1;
   padding: 0 ${(props) => props.theme.space.xs};
   ${(props) => props.theme.scrollbar}
+
+  ${(props) =>
+    props.$applyIndent &&
+    // When elements are in focus with the keyboard, we need to indent the content to the right to avoid cutting the right side of the elements
+    `
+    padding-left: ${props.theme.space.m};
+    scrollbar-gutter: stable;
+  `}
 `;
 
 export const ColumnContainer = styled.div((props) => ({
@@ -23,8 +31,8 @@ export const ColumnContainer = styled.div((props) => ({
 export const ReceiveContainer = styled.div((props) => ({
   display: 'flex',
   flexDirection: 'column',
-  marginTop: props.theme.spacing(12),
-  marginBottom: props.theme.spacing(16),
+  marginTop: props.theme.space.l,
+  marginBottom: props.theme.space.xl,
   gap: props.theme.space.m,
 }));
 
@@ -64,7 +72,7 @@ export const TokenListButtonContainer = styled.div((props) => ({
   display: 'flex',
   flexDirection: 'row',
   justifyContent: 'center',
-  marginTop: props.theme.spacing(6),
+  marginTop: props.theme.space.s,
   marginBottom: props.theme.spacing(22),
 }));
 
@@ -83,7 +91,7 @@ export const MergedOrdinalsIcon = styled.img({
 });
 
 export const VerifyOrViewContainer = styled.div((props) => ({
-  marginTop: props.theme.spacing(16),
+  marginTop: props.theme.space.xl,
   marginBottom: props.theme.spacing(20),
 }));
 
@@ -92,9 +100,9 @@ export const VerifyButtonContainer = styled.div((props) => ({
 }));
 
 export const ModalContent = styled.div((props) => ({
-  padding: props.theme.spacing(8),
+  padding: props.theme.space.m,
   paddingTop: 0,
-  paddingBottom: props.theme.spacing(16),
+  paddingBottom: props.theme.space.xl,
   display: 'flex',
   flexDirection: 'column',
   alignItems: 'center',
@@ -106,14 +114,14 @@ export const ModalIcon = styled.img((props) => ({
 
 export const ModalTitle = styled.div((props) => ({
   ...props.theme.typography.body_bold_l,
-  marginBottom: props.theme.spacing(4),
+  marginBottom: props.theme.space.xs,
   textAlign: 'center',
 }));
 
 export const ModalDescription = styled.div((props) => ({
   ...props.theme.typography.body_m,
   color: props.theme.colors.white_200,
-  marginBottom: props.theme.spacing(16),
+  marginBottom: props.theme.space.xl,
   textAlign: 'center',
 }));
 
@@ -140,7 +148,7 @@ export const StacksIcon = styled.img({
 
 export const MergedIcon = styled.div((props) => ({
   position: 'relative',
-  marginBottom: props.theme.spacing(12),
+  marginBottom: props.theme.space.l,
 }));
 
 export const IconBackground = styled.div((props) => ({
diff --git a/src/app/screens/home/index.tsx b/src/app/screens/home/index.tsx
index fce35f393..0db1ef311 100644
--- a/src/app/screens/home/index.tsx
+++ b/src/app/screens/home/index.tsx
@@ -422,7 +422,7 @@ function Home() {
       {isOrdinalReceiveAlertVisible && (
         <ShowOrdinalReceiveAlert onOrdinalReceiveAlertClose={onOrdinalReceiveAlertClose} />
       )}
-      <Container>
+      <Container $applyIndent={!showNotificationBanner}>
         <BalanceCard
           isLoading={loadingStxWalletData || loadingBtcWalletData}
           isRefetching={
diff --git a/src/app/screens/ledger/importLedgerAccount/index.tsx b/src/app/screens/ledger/importLedgerAccount/index.tsx
index 8de7969e9..00dadcffd 100644
--- a/src/app/screens/ledger/importLedgerAccount/index.tsx
+++ b/src/app/screens/ledger/importLedgerAccount/index.tsx
@@ -383,8 +383,8 @@ function ImportLedger(): JSX.Element {
     setCurrentStep(ImportLedgerSteps.START);
   };
 
-  const handleAssetSelect = (e: React.ChangeEvent<HTMLInputElement>) => {
-    if (e.target.id === 'stx_select_card') {
+  const handleAssetSelect = (selectedAsset: 'Bitcoin' | 'Stacks') => {
+    if (selectedAsset === 'Stacks') {
       setIsStacksSelected(!isStacksSelected);
     }
   };
diff --git a/src/app/screens/ledger/importLedgerAccount/stepControls.tsx b/src/app/screens/ledger/importLedgerAccount/stepControls.tsx
index 4e7b80a0a..69a6b9442 100644
--- a/src/app/screens/ledger/importLedgerAccount/stepControls.tsx
+++ b/src/app/screens/ledger/importLedgerAccount/stepControls.tsx
@@ -1,4 +1,4 @@
-import ActionButton from '@components/button';
+import Button from '@ui-library/button';
 import { useTranslation } from 'react-i18next';
 import styled from 'styled-components';
 import { ImportLedgerSteps } from './types';
@@ -6,11 +6,11 @@ import { ImportLedgerSteps } from './types';
 const ButtonContainer = styled.div((props) => ({
   marginLeft: 3,
   marginRight: 3,
-  marginTop: props.theme.spacing(4),
+  marginTop: props.theme.space.xs,
   width: '100%',
 }));
 
-interface Props {
+type Props = {
   isBitcoinSelected: boolean;
   isStacksSelected: boolean;
   isTogglerChecked: boolean;
@@ -29,7 +29,7 @@ interface Props {
     isStxAddressRejected: boolean;
     accountNameError?: string;
   };
-}
+};
 
 function StepControls({
   isBitcoinSelected,
@@ -62,38 +62,38 @@ function StepControls({
 
   switch (currentStep) {
     case ImportLedgerSteps.START:
-      return <ActionButton onPress={handleClickNext} text={t('LEDGER_IMPORT_1_BUTTON')} />;
+      return <Button onClick={handleClickNext} title={t('LEDGER_IMPORT_1_BUTTON')} />;
     case ImportLedgerSteps.SELECT_ASSET:
       return (
-        <ActionButton
-          onPress={handleClickNext}
-          text={t('LEDGER_IMPORT_CONTINUE_BUTTON')}
+        <Button
+          onClick={handleClickNext}
+          title={t('LEDGER_IMPORT_CONTINUE_BUTTON')}
           disabled={!isBitcoinSelected && !isStacksSelected}
         />
       );
     case ImportLedgerSteps.BEFORE_START:
       return (
-        <ActionButton
-          onPress={handleClickNext}
-          text={t('LEDGER_IMPORT_CONTINUE_BUTTON')}
+        <Button
+          onClick={handleClickNext}
+          title={t('LEDGER_IMPORT_CONTINUE_BUTTON')}
           disabled={selectedLedgerLiveOption === null}
         />
       );
     case ImportLedgerSteps.IMPORTANT_WARNING:
       return (
-        <ActionButton
-          onPress={handleClickNext}
-          text={t('LEDGER_IMPORT_CONTINUE_BUTTON')}
+        <Button
+          onClick={handleClickNext}
+          title={t('LEDGER_IMPORT_CONTINUE_BUTTON')}
           disabled={!isTogglerChecked}
         />
       );
     case ImportLedgerSteps.CONNECT_LEDGER:
       return (
-        <ActionButton
-          processing={isButtonDisabled}
+        <Button
+          loading={isButtonDisabled}
           disabled={isButtonDisabled}
-          onPress={checkDeviceConnection}
-          text={t(
+          onClick={checkDeviceConnection}
+          title={t(
             isConnectFailed ? 'LEDGER_IMPORT_TRY_AGAIN_BUTTON' : 'LEDGER_IMPORT_CONNECT_BUTTON',
           )}
         />
@@ -102,20 +102,20 @@ function StepControls({
       return (
         <>
           <ButtonContainer>
-            <ActionButton
+            <Button
               disabled={isButtonDisabled}
-              processing={isButtonDisabled}
-              onPress={backToAssetSelection}
-              transparent
-              text={t('LEDGER_IMPORT_CANCEL_BUTTON')}
+              loading={isButtonDisabled}
+              onClick={backToAssetSelection}
+              variant="secondary"
+              title={t('LEDGER_IMPORT_CANCEL_BUTTON')}
             />
           </ButtonContainer>
           <ButtonContainer>
-            <ActionButton
+            <Button
               disabled={isButtonDisabled}
-              processing={isButtonDisabled}
-              onPress={handleClickMultipleAccounts}
-              text={t('LEDGER_IMPORT_YES_BUTTON')}
+              loading={isButtonDisabled}
+              onClick={handleClickMultipleAccounts}
+              title={t('LEDGER_IMPORT_YES_BUTTON')}
             />
           </ButtonContainer>
         </>
@@ -129,33 +129,40 @@ function StepControls({
         isStxAddressRejected
       ) {
         return (
-          <ActionButton
-            processing={isButtonDisabled}
+          <Button
+            loading={isButtonDisabled}
             disabled={isButtonDisabled}
-            onPress={backToAssetSelection}
-            text={t('LEDGER_IMPORT_TRY_AGAIN_BUTTON')}
+            onClick={backToAssetSelection}
+            title={t('LEDGER_IMPORT_TRY_AGAIN_BUTTON')}
           />
         );
       }
       break;
     case ImportLedgerSteps.ADDRESS_ADDED:
-      return <ActionButton onPress={handleClickNext} text={t('LEDGER_IMPORT_NEXT_BUTTON')} />;
+      return (
+        <Button
+          loading={isButtonDisabled}
+          disabled={isButtonDisabled}
+          onClick={handleClickNext}
+          title={t('LEDGER_IMPORT_NEXT_BUTTON')}
+        />
+      );
     case ImportLedgerSteps.ADD_ACCOUNT_NAME:
       return (
-        <ActionButton
+        <Button
+          loading={isButtonDisabled}
           disabled={isButtonDisabled}
-          processing={isButtonDisabled}
-          onPress={updateAccountName}
-          text={t('LEDGER_IMPORT_CONFIRM_BUTTON')}
+          onClick={updateAccountName}
+          title={t('LEDGER_IMPORT_CONFIRM_BUTTON')}
         />
       );
     case ImportLedgerSteps.IMPORT_END:
       return (
-        <ActionButton
+        <Button
+          loading={isButtonDisabled}
           disabled={isButtonDisabled}
-          processing={isButtonDisabled}
-          onPress={handleWindowClose}
-          text={t('LEDGER_IMPORT_CLOSE_BUTTON')}
+          onClick={handleWindowClose}
+          title={t('LEDGER_IMPORT_CLOSE_BUTTON')}
         />
       );
     default:
diff --git a/src/app/screens/ledger/importLedgerAccount/steps/index.styled.ts b/src/app/screens/ledger/importLedgerAccount/steps/index.styled.ts
index b791f721b..fd2e41104 100644
--- a/src/app/screens/ledger/importLedgerAccount/steps/index.styled.ts
+++ b/src/app/screens/ledger/importLedgerAccount/steps/index.styled.ts
@@ -1,4 +1,3 @@
-import Switch from 'react-switch';
 import styled from 'styled-components';
 
 export const ImportStartImage = styled.img((props) => ({
@@ -171,8 +170,9 @@ export const OptionsContainer = styled.div((props) => ({
 interface OptionProps {
   selected?: boolean;
 }
-export const Option = styled.div<OptionProps>((props) => ({
+export const Option = styled.button<OptionProps>((props) => ({
   width: '100%',
+  color: props.theme.colors.white_0,
   backgroundColor: props.theme.colors.elevation3,
   padding: props.theme.spacing(8),
   paddingTop: props.theme.spacing(7),
@@ -222,15 +222,6 @@ export const ConfirmationStep = styled.div<{
   },
 }));
 
-// TODO create custom switch in ui-library
-export const CustomSwitch = styled(Switch)`
-  .react-switch-handle {
-    background-color: ${({ checked }) =>
-      checked ? '#FFFFFF' : 'rgba(255, 255, 255, 0.2)'} !important;
-    border: ${({ checked }) => (checked ? '' : '4px solid rgba(255, 255, 255, 0.2)')} !important;
-  }
-`;
-
 export const TogglerContainer = styled.div((props) => ({
   display: 'flex',
   alignItems: 'center',
diff --git a/src/app/screens/ledger/importLedgerAccount/steps/index.tsx b/src/app/screens/ledger/importLedgerAccount/steps/index.tsx
index f5210b0ea..5175b5a0b 100644
--- a/src/app/screens/ledger/importLedgerAccount/steps/index.tsx
+++ b/src/app/screens/ledger/importLedgerAccount/steps/index.tsx
@@ -13,10 +13,10 @@ import LedgerAddressComponent from '@components/ledger/ledgerAddressComponent';
 import LedgerAssetSelectCard from '@components/ledger/ledgerAssetSelectCard';
 import LedgerInput from '@components/ledger/ledgerInput';
 import { useTranslation } from 'react-i18next';
-import { useTheme } from 'styled-components';
 import LedgerConnectionView from '../../../../components/ledger/connectLedgerView';
 import { ImportLedgerSteps, LedgerLiveOptions } from '../types';
 
+import Toggle from '@ui-library/toggle';
 import {
   AddAccountNameContainer,
   AddAccountNameTitleContainer,
@@ -29,7 +29,6 @@ import {
   CreateAnotherAccountContainer,
   CreateMultipleAccountsText,
   CustomLink,
-  CustomSwitch,
   EndScreenContainer,
   EndScreenTextContainer,
   ImportBeforeStartContainer,
@@ -57,7 +56,7 @@ const LINK_TO_LEDGER_ACCOUNT_ISSUE_GUIDE =
 const LINK_TO_LEDGER_PASSPHRASE_GUIDE =
   'https://support.xverse.app/hc/en-us/articles/17901278165773';
 
-interface Props {
+type Props = {
   isConnectSuccess: boolean;
   isBitcoinSelected: boolean;
   isStacksSelected: boolean;
@@ -68,7 +67,7 @@ interface Props {
   accountName: string;
   accountId: number;
   selectedLedgerLiveOption: LedgerLiveOptions | null;
-  handleAssetSelect: (event: React.ChangeEvent<HTMLInputElement>) => void;
+  handleAssetSelect: (selectedAsset: 'Bitcoin' | 'Stacks') => void;
   setSelectedLedgerLiveOption: (option: LedgerLiveOptions) => void;
   setIsTogglerChecked: (checked: boolean) => void;
   setAccountName: (name: string) => void;
@@ -84,7 +83,7 @@ interface Props {
     isStxAddressRejected: boolean;
     accountNameError?: string;
   };
-}
+};
 
 function Steps({
   isConnectSuccess,
@@ -105,7 +104,6 @@ function Steps({
   errors,
 }: Props) {
   const { t } = useTranslation('translation', { keyPrefix: 'LEDGER_IMPORT_SCREEN' });
-  const theme = useTheme();
   const { bitcoinCredentials, ordinalsCredentials, stacksCredentials } = creds;
   const {
     isConnectFailed,
@@ -137,18 +135,18 @@ function Steps({
               icon={btcOrdinalsIcon}
               title={t('LEDGER_IMPORT_2_SELECT.BTC_TITLE')}
               text={t('LEDGER_IMPORT_2_SELECT.BTC_SUBTITLE')}
-              id="btc_select_card"
+              name="Bitcoin"
               isChecked={isBitcoinSelected}
-              onChange={handleAssetSelect}
+              onClick={handleAssetSelect}
             />
 
             <LedgerAssetSelectCard
               icon={stxIcon}
               title={t('LEDGER_IMPORT_2_SELECT.STACKS_TITLE')}
               text={t('LEDGER_IMPORT_2_SELECT.STACKS_SUBTITLE')}
-              id="stx_select_card"
+              name="Stacks"
               isChecked={isStacksSelected}
-              onChange={handleAssetSelect}
+              onClick={handleAssetSelect}
               squareIcon
             />
             <SelectAssetFootNote>{t('LEDGER_IMPORT_2_FOOTNOTE')}</SelectAssetFootNote>
@@ -239,13 +237,9 @@ function Steps({
             </ImportBeforeStartText>
           )}
           <TogglerContainer>
-            <CustomSwitch
-              onColor={theme.colors.orange_main}
-              offColor={theme.colors.background.elevation3}
+            <Toggle
               onChange={() => setIsTogglerChecked(!isTogglerChecked)}
               checked={isTogglerChecked}
-              uncheckedIcon={false}
-              checkedIcon={false}
             />
             {selectedLedgerLiveOption === LedgerLiveOptions.USING ? (
               <TogglerText>
diff --git a/src/app/screens/legal/index.tsx b/src/app/screens/legal/index.tsx
index f4496a08e..80f88ad07 100644
--- a/src/app/screens/legal/index.tsx
+++ b/src/app/screens/legal/index.tsx
@@ -1,8 +1,8 @@
 import LinkIcon from '@assets/img/linkIcon.svg';
 import Separator from '@components/separator';
 import useWalletReducer from '@hooks/useWalletReducer';
-import { CustomSwitch } from '@screens/ledger/importLedgerAccount/steps/index.styled';
 import Button from '@ui-library/button';
+import Toggle from '@ui-library/toggle';
 import { PRIVACY_POLICY_LINK, TERMS_LINK } from '@utils/constants';
 import { saveIsTermsAccepted } from '@utils/localStorage';
 import { optInMixPanel, optOutMixPanel } from '@utils/mixpanel';
@@ -116,14 +116,7 @@ function Legal() {
           </DataCollectionDescription>
           <SwitchContainer>
             <div>{t('AUTHORIZE_DATA_COLLECTION.TITLE')}</div>
-            <CustomSwitch
-              onColor={theme.colors.orange_main}
-              offColor={theme.colors.background.elevation3}
-              onChange={handleSwitchToggle}
-              checked={isToggleEnabled}
-              uncheckedIcon={false}
-              checkedIcon={false}
-            />
+            <Toggle onChange={handleSwitchToggle} checked={isToggleEnabled} />
           </SwitchContainer>
         </LinksContainer>
       </div>
diff --git a/src/app/screens/login/index.tsx b/src/app/screens/login/index.tsx
index a65047dfb..dd600763a 100644
--- a/src/app/screens/login/index.tsx
+++ b/src/app/screens/login/index.tsx
@@ -46,7 +46,7 @@ const AppVersion = styled.p((props) => ({
   ...props.theme.typography.body_s,
   color: props.theme.colors.white_0,
   textAlign: 'right',
-  marginTop: props.theme.spacing(8),
+  marginTop: props.theme.space.m,
 }));
 
 const TopSectionContainer = styled.div((props) => ({
@@ -69,10 +69,10 @@ const PasswordInputContainer = styled.div((props) => ({
   alignItems: 'center',
   width: '100%',
   border: `1px solid ${props.theme.colors.elevation3}`,
-  paddingLeft: props.theme.spacing(8),
-  paddingRight: props.theme.spacing(8),
+  paddingLeft: props.theme.space.m,
+  paddingRight: props.theme.space.m,
   borderRadius: props.theme.radius(1),
-  marginTop: props.theme.spacing(4),
+  marginTop: props.theme.space.xs,
 }));
 
 const PasswordInput = styled.input((props) => ({
@@ -94,7 +94,7 @@ const LandingTitle = styled.h1((props) => ({
 }));
 
 const ButtonContainer = styled.div((props) => ({
-  marginTop: props.theme.spacing(8),
+  marginTop: props.theme.space.m,
   width: '100%',
 }));
 
@@ -102,15 +102,19 @@ const ErrorMessage = styled.h2((props) => ({
   ...props.theme.typography.body_medium_m,
   textAlign: 'left',
   color: props.theme.colors.feedback.error,
-  marginTop: props.theme.spacing(4),
+  marginTop: props.theme.space.xs,
 }));
 
-const ForgotPasswordButton = styled.a((props) => ({
+const ForgotPasswordButton = styled.button((props) => ({
   ...props.theme.typography.body_m,
   textAlign: 'center',
-  marginTop: props.theme.spacing(12),
+  marginTop: props.theme.space.l,
   color: props.theme.colors.white_0,
   textDecoration: 'underline',
+  backgroundColor: 'transparent',
+  ':hover': {
+    textDecoration: 'none',
+  },
 }));
 
 function Login(): JSX.Element {
@@ -120,11 +124,12 @@ function Login(): JSX.Element {
   const { hasSeed } = useSeedVault();
   const { getSanityCheck } = useSanityCheck();
   const { migrateCachedStorage, isVaultUpdated } = useSeedVaultMigration();
-  const [isPasswordVisible, setIsPasswordVisible] = useState<boolean>(false);
-  const [password, setPassword] = useState<string>('');
-  const [error, setError] = useState<string>('');
+  const [isPasswordVisible, setIsPasswordVisible] = useState(false);
+  const [password, setPassword] = useState('');
+  const [error, setError] = useState('');
   const [isVerifying, setIsVerifying] = useState(false);
   const [showMigration, setShowMigration] = useState(false);
+
   const styles = useSpring({
     from: {
       opacity: 0,
@@ -194,7 +199,7 @@ function Login(): JSX.Element {
 
   useEffect(() => {
     const keyDownHandler = async (event) => {
-      if (event.key === 'Enter') {
+      if (event.key === 'Enter' && !!password && document.activeElement?.id === 'password-input') {
         event.preventDefault();
         await handleVerifyPassword();
       }
@@ -214,7 +219,7 @@ function Login(): JSX.Element {
     <>
       {!showMigration ? (
         <ScreenContainer>
-          <AppVersion>Beta</AppVersion>
+          <AppVersion>{t('BETA_VERSION')}</AppVersion>
           <ContentContainer style={styles}>
             <TopSectionContainer>
               <Logo src={logo} />
@@ -223,6 +228,7 @@ function Login(): JSX.Element {
             <PasswordInputLabel>{t('PASSWORD_INPUT_LABEL')}</PasswordInputLabel>
             <PasswordInputContainer>
               <PasswordInput
+                id="password-input"
                 type={isPasswordVisible ? 'text' : 'password'}
                 value={password}
                 onChange={handlePasswordChange}
diff --git a/src/app/screens/manageTokens/coinItem/index.tsx b/src/app/screens/manageTokens/coinItem/index.tsx
index e691a8617..62f7096b0 100644
--- a/src/app/screens/manageTokens/coinItem/index.tsx
+++ b/src/app/screens/manageTokens/coinItem/index.tsx
@@ -1,9 +1,8 @@
 import TokenImage from '@components/tokenImage';
 import type { FungibleToken } from '@secretkeylabs/xverse-core';
+import Toggle from '@ui-library/toggle';
 import { useState } from 'react';
-import Switch from 'react-switch';
 import styled from 'styled-components';
-import Theme from 'theme';
 
 const RowContainer = styled.div`
   display: flex;
@@ -19,14 +18,6 @@ const CoinContainer = styled.div({
   alignItems: 'center',
 });
 
-const CustomSwitch = styled(Switch)`
-  .react-switch-handle {
-    background-color: ${({ checked }) =>
-      checked ? '#FFFFFF' : 'rgba(255, 255, 255, 0.2)'} !important;
-    border: ${({ checked }) => (checked ? '' : '4px solid rgba(255, 255, 255, 0.2)')} !important;
-  }
-`;
-
 const CoinTitleText = styled.p<{ isEnabled?: boolean }>((props) => ({
   ...props.theme.typography[props.isEnabled ? 'body_bold_m' : 'body_m'],
   color: props.theme.colors[props.isEnabled ? 'white_0' : 'white_400'],
@@ -91,15 +82,7 @@ function CoinItem({
           {name}
         </CoinTitleText>
       </CoinContainer>
-      <CustomSwitch
-        onColor={Theme.colors.tangerine}
-        offColor={Theme.colors.elevation3}
-        onChange={toggleSwitch}
-        checked={isEnabled!}
-        uncheckedIcon={false}
-        checkedIcon={false}
-        disabled={disabled}
-      />
+      <Toggle onChange={toggleSwitch} checked={isEnabled!} disabled={disabled} />
     </RowContainer>
   );
 }
diff --git a/src/app/screens/nftDashboard/collectiblesTabs.tsx b/src/app/screens/nftDashboard/collectiblesTabs.tsx
index 41af28166..1c91435d9 100644
--- a/src/app/screens/nftDashboard/collectiblesTabs.tsx
+++ b/src/app/screens/nftDashboard/collectiblesTabs.tsx
@@ -1,9 +1,10 @@
-import ActionButton from '@components/button';
 import { StyledBarLoader, TilesSkeletonLoader } from '@components/tilesSkeletonLoader';
 import WrenchErrorMessage from '@components/wrenchErrorMessage';
 import useTrackMixPanelPageViewed from '@hooks/useTrackMixPanelPageViewed';
 import { mapRareSatsAPIResponseToBundle, type Bundle } from '@secretkeylabs/xverse-core';
-import { StyledP, StyledTab, StyledTabList } from '@ui-library/common.styled';
+import Button from '@ui-library/button';
+import { StyledP, StyledTabList } from '@ui-library/common.styled';
+import { TabItem } from '@ui-library/tabs';
 import { useEffect, useState } from 'react';
 import { useTranslation } from 'react-i18next';
 import { useNavigate, useSearchParams } from 'react-router-dom';
@@ -47,7 +48,7 @@ const StyledTotalItems = styled(StyledP)`
 `;
 
 const NoticeContainer = styled.div((props) => ({
-  marginTop: props.theme.spacing(8),
+  marginTop: props.theme.space.m,
   display: 'flex',
   flexDirection: 'column',
   alignItems: 'center',
@@ -100,6 +101,7 @@ type TabButton = {
   key: string;
   label: string;
 };
+
 const tabs: TabButton[] = [
   {
     key: 'inscriptions',
@@ -179,10 +181,17 @@ export default function CollectiblesTabs({
 
   return (
     <Tabs className={className} selectedIndex={tabIndex} onSelect={handleSelectTab}>
+      {/* TODO: replace with Tabs component from `src/app/components/tabs/index.tsx` */}
       {visibleTabButtons.length > 1 && (
         <StickyStyledTabList data-testid="tab-list">
           {visibleTabButtons.map(({ key, label }) => (
-            <StyledTab key={key}>{t(label)}</StyledTab>
+            <TabItem
+              key={key}
+              $active={tabIndex === tabKeyToIndex(key)}
+              onClick={() => handleSelectTab(tabKeyToIndex(key))}
+            >
+              {t(label)}
+            </TabItem>
           ))}
         </StickyStyledTabList>
       )}
@@ -278,12 +287,12 @@ export default function CollectiblesTabs({
           )}
           {rareSatsQuery.hasNextPage && (
             <LoadMoreButtonContainer>
-              <ActionButton
-                transparent
-                text={t('LOAD_MORE')}
-                processing={rareSatsQuery.isFetchingNextPage}
+              <Button
+                variant="secondary"
+                title={t('LOAD_MORE')}
+                loading={rareSatsQuery.isFetchingNextPage}
                 disabled={rareSatsQuery.isFetchingNextPage}
-                onPress={() => rareSatsQuery.fetchNextPage()}
+                onClick={() => rareSatsQuery.fetchNextPage()}
               />
             </LoadMoreButtonContainer>
           )}
diff --git a/src/app/screens/nftDashboard/index.tsx b/src/app/screens/nftDashboard/index.tsx
index fade3b948..5027a5bb3 100644
--- a/src/app/screens/nftDashboard/index.tsx
+++ b/src/app/screens/nftDashboard/index.tsx
@@ -1,10 +1,10 @@
 import FeatureIcon from '@assets/img/nftDashboard/rareSats/NewFeature.svg';
 import AccountHeaderComponent from '@components/accountHeader';
-import ActionButton from '@components/button';
 import ShowOrdinalReceiveAlert from '@components/showOrdinalReceiveAlert';
 import BottomTabBar from '@components/tabBar';
 import WebGalleryButton from '@components/webGalleryButton';
 import { ArrowDown } from '@phosphor-icons/react';
+import Button from '@ui-library/button';
 import { StyledHeading } from '@ui-library/common.styled';
 import Dialog from '@ui-library/dialog';
 import { useTranslation } from 'react-i18next';
@@ -54,7 +54,7 @@ const ReceiveNftContainer = styled.div((props) => ({
 }));
 
 const CollectibleContainer = styled.div((props) => ({
-  marginBottom: props.theme.spacing(12),
+  marginBottom: props.theme.space.l,
 }));
 
 const ButtonContainer = styled.div({
@@ -124,10 +124,10 @@ function NftDashboard() {
           </CollectibleContainer>
           <ButtonContainer data-testid="receive-button">
             <ReceiveButtonContainer>
-              <ActionButton
+              <Button
                 icon={<ArrowDown weight="bold" size={16} />}
-                text={t('RECEIVE')}
-                onPress={onReceiveModalOpen}
+                title={t('RECEIVE')}
+                onClick={onReceiveModalOpen}
               />
             </ReceiveButtonContainer>
             {openReceiveModal && (
diff --git a/src/app/screens/nftDashboard/receiveNft/index.tsx b/src/app/screens/nftDashboard/receiveNft/index.tsx
index 9d7d72432..a2dedb402 100644
--- a/src/app/screens/nftDashboard/receiveNft/index.tsx
+++ b/src/app/screens/nftDashboard/receiveNft/index.tsx
@@ -3,10 +3,10 @@ import plusIcon from '@assets/img/dashboard/plus.svg';
 import stacksIcon from '@assets/img/dashboard/stx_icon.svg';
 import ordinalsIcon from '@assets/img/nftDashboard/ordinals_icon.svg';
 import ActionButton from '@components/button';
-import UpdatedBottomModal from '@components/updatedBottomModal';
 import useSelectedAccount from '@hooks/useSelectedAccount';
 import useWalletSelector from '@hooks/useWalletSelector';
 import { Plus } from '@phosphor-icons/react';
+import Sheet from '@ui-library/sheet';
 import { isInOptions, isLedgerAccount } from '@utils/helper';
 import { useState } from 'react';
 import { useTranslation } from 'react-i18next';
@@ -14,13 +14,15 @@ import { useNavigate } from 'react-router-dom';
 import styled from 'styled-components';
 import ReceiveCardComponent from '../../../components/receiveCardComponent';
 
+const GalleryModalContainer = styled.div((props) => ({
+  padding: `0 ${props.theme.space.m}`,
+}));
+
 const ColumnContainer = styled.div((props) => ({
   display: 'flex',
   flexDirection: 'column',
   marginTop: props.theme.space.l,
   marginBottom: props.theme.space.xl,
-  paddingLeft: props.theme.space.m,
-  paddingRight: props.theme.space.m,
   gap: props.theme.space.m,
 }));
 
@@ -80,12 +82,12 @@ const VerifyButtonContainer = styled.div((props) => ({
   marginBottom: props.theme.spacing(6),
 }));
 
-interface Props {
+type Props = {
   visible: boolean;
   onClose: () => void;
   setOrdinalReceiveAlert: () => void;
   isGalleryOpen: boolean;
-}
+};
 
 function ReceiveNftModal({ visible, onClose, isGalleryOpen, setOrdinalReceiveAlert }: Props) {
   const { t } = useTranslation('translation', { keyPrefix: 'NFT_DASHBOARD_SCREEN' });
@@ -214,16 +216,14 @@ function ReceiveNftModal({ visible, onClose, isGalleryOpen, setOrdinalReceiveAle
           <img src={Cross} alt="cross" />
         </ButtonImage>
       </RowContainer>
-      {isReceivingAddressesVisible ? receiveContent : verifyOrViewAddresses}
+      <GalleryModalContainer>
+        {isReceivingAddressesVisible ? receiveContent : verifyOrViewAddresses}
+      </GalleryModalContainer>
     </>
   ) : (
-    <UpdatedBottomModal
-      visible={visible}
-      header={t('RECEIVE_NFT')}
-      onClose={handleReceiveModalClose}
-    >
+    <Sheet visible={visible} title={t('RECEIVE_NFT')} onClose={handleReceiveModalClose}>
       {isReceivingAddressesVisible ? receiveContent : verifyOrViewAddresses}
-    </UpdatedBottomModal>
+    </Sheet>
   );
 }
 
diff --git a/src/app/screens/nftDashboard/useNftDashboard.tsx b/src/app/screens/nftDashboard/useNftDashboard.tsx
index b2cbd6971..c78ab17d0 100644
--- a/src/app/screens/nftDashboard/useNftDashboard.tsx
+++ b/src/app/screens/nftDashboard/useNftDashboard.tsx
@@ -1,4 +1,3 @@
-import ActionButton from '@components/button';
 import useAddressInscriptionCollections from '@hooks/queries/ordinals/useAddressInscriptionCollections';
 import { useAddressRareSats } from '@hooks/queries/ordinals/useAddressRareSats';
 import useStacksCollectibles from '@hooks/queries/useStacksCollectibles';
@@ -10,6 +9,7 @@ import {
   ChangeActivateRareSatsAction,
   SetRareSatsNoticeDismissedAction,
 } from '@stores/wallet/actions/actionCreators';
+import Button from '@ui-library/button';
 import { getCollectionKey } from '@utils/inscriptions';
 import { InvalidParamsError } from '@utils/query';
 import { useCallback, useEffect, useMemo, useRef, useState, type PropsWithChildren } from 'react';
@@ -178,12 +178,12 @@ const useNftDashboard = (): NftDashboardState => {
         </GridContainer>
         {inscriptionsQuery.hasNextPage && (
           <LoadMoreButtonContainer>
-            <ActionButton
-              transparent
-              text={t('LOAD_MORE')}
-              processing={inscriptionsQuery.isFetchingNextPage}
+            <Button
+              variant="secondary"
+              title={t('LOAD_MORE')}
+              loading={inscriptionsQuery.isFetchingNextPage}
               disabled={inscriptionsQuery.isFetchingNextPage}
-              onPress={() => inscriptionsQuery.fetchNextPage()}
+              onClick={() => inscriptionsQuery.fetchNextPage()}
             />
           </LoadMoreButtonContainer>
         )}
diff --git a/src/app/screens/ordinalDetail/index.styled.ts b/src/app/screens/ordinalDetail/index.styled.ts
index b9cb58569..98ec80ca2 100644
--- a/src/app/screens/ordinalDetail/index.styled.ts
+++ b/src/app/screens/ordinalDetail/index.styled.ts
@@ -31,9 +31,13 @@ export const GalleryContainer = styled.div({
 
 export const BackButtonContainer = styled.div((props) => ({
   display: 'flex',
-  flexDirection: 'row',
-  width: 820,
+  justifyContent: 'flex-start',
+  width: '100%',
+  maxWidth: 820,
   marginTop: props.theme.spacing(40),
+  button: {
+    width: 'auto',
+  },
 }));
 
 export const ButtonContainer = styled.div((props) => ({
@@ -41,7 +45,7 @@ export const ButtonContainer = styled.div((props) => ({
   position: 'relative',
   flexDirection: 'row',
   maxWidth: 400,
-  columnGap: props.theme.spacing(8),
+  columnGap: props.theme.space.m,
   marginBottom: props.theme.spacing(10.5),
 }));
 
@@ -49,11 +53,11 @@ export const ExtensionContainer = styled.div((props) => ({
   ...props.theme.scrollbar,
   display: 'flex',
   flexDirection: 'column',
-  marginTop: props.theme.spacing(4),
+  marginTop: props.theme.space.xs,
   alignItems: 'center',
   flex: 1,
-  paddingLeft: props.theme.spacing(4),
-  paddingRight: props.theme.spacing(4),
+  paddingLeft: props.theme.space.xs,
+  paddingRight: props.theme.space.xs,
 }));
 
 export const OrdinalsContainer = styled.div((props) => ({
@@ -65,7 +69,7 @@ export const OrdinalsContainer = styled.div((props) => ({
   justifyContent: 'flex-start',
   alignItems: 'flex-start',
   borderRadius: 8,
-  marginBottom: props.theme.spacing(12),
+  marginBottom: props.theme.space.l,
 }));
 
 export const ExtensionOrdinalsContainer = styled.div((props) => ({
@@ -76,7 +80,7 @@ export const ExtensionOrdinalsContainer = styled.div((props) => ({
   justifyContent: 'center',
   alignItems: 'center',
   borderRadius: props.theme.radius(1),
-  marginTop: props.theme.spacing(12),
+  marginTop: props.theme.space.l,
   marginBottom: props.theme.space.m,
 }));
 
@@ -184,29 +188,6 @@ export const StyledTooltip = styled(Tooltip)`
   }
 `;
 
-export const ButtonImage = styled.img((props) => ({
-  marginRight: props.theme.spacing(3),
-  alignSelf: 'center',
-  transform: 'all',
-}));
-
-export const Button = styled.button((props) => ({
-  display: 'flex',
-  flexDirection: 'row',
-  justifyContent: 'flex-start',
-  alignItems: 'center',
-  background: 'transparent',
-  marginBottom: props.theme.spacing(12),
-}));
-
-export const AssetDeatilButtonText = styled.div((props) => ({
-  ...props.theme.typography.body_s,
-  fontWeight: 400,
-  fontSize: 14,
-  color: props.theme.colors.white_0,
-  textAlign: 'center',
-}));
-
 export const CollectibleText = styled.h1((props) => ({
   ...props.theme.typography.body_bold_m,
   color: props.theme.colors.white_400,
@@ -286,14 +267,14 @@ export const ActionButtonLoader = styled.div((props) => ({
   display: 'flex',
   flexDirection: 'column',
   alignItems: 'center',
-  rowGap: props.theme.spacing(4),
+  rowGap: props.theme.space.xs,
 }));
 
 export const InfoContainer = styled.div((props) => ({
   width: '100%',
   display: 'flex',
   justifyContent: 'space-between',
-  padding: `0 ${props.theme.spacing(8)}px`,
+  padding: `0 ${props.theme.space.m}`,
 }));
 
 export const RareSatsBundleCallout = styled(Callout)<DetailSectionProps>((props) => ({
diff --git a/src/app/screens/ordinalDetail/index.tsx b/src/app/screens/ordinalDetail/index.tsx
index ea8bd71a7..2006993c1 100644
--- a/src/app/screens/ordinalDetail/index.tsx
+++ b/src/app/screens/ordinalDetail/index.tsx
@@ -1,7 +1,6 @@
 import ArrowLeft from '@assets/img/dashboard/arrow_left.svg';
 import AccountHeaderComponent from '@components/accountHeader';
 import AlertMessage from '@components/alertMessage';
-import ActionButton from '@components/button';
 import CollectibleDetailTile from '@components/collectibleDetailTile';
 import RareSatIcon from '@components/rareSatIcon/rareSatIcon';
 import SquareButton from '@components/squareButton';
@@ -10,6 +9,7 @@ import TopRow from '@components/topRow';
 import { useResetUserFlow } from '@hooks/useResetUserFlow';
 import { ArrowUp, Share } from '@phosphor-icons/react';
 import OrdinalImage from '@screens/ordinals/ordinalImage';
+import Button from '@ui-library/button';
 import { StyledP } from '@ui-library/common.styled';
 import { EMPTY_LABEL } from '@utils/constants';
 import { getRareSatsColorsByRareSatsType, getRareSatsLabelByType } from '@utils/rareSats';
@@ -17,14 +17,11 @@ import { useTranslation } from 'react-i18next';
 import {
   ActionButtonLoader,
   ActionButtonsLoader,
-  AssetDeatilButtonText,
   BackButtonContainer,
   Badge,
   BottomBarContainer,
-  Button,
   ButtonContainer,
   ButtonHiglightedText,
-  ButtonImage,
   ButtonText,
   CollectibleText,
   ColumnContainer,
@@ -372,12 +369,13 @@ function OrdinalDetailScreen() {
     <GalleryScrollContainer>
       <GalleryContainer>
         <BackButtonContainer>
-          <Button data-testid="back-to-gallery" onClick={handleBackButtonClick}>
-            <>
-              <ButtonImage src={ArrowLeft} />
-              <AssetDeatilButtonText>{backButtonText}</AssetDeatilButtonText>
-            </>
-          </Button>
+          <Button
+            variant="tertiary"
+            icon={<img src={ArrowLeft} alt="go back" />}
+            dataTestId="back-to-gallery"
+            onClick={handleBackButtonClick}
+            title={backButtonText}
+          />
         </BackButtonContainer>
 
         <RowContainer withGap>
@@ -406,12 +404,13 @@ function OrdinalDetailScreen() {
     <GalleryScrollContainer>
       <GalleryContainer>
         <BackButtonContainer>
-          <Button data-testid="back-button" onClick={handleBackButtonClick}>
-            <>
-              <ButtonImage src={ArrowLeft} />
-              <AssetDeatilButtonText>{backButtonText}</AssetDeatilButtonText>
-            </>
-          </Button>
+          <Button
+            variant="tertiary"
+            icon={<img src={ArrowLeft} alt="go back" />}
+            dataTestId="back-button"
+            onClick={handleBackButtonClick}
+            title={backButtonText}
+          />
         </BackButtonContainer>
 
         <RowContainer withGap>
@@ -441,19 +440,19 @@ function OrdinalDetailScreen() {
 
             <ButtonContainer>
               <GalleryButtonContainer>
-                <ActionButton
+                <Button
                   icon={<ArrowUp weight="bold" size="16" />}
-                  text={t('SEND')}
-                  onPress={handleSendOrdinal}
+                  title={t('SEND')}
+                  onClick={handleSendOrdinal}
                 />
               </GalleryButtonContainer>
               <GalleryButtonContainer>
-                <ActionButton
+                <Button
                   icon={<Share weight="bold" color="white" size="16" />}
-                  text={t('SHARE')}
-                  onPress={onCopyClick}
-                  hoverDialogId={`copy-url-${ordinal?.id}`}
-                  transparent
+                  title={t('SHARE')}
+                  onClick={onCopyClick}
+                  id={`copy-url-${ordinal?.id}`}
+                  variant="secondary"
                 />
                 <StyledTooltip
                   anchorId={`copy-url-${ordinal?.id}`}
diff --git a/src/app/screens/ordinalsCollection/index.tsx b/src/app/screens/ordinalsCollection/index.tsx
index 1f348fcd0..4dfbb3f1c 100644
--- a/src/app/screens/ordinalsCollection/index.tsx
+++ b/src/app/screens/ordinalsCollection/index.tsx
@@ -1,6 +1,5 @@
 import AccountHeaderComponent from '@components/accountHeader';
 import { BetterBarLoader } from '@components/barLoader';
-import ActionButton from '@components/button';
 import CollectibleCollectionGridItem from '@components/collectibleCollectionGridItem';
 import CollectibleDetailTile from '@components/collectibleDetailTile';
 import Separator from '@components/separator';
@@ -15,6 +14,7 @@ import { useResetUserFlow } from '@hooks/useResetUserFlow';
 import { ArrowLeft } from '@phosphor-icons/react';
 import { GridContainer } from '@screens/nftDashboard/collectiblesTabs';
 import OrdinalImage from '@screens/ordinals/ordinalImage';
+import Button from '@ui-library/button';
 import { StyledHeading, StyledP } from '@ui-library/common.styled';
 import { EMPTY_LABEL } from '@utils/constants';
 import {
@@ -242,12 +242,12 @@ function OrdinalsCollection() {
           </StyledGridContainer>
           {hasNextPage && (
             <LoadMoreButtonContainer>
-              <ActionButton
-                transparent
-                text={t('LOAD_MORE')}
-                processing={isFetchingNextPage}
+              <Button
+                variant="secondary"
+                title={t('LOAD_MORE')}
+                loading={isFetchingNextPage}
                 disabled={isFetchingNextPage}
-                onPress={() => fetchNextPage()}
+                onClick={() => fetchNextPage()}
               />
             </LoadMoreButtonContainer>
           )}
diff --git a/src/app/screens/sendStx/stxAmountSelector.tsx b/src/app/screens/sendStx/stxAmountSelector.tsx
index 1e63bc7a3..830cd5288 100644
--- a/src/app/screens/sendStx/stxAmountSelector.tsx
+++ b/src/app/screens/sendStx/stxAmountSelector.tsx
@@ -40,6 +40,13 @@ const StyledFiatAmountText = styled(FiatAmountText)`
   color: ${(props) => props.theme.colors.white_200};
 `;
 
+const ConvertedAmountWrapper = styled.div`
+  max-width: 120px;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+`;
+
 const inputValidator = /^[0-9.]*$/;
 const stxInputExtractor = /[0-9]+[.]?[0-9]{0,6}/;
 const stxInputValidator = /^[0-9]+[.]?[0-9]{0,6}$/;
@@ -188,29 +195,29 @@ function StxAmountSelector({ amount, setAmount, sendMax, setSendMax, disabled =
       complications={
         <>
           <ConvertComplication disabled={disabled} onClick={handleUseStxValueChange}>
-            {useStxValue ? (
-              <StyledFiatAmountText
-                fiatAmount={getStxFiatEquivalent(
-                  BigNumber(amount),
-                  BigNumber(stxBtcRate),
-                  BigNumber(btcFiatRate),
-                )}
-                fiatCurrency={fiatCurrency}
-              />
-            ) : (
-              <NumericFormat
-                value={microStxToStxString(amount)}
-                displayType="text"
-                thousandSeparator
-                renderText={(value: string) => (
-                  <div>
+            <ConvertedAmountWrapper>
+              {useStxValue ? (
+                <StyledFiatAmountText
+                  fiatAmount={getStxFiatEquivalent(
+                    BigNumber(amount),
+                    BigNumber(stxBtcRate),
+                    BigNumber(btcFiatRate),
+                  )}
+                  fiatCurrency={fiatCurrency}
+                />
+              ) : (
+                <NumericFormat
+                  value={microStxToStxString(amount)}
+                  displayType="text"
+                  thousandSeparator
+                  renderText={(value: string) => (
                     <AmountText typography="body_medium_s" color="white_200">
                       {value} STX
                     </AmountText>
-                  </div>
-                )}
-              />
-            )}
+                  )}
+                />
+              )}
+            </ConvertedAmountWrapper>
             <ArrowsDownUp size={16} color={Theme.colors.white_200} />
           </ConvertComplication>
           <VertRule />
diff --git a/src/app/screens/settings/changeNetwork/index.tsx b/src/app/screens/settings/changeNetwork/index.tsx
index 412bde5be..bf76b7b36 100644
--- a/src/app/screens/settings/changeNetwork/index.tsx
+++ b/src/app/screens/settings/changeNetwork/index.tsx
@@ -1,4 +1,3 @@
-import ActionButton from '@components/button';
 import BottomBar from '@components/tabBar';
 import TopRow from '@components/topRow';
 import useWalletReducer from '@hooks/useWalletReducer';
@@ -10,6 +9,7 @@ import {
   initialNetworksList,
   type SettingsNetwork,
 } from '@secretkeylabs/xverse-core';
+import Button from '@ui-library/button';
 import { isValidBtcApi, isValidStacksApi } from '@utils/helper';
 import { useState } from 'react';
 import { useTranslation } from 'react-i18next';
@@ -209,10 +209,10 @@ function ChangeNetworkScreen() {
         </NodeInputsContainer>
       </Container>
       <ButtonContainer>
-        <ActionButton
-          text={t('SAVE')}
-          onPress={onSubmit}
-          processing={isChangingNetwork}
+        <Button
+          title={t('SAVE')}
+          onClick={onSubmit}
+          loading={isChangingNetwork}
           disabled={isChangingNetwork}
         />
       </ButtonContainer>
diff --git a/src/app/screens/settings/preferences/privacyPreferences/index.tsx b/src/app/screens/settings/preferences/privacyPreferences/index.tsx
index 399726526..b2c9451a8 100644
--- a/src/app/screens/settings/preferences/privacyPreferences/index.tsx
+++ b/src/app/screens/settings/preferences/privacyPreferences/index.tsx
@@ -2,12 +2,12 @@ import BottomBar from '@components/tabBar';
 import TopRow from '@components/topRow';
 import useSelectedAccount from '@hooks/useSelectedAccount';
 import { Container, SubTitle, Title } from '@screens/settings/index.styles';
+import Toggle from '@ui-library/toggle';
 import { hasOptedInMixPanelTracking, optInMixPanel, optOutMixPanel } from '@utils/mixpanel';
 import { useEffect, useState } from 'react';
 import { useTranslation } from 'react-i18next';
 import { useNavigate } from 'react-router-dom';
-import Switch from 'react-switch';
-import styled, { useTheme } from 'styled-components';
+import styled from 'styled-components';
 
 const SwitchContainer = styled.div((props) => ({
   ...props.theme.typography.body_medium_m,
@@ -17,19 +17,10 @@ const SwitchContainer = styled.div((props) => ({
   fontWeight: 500,
 }));
 
-const CustomSwitch = styled(Switch)`
-  .react-switch-handle {
-    background-color: ${({ checked }) =>
-      checked ? '#FFFFFF' : 'rgba(255, 255, 255, 0.2)'} !important;
-    border: ${({ checked }) => (checked ? '' : '4px solid rgba(255, 255, 255, 0.2)')} !important;
-  }
-`;
-
 function PrivacyPreferencesScreen() {
   const { t } = useTranslation('translation', { keyPrefix: 'SETTING_SCREEN' });
   const selectedAccount = useSelectedAccount();
   const navigate = useNavigate();
-  const theme = useTheme();
   const [isEnabled, setIsEnabled] = useState(false);
 
   const handleBackButtonClick = () => {
@@ -66,14 +57,7 @@ function PrivacyPreferencesScreen() {
         <SubTitle>{t('PRIVACY_PREFERENCES.DESCRIPTION')}</SubTitle>
         <SwitchContainer>
           <div>{t('PRIVACY_PREFERENCES.AUTHORIZE_DATA_COLLECTION')}</div>
-          <CustomSwitch
-            onColor={theme.colors.orange_main}
-            offColor={theme.colors.background.elevation3}
-            onChange={handleSwitchChange}
-            checked={isEnabled}
-            uncheckedIcon={false}
-            checkedIcon={false}
-          />
+          <Toggle onChange={handleSwitchChange} checked={isEnabled} />
         </SwitchContainer>
       </Container>
       <BottomBar tab="settings" />
diff --git a/src/app/screens/settings/security/index.tsx b/src/app/screens/settings/security/index.tsx
index 14a72a7c9..05198bac1 100644
--- a/src/app/screens/settings/security/index.tsx
+++ b/src/app/screens/settings/security/index.tsx
@@ -83,7 +83,7 @@ function Security() {
     <>
       <TopRow onClick={handleBackButtonClick} />
       <Container>
-        <Title>Security</Title>
+        <Title>{t('CATEGORIES.SECURITY')}</Title>
         {showResetWalletDisplay && (
           <ResetWalletContainer>
             <PasswordInput
diff --git a/src/app/screens/settings/settingComponent/index.tsx b/src/app/screens/settings/settingComponent/index.tsx
index 503eac443..e4c715b7d 100644
--- a/src/app/screens/settings/settingComponent/index.tsx
+++ b/src/app/screens/settings/settingComponent/index.tsx
@@ -1,26 +1,17 @@
 import { ArrowUpRight, CaretRight } from '@phosphor-icons/react';
 import Spinner from '@ui-library/spinner';
-import Switch from 'react-switch';
+import Toggle from '@ui-library/toggle';
 import styled, { useTheme } from 'styled-components';
 
-const CustomSwitch = styled(Switch)`
-  .react-switch-handle {
-    background-color: ${({ checked }) =>
-      checked ? '#FFFFFF' : 'rgba(255, 255, 255, 0.2)'} !important;
-    border: ${({ checked }) => (checked ? '' : '4px solid rgba(255, 255, 255, 0.2)')} !important;
-  }
-`;
-
 const Button = styled.button<{
-  border: string;
+  $border: string;
 }>((props) => ({
   display: 'flex',
   alignItems: 'center',
   background: 'transparent',
   justifyContent: 'flex-start',
-  paddingTop: props.theme.space.m,
-  paddingBottom: props.theme.space.l,
-  borderBottom: props.border,
+  padding: `20px 0 ${props.theme.space.l}`,
+  borderBottom: props.$border,
 }));
 
 const ColumnContainer = styled.div({
@@ -118,7 +109,7 @@ function SettingComponent({
         {title && <TitleText>{title}</TitleText>}
         <Button
           onClick={onClick}
-          border={showDivider ? `1px solid ${theme.colors.elevation2}` : 'transparent'}
+          $border={showDivider ? `1px solid ${theme.colors.elevation2}` : 'transparent'}
         >
           <Column>
             <ComponentText
@@ -132,15 +123,8 @@ function SettingComponent({
           {!toggle && link && <ArrowUpRight color={theme.colors.white_0} size={16} weight="bold" />}
           {!toggle && !link && <CaretRight color={theme.colors.white_0} size={16} weight="bold" />}
           {isLoading && <Spinner color="white" size={16} />}
-          {toggle && toggleFunction && toggleValue !== undefined && !isLoading && (
-            <CustomSwitch
-              onColor={theme.colors.tangerine}
-              offColor={theme.colors.elevation3}
-              onChange={toggleFunction}
-              checked={toggleValue}
-              uncheckedIcon={false}
-              checkedIcon={false}
-            />
+          {toggle && toggleFunction && !isLoading && (
+            <Toggle onChange={toggleFunction} checked={toggleValue ?? false} disabled={disabled} />
           )}
         </Button>
       </ColumnContainer>
diff --git a/src/app/screens/stacking/index.tsx b/src/app/screens/stacking/index.tsx
index a38c0b290..8d2d96900 100644
--- a/src/app/screens/stacking/index.tsx
+++ b/src/app/screens/stacking/index.tsx
@@ -13,11 +13,11 @@ const LoaderContainer = styled.div((props) => ({
   flex: 1,
   justifyContent: 'center',
   alignItems: 'center',
-  marginTop: props.theme.spacing(12),
+  marginTop: props.theme.space.l,
 }));
 
 const Text = styled.h1((props) => ({
-  ...props.theme.body_bold_m,
+  ...props.theme.typography.body_bold_m,
   color: props.theme.colors.white_200,
   marginTop: 'auto',
   marginBottom: 'auto',
diff --git a/src/app/screens/stacking/stackingProgress/components/index.tsx b/src/app/screens/stacking/stackingProgress/components/index.tsx
index 234d4e51d..25d54dc55 100644
--- a/src/app/screens/stacking/stackingProgress/components/index.tsx
+++ b/src/app/screens/stacking/stackingProgress/components/index.tsx
@@ -5,9 +5,10 @@ export const Container = styled.button((props) => ({
   flexDirection: 'row',
   justifyContent: 'space-between',
   alignItems: 'center',
-  background: props.theme.colors.elevation1,
+  backgroundColor: 'transparent',
+  border: `1px solid ${props.theme.colors.white_850}`,
   borderRadius: props.theme.radius(2),
-  padding: props.theme.spacing(9),
+  padding: props.theme.space.m,
 }));
 
 export const TextContainer = styled.div({
@@ -23,17 +24,17 @@ export const StatusContainer = styled.div((props) => ({
   alignItems: 'center',
   background: 'rgba(81, 214, 166, 0.15)',
   borderRadius: props.theme.radius(7),
-  paddingLeft: props.theme.spacing(7),
-  paddingRight: props.theme.spacing(7),
-  paddingTop: props.theme.spacing(4),
-  paddingBottom: props.theme.spacing(4),
+  paddingLeft: props.theme.space.m,
+  paddingRight: props.theme.space.m,
+  paddingTop: props.theme.space.xs,
+  paddingBottom: props.theme.space.xs,
 }));
 
 export const Dot = styled.div((props) => ({
   width: 7,
   height: 7,
   borderRadius: props.theme.radius(9),
-  marginRight: props.theme.spacing(4),
+  marginRight: props.theme.space.xs,
   background: props.theme.colors.feedback.success,
 }));
 
@@ -41,16 +42,16 @@ export const ColumnContainer = styled.div((props) => ({
   display: 'flex',
   flexDirection: 'column',
   alignItems: 'flex-start',
-  marginLeft: props.theme.spacing(6),
+  marginLeft: props.theme.space.s,
 }));
 
 export const BoldText = styled.h1((props) => ({
-  ...props.theme.body_bold_m,
+  ...props.theme.typography.body_bold_m,
   color: props.theme.colors.white_0,
 }));
 
 export const SubText = styled.h1((props) => ({
-  ...props.theme.body_xs,
+  ...props.theme.typography.body_s,
   color: props.theme.colors.white_400,
 }));
 
diff --git a/src/app/screens/stacking/stackingProgress/index.tsx b/src/app/screens/stacking/stackingProgress/index.tsx
index 83bd173ce..94d6f7b40 100644
--- a/src/app/screens/stacking/stackingProgress/index.tsx
+++ b/src/app/screens/stacking/stackingProgress/index.tsx
@@ -6,21 +6,22 @@ const Container = styled.div((props) => ({
   display: 'flex',
   flex: 1,
   flexDirection: 'column',
-  marginLeft: props.theme.spacing(8),
-  marginRight: props.theme.spacing(8),
+  marginLeft: props.theme.space.m,
+  marginRight: props.theme.space.m,
 }));
 
 const TitleText = styled.h1((props) => ({
   ...props.theme.headline_s,
-  marginTop: props.theme.spacing(16),
+  marginTop: props.theme.space.xl,
 }));
 
 const StackingDescriptionText = styled.h1((props) => ({
-  ...props.theme.body_m,
-  marginTop: props.theme.spacing(4),
-  marginBottom: props.theme.spacing(18),
+  ...props.theme.typography.body_m,
+  marginTop: props.theme.space.xs,
+  marginBottom: props.theme.space.l,
   color: props.theme.colors.white_200,
 }));
+
 function StackingProgress() {
   const { t } = useTranslation('translation', { keyPrefix: 'STACKING_SCREEN' });
 
diff --git a/src/app/screens/stacking/startStacking/index.tsx b/src/app/screens/stacking/startStacking/index.tsx
index 71eac292d..8edac7426 100644
--- a/src/app/screens/stacking/startStacking/index.tsx
+++ b/src/app/screens/stacking/startStacking/index.tsx
@@ -1,8 +1,7 @@
-import ArrowSquareOut from '@assets/img/arrow_square_out.svg';
-import ActionButton from '@components/button';
 import useStackingData from '@hooks/queries/useStackingData';
 import type { Pool } from '@secretkeylabs/xverse-core';
 import { microstacksToStx } from '@secretkeylabs/xverse-core';
+import Button from '@ui-library/button';
 import { XVERSE_WEB_POOL_URL } from '@utils/constants';
 import BigNumber from 'bignumber.js';
 import { useTranslation } from 'react-i18next';
@@ -63,7 +62,7 @@ function StartStacking() {
       </OuterContainer>
 
       <ButtonContainer>
-        <ActionButton src={ArrowSquareOut} text={t('START_STACKING')} onPress={handleOnClick} />
+        <Button title={t('START_STACKING')} onClick={handleOnClick} />
       </ButtonContainer>
     </>
   );
diff --git a/src/app/screens/swap/components/amountInput/index.tsx b/src/app/screens/swap/components/amountInput/index.tsx
index 593466bb3..d10f29113 100644
--- a/src/app/screens/swap/components/amountInput/index.tsx
+++ b/src/app/screens/swap/components/amountInput/index.tsx
@@ -53,6 +53,10 @@ const RowCenter = styled.div<{ justifyContent: 'space-between' | 'flex-start' }>
   justify-content: ${(props) => props.justifyContent};
 `;
 
+const ConvertedFiatP = styled(StyledP)`
+  word-break: break-word;
+`;
+
 const BalanceP = styled(StyledP)`
   word-break: break-word;
   text-align: right;
@@ -130,9 +134,9 @@ export default function AmountInput({ max, input, balance }: Props) {
           thousandSeparator
           prefix={`~${currencySymbolMap[input.fiatCurrency]}`}
           renderText={(value: string) => (
-            <StyledP data-testid="usd-text" typography="body_s" color="white_400">
+            <ConvertedFiatP data-testid="usd-text" typography="body_s" color="white_400">
               {value} {input.fiatCurrency}
-            </StyledP>
+            </ConvertedFiatP>
           )}
         />
       </Container>
diff --git a/src/app/screens/swap/components/routeItem/index.tsx b/src/app/screens/swap/components/routeItem/index.tsx
index 793f10d77..38297efb1 100644
--- a/src/app/screens/swap/components/routeItem/index.tsx
+++ b/src/app/screens/swap/components/routeItem/index.tsx
@@ -19,7 +19,6 @@ const RouteItemButtonContainer = styled.button((props) => ({
   marginTop: props.theme.space.xs,
   width: 135,
   height: 56,
-  overflow: 'hidden',
   ':hover': {
     opacity: 0.8,
   },
@@ -35,13 +34,13 @@ const TokenName = styled(StyledP)`
   text-align: left;
 `;
 
-type RouteItemProps = {
+type Props = {
   label: string;
   token?: FungibleToken | Token;
   onClick: () => void;
 };
 
-export default function RouteItem({ label, token, onClick }: RouteItemProps) {
+export default function RouteItem({ label, token, onClick }: Props) {
   const { t } = useTranslation('translation', { keyPrefix: 'SWAP_SCREEN' });
 
   const currency =
diff --git a/src/app/screens/swap/quoteSummary/EditFee.tsx b/src/app/screens/swap/quoteSummary/EditFee.tsx
index 8afbf519c..86ec28095 100644
--- a/src/app/screens/swap/quoteSummary/EditFee.tsx
+++ b/src/app/screens/swap/quoteSummary/EditFee.tsx
@@ -12,23 +12,12 @@ const EditRow = styled.span`
   gap: 7px;
 `;
 
-const Label = styled.span<{
-  $size: 'm' | 's';
-  $variant: 'action' | 'light' | 'mid' | 'dark';
+const EditFeeButton = styled.button<{
   $clickable?: boolean;
 }>`
-  ${(props) =>
-    props.$size === 'm'
-      ? props.theme.typography.body_medium_m
-      : props.theme.typography.body_medium_s};
-  color: ${(props) =>
-    props.$variant === 'action'
-      ? props.theme.colors.tangerine
-      : props.$variant === 'light'
-      ? props.theme.colors.white_0
-      : props.$variant === 'mid'
-      ? props.theme.colors.white_200
-      : props.theme.colors.white_400};
+  ${(props) => props.theme.typography.body_medium_m};
+  background-color: transparent;
+  color: ${(props) => props.theme.colors.tangerine};
   transition: color 0.1s ease;
   margin-bottom: ${(props) => props.theme.space.xxs};
   cursor: ${(props) => (props.$clickable ? 'pointer' : 'default')};
@@ -119,15 +108,13 @@ function EditFee({
   return (
     <div>
       <EditRow>
-        <Label
+        <EditFeeButton
           data-testid="fee-button"
-          $size="m"
-          $variant="action"
           $clickable={!isLoading}
           onClick={() => setEditing((cur) => !cur)}
         >
           {t('COMMON.EDIT')} <PencilSimple size={16} weight="fill" />
-        </Label>
+        </EditFeeButton>
       </EditRow>
       {editing && (
         <FeeSelectPopup
diff --git a/src/app/ui-components/btcAmountSelector.tsx b/src/app/ui-components/btcAmountSelector.tsx
index 224371aa5..8165876d5 100644
--- a/src/app/ui-components/btcAmountSelector.tsx
+++ b/src/app/ui-components/btcAmountSelector.tsx
@@ -26,6 +26,13 @@ const BalanceDiv = styled.div`
   text-align: end;
 `;
 
+const ConvertedAmountWrapper = styled.div`
+  max-width: 120px;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+`;
+
 const inputValidator = /^[0-9.]*$/;
 const btcInputExtractor = /[0-9]+[.]?[0-9]{0,8}/;
 const btcInputValidator = /^[0-9]+[.]?[0-9]{0,8}$/;
@@ -182,9 +189,9 @@ function AmountSelector({
               thousandSeparator
               prefix={useBtcValue ? `~${currencySymbolMap[fiatCurrency]}` : ''}
               renderText={(value: string) => (
-                <div>
+                <ConvertedAmountWrapper>
                   {value} {useBtcValue ? fiatCurrency : 'BTC'}
-                </div>
+                </ConvertedAmountWrapper>
               )}
             />
             <ArrowsDownUp size={16} weight="fill" />
diff --git a/src/app/ui-components/selectFeeRate/index.tsx b/src/app/ui-components/selectFeeRate/index.tsx
index 68df5ec8a..cb8dbcda5 100644
--- a/src/app/ui-components/selectFeeRate/index.tsx
+++ b/src/app/ui-components/selectFeeRate/index.tsx
@@ -16,25 +16,31 @@ const RowContainer = styled.div`
 
 const Label = styled.span<{
   $size: 'm' | 's';
-  $variant: 'action' | 'light' | 'mid' | 'dark';
-  $clickable?: boolean;
+  $variant: 'light' | 'dark';
 }>`
   ${(props) =>
     props.$size === 'm'
       ? props.theme.typography.body_medium_m
       : props.theme.typography.body_medium_s};
   color: ${(props) =>
-    props.$variant === 'action'
-      ? props.theme.colors.tangerine
-      : props.$variant === 'light'
-      ? props.theme.colors.white_0
-      : props.$variant === 'mid'
-      ? props.theme.colors.white_200
-      : props.theme.colors.white_400};
+    props.$variant === 'light' ? props.theme.colors.white_0 : props.theme.colors.white_400};
   transition: color 0.1s ease;
   margin-bottom: ${(props) => props.theme.space.xxs};
-  cursor: ${(props) => (props.$clickable ? 'pointer' : 'default')};
+  display: inline-flex;
+  flex-direction: row;
+  align-items: center;
+  gap: ${(props) => props.theme.space.xxs};
+`;
+
+const EditButton = styled.button<{
+  $clickable?: boolean;
+}>`
+  ${(props) => props.theme.typography.body_medium_m};
+  color: ${(props) => props.theme.colors.tangerine};
+  background-color: transparent;
   transition: color 0.1s ease;
+  margin-bottom: ${(props) => props.theme.space.xxs};
+  cursor: ${(props) => (props.$clickable ? 'pointer' : 'default')};
 
   user-select: ${(props) => (props.$clickable ? 'none' : 'auto')};
 
@@ -151,15 +157,13 @@ function SelectFeeRate({
               {feeRateSpeed}{' '}
             </Label>
           )}
-          <Label
+          <EditButton
             data-testid="fee-button"
-            $size="m"
-            $variant="action"
             $clickable={!isLoading}
             onClick={() => setEditing((cur) => !cur)}
           >
             {t('COMMON.EDIT')} <PencilSimple size={16} weight="fill" />
-          </Label>
+          </EditButton>
         </EditRow>
         {/* Fee can either be an absolute amount or a rate */}
         {/* If feeRateUnits is not defined, therefore an absolute fee is used */}
diff --git a/src/app/ui-library/button.tsx b/src/app/ui-library/button.tsx
index 487bf62ea..47f130f79 100644
--- a/src/app/ui-library/button.tsx
+++ b/src/app/ui-library/button.tsx
@@ -32,7 +32,6 @@ const StyledButton = styled.button`
     border: 1px solid;
     color: ${(props) => props.theme.colors.elevation0};
 
-    :focus-visible,
     :hover:enabled {
       background-color: ${(props) => props.theme.colors.white_200};
     }
@@ -49,7 +48,6 @@ const StyledButton = styled.button`
     border: 1px solid ${(props) => props.theme.colors.white_800};
     color: ${(props) => props.theme.colors.white_0};
 
-    :focus-visible,
     :hover:enabled {
       background-color: ${(props) => props.theme.colors.elevation6_800};
       border: 1px solid ${(props) => props.theme.colors.white_850};
@@ -71,7 +69,6 @@ const StyledButton = styled.button`
     border: none;
     color: ${(props) => props.theme.colors.white_0};
 
-    :focus-visible,
     :hover:enabled {
       color: ${(props) => props.theme.colors.white_200};
     }
@@ -88,7 +85,6 @@ const StyledButton = styled.button`
     border: none;
     color: ${(props) => props.theme.colors.white_0};
 
-    :focus-visible,
     :hover:enabled {
       background-color: ${(props) => props.theme.colors.danger_dark_100};
       color: ${(props) => props.theme.colors.white_0};
@@ -119,6 +115,8 @@ type Props = {
   className?: string;
   variant?: ButtonVariant;
   type?: 'button' | 'submit' | 'reset';
+  id?: string;
+  dataTestId?: string;
 };
 
 function Button({
@@ -131,6 +129,8 @@ function Button({
   disabled = false,
   variant = 'primary',
   type,
+  id,
+  dataTestId,
 }: Props) {
   return (
     <StyledButton
@@ -139,6 +139,8 @@ function Button({
       tabIndex={0}
       disabled={disabled || loading}
       type={type}
+      id={id}
+      data-testid={dataTestId}
     >
       {loading ? (
         <Spinner />
diff --git a/src/app/ui-library/common.styled.ts b/src/app/ui-library/common.styled.ts
index b1c4222cb..14427feb7 100644
--- a/src/app/ui-library/common.styled.ts
+++ b/src/app/ui-library/common.styled.ts
@@ -1,4 +1,4 @@
-import { Tab, TabList } from 'react-tabs';
+import { TabList } from 'react-tabs';
 import styled from 'styled-components';
 import type { Color, Typography } from 'theme';
 
@@ -65,28 +65,6 @@ export const StickyButtonContainer = styled.div`
  */
 export const StyledTabList = styled(TabList)`
   display: flex;
-  gap: ${(props) => props.theme.spacing(2)}px;
+  gap: ${(props) => props.theme.space.xxs};
   list-style: none;
 `;
-
-export const StyledTab = styled(Tab)`
-  ${(props) => props.theme.typography.body_bold_s}
-  padding: ${(props) => props.theme.spacing(4)}px ${(props) => props.theme.spacing(6)}px;
-  border-radius: ${(props) => props.theme.radius(2)}px;
-  text-transform: uppercase;
-  cursor: pointer;
-  color: ${(props) => props.theme.colors.white_0};
-  background-color: ${(props) => props.theme.colors.elevation0};
-
-  :hover {
-    background-color: ${(props) => props.theme.colors.elevation1};
-  }
-
-  &.react-tabs__tab--selected {
-    background-color: ${(props) => props.theme.colors.elevation3};
-  }
-
-  :active {
-    background-color: ${(props) => props.theme.colors.elevation5};
-  }
-`;
diff --git a/src/app/ui-library/input.tsx b/src/app/ui-library/input.tsx
index 1ce68ee64..0b893ead2 100644
--- a/src/app/ui-library/input.tsx
+++ b/src/app/ui-library/input.tsx
@@ -91,7 +91,7 @@ const InputField = styled.input<{ $bgColor?: string; $hasLeftAccessory?: boolean
 
 const ComplicationsContainer = styled.div`
   position: absolute;
-  right: ${(props) => props.theme.spacing(8)}px;
+  right: ${(props) => props.theme.space.m};
   top: 0;
 
   height: 100%;
@@ -101,10 +101,17 @@ const ComplicationsContainer = styled.div`
   align-items: center;
 
   > *:first-child {
-    margin-left: ${(props) => props.theme.spacing(4)}px;
+    margin-left: ${(props) => props.theme.space.xs};
   }
 `;
 
+const ClearButtonContainer = styled.button`
+  cursor: pointer;
+  background-color: transparent;
+  border: none;
+  border-radius: 50%;
+`;
+
 const ClearButton = styled.div<{ $hasSiblings?: boolean }>`
   cursor: pointer;
 
@@ -118,8 +125,8 @@ const ClearButton = styled.div<{ $hasSiblings?: boolean }>`
   height: 16px;
   background-color: ${(props) => props.theme.colors.white_200};
   color: ${(props) => props.theme.colors.elevation_n1};
-  border-radius: 50%;
-  margin-right: ${(props) => (props.$hasSiblings ? props.theme.spacing(4) : 0)}px;
+  border-radius: inherit;
+  margin-right: ${(props) => (props.$hasSiblings ? props.theme.space.xs : 0)}px;
   transition: opacity 0.1s ease;
 
   :before,
@@ -165,15 +172,16 @@ const LeftAccessoryContainer = styled.div`
 
 const SubText = styled.div`
   color: ${(props) => props.theme.colors.white_400};
-  margin-top: ${(props) => props.theme.spacing(4)}px;
+  margin-top: ${(props) => props.theme.space.xs};
   ${(props) => props.theme.typography.body_s}
 `;
 
 const Feedback = styled.div`
-  margin-top: 8px;
+  margin-top: ${(props) => props.theme.space.xs};
 `;
 
 type Props = {
+  id?: string;
   title?: string;
   placeholder?: string;
   value: string;
@@ -200,6 +208,7 @@ type Props = {
 };
 
 function Input({
+  id,
   title,
   placeholder,
   value,
@@ -266,6 +275,7 @@ function Input({
       <InputContainer>
         {leftAccessory && <LeftAccessoryContainer>{leftAccessory.icon}</LeftAccessoryContainer>}
         <InputField
+          id={id}
           className={displayVariant}
           ref={inputRef}
           type={type}
@@ -281,7 +291,9 @@ function Input({
         />
         <ComplicationsContainer ref={complicationsRef}>
           {!hideClear && value && (
-            <ClearButton onClick={handleClear} $hasSiblings={!!complications} />
+            <ClearButtonContainer onClick={handleClear}>
+              <ClearButton $hasSiblings={!!complications} />
+            </ClearButtonContainer>
           )}
           {complications}
         </ComplicationsContainer>
diff --git a/src/app/ui-library/sheet.tsx b/src/app/ui-library/sheet.tsx
index 18a5309e1..f51b5dce4 100644
--- a/src/app/ui-library/sheet.tsx
+++ b/src/app/ui-library/sheet.tsx
@@ -97,7 +97,7 @@ function Sheet({
   return (
     <CustomisedModal
       isOpen={visible}
-      parentSelector={() => document.getElementById('app') as HTMLElement}
+      appElement={document.getElementById('app') as HTMLElement}
       ariaHideApp={false}
       style={customStyles}
       className={className}
diff --git a/src/app/components/tabs/index.tsx b/src/app/ui-library/tabs.tsx
similarity index 86%
rename from src/app/components/tabs/index.tsx
rename to src/app/ui-library/tabs.tsx
index dac97d295..28a8cb7b6 100644
--- a/src/app/components/tabs/index.tsx
+++ b/src/app/ui-library/tabs.tsx
@@ -5,12 +5,13 @@ const TabContainer = styled.div`
   gap: ${(props) => props.theme.space.xxs};
 `;
 
-const TabItem = styled.div<{ $active?: boolean }>`
-  padding: 7px 12px 8px;
-  border-radius: 12px;
+export const TabItem = styled.button<{ $active?: boolean }>`
   ${(props) => props.theme.typography.body_bold_s};
+  padding: ${(props) => props.theme.space.xs} ${(props) => props.theme.space.s};
+  border-radius: 12px;
   color: ${(props) => props.theme.colors.white_200};
   text-transform: uppercase;
+  background-color: transparent;
   cursor: pointer;
   user-select: none;
   transition: color 0.1s ease;
@@ -29,12 +30,13 @@ const TabItem = styled.div<{ $active?: boolean }>`
         `}
 `;
 
-interface TabProps<T> {
+type TabProps<T> = {
   tabs: { label: string; value: T }[];
   activeTab: T;
   onTabClick: (value: T) => void;
   className?: string;
-}
+};
+
 function Tabs<T extends unknown>({ tabs, activeTab, onTabClick, className }: TabProps<T>) {
   return (
     <TabContainer className={className}>
diff --git a/src/app/ui-library/toggle.tsx b/src/app/ui-library/toggle.tsx
new file mode 100644
index 000000000..0907dbe79
--- /dev/null
+++ b/src/app/ui-library/toggle.tsx
@@ -0,0 +1,104 @@
+import styled from 'styled-components';
+
+const Container = styled.div`
+  display: inline-block;
+  position: relative;
+`;
+
+const Input = styled.input`
+  opacity: 0;
+  width: 0;
+  height: 0;
+`;
+
+const Slider = styled.span`
+  position: absolute;
+  cursor: pointer;
+  top: 0;
+  left: 0;
+  right: 0;
+  bottom: 0;
+  background-color: ${(props) => props.theme.colors.elevation3};
+  transition: 0.4s;
+  border-radius: inherit;
+
+  &::before {
+    position: absolute;
+    content: '';
+    height: 18px;
+    width: 18px;
+    left: 3px;
+    bottom: 3px;
+    background-color: ${(props) => props.theme.colors.white_600};
+    border-radius: 50%;
+    filter: drop-shadow(0px 1px 6px rgba(0, 0, 0, 0.15));
+    transition: 0.4s;
+  }
+
+  &::after {
+    position: absolute;
+    content: '';
+    height: 8px;
+    width: 8px;
+    left: 8px;
+    bottom: 8px;
+    border-radius: 50%;
+    background-color: inherit;
+    transition: transform 0.4s, background-color 0.1s;
+  }
+`;
+
+const Label = styled.label`
+  display: block;
+  width: 40px;
+  height: 24px;
+  position: relative;
+  background-color: transparent;
+  border-radius: 24px;
+
+  ${Input}:checked + ${Slider} {
+    background-color: ${(props) => props.theme.colors.tangerine};
+  }
+
+  ${Input}:checked + ${Slider}::before,
+  ${Input}:checked + ${Slider}::after {
+    transform: translateX(16px);
+    background-color: ${(props) => props.theme.colors.white_0};
+  }
+`;
+
+type Props = {
+  className?: string;
+  checked: boolean;
+  onChange: (newValue: boolean) => void;
+  disabled?: boolean;
+};
+
+function Toggle({ className, checked, onChange, disabled }: Props) {
+  const handleToggle = () => {
+    onChange(!checked);
+  };
+
+  const handleKeyDown = (event: React.KeyboardEvent<HTMLLabelElement>) => {
+    if (!disabled && event.key === ' ') {
+      event.preventDefault();
+      onChange(!checked);
+    }
+  };
+
+  return (
+    <Container className={className}>
+      <Label
+        tabIndex={disabled ? -1 : 0}
+        onKeyDown={handleKeyDown}
+        role="checkbox"
+        aria-checked={checked}
+      >
+        <Input disabled={disabled} type="checkbox" checked={checked} onChange={handleToggle} />
+        <Slider />
+      </Label>
+    </Container>
+  );
+}
+
+export default Toggle;
diff --git a/src/locales/en.json b/src/locales/en.json
index 36a3ea2e2..1c611bae9 100644
--- a/src/locales/en.json
+++ b/src/locales/en.json
@@ -624,6 +624,7 @@
     }
   },
   "LOGIN_SCREEN": {
+    "BETA_VERSION": "Beta",
     "WELCOME_MESSAGE_FIRST_LOGIN": "Welcome!",
     "WELCOME_MESSAGE": "Welcome back!",
     "PASSWORD_INPUT_LABEL": "Password",
diff --git a/src/pages/Options/index.css b/src/pages/Options/index.css
index cc87c7ff7..78a8d52ab 100644
--- a/src/pages/Options/index.css
+++ b/src/pages/Options/index.css
@@ -41,3 +41,18 @@ header h2 {
 :focus {
   outline: none;
 }
+
+:focus-visible {
+  position: relative;
+  border-radius: 4px;
+}
+
+:focus-visible::after {
+  content: '';
+  position: absolute;
+  inset: -2px;
+  outline: 1px solid #ffffff;
+  border: 2px solid #ee7a30;
+  border-radius: inherit;
+  pointer-events: none;
+}
diff --git a/src/pages/Popup/index.css b/src/pages/Popup/index.css
index f74e9369a..6acc83c91 100644
--- a/src/pages/Popup/index.css
+++ b/src/pages/Popup/index.css
@@ -28,3 +28,18 @@ body {
 :focus {
   outline: none;
 }
+
+:focus-visible {
+  position: relative;
+  border-radius: 4px;
+}
+
+:focus-visible::after {
+  content: '';
+  position: absolute;
+  inset: -2px;
+  outline: 1px solid #ffffff;
+  border: 2px solid #ee7a30;
+  border-radius: inherit;
+  pointer-events: none;
+}
diff --git a/tests/pages/onboarding.ts b/tests/pages/onboarding.ts
index 0fdbe194c..a7ee1fa93 100644
--- a/tests/pages/onboarding.ts
+++ b/tests/pages/onboarding.ts
@@ -129,7 +129,7 @@ export default class Onboarding {
     for (let i = 0; i < (await linkList.count()); i++) {
       expect(await linkList.nth(i).getAttribute('href')).not.toBeNull();
     }
-    await expect(this.page.locator('input[type="checkbox"]')).toBeVisible();
+    await expect(this.page.locator('label[role="checkbox"]')).toBeVisible();
     await expect(this.buttonAccept).toBeVisible();
 
     // check links
diff --git a/tests/pages/wallet.ts b/tests/pages/wallet.ts
index dfdcdaee7..6ce8a2237 100644
--- a/tests/pages/wallet.ts
+++ b/tests/pages/wallet.ts
@@ -435,9 +435,9 @@ export default class Wallet {
 
     // Token
     this.labelCoinTitle = page.getByLabel('Coin Title');
-    this.checkboxToken = page.locator('input[type="checkbox"]');
-    this.checkboxTokenActive = page.locator('input[type="checkbox"]:checked');
-    this.checkboxTokenInactive = page.locator('input[type="checkbox"]:not(:checked)');
+    this.checkboxToken = page.locator('label[role="checkbox"]');
+    this.checkboxTokenActive = page.locator('label[role="checkbox"][aria-checked="true"]');
+    this.checkboxTokenInactive = page.locator('label[role="checkbox"][aria-checked="false"]');
     this.buttonSip10 = page.getByRole('button', { name: 'SIP-10' });
     this.buttonBRC20 = page.getByRole('button', { name: 'BRC-20' });
     this.buttonRunes = page.getByRole('button', { name: 'RUNES' });
@@ -459,7 +459,7 @@ export default class Wallet {
 
     // Collectibles
     this.totalItem = page.getByTestId('total-items');
-    this.tabsCollectiblesItems = page.getByTestId('tab-list').locator('li');
+    this.tabsCollectiblesItems = page.getByTestId('tab-list').locator('button');
     this.containerRareSats = page.getByTestId('rareSats-container');
     this.nameInscription = page.getByTestId('inscription-name');
     this.containersCollectibleItem = page.getByTestId('collection-container');
@@ -1046,7 +1046,7 @@ export default class Wallet {
           'No active token checkbox found or there are multiple, taking alternative action.',
         );
         // Activate Test rune
-        await this.runeSKIBIDI.locator('div.react-switch-handle').click();
+        await this.runeSKIBIDI.locator('label[role="checkbox"]').click();
       } else {
         console.log('One active token checkbox is present.');
       }
@@ -1199,7 +1199,7 @@ export default class Wallet {
     const tokenName = (await chosenToken.getAttribute('data-testid')) || 'default-value';
 
     // Click the switch handle to toggle the token's state
-    await chosenToken.locator('div.react-switch-handle').click();
+    await chosenToken.locator('label[role="checkbox"]').click();
 
     return tokenName;
   }
@@ -1215,7 +1215,7 @@ export default class Wallet {
 
     for (let i = 0; i < count; i++) {
       // Since clicking the switch will change its state, always interact with the first one
-      await actionTokens.first().locator('div.react-switch-handle').click();
+      await actionTokens.first().locator('label[role="checkbox"]').click();
     }
   }
 

From 95a4cbba34ec7b050e50eaa3c30ba7714ab0c8dd Mon Sep 17 00:00:00 2001
From: jordankzf <jordan@secretkeylabs.com>
Date: Wed, 4 Sep 2024 17:30:52 +0800
Subject: [PATCH 074/227] Remove unused stuff

---
 package-lock.json                             | 308 ++----------------
 package.json                                  |   1 -
 src/app/components/tokenImage/index.tsx       |   2 +-
 src/app/screens/swap/types.ts                 |  12 -
 .../screens/swap/useStxCurrencyConversion.tsx |  82 -----
 5 files changed, 25 insertions(+), 380 deletions(-)
 delete mode 100644 src/app/screens/swap/useStxCurrencyConversion.tsx

diff --git a/package-lock.json b/package-lock.json
index c3f119e2a..7ecb790e3 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -23,7 +23,6 @@
         "@tanstack/react-query": "^4.29.3",
         "@tanstack/react-query-devtools": "^4.29.3",
         "@tanstack/react-query-persist-client": "^4.29.3",
-        "alex-sdk": "0.1.26",
         "argon2-browser": "^1.18.0",
         "async-mutex": "^0.5.0",
         "axios": "1.7.0",
@@ -2887,21 +2886,6 @@
         "ajv": "^6.9.1"
       }
     },
-    "node_modules/alex-sdk": {
-      "version": "0.1.26",
-      "resolved": "https://registry.npmjs.org/alex-sdk/-/alex-sdk-0.1.26.tgz",
-      "integrity": "sha512-uUjbONoAit6htxZGLOFev8v2h59kE31fM1X9efH0Yi1eLXYSSXojj+iFPTlQTQvIysyseXGxkX4VVTc9aQ13sg==",
-      "dependencies": {
-        "clarity-codegen": "^0.3.5"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "peerDependencies": {
-        "@stacks/network": "*",
-        "@stacks/transactions": "*"
-      }
-    },
     "node_modules/ansi-escapes": {
       "version": "4.3.2",
       "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-4.3.2.tgz",
@@ -2945,6 +2929,7 @@
       "version": "5.0.1",
       "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
       "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
+      "dev": true,
       "engines": {
         "node": ">=8"
       }
@@ -3994,29 +3979,6 @@
         "safe-buffer": "^5.0.1"
       }
     },
-    "node_modules/clarity-codegen": {
-      "version": "0.3.6",
-      "resolved": "https://registry.npmjs.org/clarity-codegen/-/clarity-codegen-0.3.6.tgz",
-      "integrity": "sha512-Be1J8RFtPFGfWtQ/7enl3xkU1j2KkIS9W7RbuofIVYfKp11MCZSGQeNV+Gh0dQOQIs3O0WQLLg03ikyNaWtYzQ==",
-      "dependencies": {
-        "@stacks/stacks-blockchain-api-types": "^7.1.10",
-        "axios": "^1.5.0",
-        "lodash": "^4.17.21",
-        "yargs": "^17.7.2",
-        "yqueue": "^1.0.1"
-      },
-      "bin": {
-        "clarity-codegen": "lib/generate/cli.js"
-      },
-      "peerDependencies": {
-        "@stacks/transactions": "*"
-      }
-    },
-    "node_modules/clarity-codegen/node_modules/@stacks/stacks-blockchain-api-types": {
-      "version": "7.9.0",
-      "resolved": "https://registry.npmjs.org/@stacks/stacks-blockchain-api-types/-/stacks-blockchain-api-types-7.9.0.tgz",
-      "integrity": "sha512-29tcIOxEj0jIAVrMLH2hDuTM0wWtOT4z9EnNgOCEQvipEDPyvoaPjbYJmQUTxzvVjfoLjZAQsvTlJw7fnbkkrg=="
-    },
     "node_modules/classnames": {
       "version": "2.3.2",
       "resolved": "https://registry.npmjs.org/classnames/-/classnames-2.3.2.tgz",
@@ -4095,45 +4057,6 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/cliui": {
-      "version": "8.0.1",
-      "resolved": "https://registry.npmjs.org/cliui/-/cliui-8.0.1.tgz",
-      "integrity": "sha512-BSeNnyus75C4//NQ9gQt1/csTXyo/8Sb+afLAkzAptFuMsod9HFokGNudZpi/oQV73hnVK+sR+5PVRMd+Dr7YQ==",
-      "dependencies": {
-        "string-width": "^4.2.0",
-        "strip-ansi": "^6.0.1",
-        "wrap-ansi": "^7.0.0"
-      },
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/cliui/node_modules/emoji-regex": {
-      "version": "8.0.0",
-      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
-      "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A=="
-    },
-    "node_modules/cliui/node_modules/is-fullwidth-code-point": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
-      "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/cliui/node_modules/string-width": {
-      "version": "4.2.3",
-      "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
-      "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
-      "dependencies": {
-        "emoji-regex": "^8.0.0",
-        "is-fullwidth-code-point": "^3.0.0",
-        "strip-ansi": "^6.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
     "node_modules/clone": {
       "version": "1.0.4",
       "resolved": "https://registry.npmjs.org/clone/-/clone-1.0.4.tgz",
@@ -6684,14 +6607,6 @@
         "node": ">=6.9.0"
       }
     },
-    "node_modules/get-caller-file": {
-      "version": "2.0.5",
-      "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz",
-      "integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==",
-      "engines": {
-        "node": "6.* || 8.* || >= 10.*"
-      }
-    },
     "node_modules/get-intrinsic": {
       "version": "1.2.4",
       "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.2.4.tgz",
@@ -10627,14 +10542,6 @@
         "strip-ansi": "^6.0.1"
       }
     },
-    "node_modules/require-directory": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz",
-      "integrity": "sha512-fGxEI7+wsG9xrvdjsrlmL22OMTTiHRwAMroiEeMgq8gzoLC/PQr7RsRDSTLUg/bZAZtF+TVIkHc6/4RIKrui+Q==",
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
     "node_modules/require-from-string": {
       "version": "2.0.2",
       "resolved": "https://registry.npmjs.org/require-from-string/-/require-from-string-2.0.2.tgz",
@@ -11486,6 +11393,7 @@
       "version": "6.0.1",
       "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
       "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
+      "dev": true,
       "dependencies": {
         "ansi-regex": "^5.0.1"
       },
@@ -12867,6 +12775,7 @@
       "version": "7.0.0",
       "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz",
       "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==",
+      "dev": true,
       "dependencies": {
         "ansi-styles": "^4.0.0",
         "string-width": "^4.1.0",
@@ -12883,6 +12792,7 @@
       "version": "4.3.0",
       "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
       "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+      "dev": true,
       "dependencies": {
         "color-convert": "^2.0.1"
       },
@@ -12897,6 +12807,7 @@
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
       "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+      "dev": true,
       "dependencies": {
         "color-name": "~1.1.4"
       },
@@ -12907,17 +12818,20 @@
     "node_modules/wrap-ansi/node_modules/color-name": {
       "version": "1.1.4",
       "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="
+      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+      "dev": true
     },
     "node_modules/wrap-ansi/node_modules/emoji-regex": {
       "version": "8.0.0",
       "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
-      "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A=="
+      "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
+      "dev": true
     },
     "node_modules/wrap-ansi/node_modules/is-fullwidth-code-point": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
       "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
+      "dev": true,
       "engines": {
         "node": ">=8"
       }
@@ -12926,6 +12840,7 @@
       "version": "4.2.3",
       "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
       "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
+      "dev": true,
       "dependencies": {
         "emoji-regex": "^8.0.0",
         "is-fullwidth-code-point": "^3.0.0",
@@ -12940,14 +12855,6 @@
       "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
       "integrity": "sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ=="
     },
-    "node_modules/y18n": {
-      "version": "5.0.8",
-      "resolved": "https://registry.npmjs.org/y18n/-/y18n-5.0.8.tgz",
-      "integrity": "sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==",
-      "engines": {
-        "node": ">=10"
-      }
-    },
     "node_modules/yallist": {
       "version": "3.1.1",
       "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.1.1.tgz",
@@ -12963,57 +12870,6 @@
         "node": ">= 14"
       }
     },
-    "node_modules/yargs": {
-      "version": "17.7.2",
-      "resolved": "https://registry.npmjs.org/yargs/-/yargs-17.7.2.tgz",
-      "integrity": "sha512-7dSzzRQ++CKnNI/krKnYRV7JKKPUXMEh61soaHKg9mrWEhzFWhFnxPxGl+69cD1Ou63C13NUPCnmIcrvqCuM6w==",
-      "dependencies": {
-        "cliui": "^8.0.1",
-        "escalade": "^3.1.1",
-        "get-caller-file": "^2.0.5",
-        "require-directory": "^2.1.1",
-        "string-width": "^4.2.3",
-        "y18n": "^5.0.5",
-        "yargs-parser": "^21.1.1"
-      },
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/yargs-parser": {
-      "version": "21.1.1",
-      "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-21.1.1.tgz",
-      "integrity": "sha512-tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw==",
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/yargs/node_modules/emoji-regex": {
-      "version": "8.0.0",
-      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
-      "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A=="
-    },
-    "node_modules/yargs/node_modules/is-fullwidth-code-point": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
-      "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/yargs/node_modules/string-width": {
-      "version": "4.2.3",
-      "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
-      "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
-      "dependencies": {
-        "emoji-regex": "^8.0.0",
-        "is-fullwidth-code-point": "^3.0.0",
-        "strip-ansi": "^6.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
     "node_modules/yocto-queue": {
       "version": "0.1.0",
       "resolved": "https://registry.npmjs.org/yocto-queue/-/yocto-queue-0.1.0.tgz",
@@ -13026,11 +12882,6 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/yqueue": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/yqueue/-/yqueue-1.0.1.tgz",
-      "integrity": "sha512-DBxJZBRafFLA/tCc5uO8ZTGFr+sQgn1FRJkZ4cVrIQIk6bv2bInraE3mbpLAJw9z93JGrLkqDoyTLrrZaCNq5w=="
-    },
     "node_modules/zod": {
       "version": "3.22.4",
       "resolved": "https://registry.npmjs.org/zod/-/zod-3.22.4.tgz",
@@ -15165,14 +15016,6 @@
       "dev": true,
       "requires": {}
     },
-    "alex-sdk": {
-      "version": "0.1.26",
-      "resolved": "https://registry.npmjs.org/alex-sdk/-/alex-sdk-0.1.26.tgz",
-      "integrity": "sha512-uUjbONoAit6htxZGLOFev8v2h59kE31fM1X9efH0Yi1eLXYSSXojj+iFPTlQTQvIysyseXGxkX4VVTc9aQ13sg==",
-      "requires": {
-        "clarity-codegen": "^0.3.5"
-      }
-    },
     "ansi-escapes": {
       "version": "4.3.2",
       "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-4.3.2.tgz",
@@ -15199,7 +15042,8 @@
     "ansi-regex": {
       "version": "5.0.1",
       "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
-      "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ=="
+      "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
+      "dev": true
     },
     "ansi-styles": {
       "version": "3.2.1",
@@ -16015,25 +15859,6 @@
         "safe-buffer": "^5.0.1"
       }
     },
-    "clarity-codegen": {
-      "version": "0.3.6",
-      "resolved": "https://registry.npmjs.org/clarity-codegen/-/clarity-codegen-0.3.6.tgz",
-      "integrity": "sha512-Be1J8RFtPFGfWtQ/7enl3xkU1j2KkIS9W7RbuofIVYfKp11MCZSGQeNV+Gh0dQOQIs3O0WQLLg03ikyNaWtYzQ==",
-      "requires": {
-        "@stacks/stacks-blockchain-api-types": "^7.1.10",
-        "axios": "^1.5.0",
-        "lodash": "^4.17.21",
-        "yargs": "^17.7.2",
-        "yqueue": "^1.0.1"
-      },
-      "dependencies": {
-        "@stacks/stacks-blockchain-api-types": {
-          "version": "7.9.0",
-          "resolved": "https://registry.npmjs.org/@stacks/stacks-blockchain-api-types/-/stacks-blockchain-api-types-7.9.0.tgz",
-          "integrity": "sha512-29tcIOxEj0jIAVrMLH2hDuTM0wWtOT4z9EnNgOCEQvipEDPyvoaPjbYJmQUTxzvVjfoLjZAQsvTlJw7fnbkkrg=="
-        }
-      }
-    },
     "classnames": {
       "version": "2.3.2",
       "resolved": "https://registry.npmjs.org/classnames/-/classnames-2.3.2.tgz",
@@ -16090,38 +15915,6 @@
         "string-width": "^5.0.0"
       }
     },
-    "cliui": {
-      "version": "8.0.1",
-      "resolved": "https://registry.npmjs.org/cliui/-/cliui-8.0.1.tgz",
-      "integrity": "sha512-BSeNnyus75C4//NQ9gQt1/csTXyo/8Sb+afLAkzAptFuMsod9HFokGNudZpi/oQV73hnVK+sR+5PVRMd+Dr7YQ==",
-      "requires": {
-        "string-width": "^4.2.0",
-        "strip-ansi": "^6.0.1",
-        "wrap-ansi": "^7.0.0"
-      },
-      "dependencies": {
-        "emoji-regex": {
-          "version": "8.0.0",
-          "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
-          "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A=="
-        },
-        "is-fullwidth-code-point": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
-          "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg=="
-        },
-        "string-width": {
-          "version": "4.2.3",
-          "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
-          "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
-          "requires": {
-            "emoji-regex": "^8.0.0",
-            "is-fullwidth-code-point": "^3.0.0",
-            "strip-ansi": "^6.0.1"
-          }
-        }
-      }
-    },
     "clone": {
       "version": "1.0.4",
       "resolved": "https://registry.npmjs.org/clone/-/clone-1.0.4.tgz",
@@ -18070,11 +17863,6 @@
       "integrity": "sha512-3hN7NaskYvMDLQY55gnW3NQ+mesEAepTqlg+VEbj7zzqEMBVNhzcGYYeqFo/TlYz6eQiFcp1HcsCZO+nGgS8zg==",
       "peer": true
     },
-    "get-caller-file": {
-      "version": "2.0.5",
-      "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz",
-      "integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg=="
-    },
     "get-intrinsic": {
       "version": "1.2.4",
       "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.2.4.tgz",
@@ -20892,11 +20680,6 @@
         "strip-ansi": "^6.0.1"
       }
     },
-    "require-directory": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz",
-      "integrity": "sha512-fGxEI7+wsG9xrvdjsrlmL22OMTTiHRwAMroiEeMgq8gzoLC/PQr7RsRDSTLUg/bZAZtF+TVIkHc6/4RIKrui+Q=="
-    },
     "require-from-string": {
       "version": "2.0.2",
       "resolved": "https://registry.npmjs.org/require-from-string/-/require-from-string-2.0.2.tgz",
@@ -21559,6 +21342,7 @@
       "version": "6.0.1",
       "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
       "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
+      "dev": true,
       "requires": {
         "ansi-regex": "^5.0.1"
       }
@@ -22560,6 +22344,7 @@
       "version": "7.0.0",
       "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz",
       "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==",
+      "dev": true,
       "requires": {
         "ansi-styles": "^4.0.0",
         "string-width": "^4.1.0",
@@ -22570,6 +22355,7 @@
           "version": "4.3.0",
           "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
           "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+          "dev": true,
           "requires": {
             "color-convert": "^2.0.1"
           }
@@ -22578,6 +22364,7 @@
           "version": "2.0.1",
           "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
           "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+          "dev": true,
           "requires": {
             "color-name": "~1.1.4"
           }
@@ -22585,22 +22372,26 @@
         "color-name": {
           "version": "1.1.4",
           "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-          "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="
+          "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+          "dev": true
         },
         "emoji-regex": {
           "version": "8.0.0",
           "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
-          "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A=="
+          "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
+          "dev": true
         },
         "is-fullwidth-code-point": {
           "version": "3.0.0",
           "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
-          "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg=="
+          "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
+          "dev": true
         },
         "string-width": {
           "version": "4.2.3",
           "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
           "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
+          "dev": true,
           "requires": {
             "emoji-regex": "^8.0.0",
             "is-fullwidth-code-point": "^3.0.0",
@@ -22614,11 +22405,6 @@
       "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
       "integrity": "sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ=="
     },
-    "y18n": {
-      "version": "5.0.8",
-      "resolved": "https://registry.npmjs.org/y18n/-/y18n-5.0.8.tgz",
-      "integrity": "sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA=="
-    },
     "yallist": {
       "version": "3.1.1",
       "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.1.1.tgz",
@@ -22631,58 +22417,12 @@
       "integrity": "sha512-2eHWfjaoXgTBC2jNM1LRef62VQa0umtvRiDSk6HSzW7RvS5YtkabJrwYLLEKWBc8a5U2PTSCs+dJjUTJdlHsWQ==",
       "dev": true
     },
-    "yargs": {
-      "version": "17.7.2",
-      "resolved": "https://registry.npmjs.org/yargs/-/yargs-17.7.2.tgz",
-      "integrity": "sha512-7dSzzRQ++CKnNI/krKnYRV7JKKPUXMEh61soaHKg9mrWEhzFWhFnxPxGl+69cD1Ou63C13NUPCnmIcrvqCuM6w==",
-      "requires": {
-        "cliui": "^8.0.1",
-        "escalade": "^3.1.1",
-        "get-caller-file": "^2.0.5",
-        "require-directory": "^2.1.1",
-        "string-width": "^4.2.3",
-        "y18n": "^5.0.5",
-        "yargs-parser": "^21.1.1"
-      },
-      "dependencies": {
-        "emoji-regex": {
-          "version": "8.0.0",
-          "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
-          "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A=="
-        },
-        "is-fullwidth-code-point": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
-          "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg=="
-        },
-        "string-width": {
-          "version": "4.2.3",
-          "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
-          "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
-          "requires": {
-            "emoji-regex": "^8.0.0",
-            "is-fullwidth-code-point": "^3.0.0",
-            "strip-ansi": "^6.0.1"
-          }
-        }
-      }
-    },
-    "yargs-parser": {
-      "version": "21.1.1",
-      "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-21.1.1.tgz",
-      "integrity": "sha512-tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw=="
-    },
     "yocto-queue": {
       "version": "0.1.0",
       "resolved": "https://registry.npmjs.org/yocto-queue/-/yocto-queue-0.1.0.tgz",
       "integrity": "sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==",
       "dev": true
     },
-    "yqueue": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/yqueue/-/yqueue-1.0.1.tgz",
-      "integrity": "sha512-DBxJZBRafFLA/tCc5uO8ZTGFr+sQgn1FRJkZ4cVrIQIk6bv2bInraE3mbpLAJw9z93JGrLkqDoyTLrrZaCNq5w=="
-    },
     "zod": {
       "version": "3.22.4",
       "resolved": "https://registry.npmjs.org/zod/-/zod-3.22.4.tgz",
diff --git a/package.json b/package.json
index 057a6678b..f44da81e6 100644
--- a/package.json
+++ b/package.json
@@ -51,7 +51,6 @@
     "@tanstack/react-query": "^4.29.3",
     "@tanstack/react-query-devtools": "^4.29.3",
     "@tanstack/react-query-persist-client": "^4.29.3",
-    "alex-sdk": "0.1.26",
     "argon2-browser": "^1.18.0",
     "async-mutex": "^0.5.0",
     "axios": "1.7.0",
diff --git a/src/app/components/tokenImage/index.tsx b/src/app/components/tokenImage/index.tsx
index 933d78c83..c63b083c0 100644
--- a/src/app/components/tokenImage/index.tsx
+++ b/src/app/components/tokenImage/index.tsx
@@ -64,7 +64,7 @@ const ProtocolImage = styled.img({
   width: '100%',
 });
 
-export interface TokenImageProps {
+interface TokenImageProps {
   currency?: CurrencyTypes;
   fungibleToken?: FungibleToken;
   loading?: boolean;
diff --git a/src/app/screens/swap/types.ts b/src/app/screens/swap/types.ts
index 4096ac6ab..59fcb68b4 100644
--- a/src/app/screens/swap/types.ts
+++ b/src/app/screens/swap/types.ts
@@ -1,23 +1,11 @@
-import { type TokenImageProps } from '@components/tokenImage';
 import {
   type ExecuteOrderRequest,
-  type FungibleToken,
   type PlaceOrderResponse,
   type PlaceStxOrderResponse,
   type PlaceUtxoOrderResponse,
 } from '@secretkeylabs/xverse-core';
-import { Currency } from 'alex-sdk';
 
 export type Side = 'from' | 'to';
-
-export type SwapToken = {
-  name: string;
-  image: TokenImageProps;
-  balance?: number;
-  amount?: number;
-  fiatAmount?: number;
-};
-
 type BaseOrderInfo = {
   providerCode: ExecuteOrderRequest['providerCode'];
 };
diff --git a/src/app/screens/swap/useStxCurrencyConversion.tsx b/src/app/screens/swap/useStxCurrencyConversion.tsx
deleted file mode 100644
index 5561c7d04..000000000
--- a/src/app/screens/swap/useStxCurrencyConversion.tsx
+++ /dev/null
@@ -1,82 +0,0 @@
-import { useGetSip10FungibleTokens } from '@hooks/queries/stx/useGetSip10FungibleTokens';
-import useCoinRates from '@hooks/queries/useCoinRates';
-import useStxWalletData from '@hooks/queries/useStxWalletData';
-import {
-  getFiatEquivalent,
-  microstacksToStx,
-  type FungibleToken,
-} from '@secretkeylabs/xverse-core';
-import { ftDecimals } from '@utils/helper';
-import { AlexSDK, Currency } from 'alex-sdk';
-import BigNumber from 'bignumber.js';
-import type { SwapToken } from './types';
-
-// eslint-disable-next-line import/prefer-default-export
-export function useStxCurrencyConversion() {
-  const alexSDK = new AlexSDK();
-  const { data: stxData } = useStxWalletData();
-  const { stxBtcRate, btcFiatRate } = useCoinRates();
-  const { data: sip10CoinsList } = useGetSip10FungibleTokens();
-
-  const acceptableCoinList =
-    sip10CoinsList
-      ?.filter((sc) => alexSDK.getCurrencyFrom(sc.principal) != null)
-      // TODO tim: remove this once alexsdk fix issue here
-      // https://github.com/alexgo-io/alex-sdk/issues/2
-      .filter((sc) => sc.principal !== 'SP3K8BC0PPEVCV7NZ6QSRWPQ2JE9E5B6N3PA0KBR9.brc20-db20')
-      .map<FungibleToken>((sc) => ({
-        ...sc,
-        assetName: '',
-        total_sent: sc?.total_sent ?? '0',
-        total_received: sc?.total_received ?? '0',
-        balance: sc?.balance ?? '0',
-      })) ?? [];
-
-  function currencyToToken(currency?: Currency, amount?: number): SwapToken | undefined {
-    if (currency == null) {
-      return undefined;
-    }
-    if (currency === Currency.STX) {
-      return {
-        balance: Number(microstacksToStx(stxData?.availableBalance ?? new BigNumber(0))),
-        image: { currency: 'STX', size: 28 },
-        name: 'STX',
-        amount,
-        fiatAmount:
-          amount != null
-            ? Number(
-                getFiatEquivalent(
-                  amount,
-                  'STX',
-                  BigNumber(stxBtcRate) as any,
-                  BigNumber(btcFiatRate) as any,
-                ),
-              )
-            : undefined,
-      };
-    }
-    const token = acceptableCoinList.find(
-      (c) => alexSDK.getCurrencyFrom(c.principal) === currency,
-    )!;
-    if (token == null) {
-      return undefined;
-    }
-    return {
-      amount,
-      image: { fungibleToken: token, size: 28 },
-      name: (token.ticker ?? token.name).toUpperCase(),
-      balance: Number(ftDecimals(token.balance, token.decimals ?? 0)),
-      fiatAmount:
-        amount != null
-          ? Number(
-              getFiatEquivalent(amount, 'FT', BigNumber(stxBtcRate), BigNumber(btcFiatRate), token),
-            )
-          : undefined,
-    };
-  }
-
-  return {
-    acceptableCoinList,
-    currencyToToken,
-  };
-}

From 8b55e99455d1f4cf1b457d475cca9a0cae4c5526 Mon Sep 17 00:00:00 2001
From: "Jordan K." <65149726+jordankzf@users.noreply.github.com>
Date: Wed, 4 Sep 2024 17:42:10 +0800
Subject: [PATCH 075/227] Remove unused stuff (#562)

---
 package-lock.json                             | 308 ++----------------
 package.json                                  |   1 -
 src/app/components/tokenImage/index.tsx       |   2 +-
 src/app/screens/swap/types.ts                 |  12 -
 .../screens/swap/useStxCurrencyConversion.tsx |  82 -----
 5 files changed, 25 insertions(+), 380 deletions(-)
 delete mode 100644 src/app/screens/swap/useStxCurrencyConversion.tsx

diff --git a/package-lock.json b/package-lock.json
index 28949fb56..70e19b79b 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -23,7 +23,6 @@
         "@tanstack/react-query": "^4.29.3",
         "@tanstack/react-query-devtools": "^4.29.3",
         "@tanstack/react-query-persist-client": "^4.29.3",
-        "alex-sdk": "0.1.26",
         "argon2-browser": "^1.18.0",
         "async-mutex": "^0.5.0",
         "axios": "1.7.0",
@@ -2886,21 +2885,6 @@
         "ajv": "^6.9.1"
       }
     },
-    "node_modules/alex-sdk": {
-      "version": "0.1.26",
-      "resolved": "https://registry.npmjs.org/alex-sdk/-/alex-sdk-0.1.26.tgz",
-      "integrity": "sha512-uUjbONoAit6htxZGLOFev8v2h59kE31fM1X9efH0Yi1eLXYSSXojj+iFPTlQTQvIysyseXGxkX4VVTc9aQ13sg==",
-      "dependencies": {
-        "clarity-codegen": "^0.3.5"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "peerDependencies": {
-        "@stacks/network": "*",
-        "@stacks/transactions": "*"
-      }
-    },
     "node_modules/ansi-escapes": {
       "version": "4.3.2",
       "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-4.3.2.tgz",
@@ -2944,6 +2928,7 @@
       "version": "5.0.1",
       "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
       "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
+      "dev": true,
       "engines": {
         "node": ">=8"
       }
@@ -3993,29 +3978,6 @@
         "safe-buffer": "^5.0.1"
       }
     },
-    "node_modules/clarity-codegen": {
-      "version": "0.3.6",
-      "resolved": "https://registry.npmjs.org/clarity-codegen/-/clarity-codegen-0.3.6.tgz",
-      "integrity": "sha512-Be1J8RFtPFGfWtQ/7enl3xkU1j2KkIS9W7RbuofIVYfKp11MCZSGQeNV+Gh0dQOQIs3O0WQLLg03ikyNaWtYzQ==",
-      "dependencies": {
-        "@stacks/stacks-blockchain-api-types": "^7.1.10",
-        "axios": "^1.5.0",
-        "lodash": "^4.17.21",
-        "yargs": "^17.7.2",
-        "yqueue": "^1.0.1"
-      },
-      "bin": {
-        "clarity-codegen": "lib/generate/cli.js"
-      },
-      "peerDependencies": {
-        "@stacks/transactions": "*"
-      }
-    },
-    "node_modules/clarity-codegen/node_modules/@stacks/stacks-blockchain-api-types": {
-      "version": "7.9.0",
-      "resolved": "https://registry.npmjs.org/@stacks/stacks-blockchain-api-types/-/stacks-blockchain-api-types-7.9.0.tgz",
-      "integrity": "sha512-29tcIOxEj0jIAVrMLH2hDuTM0wWtOT4z9EnNgOCEQvipEDPyvoaPjbYJmQUTxzvVjfoLjZAQsvTlJw7fnbkkrg=="
-    },
     "node_modules/classnames": {
       "version": "2.3.2",
       "resolved": "https://registry.npmjs.org/classnames/-/classnames-2.3.2.tgz",
@@ -4094,45 +4056,6 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/cliui": {
-      "version": "8.0.1",
-      "resolved": "https://registry.npmjs.org/cliui/-/cliui-8.0.1.tgz",
-      "integrity": "sha512-BSeNnyus75C4//NQ9gQt1/csTXyo/8Sb+afLAkzAptFuMsod9HFokGNudZpi/oQV73hnVK+sR+5PVRMd+Dr7YQ==",
-      "dependencies": {
-        "string-width": "^4.2.0",
-        "strip-ansi": "^6.0.1",
-        "wrap-ansi": "^7.0.0"
-      },
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/cliui/node_modules/emoji-regex": {
-      "version": "8.0.0",
-      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
-      "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A=="
-    },
-    "node_modules/cliui/node_modules/is-fullwidth-code-point": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
-      "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/cliui/node_modules/string-width": {
-      "version": "4.2.3",
-      "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
-      "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
-      "dependencies": {
-        "emoji-regex": "^8.0.0",
-        "is-fullwidth-code-point": "^3.0.0",
-        "strip-ansi": "^6.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
     "node_modules/clone": {
       "version": "1.0.4",
       "resolved": "https://registry.npmjs.org/clone/-/clone-1.0.4.tgz",
@@ -6683,14 +6606,6 @@
         "node": ">=6.9.0"
       }
     },
-    "node_modules/get-caller-file": {
-      "version": "2.0.5",
-      "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz",
-      "integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==",
-      "engines": {
-        "node": "6.* || 8.* || >= 10.*"
-      }
-    },
     "node_modules/get-intrinsic": {
       "version": "1.2.4",
       "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.2.4.tgz",
@@ -10614,14 +10529,6 @@
         "strip-ansi": "^6.0.1"
       }
     },
-    "node_modules/require-directory": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz",
-      "integrity": "sha512-fGxEI7+wsG9xrvdjsrlmL22OMTTiHRwAMroiEeMgq8gzoLC/PQr7RsRDSTLUg/bZAZtF+TVIkHc6/4RIKrui+Q==",
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
     "node_modules/require-from-string": {
       "version": "2.0.2",
       "resolved": "https://registry.npmjs.org/require-from-string/-/require-from-string-2.0.2.tgz",
@@ -11473,6 +11380,7 @@
       "version": "6.0.1",
       "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
       "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
+      "dev": true,
       "dependencies": {
         "ansi-regex": "^5.0.1"
       },
@@ -12854,6 +12762,7 @@
       "version": "7.0.0",
       "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz",
       "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==",
+      "dev": true,
       "dependencies": {
         "ansi-styles": "^4.0.0",
         "string-width": "^4.1.0",
@@ -12870,6 +12779,7 @@
       "version": "4.3.0",
       "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
       "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+      "dev": true,
       "dependencies": {
         "color-convert": "^2.0.1"
       },
@@ -12884,6 +12794,7 @@
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
       "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+      "dev": true,
       "dependencies": {
         "color-name": "~1.1.4"
       },
@@ -12894,17 +12805,20 @@
     "node_modules/wrap-ansi/node_modules/color-name": {
       "version": "1.1.4",
       "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="
+      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+      "dev": true
     },
     "node_modules/wrap-ansi/node_modules/emoji-regex": {
       "version": "8.0.0",
       "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
-      "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A=="
+      "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
+      "dev": true
     },
     "node_modules/wrap-ansi/node_modules/is-fullwidth-code-point": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
       "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
+      "dev": true,
       "engines": {
         "node": ">=8"
       }
@@ -12913,6 +12827,7 @@
       "version": "4.2.3",
       "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
       "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
+      "dev": true,
       "dependencies": {
         "emoji-regex": "^8.0.0",
         "is-fullwidth-code-point": "^3.0.0",
@@ -12927,14 +12842,6 @@
       "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
       "integrity": "sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ=="
     },
-    "node_modules/y18n": {
-      "version": "5.0.8",
-      "resolved": "https://registry.npmjs.org/y18n/-/y18n-5.0.8.tgz",
-      "integrity": "sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==",
-      "engines": {
-        "node": ">=10"
-      }
-    },
     "node_modules/yallist": {
       "version": "3.1.1",
       "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.1.1.tgz",
@@ -12950,57 +12857,6 @@
         "node": ">= 14"
       }
     },
-    "node_modules/yargs": {
-      "version": "17.7.2",
-      "resolved": "https://registry.npmjs.org/yargs/-/yargs-17.7.2.tgz",
-      "integrity": "sha512-7dSzzRQ++CKnNI/krKnYRV7JKKPUXMEh61soaHKg9mrWEhzFWhFnxPxGl+69cD1Ou63C13NUPCnmIcrvqCuM6w==",
-      "dependencies": {
-        "cliui": "^8.0.1",
-        "escalade": "^3.1.1",
-        "get-caller-file": "^2.0.5",
-        "require-directory": "^2.1.1",
-        "string-width": "^4.2.3",
-        "y18n": "^5.0.5",
-        "yargs-parser": "^21.1.1"
-      },
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/yargs-parser": {
-      "version": "21.1.1",
-      "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-21.1.1.tgz",
-      "integrity": "sha512-tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw==",
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/yargs/node_modules/emoji-regex": {
-      "version": "8.0.0",
-      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
-      "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A=="
-    },
-    "node_modules/yargs/node_modules/is-fullwidth-code-point": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
-      "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/yargs/node_modules/string-width": {
-      "version": "4.2.3",
-      "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
-      "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
-      "dependencies": {
-        "emoji-regex": "^8.0.0",
-        "is-fullwidth-code-point": "^3.0.0",
-        "strip-ansi": "^6.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
     "node_modules/yocto-queue": {
       "version": "0.1.0",
       "resolved": "https://registry.npmjs.org/yocto-queue/-/yocto-queue-0.1.0.tgz",
@@ -13013,11 +12869,6 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/yqueue": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/yqueue/-/yqueue-1.0.1.tgz",
-      "integrity": "sha512-DBxJZBRafFLA/tCc5uO8ZTGFr+sQgn1FRJkZ4cVrIQIk6bv2bInraE3mbpLAJw9z93JGrLkqDoyTLrrZaCNq5w=="
-    },
     "node_modules/zod": {
       "version": "3.22.4",
       "resolved": "https://registry.npmjs.org/zod/-/zod-3.22.4.tgz",
@@ -15152,14 +15003,6 @@
       "dev": true,
       "requires": {}
     },
-    "alex-sdk": {
-      "version": "0.1.26",
-      "resolved": "https://registry.npmjs.org/alex-sdk/-/alex-sdk-0.1.26.tgz",
-      "integrity": "sha512-uUjbONoAit6htxZGLOFev8v2h59kE31fM1X9efH0Yi1eLXYSSXojj+iFPTlQTQvIysyseXGxkX4VVTc9aQ13sg==",
-      "requires": {
-        "clarity-codegen": "^0.3.5"
-      }
-    },
     "ansi-escapes": {
       "version": "4.3.2",
       "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-4.3.2.tgz",
@@ -15186,7 +15029,8 @@
     "ansi-regex": {
       "version": "5.0.1",
       "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
-      "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ=="
+      "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
+      "dev": true
     },
     "ansi-styles": {
       "version": "3.2.1",
@@ -16002,25 +15846,6 @@
         "safe-buffer": "^5.0.1"
       }
     },
-    "clarity-codegen": {
-      "version": "0.3.6",
-      "resolved": "https://registry.npmjs.org/clarity-codegen/-/clarity-codegen-0.3.6.tgz",
-      "integrity": "sha512-Be1J8RFtPFGfWtQ/7enl3xkU1j2KkIS9W7RbuofIVYfKp11MCZSGQeNV+Gh0dQOQIs3O0WQLLg03ikyNaWtYzQ==",
-      "requires": {
-        "@stacks/stacks-blockchain-api-types": "^7.1.10",
-        "axios": "^1.5.0",
-        "lodash": "^4.17.21",
-        "yargs": "^17.7.2",
-        "yqueue": "^1.0.1"
-      },
-      "dependencies": {
-        "@stacks/stacks-blockchain-api-types": {
-          "version": "7.9.0",
-          "resolved": "https://registry.npmjs.org/@stacks/stacks-blockchain-api-types/-/stacks-blockchain-api-types-7.9.0.tgz",
-          "integrity": "sha512-29tcIOxEj0jIAVrMLH2hDuTM0wWtOT4z9EnNgOCEQvipEDPyvoaPjbYJmQUTxzvVjfoLjZAQsvTlJw7fnbkkrg=="
-        }
-      }
-    },
     "classnames": {
       "version": "2.3.2",
       "resolved": "https://registry.npmjs.org/classnames/-/classnames-2.3.2.tgz",
@@ -16077,38 +15902,6 @@
         "string-width": "^5.0.0"
       }
     },
-    "cliui": {
-      "version": "8.0.1",
-      "resolved": "https://registry.npmjs.org/cliui/-/cliui-8.0.1.tgz",
-      "integrity": "sha512-BSeNnyus75C4//NQ9gQt1/csTXyo/8Sb+afLAkzAptFuMsod9HFokGNudZpi/oQV73hnVK+sR+5PVRMd+Dr7YQ==",
-      "requires": {
-        "string-width": "^4.2.0",
-        "strip-ansi": "^6.0.1",
-        "wrap-ansi": "^7.0.0"
-      },
-      "dependencies": {
-        "emoji-regex": {
-          "version": "8.0.0",
-          "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
-          "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A=="
-        },
-        "is-fullwidth-code-point": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
-          "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg=="
-        },
-        "string-width": {
-          "version": "4.2.3",
-          "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
-          "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
-          "requires": {
-            "emoji-regex": "^8.0.0",
-            "is-fullwidth-code-point": "^3.0.0",
-            "strip-ansi": "^6.0.1"
-          }
-        }
-      }
-    },
     "clone": {
       "version": "1.0.4",
       "resolved": "https://registry.npmjs.org/clone/-/clone-1.0.4.tgz",
@@ -18057,11 +17850,6 @@
       "integrity": "sha512-3hN7NaskYvMDLQY55gnW3NQ+mesEAepTqlg+VEbj7zzqEMBVNhzcGYYeqFo/TlYz6eQiFcp1HcsCZO+nGgS8zg==",
       "peer": true
     },
-    "get-caller-file": {
-      "version": "2.0.5",
-      "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz",
-      "integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg=="
-    },
     "get-intrinsic": {
       "version": "1.2.4",
       "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.2.4.tgz",
@@ -20871,11 +20659,6 @@
         "strip-ansi": "^6.0.1"
       }
     },
-    "require-directory": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz",
-      "integrity": "sha512-fGxEI7+wsG9xrvdjsrlmL22OMTTiHRwAMroiEeMgq8gzoLC/PQr7RsRDSTLUg/bZAZtF+TVIkHc6/4RIKrui+Q=="
-    },
     "require-from-string": {
       "version": "2.0.2",
       "resolved": "https://registry.npmjs.org/require-from-string/-/require-from-string-2.0.2.tgz",
@@ -21538,6 +21321,7 @@
       "version": "6.0.1",
       "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
       "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
+      "dev": true,
       "requires": {
         "ansi-regex": "^5.0.1"
       }
@@ -22539,6 +22323,7 @@
       "version": "7.0.0",
       "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz",
       "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==",
+      "dev": true,
       "requires": {
         "ansi-styles": "^4.0.0",
         "string-width": "^4.1.0",
@@ -22549,6 +22334,7 @@
           "version": "4.3.0",
           "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
           "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+          "dev": true,
           "requires": {
             "color-convert": "^2.0.1"
           }
@@ -22557,6 +22343,7 @@
           "version": "2.0.1",
           "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
           "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+          "dev": true,
           "requires": {
             "color-name": "~1.1.4"
           }
@@ -22564,22 +22351,26 @@
         "color-name": {
           "version": "1.1.4",
           "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-          "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="
+          "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+          "dev": true
         },
         "emoji-regex": {
           "version": "8.0.0",
           "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
-          "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A=="
+          "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
+          "dev": true
         },
         "is-fullwidth-code-point": {
           "version": "3.0.0",
           "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
-          "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg=="
+          "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
+          "dev": true
         },
         "string-width": {
           "version": "4.2.3",
           "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
           "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
+          "dev": true,
           "requires": {
             "emoji-regex": "^8.0.0",
             "is-fullwidth-code-point": "^3.0.0",
@@ -22593,11 +22384,6 @@
       "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
       "integrity": "sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ=="
     },
-    "y18n": {
-      "version": "5.0.8",
-      "resolved": "https://registry.npmjs.org/y18n/-/y18n-5.0.8.tgz",
-      "integrity": "sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA=="
-    },
     "yallist": {
       "version": "3.1.1",
       "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.1.1.tgz",
@@ -22610,58 +22396,12 @@
       "integrity": "sha512-2eHWfjaoXgTBC2jNM1LRef62VQa0umtvRiDSk6HSzW7RvS5YtkabJrwYLLEKWBc8a5U2PTSCs+dJjUTJdlHsWQ==",
       "dev": true
     },
-    "yargs": {
-      "version": "17.7.2",
-      "resolved": "https://registry.npmjs.org/yargs/-/yargs-17.7.2.tgz",
-      "integrity": "sha512-7dSzzRQ++CKnNI/krKnYRV7JKKPUXMEh61soaHKg9mrWEhzFWhFnxPxGl+69cD1Ou63C13NUPCnmIcrvqCuM6w==",
-      "requires": {
-        "cliui": "^8.0.1",
-        "escalade": "^3.1.1",
-        "get-caller-file": "^2.0.5",
-        "require-directory": "^2.1.1",
-        "string-width": "^4.2.3",
-        "y18n": "^5.0.5",
-        "yargs-parser": "^21.1.1"
-      },
-      "dependencies": {
-        "emoji-regex": {
-          "version": "8.0.0",
-          "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
-          "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A=="
-        },
-        "is-fullwidth-code-point": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
-          "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg=="
-        },
-        "string-width": {
-          "version": "4.2.3",
-          "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
-          "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
-          "requires": {
-            "emoji-regex": "^8.0.0",
-            "is-fullwidth-code-point": "^3.0.0",
-            "strip-ansi": "^6.0.1"
-          }
-        }
-      }
-    },
-    "yargs-parser": {
-      "version": "21.1.1",
-      "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-21.1.1.tgz",
-      "integrity": "sha512-tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw=="
-    },
     "yocto-queue": {
       "version": "0.1.0",
       "resolved": "https://registry.npmjs.org/yocto-queue/-/yocto-queue-0.1.0.tgz",
       "integrity": "sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==",
       "dev": true
     },
-    "yqueue": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/yqueue/-/yqueue-1.0.1.tgz",
-      "integrity": "sha512-DBxJZBRafFLA/tCc5uO8ZTGFr+sQgn1FRJkZ4cVrIQIk6bv2bInraE3mbpLAJw9z93JGrLkqDoyTLrrZaCNq5w=="
-    },
     "zod": {
       "version": "3.22.4",
       "resolved": "https://registry.npmjs.org/zod/-/zod-3.22.4.tgz",
diff --git a/package.json b/package.json
index a9f15f516..a325b86f0 100644
--- a/package.json
+++ b/package.json
@@ -51,7 +51,6 @@
     "@tanstack/react-query": "^4.29.3",
     "@tanstack/react-query-devtools": "^4.29.3",
     "@tanstack/react-query-persist-client": "^4.29.3",
-    "alex-sdk": "0.1.26",
     "argon2-browser": "^1.18.0",
     "async-mutex": "^0.5.0",
     "axios": "1.7.0",
diff --git a/src/app/components/tokenImage/index.tsx b/src/app/components/tokenImage/index.tsx
index 933d78c83..c63b083c0 100644
--- a/src/app/components/tokenImage/index.tsx
+++ b/src/app/components/tokenImage/index.tsx
@@ -64,7 +64,7 @@ const ProtocolImage = styled.img({
   width: '100%',
 });
 
-export interface TokenImageProps {
+interface TokenImageProps {
   currency?: CurrencyTypes;
   fungibleToken?: FungibleToken;
   loading?: boolean;
diff --git a/src/app/screens/swap/types.ts b/src/app/screens/swap/types.ts
index 4096ac6ab..59fcb68b4 100644
--- a/src/app/screens/swap/types.ts
+++ b/src/app/screens/swap/types.ts
@@ -1,23 +1,11 @@
-import { type TokenImageProps } from '@components/tokenImage';
 import {
   type ExecuteOrderRequest,
-  type FungibleToken,
   type PlaceOrderResponse,
   type PlaceStxOrderResponse,
   type PlaceUtxoOrderResponse,
 } from '@secretkeylabs/xverse-core';
-import { Currency } from 'alex-sdk';
 
 export type Side = 'from' | 'to';
-
-export type SwapToken = {
-  name: string;
-  image: TokenImageProps;
-  balance?: number;
-  amount?: number;
-  fiatAmount?: number;
-};
-
 type BaseOrderInfo = {
   providerCode: ExecuteOrderRequest['providerCode'];
 };
diff --git a/src/app/screens/swap/useStxCurrencyConversion.tsx b/src/app/screens/swap/useStxCurrencyConversion.tsx
deleted file mode 100644
index 5561c7d04..000000000
--- a/src/app/screens/swap/useStxCurrencyConversion.tsx
+++ /dev/null
@@ -1,82 +0,0 @@
-import { useGetSip10FungibleTokens } from '@hooks/queries/stx/useGetSip10FungibleTokens';
-import useCoinRates from '@hooks/queries/useCoinRates';
-import useStxWalletData from '@hooks/queries/useStxWalletData';
-import {
-  getFiatEquivalent,
-  microstacksToStx,
-  type FungibleToken,
-} from '@secretkeylabs/xverse-core';
-import { ftDecimals } from '@utils/helper';
-import { AlexSDK, Currency } from 'alex-sdk';
-import BigNumber from 'bignumber.js';
-import type { SwapToken } from './types';
-
-// eslint-disable-next-line import/prefer-default-export
-export function useStxCurrencyConversion() {
-  const alexSDK = new AlexSDK();
-  const { data: stxData } = useStxWalletData();
-  const { stxBtcRate, btcFiatRate } = useCoinRates();
-  const { data: sip10CoinsList } = useGetSip10FungibleTokens();
-
-  const acceptableCoinList =
-    sip10CoinsList
-      ?.filter((sc) => alexSDK.getCurrencyFrom(sc.principal) != null)
-      // TODO tim: remove this once alexsdk fix issue here
-      // https://github.com/alexgo-io/alex-sdk/issues/2
-      .filter((sc) => sc.principal !== 'SP3K8BC0PPEVCV7NZ6QSRWPQ2JE9E5B6N3PA0KBR9.brc20-db20')
-      .map<FungibleToken>((sc) => ({
-        ...sc,
-        assetName: '',
-        total_sent: sc?.total_sent ?? '0',
-        total_received: sc?.total_received ?? '0',
-        balance: sc?.balance ?? '0',
-      })) ?? [];
-
-  function currencyToToken(currency?: Currency, amount?: number): SwapToken | undefined {
-    if (currency == null) {
-      return undefined;
-    }
-    if (currency === Currency.STX) {
-      return {
-        balance: Number(microstacksToStx(stxData?.availableBalance ?? new BigNumber(0))),
-        image: { currency: 'STX', size: 28 },
-        name: 'STX',
-        amount,
-        fiatAmount:
-          amount != null
-            ? Number(
-                getFiatEquivalent(
-                  amount,
-                  'STX',
-                  BigNumber(stxBtcRate) as any,
-                  BigNumber(btcFiatRate) as any,
-                ),
-              )
-            : undefined,
-      };
-    }
-    const token = acceptableCoinList.find(
-      (c) => alexSDK.getCurrencyFrom(c.principal) === currency,
-    )!;
-    if (token == null) {
-      return undefined;
-    }
-    return {
-      amount,
-      image: { fungibleToken: token, size: 28 },
-      name: (token.ticker ?? token.name).toUpperCase(),
-      balance: Number(ftDecimals(token.balance, token.decimals ?? 0)),
-      fiatAmount:
-        amount != null
-          ? Number(
-              getFiatEquivalent(amount, 'FT', BigNumber(stxBtcRate), BigNumber(btcFiatRate), token),
-            )
-          : undefined,
-    };
-  }
-
-  return {
-    acceptableCoinList,
-    currencyToToken,
-  };
-}

From 495f401546ca3febbc8ff3d0b0dd39ac6fa0c532 Mon Sep 17 00:00:00 2001
From: Den <36603049+dhriaznov@users.noreply.github.com>
Date: Wed, 4 Sep 2024 11:53:28 +0200
Subject: [PATCH 076/227] [ENG-5003] fix: Token name line break on dashboard
 (#545)

* [ENG-4651] fix: Difficult to differentiate selected vs not selected accounts

* Fix the html props for styling

* Add a separate Props type

* [ENG-4652] Add keyboard navigation throughout the app

* Add elements focus for keyboard on full screen

* Move tabs component to ui-library, use it on the Collectibles screen

* Refactor the SquareButton component

* Update the ordinal detail screen action buttons

* Refactor the resetWallet component

* Refactor tabBar component to improve accessibility

* Improve the scrollbar indent on the Home screen

* Improve accessibility for the fee Edit button

* Make Home screen banner clickable via keyboard

* Improve accessibility on the Swap flow

* Update the Save button on the ChangeNetworkScreen

* Update the Modal component on the ReceiveNftModal screen

* Make Sheet component accessible via keyboard

* Make input clear button accessible via keyboard

* Add accessibility for the AlertMessage component

* Improve the Forgot password flow accessibility

* [ENG-5003] fix: Token name line break on dashboard

* Fix caret icon color in the header

* Remove the unused styles

* Improve the ledger account import flow accessibility

* Fix value submit on Enter when other buttons are in focus

* Add Toggle component to ui-library, replace and remove react-switch package, update e2e

* Update the toggle and settings buttons

* Fix the converted value overflow in the amount inputs

* Remove the code that appeared after git conflicts merge
---
 src/app/components/tokenTile/index.tsx | 18 +++++++-----------
 src/app/screens/home/index.styled.ts   | 16 +++++-----------
 src/app/screens/home/index.tsx         |  6 ++++--
 3 files changed, 16 insertions(+), 24 deletions(-)

diff --git a/src/app/components/tokenTile/index.tsx b/src/app/components/tokenTile/index.tsx
index 6a4d5bfcb..a44f6b2d9 100644
--- a/src/app/components/tokenTile/index.tsx
+++ b/src/app/components/tokenTile/index.tsx
@@ -18,12 +18,8 @@ const TileContainer = styled.button((props) => ({
   flexDirection: 'row',
   backgroundColor: props.color,
   width: '100%',
-  paddingLeft: props.theme.spacing(8),
-  paddingRight: props.theme.spacing(8),
-  paddingTop: props.theme.spacing(7.25),
-  paddingBottom: props.theme.spacing(7.25),
+  padding: `${props.theme.space.m} 0`,
   borderRadius: props.theme.radius(2),
-  marginBottom: props.theme.spacing(0),
 }));
 
 const RowContainer = styled.div({
@@ -59,11 +55,11 @@ const CoinTickerText = styled.p((props) => ({
 }));
 
 const SubText = styled.p<{ fullWidth: boolean }>((props) => ({
-  ...props.theme.typography.body_medium_m,
+  ...props.theme.typography.body_medium_s,
   color: props.theme.colors.white_200,
-  fontSize: 12,
   textAlign: 'left',
-  maxWidth: props.fullWidth ? undefined : 100,
+  maxWidth: props.fullWidth ? 'unset' : 120,
+  whiteSpace: props.fullWidth ? 'normal' : 'nowrap',
   overflow: 'hidden',
   textOverflow: 'ellipsis',
 }));
@@ -88,7 +84,7 @@ const StyledBarLoader = styled(BetterBarLoader)<{
 }>((props) => ({
   padding: 0,
   borderRadius: props.theme.radius(1),
-  marginBottom: props.withMarginBottom ? props.theme.spacing(2) : 0,
+  marginBottom: props.withMarginBottom ? props.theme.space.xxs : 0,
 }));
 
 function TokenLoader() {
@@ -100,7 +96,7 @@ function TokenLoader() {
   );
 }
 
-interface Props {
+type Props = {
   title: string;
   loading?: boolean;
   currency: CurrencyTypes;
@@ -110,7 +106,7 @@ interface Props {
   className?: string;
   showProtocolIcon?: boolean;
   hideBalance?: boolean;
-}
+};
 
 function TokenTile({
   title,
diff --git a/src/app/screens/home/index.styled.ts b/src/app/screens/home/index.styled.ts
index 7bcbfc822..be06d44bb 100644
--- a/src/app/screens/home/index.styled.ts
+++ b/src/app/screens/home/index.styled.ts
@@ -8,14 +8,6 @@ export const Container = styled.div<{ $applyIndent?: boolean }>`
   flex: 1;
   padding: 0 ${(props) => props.theme.space.xs};
   ${(props) => props.theme.scrollbar}
-
-  ${(props) =>
-    props.$applyIndent &&
-    // When elements are in focus with the keyboard, we need to indent the content to the right to avoid cutting the right side of the elements
-    `
-    padding-left: ${props.theme.space.m};
-    scrollbar-gutter: stable;
-  `}
 `;
 
 export const ColumnContainer = styled.div((props) => ({
@@ -23,8 +15,6 @@ export const ColumnContainer = styled.div((props) => ({
   flexDirection: 'column',
   alignItems: 'space-between',
   justifyContent: 'space-between',
-  gap: props.theme.space.s,
-  marginTop: props.theme.space.l,
   marginBottom: props.theme.space.s,
 }));
 
@@ -77,7 +67,7 @@ export const TokenListButtonContainer = styled.div((props) => ({
 }));
 
 export const StyledTokenTile = styled(TokenTile)`
-  background-color: ${(props) => props.theme.colors.elevation1};
+  background-color: transparent;
 `;
 
 export const Icon = styled.img({
@@ -171,3 +161,7 @@ export const StyledDivider = styled(Divider)`
   margin-left: -${(props) => props.theme.space.m};
   margin-right: -${(props) => props.theme.space.m};
 `;
+
+export const StyledDividerSingle = styled(StyledDivider)`
+  margin-top: ${(props) => props.theme.space.xl};
+`;
diff --git a/src/app/screens/home/index.tsx b/src/app/screens/home/index.tsx
index 0db1ef311..4657f92c1 100644
--- a/src/app/screens/home/index.tsx
+++ b/src/app/screens/home/index.tsx
@@ -70,6 +70,7 @@ import {
   RowButtonContainer,
   StacksIcon,
   StyledDivider,
+  StyledDividerSingle,
   StyledTokenTile,
   TokenListButton,
   TokenListButtonContainer,
@@ -87,7 +88,6 @@ function Home() {
     showBtcReceiveAlert,
     showOrdinalReceiveAlert,
     showDataCollectionAlert,
-    network,
     hideStx,
     spamToken,
     notificationBanners,
@@ -452,13 +452,15 @@ function Home() {
           />
         </RowButtonContainer>
 
-        {showNotificationBanner && (
+        {showNotificationBanner ? (
           <>
             <br />
             <StyledDivider color="white_850" verticalMargin="m" />
             <Banner {...notificationBannersArr[0]} />
             <StyledDivider color="white_850" verticalMargin="xxs" />
           </>
+        ) : (
+          <StyledDividerSingle color="elevation3" verticalMargin="xs" />
         )}
 
         <ColumnContainer>

From d4dbd7f3ebe57c042aeaee7258ffab8fbe84578a Mon Sep 17 00:00:00 2001
From: jordankzf <jordan@secretkeylabs.com>
Date: Wed, 4 Sep 2024 19:22:49 +0800
Subject: [PATCH 077/227] Fix SIP-10 fiat rate

---
 .../hooks/queries/stx/useGetSip10TokenInfo.ts | 32 +++++++++++++++++++
 src/app/screens/swap/index.tsx                |  8 ++---
 src/app/screens/swap/mixpanel.ts              | 11 +++----
 src/app/screens/swap/quoteSummary/index.tsx   | 10 +++---
 src/app/screens/swap/quotesModal/index.tsx    |  1 -
 5 files changed, 44 insertions(+), 18 deletions(-)
 create mode 100644 src/app/hooks/queries/stx/useGetSip10TokenInfo.ts

diff --git a/src/app/hooks/queries/stx/useGetSip10TokenInfo.ts b/src/app/hooks/queries/stx/useGetSip10TokenInfo.ts
new file mode 100644
index 000000000..5cee14355
--- /dev/null
+++ b/src/app/hooks/queries/stx/useGetSip10TokenInfo.ts
@@ -0,0 +1,32 @@
+import useWalletSelector from '@hooks/useWalletSelector';
+import { getXverseApiClient } from '@secretkeylabs/xverse-core';
+import { useQuery } from '@tanstack/react-query';
+
+const useGetSip10TokenInfo = (principal?: string) => {
+  const { fiatCurrency, network } = useWalletSelector();
+
+  const xverseApiClient = getXverseApiClient(network.type);
+
+  const fetchTokensInfo = async () => {
+    if (principal) {
+      const coinsInfo = await xverseApiClient.getCoinsInfo([principal], fiatCurrency);
+
+      const tokenInfo = coinsInfo.find((coin) => coin.contract === principal);
+      return tokenInfo;
+    }
+  };
+
+  const {
+    data: tokenInfo,
+    isLoading,
+    error,
+  } = useQuery({
+    queryKey: ['sip10TokensInfo', principal, fiatCurrency, network.type],
+    queryFn: fetchTokensInfo,
+    enabled: !!principal,
+  });
+
+  return { tokenInfo, isLoading, error };
+};
+
+export default useGetSip10TokenInfo;
diff --git a/src/app/screens/swap/index.tsx b/src/app/screens/swap/index.tsx
index 072d25d1d..8cecbfc77 100644
--- a/src/app/screens/swap/index.tsx
+++ b/src/app/screens/swap/index.tsx
@@ -3,7 +3,7 @@ import RequestsRoutes from '@common/utils/route-urls';
 import BottomBar from '@components/tabBar';
 import TopRow from '@components/topRow';
 import useRuneFloorPriceQuery from '@hooks/queries/runes/useRuneFloorPriceQuery';
-import { useGetSip10FungibleTokens } from '@hooks/queries/stx/useGetSip10FungibleTokens';
+import useGetSip10TokenInfo from '@hooks/queries/stx/useGetSip10TokenInfo';
 import useGetQuotes from '@hooks/queries/swaps/useGetQuotes';
 import useBtcWalletData from '@hooks/queries/useBtcWalletData';
 import useCoinRates from '@hooks/queries/useCoinRates';
@@ -138,7 +138,7 @@ export default function SwapScreen() {
   const { quotes, loading: quotesLoading, error: quotesError, fetchQuotes } = useGetQuotes();
   const { data: runeFloorPrice } = useRuneFloorPriceQuery(toToken?.name ?? '');
   const coinsMasterList = useMasterCoinsList();
-  const { data: sip10CoinsList } = useGetSip10FungibleTokens();
+  const { tokenInfo: toTokenInfo } = useGetSip10TokenInfo(toToken?.ticker);
 
   useEffect(() => {
     if (defaultFrom) {
@@ -182,7 +182,7 @@ export default function SwapScreen() {
       btcUsdRate,
       runeFloorPrice,
       stxBtcRate,
-      sip10CoinsList,
+      toTokenInfo,
     });
 
     fetchQuotes({
@@ -400,7 +400,7 @@ export default function SwapScreen() {
       btcUsdRate,
       runeFloorPrice,
       stxBtcRate,
-      sip10CoinsList,
+      toTokenInfo,
     });
   };
 
diff --git a/src/app/screens/swap/mixpanel.ts b/src/app/screens/swap/mixpanel.ts
index a66e35ad1..700b74203 100644
--- a/src/app/screens/swap/mixpanel.ts
+++ b/src/app/screens/swap/mixpanel.ts
@@ -2,6 +2,7 @@ import {
   getBtcFiatEquivalent,
   getStxFiatEquivalent,
   stxToMicrostacks,
+  type Coin,
   type FungibleToken,
   type Provider,
   type Quote,
@@ -22,7 +23,7 @@ function trackSwapMixPanel(
     btcUsdRate,
     runeFloorPrice,
     stxBtcRate,
-    sip10CoinsList,
+    toTokenInfo,
   }: {
     provider?: Provider;
     fromToken?: FungibleToken;
@@ -32,7 +33,7 @@ function trackSwapMixPanel(
     btcUsdRate: string;
     runeFloorPrice?: number;
     stxBtcRate?: string;
-    sip10CoinsList?: any;
+    toTokenInfo?: Coin;
   },
 ) {
   let fromAmount;
@@ -81,11 +82,7 @@ function trackSwapMixPanel(
               new BigNumber(stxBtcRate),
               new BigNumber(btcUsdRate),
             ).toFixed(2)
-          : new BigNumber(
-              sip10CoinsList?.find((s) => s.principal === toToken?.ticker)?.tokenFiatRate ?? 0,
-            )
-              .multipliedBy(receiveAmount)
-              .toFixed(2);
+          : new BigNumber(toTokenInfo?.tokenFiatRate ?? 0).multipliedBy(receiveAmount).toFixed(2);
     }
   }
 
diff --git a/src/app/screens/swap/quoteSummary/index.tsx b/src/app/screens/swap/quoteSummary/index.tsx
index 1fdc543e4..5f44daa39 100644
--- a/src/app/screens/swap/quoteSummary/index.tsx
+++ b/src/app/screens/swap/quoteSummary/index.tsx
@@ -1,7 +1,7 @@
 import SlippageEditIcon from '@assets/img/swap/slippageEdit.svg';
 import TopRow from '@components/topRow';
 import useRuneFloorPriceQuery from '@hooks/queries/runes/useRuneFloorPriceQuery';
-import { useGetSip10FungibleTokens } from '@hooks/queries/stx/useGetSip10FungibleTokens';
+import useGetSip10TokenInfo from '@hooks/queries/stx/useGetSip10TokenInfo';
 import useCoinRates from '@hooks/queries/useCoinRates';
 import useBtcFeeRate from '@hooks/useBtcFeeRate';
 import useSearchParamsState from '@hooks/useSearchParamsState';
@@ -171,7 +171,7 @@ export default function QuoteSummary({
   selectedIdentifiers,
 }: QuoteSummaryProps) {
   const { t } = useTranslation('translation');
-  const { data: sip10CoinsList } = useGetSip10FungibleTokens();
+  const { tokenInfo: toTokenInfo } = useGetSip10TokenInfo(toToken?.ticker);
   const theme = useTheme();
   const { btcFiatRate, btcUsdRate, stxBtcRate } = useCoinRates();
   const { btcAddress, ordinalsAddress, btcPublicKey, ordinalsPublicKey, stxAddress, stxPublicKey } =
@@ -258,7 +258,7 @@ export default function QuoteSummary({
       btcUsdRate,
       runeFloorPrice,
       stxBtcRate,
-      sip10CoinsList,
+      toTokenInfo,
     });
 
     if (selectedIdentifiers) {
@@ -361,9 +361,7 @@ export default function QuoteSummary({
         new BigNumber(btcFiatRate),
       ).toFixed(2);
     }
-    return new BigNumber(
-      sip10CoinsList?.find((s) => s.principal === toToken?.ticker)?.tokenFiatRate ?? 0,
-    )
+    return new BigNumber(toTokenInfo?.tokenFiatRate ?? 0)
       .multipliedBy(quote.receiveAmount)
       .toFixed(2);
   })();
diff --git a/src/app/screens/swap/quotesModal/index.tsx b/src/app/screens/swap/quotesModal/index.tsx
index ec256e0f5..ac6073a09 100644
--- a/src/app/screens/swap/quotesModal/index.tsx
+++ b/src/app/screens/swap/quotesModal/index.tsx
@@ -1,4 +1,3 @@
-import { microStxToStx } from '@components/postCondition/postConditionView/helper';
 import useCoinRates from '@hooks/queries/useCoinRates';
 import {
   getBtcFiatEquivalent,

From 72172748169be4615ed90cf2971205a870334376 Mon Sep 17 00:00:00 2001
From: jordankzf <jordan@secretkeylabs.com>
Date: Wed, 4 Sep 2024 19:49:28 +0800
Subject: [PATCH 078/227] Show '--' if fiat rate is not available

---
 src/app/screens/swap/components/amountInput/index.tsx |  2 +-
 src/app/screens/swap/index.tsx                        |  2 +-
 src/app/screens/swap/mixpanel.ts                      |  8 ++++++--
 src/app/screens/swap/quoteSummary/index.tsx           | 11 +++++++----
 src/app/screens/swap/quotesModal/index.tsx            |  9 ++++++++-
 src/app/screens/swap/quotesModal/quoteTile.tsx        |  3 +--
 6 files changed, 24 insertions(+), 11 deletions(-)

diff --git a/src/app/screens/swap/components/amountInput/index.tsx b/src/app/screens/swap/components/amountInput/index.tsx
index d10f29113..5766bf04c 100644
--- a/src/app/screens/swap/components/amountInput/index.tsx
+++ b/src/app/screens/swap/components/amountInput/index.tsx
@@ -135,7 +135,7 @@ export default function AmountInput({ max, input, balance }: Props) {
           prefix={`~${currencySymbolMap[input.fiatCurrency]}`}
           renderText={(value: string) => (
             <ConvertedFiatP data-testid="usd-text" typography="body_s" color="white_400">
-              {value} {input.fiatCurrency}
+              {value || '--'} {input.fiatCurrency}
             </ConvertedFiatP>
           )}
         />
diff --git a/src/app/screens/swap/index.tsx b/src/app/screens/swap/index.tsx
index 8cecbfc77..fcabb2f45 100644
--- a/src/app/screens/swap/index.tsx
+++ b/src/app/screens/swap/index.tsx
@@ -302,7 +302,7 @@ export default function SwapScreen() {
     }
 
     if (!fromToken?.tokenFiatRate || !fromToken.decimals) {
-      return '0.00';
+      return '--';
     }
 
     const rate = new BigNumber(fromToken.tokenFiatRate);
diff --git a/src/app/screens/swap/mixpanel.ts b/src/app/screens/swap/mixpanel.ts
index 700b74203..7928c6a21 100644
--- a/src/app/screens/swap/mixpanel.ts
+++ b/src/app/screens/swap/mixpanel.ts
@@ -71,7 +71,9 @@ function trackSwapMixPanel(
             new BigNumber(stxBtcRate),
             new BigNumber(btcUsdRate),
           ).toFixed(2)
-        : new BigNumber(fromToken?.tokenFiatRate ?? 0).multipliedBy(amount).toFixed(2);
+        : fromToken?.tokenFiatRate
+        ? new BigNumber(fromToken?.tokenFiatRate).multipliedBy(amount).toFixed(2)
+        : '--';
 
     receiveAmount = quote?.receiveAmount ? new BigNumber(quote?.receiveAmount) : undefined;
     if (receiveAmount) {
@@ -82,7 +84,9 @@ function trackSwapMixPanel(
               new BigNumber(stxBtcRate),
               new BigNumber(btcUsdRate),
             ).toFixed(2)
-          : new BigNumber(toTokenInfo?.tokenFiatRate ?? 0).multipliedBy(receiveAmount).toFixed(2);
+          : toTokenInfo?.tokenFiatRate
+          ? new BigNumber(toTokenInfo?.tokenFiatRate).multipliedBy(receiveAmount).toFixed(2)
+          : '--';
     }
   }
 
diff --git a/src/app/screens/swap/quoteSummary/index.tsx b/src/app/screens/swap/quoteSummary/index.tsx
index 5f44daa39..a291d7d55 100644
--- a/src/app/screens/swap/quoteSummary/index.tsx
+++ b/src/app/screens/swap/quoteSummary/index.tsx
@@ -338,7 +338,9 @@ export default function QuoteSummary({
         new BigNumber(btcFiatRate),
       ).toFixed(2);
     }
-    return new BigNumber(fromToken?.tokenFiatRate ?? 0).multipliedBy(amount).toFixed(2);
+    return fromToken?.tokenFiatRate
+      ? new BigNumber(fromToken?.tokenFiatRate).multipliedBy(amount).toFixed(2)
+      : '--';
   })();
 
   const toTokenFiatValue = (() => {
@@ -361,9 +363,10 @@ export default function QuoteSummary({
         new BigNumber(btcFiatRate),
       ).toFixed(2);
     }
-    return new BigNumber(toTokenInfo?.tokenFiatRate ?? 0)
-      .multipliedBy(quote.receiveAmount)
-      .toFixed(2);
+    if (!toTokenInfo?.tokenFiatRate) {
+      return '--';
+    }
+    return new BigNumber(toTokenInfo?.tokenFiatRate).multipliedBy(quote.receiveAmount).toFixed(2);
   })();
 
   const showBadQuoteWarning =
diff --git a/src/app/screens/swap/quotesModal/index.tsx b/src/app/screens/swap/quotesModal/index.tsx
index ac6073a09..9e7d56497 100644
--- a/src/app/screens/swap/quotesModal/index.tsx
+++ b/src/app/screens/swap/quotesModal/index.tsx
@@ -1,3 +1,4 @@
+import useGetSip10TokenInfo from '@hooks/queries/stx/useGetSip10TokenInfo';
 import useCoinRates from '@hooks/queries/useCoinRates';
 import {
   getBtcFiatEquivalent,
@@ -101,6 +102,8 @@ function QuotesModal({
     BigNumber(b.floorRate).gte(a.floorRate) ? -1 : BigNumber(a.floorRate).gte(b.floorRate) ? 1 : 0,
   );
 
+  const { tokenInfo: toTokenInfo } = useGetSip10TokenInfo(toToken?.ticker);
+
   return (
     <Sheet visible={visible} title={t('GET_QUOTES_TITLE')} onClose={onClose}>
       <Container>
@@ -155,7 +158,11 @@ function QuotesModal({
                     new BigNumber(stxBtcRate),
                     new BigNumber(btcFiatRate),
                   ).toFixed(2)
-                : ''
+                : toTokenInfo?.tokenFiatRate
+                ? new BigNumber(toTokenInfo?.tokenFiatRate)
+                    .multipliedBy(stx.receiveAmount)
+                    .toFixed(2)
+                : '--'
             }
           />
         ))}
diff --git a/src/app/screens/swap/quotesModal/quoteTile.tsx b/src/app/screens/swap/quotesModal/quoteTile.tsx
index fd3280650..5b7445f66 100644
--- a/src/app/screens/swap/quotesModal/quoteTile.tsx
+++ b/src/app/screens/swap/quotesModal/quoteTile.tsx
@@ -114,11 +114,10 @@ function QuoteTile({
               value={fiatValue}
               displayType="text"
               thousandSeparator
-              suffix={` ${fiatCurrency}`}
               prefix="~ $"
               renderText={(value: string) => (
                 <StyledP data-testid="usd-text" typography="body_s" color="white_200">
-                  {value}
+                  {value || '--'} {fiatCurrency}
                 </StyledP>
               )}
             />

From 747392e76cba0a1cb489bd3938cd533c67809a52 Mon Sep 17 00:00:00 2001
From: Den <36603049+dhriaznov@users.noreply.github.com>
Date: Wed, 4 Sep 2024 14:40:52 +0200
Subject: [PATCH 079/227] [ENG-4532] feat: Carousel banner to highlight
 multiple web3 partners & activities (#556)

Co-authored-by: Terence Ng <ngtere@live.com.sg>
---
 .../components/explore/FeaturedCarousel.tsx   |  11 +-
 .../components/explore/SwiperNavigation.tsx   |   9 +-
 src/app/hooks/useNotificationBanners.ts       |  18 +--
 src/app/screens/home/banner.tsx               |  27 +---
 src/app/screens/home/bannerCarousel.tsx       | 142 ++++++++++++++++++
 src/app/screens/home/index.styled.ts          |   2 +-
 src/app/screens/home/index.tsx                |  20 +--
 7 files changed, 172 insertions(+), 57 deletions(-)
 create mode 100644 src/app/screens/home/bannerCarousel.tsx

diff --git a/src/app/components/explore/FeaturedCarousel.tsx b/src/app/components/explore/FeaturedCarousel.tsx
index a8b311dd5..5779afc67 100644
--- a/src/app/components/explore/FeaturedCarousel.tsx
+++ b/src/app/components/explore/FeaturedCarousel.tsx
@@ -13,7 +13,6 @@ const CarouselContainer = styled.div`
     padding-bottom: 35px;
   }
 
-  // So silly that they don't have a native API for this
   .swiper-slide {
     width: fit-content !important;
   }
@@ -24,11 +23,17 @@ const CarouselContainer = styled.div`
   }
 
   .swiper-pagination-bullet {
-    background: ${(props) => props.theme.colors.white_800};
+    width: 6px;
+    height: 6px;
+    background: ${(props) => props.theme.colors.white_600};
+    opacity: 1;
+    border-radius: 50px;
+    transition: width 0.2s ease, background 0.1s ease;
   }
 
   .swiper-pagination-bullet-active {
-    background: ${(props) => props.theme.colors.white_200};
+    width: 18px;
+    background: ${(props) => props.theme.colors.white_0};
   }
 `;
 
diff --git a/src/app/components/explore/SwiperNavigation.tsx b/src/app/components/explore/SwiperNavigation.tsx
index 366d2864c..a4c0dac1e 100644
--- a/src/app/components/explore/SwiperNavigation.tsx
+++ b/src/app/components/explore/SwiperNavigation.tsx
@@ -8,6 +8,9 @@ const Container = styled.div`
 
 const Button = styled.button`
   background-color: transparent;
+  width: 18px;
+  height: 18px;
+  margin: 6px;
 
   svg {
     color: ${({ theme }) => theme.colors.white_0};
@@ -21,13 +24,11 @@ const Button = styled.button`
   }
 
   &:disabled {
+    cursor: default;
     svg {
-      color: ${({ theme }) => theme.colors.white_400};
+      color: ${({ theme }) => theme.colors.white_600};
     }
   }
-  width: 18px;
-  height: 18px;
-  margin: 6px;
 `;
 
 function SwiperNavigation() {
diff --git a/src/app/hooks/useNotificationBanners.ts b/src/app/hooks/useNotificationBanners.ts
index a689408d7..e64ead68f 100644
--- a/src/app/hooks/useNotificationBanners.ts
+++ b/src/app/hooks/useNotificationBanners.ts
@@ -1,22 +1,9 @@
 import { getXverseApiClient } from '@secretkeylabs/xverse-core';
 import { useQuery } from '@tanstack/react-query';
-import { useEffect, useState } from 'react';
 import useWalletSelector from './useWalletSelector';
-import useWalletSession from './useWalletSession';
 
 function useNotificationBanners() {
   const { network } = useWalletSelector();
-  const { getSessionStartTime } = useWalletSession();
-  const [sessionStartTime, setSessionStartTime] = useState<number | undefined>(undefined);
-
-  const fetchSessionStartTime = async () => {
-    const time = await getSessionStartTime();
-    setSessionStartTime(time);
-  };
-
-  useEffect(() => {
-    fetchSessionStartTime();
-  }, []);
 
   const fetchNotificationBanners = async () => {
     const response = await getXverseApiClient(network.type).getNotificationBanners();
@@ -24,8 +11,8 @@ function useNotificationBanners() {
     return response;
   };
 
-  const { data, isLoading, refetch } = useQuery({
-    queryKey: ['notificationBanners', sessionStartTime],
+  const { data, isLoading, isFetching, refetch } = useQuery({
+    queryKey: ['notificationBanners'],
     queryFn: fetchNotificationBanners,
     staleTime: 60 * 60 * 1000, // 1 hour
   });
@@ -33,6 +20,7 @@ function useNotificationBanners() {
   return {
     data,
     isLoading,
+    isFetching,
     refetch,
   };
 }
diff --git a/src/app/screens/home/banner.tsx b/src/app/screens/home/banner.tsx
index 71c5426bc..f2217ae67 100644
--- a/src/app/screens/home/banner.tsx
+++ b/src/app/screens/home/banner.tsx
@@ -1,25 +1,18 @@
-import { XCircle } from '@phosphor-icons/react';
 import { AnalyticsEvents, type NotificationBanner } from '@secretkeylabs/xverse-core';
-import { setNotificationBannersAction } from '@stores/wallet/actions/actionCreators';
-import { CrossButton } from '@ui-library/sheet';
 import { trackMixPanel } from '@utils/mixpanel';
-import { useDispatch } from 'react-redux';
 import styled from 'styled-components';
-import Theme from 'theme';
 
 const Container = styled.div`
   position: relative;
   width: 100%;
   color: ${({ theme }) => theme.colors.white_0};
-  padding-top: ${({ theme }) => theme.space.xxs};
-  padding-bottom: ${({ theme }) => theme.space.m};
 `;
 
 const BannerContent = styled.button`
   cursor: pointer;
   display: flex;
   align-items: center;
-  column-gap: ${({ theme }) => theme.space.m};
+  column-gap: ${({ theme }) => theme.space.s};
   padding-left: ${({ theme }) => theme.space.m};
   padding-right: ${({ theme }) => theme.space.m};
   color: ${({ theme }) => theme.colors.white_0};
@@ -55,25 +48,9 @@ const BannerText = styled.div`
   overflow: hidden;
 `;
 
-const StyledCrossButton = styled(CrossButton)`
-  z-index: 1;
-  position: absolute;
-  top: -${(props) => props.theme.space.xs};
-  right: -${(props) => props.theme.space.xxs};
-`;
-
-function Banner({ id, name, url, icon, description }: NotificationBanner) {
-  const dispatch = useDispatch();
-
-  const dismissBanner = () => {
-    dispatch(setNotificationBannersAction({ id, isDismissed: true }));
-  };
-
+function Banner({ name, url, icon, description }: NotificationBanner) {
   return (
     <Container>
-      <StyledCrossButton onClick={dismissBanner}>
-        <XCircle size={24} weight="fill" color={Theme.colors.white_200} />
-      </StyledCrossButton>
       <BannerContent
         onClick={() => {
           trackMixPanel(
diff --git a/src/app/screens/home/bannerCarousel.tsx b/src/app/screens/home/bannerCarousel.tsx
new file mode 100644
index 000000000..9d584bb0a
--- /dev/null
+++ b/src/app/screens/home/bannerCarousel.tsx
@@ -0,0 +1,142 @@
+import { CaretLeft, CaretRight, XCircle } from '@phosphor-icons/react';
+import type { NotificationBanner } from '@secretkeylabs/xverse-core';
+import { setNotificationBannersAction } from '@stores/wallet/actions/actionCreators';
+import { CrossButton } from '@ui-library/sheet';
+import { useState } from 'react';
+import { useDispatch } from 'react-redux';
+import styled from 'styled-components';
+import 'swiper/css';
+import 'swiper/css/pagination';
+import { Navigation, Pagination } from 'swiper/modules';
+import { Swiper, SwiperSlide } from 'swiper/react';
+import Theme from 'theme';
+import Banner from './banner';
+
+const CarouselContainer = styled.div`
+  position: relative;
+  margin-top: ${({ theme }) => theme.space.xxs};
+  margin-bottom: ${({ theme }) => theme.space.m};
+
+  .swiper {
+    padding: 0;
+  }
+
+  .swiper-pagination {
+    position: absolute;
+    bottom: 0px;
+  }
+
+  .swiper-pagination-bullet {
+    width: 6px;
+    height: 6px;
+    background: ${(props) => props.theme.colors.white_600};
+    opacity: 1;
+    border-radius: 50px;
+    transition: width 0.2s ease, background 0.1s ease;
+  }
+
+  .swiper-pagination-bullet-active {
+    width: 18px;
+    background: ${(props) => props.theme.colors.white_0};
+  }
+`;
+
+const Button = styled.button`
+  position: absolute;
+  top: 50%;
+  transform: translateY(-50%);
+  background-color: transparent;
+  width: 18px;
+  height: 18px;
+  z-index: 1;
+
+  svg {
+    color: ${({ theme }) => theme.colors.white_0};
+    transition: color 0.1s ease;
+  }
+
+  &:hover {
+    svg {
+      color: ${({ theme }) => theme.colors.white_200};
+    }
+  }
+
+  &:disabled {
+    cursor: default;
+    svg {
+      color: ${({ theme }) => theme.colors.white_600};
+    }
+  }
+
+  &.swiper-button-next {
+    right: -6px;
+  }
+
+  &.swiper-button-prev {
+    left: -8px;
+  }
+`;
+
+const PaginationContainer = styled.div`
+  margin-bottom: -40px;
+  z-index: 1;
+`;
+
+const StyledCrossButton = styled(CrossButton)`
+  z-index: 1;
+  position: absolute;
+  top: -14px;
+  right: -6px;
+`;
+
+type Props = {
+  items: NotificationBanner[];
+};
+
+function BannerCarousel({ items }: Props) {
+  const [activeIndex, setActiveIndex] = useState(0);
+  const dispatch = useDispatch();
+
+  const dismissBanner = () => {
+    dispatch(setNotificationBannersAction({ id: items[activeIndex].id, isDismissed: true }));
+  };
+
+  return (
+    <CarouselContainer>
+      <StyledCrossButton onClick={dismissBanner}>
+        <XCircle size={24} weight="fill" color={Theme.colors.white_200} />
+      </StyledCrossButton>
+      <Swiper
+        slidesPerView="auto"
+        spaceBetween={16}
+        pagination={{ clickable: true, el: '.swiper-pagination' }}
+        modules={[Pagination, Navigation]}
+        navigation={{ nextEl: '.swiper-button-next', prevEl: '.swiper-button-prev' }}
+        onSlideChange={(swiper) => {
+          setActiveIndex(swiper.activeIndex);
+        }}
+        allowTouchMove
+        autoHeight
+      >
+        {items.map((item) => (
+          <SwiperSlide data-testid="app-slide" key={item.id}>
+            <Banner {...item} />
+          </SwiperSlide>
+        ))}
+      </Swiper>
+      {items.length > 1 && (
+        <>
+          <Button className="swiper-button-prev">
+            <CaretLeft size={18} />
+          </Button>
+          <Button className="swiper-button-next">
+            <CaretRight size={18} />
+          </Button>
+        </>
+      )}
+      <PaginationContainer className="swiper-pagination" />
+    </CarouselContainer>
+  );
+}
+
+export default BannerCarousel;
diff --git a/src/app/screens/home/index.styled.ts b/src/app/screens/home/index.styled.ts
index be06d44bb..b2f4fbb47 100644
--- a/src/app/screens/home/index.styled.ts
+++ b/src/app/screens/home/index.styled.ts
@@ -2,7 +2,7 @@ import TokenTile from '@components/tokenTile';
 import Divider from '@ui-library/divider';
 import styled from 'styled-components';
 
-export const Container = styled.div<{ $applyIndent?: boolean }>`
+export const Container = styled.div`
   display: flex;
   flex-direction: column;
   flex: 1;
diff --git a/src/app/screens/home/index.tsx b/src/app/screens/home/index.tsx
index 4657f92c1..114479b67 100644
--- a/src/app/screens/home/index.tsx
+++ b/src/app/screens/home/index.tsx
@@ -50,7 +50,7 @@ import { useNavigate } from 'react-router-dom';
 import { useTheme } from 'styled-components';
 import SquareButton from '../../components/squareButton';
 import BalanceCard from './balanceCard';
-import Banner from './banner';
+import BannerCarousel from './bannerCarousel';
 import {
   ButtonImage,
   ButtonText,
@@ -109,7 +109,8 @@ function Home() {
   const { isInitialLoading: loadingStxWalletData, isRefetching: refetchingStxWalletData } =
     useStxWalletData();
   const { btcFiatRate, stxBtcRate } = useCoinRates();
-  const { data: notificationBannersArr } = useNotificationBanners();
+  const { data: notificationBannersArr, isFetching: isFetchingNotificationBannersArr } =
+    useNotificationBanners();
   const {
     unfilteredData: fullSip10CoinsList,
     visible: sip10CoinsList,
@@ -182,10 +183,11 @@ function Home() {
     .concat(runesCoinsList)
     .sort((a, b) => sortFtByFiatBalance(a, b, stxBtcRate, btcFiatRate));
 
-  const showNotificationBanner =
-    notificationBannersArr?.length &&
-    notificationBannersArr.length > 0 &&
-    !notificationBanners[notificationBannersArr[0].id];
+  const filteredNotificationBannersArr = notificationBannersArr
+    ? notificationBannersArr.filter((banner) => !notificationBanners[banner.id])
+    : [];
+  const showBannerCarousel =
+    !isFetchingNotificationBannersArr && !!filteredNotificationBannersArr?.length;
 
   const onReceiveModalOpen = () => {
     setOpenReceiveModal(true);
@@ -422,7 +424,7 @@ function Home() {
       {isOrdinalReceiveAlertVisible && (
         <ShowOrdinalReceiveAlert onOrdinalReceiveAlertClose={onOrdinalReceiveAlertClose} />
       )}
-      <Container $applyIndent={!showNotificationBanner}>
+      <Container>
         <BalanceCard
           isLoading={loadingStxWalletData || loadingBtcWalletData}
           isRefetching={
@@ -452,11 +454,11 @@ function Home() {
           />
         </RowButtonContainer>
 
-        {showNotificationBanner ? (
+        {showBannerCarousel ? (
           <>
             <br />
             <StyledDivider color="white_850" verticalMargin="m" />
-            <Banner {...notificationBannersArr[0]} />
+            <BannerCarousel items={filteredNotificationBannersArr} />
             <StyledDivider color="white_850" verticalMargin="xxs" />
           </>
         ) : (

From a95a26a688c126766e69f28a6c305ee59a7a3aae Mon Sep 17 00:00:00 2001
From: jordankzf <jordan@secretkeylabs.com>
Date: Thu, 5 Sep 2024 15:00:00 +0800
Subject: [PATCH 080/227] Don't show fiatCurrency if there is no fiat value

---
 src/app/screens/swap/components/amountInput/index.tsx | 3 ++-
 src/app/screens/swap/quotesModal/quoteTile.tsx        | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/app/screens/swap/components/amountInput/index.tsx b/src/app/screens/swap/components/amountInput/index.tsx
index 5766bf04c..0126fb80e 100644
--- a/src/app/screens/swap/components/amountInput/index.tsx
+++ b/src/app/screens/swap/components/amountInput/index.tsx
@@ -133,9 +133,10 @@ export default function AmountInput({ max, input, balance }: Props) {
           displayType="text"
           thousandSeparator
           prefix={`~${currencySymbolMap[input.fiatCurrency]}`}
+          suffix={input.fiatCurrency}
           renderText={(value: string) => (
             <ConvertedFiatP data-testid="usd-text" typography="body_s" color="white_400">
-              {value || '--'} {input.fiatCurrency}
+              {value || '--'}
             </ConvertedFiatP>
           )}
         />
diff --git a/src/app/screens/swap/quotesModal/quoteTile.tsx b/src/app/screens/swap/quotesModal/quoteTile.tsx
index 5b7445f66..2291578cd 100644
--- a/src/app/screens/swap/quotesModal/quoteTile.tsx
+++ b/src/app/screens/swap/quotesModal/quoteTile.tsx
@@ -115,9 +115,10 @@ function QuoteTile({
               displayType="text"
               thousandSeparator
               prefix="~ $"
+              suffix={fiatCurrency}
               renderText={(value: string) => (
                 <StyledP data-testid="usd-text" typography="body_s" color="white_200">
-                  {value || '--'} {fiatCurrency}
+                  {value || '--'}
                 </StyledP>
               )}
             />

From 97a1e1652dc32ae7059b5514b5d9501166be04be Mon Sep 17 00:00:00 2001
From: jordankzf <jordan@secretkeylabs.com>
Date: Fri, 6 Sep 2024 16:59:56 +0800
Subject: [PATCH 081/227] Unified Provider Sorting

---
 src/app/screens/swap/quoteSummary/index.tsx   |   4 +-
 src/app/screens/swap/quotesModal/index.tsx    | 120 ++++++++++--------
 .../screens/swap/quotesModal/quoteTile.tsx    |  11 +-
 3 files changed, 79 insertions(+), 56 deletions(-)

diff --git a/src/app/screens/swap/quoteSummary/index.tsx b/src/app/screens/swap/quoteSummary/index.tsx
index 1fdc543e4..e0dd19687 100644
--- a/src/app/screens/swap/quoteSummary/index.tsx
+++ b/src/app/screens/swap/quoteSummary/index.tsx
@@ -436,7 +436,7 @@ export default function QuoteSummary({
                   ? fromToken?.assetName
                   : fromToken?.name
               }
-              subtitleColor="white_400"
+              subtitleColorOverride="white_400"
               unit={fromUnit}
               fiatValue={fromTokenFiatValue}
             />
@@ -463,7 +463,7 @@ export default function QuoteSummary({
                     : undefined,
               }}
               subtitle={toToken?.protocol === 'btc' ? 'Bitcoin' : toToken?.name}
-              subtitleColor="white_400"
+              subtitleColorOverride="white_400"
               unit={toUnit}
               fiatValue={toTokenFiatValue}
             />
diff --git a/src/app/screens/swap/quotesModal/index.tsx b/src/app/screens/swap/quotesModal/index.tsx
index ec256e0f5..07ce4ed8b 100644
--- a/src/app/screens/swap/quotesModal/index.tsx
+++ b/src/app/screens/swap/quotesModal/index.tsx
@@ -1,4 +1,3 @@
-import { microStxToStx } from '@components/postCondition/postConditionView/helper';
 import useCoinRates from '@hooks/queries/useCoinRates';
 import {
   getBtcFiatEquivalent,
@@ -15,7 +14,6 @@ import Sheet from '@ui-library/sheet';
 import BigNumber from 'bignumber.js';
 import { useTranslation } from 'react-i18next';
 import styled from 'styled-components';
-import type { Color } from 'theme';
 import QuoteTile from './quoteTile';
 
 interface Props {
@@ -29,10 +27,10 @@ interface Props {
   utxoProviderClicked?: (utxoProvider: UtxoQuote) => void;
 }
 
-const Container = styled.div((props) => ({
-  display: 'flex',
-  flexDirection: 'column',
-}));
+const Container = styled.div`
+  display: flex;
+  flex-direction: column;
+`;
 
 const Heading = styled(StyledP)`
   margin-top: ${(props) => props.theme.space.l};
@@ -68,20 +66,61 @@ function QuotesModal({
 
   const { btcFiatRate, stxBtcRate } = useCoinRates();
 
-  const numberOfUtxoProviders = utxoProviders.length;
-  const lowestUtxoQuoteFloorRate = Math.min(
-    ...utxoProviders.map((provider) => Number(provider.floorRate)),
+  const sortQuotesByReceiveAmount = <T extends StxQuote | Quote>(quotes: T[]): T[] =>
+    [...quotes].sort((a, b) =>
+      BigNumber(b.receiveAmount).gte(a.receiveAmount)
+        ? 1
+        : BigNumber(a.receiveAmount).gte(b.receiveAmount)
+        ? -1
+        : 0,
+    );
+
+  const sortedAmmQuotes = sortQuotesByReceiveAmount<Quote>(ammProviders);
+  const sortedStxQuotes = sortQuotesByReceiveAmount<StxQuote>(stxProviders);
+  const sortedUtxoQuotes = [...utxoProviders].sort((a, b) =>
+    BigNumber(b.floorRate).gte(a.floorRate) ? -1 : BigNumber(a.floorRate).gte(b.floorRate) ? 1 : 0,
   );
 
-  const getSubtitle = (provider: UtxoQuote): string => {
-    if (numberOfUtxoProviders === 1) {
+  const getReceiveAmountSubtitle = (
+    quote: StxQuote | Quote,
+    quotes: (StxQuote | Quote)[],
+  ): string => {
+    const highestReceiveAmount = BigNumber.max(
+      ...quotes.map((q) => new BigNumber(q.receiveAmount)),
+    );
+
+    if (quote.provider.code === 'dotswap') {
+      return t('RECOMMENDED');
+    }
+
+    if (new BigNumber(quote.receiveAmount).eq(highestReceiveAmount)) {
+      return t('BEST');
+    }
+
+    const difference = highestReceiveAmount.minus(quote.receiveAmount);
+    const percentageDifference = difference.div(highestReceiveAmount).times(100);
+
+    if (percentageDifference.gt(0)) {
+      return `+${percentageDifference.toFixed(2)}%`;
+    }
+
+    return `-${percentageDifference.abs().toFixed(2)}%`;
+  };
+
+  const getFloorPriceSubtitle = (quote: UtxoQuote, quotes: UtxoQuote[]): string => {
+    if (quotes.length === 1) {
       return '';
     }
-    if (Number(provider.floorRate) === lowestUtxoQuoteFloorRate) {
+
+    const lowestUtxoQuoteFloorRate = Math.min(
+      ...utxoProviders.map((provider) => Number(provider.floorRate)),
+    );
+
+    if (Number(quote.floorRate) === lowestUtxoQuoteFloorRate) {
       return t('BEST');
     }
     const difference = lowestUtxoQuoteFloorRate
-      ? Number(provider.floorRate) - lowestUtxoQuoteFloorRate
+      ? Number(quote.floorRate) - lowestUtxoQuoteFloorRate
       : 0;
     const percentageDifference = (difference / lowestUtxoQuoteFloorRate) * 100;
     if (percentageDifference > 0) {
@@ -90,18 +129,6 @@ function QuotesModal({
     return `-${Math.abs(percentageDifference).toFixed(2)}%`;
   };
 
-  const ammQuotes = [...ammProviders].sort((a, b) =>
-    BigNumber(b.receiveAmount).gte(a.receiveAmount)
-      ? 1
-      : BigNumber(a.receiveAmount).gte(b.receiveAmount)
-      ? -1
-      : 0,
-  );
-
-  const utxoQuotes = [...utxoProviders].sort((a, b) =>
-    BigNumber(b.floorRate).gte(a.floorRate) ? -1 : BigNumber(a.floorRate).gte(b.floorRate) ? 1 : 0,
-  );
-
   return (
     <Sheet visible={visible} title={t('GET_QUOTES_TITLE')} onClose={onClose}>
       <Container>
@@ -114,15 +141,14 @@ function QuotesModal({
               {t('EXCHANGE')}
             </Heading>
           ))}
-        {ammProviders.map((amm) => (
+        {sortedAmmQuotes.map((amm) => (
           <QuoteTile
             key={amm.provider.name}
             provider={amm.provider.name}
             price={amm.receiveAmount}
             image={{ ft: { image: amm.provider.logo } as FungibleToken }}
             onClick={() => ammProviderClicked && ammProviderClicked(amm)}
-            subtitle={t('RECOMMENDED')}
-            subtitleColor="success_light"
+            subtitle={getReceiveAmountSubtitle(amm, ammProviders)}
             unit={amm.to.protocol === 'btc' ? 'Sats' : toToken?.symbol || ''}
             fiatValue={
               amm.to.protocol === 'btc'
@@ -139,15 +165,14 @@ function QuotesModal({
             {t('MARKETPLACE')}
           </SecondHeading>
         )}
-        {stxProviders.map((stx) => (
+        {sortedStxQuotes.map((stx) => (
           <QuoteTile
             key={stx.provider.name}
             provider={stx.provider.name}
             price={stx.receiveAmount}
             image={{ ft: { image: stx.provider.logo } as FungibleToken }}
             onClick={() => ammProviderClicked && ammProviderClicked(stx)}
-            subtitle={t('RECOMMENDED')}
-            subtitleColor="success_light"
+            subtitle={getReceiveAmountSubtitle(stx, stxProviders)}
             unit={stx.to.protocol === 'stx' ? 'STX' : toToken?.name || ''}
             fiatValue={
               stx.to.protocol === 'stx'
@@ -160,27 +185,18 @@ function QuotesModal({
             }
           />
         ))}
-        {utxoQuotes.map((utxoProvider) => {
-          const subTitle = getSubtitle(utxoProvider);
-          let subTitleColour: Color = 'success_light';
-
-          if (subTitle.startsWith('+')) {
-            subTitleColour = 'danger_light';
-          }
-          return (
-            <QuoteTile
-              key={utxoProvider.provider.name}
-              provider={utxoProvider.provider.name}
-              price={utxoProvider.floorRate}
-              image={{ ft: { image: utxoProvider.provider.logo } as FungibleToken }}
-              floorText={t('FLOOR_PRICE')}
-              onClick={() => utxoProviderClicked && utxoProviderClicked(utxoProvider)}
-              subtitle={subTitle}
-              subtitleColor={subTitleColour}
-              unit={toToken?.symbol ? `Sats / ${toToken.symbol}` : ''}
-            />
-          );
-        })}
+        {sortedUtxoQuotes.map((utxoProvider) => (
+          <QuoteTile
+            key={utxoProvider.provider.name}
+            provider={utxoProvider.provider.name}
+            price={utxoProvider.floorRate}
+            image={{ ft: { image: utxoProvider.provider.logo } as FungibleToken }}
+            floorText={t('FLOOR_PRICE')}
+            onClick={() => utxoProviderClicked && utxoProviderClicked(utxoProvider)}
+            subtitle={getFloorPriceSubtitle(utxoProvider, utxoProviders)}
+            unit={toToken?.symbol ? `Sats / ${toToken.symbol}` : ''}
+          />
+        ))}
       </Container>
     </Sheet>
   );
diff --git a/src/app/screens/swap/quotesModal/quoteTile.tsx b/src/app/screens/swap/quotesModal/quoteTile.tsx
index fd3280650..531f7c98b 100644
--- a/src/app/screens/swap/quotesModal/quoteTile.tsx
+++ b/src/app/screens/swap/quotesModal/quoteTile.tsx
@@ -60,7 +60,7 @@ interface Props {
     ft?: FungibleToken;
   };
   subtitle?: string;
-  subtitleColor?: Color;
+  subtitleColorOverride?: Color;
   fiatValue?: string;
   floorText?: string;
   onClick?: () => void;
@@ -72,7 +72,7 @@ function QuoteTile({
   price,
   image,
   subtitle,
-  subtitleColor,
+  subtitleColorOverride,
   fiatValue,
   floorText,
   onClick,
@@ -81,6 +81,13 @@ function QuoteTile({
   const theme = useTheme();
   const { fiatCurrency } = useWalletSelector();
 
+  const getSubtitleColor = (): Color | undefined => {
+    if (!subtitle) return undefined;
+    return subtitle.startsWith('+') ? 'danger_light' : 'success_light';
+  };
+
+  const subtitleColor = subtitleColorOverride ?? getSubtitleColor();
+
   return (
     <Container data-testid="swap-place-button" onClick={onClick} clickable={Boolean(onClick)}>
       <TokenImage currency={image.currency} fungibleToken={image.ft} size={32} />

From 590ba41456ec805042254771e4bf155da399c297 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Eduard=20Bardaj=C3=AD=20Puig?= <ebardaji@gmail.com>
Date: Fri, 6 Sep 2024 11:39:21 +0200
Subject: [PATCH 082/227] Add missing return (#566)

---
 src/common/utils/rpc/btc/getAddresses/getAddresses.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/common/utils/rpc/btc/getAddresses/getAddresses.ts b/src/common/utils/rpc/btc/getAddresses/getAddresses.ts
index 95df6e2f1..7483c78a6 100644
--- a/src/common/utils/rpc/btc/getAddresses/getAddresses.ts
+++ b/src/common/utils/rpc/btc/getAddresses/getAddresses.ts
@@ -42,6 +42,7 @@ export const handleGetAddresses = async (message: RpcRequestMessage, port: chrom
         messageId: parseResult.output.id,
       }),
     });
+    return;
   }
 
   const {

From 76305a5e3251cb277c375d50ec2d1a34b3fabdb4 Mon Sep 17 00:00:00 2001
From: Tim Man <tim@secretkeylabs.com>
Date: Fri, 6 Sep 2024 18:18:02 +0800
Subject: [PATCH 083/227] [ENG-4958][ENG-5105] core update - adjust threshold
 for ordinals split send & 5byte brc20 fix (#560)

* chore: bump core version to update split send threshold

* chore: bump to core 19.1.0

includes split send threshold change
and brc20 5 byte ticker fix
---
 package-lock.json | 15 +++++++--------
 package.json      |  2 +-
 2 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 125fb24d8..3bcf90680 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -15,7 +15,7 @@
         "@react-spring/web": "^9.6.1",
         "@sats-connect/core": "0.2.1",
         "@scure/btc-signer": "1.2.1",
-        "@secretkeylabs/xverse-core": "19.0.0",
+        "@secretkeylabs/xverse-core": "19.1.0",
         "@stacks/connect": "7.4.1",
         "@stacks/stacks-blockchain-api-types": "6.1.1",
         "@stacks/transactions": "6.16.1",
@@ -1277,10 +1277,9 @@
       }
     },
     "node_modules/@secretkeylabs/xverse-core": {
-      "version": "19.0.0",
-      "resolved": "https://npm.pkg.github.com/download/@secretkeylabs/xverse-core/19.0.0/7b2d47d225739051b88873932cd373fa5672b647",
-      "integrity": "sha512-3TBd/JeH0PCvqmPKsFJee8XwvBTAUWkrqNgkA3jUCmj1lpdBn6Uw6MTAsTdMBIiOvT8A4PdNf44BrPplTgHZdw==",
-      "license": "ISC",
+      "version": "19.1.0",
+      "resolved": "https://npm.pkg.github.com/download/@secretkeylabs/xverse-core/19.1.0/fe6b53e68ea3d66c7fd1bbf8e791f865299811d8",
+      "integrity": "sha512-ssrdJAb9jpl1mGCfbS4K6S22sKLBXzK5LbYMiNBU8anyps4A79u/c7qkHUDMgDY4pWcuSMs8iS4mcpyshPFiQQ==",
       "dependencies": {
         "@bitcoinerlab/secp256k1": "^1.0.2",
         "@noble/curves": "^1.2.0",
@@ -13686,9 +13685,9 @@
       }
     },
     "@secretkeylabs/xverse-core": {
-      "version": "19.0.0",
-      "resolved": "https://npm.pkg.github.com/download/@secretkeylabs/xverse-core/19.0.0/7b2d47d225739051b88873932cd373fa5672b647",
-      "integrity": "sha512-3TBd/JeH0PCvqmPKsFJee8XwvBTAUWkrqNgkA3jUCmj1lpdBn6Uw6MTAsTdMBIiOvT8A4PdNf44BrPplTgHZdw==",
+      "version": "19.1.0",
+      "resolved": "https://npm.pkg.github.com/download/@secretkeylabs/xverse-core/19.1.0/fe6b53e68ea3d66c7fd1bbf8e791f865299811d8",
+      "integrity": "sha512-ssrdJAb9jpl1mGCfbS4K6S22sKLBXzK5LbYMiNBU8anyps4A79u/c7qkHUDMgDY4pWcuSMs8iS4mcpyshPFiQQ==",
       "requires": {
         "@bitcoinerlab/secp256k1": "^1.0.2",
         "@noble/curves": "^1.2.0",
diff --git a/package.json b/package.json
index 346376016..a5b76e4c1 100644
--- a/package.json
+++ b/package.json
@@ -43,7 +43,7 @@
     "@react-spring/web": "^9.6.1",
     "@sats-connect/core": "0.2.1",
     "@scure/btc-signer": "1.2.1",
-    "@secretkeylabs/xverse-core": "19.0.0",
+    "@secretkeylabs/xverse-core": "19.1.0",
     "@stacks/connect": "7.4.1",
     "@stacks/stacks-blockchain-api-types": "6.1.1",
     "@stacks/transactions": "6.16.1",

From 960980441b0a26cc2f1486c2a28ca66068bdd83c Mon Sep 17 00:00:00 2001
From: Terence Ng <ngtere@live.com.sg>
Date: Sat, 7 Sep 2024 14:46:33 +0800
Subject: [PATCH 084/227] track rune bundles (#551)

* initial commit

* add satribute icon

* fix sizing

* commit ui redesign

* commit final logic work

* fix up navigations

* code review updates

* update e2e

* remove duplicate await

* fix up spacing and margins

* add role

* add default export

* add accessibility

* seperate into component

* fix up e2e

* fix e2e

---------

Co-authored-by: Den <36603049+dhriaznov@users.noreply.github.com>
---
 .../confirmBtcTransaction/itemRow/amount.tsx  |  56 +++---
 .../amountWithInscriptionSatribute.tsx        |   1 +
 .../itemRow/runeAmount.tsx                    |  14 +-
 .../confirmBtcTransaction/sendSection.tsx     |  25 ++-
 .../queries/runes/useRuneFloorPriceQuery.ts   |   1 -
 .../runes/useRuneFungibleTokensQuery.ts       |   1 -
 .../hooks/queries/runes/useRuneUtxosQuery.ts  |  11 +-
 src/app/screens/coinDashboard/index.tsx       | 166 +++++++++++-------
 .../screens/coinDashboard/runes/bundleRow.tsx | 151 ++++++++++++++++
 .../screens/rareSatsBundle/bundleContent.tsx  |  41 +++++
 .../screens/rareSatsBundle/index.styled.ts    |  16 +-
 src/app/screens/rareSatsBundle/index.tsx      | 132 +++++++-------
 .../rareSatsBundle/rareSatsBundleGridItem.tsx |  12 +-
 src/app/screens/rareSatsBundle/runeAmount.tsx | 108 ++++++++++++
 src/app/screens/sendOrdinal/index.tsx         |   3 +-
 src/locales/en.json                           |   7 +-
 tests/pages/wallet.ts                         |  12 +-
 tests/specs/createWallet.spec.ts              |   2 +-
 tests/specs/managementToken.spec.ts           |   4 +-
 tests/specs/tabCollectiblesRareSats.spec.ts   |   2 +-
 tests/specs/transactionHistory.spec.ts        |  12 +-
 tests/specs/transactionSTX.spec.ts            |   2 +-
 22 files changed, 570 insertions(+), 209 deletions(-)
 create mode 100644 src/app/screens/coinDashboard/runes/bundleRow.tsx
 create mode 100644 src/app/screens/rareSatsBundle/bundleContent.tsx
 create mode 100644 src/app/screens/rareSatsBundle/runeAmount.tsx

diff --git a/src/app/components/confirmBtcTransaction/itemRow/amount.tsx b/src/app/components/confirmBtcTransaction/itemRow/amount.tsx
index 469417188..932ab340c 100644
--- a/src/app/components/confirmBtcTransaction/itemRow/amount.tsx
+++ b/src/app/components/confirmBtcTransaction/itemRow/amount.tsx
@@ -9,20 +9,14 @@ import { useTranslation } from 'react-i18next';
 import { NumericFormat } from 'react-number-format';
 import styled from 'styled-components';
 
-const RowCenter = styled.div<{ spaceBetween?: boolean }>((props) => ({
+const Container = styled.div<{ spaceBetween?: boolean }>((props) => ({
+  width: '100%',
   display: 'flex',
-  flex: 1,
   flexDirection: 'row',
   alignItems: 'center',
-  justifyContent: props.spaceBetween ? 'space-between' : 'initial',
-  columnGap: props.theme.space.m,
   marginBottom: props.theme.space.s,
 }));
 
-const NumberTypeContainer = styled.div`
-  text-align: right;
-`;
-
 const StyledFiatAmountText = styled(FiatAmountText)`
   display: block;
   ${(props) => props.theme.typography.body_medium_s}
@@ -30,8 +24,24 @@ const StyledFiatAmountText = styled(FiatAmountText)`
   margin-top: ${(props) => props.theme.space.xxxs};
 `;
 
-const StyledBtcTitle = styled(StyledP)`
-  margin-top: ${(props) => props.theme.space.xxxs};
+const Column = styled.div`
+  width: 100%;
+  display: flex;
+  flex-direction: column;
+  gap: 2px;
+  overflow: hidden;
+`;
+
+const Row = styled.div`
+  width: 100%;
+  display: flex;
+  flex-direction: row;
+  justify-content: space-between;
+  gap: 24px;
+`;
+
+const AvatarContainer = styled.div`
+  margin-right: ${(props) => props.theme.space.m};
 `;
 
 type Props = {
@@ -46,18 +56,15 @@ export default function Amount({ amount }: Props) {
   if (!amount) return null;
 
   return (
-    <RowCenter>
-      <TokenImage currency="BTC" loading={false} size={32} />
-      <RowCenter spaceBetween>
-        <div>
+    <Container>
+      <AvatarContainer>
+        <TokenImage currency="BTC" loading={false} size={32} />
+      </AvatarContainer>
+      <Column>
+        <Row>
           <StyledP typography="body_medium_m" color="white_0">
             {t('CONFIRM_TRANSACTION.AMOUNT')}
           </StyledP>
-          <StyledBtcTitle typography="body_medium_s" color="white_400">
-            Bitcoin
-          </StyledBtcTitle>
-        </div>
-        <NumberTypeContainer>
           <NumericFormat
             value={satsToBtc(new BigNumber(amount)).toFixed()}
             displayType="text"
@@ -69,13 +76,18 @@ export default function Amount({ amount }: Props) {
               </StyledP>
             )}
           />
+        </Row>
+        <Row>
+          <StyledP typography="body_medium_s" color="white_400">
+            Bitcoin
+          </StyledP>
           <StyledFiatAmountText
             fiatAmount={getBtcFiatEquivalent(BigNumber(amount), BigNumber(btcFiatRate))}
             fiatCurrency={fiatCurrency}
             dataTestId="confirm-currency-amount"
           />
-        </NumberTypeContainer>
-      </RowCenter>
-    </RowCenter>
+        </Row>
+      </Column>
+    </Container>
   );
 }
diff --git a/src/app/components/confirmBtcTransaction/itemRow/amountWithInscriptionSatribute.tsx b/src/app/components/confirmBtcTransaction/itemRow/amountWithInscriptionSatribute.tsx
index 37710a65e..48738f870 100644
--- a/src/app/components/confirmBtcTransaction/itemRow/amountWithInscriptionSatribute.tsx
+++ b/src/app/components/confirmBtcTransaction/itemRow/amountWithInscriptionSatribute.tsx
@@ -17,6 +17,7 @@ const WarningContainer = styled.div`
   display: flex;
   flex-direction: column;
   border-radius: ${(props) => props.theme.space.s};
+  margin-bottom: ${(props) => props.theme.space.s};
 `;
 
 const WarningButton = styled.button`
diff --git a/src/app/components/confirmBtcTransaction/itemRow/runeAmount.tsx b/src/app/components/confirmBtcTransaction/itemRow/runeAmount.tsx
index 979f1849b..b00a0b802 100644
--- a/src/app/components/confirmBtcTransaction/itemRow/runeAmount.tsx
+++ b/src/app/components/confirmBtcTransaction/itemRow/runeAmount.tsx
@@ -17,7 +17,6 @@ const Container = styled.div<{ topMargin?: boolean }>((props) => ({
   flexDirection: 'row',
   alignItems: 'center',
   marginBottom: props.theme.space.s,
-  marginTop: props.topMargin ? props.theme.space.s : 0,
 }));
 
 const AvatarContainer = styled.div`
@@ -43,21 +42,16 @@ const Column = styled.div`
 type Props = {
   rune: RuneBase;
   hasSufficientBalance?: boolean;
-  topMargin?: boolean;
 };
 
-export default function RuneAmount({
-  rune,
-  hasSufficientBalance = true,
-  topMargin = false,
-}: Props) {
+export default function RuneAmount({ rune, hasSufficientBalance = true }: Props) {
   const { t } = useTranslation('translation', { keyPrefix: 'CONFIRM_TRANSACTION' });
   const { runeName, amount, divisibility, symbol } = rune;
   const amountWithDecimals = ftDecimals(String(amount), divisibility);
   const { fiatCurrency } = useWalletSelector();
   const { data: runeFiatRate } = useRuneFiatRateQuery(rune);
   return (
-    <Container topMargin={topMargin}>
+    <Container>
       <AvatarContainer>
         <TokenImage
           currency="FT"
@@ -94,9 +88,7 @@ export default function RuneAmount({
           </StyledP>
           {runeFiatRate !== undefined && runeFiatRate > 0 && (
             <RightAlignedStyledFiatAmountText
-              fiatAmount={
-                new BigNumber(BigNumber(amountWithDecimals).multipliedBy(runeFiatRate).toFixed(2))
-              }
+              fiatAmount={BigNumber(amountWithDecimals).multipliedBy(runeFiatRate)}
               fiatCurrency={fiatCurrency}
             />
           )}
diff --git a/src/app/components/confirmBtcTransaction/sendSection.tsx b/src/app/components/confirmBtcTransaction/sendSection.tsx
index e84e28733..833352000 100644
--- a/src/app/components/confirmBtcTransaction/sendSection.tsx
+++ b/src/app/components/confirmBtcTransaction/sendSection.tsx
@@ -26,9 +26,9 @@ const Container = styled.div((props) => ({
   marginBottom: props.theme.space.s,
 }));
 
-const RowContainer = styled.div<{ noPadding?: boolean; noMargin?: boolean }>((props) => ({
-  padding: props.noPadding ? 0 : `0 ${props.theme.space.m}`,
-  marginBottom: props.noMargin ? 0 : props.theme.space.m,
+const RowContainer = styled.div((props) => ({
+  padding: `0 ${props.theme.space.m}`,
+  marginBottom: props.theme.space.s,
 }));
 
 const BundleHeader = styled.div((props) => ({
@@ -57,7 +57,7 @@ function SendSection({
       <Title>{t('CONFIRM_TRANSACTION.YOU_WILL_SEND')}</Title>
       {Object.entries(bundledOutputs).map(([address, bundle], index) => (
         <Container key={address}>
-          <RowContainer key={address} noMargin>
+          <RowContainer>
             <BundleHeader>
               <StyledP typography="body_medium_m" color="white_400">
                 {t('COMMON.TO')}
@@ -66,20 +66,17 @@ function SendSection({
                 {getTruncatedAddress(address, 6)}
               </StyledP>
             </BundleHeader>
-            <RowContainer noPadding>
-              <Amount amount={bundle.netBtcAmount} />
-              <AmountWithInscriptionSatribute
-                inscriptions={inscriptionsFromPayment}
-                satributes={satributesFromPayment}
-                onShowInscription={onShowInscription}
-              />
-            </RowContainer>
-            {bundle.runeTransfers.map((runeTransfer, i) => (
+            <Amount amount={bundle.netBtcAmount} />
+            <AmountWithInscriptionSatribute
+              inscriptions={inscriptionsFromPayment}
+              satributes={satributesFromPayment}
+              onShowInscription={onShowInscription}
+            />
+            {bundle.runeTransfers.map((runeTransfer) => (
               <RuneAmount
                 // eslint-disable-next-line react/no-array-index-key
                 key={index}
                 rune={runeTransfer}
-                topMargin={i === 0 && bundle.netBtcAmount > 0}
                 hasSufficientBalance={runeTransfer.hasSufficientBalance}
               />
             ))}
diff --git a/src/app/hooks/queries/runes/useRuneFloorPriceQuery.ts b/src/app/hooks/queries/runes/useRuneFloorPriceQuery.ts
index 39525660d..cec5195b2 100644
--- a/src/app/hooks/queries/runes/useRuneFloorPriceQuery.ts
+++ b/src/app/hooks/queries/runes/useRuneFloorPriceQuery.ts
@@ -5,7 +5,6 @@ import { useCallback } from 'react';
 
 export default function useRuneFloorPriceQuery(runeName: string, backgroundRefetch = true) {
   const { network } = useWalletSelector();
-
   const runesApi = useRunesApi();
   const queryFn = useCallback(
     async () =>
diff --git a/src/app/hooks/queries/runes/useRuneFungibleTokensQuery.ts b/src/app/hooks/queries/runes/useRuneFungibleTokensQuery.ts
index b220ae91b..e9526fe33 100644
--- a/src/app/hooks/queries/runes/useRuneFungibleTokensQuery.ts
+++ b/src/app/hooks/queries/runes/useRuneFungibleTokensQuery.ts
@@ -44,7 +44,6 @@ export const useRuneFungibleTokensQuery = (backgroundRefetch = true) => {
     refetchOnReconnect: backgroundRefetch,
     queryFn,
   });
-
   return {
     ...query,
     unfilteredData: query.data,
diff --git a/src/app/hooks/queries/runes/useRuneUtxosQuery.ts b/src/app/hooks/queries/runes/useRuneUtxosQuery.ts
index ba18c7b7c..847993edd 100644
--- a/src/app/hooks/queries/runes/useRuneUtxosQuery.ts
+++ b/src/app/hooks/queries/runes/useRuneUtxosQuery.ts
@@ -10,12 +10,12 @@ export default function useRuneUtxosQuery(
   backgroundRefetch = true,
 ) {
   const { network } = useWalletSelector();
-  const { ordinalsAddress } = useSelectedAccount();
-  if (network.type !== 'Mainnet') {
-    throw new Error('Only available on Mainnet');
-  }
   const runesApi = useRunesApi();
+  const { ordinalsAddress } = useSelectedAccount();
   const queryFn = useCallback(async () => {
+    if (network.type !== 'Mainnet') {
+      return [];
+    }
     const res = await runesApi.getRunesUtxos({ address: ordinalsAddress, rune: runeName });
     const sortedRes = res.sort((a, b) => {
       const amountA = Number(a.runes?.[0][1].amount);
@@ -28,7 +28,8 @@ export default function useRuneUtxosQuery(
     if (filter === 'listed') {
       return sortedRes.filter((item) => item.listing[0] !== null);
     }
-  }, [runesApi, ordinalsAddress, filter, runeName]);
+    return sortedRes;
+  }, [network.type, runesApi, ordinalsAddress, runeName, filter]);
   return useQuery({
     refetchOnWindowFocus: backgroundRefetch,
     refetchOnReconnect: backgroundRefetch,
diff --git a/src/app/screens/coinDashboard/index.tsx b/src/app/screens/coinDashboard/index.tsx
index 35d8a17b9..56e89c919 100644
--- a/src/app/screens/coinDashboard/index.tsx
+++ b/src/app/screens/coinDashboard/index.tsx
@@ -5,13 +5,15 @@ import BottomBar from '@components/tabBar';
 import TopRow from '@components/topRow';
 import { useVisibleBrc20FungibleTokens } from '@hooks/queries/ordinals/useGetBrc20FungibleTokens';
 import { useVisibleRuneFungibleTokens } from '@hooks/queries/runes/useRuneFungibleTokensQuery';
+import useRuneUtxosQuery from '@hooks/queries/runes/useRuneUtxosQuery';
 import { useVisibleSip10FungibleTokens } from '@hooks/queries/stx/useGetSip10FungibleTokens';
-import useBtcWalletData from '@hooks/queries/useBtcWalletData';
 import useSpamTokens from '@hooks/queries/useSpamTokens';
 import { broadcastResetUserFlow, useResetUserFlow } from '@hooks/useResetUserFlow';
 import useTrackMixPanelPageViewed from '@hooks/useTrackMixPanelPageViewed';
 import { Flag } from '@phosphor-icons/react';
+import RuneBundleRow from '@screens/coinDashboard/runes/bundleRow';
 import type { FungibleToken } from '@secretkeylabs/xverse-core';
+import { mapRareSatsAPIResponseToBundle } from '@secretkeylabs/xverse-core';
 import {
   setBrc20ManageTokensAction,
   setRunesManageTokensAction,
@@ -20,7 +22,9 @@ import {
 } from '@stores/wallet/actions/actionCreators';
 import { StyledP } from '@ui-library/common.styled';
 import { SPAM_OPTIONS_WIDTH, type CurrencyTypes } from '@utils/constants';
-import { getExplorerUrl } from '@utils/helper';
+import { ftDecimals, getExplorerUrl, getTruncatedAddress } from '@utils/helper';
+import { getFullTxId, getTxIdFromFullTxId, getVoutFromFullTxId } from '@utils/runes';
+import BigNumber from 'bignumber.js';
 import { useState } from 'react';
 import { useTranslation } from 'react-i18next';
 import { useDispatch } from 'react-redux';
@@ -33,7 +37,7 @@ import TransactionsHistoryList from './transactionsHistoryList';
 const Container = styled.div((props) => ({
   display: 'flex',
   flex: 1,
-  marginTop: props.theme.spacing(4),
+  marginTop: props.theme.space.xs,
   flexDirection: 'column',
   overflowY: 'auto',
   '&::-webkit-scrollbar': {
@@ -41,12 +45,13 @@ const Container = styled.div((props) => ({
   },
 }));
 
-const TokenContractContainer = styled.div((props) => ({
+const SecondaryContainer = styled.div((props) => ({
   display: 'flex',
   flexDirection: 'column',
-  paddingLeft: props.theme.spacing(8),
-  paddingRight: props.theme.spacing(8),
-  marginTop: props.theme.spacing(16),
+  paddingLeft: props.theme.space.m,
+  paddingRight: props.theme.space.m,
+  marginTop: props.theme.space.xl,
+  marginBottom: props.theme.space.xl,
   h1: {
     ...props.theme.typography.body_medium_m,
     color: props.theme.colors.white_400,
@@ -55,7 +60,7 @@ const TokenContractContainer = styled.div((props) => ({
 
 const ContractAddressCopyButton = styled.button((props) => ({
   display: 'flex',
-  marginTop: props.theme.spacing(2),
+  marginTop: props.theme.space.xxs,
   background: 'transparent',
 }));
 
@@ -71,10 +76,9 @@ const FtInfoContainer = styled.div((props) => ({
   display: 'flex',
   flexDirection: 'row',
   borderTop: `1px solid ${props.theme.colors.elevation2}`,
-  paddingTop: props.theme.spacing(12),
-  marginTop: props.theme.spacing(16),
-  paddingLeft: props.theme.spacing(8),
-  paddingRight: props.theme.spacing(14),
+  paddingTop: props.theme.space.l,
+  marginTop: props.theme.space.xl,
+  paddingLeft: props.theme.space.m,
 }));
 
 const ShareIcon = styled.img({
@@ -83,22 +87,22 @@ const ShareIcon = styled.img({
 });
 
 const CopyButtonContainer = styled.div((props) => ({
-  marginRight: props.theme.spacing(2),
+  marginRight: props.theme.space.xxs,
 }));
 
 const ContractDeploymentButton = styled.button((props) => ({
   ...props.theme.typography.body_m,
   display: 'flex',
   alignItems: 'center',
-  marginTop: props.theme.spacing(12),
+  marginTop: props.theme.space.l,
   background: 'none',
   color: props.theme.colors.white_400,
   span: {
     color: props.theme.colors.white_0,
-    marginLeft: props.theme.spacing(3),
+    marginLeft: props.theme.space.xs,
   },
   img: {
-    marginLeft: props.theme.spacing(3),
+    marginLeft: props.theme.space.xs,
   },
 }));
 
@@ -111,9 +115,9 @@ const Button = styled.button<{
   justifyContent: 'center',
   alignItems: 'center',
   height: 31,
-  paddingLeft: props.theme.spacing(6),
-  paddingRight: props.theme.spacing(6),
-  marginRight: props.theme.spacing(2),
+  paddingLeft: props.theme.space.s,
+  paddingRight: props.theme.space.s,
+  marginRight: props.theme.space.xxs,
   borderRadius: 44,
   background: props.isSelected ? props.theme.colors.elevation2 : 'transparent',
   color: props.theme.colors.white_0,
@@ -142,14 +146,23 @@ const TokenText = styled(StyledP)`
   margin-left: ${(props) => props.theme.space.m};
 `;
 
+const RuneBundlesContainer = styled.div`
+  display: flex;
+  flex-direction: column;
+  gap: ${(props) => props.theme.space.s};
+`;
+
 export default function CoinDashboard() {
+  const [searchParams] = useSearchParams();
+  const ftKey = searchParams.get('ftKey') ?? '';
+  const protocol = searchParams.get('protocol') ?? '';
   const { t } = useTranslation('translation', { keyPrefix: 'COIN_DASHBOARD_SCREEN' });
-  const [showFtContractDetails, setShowFtContractDetails] = useState(false);
+  const fromSecondaryTab = searchParams.get('secondaryTab') === 'true' ? 'secondary' : 'primary';
+  const [currentTab, setCurrentTab] = useState<'primary' | 'secondary'>(fromSecondaryTab);
   const [showOptionsDialog, setShowOptionsDialog] = useState(false);
   const [optionsDialogIndents, setOptionsDialogIndents] = useState<
     { top: string; left: string } | undefined
   >();
-  const [searchParams] = useSearchParams();
   const { addToSpamTokens } = useSpamTokens();
   const dispatch = useDispatch();
   const { currency } = useParams();
@@ -157,8 +170,6 @@ export default function CoinDashboard() {
   const { visible: sip10CoinsList } = useVisibleSip10FungibleTokens();
   const { visible: brc20CoinsList } = useVisibleBrc20FungibleTokens();
 
-  const ftKey = searchParams.get('ftKey');
-  const protocol = searchParams.get('protocol');
   let selectedFt: FungibleToken | undefined;
 
   if (ftKey && protocol) {
@@ -176,9 +187,16 @@ export default function CoinDashboard() {
         selectedFt = undefined;
     }
   }
+  const { data: runeUtxos } = useRuneUtxosQuery(
+    selectedFt?.protocol === 'runes' ? selectedFt?.name : '',
+  );
+
+  const showTxHistory = currentTab === 'primary';
+  const displayTabs = ['stacks', 'runes'].includes(protocol);
+  const showStxContract = currentTab === 'secondary' && selectedFt && protocol === 'stacks';
+  const showRuneBundles = currentTab === 'secondary' && selectedFt && protocol === 'runes';
 
   useResetUserFlow('/coinDashboard');
-  useBtcWalletData();
 
   const handleGoBack = () => broadcastResetUserFlow();
 
@@ -192,29 +210,13 @@ export default function CoinDashboard() {
 
   const openOptionsDialog = (event: React.MouseEvent<HTMLButtonElement>) => {
     setShowOptionsDialog(true);
-
     setOptionsDialogIndents({
       top: `${(event.target as HTMLElement).parentElement?.getBoundingClientRect().top}px`,
       left: `calc(100% - ${SPAM_OPTIONS_WIDTH}px)`,
     });
   };
 
-  const closeOptionsDialog = () => {
-    setShowOptionsDialog(false);
-  };
-
-  const openContractDeployment = () =>
-    window.open(getExplorerUrl(selectedFt?.principal as string), '_blank');
-
-  const onContractClick = () => setShowFtContractDetails(true);
-
-  const handleCopyContractAddress = () =>
-    navigator.clipboard.writeText(selectedFt?.principal as string);
-
-  const onTransactionsClick = () => setShowFtContractDetails(false);
-
-  const formatAddress = (addr: string): string =>
-    addr ? `${addr.substring(0, 20)}...${addr.substring(addr.length - 20, addr.length)}` : '';
+  const closeOptionsDialog = () => setShowOptionsDialog(false);
 
   return (
     <>
@@ -262,55 +264,83 @@ export default function CoinDashboard() {
       )}
       <Container>
         <CoinHeader currency={currency as CurrencyTypes} fungibleToken={selectedFt} />
-        {protocol === 'stacks' && (
+        {displayTabs && (
           <FtInfoContainer>
             <Button
-              disabled={!showFtContractDetails}
-              isSelected={!showFtContractDetails}
-              onClick={onTransactionsClick}
+              disabled={currentTab === 'primary'}
+              isSelected={currentTab === 'primary'}
+              onClick={() => setCurrentTab('primary')}
             >
               {t('TRANSACTIONS')}
             </Button>
             <Button
-              data-testid="coin-contract-button"
-              disabled={showFtContractDetails}
-              onClick={onContractClick}
-              isSelected={showFtContractDetails}
+              data-testid="coin-secondary-button"
+              disabled={currentTab === 'secondary'}
+              isSelected={currentTab === 'secondary'}
+              onClick={() => setCurrentTab('secondary')}
             >
-              {t('CONTRACT')}
+              {protocol === 'stacks' && t('CONTRACT')}
+              {protocol === 'runes' && t('BUNDLES')}
             </Button>
           </FtInfoContainer>
         )}
-        {selectedFt && protocol === 'stacks' && showFtContractDetails && (
-          <TokenContractContainer data-testid="coin-contract-container">
+        {showTxHistory && (
+          <TransactionsHistoryList
+            coin={currency as CurrencyTypes}
+            stxTxFilter={
+              selectedFt?.protocol === 'runes'
+                ? selectedFt?.name
+                : `${selectedFt?.principal}::${selectedFt?.assetName}`
+            }
+            brc20Token={protocol === 'brc-20' ? selectedFt?.principal || null : null}
+            runeToken={protocol === 'runes' ? selectedFt?.name || null : null}
+            runeSymbol={protocol === 'runes' ? selectedFt?.runeSymbol || null : null}
+          />
+        )}
+        {showStxContract && (
+          <SecondaryContainer data-testid="coin-secondary-container">
             <h1>{t('FT_CONTRACT_PREFIX')}</h1>
-            <ContractAddressCopyButton onClick={handleCopyContractAddress}>
+            <ContractAddressCopyButton
+              onClick={() => navigator.clipboard.writeText(selectedFt?.principal as string)}
+            >
               <TokenContractAddress data-testid="coin-contract-address">
-                {formatAddress(selectedFt?.principal as string)}
+                {getTruncatedAddress(selectedFt?.principal as string, 20)}
               </TokenContractAddress>
               <CopyButtonContainer>
                 <CopyButton text={selectedFt?.principal as string} />
               </CopyButtonContainer>
             </ContractAddressCopyButton>
-            <ContractDeploymentButton onClick={openContractDeployment}>
+            <ContractDeploymentButton
+              onClick={() => window.open(getExplorerUrl(selectedFt?.principal as string), '_blank')}
+            >
               {t('OPEN_FT_CONTRACT_DEPLOYMENT')}
               <span>{t('STACKS_EXPLORER')}</span>
               <ShareIcon src={linkIcon} alt="link" />
             </ContractDeploymentButton>
-          </TokenContractContainer>
+          </SecondaryContainer>
         )}
-        {!showFtContractDetails && (
-          <TransactionsHistoryList
-            coin={currency as CurrencyTypes}
-            stxTxFilter={
-              selectedFt?.protocol === 'runes'
-                ? selectedFt?.name
-                : `${selectedFt?.principal}::${selectedFt?.assetName}`
-            }
-            brc20Token={protocol === 'brc-20' ? selectedFt?.principal || null : null}
-            runeToken={protocol === 'runes' ? selectedFt?.name || null : null}
-            runeSymbol={protocol === 'runes' ? selectedFt?.runeSymbol || null : null}
-          />
+        {showRuneBundles && (
+          <SecondaryContainer data-testid="coin-secondary-container">
+            <RuneBundlesContainer>
+              {runeUtxos?.map((utxo) => {
+                const fullTxId = getFullTxId(utxo);
+                const runeAmount = utxo.runes?.filter((rune) => rune[0] === selectedFt?.name)[0][1]
+                  .amount;
+                return (
+                  <RuneBundleRow
+                    key={fullTxId}
+                    txId={getTxIdFromFullTxId(fullTxId)}
+                    vout={getVoutFromFullTxId(fullTxId)}
+                    runeAmount={String(ftDecimals(runeAmount ?? 0, selectedFt?.decimals ?? 0))}
+                    runeId={selectedFt?.principal ?? ''}
+                    runeSymbol={selectedFt?.runeSymbol ?? ''}
+                    satAmount={BigNumber(utxo.value).toNumber()}
+                    bundle={mapRareSatsAPIResponseToBundle(utxo)}
+                  />
+                );
+              })}
+            </RuneBundlesContainer>
+          </SecondaryContainer>
         )}
       </Container>
       <BottomBar tab="dashboard" />
diff --git a/src/app/screens/coinDashboard/runes/bundleRow.tsx b/src/app/screens/coinDashboard/runes/bundleRow.tsx
new file mode 100644
index 000000000..6caa33587
--- /dev/null
+++ b/src/app/screens/coinDashboard/runes/bundleRow.tsx
@@ -0,0 +1,151 @@
+import RareSatIcon from '@components/rareSatIcon/rareSatIcon';
+import useSatBundleDataReducer from '@hooks/stores/useSatBundleReducer';
+import type { Bundle } from '@secretkeylabs/xverse-core';
+import { StyledP } from '@ui-library/common.styled';
+import { getTruncatedAddress } from '@utils/helper';
+import { useTranslation } from 'react-i18next';
+import { NumericFormat } from 'react-number-format';
+import { useNavigate } from 'react-router-dom';
+import styled from 'styled-components';
+
+const Container = styled.div`
+  display: flex;
+  align-items: center;
+  flex-direction: row;
+  justify-content: space-between;
+  flex: 1;
+  padding: ${(props) => props.theme.space.s};
+  padding-left ${(props) => props.theme.space.m};
+  border-radius: ${(props) => props.theme.space.xs};
+  border: 1px solid 'transparent';
+  background-color: ${(props) => props.theme.colors.elevation1};
+  gap: ${(props) => props.theme.space.s}; 
+  :hover {
+      cursor: pointer;
+  },
+`;
+
+const InfoContainer = styled.div`
+  display: flex;
+  flex: 1;
+  flex-direction: column;
+  gap: ${(props) => props.theme.space.xxxs};
+`;
+
+const SubContainer = styled.div`
+  display: flex;
+  flex: 1;
+  flex-direction: row;
+  justify-content: space-between;
+`;
+
+const RuneTitle = styled(StyledP)`
+  overflow: hidden;
+  text-overflow: ellipsis;
+  width: 100%;
+  text-align: left;
+`;
+
+const StyledBundleSub = styled(StyledP)`
+  width: 100%;
+  text-align: left;
+`;
+
+const SizeInfoContainer = styled.div`
+  display: flex;
+  align-items: center;
+  column-gap: ${(props) => props.theme.space.xxs};
+`;
+
+const RangeContainer = styled.div``;
+
+const Range = styled.div`
+  display: flex;
+  border-radius: 6px;
+  border: 1px solid ${(props) => props.theme.colors.white_800};
+  padding: 1px;
+  flex-wrap: wrap;
+  flex-direction: row;
+  align-items: center;
+`;
+
+type Props = {
+  runeAmount: string;
+  runeSymbol: string;
+  runeId: string;
+  txId: string;
+  vout: string;
+  satAmount: number;
+  bundle: Bundle;
+};
+
+function RuneBundleRow({ runeAmount, runeSymbol, runeId, txId, vout, satAmount, bundle }: Props) {
+  const { t } = useTranslation('translation', { keyPrefix: 'COMMON' });
+  const navigate = useNavigate();
+  const satributesArr = bundle.satributes.flatMap((item) => item);
+  const { setSelectedSatBundleDetails } = useSatBundleDataReducer();
+
+  const handleOnClick = () => {
+    // exotics v1 wont show range details only bundle details
+    setSelectedSatBundleDetails(bundle);
+    navigate('/nft-dashboard/rare-sats-bundle', { state: { source: 'RuneBundlesTab', runeId } });
+  };
+
+  const onKeyDown = (event) => {
+    if (event.key === 'Enter') {
+      handleOnClick();
+    }
+  };
+
+  return (
+    <Container
+      role="button"
+      data-testid="rune-item"
+      tabIndex={0}
+      onKeyDown={onKeyDown}
+      onClick={handleOnClick}
+    >
+      <RangeContainer>
+        <Range>
+          {satributesArr.map((satribute) => (
+            <RareSatIcon key={satribute} type={satribute} size={28} />
+          ))}
+        </Range>
+      </RangeContainer>
+      <InfoContainer>
+        <NumericFormat
+          value={runeAmount}
+          displayType="text"
+          suffix={` ${runeSymbol}`}
+          thousandSeparator
+          renderText={(value: string) => (
+            <RuneTitle typography="body_medium_m" color="white_0">
+              {value}
+            </RuneTitle>
+          )}
+        />
+        <SubContainer>
+          <StyledP typography="body_medium_s" color="white_400">
+            {`${getTruncatedAddress(txId, 6)}:${vout}`}
+          </StyledP>
+          <SizeInfoContainer>
+            <NumericFormat
+              value={satAmount}
+              displayType="text"
+              prefix={`${t('SIZE')}: `}
+              suffix={` ${t('SATS')}`}
+              thousandSeparator
+              renderText={(value: string) => (
+                <StyledBundleSub typography="body_medium_s" color="white_400">
+                  {value}
+                </StyledBundleSub>
+              )}
+            />
+          </SizeInfoContainer>
+        </SubContainer>
+      </InfoContainer>
+    </Container>
+  );
+}
+
+export default RuneBundleRow;
diff --git a/src/app/screens/rareSatsBundle/bundleContent.tsx b/src/app/screens/rareSatsBundle/bundleContent.tsx
new file mode 100644
index 000000000..955050a45
--- /dev/null
+++ b/src/app/screens/rareSatsBundle/bundleContent.tsx
@@ -0,0 +1,41 @@
+import { useRuneFungibleTokensQuery } from '@hooks/queries/runes/useRuneFungibleTokensQuery';
+import { RuneAmountContainer } from '@screens/rareSatsBundle/index.styled';
+import RareSatsBundleGridItem from '@screens/rareSatsBundle/rareSatsBundleGridItem';
+import RuneAmount from '@screens/rareSatsBundle/runeAmount';
+import type { Bundle, BundleSatRange, FungibleToken } from '@secretkeylabs/xverse-core';
+
+export default function BundleContent({ bundle }: { bundle: Bundle }) {
+  const isGalleryOpen: boolean = document.documentElement.clientWidth > 360;
+  const { data: runesCoinsList } = useRuneFungibleTokensQuery();
+  return (
+    <>
+      {bundle?.satRanges.map((item: BundleSatRange) => (
+        <RareSatsBundleGridItem key={`${item.block}-${item.offset}`} item={item} />
+      ))}
+      {bundle?.runes?.map((runeUtxo) => {
+        const matchedRune: FungibleToken | undefined = (runesCoinsList ?? []).find(
+          (ft) => ft.name === runeUtxo[0],
+        );
+        if (matchedRune) {
+          return (
+            // eslint-disable-next-line react/jsx-key
+            <RuneAmountContainer isGalleryOpen={isGalleryOpen}>
+              <RuneAmount
+                hasSufficientBalance
+                rune={{
+                  runeName: matchedRune.name,
+                  runeId: matchedRune.principal,
+                  amount: BigInt(Number(runeUtxo[1].amount)),
+                  divisibility: matchedRune.decimals ?? 0,
+                  symbol: matchedRune.runeSymbol ?? '',
+                  inscriptionId: matchedRune.runeInscriptionId ?? '',
+                }}
+              />
+            </RuneAmountContainer>
+          );
+        }
+        return null;
+      })}
+    </>
+  );
+}
diff --git a/src/app/screens/rareSatsBundle/index.styled.ts b/src/app/screens/rareSatsBundle/index.styled.ts
index 46af82766..49bec85dc 100644
--- a/src/app/screens/rareSatsBundle/index.styled.ts
+++ b/src/app/screens/rareSatsBundle/index.styled.ts
@@ -7,10 +7,12 @@ interface DetailSectionProps {
 }
 
 /* layout */
-export const Container = styled.div`
+export const Container = styled.div<DetailSectionProps>`
   ...${(props) => props.theme.scrollbar};
   overflow-y: auto;
   padding-bottom: ${(props) => props.theme.space.l};
+  padding-left: ${(props) => (props.isGalleryOpen ? 0 : props.theme.space.m)};
+  padding-right: ${(props) => (props.isGalleryOpen ? 0 : props.theme.space.m)};
 `;
 
 export const PageHeader = styled.div<DetailSectionProps>`
@@ -32,7 +34,6 @@ export const PageHeaderContent = styled.div<DetailSectionProps>`
 
 export const AttributesContainer = styled.div<DetailSectionProps>((props) => ({
   maxWidth: props.isGalleryOpen ? '285px' : '100%',
-  padding: props.isGalleryOpen ? 0 : `0 ${props.theme.space.m}`,
 }));
 
 export const StyledSeparator = styled(Separator)`
@@ -48,7 +49,7 @@ export const StyledWebGalleryButton = styled(WebGalleryButton)`
 
 export const SendButtonContainer = styled.div<DetailSectionProps>`
   margin-top: ${(props) => props.theme.space.l};
-  width: ${(props) => (props.isGalleryOpen ? '222px' : '155px')};
+  width: ${(props) => (props.isGalleryOpen ? '222px' : '100%')};
 `;
 
 export const BundleRarityLinkContainer = styled.button`
@@ -112,11 +113,11 @@ export const NoCollectiblesText = styled.p((props) => ({
 export const Header = styled.div<{ isGalleryOpen: boolean }>((props) => ({
   display: props.isGalleryOpen ? 'block' : 'flex',
   flexDirection: props.isGalleryOpen ? 'row' : 'column',
-  alignItems: props.isGalleryOpen ? 'flex-start' : 'center',
+  alignItems: 'flex-start',
 }));
 
 export const SatRangeContainer = styled.div<DetailSectionProps>((props) => ({
-  marginTop: props.isGalleryOpen ? 0 : props.theme.space.xl,
+  marginTop: props.isGalleryOpen ? 0 : props.theme.space.s,
   maxWidth: '1224px',
   marginLeft: 'auto',
   marginRight: 'auto',
@@ -134,3 +135,8 @@ export const DetailSection = styled.div<DetailSectionProps>((props) => ({
 export const SeeRarityContainer = styled.div`
   padding: ${(props) => props.theme.space.l} ${(props) => props.theme.space.m};
 `;
+
+export const RuneAmountContainer = styled.div<{ isGalleryOpen?: boolean }>((props) => ({
+  padding: props.isGalleryOpen ? `0 ${props.theme.space.m}` : 0,
+  marginBottom: props.theme.space.s,
+}));
diff --git a/src/app/screens/rareSatsBundle/index.tsx b/src/app/screens/rareSatsBundle/index.tsx
index a5eb7bd36..39662d69b 100644
--- a/src/app/screens/rareSatsBundle/index.tsx
+++ b/src/app/screens/rareSatsBundle/index.tsx
@@ -10,7 +10,8 @@ import { useResetUserFlow } from '@hooks/useResetUserFlow';
 import useSelectedAccount from '@hooks/useSelectedAccount';
 import useWalletSelector from '@hooks/useWalletSelector';
 import { ArrowRight, ArrowUp } from '@phosphor-icons/react';
-import type { BundleSatRange } from '@secretkeylabs/xverse-core';
+import BundleContent from '@screens/rareSatsBundle/bundleContent';
+import type { Bundle } from '@secretkeylabs/xverse-core';
 import Button from '@ui-library/button';
 import { StyledHeading, StyledP } from '@ui-library/common.styled';
 import {
@@ -21,7 +22,7 @@ import {
 } from '@utils/helper';
 import { useMemo, useState } from 'react';
 import { useTranslation } from 'react-i18next';
-import { useLocation, useNavigate } from 'react-router-dom';
+import { useLocation, useNavigate, useSearchParams } from 'react-router-dom';
 import OrdinalAttributeComponent from '../ordinalDetail/ordinalAttributeComponent';
 import {
   AssetDetailButtonText,
@@ -42,14 +43,14 @@ import {
   StyledSeparator,
   StyledWebGalleryButton,
 } from './index.styled';
-import { RareSatsBundleGridItem } from './rareSatsBundleGridItem';
 
 function RareSatsBundle() {
   const { t } = useTranslation('translation');
   const navigate = useNavigate();
   const location = useLocation();
-  const { source } = location.state || {};
+  const { source, runeId } = location.state || {};
   const selectedAccount = useSelectedAccount();
+  const [searchParams] = useSearchParams();
   const { network } = useWalletSelector();
   const { selectedSatBundle: bundle } = useNftDataSelector();
   const { isPending, pendingTxHash } = usePendingOrdinalTxs(bundle?.txid);
@@ -57,42 +58,53 @@ function RareSatsBundle() {
   const { setSelectedSatBundleDetails } = useSatBundleDataReducer();
 
   const isGalleryOpen: boolean = useMemo(() => document.documentElement.clientWidth > 360, []);
+  const fromRunes = !!searchParams.get('fromRune') || source === 'RuneBundlesTab';
+  const fromOrdinals = source === 'OrdinalDetail';
+  const isEmpty = !bundle?.satRanges?.length;
 
   useResetUserFlow('/rare-sats-bundle');
 
   const handleBackButtonClick = () => {
-    if (source === 'OrdinalDetail') {
-      navigate(-1);
-    } else {
-      navigate('/nft-dashboard?tab=rareSats');
-    }
     setSelectedSatBundleDetails(null);
+    if (fromOrdinals) {
+      return navigate(-1);
+    }
+    if (fromRunes) {
+      return navigate(
+        `/coinDashboard/FT?ftKey=${
+          searchParams.get('fromRune') || runeId
+        }&protocol=runes&secondaryTab=true`,
+      );
+    }
+    return navigate('/nft-dashboard?tab=rareSats');
   };
 
   const openInGalleryView = async () => {
     await chrome.tabs.create({
-      url: chrome.runtime.getURL('options.html#/nft-dashboard/rare-sats-bundle'),
+      url: chrome.runtime.getURL(
+        `options.html#/nft-dashboard/rare-sats-bundle?fromRune=${
+          searchParams.get('fromRune') || runeId
+        }`,
+      ),
     });
   };
 
-  const onCloseAlert = () => {
-    setShowSendOrdinalsAlert(false);
-  };
+  const onCloseAlert = () => setShowSendOrdinalsAlert(false);
 
   const handleSendOrdinal = async () => {
     if (isPending) {
       return setShowSendOrdinalsAlert(true);
     }
-
-    const link = `/nft-dashboard/ordinal-detail/${bundle?.txid}/send-ordinal?isRareSat=true&vout=${bundle?.vout}`;
-
+    const hasRune = !!(searchParams.get('fromRune') || runeId);
+    const link = `/nft-dashboard/ordinal-detail/${bundle?.txid}/send-ordinal?isRareSat=true&vout=${
+      bundle?.vout
+    }${hasRune ? `&fromRune=${searchParams.get('fromRune') || runeId}` : ''}`;
     if (isLedgerAccount(selectedAccount) && !isInOptions()) {
       await chrome.tabs.create({
         url: chrome.runtime.getURL(`options.html#${link}`),
       });
       return;
     }
-
     navigate(link);
   };
 
@@ -102,45 +114,48 @@ function RareSatsBundle() {
     }
   };
 
-  const handleRarityScale = () => {
-    navigate('/nft-dashboard/supported-rarity-scale');
-  };
-
-  const goBackText =
-    location.state && location.state.source === 'OrdinalDetail'
-      ? t('SEND.MOVE_TO_ASSET_DETAIL')
-      : t('NFT_DETAIL_SCREEN.MOVE_TO_ASSET_DETAIL');
+  const handleRarityScale = () => navigate('/nft-dashboard/supported-rarity-scale');
 
-  const isEmpty = !bundle?.satRanges?.length;
+  const goBackText = () => {
+    if (fromOrdinals) {
+      return t('SEND.MOVE_TO_ASSET_DETAIL');
+    }
+    if (fromRunes) {
+      return t('NFT_DETAIL_SCREEN.BACK_TO_RUNES');
+    }
+    return t('NFT_DETAIL_SCREEN.MOVE_TO_ASSET_DETAIL');
+  };
 
   return (
     <>
       {isGalleryOpen ? (
         <AccountHeaderComponent disableMenuOption={isGalleryOpen} disableAccountSwitch />
       ) : (
-        <TopRow title={t('RARE_SATS.SATS_BUNDLE')} onClick={handleBackButtonClick} />
+        <TopRow onClick={handleBackButtonClick} />
       )}
-      <Container>
+      <Container isGalleryOpen={isGalleryOpen}>
         <PageHeader isGalleryOpen={isGalleryOpen}>
           {isGalleryOpen && (
             <BackButtonContainer>
               <BackButton data-testid="back-button" onClick={handleBackButtonClick}>
                 <>
                   <ButtonImage src={ArrowLeft} />
-                  <AssetDetailButtonText>{goBackText}</AssetDetailButtonText>
+                  <AssetDetailButtonText>{goBackText()}</AssetDetailButtonText>
                 </>
               </BackButton>
             </BackButtonContainer>
           )}
           <PageHeaderContent isGalleryOpen={isGalleryOpen}>
             <Header isGalleryOpen={isGalleryOpen}>
-              <StyledP typography="body_bold_m" color="white_400">
-                {t('NFT_DASHBOARD_SCREEN.RARE_SATS')}
-              </StyledP>
-              <StyledHeading typography="headline_m" color="white_0">
-                {bundle?.totalExoticSats}
+              <StyledHeading typography="headline_xs" color="white_0">
+                {t('NFT_DASHBOARD_SCREEN.BUNDLE')}
               </StyledHeading>
               {!isGalleryOpen && <StyledWebGalleryButton onClick={openInGalleryView} />}
+              <OrdinalAttributeComponent
+                title={t('NFT_DETAIL_SCREEN.RARE_SATS')}
+                value={bundle?.totalExoticSats.toString()}
+                isAddress
+              />
               <SendButtonContainer isGalleryOpen={isGalleryOpen}>
                 <Button
                   icon={<ArrowUp weight="bold" size="16" />}
@@ -157,14 +172,34 @@ function RareSatsBundle() {
                 </BundleRarityLinkContainer>
               )}
             </Header>
+            <AttributesContainer isGalleryOpen={isGalleryOpen}>
+              <DetailSection>
+                <OrdinalAttributeComponent
+                  title={t('NFT_DETAIL_SCREEN.OWNED_BY')}
+                  value={getTruncatedAddress(selectedAccount.ordinalsAddress, 6)}
+                  isAddress
+                />
+                <OrdinalAttributeComponent
+                  title={t('RARE_SATS.SATS_VALUE')}
+                  value={`${bundle?.value}`}
+                  suffix=" sats"
+                />
+              </DetailSection>
+              <OrdinalAttributeComponent
+                title={t('NFT_DETAIL_SCREEN.ID')}
+                value={bundle?.txid}
+                isAddress
+              />
+              {!isGalleryOpen && (
+                <OrdinalAttributeComponent title={t('NFT_DETAIL_SCREEN.CONTENT')} />
+              )}
+            </AttributesContainer>
             {isEmpty && (
               <NoCollectiblesText>{t('NFT_DASHBOARD_SCREEN.NO_COLLECTIBLES')}</NoCollectiblesText>
             )}
             {!isGalleryOpen && (
               <SatRangeContainer isGalleryOpen={isGalleryOpen}>
-                {bundle?.satRanges.map((item: BundleSatRange) => (
-                  <RareSatsBundleGridItem key={`${item.block}-${item.offset}`} item={item} />
-                ))}
+                <BundleContent bundle={bundle as Bundle} />
               </SatRangeContainer>
             )}
             {!isGalleryOpen && (
@@ -176,25 +211,6 @@ function RareSatsBundle() {
                 />
               </SeeRarityContainer>
             )}
-            <AttributesContainer isGalleryOpen={isGalleryOpen}>
-              <DetailSection>
-                <OrdinalAttributeComponent
-                  title={t('RARE_SATS.SATS_VALUE')}
-                  value={`${bundle?.value}`}
-                  suffix=" sats"
-                />
-                <OrdinalAttributeComponent
-                  title={t('NFT_DETAIL_SCREEN.OWNED_BY')}
-                  value={getTruncatedAddress(selectedAccount.ordinalsAddress, 6)}
-                  isAddress
-                />
-              </DetailSection>
-              <OrdinalAttributeComponent
-                title={t('NFT_DETAIL_SCREEN.ID')}
-                value={bundle?.txid}
-                isAddress
-              />
-            </AttributesContainer>
           </PageHeaderContent>
         </PageHeader>
         {isGalleryOpen && <StyledSeparator />}
@@ -203,9 +219,7 @@ function RareSatsBundle() {
         )}
         {isGalleryOpen && (
           <SatRangeContainer isGalleryOpen={isGalleryOpen}>
-            {bundle?.satRanges.map((item: BundleSatRange) => (
-              <RareSatsBundleGridItem key={`${item.block}-${item.offset}`} item={item} />
-            ))}
+            <BundleContent bundle={bundle as Bundle} />
           </SatRangeContainer>
         )}
         {showSendOrdinalsAlert && (
diff --git a/src/app/screens/rareSatsBundle/rareSatsBundleGridItem.tsx b/src/app/screens/rareSatsBundle/rareSatsBundleGridItem.tsx
index 8138de4d9..d02c0aedc 100644
--- a/src/app/screens/rareSatsBundle/rareSatsBundleGridItem.tsx
+++ b/src/app/screens/rareSatsBundle/rareSatsBundleGridItem.tsx
@@ -1,4 +1,3 @@
-/* eslint-disable import/prefer-default-export */
 import ExoticSatsRow from '@components/exoticSatsRow/exoticSatsRow';
 import RareSatIcon from '@components/rareSatIcon/rareSatIcon';
 import type { BundleSatRange } from '@secretkeylabs/xverse-core';
@@ -19,17 +18,18 @@ const Range = styled.div`
   flex-wrap: wrap;
 `;
 
-const Container = styled.div((props) => ({
+const Container = styled.div<{ isGalleryOpen?: boolean }>((props) => ({
   marginBottom: props.theme.space.s,
-  padding: `0 ${props.theme.space.m}`,
+  padding: props.isGalleryOpen ? `0 ${props.theme.space.m}` : 0,
 }));
 
-export function RareSatsBundleGridItem({ item }: { item: BundleSatRange }) {
+export default function RareSatsBundleGridItem({ item }: { item: BundleSatRange }) {
+  const isGalleryOpen: boolean = document.documentElement.clientWidth > 360;
   return (
-    <Container>
+    <Container isGalleryOpen={isGalleryOpen}>
       <ExoticSatsRow
         title={getSatLabel(item.satributes)}
-        satAmount={item.totalSats}
+        satAmount={Number(item.totalSats)}
         inscriptions={item.inscriptions}
         icons={
           <RangeContainer>
diff --git a/src/app/screens/rareSatsBundle/runeAmount.tsx b/src/app/screens/rareSatsBundle/runeAmount.tsx
new file mode 100644
index 000000000..2fc483e48
--- /dev/null
+++ b/src/app/screens/rareSatsBundle/runeAmount.tsx
@@ -0,0 +1,108 @@
+import { mapRuneBaseToFungibleToken } from '@components/confirmBtcTransaction/utils';
+import { RightAlignedStyledFiatAmountText } from '@components/fiatAmountText';
+import TokenImage from '@components/tokenImage';
+import useRuneFiatRateQuery from '@hooks/queries/runes/useRuneFiatRateQuery';
+import useWalletSelector from '@hooks/useWalletSelector';
+import type { RuneBase } from '@secretkeylabs/xverse-core';
+import { StyledP } from '@ui-library/common.styled';
+import { ftDecimals } from '@utils/helper';
+import BigNumber from 'bignumber.js';
+import { useTranslation } from 'react-i18next';
+import { NumericFormat } from 'react-number-format';
+import styled from 'styled-components';
+
+const Container = styled.div<{ topMargin?: boolean }>((props) => ({
+  width: '100%',
+  display: 'flex',
+  flexDirection: 'row',
+  alignItems: 'center',
+  marginBottom: props.theme.space.s,
+  marginTop: props.topMargin ? props.theme.space.s : 0,
+  backgroundColor: props.theme.colors.elevation1,
+  padding: props.theme.space.m,
+  borderRadius: props.theme.space.xs,
+}));
+
+const AvatarContainer = styled.div`
+  margin-right: ${(props) => props.theme.space.m};
+`;
+
+const Row = styled.div`
+  width: 100%;
+  display: flex;
+  flex-direction: row;
+  justify-content: space-between;
+  gap: 24px;
+`;
+
+const Column = styled.div`
+  width: 100%;
+  display: flex;
+  flex-direction: column;
+  gap: 2px;
+  overflow: hidden;
+`;
+
+type Props = {
+  rune: RuneBase;
+  hasSufficientBalance?: boolean;
+  topMargin?: boolean;
+};
+
+export default function RuneAmount({
+  rune,
+  hasSufficientBalance = true,
+  topMargin = false,
+}: Props) {
+  const { t } = useTranslation('translation', { keyPrefix: 'CONFIRM_TRANSACTION' });
+  const { runeName, amount, divisibility, symbol } = rune;
+  const amountWithDecimals = ftDecimals(String(amount), divisibility);
+  const { fiatCurrency } = useWalletSelector();
+  const { data: runeFiatRate } = useRuneFiatRateQuery(rune);
+  return (
+    <Container topMargin={topMargin}>
+      <AvatarContainer>
+        <TokenImage
+          currency="FT"
+          fungibleToken={mapRuneBaseToFungibleToken(rune)}
+          showProtocolIcon
+          loading={false}
+          size={32}
+        />
+      </AvatarContainer>
+      <Column>
+        <Row>
+          <StyledP typography="body_medium_m" color="white_0">
+            {t('AMOUNT')}
+          </StyledP>
+          <NumericFormat
+            value={amountWithDecimals}
+            displayType="text"
+            thousandSeparator
+            suffix={` ${symbol}`}
+            renderText={(value: string) => (
+              <StyledP
+                data-testid="send-rune-amount"
+                typography="body_medium_m"
+                color={hasSufficientBalance ? 'white_0' : 'danger_light'}
+              >
+                {value}
+              </StyledP>
+            )}
+          />
+        </Row>
+        <Row>
+          <StyledP data-testid="rune-name" typography="body_medium_s" color="white_400">
+            {runeName}
+          </StyledP>
+          {runeFiatRate !== undefined && runeFiatRate > 0 && (
+            <RightAlignedStyledFiatAmountText
+              fiatAmount={BigNumber(amountWithDecimals).multipliedBy(runeFiatRate)}
+              fiatCurrency={fiatCurrency}
+            />
+          )}
+        </Row>
+      </Column>
+    </Container>
+  );
+}
diff --git a/src/app/screens/sendOrdinal/index.tsx b/src/app/screens/sendOrdinal/index.tsx
index 78a1c746d..4725ceb23 100644
--- a/src/app/screens/sendOrdinal/index.tsx
+++ b/src/app/screens/sendOrdinal/index.tsx
@@ -31,6 +31,7 @@ function SendOrdinalScreen() {
   const isRareSatParam = params.get('isRareSat');
   const vout = params.get('vout');
   const isRareSat = isRareSatParam === 'true';
+  const fromRune = params.get('fromRune');
 
   const context = useTransactionContext();
   const { data: selectedOrdinal } = useAddressInscription(isRareSat ? undefined : id);
@@ -136,7 +137,7 @@ function SendOrdinalScreen() {
     }
     navigate(
       isRareSat
-        ? `/nft-dashboard/rare-sats-bundle`
+        ? `/nft-dashboard/rare-sats-bundle${fromRune ? `?fromRune=${fromRune}` : ''}`
         : `/nft-dashboard/ordinal-detail/${selectedOrdinal?.id}`,
     );
   };
diff --git a/src/locales/en.json b/src/locales/en.json
index 1c611bae9..792e1bc98 100644
--- a/src/locales/en.json
+++ b/src/locales/en.json
@@ -665,6 +665,7 @@
     "NO_EARN_OPTION": "No Earn options currently available for this wallet type."
   },
   "NFT_DASHBOARD_SCREEN": {
+    "BUNDLE": "Bundle",
     "COLLECTIBLES": "Collectibles",
     "NO_COLLECTIBLES": "There's nothing here yet.",
     "INSCRIPTIONS": "Inscriptions",
@@ -750,6 +751,7 @@
     "TRANSFER_ALL": "Transfer all"
   },
   "NFT_DETAIL_SCREEN": {
+    "RARE_SATS": "Rare Sats",
     "NFT_DETAIL": "Item detail",
     "WEB_GALLERY": "Open gallery",
     "SEND": "Send",
@@ -769,6 +771,7 @@
     "GAMMA": "Gamma.io",
     "MOVE_TO_ASSET_DETAIL": "Back to gallery",
     "BACK_TO_COLLECTION": "Back to collection",
+    "BACK_TO_RUNES": "Back to runes",
     "ORDINALS": "Ordinal",
     "ORDINAL_PENDING_SEND_TITLE": "Transfer Pending",
     "ORDINAL_PENDING_SEND_DESCRIPTION": "This Ordinal is already in a pending transfer.",
@@ -803,7 +806,8 @@
     "SAT": "Sat",
     "NFT_TYPE": "Asset Type",
     "DATA": "Data",
-    "COPIED": "Sharing Link Copied"
+    "COPIED": "Sharing Link Copied",
+    "CONTENT": "Content"
   },
   "RESET_WALLET_SCREEN": {
     "ENTER_PASSWORD": "Enter your password to reset your wallet",
@@ -984,6 +988,7 @@
     "BALANCE": "Balance",
     "TRANSACTIONS": "TRANSACTIONS",
     "CONTRACT": "CONTRACT",
+    "BUNDLES": "BUNDLES",
     "COMING_SOON": "Coming soon",
     "VERIFY_ADDRESS_ON_LEDGER": "Verify address on Ledger",
     "VIEW_ADDRESS": "View address",
diff --git a/tests/pages/wallet.ts b/tests/pages/wallet.ts
index 6ce8a2237..2fb0bfa9f 100644
--- a/tests/pages/wallet.ts
+++ b/tests/pages/wallet.ts
@@ -212,9 +212,9 @@ export default class Wallet {
 
   readonly noFundsBTCMessage: Locator;
 
-  readonly buttonCoinContract: Locator;
+  readonly coinSecondaryButton: Locator;
 
-  readonly coinContractContainer: Locator;
+  readonly coinSecondaryContainer: Locator;
 
   readonly coinContractAddress: Locator;
 
@@ -266,7 +266,7 @@ export default class Wallet {
 
   readonly labelOwnedBy: Locator;
 
-  readonly labelRareSats: Locator;
+  readonly labelBundle: Locator;
 
   readonly buttonSupportRarity: Locator;
 
@@ -452,8 +452,8 @@ export default class Wallet {
     this.containerTransactionHistory = page.getByTestId('transaction-container');
     this.transactionHistoryAmount = page.getByTestId('transaction-amount');
     this.transactionHistoryInfo = page.getByTestId('transaction-info');
-    this.buttonCoinContract = page.getByTestId('coin-contract-button');
-    this.coinContractContainer = page.getByTestId('coin-contract-container');
+    this.coinSecondaryButton = page.getByTestId('coin-secondary-button');
+    this.coinSecondaryContainer = page.getByTestId('coin-secondary-container');
     this.coinContractAddress = page.getByTestId('coin-contract-address');
     this.textCoinTitle = page.getByTestId('coin-title-text');
 
@@ -487,9 +487,9 @@ export default class Wallet {
     this.buttonShare = page.getByRole('button', { name: 'Share' });
     this.buttonReceive = page.getByRole('button', { name: 'Receive', exact: true });
     this.buttonOpenOrdinalViewer = page.getByRole('button', { name: 'Open in Ordinal Viewer' });
+    this.labelBundle = page.locator('h1').filter({ hasText: 'Bundle' });
     this.labelSatsValue = page.locator('h1').filter({ hasText: 'Sats value' });
     this.labelOwnedBy = page.locator('h1').filter({ hasText: 'Owned by' });
-    this.labelRareSats = page.locator('p').filter({ hasText: 'Rare Sats' });
     this.buttonSupportRarity = page.getByRole('button', { name: 'See supported rarity scale' });
     this.numberInscription = page.getByTestId('inscription-number');
     this.numberOrdinal = page.getByTestId('ordinal-number');
diff --git a/tests/specs/createWallet.spec.ts b/tests/specs/createWallet.spec.ts
index e0f530738..e323e2b77 100644
--- a/tests/specs/createWallet.spec.ts
+++ b/tests/specs/createWallet.spec.ts
@@ -142,7 +142,7 @@ test.describe('Create and Restore Wallet Flow', () => {
       await newWallet.checkVisualsStartpage();
 
       const balanceText = newWallet.balance;
-      await await expect(balanceText).toHaveText('$0.00');
+      await expect(balanceText).toHaveText('$0.00');
 
       // Get the Addresses
       const addressBitcoinCheck = await newWallet.getAddress('Bitcoin');
diff --git a/tests/specs/managementToken.spec.ts b/tests/specs/managementToken.spec.ts
index 154ac4e66..0b559955f 100644
--- a/tests/specs/managementToken.spec.ts
+++ b/tests/specs/managementToken.spec.ts
@@ -24,7 +24,7 @@ test.describe('Token Management', () => {
     await expect(wallet.checkboxTokenInactive.first()).toBeVisible();
     const amounttokenSIP = await wallet.labelCoinTitle.count();
 
-    await await expect(amounttokenSIP).toBeGreaterThanOrEqual(15);
+    await expect(amounttokenSIP).toBeGreaterThanOrEqual(15);
     await expect(wallet.checkboxTokenInactive).toHaveCount(amounttokenSIP - 1);
     await expect(wallet.checkboxTokenActive).toHaveCount(1);
     await expect(wallet.checkboxToken).toHaveCount(amounttokenSIP);
@@ -56,7 +56,7 @@ test.describe('Token Management', () => {
       await wallet.checkVisualsStartpage();
       // Check balances
       await expect(wallet.balance).toBeVisible();
-      await await expect(wallet.balance).toHaveText('$0.00');
+      await expect(wallet.balance).toHaveText('$0.00');
       let balanceText = await wallet.getBalanceOfAllTokens();
       await expect(balanceText).toBe(0);
       await wallet.manageTokenButton.click();
diff --git a/tests/specs/tabCollectiblesRareSats.spec.ts b/tests/specs/tabCollectiblesRareSats.spec.ts
index ed63df9c3..ed135620c 100644
--- a/tests/specs/tabCollectiblesRareSats.spec.ts
+++ b/tests/specs/tabCollectiblesRareSats.spec.ts
@@ -22,7 +22,7 @@ test.describe('Collectibles Tab - Rare sats', () => {
     await expect(wallet.buttonSend).toBeVisible();
     await expect(wallet.labelSatsValue).toBeVisible();
     await expect(wallet.labelOwnedBy).toBeVisible();
-    await expect(wallet.labelRareSats).toBeVisible();
+    await expect(wallet.labelBundle).toBeVisible();
     await expect(wallet.buttonSupportRarity).toBeVisible();
   });
 
diff --git a/tests/specs/transactionHistory.spec.ts b/tests/specs/transactionHistory.spec.ts
index 8aa556b40..3d1b6e16d 100644
--- a/tests/specs/transactionHistory.spec.ts
+++ b/tests/specs/transactionHistory.spec.ts
@@ -17,8 +17,8 @@ test.describe('Transaction', () => {
     await expect(wallet.textCoinTitle).toContainText(tokenName);
 
     // Check contract details are displayed
-    await wallet.buttonCoinContract.click();
-    await expect(wallet.buttonCoinContract).toBeVisible();
+    await wallet.coinSecondaryButton.click();
+    await expect(wallet.coinSecondaryButton).toBeVisible();
     await expect(wallet.coinContractAddress).toBeVisible();
     await expect(wallet.coinContractAddress).not.toBeEmpty();
   });
@@ -76,15 +76,19 @@ test.describe('Transaction', () => {
   test('Visual Check Runes Transaction history', async ({ page, extensionId }) => {
     const wallet = new Wallet(page);
     await wallet.setupTest(extensionId, 'SEED_WORDS1', false);
-
     // Check if Rune is enabled and if not enable the rune and click on it
     await wallet.checkAndClickOnSpecificRune('SKIBIDI•OHIO•RIZZ');
-
     const originalBalanceAmount = await wallet.checkVisualsRunesDashboard('SKIBIDI•OHIO•RIZZ');
     await expect(originalBalanceAmount).toBeGreaterThan(0);
     await expect(wallet.containerTransactionHistory.first()).toBeVisible();
     // There should be at least one transaction visible
     await expect(await wallet.containerTransactionHistory.count()).toBeGreaterThanOrEqual(1);
+    // check able to see rune bundles
+    await wallet.coinSecondaryButton.click();
+    await expect(wallet.coinSecondaryButton).toBeVisible();
+    // can navigate to rare-sats-bundle page
+    await wallet.runeItem.last().click();
+    await expect(page.url()).toContain('rare-sats-bundle');
   });
 
   // TODO: add test for sending NFT - https://linear.app/xverseapp/issue/ENG-4321/transaction-send-nft
diff --git a/tests/specs/transactionSTX.spec.ts b/tests/specs/transactionSTX.spec.ts
index 41b65f0a5..6a1d69b0d 100644
--- a/tests/specs/transactionSTX.spec.ts
+++ b/tests/specs/transactionSTX.spec.ts
@@ -43,9 +43,9 @@ test.describe('Transaction STX', () => {
     await expect(wallet.buttonNext).toBeHidden();
     // Amount input is visible
     await expect(wallet.inputField.first()).toBeVisible();
+    await expect(wallet.inputField.first()).toBeEnabled();
     await expect(wallet.labelBalanceAmountSelector).toBeVisible();
     await expect(wallet.imageToken).toBeVisible();
-    await expect(wallet.inputField.first()).toBeDisabled();
     await expect(wallet.noFundsBTCMessage).toBeVisible();
   });
 

From 7bae215aa4db6f2b4ddcfc88f10cfa15c8405d90 Mon Sep 17 00:00:00 2001
From: Den <36603049+dhriaznov@users.noreply.github.com>
Date: Mon, 9 Sep 2024 05:43:24 +0200
Subject: [PATCH 085/227] [ENG-5132] Adjust the banner carousel to have a fixed
 height (#570)

* [ENG-5132] Adjust the banner carousel to have a fixed height

* Update the carousel banner height/smoothness
---
 src/app/screens/home/banner.tsx         |  2 ++
 src/app/screens/home/bannerCarousel.tsx | 10 ++++--
 src/app/screens/home/index.styled.ts    | 12 +++++--
 src/app/screens/home/index.tsx          | 42 +++++++++++++++++++------
 4 files changed, 52 insertions(+), 14 deletions(-)

diff --git a/src/app/screens/home/banner.tsx b/src/app/screens/home/banner.tsx
index f2217ae67..056493311 100644
--- a/src/app/screens/home/banner.tsx
+++ b/src/app/screens/home/banner.tsx
@@ -10,6 +10,8 @@ const Container = styled.div`
 
 const BannerContent = styled.button`
   cursor: pointer;
+  width: 100%;
+  min-height: 60px;
   display: flex;
   align-items: center;
   column-gap: ${({ theme }) => theme.space.s};
diff --git a/src/app/screens/home/bannerCarousel.tsx b/src/app/screens/home/bannerCarousel.tsx
index 9d584bb0a..a1f565ec2 100644
--- a/src/app/screens/home/bannerCarousel.tsx
+++ b/src/app/screens/home/bannerCarousel.tsx
@@ -15,10 +15,15 @@ import Banner from './banner';
 const CarouselContainer = styled.div`
   position: relative;
   margin-top: ${({ theme }) => theme.space.xxs};
-  margin-bottom: ${({ theme }) => theme.space.m};
+  margin-bottom: ${({ theme }) => theme.space.xxs};
 
   .swiper {
     padding: 0;
+    z-index: 0;
+  }
+
+  .swiper-wrapper {
+    align-items: center;
   }
 
   .swiper-pagination {
@@ -85,7 +90,7 @@ const PaginationContainer = styled.div`
 const StyledCrossButton = styled(CrossButton)`
   z-index: 1;
   position: absolute;
-  top: -14px;
+  top: -8px;
   right: -6px;
 `;
 
@@ -116,7 +121,6 @@ function BannerCarousel({ items }: Props) {
           setActiveIndex(swiper.activeIndex);
         }}
         allowTouchMove
-        autoHeight
       >
         {items.map((item) => (
           <SwiperSlide data-testid="app-slide" key={item.id}>
diff --git a/src/app/screens/home/index.styled.ts b/src/app/screens/home/index.styled.ts
index b2f4fbb47..ac6a1426f 100644
--- a/src/app/screens/home/index.styled.ts
+++ b/src/app/screens/home/index.styled.ts
@@ -1,4 +1,5 @@
 import TokenTile from '@components/tokenTile';
+import { animated } from '@react-spring/web';
 import Divider from '@ui-library/divider';
 import styled from 'styled-components';
 
@@ -15,6 +16,7 @@ export const ColumnContainer = styled.div((props) => ({
   flexDirection: 'column',
   alignItems: 'space-between',
   justifyContent: 'space-between',
+  marginTop: props.theme.space.xs,
   marginBottom: props.theme.space.s,
 }));
 
@@ -155,13 +157,19 @@ export const IconBackground = styled.div((props) => ({
   alignItems: 'center',
 }));
 
-export const StyledDivider = styled(Divider)`
+export const StyledDivider = styled(Divider)<{ $noMarginBottom?: boolean }>`
   flex: 1 0 auto;
   width: calc(100% + ${(props) => props.theme.space.xl});
   margin-left: -${(props) => props.theme.space.m};
   margin-right: -${(props) => props.theme.space.m};
+  transition: margin-bottom 0.1s ease;
+  ${(props) =>
+    props.$noMarginBottom &&
+    `
+      margin-bottom: 0;
+    `}
 `;
 
 export const StyledDividerSingle = styled(StyledDivider)`
-  margin-top: ${(props) => props.theme.space.xl};
+  margin-bottom: 0;
 `;
diff --git a/src/app/screens/home/index.tsx b/src/app/screens/home/index.tsx
index 114479b67..08af56b25 100644
--- a/src/app/screens/home/index.tsx
+++ b/src/app/screens/home/index.tsx
@@ -25,6 +25,7 @@ import useSelectedAccount from '@hooks/useSelectedAccount';
 import useTrackMixPanelPageViewed from '@hooks/useTrackMixPanelPageViewed';
 import useWalletSelector from '@hooks/useWalletSelector';
 import { ArrowDown, ArrowUp, Plus } from '@phosphor-icons/react';
+import { animated, useTransition } from '@react-spring/web';
 import CoinSelectModal from '@screens/home/coinSelectModal';
 import { AnalyticsEvents, FeatureId, type FungibleToken } from '@secretkeylabs/xverse-core';
 import {
@@ -415,6 +416,21 @@ function Home() {
   const isCrossChainSwapsEnabled = useHasFeature(FeatureId.CROSS_CHAIN_SWAPS);
   const showSwaps = isCrossChainSwapsEnabled;
 
+  const transitions = useTransition(showBannerCarousel, {
+    from: { maxHeight: '1000px', opacity: 0.5 },
+    enter: { maxHeight: '1000px', opacity: 1 },
+    leave: { maxHeight: '0px', opacity: 0 },
+    config: (item, index, phase) =>
+      phase === 'leave'
+        ? {
+            duration: 300,
+            easing: (progress) => 1 - (1 - progress) ** 4,
+          }
+        : {
+            duration: 200,
+          },
+  });
+
   return (
     <>
       <AccountHeaderComponent />
@@ -454,15 +470,23 @@ function Home() {
           />
         </RowButtonContainer>
 
-        {showBannerCarousel ? (
-          <>
-            <br />
-            <StyledDivider color="white_850" verticalMargin="m" />
-            <BannerCarousel items={filteredNotificationBannersArr} />
-            <StyledDivider color="white_850" verticalMargin="xxs" />
-          </>
-        ) : (
-          <StyledDividerSingle color="elevation3" verticalMargin="xs" />
+        {transitions((style, item) =>
+          item ? (
+            <animated.div style={style}>
+              <br />
+              <StyledDivider color="white_850" verticalMargin="m" />
+              <BannerCarousel items={filteredNotificationBannersArr} />
+              <StyledDivider
+                color="white_850"
+                verticalMargin="m"
+                $noMarginBottom={filteredNotificationBannersArr.length === 1}
+              />
+            </animated.div>
+          ) : (
+            <animated.div style={style}>
+              <StyledDividerSingle color="elevation3" verticalMargin="xl" />
+            </animated.div>
+          ),
         )}
 
         <ColumnContainer>

From c4c215d9976c44603b8d2541dcef8bbd652a12ee Mon Sep 17 00:00:00 2001
From: Mahmoud Aboelenein <mahmoud@secretkeylabs.com>
Date: Mon, 9 Sep 2024 06:46:07 +0300
Subject: [PATCH 086/227] 
 mahmoud/eng-5115-ext-sendtransfer-fails-with-user-rejection-error-even-if-successfull
 (#564)

* re-add request handling for `sendTransfer`

* remove unnecessary log
---
 src/app/screens/btcSendRequest/index.tsx      | 39 ++++++++++++++-----
 .../useBtcSendRequestPayload.ts               |  4 +-
 src/common/utils/rpc/btc/signPsbt.ts          |  2 +-
 src/common/utils/rpc/runes/etch.ts            |  2 +-
 src/common/utils/rpc/runes/mint.ts            |  2 +-
 5 files changed, 34 insertions(+), 15 deletions(-)

diff --git a/src/app/screens/btcSendRequest/index.tsx b/src/app/screens/btcSendRequest/index.tsx
index 50db52f51..2fd7caf8b 100644
--- a/src/app/screens/btcSendRequest/index.tsx
+++ b/src/app/screens/btcSendRequest/index.tsx
@@ -1,4 +1,4 @@
-import { makeRPCError, sendRpcResponse } from '@common/utils/rpc/helpers';
+import { makeRPCError, makeRpcSuccessResponse, sendRpcResponse } from '@common/utils/rpc/helpers';
 import ConfirmBtcTransaction from '@components/confirmBtcTransaction';
 import useBtcFeeRate from '@hooks/useBtcFeeRate';
 import useHasFeature from '@hooks/useHasFeature';
@@ -166,6 +166,15 @@ function BtcSendRequest() {
     checkIfValidAmount();
   }, [payload]);
 
+  const handleCancel = () => {
+    const response = makeRPCError(requestId, {
+      code: RpcErrorCode.USER_REJECTION,
+      message: 'User rejected request to send transfer',
+    });
+    sendRpcResponse(+tabId, response);
+    window.close();
+  };
+
   const handleSubmit = async (ledgerTransport?: Transport) => {
     try {
       setIsSubmitting(true);
@@ -175,16 +184,26 @@ function BtcSendRequest() {
         action: 'transfer',
         wallet_type: selectedAccount.accountType || 'software',
       });
-      navigate('/tx-status', {
-        state: {
+      if (txnId) {
+        const sendTransferResponse = makeRpcSuccessResponse<'sendTransfer'>(requestId, {
           txid: txnId,
-          currency: 'BTC',
-          error: '',
-          browserTx: true,
-        },
-      });
+        });
+        sendRpcResponse(+tabId, sendTransferResponse);
+        navigate('/tx-status', {
+          state: {
+            txid: txnId,
+            currency: 'BTC',
+            error: '',
+            browserTx: true,
+          },
+        });
+      }
     } catch (e) {
-      console.error(e);
+      const response = makeRPCError(requestId, {
+        code: RpcErrorCode.INTERNAL_ERROR,
+        message: (e as any).message,
+      });
+      sendRpcResponse(+tabId, response);
       navigate('/tx-status', {
         state: {
           txid: '',
@@ -216,7 +235,7 @@ function BtcSendRequest() {
       isLoading={isLoading}
       confirmText={t('COMMON.CONFIRM')}
       cancelText={t('COMMON.CANCEL')}
-      onCancel={() => window.close()}
+      onCancel={handleCancel}
       onConfirm={handleSubmit}
       getFeeForFeeRate={calculateFeeForFeeRate}
       onFeeRateSet={(newFeeRate) => setFeeRate(newFeeRate.toString())}
diff --git a/src/app/screens/btcSendRequest/useBtcSendRequestPayload.ts b/src/app/screens/btcSendRequest/useBtcSendRequestPayload.ts
index 3486a7e7d..6ee2bb7b2 100644
--- a/src/app/screens/btcSendRequest/useBtcSendRequestPayload.ts
+++ b/src/app/screens/btcSendRequest/useBtcSendRequestPayload.ts
@@ -10,7 +10,7 @@ import { useLocation } from 'react-router-dom';
 
 const useBtcSendRequestPayload = (btcAddress: string, network: SettingsNetwork) => {
   const { search } = useLocation();
-  const params = new URLSearchParams(search);
+  const params = useMemo(() => new URLSearchParams(search), [search]);
   const tabId = params.get('tabId') ?? '0';
   const requestId = params.get('requestId') ?? '';
 
@@ -38,7 +38,7 @@ const useBtcSendRequestPayload = (btcAddress: string, network: SettingsNetwork)
       payload: rpcPayload,
       requestToken: null,
     };
-  }, []);
+  }, [params, btcAddress, network]);
 
   return { payload, tabId, requestToken, requestId };
 };
diff --git a/src/common/utils/rpc/btc/signPsbt.ts b/src/common/utils/rpc/btc/signPsbt.ts
index 67811c67c..b9007ba7f 100644
--- a/src/common/utils/rpc/btc/signPsbt.ts
+++ b/src/common/utils/rpc/btc/signPsbt.ts
@@ -51,7 +51,7 @@ export const handleSignPsbt = async (
     id,
     response: makeRPCError(message.id, {
       code: RpcErrorCode.USER_REJECTION,
-      message: 'User rejected request to send transfer',
+      message: 'User rejected request to sign a psbt',
     }),
   });
 
diff --git a/src/common/utils/rpc/runes/etch.ts b/src/common/utils/rpc/runes/etch.ts
index 02cd3fe51..140ae02bd 100644
--- a/src/common/utils/rpc/runes/etch.ts
+++ b/src/common/utils/rpc/runes/etch.ts
@@ -68,7 +68,7 @@ const handleEtchRune = async (message: WebBtcMessage<'runes_etch'>, port: chrome
     id,
     response: makeRPCError(message.id, {
       code: RpcErrorCode.USER_REJECTION,
-      message: 'User rejected request to send transfer',
+      message: 'User rejected request to etch a rune',
     }),
   });
   listenForOriginTabClose({ tabId });
diff --git a/src/common/utils/rpc/runes/mint.ts b/src/common/utils/rpc/runes/mint.ts
index 3919b8f8b..35713f5f7 100644
--- a/src/common/utils/rpc/runes/mint.ts
+++ b/src/common/utils/rpc/runes/mint.ts
@@ -49,7 +49,7 @@ const handleMintRune = async (message: WebBtcMessage<'runes_mint'>, port: chrome
     id,
     response: makeRPCError(message.id, {
       code: RpcErrorCode.USER_REJECTION,
-      message: 'User rejected request to send transfer',
+      message: 'User rejected request to mint a rune',
     }),
   });
   listenForOriginTabClose({ tabId });

From 7a1dc01db38d76aaf0d218a51db4b7123d30f769 Mon Sep 17 00:00:00 2001
From: GitHub Actions Bot <>
Date: Mon, 9 Sep 2024 03:48:32 +0000
Subject: [PATCH 087/227] release: v0.42.0

---
 package-lock.json | 4 ++--
 package.json      | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 3bcf90680..e2f5dc011 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "xverse-web-extension",
-  "version": "0.41.1",
+  "version": "0.42.0",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "xverse-web-extension",
-      "version": "0.41.1",
+      "version": "0.42.0",
       "dependencies": {
         "@aryzing/superqs": "0.0.6",
         "@ledgerhq/hw-transport-webusb": "^6.27.13",
diff --git a/package.json b/package.json
index a5b76e4c1..5bd0f9313 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "xverse-web-extension",
   "description": "A Bitcoin wallet for Web3",
-  "version": "0.41.1",
+  "version": "0.42.0",
   "private": true,
   "engines": {
     "node": "^18.18.2"

From cfa2d52dc3add87f36500b55b3a31dfaf02ad875 Mon Sep 17 00:00:00 2001
From: "Duska.T" <55587184+DuskaT021@users.noreply.github.com>
Date: Mon, 9 Sep 2024 06:41:48 +0200
Subject: [PATCH 088/227] Added the e2e for swap flow from sip-10 to stx and
 improved some assertions in a previous test (#568)

* Added the e2e for swap flow from sip-10 to stx and improved some assertions in a previous test

* Renamed the file
---
 tests/specs/swapSip10Velar.spec.ts | 80 ++++++++++++++++++++++++++++++
 tests/specs/swapVelar.spec.ts      | 10 ++--
 2 files changed, 84 insertions(+), 6 deletions(-)
 create mode 100644 tests/specs/swapSip10Velar.spec.ts

diff --git a/tests/specs/swapSip10Velar.spec.ts b/tests/specs/swapSip10Velar.spec.ts
new file mode 100644
index 000000000..111ef61b6
--- /dev/null
+++ b/tests/specs/swapSip10Velar.spec.ts
@@ -0,0 +1,80 @@
+import { expect, test } from '../fixtures/base';
+import { enableCrossChainSwaps } from '../fixtures/helpers';
+import Wallet from '../pages/wallet';
+
+// swap sip-10 to STX on Velar - mainnet
+
+test.describe('Swap sip-10 token to STX', () => {
+  test.beforeAll(async ({ page }) => {
+    await enableCrossChainSwaps(page);
+  });
+
+  test('Swap sip-10 to STX #localexecution', async ({ page, extensionId }) => {
+    // set up the testing wallet
+    const wallet = new Wallet(page);
+    await wallet.setupTest(extensionId, 'SEED_WORDS1', false);
+
+    // click swap button on the homepage
+    await page.getByRole('button', { name: 'Swap' }).click();
+
+    // choose the tokens
+    await page
+      .getByRole('button', { name: /select asset/i })
+      .first()
+      .click();
+    await page.getByText('VELAR', { exact: true }).first().click();
+    await expect(page.getByText(/velar/i)).toBeVisible();
+    await page
+      .getByRole('button', { name: /select asset/i })
+      .last()
+      .click();
+    await page.getByText('STX', { exact: true }).first().click();
+
+    // assert chosen tokens populated the dropdown inputs velar -> stx
+    await expect(page.getByText(/velar/i)).toBeVisible();
+    await expect(page.getByText(/stx/i)).toBeVisible();
+
+    // input the amount for swapping
+    await page.getByRole('textbox', { name: '0' }).fill('0.1');
+    await expect(page.getByText(/^~\$\d+\.\d{2}\sUSD$/)).toBeVisible();
+
+    // assert presence balance and amount
+    await expect(page.getByText(/balance:/i)).toBeVisible();
+    await expect(page.getByText(/^\d+\.\d+$/i)).toBeVisible();
+
+    // assert presence of max button
+    await expect(page.getByRole('button', { name: 'MAX' })).toBeVisible();
+
+    page.getByRole('button', { name: /get quotes/i }).click();
+
+    await expect(page.getByText('Rates', { exact: true })).toBeVisible();
+    await page.getByText(/^\d+\.\d+\s+STX$/i).click();
+
+    // Quotes page velar -> stacks
+    await expect(page.getByText(/quote/i)).toBeVisible();
+    await expect(page.getByText(/4%/i)).toBeVisible();
+    page.getByRole('button', { name: /4%/i }).click();
+
+    // edit slippage tolerance
+    await page.getByRole('textbox', { name: '4' }).fill('1.22');
+    page.getByRole('button', { name: /apply/i }).click();
+    await expect(page.getByText('1.22')).toBeVisible();
+    await expect(page.getByRole('img', { name: /velar logo/i })).toBeVisible();
+
+    page.getByRole('button', { name: /swap/i }).click();
+
+    // Arrive to the final step - swap contract page
+    await expect(page.getByText(/swap-exact-tokens-for-tokens/i)).toHaveCount(2);
+    await expect(page.getByText(/network fee/i)).toBeVisible();
+    await expect(page.getByText(/^\d+\.\d+\s+STX$/i).last()).toBeVisible();
+    await expect(page.getByRole('button', { name: /edit nonce/i })).toBeVisible();
+
+    // User clicks confirm
+    page.getByRole('button', { name: /confirm/i }).click();
+    await expect(page.getByText(/transaction broadcasted/i)).toBeVisible();
+    page.getByRole('button', { name: /close/i }).click();
+
+    // After closing user should arrive to homepage
+    await expect(page).toHaveURL(/popup\.html/);
+  });
+});
diff --git a/tests/specs/swapVelar.spec.ts b/tests/specs/swapVelar.spec.ts
index 733a9fe34..0c0b478ee 100644
--- a/tests/specs/swapVelar.spec.ts
+++ b/tests/specs/swapVelar.spec.ts
@@ -28,7 +28,7 @@ test.describe('Velar sip-10 swap flow', () => {
     await page.getByText(/velar/i).first().click();
     page.getByRole('textbox', { name: '0' }).fill('0.1');
     page.getByRole('button', { name: /get quotes/i }).click();
-    page.getByRole('heading', { name: /rates/i }).isVisible();
+    await expect(page.getByText('Rates', { exact: true })).toBeVisible();
     await page.getByText(/^\d+\.\d+\s+Velar$/i).click();
 
     // Arrive to Quotes page
@@ -40,11 +40,9 @@ test.describe('Velar sip-10 swap flow', () => {
 
     // Arrive to the final step - swap contract page
     await expect(page.getByText(/swap-exact-tokens-for-tokens/i)).toHaveCount(2);
-    page
-      .getByText(/network fee/i)
-      .getByText(/^\d+\.\d+\s+STX$/i)
-      .isVisible();
-    page.getByRole('button', { name: /edit nonce/i }).isVisible();
+    await expect(page.getByText(/network fee/i)).toBeVisible();
+    await expect(page.getByText(/^\d+\.\d+\s+STX$/i)).toBeVisible();
+    await expect(page.getByRole('button', { name: /edit nonce/i })).toBeVisible();
 
     // User clicks confirm
     page.getByRole('button', { name: /confirm/i }).click();

From 9c4f55a35b78c0cc8bb78f8ed220e18dd9ff2a0f Mon Sep 17 00:00:00 2001
From: jordankzf <jordan@secretkeylabs.com>
Date: Mon, 9 Sep 2024 14:26:31 +0800
Subject: [PATCH 089/227] Use comparedTo

---
 src/app/screens/swap/quotesModal/index.tsx | 15 +++++----------
 1 file changed, 5 insertions(+), 10 deletions(-)

diff --git a/src/app/screens/swap/quotesModal/index.tsx b/src/app/screens/swap/quotesModal/index.tsx
index 07ce4ed8b..f5e8a87ce 100644
--- a/src/app/screens/swap/quotesModal/index.tsx
+++ b/src/app/screens/swap/quotesModal/index.tsx
@@ -67,19 +67,14 @@ function QuotesModal({
   const { btcFiatRate, stxBtcRate } = useCoinRates();
 
   const sortQuotesByReceiveAmount = <T extends StxQuote | Quote>(quotes: T[]): T[] =>
-    [...quotes].sort((a, b) =>
-      BigNumber(b.receiveAmount).gte(a.receiveAmount)
-        ? 1
-        : BigNumber(a.receiveAmount).gte(b.receiveAmount)
-        ? -1
-        : 0,
-    );
+    [...quotes].sort((a, b) => BigNumber(b.receiveAmount).comparedTo(a.receiveAmount));
+
+  const sortQuotesByFloorPrice = <T extends UtxoQuote>(quotes: T[]): T[] =>
+    [...quotes].sort((a, b) => BigNumber(a.floorRate).comparedTo(b.floorRate));
 
   const sortedAmmQuotes = sortQuotesByReceiveAmount<Quote>(ammProviders);
   const sortedStxQuotes = sortQuotesByReceiveAmount<StxQuote>(stxProviders);
-  const sortedUtxoQuotes = [...utxoProviders].sort((a, b) =>
-    BigNumber(b.floorRate).gte(a.floorRate) ? -1 : BigNumber(a.floorRate).gte(b.floorRate) ? 1 : 0,
-  );
+  const sortedUtxoQuotes = sortQuotesByFloorPrice<UtxoQuote>(utxoProviders);
 
   const getReceiveAmountSubtitle = (
     quote: StxQuote | Quote,

From 688f877fa970ecfc1f5cbc4bf7a28a9da683cfe1 Mon Sep 17 00:00:00 2001
From: "Duska.T" <55587184+DuskaT021@users.noreply.github.com>
Date: Mon, 9 Sep 2024 10:34:21 +0200
Subject: [PATCH 090/227] Fixed a failing test in the stx flow (#574)

* Fixed a failing test in the stx flow

* removed a commented line

* improved an existing locator :)
---
 tests/specs/transactionSTX.spec.ts | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/tests/specs/transactionSTX.spec.ts b/tests/specs/transactionSTX.spec.ts
index 6a1d69b0d..fae696298 100644
--- a/tests/specs/transactionSTX.spec.ts
+++ b/tests/specs/transactionSTX.spec.ts
@@ -6,7 +6,10 @@ const STXTest = `STN2AMZQ54Y0NN4H5Z4S0DGMWP27CTXY5QEDCQAN`;
 
 const amountSTXSend = 10;
 test.describe('Transaction STX', () => {
-  test('Send STX Page Visual Check without funds Mainnet', async ({ page, extensionId }) => {
+  test('Send STX Page Visual Check with insufficient funds Mainnet', async ({
+    page,
+    extensionId,
+  }) => {
     const wallet = new Wallet(page);
     await wallet.setupTest(extensionId, 'SEED_WORDS1', false);
 
@@ -42,11 +45,12 @@ test.describe('Transaction STX', () => {
     // No funds on mainnet in this wallet -->Page opens and Next button is hidden and info message is shown
     await expect(wallet.buttonNext).toBeHidden();
     // Amount input is visible
-    await expect(wallet.inputField.first()).toBeVisible();
-    await expect(wallet.inputField.first()).toBeEnabled();
+    await expect(page.getByRole('textbox', { name: '0' })).toBeVisible();
+    await expect(page.getByRole('textbox', { name: '0' })).toBeEnabled();
     await expect(wallet.labelBalanceAmountSelector).toBeVisible();
     await expect(wallet.imageToken).toBeVisible();
-    await expect(wallet.noFundsBTCMessage).toBeVisible();
+    page.getByRole('textbox', { name: '0' }).fill('200000000');
+    await expect(page.getByRole('button', { name: /insufficient funds/i })).toBeVisible();
   });
 
   test('Send STX - Cancel transaction testnet', async ({ page, extensionId }) => {

From 28c3be0b3ce3c29bf85a541d0604c982358af5d1 Mon Sep 17 00:00:00 2001
From: "Jordan K." <65149726+jordankzf@users.noreply.github.com>
Date: Mon, 9 Sep 2024 17:49:07 +0800
Subject: [PATCH 091/227] ENG-5062: Non-blocking Stacks Swaps fixes (#565)

* More consistent Mixpanel token names

* DRY

* Pass both fromToken and toToken

* Simplify conditional principal

* Make code less brittle
---
 src/app/screens/coinDashboard/coinHeader.tsx  |  9 +++----
 .../components/tokenFromBottomSheet/index.tsx |  7 +++---
 .../components/tokenToBottomSheet/index.tsx   |  4 +--
 src/app/screens/swap/index.tsx                |  5 ++--
 src/app/screens/swap/mixpanel.ts              |  8 +++---
 src/app/screens/swap/quoteSummary/index.tsx   |  2 +-
 src/app/screens/swap/utils.ts                 | 25 ++++++++++++++-----
 7 files changed, 36 insertions(+), 24 deletions(-)

diff --git a/src/app/screens/coinDashboard/coinHeader.tsx b/src/app/screens/coinDashboard/coinHeader.tsx
index 2f0f56e8f..8dcdedd08 100644
--- a/src/app/screens/coinDashboard/coinHeader.tsx
+++ b/src/app/screens/coinDashboard/coinHeader.tsx
@@ -14,6 +14,7 @@ import useStxWalletData from '@hooks/queries/useStxWalletData';
 import useHasFeature from '@hooks/useHasFeature';
 import useSelectedAccount from '@hooks/useSelectedAccount';
 import useWalletSelector from '@hooks/useWalletSelector';
+import { getTrackingIdentifier, isMotherToken } from '@screens/swap/utils';
 import {
   AnalyticsEvents,
   FeatureId,
@@ -182,12 +183,8 @@ export default function CoinHeader({ currency, fungibleToken }: Props) {
       return;
     }
     trackMixPanel(AnalyticsEvents.InitiateSwapFlow, {
-      selectedToken: fungibleToken ? fungibleToken.name : currency,
-      principal: fungibleToken
-        ? fungibleToken?.principal
-        : currency === 'STX'
-        ? currency
-        : undefined,
+      selectedToken: fungibleToken ? getTrackingIdentifier(fungibleToken) : currency,
+      principal: isMotherToken(fungibleToken) ? getTrackingIdentifier(fungibleToken) : undefined,
     });
     navigate(`/swap?from=${fungibleToken ? fungibleToken.principal : currency}`);
   };
diff --git a/src/app/screens/swap/components/tokenFromBottomSheet/index.tsx b/src/app/screens/swap/components/tokenFromBottomSheet/index.tsx
index 05234fa21..9f8f6dc28 100644
--- a/src/app/screens/swap/components/tokenFromBottomSheet/index.tsx
+++ b/src/app/screens/swap/components/tokenFromBottomSheet/index.tsx
@@ -1,4 +1,5 @@
 import TokenTile from '@components/tokenTile';
+import { getTrackingIdentifier } from '@screens/swap/utils';
 import { AnalyticsEvents, type FungibleToken, type Token } from '@secretkeylabs/xverse-core';
 import { StyledP } from '@ui-library/common.styled';
 import Sheet from '@ui-library/sheet';
@@ -45,7 +46,7 @@ export default function TokenFromBottomSheet({ visible, title, onSelectCoin, onC
                 onPress={() => {
                   onSelectCoin(token);
                   trackMixPanel(AnalyticsEvents.SelectTokenToSwapFrom, {
-                    selectedToken: 'Bitcoin',
+                    selectedToken: 'BTC',
                   });
                   onClose();
                 }}
@@ -61,7 +62,7 @@ export default function TokenFromBottomSheet({ visible, title, onSelectCoin, onC
                 onPress={() => {
                   onSelectCoin(token);
                   trackMixPanel(AnalyticsEvents.SelectTokenToSwapFrom, {
-                    selectedToken: 'Stacks',
+                    selectedToken: 'STX',
                     principal: 'STX',
                   });
                   onClose();
@@ -78,7 +79,7 @@ export default function TokenFromBottomSheet({ visible, title, onSelectCoin, onC
                 onPress={() => {
                   onSelectCoin(token);
                   trackMixPanel(AnalyticsEvents.SelectTokenToSwapFrom, {
-                    selectedToken: token.name,
+                    selectedToken: getTrackingIdentifier(token),
                     principal: token.protocol === 'stacks' ? token.principal : undefined,
                   });
                   onClose();
diff --git a/src/app/screens/swap/components/tokenToBottomSheet/index.tsx b/src/app/screens/swap/components/tokenToBottomSheet/index.tsx
index 2953d0f5a..5a0830d88 100644
--- a/src/app/screens/swap/components/tokenToBottomSheet/index.tsx
+++ b/src/app/screens/swap/components/tokenToBottomSheet/index.tsx
@@ -178,7 +178,7 @@ export default function TokenToBottomSheet({
                   onPress={() => {
                     onSelectCoin(token);
                     trackMixPanel(AnalyticsEvents.SelectTokenToSwapTo, {
-                      selectedToken: 'Bitcoin',
+                      selectedToken: 'BTC',
                     });
                     handleClose();
                   }}
@@ -195,7 +195,7 @@ export default function TokenToBottomSheet({
                   onPress={() => {
                     onSelectCoin(token);
                     trackMixPanel(AnalyticsEvents.SelectTokenToSwapTo, {
-                      selectedToken: 'Stacks',
+                      selectedToken: 'STX',
                       principal: 'STX',
                     });
                     handleClose();
diff --git a/src/app/screens/swap/index.tsx b/src/app/screens/swap/index.tsx
index fcabb2f45..810711700 100644
--- a/src/app/screens/swap/index.tsx
+++ b/src/app/screens/swap/index.tsx
@@ -48,6 +48,7 @@ import QuotesModal from './quotesModal';
 import type { OrderInfo, Side, StxOrderInfo } from './types';
 import useMasterCoinsList from './useMasterCoinsList';
 import {
+  getTrackingIdentifier,
   isStxTx,
   mapFTNativeSwapTokenToTokenBasic,
   mapFTProtocolToSwapProtocol,
@@ -360,8 +361,8 @@ export default function SwapScreen() {
 
     trackMixPanel(AnalyticsEvents.SelectSwapQuote, {
       provider: provider.provider.name,
-      from: fromToken.name,
-      to: toToken.name ?? toToken.ticker,
+      from: getTrackingIdentifier(fromToken),
+      to: getTrackingIdentifier(toToken),
       fromPrincipal: isStxTx({ fromToken, toToken }) ? fromToken.principal : undefined,
       toPrincipal: isStxTx({ fromToken, toToken }) ? toToken.ticker : undefined,
     });
diff --git a/src/app/screens/swap/mixpanel.ts b/src/app/screens/swap/mixpanel.ts
index 7928c6a21..665a23a77 100644
--- a/src/app/screens/swap/mixpanel.ts
+++ b/src/app/screens/swap/mixpanel.ts
@@ -10,7 +10,7 @@ import {
 } from '@secretkeylabs/xverse-core';
 import { trackMixPanel } from '@utils/mixpanel';
 import BigNumber from 'bignumber.js';
-import { isRunesTx } from './utils';
+import { getTrackingIdentifier, isRunesTx } from './utils';
 
 function trackSwapMixPanel(
   eventName,
@@ -42,10 +42,10 @@ function trackSwapMixPanel(
   let fromPrincipal;
   let toPrincipal;
 
-  const from = fromToken?.name;
-  const to = toToken?.name ?? toToken?.ticker;
+  const from = getTrackingIdentifier(fromToken);
+  const to = getTrackingIdentifier(toToken);
 
-  if (isRunesTx({ fromToken, toToken })) {
+  if (fromToken && toToken && isRunesTx({ fromToken, toToken })) {
     fromAmount =
       fromToken?.principal === 'BTC'
         ? getBtcFiatEquivalent(new BigNumber(amount), new BigNumber(btcUsdRate)).toFixed(2)
diff --git a/src/app/screens/swap/quoteSummary/index.tsx b/src/app/screens/swap/quoteSummary/index.tsx
index 4c54f8032..38db3fa72 100644
--- a/src/app/screens/swap/quoteSummary/index.tsx
+++ b/src/app/screens/swap/quoteSummary/index.tsx
@@ -529,7 +529,7 @@ export default function QuoteSummary({
                 </RouteContainer>
               </StyledP>
             </ListingDescriptionRow>
-            {isRunesTx({ toToken }) && (
+            {fromToken && toToken && isRunesTx({ fromToken, toToken }) && (
               <ListingDescriptionRow>
                 <StyledP typography="body_medium_m" color="white_200">
                   {t('TRANSACTION_SETTING.FEE_RATE')}
diff --git a/src/app/screens/swap/utils.ts b/src/app/screens/swap/utils.ts
index 283d6d0d9..e415ebb54 100644
--- a/src/app/screens/swap/utils.ts
+++ b/src/app/screens/swap/utils.ts
@@ -108,13 +108,11 @@ export const isRunesTx = ({
   fromToken,
   toToken,
 }: {
-  fromToken?: FungibleToken;
-  toToken?: Token;
+  fromToken: FungibleToken;
+  toToken: Token;
 }): boolean =>
-  fromToken?.protocol === 'runes' ||
-  fromToken?.principal === 'BTC' ||
-  toToken?.protocol === 'runes' ||
-  toToken?.ticker === 'BTC';
+  (fromToken?.protocol === 'runes' || toToken?.protocol === 'runes') &&
+  (fromToken?.principal === 'BTC' || toToken?.ticker === 'BTC');
 
 export const isStxTx = ({
   fromToken,
@@ -127,3 +125,18 @@ export const isStxTx = ({
   fromToken?.principal === 'STX' ||
   toToken?.protocol === 'sip10' ||
   toToken?.ticker === 'STX';
+
+const getIdentifier = (token?: Token | FungibleToken) => {
+  if (!token) return '';
+  return 'principal' in token ? token.principal : token.ticker;
+};
+
+export const isMotherToken = (token?: Token | FungibleToken) => {
+  const identifier = getIdentifier(token);
+  return identifier === 'BTC' || identifier === 'STX';
+};
+
+export const getTrackingIdentifier = (token?: Token | FungibleToken) => {
+  const identifier = getIdentifier(token);
+  return isMotherToken(token) ? identifier : token?.name ?? identifier;
+};

From 69268e2262abc948e7847b33cb4bd2f3d42535a8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Eduard=20Bardaj=C3=AD=20Puig?= <ebardaji@gmail.com>
Date: Mon, 9 Sep 2024 14:44:32 +0200
Subject: [PATCH 092/227] Avoid switching accounts when current account is
 target account (#575)

---
 .../signMessageRequest/useSignMessageRequest.ts       | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/src/app/screens/signMessageRequest/useSignMessageRequest.ts b/src/app/screens/signMessageRequest/useSignMessageRequest.ts
index 3f59bb949..548a86cb0 100644
--- a/src/app/screens/signMessageRequest/useSignMessageRequest.ts
+++ b/src/app/screens/signMessageRequest/useSignMessageRequest.ts
@@ -59,6 +59,7 @@ export const useSignMessageValidation = (requestPayload: SignMessagePayload | un
   const { t } = useTranslation('translation', { keyPrefix: 'REQUEST_ERRORS' });
   const selectedAccount = useSelectedAccount();
   const { accountsList, network } = useWalletSelector();
+  const { btcAddress } = useSelectedAccount();
   const { switchAccount } = useWalletReducer();
 
   const checkAddressAvailability = () => {
@@ -83,13 +84,17 @@ export const useSignMessageValidation = (requestPayload: SignMessagePayload | un
       return;
     }
     const account = checkAddressAvailability();
-    if (account) {
-      switchAccount(account);
-    } else {
+
+    if (!account) {
       setValidationError({
         error: t('ADDRESS_MISMATCH'),
       });
+      return;
     }
+
+    if (btcAddress === account.btcAddress) return;
+
+    switchAccount(account);
   };
 
   useEffect(() => {

From fa13cb74b91a895790161fe7e3bf1cf304338f8b Mon Sep 17 00:00:00 2001
From: Christos Maris <christos@secretkeylabs.com>
Date: Tue, 20 Aug 2024 21:47:04 +0300
Subject: [PATCH 093/227] [ENG-4887] Start the Runes Listing Flow

---
 package-lock.json                             |  15 +++
 package.json                                  |   1 +
 src/app/components/tokenImage/index.tsx       |  36 +++---
 src/app/hooks/apiClients/useXverseApi.ts      |  10 ++
 .../useRuneFloorPricePerMarketplaceQuery.ts   |  36 ++++++
 .../hooks/queries/runes/useRuneSellPsbt.ts    |   3 +-
 .../runes/useRuneSellPsbtPerMarketplace.ts    |  85 ++++++++++++
 .../queries/runes/useSubmitRuneSellPsbt.ts    |   3 +-
 src/app/hooks/useSearchParamsState.ts         |  15 ++-
 src/app/hooks/useSignBatchPsbtTx.ts           |  13 +-
 src/app/routes/index.tsx                      |   5 +
 src/app/screens/listRune/index.tsx            | 122 +++++++++++++++---
 .../screens/listRune/listMarketplaceItem.tsx  |  86 ++++++++++++
 src/app/screens/listRune/reducer.tsx          |   6 +-
 .../screens/signBatchPsbtRequest/index.tsx    | 112 +++++++++++++---
 src/app/screens/transactionStatus/index.tsx   |  83 +++++++++---
 .../marketplaceRuneListingResults.tsx         | 104 +++++++++++++++
 .../multipleMarketplaceListingResult.tsx      |  82 ++++++++++++
 src/app/utils/constants.ts                    |   2 +
 src/app/utils/helper.ts                       |   2 +
 src/assets/img/listings/CheckCircle.svg       |   3 +
 src/assets/img/listings/XCircle.svg           |   3 +
 src/assets/img/send/info_circle.svg           |   3 +
 src/locales/en.json                           |  17 ++-
 24 files changed, 772 insertions(+), 75 deletions(-)
 create mode 100644 src/app/hooks/apiClients/useXverseApi.ts
 create mode 100644 src/app/hooks/queries/runes/useRuneFloorPricePerMarketplaceQuery.ts
 create mode 100644 src/app/hooks/queries/runes/useRuneSellPsbtPerMarketplace.ts
 create mode 100644 src/app/screens/listRune/listMarketplaceItem.tsx
 create mode 100644 src/app/screens/transactionStatus/marketplaceRuneListingResults.tsx
 create mode 100644 src/app/screens/transactionStatus/multipleMarketplaceListingResult.tsx
 create mode 100644 src/assets/img/listings/CheckCircle.svg
 create mode 100644 src/assets/img/listings/XCircle.svg
 create mode 100644 src/assets/img/send/info_circle.svg

diff --git a/package-lock.json b/package-lock.json
index 3bcf90680..24cfdbdb8 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -37,6 +37,7 @@
         "jsontokens": "^4.0.1",
         "mixpanel-browser": "^2.47.0",
         "nanoid": "^4.0.0",
+        "object-hash": "^3.0.0",
         "p-queue": "^7.3.4",
         "path": "^0.12.7",
         "qr-code-styling": "^1.5.0",
@@ -1280,6 +1281,7 @@
       "version": "19.1.0",
       "resolved": "https://npm.pkg.github.com/download/@secretkeylabs/xverse-core/19.1.0/fe6b53e68ea3d66c7fd1bbf8e791f865299811d8",
       "integrity": "sha512-ssrdJAb9jpl1mGCfbS4K6S22sKLBXzK5LbYMiNBU8anyps4A79u/c7qkHUDMgDY4pWcuSMs8iS4mcpyshPFiQQ==",
+      "license": "ISC",
       "dependencies": {
         "@bitcoinerlab/secp256k1": "^1.0.2",
         "@noble/curves": "^1.2.0",
@@ -9097,6 +9099,14 @@
         "node": ">=0.10.0"
       }
     },
+    "node_modules/object-hash": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/object-hash/-/object-hash-3.0.0.tgz",
+      "integrity": "sha512-RSn9F68PjH9HqtltsSnqYC1XXoWe9Bju5+213R98cNGttag9q9yAOTzdbsqvIa7aNm5WffBZFpWYr2aWrklWAw==",
+      "engines": {
+        "node": ">= 6"
+      }
+    },
     "node_modules/object-inspect": {
       "version": "1.12.3",
       "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.12.3.tgz",
@@ -19637,6 +19647,11 @@
       "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
       "integrity": "sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg=="
     },
+    "object-hash": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/object-hash/-/object-hash-3.0.0.tgz",
+      "integrity": "sha512-RSn9F68PjH9HqtltsSnqYC1XXoWe9Bju5+213R98cNGttag9q9yAOTzdbsqvIa7aNm5WffBZFpWYr2aWrklWAw=="
+    },
     "object-inspect": {
       "version": "1.12.3",
       "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.12.3.tgz",
diff --git a/package.json b/package.json
index a5b76e4c1..bd87877d9 100644
--- a/package.json
+++ b/package.json
@@ -65,6 +65,7 @@
     "jsontokens": "^4.0.1",
     "mixpanel-browser": "^2.47.0",
     "nanoid": "^4.0.0",
+    "object-hash": "^3.0.0",
     "p-queue": "^7.3.4",
     "path": "^0.12.7",
     "qr-code-styling": "^1.5.0",
diff --git a/src/app/components/tokenImage/index.tsx b/src/app/components/tokenImage/index.tsx
index c63b083c0..0a8bb3202 100644
--- a/src/app/components/tokenImage/index.tsx
+++ b/src/app/components/tokenImage/index.tsx
@@ -7,7 +7,7 @@ import useWalletSelector from '@hooks/useWalletSelector';
 import type { FungibleToken } from '@secretkeylabs/xverse-core';
 import { XVERSE_ORDIVIEW_URL, type CurrencyTypes } from '@utils/constants';
 import { getTicker } from '@utils/helper';
-import { useCallback, useState } from 'react';
+import { useCallback, useMemo, useState } from 'react';
 import styled from 'styled-components';
 
 const DEFAULT_SIZE = 40;
@@ -71,6 +71,7 @@ interface TokenImageProps {
   size?: number;
   round?: boolean;
   showProtocolIcon?: boolean;
+  customProtocolIcon?: string;
 }
 
 export default function TokenImage({
@@ -80,6 +81,7 @@ export default function TokenImage({
   size,
   round,
   showProtocolIcon = true,
+  customProtocolIcon,
 }: TokenImageProps) {
   const { network } = useWalletSelector();
   const ftProtocol = fungibleToken?.protocol;
@@ -104,21 +106,23 @@ export default function TokenImage({
     </TickerIconContainer>
   );
 
-  const getProtocolIcon = () => {
-    if (!ftProtocol) {
+  const protocolIcon = useMemo(() => {
+    if (!ftProtocol && !customProtocolIcon) {
       return null;
     }
-    switch (ftProtocol) {
-      case 'stacks':
-        return <ProtocolImage src={IconStacks} alt="stacks" />;
-      case 'brc-20':
-        return <ProtocolImage src={OrdinalIcon} alt="brc20" />;
-      case 'runes':
-        return <ProtocolImage src={RunesIcon} alt="runes" />;
-      default:
-        return null;
-    }
-  };
+
+    const protocolToIcon = {
+      'brc-20': <ProtocolImage src={OrdinalIcon} alt="brc20" />,
+      stacks: <ProtocolImage src={IconStacks} alt="stacks" />,
+      runes: <ProtocolImage src={RunesIcon} alt="runes" />,
+    };
+
+    return ftProtocol ? (
+      protocolToIcon[ftProtocol]
+    ) : (
+      <ProtocolImage src={customProtocolIcon} alt="custom" />
+    );
+  }, [ftProtocol, customProtocolIcon]);
 
   const renderIcon = () => {
     if (!fungibleToken) {
@@ -178,8 +182,8 @@ export default function TokenImage({
   return (
     <TickerProtocolContainer>
       {imageError ? tickerComponent() : renderIcon()}
-      {ftProtocol && showProtocolIcon && (
-        <ProtocolIcon isSquare={ftProtocol === 'runes'}>{getProtocolIcon()}</ProtocolIcon>
+      {showProtocolIcon && protocolIcon && (
+        <ProtocolIcon isSquare={ftProtocol === 'runes'}>{protocolIcon}</ProtocolIcon>
       )}
     </TickerProtocolContainer>
   );
diff --git a/src/app/hooks/apiClients/useXverseApi.ts b/src/app/hooks/apiClients/useXverseApi.ts
new file mode 100644
index 000000000..16b2cbf05
--- /dev/null
+++ b/src/app/hooks/apiClients/useXverseApi.ts
@@ -0,0 +1,10 @@
+import { getXverseApiClient } from '@secretkeylabs/xverse-core';
+import { useMemo } from 'react';
+import useWalletSelector from '../useWalletSelector';
+
+const useXverseApi = () => {
+  const { network } = useWalletSelector();
+  return useMemo(() => getXverseApiClient(network.type), [network.type]);
+};
+
+export default useXverseApi;
diff --git a/src/app/hooks/queries/runes/useRuneFloorPricePerMarketplaceQuery.ts b/src/app/hooks/queries/runes/useRuneFloorPricePerMarketplaceQuery.ts
new file mode 100644
index 000000000..bb3fafb4b
--- /dev/null
+++ b/src/app/hooks/queries/runes/useRuneFloorPricePerMarketplaceQuery.ts
@@ -0,0 +1,36 @@
+import useXverseApi from '@hooks/apiClients/useXverseApi';
+import useWalletSelector from '@hooks/useWalletSelector';
+import type { Marketplace, TokenId } from '@secretkeylabs/xverse-core';
+import { useQuery } from '@tanstack/react-query';
+import { useCallback } from 'react';
+
+export default function useRuneFloorPricePerMarketplaceQuery(
+  token: TokenId,
+  marketplaces: Marketplace[],
+  backgroundRefetch = true,
+) {
+  const { network } = useWalletSelector();
+  const xverseApi = useXverseApi();
+
+  const queryFn = useCallback(
+    () =>
+      xverseApi.listings.getRuneMarketData(token, marketplaces).then((res) =>
+        res
+          .filter((data) => marketplaces.includes(data.marketplace.name))
+          .sort((a, b) => (a.marketplace.name < b.marketplace.name ? -1 : 1))
+          .map((data) => ({
+            floorPrice: Number(data.floorPrice ?? '0'),
+            marketplace: data.marketplace,
+          })),
+      ),
+    [token, marketplaces, xverseApi],
+  );
+
+  return useQuery({
+    refetchOnWindowFocus: backgroundRefetch,
+    refetchOnReconnect: backgroundRefetch,
+    queryKey: ['get-rune-floor-price-per-marketplace', token],
+    enabled: Boolean(Object.keys(token).length) && network.type === 'Mainnet',
+    queryFn,
+  });
+}
diff --git a/src/app/hooks/queries/runes/useRuneSellPsbt.ts b/src/app/hooks/queries/runes/useRuneSellPsbt.ts
index 8efb17536..d2236b97d 100644
--- a/src/app/hooks/queries/runes/useRuneSellPsbt.ts
+++ b/src/app/hooks/queries/runes/useRuneSellPsbt.ts
@@ -3,6 +3,7 @@ import useSelectedAccount from '@hooks/useSelectedAccount';
 import useWalletSelector from '@hooks/useWalletSelector';
 import { BitcoinNetworkType } from '@sats-connect/core';
 import type { RuneSellRequest } from '@secretkeylabs/xverse-core';
+import { sanitizeRuneName } from '@utils/helper';
 import type { RuneItem } from '@utils/runes';
 import { useCallback, useState } from 'react';
 
@@ -20,7 +21,7 @@ const useRuneSellPsbt = (runeName: string, listingUtxos: Record<string, RuneItem
   const runesApi = useRunesApi();
 
   const getRuneSellPsbt = useCallback(async () => {
-    const sanitizedRuneName = runeName.replace(/[^A-Za-z]+/g, '').toUpperCase();
+    const sanitizedRuneName = sanitizeRuneName(runeName);
     const utxosToList = Object.entries(listingUtxos)
       .filter((item) => item[1].selected)
       .map(([key, item]) => ({
diff --git a/src/app/hooks/queries/runes/useRuneSellPsbtPerMarketplace.ts b/src/app/hooks/queries/runes/useRuneSellPsbtPerMarketplace.ts
new file mode 100644
index 000000000..51db2a39e
--- /dev/null
+++ b/src/app/hooks/queries/runes/useRuneSellPsbtPerMarketplace.ts
@@ -0,0 +1,85 @@
+import useXverseApi from '@hooks/apiClients/useXverseApi';
+import useSelectedAccount from '@hooks/useSelectedAccount';
+import useWalletSelector from '@hooks/useWalletSelector';
+import { BitcoinNetworkType } from '@sats-connect/core';
+import type { CreateRuneListingRequest, Marketplace } from '@secretkeylabs/xverse-core';
+import { sanitizeRuneName } from '@utils/helper';
+import type { RuneItem } from '@utils/runes';
+import { useCallback, useState } from 'react';
+
+const useRuneSellPsbtPerMarketplace = (
+  runeName: string,
+  listingUtxos: Record<string, RuneItem>,
+  selectedMarketplaces: Marketplace[],
+) => {
+  const { network } = useWalletSelector();
+  const { ordinalsAddress, ordinalsPublicKey, btcAddress } = useSelectedAccount();
+
+  const [loading, setLoading] = useState<boolean>(false);
+  const [signPsbtPayload, setSignPsbtPayload] = useState<null | object>(null);
+  const [error, setError] = useState<string | null>(null);
+  const xverseApi = useXverseApi();
+
+  const getRuneSellPsbt = useCallback(async () => {
+    const sanitizedRuneName = sanitizeRuneName(runeName);
+    const utxosToList = Object.entries(listingUtxos)
+      .filter((item) => item[1].selected)
+      .map(([key, item]) => ({
+        location: key.split(':')[0],
+        index: Number(key.split(':')[1]),
+        priceSats: item.priceSats,
+        amount: item.amount,
+      }));
+
+    const expiresAt = new Date();
+    expiresAt.setDate(expiresAt.getDate() + 10); // 10 days from now
+
+    const args: CreateRuneListingRequest = {
+      rune: sanitizedRuneName,
+      makerRunesPublicKey: ordinalsPublicKey,
+      makerRunesAddress: ordinalsAddress,
+      makerReceiveAddress: btcAddress,
+      utxos: utxosToList,
+      expiresAt: expiresAt.toISOString(),
+      marketplaces: selectedMarketplaces,
+    };
+
+    setLoading(true);
+    setError(null);
+
+    await xverseApi.listings
+      .getRuneSellOrder(args)
+      .then((sellOrder) => {
+        const payload = {
+          network: {
+            type:
+              network.type === 'Mainnet' ? BitcoinNetworkType.Mainnet : BitcoinNetworkType.Testnet,
+          },
+          message: 'Sign Transactions',
+          psbts: sellOrder.map((order) => ({
+            psbtBase64: order.psbt,
+            inputsToSign: undefined,
+            marketplaceName: order.marketplace.name,
+            batchAuctionId: order.batchAuctionId,
+          })),
+        };
+
+        setSignPsbtPayload(payload);
+      })
+      .catch(() => setError('Failed to create listing'))
+      .finally(() => setLoading(false));
+  }, [
+    runeName,
+    listingUtxos,
+    btcAddress,
+    network,
+    ordinalsAddress,
+    ordinalsPublicKey,
+    xverseApi,
+    selectedMarketplaces,
+  ]);
+
+  return { getRuneSellPsbt, loading, signPsbtPayload, error };
+};
+
+export default useRuneSellPsbtPerMarketplace;
diff --git a/src/app/hooks/queries/runes/useSubmitRuneSellPsbt.ts b/src/app/hooks/queries/runes/useSubmitRuneSellPsbt.ts
index 928a4eee6..b05ba708f 100644
--- a/src/app/hooks/queries/runes/useSubmitRuneSellPsbt.ts
+++ b/src/app/hooks/queries/runes/useSubmitRuneSellPsbt.ts
@@ -1,6 +1,7 @@
 import useRunesApi from '@hooks/apiClients/useRunesApi';
 import useSelectedAccount from '@hooks/useSelectedAccount';
 import type { SubmitRuneSellRequest } from '@secretkeylabs/xverse-core';
+import { sanitizeRuneName } from '@utils/helper';
 import { useCallback } from 'react';
 
 const useSubmitRuneSellPsbt = () => {
@@ -10,7 +11,7 @@ const useSubmitRuneSellPsbt = () => {
   const submitRuneSellPsbt = useCallback(
     async (signedPsbtBase64: string, runeName: string) => {
       const expiresAt = new Date();
-      const sanitizedRuneName = runeName.replace(/[^A-Za-z]+/g, '').toUpperCase();
+      const sanitizedRuneName = sanitizeRuneName(runeName);
       // setting the expiration date to 10 days from now
       expiresAt.setDate(expiresAt.getDate() + 10);
       const args: SubmitRuneSellRequest = {
diff --git a/src/app/hooks/useSearchParamsState.ts b/src/app/hooks/useSearchParamsState.ts
index 5a88747e4..556ee310f 100644
--- a/src/app/hooks/useSearchParamsState.ts
+++ b/src/app/hooks/useSearchParamsState.ts
@@ -1,8 +1,12 @@
-import { useState } from 'react';
+import { useEffect, useState } from 'react';
 import { useSearchParams } from 'react-router-dom';
 
 const useSearchParamsState = <T>(key: string, defaultValue: T): [T, (newValue: T) => void] => {
-  const [searchParams, setSearchParams] = useSearchParams();
+  const [searchParams, setSearchParamsInternal] = useSearchParams();
+  const setSearchParam = (newValue: T) => {
+    searchParams.set(key, JSON.stringify(newValue));
+    setSearchParamsInternal(searchParams);
+  };
 
   const paramValue = searchParams.get(key);
   const initialValue = paramValue !== null ? (JSON.parse(paramValue) as T) : defaultValue;
@@ -10,10 +14,13 @@ const useSearchParamsState = <T>(key: string, defaultValue: T): [T, (newValue: T
   const [value, setValue] = useState<T>(initialValue);
   const customSetter = (newValue: T) => {
     setValue(newValue);
-    searchParams.set(key, JSON.stringify(newValue));
-    setSearchParams(searchParams);
+    setSearchParam(newValue);
   };
 
+  useEffect(() => {
+    setSearchParam(initialValue);
+  }, []);
+
   return [value, customSetter];
 };
 
diff --git a/src/app/hooks/useSignBatchPsbtTx.ts b/src/app/hooks/useSignBatchPsbtTx.ts
index f44ba74b6..615461df9 100644
--- a/src/app/hooks/useSignBatchPsbtTx.ts
+++ b/src/app/hooks/useSignBatchPsbtTx.ts
@@ -9,12 +9,17 @@ import useSeedVault from './useSeedVault';
 
 const useSignBatchPsbtTx = () => {
   const { accountsList, network } = useWalletSelector();
-  const { search } = useLocation();
+  const location = useLocation();
+  const locationState = useMemo(() => location.state || {}, []);
+  const { search } = location;
   const { getSeed } = useSeedVault();
   const params = new URLSearchParams(search);
+  const inApp = params.get('signBatchPsbtsInApp') ?? false;
   const requestToken = params.get('signBatchPsbtRequest') ?? '';
+
   const request = useMemo(
-    () => decodeToken(requestToken) as any as SignMultipleTransactionOptions,
+    () =>
+      inApp ? locationState : (decodeToken(requestToken) as any as SignMultipleTransactionOptions),
     [requestToken],
   );
   const tabId = params.get('tabId') ?? '0';
@@ -25,7 +30,7 @@ const useSignBatchPsbtTx = () => {
     const signingResponse = await signPsbt(
       seedPhrase,
       accountsList,
-      psbt.inputsToSign,
+      psbt.inputsToSign || [],
       psbt.psbtBase64,
       false,
       network.type,
@@ -63,6 +68,8 @@ const useSignBatchPsbtTx = () => {
     getSigningAddresses,
     confirmSignPsbt,
     cancelSignPsbt,
+    selectedRune: locationState.selectedRune,
+    minPriceSats: locationState.minPriceSats,
   };
 };
 
diff --git a/src/app/routes/index.tsx b/src/app/routes/index.tsx
index 7afaf70f3..ae1350bb7 100644
--- a/src/app/routes/index.tsx
+++ b/src/app/routes/index.tsx
@@ -78,6 +78,7 @@ import Stacking from '@screens/stacking';
 import SwapScreen from '@screens/swap';
 import TransactionRequest from '@screens/transactionRequest';
 import TransactionStatus from '@screens/transactionStatus';
+import MultipleMarketplaceListingResult from '@screens/transactionStatus/multipleMarketplaceListingResult';
 import TransferRunesRequest from '@screens/transferRunesRequest';
 import UnlistRuneScreen from '@screens/unlistRune';
 import WalletExists from '@screens/walletExists';
@@ -400,6 +401,10 @@ const router = createHashRouter([
         path: 'tx-status',
         element: <TransactionStatus />,
       },
+      {
+        path: 'multiple-marketplace-listing-result',
+        element: <MultipleMarketplaceListingResult />,
+      },
       {
         path: 'buy/:currency',
         element: <Buy />,
diff --git a/src/app/screens/listRune/index.tsx b/src/app/screens/listRune/index.tsx
index 258a5d06c..ebf1ec96f 100644
--- a/src/app/screens/listRune/index.tsx
+++ b/src/app/screens/listRune/index.tsx
@@ -1,8 +1,9 @@
+import RequestsRoutes from '@common/utils/route-urls';
 import BottomBar from '@components/tabBar';
 import TopRow from '@components/topRow';
-import useRuneFloorPriceQuery from '@hooks/queries/runes/useRuneFloorPriceQuery';
+import useRuneFloorPricePerMarketplaceQuery from '@hooks/queries/runes/useRuneFloorPricePerMarketplaceQuery';
 import { useVisibleRuneFungibleTokens } from '@hooks/queries/runes/useRuneFungibleTokensQuery';
-import useRuneSellPsbt from '@hooks/queries/runes/useRuneSellPsbt';
+import useRuneSellPsbtPerMarketplace from '@hooks/queries/runes/useRuneSellPsbtPerMarketplace';
 import useRuneUtxosQuery from '@hooks/queries/runes/useRuneUtxosQuery';
 import useCoinRates from '@hooks/queries/useCoinRates';
 import useHasFeature from '@hooks/useHasFeature';
@@ -18,6 +19,8 @@ import {
   currencySymbolMap,
   getBtcFiatEquivalent,
   satsToBtc,
+  type FungibleToken,
+  type Marketplace,
 } from '@secretkeylabs/xverse-core';
 import Button, { LinkButton } from '@ui-library/button';
 import { StickyButtonContainer, StyledP } from '@ui-library/common.styled';
@@ -25,7 +28,7 @@ import Spinner from '@ui-library/spinner';
 import { formatToXDecimalPlaces, ftDecimals } from '@utils/helper';
 import { getFullTxId, getTxIdFromFullTxId, getVoutFromFullTxId } from '@utils/runes';
 import BigNumber from 'bignumber.js';
-import { useEffect, useReducer } from 'react';
+import { useEffect, useMemo, useReducer, useState } from 'react';
 import toast from 'react-hot-toast';
 import { useTranslation } from 'react-i18next';
 import { NumericFormat } from 'react-number-format';
@@ -52,9 +55,15 @@ import {
   TabButtonsContainer,
   TabContainer,
 } from './index.styled';
+import ListMarketplaceItem from './listMarketplaceItem';
 import WrapperComponent from './listRuneWrapper';
 import SetCustomPriceModal from './setCustomPriceModal';
 
+const joinedSelectedMarketplaces = (selectedMarketplaces: Marketplace[]) => {
+  const last = selectedMarketplaces.pop();
+  return [selectedMarketplaces.join(', '), last].filter((s) => s).join(' and ');
+};
+
 export default function ListRuneScreen() {
   const { t } = useTranslation('translation', { keyPrefix: 'LIST_RUNE_SCREEN' });
   const navigate = useNavigate();
@@ -82,13 +91,31 @@ export default function ListRuneScreen() {
     refetch,
   } = useRuneUtxosQuery(selectedRune?.name ?? '', 'unlisted', false);
 
+  const supportedMarketplaces: Marketplace[] = ['Unisat', 'Magic Eden'];
   const {
-    data: runeFloorPrice,
+    data: floorPriceData,
     isInitialLoading: floorPriceLoading,
     isRefetching: floorPriceRefetching,
-  } = useRuneFloorPriceQuery(selectedRune?.name ?? '', false);
+  } = useRuneFloorPricePerMarketplaceQuery(
+    {
+      name: selectedRune?.assetName ?? '',
+      id: selectedRune?.principal ?? '',
+    },
+    supportedMarketplaces,
+    false,
+  );
 
-  const noFloorPrice = runeFloorPrice === 0;
+  const [selectedMarketplaces, setSelectedMarketplaces] = useState(new Set<Marketplace>());
+  const runeFloorPrice = useMemo(
+    () =>
+      Math.min(
+        ...(floorPriceData
+          ?.filter((d) => selectedMarketplaces.has(d.marketplace.name))
+          .map((d) => d.floorPrice) || [0]),
+      ),
+    [floorPriceData, selectedMarketplaces],
+  );
+  const noFloorPrice = useMemo(() => runeFloorPrice === 0, [runeFloorPrice]);
 
   const isLoading =
     listItemsLoading || listItemsRefetching || floorPriceLoading || floorPriceRefetching;
@@ -112,7 +139,9 @@ export default function ListRuneScreen() {
     signPsbtPayload,
     loading: psbtLoading,
     error: psbtError,
-  } = useRuneSellPsbt(selectedRune?.name ?? '', listItemsMap);
+  } = useRuneSellPsbtPerMarketplace(selectedRune?.name ?? '', listItemsMap, [
+    ...selectedMarketplaces,
+  ]);
 
   const selectedListItems = Object.values(listItemsMap).filter((item) => item.selected);
 
@@ -141,7 +170,7 @@ export default function ListRuneScreen() {
     const curAmount = currentItem.amount;
     return curAmount > maxAmount ? curAmount : maxAmount;
   }, 0);
-  const maxGlobalPriceSats = 1_000_000_000 / highestSelectedRuneAmount;
+  const maxGlobalPriceSats = 500_000_000 / highestSelectedRuneAmount; // Unisat's maximum
 
   const invalidListings: boolean = selectedListItems.some(
     (item) => item.amount * item.priceSats < 10000 || item.amount * item.priceSats > 1000000000,
@@ -157,8 +186,23 @@ export default function ListRuneScreen() {
 
     if (section === 'SELECT_RUNES') {
       navigate(`/coinDashboard/FT?ftKey=${selectedRune?.principal}&protocol=runes`);
-    } else {
+    } else if (section === 'SELECT_MARKETPLACES') {
       dispatch({ type: 'SET_SECTION', payload: 'SELECT_RUNES' });
+    } else {
+      dispatch({ type: 'SET_SECTION', payload: 'SELECT_MARKETPLACES' });
+    }
+  };
+
+  const getTitle = () => {
+    switch (section) {
+      case 'SELECT_RUNES':
+        return t('SELECT_RUNES');
+      case 'SELECT_MARKETPLACES':
+        return t('SELECT_MARKETPLACES');
+      case 'SET_PRICES':
+        return t('LIST_RUNES');
+      default:
+        return '';
     }
   };
 
@@ -166,6 +210,8 @@ export default function ListRuneScreen() {
     switch (section) {
       case 'SELECT_RUNES':
         return t('SELECT_RUNES_SECTION');
+      case 'SELECT_MARKETPLACES':
+        return t('SELECT_MARKETPLACES_SECTION');
       case 'SET_PRICES':
         return t('SET_PRICES_SECTION');
       default:
@@ -241,11 +287,11 @@ export default function ListRuneScreen() {
 
   useEffect(() => {
     if (signPsbtPayload) {
-      navigate(`/psbt-signing-request?magicEdenPsbt=true&runeId=${runeId}`, {
+      navigate(`${RequestsRoutes.SignBatchBtcTx}?signBatchPsbtsInApp=true`, {
         state: {
           payload: signPsbtPayload,
+          minPriceSats: Math.min(...Object.values(listItemsMap).map((item) => item.priceSats)),
           selectedRune,
-          listRunesState,
         },
       });
     }
@@ -293,7 +339,7 @@ export default function ListRuneScreen() {
         <TopRow onClick={handleGoBack} />
         <Container>
           <PaddingContainer>
-            <Header>{t('LIST_RUNES')}</Header>
+            <Header>{getTitle()}</Header>
             <StyledP color="white_200" typography="body_m">
               {getDesc()}
             </StyledP>
@@ -361,8 +407,10 @@ export default function ListRuneScreen() {
                 <PaddingContainer>
                   <StickyButtonContainer>
                     <Button
-                      title={t('SET_PRICES')}
-                      onClick={() => dispatch({ type: 'SET_SECTION', payload: 'SET_PRICES' })}
+                      title={t('NEXT')}
+                      onClick={() =>
+                        dispatch({ type: 'SET_SECTION', payload: 'SELECT_MARKETPLACES' })
+                      }
                       variant="primary"
                       disabled={!Object.values(listItemsMap).some((item) => item.selected)}
                     />
@@ -370,6 +418,49 @@ export default function ListRuneScreen() {
                 </PaddingContainer>
               </>
             )}
+            {section === 'SELECT_MARKETPLACES' && (
+              <>
+                <ScrollContainer style={{ marginTop: theme.space.xl }}>
+                  <PaddingContainer>
+                    <ListRunesContainer>
+                      {floorPriceData?.map((runeMarketInfo) => {
+                        const { name } = runeMarketInfo.marketplace;
+                        const selected = selectedMarketplaces.has(name);
+
+                        return (
+                          <ListMarketplaceItem
+                            key={name}
+                            runeMarketInfo={runeMarketInfo}
+                            rune={selectedRune as FungibleToken}
+                            selected={selected}
+                            onToggle={() =>
+                              setSelectedMarketplaces((prev) => {
+                                if (selected) {
+                                  prev.delete(name);
+                                } else {
+                                  prev.add(name);
+                                }
+                                return new Set([...prev]);
+                              })
+                            }
+                          />
+                        );
+                      })}
+                    </ListRunesContainer>
+                  </PaddingContainer>
+                </ScrollContainer>
+                <PaddingContainer>
+                  <StickyButtonContainer>
+                    <Button
+                      title={t('NEXT')}
+                      onClick={() => dispatch({ type: 'SET_SECTION', payload: 'SET_PRICES' })}
+                      variant="primary"
+                      disabled={!selectedMarketplaces.size}
+                    />
+                  </StickyButtonContainer>
+                </PaddingContainer>
+              </>
+            )}
             {section === 'SET_PRICES' && (
               <>
                 <PaddingContainer>
@@ -436,9 +527,10 @@ export default function ListRuneScreen() {
                     <StyledP typography="body_medium_s" color="white_200">
                       {noFloorPrice
                         ? t('NO_FLOOR_PRICE', { symbol: selectedRune?.runeSymbol })
-                        : t('MAGIC_EDEN_FLOOR_PRICE', {
+                        : t('MARKETPLACE_FLOOR_PRICE', {
                             sats: formatToXDecimalPlaces(runeFloorPrice, 5),
                             symbol: selectedRune?.runeSymbol,
+                            marketplaces: joinedSelectedMarketplaces([...selectedMarketplaces]),
                           })}
                     </StyledP>
                   </SetRunePricesContainer>
diff --git a/src/app/screens/listRune/listMarketplaceItem.tsx b/src/app/screens/listRune/listMarketplaceItem.tsx
new file mode 100644
index 000000000..261033a01
--- /dev/null
+++ b/src/app/screens/listRune/listMarketplaceItem.tsx
@@ -0,0 +1,86 @@
+import { RowCenter } from '@components/confirmBtcTransaction/runes';
+import TokenImage from '@components/tokenImage';
+import type { FungibleToken, ListingProvider } from '@secretkeylabs/xverse-core';
+import Checkbox from '@ui-library/checkbox';
+import { StyledP } from '@ui-library/common.styled';
+import { formatNumber } from '@utils/helper';
+import { useTranslation } from 'react-i18next';
+import styled from 'styled-components';
+import theme from 'theme';
+
+const Container = styled.div<{ $selected: boolean }>`
+  display: flex;
+  align-items: center;
+  flex-direction: row;
+  justify-content: space-between;
+  flex: 1;
+  padding: ${(props) => props.theme.space.s};
+  padding-right: ${(props) => props.theme.space.m};
+  border-radius: ${(props) => props.theme.space.xs};
+  border: 1px solid;
+  border-color: ${(props) => (props.$selected ? props.theme.colors.white_900 : 'transparent')};
+  background-color: ${(props) =>
+    props.$selected ? props.theme.colors.elevation2 : props.theme.colors.elevation1};
+  transition: background-color 0.1s ease, border-color 0.1s ease;
+`;
+
+const InfoContainer = styled.div`
+  display: flex;
+  flex: 1;
+  flex-direction: column;
+  gap: ${(props) => props.theme.space.xxxs};
+`;
+
+const SubtitleContainer = styled.div((props) => ({
+  marginTop: props.theme.space.xxs,
+}));
+
+const CheckBoxContainer = styled.div((props) => ({
+  marginRight: props.theme.space.s,
+}));
+
+type Props = {
+  runeMarketInfo: {
+    floorPrice: number;
+    marketplace: ListingProvider;
+  };
+  rune: FungibleToken;
+  selected: boolean;
+  onToggle: () => void;
+};
+
+function ListMarketplaceItem({ runeMarketInfo, rune, selected, onToggle }: Props) {
+  const { t } = useTranslation('translation', { keyPrefix: 'LIST_RUNE_SCREEN' });
+  const { floorPrice: rawFloorPrice, marketplace } = runeMarketInfo;
+  const floorPrice = formatNumber(rawFloorPrice);
+
+  return (
+    <Container data-testid="rune-item" $selected={selected}>
+      <CheckBoxContainer>
+        <Checkbox checkboxId="list-rune" checked={selected} onChange={onToggle} color="white_400" />
+      </CheckBoxContainer>
+      <div style={{ marginRight: theme.space.s }}>
+        <TokenImage fungibleToken={{ image: marketplace.logo } as FungibleToken} size={32} />
+      </div>
+      <InfoContainer>
+        <RowCenter>
+          <StyledP typography="body_bold_m" color="white_0">
+            {marketplace.name}
+          </StyledP>
+        </RowCenter>
+        <RowCenter>
+          <SubtitleContainer>
+            <StyledP typography="body_medium_s" color="white_200">
+              {t('FLOOR_PRICE', {
+                floor_price: floorPrice,
+                symbol: rune.runeSymbol || rune.name,
+              })}
+            </StyledP>
+          </SubtitleContainer>
+        </RowCenter>
+      </InfoContainer>
+    </Container>
+  );
+}
+
+export default ListMarketplaceItem;
diff --git a/src/app/screens/listRune/reducer.tsx b/src/app/screens/listRune/reducer.tsx
index bbc1454c0..16f20184e 100644
--- a/src/app/screens/listRune/reducer.tsx
+++ b/src/app/screens/listRune/reducer.tsx
@@ -1,8 +1,10 @@
 import type { RuneItem } from '@utils/runes';
 
+export type SupportedSections = 'SELECT_RUNES' | 'SELECT_MARKETPLACES' | 'SET_PRICES';
+
 interface ListRunesState {
   listItemsMap: Record<string, RuneItem>;
-  section: 'SELECT_RUNES' | 'SET_PRICES';
+  section: SupportedSections;
   selectAllToggle: boolean;
   runePriceOption: 1 | 1.05 | 1.1 | 1.2 | 'custom';
   customRunePrice: number | null;
@@ -18,7 +20,7 @@ type Action =
   | { type: 'TOGGLE_ALL_LIST_ITEMS'; payload: boolean }
   | { type: 'SET_ALL_LIST_ITEMS_PRICES'; payload: number }
   | { type: 'UPDATE_ONE_LIST_ITEM'; key: string; payload: RuneItem }
-  | { type: 'SET_SECTION'; payload: 'SELECT_RUNES' | 'SET_PRICES' }
+  | { type: 'SET_SECTION'; payload: SupportedSections }
   | { type: 'SET_SELECT_ALL_TOGGLE'; payload: boolean }
   | { type: 'SET_RUNE_PRICE_OPTION'; payload: 1 | 1.05 | 1.1 | 1.2 | 'custom' }
   | { type: 'SET_CUSTOM_RUNE_PRICE'; payload: number | null }
diff --git a/src/app/screens/signBatchPsbtRequest/index.tsx b/src/app/screens/signBatchPsbtRequest/index.tsx
index 60777d69e..f35b765da 100644
--- a/src/app/screens/signBatchPsbtRequest/index.tsx
+++ b/src/app/screens/signBatchPsbtRequest/index.tsx
@@ -17,7 +17,9 @@ import InfoContainer from '@components/infoContainer';
 import LoadingTransactionStatus from '@components/loadingTransactionStatus';
 import type { ConfirmationStatus } from '@components/loadingTransactionStatus/circularSvgAnimation';
 import TransactionDetailComponent from '@components/transactionDetailComponent';
+import useXverseApi from '@hooks/apiClients/useXverseApi';
 import useHasFeature from '@hooks/useHasFeature';
+import useSearchParamsState from '@hooks/useSearchParamsState';
 import useSelectedAccount from '@hooks/useSelectedAccount';
 import useSignBatchPsbtTx from '@hooks/useSignBatchPsbtTx';
 import useTrackMixPanelPageViewed from '@hooks/useTrackMixPanelPageViewed';
@@ -25,6 +27,7 @@ import useTransactionContext from '@hooks/useTransactionContext';
 import useWalletSelector from '@hooks/useWalletSelector';
 import { ArrowLeft, ArrowRight } from '@phosphor-icons/react';
 import type { SignMultiplePsbtPayload } from '@sats-connect/core';
+import { SigHash } from '@scure/btc-signer';
 import {
   AnalyticsEvents,
   FeatureId,
@@ -37,6 +40,7 @@ import Callout from '@ui-library/callout';
 import Spinner from '@ui-library/spinner';
 import { isLedgerAccount } from '@utils/helper';
 import { trackMixPanel } from '@utils/mixpanel';
+import objecthash from 'object-hash';
 import { useCallback, useEffect, useMemo, useState } from 'react';
 import { useTranslation } from 'react-i18next';
 import { useLocation, useNavigate } from 'react-router-dom';
@@ -57,17 +61,20 @@ import {
 interface TxResponse {
   txId: string;
   psbtBase64: string;
+  marketplaceName?: string;
+  batchAuctionId?: string;
 }
 
 type PsbtSummary = btcTransaction.PsbtSummary;
 type ParsedPsbt = { summary: PsbtSummary; runeSummary: RuneSummary | undefined };
-
 function SignBatchPsbtRequest() {
+  const [inApp] = useSearchParamsState('signBatchPsbtsInApp', false);
   const selectedAccount = useSelectedAccount();
   const { network } = useWalletSelector();
   const navigate = useNavigate();
   const { t } = useTranslation('translation', { keyPrefix: 'CONFIRM_TRANSACTION' });
-  const { payload, confirmSignPsbt, cancelSignPsbt, requestToken } = useSignBatchPsbtTx();
+  const { payload, confirmSignPsbt, cancelSignPsbt, requestToken, selectedRune, minPriceSats } =
+    useSignBatchPsbtTx();
   const [isSigning, setIsSigning] = useState(false);
   const [isSigningComplete, setIsSigningComplete] = useState(false);
   const [signingPsbtIndex, setSigningPsbtIndex] = useState(1);
@@ -84,6 +91,7 @@ function SignBatchPsbtRequest() {
   const hasRunesSupport = useHasFeature(FeatureId.RUNES_SUPPORT);
   useTrackMixPanelPageViewed();
   const [parsedPsbts, setParsedPsbts] = useState<ParsedPsbt[]>([]);
+  const xverseApi = useXverseApi();
 
   const individualParsedTxSummaryContext = useMemo(
     () => ({
@@ -190,7 +198,7 @@ function SignBatchPsbtRequest() {
       });
     }
 
-    payload.psbts.forEach((psbt) => psbt.inputsToSign.forEach(checkAddressMismatch));
+    payload.psbts?.forEach((psbt) => psbt.inputsToSign?.forEach(checkAddressMismatch));
   };
 
   useEffect(() => {
@@ -211,10 +219,30 @@ function SignBatchPsbtRequest() {
         // eslint-disable-next-line no-await-in-loop
         await delay(100);
         // eslint-disable-next-line no-await-in-loop
-        const signedPsbt = await confirmSignPsbt(psbt);
+        const enhancedPsbt = new btcTransaction.EnhancedPsbt(txnContext, psbt.psbtBase64);
+
+        let txId: string;
+        let psbtBase64: string;
+        if (inApp) {
+          txId = '';
+          psbtBase64 = await enhancedPsbt.getSignedPsbtBase64({
+            finalize: false,
+            ledgerTransport: undefined,
+            allowedSigHash:
+              psbt.marketplaceName === 'Magic Eden' ? [SigHash.SINGLE_ANYONECANPAY] : undefined,
+          });
+        } else {
+          const signedPsbt = await confirmSignPsbt(psbt);
+
+          txId = signedPsbt.txId;
+          psbtBase64 = signedPsbt.signingResponse;
+        }
+
         signedPsbts.push({
-          txId: signedPsbt.txId,
-          psbtBase64: signedPsbt.signingResponse,
+          txId,
+          psbtBase64,
+          marketplaceName: psbt.marketplaceName,
+          batchAuctionId: psbt.batchAuctionId,
         });
         if (payload.psbts.findIndex((item) => item === psbt) !== payload.psbts.length - 1) {
           setSigningPsbtIndex((prevIndex) => prevIndex + 1);
@@ -229,16 +257,58 @@ function SignBatchPsbtRequest() {
       setIsSigningComplete(true);
       setIsSigning(false);
 
-      const signingMessage = {
-        source: MESSAGE_SOURCE,
-        method: SatsConnectMethods.signBatchPsbtResponse,
-        payload: {
-          signBatchPsbtRequest: requestToken,
-          signBatchPsbtResponse: signedPsbts,
-        },
-      };
+      if (inApp) {
+        const expiresAt = new Date();
+        expiresAt.setDate(expiresAt.getDate() + 10); // 10 days from now
 
-      chrome.tabs.sendMessage(+tabId, signingMessage);
+        await xverseApi.listings
+          .submitRuneSellOrder(
+            signedPsbts.map((psbt) => ({
+              psbtBase64: psbt.psbtBase64,
+              marketplaceName: psbt.marketplaceName as string,
+              batchAuctionId: psbt.batchAuctionId,
+              ordinalsPublicKey: selectedAccount.ordinalsPublicKey,
+              ordinalsAddress: selectedAccount.ordinalsAddress,
+              btcAddress: selectedAccount.btcAddress,
+              rune: {
+                name: selectedRune?.assetName ?? '',
+                id: selectedRune?.principal ?? '',
+              },
+              expiresAt: expiresAt.toISOString(),
+            })),
+          )
+          .then((res) => {
+            if (res) {
+              navigate('/tx-status', {
+                state: {
+                  runeListed: selectedRune,
+                  orders: res,
+                  minPriceSats,
+                },
+              });
+            }
+          })
+          .catch((_) => {
+            navigate('/tx-status', {
+              state: {
+                txid: '',
+                error: '',
+                browserTx: true,
+              },
+            });
+          });
+      } else {
+        const signingMessage = {
+          source: MESSAGE_SOURCE,
+          method: SatsConnectMethods.signBatchPsbtResponse,
+          payload: {
+            signBatchPsbtRequest: requestToken,
+            signBatchPsbtResponse: signedPsbts,
+          },
+        };
+
+        chrome.tabs.sendMessage(+tabId, signingMessage);
+      }
     } catch (err) {
       setIsSigning(false);
       setIsSigningComplete(false);
@@ -273,10 +343,20 @@ function SignBatchPsbtRequest() {
 
   const signingStatus: ConfirmationStatus = isSigningComplete ? 'SUCCESS' : 'LOADING';
   const runeBurns = parsedPsbts.map((psbt) => psbt.runeSummary?.burns ?? []).flat();
+  const distinctRuneDelegations = new Set();
   const runeDelegations = parsedPsbts
     .filter((psbt) => !psbt.summary.isFinal)
     .map((psbt) => psbt.runeSummary?.receipts ?? [])
-    .flat();
+    .flat()
+    .filter((delegation) => {
+      const key = objecthash(delegation);
+      if (distinctRuneDelegations.has(key)) {
+        return false;
+      }
+
+      distinctRuneDelegations.add(key);
+      return true;
+    });
   const hasSomeRuneDelegation = runeDelegations.length > 0;
 
   if (isSigning || isSigningComplete) {
diff --git a/src/app/screens/transactionStatus/index.tsx b/src/app/screens/transactionStatus/index.tsx
index 4e34024cf..048e385da 100644
--- a/src/app/screens/transactionStatus/index.tsx
+++ b/src/app/screens/transactionStatus/index.tsx
@@ -1,5 +1,6 @@
 import ArrowSquareOut from '@assets/img/arrow_square_out.svg';
 import Success from '@assets/img/send/check_circle.svg';
+import Warning from '@assets/img/send/info_circle.svg';
 import Failure from '@assets/img/send/x_circle.svg';
 import {
   sendAddressMismatchMessage,
@@ -10,9 +11,11 @@ import ActionButton from '@components/button';
 import CopyButton from '@components/copyButton';
 import InfoContainer from '@components/infoContainer';
 import useWalletSelector from '@hooks/useWalletSelector';
+import type { SubmitRuneListingResponse } from '@secretkeylabs/xverse-core';
 import Button from '@ui-library/button';
 import { MAGIC_EDEN_RUNES_URL } from '@utils/constants';
 import { getBtcTxStatusUrl, getStxTxStatusUrl } from '@utils/helper';
+import { useMemo } from 'react';
 import { useTranslation } from 'react-i18next';
 import { useLocation, useNavigate } from 'react-router-dom';
 import styled from 'styled-components';
@@ -29,7 +32,6 @@ const Container = styled.div({
   flexDirection: 'column',
   justifyContent: 'center',
 });
-
 const OuterContainer = styled.div((props) => ({
   display: 'flex',
   flexDirection: 'column',
@@ -167,15 +169,46 @@ function TransactionStatus() {
     isSwapTransaction,
     tabId,
     messageId,
-  } = location.state as { tabId?: chrome.tabs.Tab['id']; messageId?: string; [key: string]: any };
+    orders,
+    minPriceSats,
+  } = location.state as {
+    tabId?: chrome.tabs.Tab['id'];
+    messageId?: string;
+    [key: string]: any;
+    orders?: SubmitRuneListingResponse[];
+    minPriceSats?: number;
+  };
+
+  const multipleOrders = useMemo(() => !!orders?.length, [orders]);
+  const failedMultipleOrders = useMemo(
+    () => orders?.filter((order) => !order.successfull).length,
+    [orders],
+  );
 
-  const renderTransactionSuccessStatus = (
+  /* eslint-disable no-inline-styles/no-inline-styles */
+  const renderTransactionSuccessStatus = multipleOrders ? (
+    <Container style={{ marginTop: '74px', marginBottom: '85px' }}>
+      <Image src={failedMultipleOrders ? Warning : Success} />
+      <HeadingText style={{ fontSize: '20px' }}>
+        {failedMultipleOrders ? t('BROADCASTED_MULTIPLE_PARTIALLY') : t('BROADCASTED_MULTIPLE')}
+      </HeadingText>
+      {failedMultipleOrders ? (
+        <BodyText style={{ fontSize: '16px' }}>
+          {t('BROADCASTED_MULTIPLE_PARTIALLY_SUBTITLE', {
+            failedTranscations: failedMultipleOrders,
+            totalTranscations: orders?.length,
+          })}
+        </BodyText>
+      ) : null}
+    </Container>
+  ) : (
     <Container>
       <Image src={Success} />
       <HeadingText>{sponsored ? t('SPONSORED_SUCCESS_MSG') : t('BROADCASTED')}</HeadingText>
       <BodyText>{sponsored ? t('SPONSORED_MSG') : t('SUCCESS_MSG')}</BodyText>
     </Container>
   );
+  /* eslint-enable no-inline-styles/no-inline-styles */
 
   const renderTransactionFailureStatus = (
     <Container>
@@ -207,10 +240,21 @@ function TransactionStatus() {
     } else if (isRareSat) navigate('/nft-dashboard?tab=rareSats');
     else if (isOrdinal) navigate('/nft-dashboard?tab=inscriptions');
     else if (isNft) navigate('/nft-dashboard?tab=nfts');
+    else if (multipleOrders) navigate('/');
     else if (runeListed) navigate(`/coinDashboard/FT?ftKey=${runeListed.principal}&protocol=runes`);
     else navigate('/');
   };
 
+  const onSeeDetail = () => {
+    navigate('/multiple-marketplace-listing-result', {
+      state: {
+        orders,
+        minPriceSats,
+        rune: runeListed,
+      },
+    });
+  };
+
   const handleClickTrySwapAgain = () => {
     navigate('/swap');
   };
@@ -242,18 +286,27 @@ function TransactionStatus() {
       <TxStatusContainer data-testid="transaction-container">
         <OuterContainer>{renderTransactionSuccessStatus}</OuterContainer>
         <ButtonContainer>
-          <Button variant="primary" title={t('CLOSE')} onClick={onCloseClick} />
-          <Button
-            variant="secondary"
-            title={t('SEE_ON_MAGICEDEN', { runeSymbol: runeListed?.runeSymbol ?? '' })}
-            onClick={() => {
-              window.open(
-                `${MAGIC_EDEN_RUNES_URL}/${runeListed?.name}`,
-                '_blank',
-                'noopener,noreferrer',
-              );
-            }}
-          />
+          {multipleOrders ? (
+            <>
+              <Button variant="primary" title={t('SEE_DETAIL')} onClick={onSeeDetail} />
+              <Button variant="secondary" title={t('CLOSE')} onClick={onCloseClick} />
+            </>
+          ) : (
+            <>
+              <Button variant="primary" title={t('CLOSE')} onClick={onCloseClick} />
+              <Button
+                variant="secondary"
+                title={t('SEE_ON_MAGICEDEN', { runeSymbol: runeListed?.runeSymbol ?? '' })}
+                onClick={() => {
+                  window.open(
+                    `${MAGIC_EDEN_RUNES_URL}/${runeListed?.name}`,
+                    '_blank',
+                    'noopener,noreferrer',
+                  );
+                }}
+              />
+            </>
+          )}
         </ButtonContainer>
       </TxStatusContainer>
     );
diff --git a/src/app/screens/transactionStatus/marketplaceRuneListingResults.tsx b/src/app/screens/transactionStatus/marketplaceRuneListingResults.tsx
new file mode 100644
index 000000000..03081d71c
--- /dev/null
+++ b/src/app/screens/transactionStatus/marketplaceRuneListingResults.tsx
@@ -0,0 +1,104 @@
+import CheckCircle from '@assets/img/listings/CheckCircle.svg';
+import XCircle from '@assets/img/listings/XCircle.svg';
+import { RowCenter } from '@components/confirmBtcTransaction/runes';
+import TokenImage from '@components/tokenImage';
+import { ArrowUpRight } from '@phosphor-icons/react';
+import type { FungibleToken, ListingProvider, Marketplace } from '@secretkeylabs/xverse-core';
+import { StyledP } from '@ui-library/common.styled';
+import { MAGIC_EDEN_RUNES_URL, OKX_RUNES_URL, UNISAT_RUNES_URL } from '@utils/constants';
+import { formatNumber } from '@utils/helper';
+import { useTranslation } from 'react-i18next';
+import styled from 'styled-components';
+import theme from 'theme';
+
+const Container = styled.div<{ $successfull: boolean }>`
+  display: flex;
+  align-items: center;
+  flex-direction: row;
+  justify-content: space-between;
+  flex: 1;
+  padding: ${(props) => props.theme.space.m};
+  padding-right: ${(props) => props.theme.space.m};
+  border-radius: ${(props) => props.theme.space.s};
+  border: 1px solid;
+  border-color: ${(props) =>
+    props.$successfull ? props.theme.colors.white_800 : props.theme.colors.white_900};
+  transition: background-color 0.1s ease, border-color 0.1s ease;
+  width: 100%;
+  gap: 10px;
+  cursor: ${(props) => (props.$successfull ? 'pointer' : 'auto')};
+`;
+
+const InfoContainer = styled.div`
+  display: flex;
+  flex: 1;
+  flex-direction: column;
+`;
+
+const SubtitleContainer = styled.div((props) => ({
+  marginTop: props.theme.space.xxs,
+}));
+
+type Props = {
+  minPriceSats: number;
+  marketplace: ListingProvider;
+  rune: FungibleToken;
+  successfull: boolean;
+};
+
+function MarketplaceRuneListingResult({ minPriceSats, marketplace, rune, successfull }: Props) {
+  const { t } = useTranslation('translation', { keyPrefix: 'LIST_RUNE_SCREEN' });
+  const floorPrice = formatNumber(minPriceSats);
+
+  const marketplaceToUrl: { [key in Marketplace]: string } = {
+    'Magic Eden': `${MAGIC_EDEN_RUNES_URL}/${rune.name}`,
+    Unisat: `${UNISAT_RUNES_URL}/market?tick=${rune.name}`,
+    OKX: `${OKX_RUNES_URL}/token/${rune.name}/${rune.ticker}`,
+  };
+
+  const handleClick = () =>
+    successfull && window.open(marketplaceToUrl[marketplace.name], '_blank', 'noopener,noreferrer');
+
+  return (
+    <Container
+      data-testid="marketplace-listing-result"
+      $successfull={successfull}
+      onClick={handleClick}
+    >
+      <div style={{ marginRight: theme.space.s }}>
+        <TokenImage
+          fungibleToken={{ image: marketplace.logo } as FungibleToken}
+          size={32}
+          customProtocolIcon={successfull ? CheckCircle : XCircle}
+          showProtocolIcon
+        />
+      </div>
+      <InfoContainer>
+        <RowCenter>
+          <StyledP typography="body_bold_m" color="white_0">
+            {marketplace.name}
+          </StyledP>
+        </RowCenter>
+        <RowCenter>
+          <SubtitleContainer>
+            {successfull ? (
+              <StyledP typography="body_medium_m" color="white_200">
+                {t('LISTED_FOR', {
+                  floor_price: floorPrice,
+                  symbol: rune.runeSymbol || rune.name,
+                })}
+              </StyledP>
+            ) : (
+              <StyledP typography="body_medium_m" color="danger_light">
+                {t('FAILED_TO_LIST')}
+              </StyledP>
+            )}
+          </SubtitleContainer>
+        </RowCenter>
+      </InfoContainer>
+      {successfull && <ArrowUpRight size="16" color={theme.colors.white_0} />}
+    </Container>
+  );
+}
+
+export default MarketplaceRuneListingResult;
diff --git a/src/app/screens/transactionStatus/multipleMarketplaceListingResult.tsx b/src/app/screens/transactionStatus/multipleMarketplaceListingResult.tsx
new file mode 100644
index 000000000..f8971d1e5
--- /dev/null
+++ b/src/app/screens/transactionStatus/multipleMarketplaceListingResult.tsx
@@ -0,0 +1,82 @@
+import { ArrowLeft } from '@phosphor-icons/react';
+import type { FungibleToken, ListingProvider } from '@secretkeylabs/xverse-core';
+import { useTranslation } from 'react-i18next';
+import { useLocation, useNavigate } from 'react-router-dom';
+import styled from 'styled-components';
+import MarketplaceRuneListingResult from './marketplaceRuneListingResults';
+
+const Container = styled.div((props) => ({
+  background: props.theme.colors.elevation0,
+  display: 'flex',
+  flexDirection: 'column',
+  justifyContent: 'flex-start',
+  height: '100%',
+  padding: `0px ${props.theme.space.m}`,
+}));
+
+const BackButtonContainer = styled.div((props) => ({
+  display: 'flex',
+  flexDirection: 'row',
+  width: '100%',
+  height: '68px',
+  marginBottom: props.theme.space.xs,
+}));
+
+const BackButton = styled.button((_props) => ({
+  display: 'flex',
+  flexDirection: 'row',
+  justifyContent: 'flex-start',
+  alignItems: 'center',
+  background: 'transparent',
+}));
+
+const HeaderContainer = styled.h1((props) => ({
+  ...props.theme.typography.headline_s,
+  color: props.theme.colors.white_0,
+  marginBottom: props.theme.space.l,
+}));
+
+const MarketplacesContainer = styled.div((props) => ({
+  display: 'flex',
+  flexDirection: 'column',
+  gap: props.theme.space.s,
+}));
+
+export default function MultipleMarketplaceListingResult() {
+  const { t } = useTranslation('translation', { keyPrefix: 'LIST_RUNE_SCREEN' });
+  const navigate = useNavigate();
+  const location = useLocation();
+  const { minPriceSats, rune, orders } = location.state as {
+    minPriceSats: number;
+    rune: FungibleToken;
+    orders: [
+      {
+        marketplace: ListingProvider;
+        successfull: boolean;
+      },
+    ];
+  };
+
+  return (
+    <Container>
+      <BackButtonContainer>
+        <BackButton data-testid="back-button" onClick={() => navigate('/')}>
+          <ArrowLeft weight="regular" size="20" color="white" />
+        </BackButton>
+      </BackButtonContainer>
+      <HeaderContainer>{t('LISTING_STATUS')}</HeaderContainer>
+      <MarketplacesContainer>
+        {orders?.map(({ marketplace, successfull }, index) => (
+          <MarketplaceRuneListingResult
+            // eslint-disable-next-line
+            key={index}
+            minPriceSats={minPriceSats || 0}
+            marketplace={marketplace}
+            rune={rune}
+            successfull={successfull}
+          />
+        ))}
+      </MarketplacesContainer>
+    </Container>
+  );
+}
diff --git a/src/app/utils/constants.ts b/src/app/utils/constants.ts
index 971e2eff7..1cd4105a8 100644
--- a/src/app/utils/constants.ts
+++ b/src/app/utils/constants.ts
@@ -35,6 +35,8 @@ export const MIX_PANEL_TOKEN = process.env.MIX_PANEL_TOKEN;
 export const MIX_PANEL_EXPLORE_APP_TOKEN = process.env.MIX_PANEL_EXPLORE_APP_TOKEN;
 
 export const MAGIC_EDEN_RUNES_URL = 'https://magiceden.io/runes';
+export const UNISAT_RUNES_URL = 'https://unisat.io/runes';
+export const OKX_RUNES_URL = 'https://www.okx.com/web3/marketplace/runes';
 
 export type CurrencyTypes = 'STX' | 'BTC' | 'FT' | 'NFT' | 'Ordinal' | 'brc20-Ordinal' | 'RareSat';
 export enum LoaderSize {
diff --git a/src/app/utils/helper.ts b/src/app/utils/helper.ts
index 5cd64f830..2a7671195 100644
--- a/src/app/utils/helper.ts
+++ b/src/app/utils/helper.ts
@@ -333,3 +333,5 @@ export const satsToBtcString = (num: BigNumber) =>
   satsToBtc(num)
     .toFixed(8)
     .replace(/\.?0+$/, '');
+
+export const sanitizeRuneName = (runeName) => runeName.replace(/[^A-Za-z]+/g, '').toUpperCase();
diff --git a/src/assets/img/listings/CheckCircle.svg b/src/assets/img/listings/CheckCircle.svg
new file mode 100644
index 000000000..2639e9ec7
--- /dev/null
+++ b/src/assets/img/listings/CheckCircle.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="M9 0.875C7.39303 0.875 5.82214 1.35152 4.486 2.24431C3.14985 3.1371 2.10844 4.40605 1.49348 5.8907C0.87852 7.37535 0.717618 9.00901 1.03112 10.5851C1.34463 12.1612 2.11846 13.6089 3.25476 14.7452C4.39106 15.8815 5.8388 16.6554 7.4149 16.9689C8.99099 17.2824 10.6247 17.1215 12.1093 16.5065C13.594 15.8916 14.8629 14.8502 15.7557 13.514C16.6485 12.1779 17.125 10.607 17.125 9C17.1227 6.84581 16.266 4.78051 14.7427 3.25727C13.2195 1.73403 11.1542 0.877275 9 0.875ZM12.5672 7.56719L8.19219 11.9422C8.13415 12.0003 8.06522 12.0464 7.98934 12.0779C7.91347 12.1093 7.83214 12.1255 7.75 12.1255C7.66787 12.1255 7.58654 12.1093 7.51067 12.0779C7.43479 12.0464 7.36586 12.0003 7.30782 11.9422L5.43282 10.0672C5.31554 9.94991 5.24966 9.79085 5.24966 9.625C5.24966 9.45915 5.31554 9.30009 5.43282 9.18281C5.55009 9.06554 5.70915 8.99965 5.875 8.99965C6.04086 8.99965 6.19992 9.06554 6.31719 9.18281L7.75 10.6164L11.6828 6.68281C11.7409 6.62474 11.8098 6.57868 11.8857 6.54725C11.9616 6.51583 12.0429 6.49965 12.125 6.49965C12.2071 6.49965 12.2884 6.51583 12.3643 6.54725C12.4402 6.57868 12.5091 6.62474 12.5672 6.68281C12.6253 6.74088 12.6713 6.80982 12.7027 6.88569C12.7342 6.96156 12.7504 7.04288 12.7504 7.125C12.7504 7.20712 12.7342 7.28844 12.7027 7.36431C12.6713 7.44018 12.6253 7.50912 12.5672 7.56719Z" fill="#55E078"/>
+</svg>
diff --git a/src/assets/img/listings/XCircle.svg b/src/assets/img/listings/XCircle.svg
new file mode 100644
index 000000000..a3fea84bc
--- /dev/null
+++ b/src/assets/img/listings/XCircle.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="M9 0.875C7.39303 0.875 5.82214 1.35152 4.486 2.24431C3.14985 3.1371 2.10844 4.40605 1.49348 5.8907C0.87852 7.37535 0.717618 9.00901 1.03112 10.5851C1.34463 12.1612 2.11846 13.6089 3.25476 14.7452C4.39106 15.8815 5.8388 16.6554 7.4149 16.9689C8.99099 17.2824 10.6247 17.1215 12.1093 16.5065C13.594 15.8916 14.8629 14.8502 15.7557 13.514C16.6485 12.1779 17.125 10.607 17.125 9C17.1227 6.84581 16.266 4.78051 14.7427 3.25727C13.2195 1.73403 11.1542 0.877275 9 0.875ZM11.9422 11.0578C12.0003 11.1159 12.0463 11.1848 12.0777 11.2607C12.1092 11.3366 12.1254 11.4179 12.1254 11.5C12.1254 11.5821 12.1092 11.6634 12.0777 11.7393C12.0463 11.8152 12.0003 11.8841 11.9422 11.9422C11.8841 12.0003 11.8152 12.0463 11.7393 12.0777C11.6634 12.1092 11.5821 12.1253 11.5 12.1253C11.4179 12.1253 11.3366 12.1092 11.2607 12.0777C11.1848 12.0463 11.1159 12.0003 11.0578 11.9422L9 9.88359L6.94219 11.9422C6.88412 12.0003 6.81518 12.0463 6.73931 12.0777C6.66344 12.1092 6.58213 12.1253 6.5 12.1253C6.41788 12.1253 6.33656 12.1092 6.26069 12.0777C6.18482 12.0463 6.11588 12.0003 6.05782 11.9422C5.99975 11.8841 5.95368 11.8152 5.92226 11.7393C5.89083 11.6634 5.87466 11.5821 5.87466 11.5C5.87466 11.4179 5.89083 11.3366 5.92226 11.2607C5.95368 11.1848 5.99975 11.1159 6.05782 11.0578L8.11641 9L6.05782 6.94219C5.94054 6.82491 5.87466 6.66585 5.87466 6.5C5.87466 6.33415 5.94054 6.17509 6.05782 6.05781C6.17509 5.94054 6.33415 5.87465 6.5 5.87465C6.66586 5.87465 6.82492 5.94054 6.94219 6.05781L9 8.11641L11.0578 6.05781C11.1159 5.99974 11.1848 5.95368 11.2607 5.92225C11.3366 5.89083 11.4179 5.87465 11.5 5.87465C11.5821 5.87465 11.6634 5.89083 11.7393 5.92225C11.8152 5.95368 11.8841 5.99974 11.9422 6.05781C12.0003 6.11588 12.0463 6.18482 12.0777 6.26069C12.1092 6.33656 12.1254 6.41788 12.1254 6.5C12.1254 6.58212 12.1092 6.66344 12.0777 6.73931C12.0463 6.81518 12.0003 6.88412 11.9422 6.94219L9.8836 9L11.9422 11.0578Z" fill="#FF5A5A"/>
+</svg>
diff --git a/src/assets/img/send/info_circle.svg b/src/assets/img/send/info_circle.svg
new file mode 100644
index 000000000..0f9ab6136
--- /dev/null
+++ b/src/assets/img/send/info_circle.svg
@@ -0,0 +1,3 @@
+<svg width="70" height="69" viewBox="0 0 70 69" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M35 0.125C28.2013 0.125 21.5552 2.14106 15.9023 5.91823C10.2493 9.69541 5.84342 15.064 3.24166 21.3453C0.639894 27.6265 -0.0408453 34.5381 1.28552 41.2062C2.61189 47.8743 5.88579 53.9994 10.6932 58.8068C15.5007 63.6142 21.6257 66.8881 28.2938 68.2145C34.9619 69.5409 41.8735 68.8601 48.1548 66.2584C54.436 63.6566 59.8046 59.2507 63.5818 53.5977C67.359 47.9448 69.375 41.2987 69.375 34.5C69.365 25.3863 65.7402 16.6487 59.2958 10.2043C52.8514 3.75986 44.1138 0.135009 35 0.125ZM35 66.125C28.7452 66.125 22.6308 64.2702 17.4301 60.7952C12.2294 57.3202 8.17595 52.3811 5.78232 46.6024C3.3887 40.8237 2.76242 34.4649 3.98268 28.3303C5.20294 22.1956 8.21493 16.5606 12.6378 12.1377C17.0606 7.71491 22.6956 4.70292 28.8303 3.48267C34.9649 2.26241 41.3237 2.88869 47.1024 5.28231C52.8811 7.67593 57.8202 11.7294 61.2952 16.9301C64.7702 22.1308 66.625 28.2452 66.625 34.5C66.6159 42.8847 63.2811 50.9233 57.3522 56.8522C51.4233 62.7811 43.3847 66.1159 35 66.125ZM33.625 37.25V18C33.625 17.6353 33.7699 17.2856 34.0277 17.0277C34.2856 16.7699 34.6353 16.625 35 16.625C35.3647 16.625 35.7144 16.7699 35.9723 17.0277C36.2302 17.2856 36.375 17.6353 36.375 18V37.25C36.375 37.6147 36.2302 37.9644 35.9723 38.2223C35.7144 38.4801 35.3647 38.625 35 38.625C34.6353 38.625 34.2856 38.4801 34.0277 38.2223C33.7699 37.9644 33.625 37.6147 33.625 37.25ZM37.75 49.625C37.75 50.1689 37.5887 50.7006 37.2866 51.1528C36.9844 51.6051 36.5549 51.9575 36.0524 52.1657C35.5499 52.3738 34.997 52.4283 34.4635 52.3222C33.9301 52.216 33.4401 51.9541 33.0555 51.5695C32.6709 51.185 32.409 50.695 32.3029 50.1615C32.1967 49.6281 32.2512 49.0751 32.4593 48.5726C32.6675 48.0701 33.02 47.6406 33.4722 47.3385C33.9244 47.0363 34.4561 46.875 35 46.875C35.7294 46.875 36.4288 47.1647 36.9446 47.6805C37.4603 48.1962 37.75 48.8957 37.75 49.625Z" fill="#F2A900"/>
+</svg>
diff --git a/src/locales/en.json b/src/locales/en.json
index 792e1bc98..faa0cc20a 100644
--- a/src/locales/en.json
+++ b/src/locales/en.json
@@ -502,8 +502,12 @@
   },
   "TRANSACTION_STATUS": {
     "BROADCASTED": "Transaction broadcasted",
+    "BROADCASTED_MULTIPLE": "Transactions broadcasted",
+    "BROADCASTED_MULTIPLE_PARTIALLY": "Transactions partially broadcasted",
+    "BROADCASTED_MULTIPLE_PARTIALLY_SUBTITLE": "{{failedTranscations}}/{{totalTranscations}} transcations failed to broadcast.",
     "SUCCESS_MSG": "Your transaction has been successfully submitted.",
     "SEE_ON": "See on",
+    "SEE_DETAIL": "See detail",
     "SEE_ON_MAGICEDEN": "See {{runeSymbol}} on Magic Eden",
     "STACKS_EXPLORER": "Stacks Explorer",
     "BITCOIN_EXPLORER": "Explorer",
@@ -922,17 +926,26 @@
     "THIRD_PARTY_WARNING": "You will be redirected to a third-party service provider to complete the purchase. If you encounter any issues during the process please contact the provider."
   },
   "LIST_RUNE_SCREEN": {
+    "LISTING_STATUS": "Listing status",
+    "FLOOR_PRICE": "Floor Price: {{floor_price}} Sats/{{symbol}}",
+    "LISTED_FOR": "Listed for {{floor_price}} Sats/{{symbol}}",
+    "FAILED_TO_LIST": "Failed to list",
+    "SELECT_RUNES": "Select Runes",
+    "SELECT_MARKETPLACES": "Select Marketplaces",
     "LIST_RUNES": "List Runes",
-    "SELECT_RUNES_SECTION": "Select Runes bundles to list on Magic Eden’s runes marketplace.",
+    "SELECT_RUNES_SECTION": "Select Runes bundles to list on marketplaces.",
+    "SELECT_MARKETPLACES_SECTION": "Select the Marketplaces you want to list your Runes on.",
     "SET_PRICES_SECTION": "Set the listing price for your Runes bundles.",
     "CONTINUE": "Continue",
     "LISTED": "LISTED",
     "NOT_LISTED": "NOT LISTED",
     "SELECT_ALL": "Select all",
     "DESELECT_ALL": "Deselect all",
+    "NEXT": "Next",
     "SET_PRICES": "Set price",
     "EDIT_PRICE": "Edit price",
     "MAGIC_EDEN_FLOOR_PRICE": "The Magic Eden floor price is currently {{sats}} sats/{{symbol}}",
+    "MARKETPLACE_FLOOR_PRICE": "The floor price for {{marketplaces}} is currently {{sats}} Sats/{{symbol}}",
     "NO_FLOOR_PRICE": "There is no floor price for {{symbol}}",
     "TOTAL_LISTED": "Total listed",
     "TOTAL_RECEIVED_IF_SOLD": "Total received if sold",
@@ -942,7 +955,7 @@
     "BELOW_FLOOR_PRICE_LABEL": "This listing is {{percentage}}% below floor price",
     "ABOVE_FLOOR_PRICE_LABEL": "This listing is {{percentage}}% above floor price",
     "LISTING_PRICE_TOO_LOW": "Bundle price must be > 10000 sats",
-    "LISTING_PRICE_TOO_HIGH": "Bundle price must be < 10 BTC",
+    "LISTING_PRICE_TOO_HIGH": "Bundle price must be < 5 BTC",
     "EDIT": "Edit",
     "MIN_PRICE_LABEL": "The listing price per {{symbol}} must be at least {{price}} sats",
     "NO_LISTED_ITEMS": "There're no listed items for this rune.",

From fcfb22fc5e466d8ce7a7aaaa10568857f9a700bd Mon Sep 17 00:00:00 2001
From: Christos Maris <christos@secretkeylabs.com>
Date: Fri, 6 Sep 2024 12:23:18 +0300
Subject: [PATCH 094/227] [ENG-4887] Implement Delisting for Multiple
 Marketplaces

---
 .../useRuneFloorPricePerMarketplaceQuery.ts   |  10 +-
 .../runes/useRuneUtxosQueryPerMarketplace.ts  |  64 +++++
 src/app/routes/index.tsx                      |   5 +
 src/app/screens/listRune/index.tsx            |  14 +-
 .../screens/signMessageRequestInApp/index.tsx |   2 +-
 .../psbtConfirmation/psbtConfirmation.tsx     |  41 +--
 src/app/screens/swap/index.tsx                |   4 +-
 src/app/screens/transactionStatus/index.tsx   |   2 +-
 .../marketplaceRuneListingResults.tsx         |  20 +-
 .../multipleMarketplaceListingResult.tsx      |   6 +-
 src/app/screens/unlistRune/index.tsx          |  43 ++--
 .../unlistRuneItemPerMarketplace.tsx          | 126 ++++++++++
 src/app/screens/unlistRuneUtxo/index.tsx      | 236 ++++++++++++++++++
 src/locales/en.json                           |   8 +
 14 files changed, 509 insertions(+), 72 deletions(-)
 create mode 100644 src/app/hooks/queries/runes/useRuneUtxosQueryPerMarketplace.ts
 create mode 100644 src/app/screens/unlistRune/unlistRuneItemPerMarketplace.tsx
 create mode 100644 src/app/screens/unlistRuneUtxo/index.tsx

diff --git a/src/app/hooks/queries/runes/useRuneFloorPricePerMarketplaceQuery.ts b/src/app/hooks/queries/runes/useRuneFloorPricePerMarketplaceQuery.ts
index bb3fafb4b..d06e813a3 100644
--- a/src/app/hooks/queries/runes/useRuneFloorPricePerMarketplaceQuery.ts
+++ b/src/app/hooks/queries/runes/useRuneFloorPricePerMarketplaceQuery.ts
@@ -5,7 +5,7 @@ import { useQuery } from '@tanstack/react-query';
 import { useCallback } from 'react';
 
 export default function useRuneFloorPricePerMarketplaceQuery(
-  token: TokenId,
+  rune: TokenId,
   marketplaces: Marketplace[],
   backgroundRefetch = true,
 ) {
@@ -14,7 +14,7 @@ export default function useRuneFloorPricePerMarketplaceQuery(
 
   const queryFn = useCallback(
     () =>
-      xverseApi.listings.getRuneMarketData(token, marketplaces).then((res) =>
+      xverseApi.listings.getRuneMarketData({ rune, marketplaces }).then((res) =>
         res
           .filter((data) => marketplaces.includes(data.marketplace.name))
           .sort((a, b) => (a.marketplace.name < b.marketplace.name ? -1 : 1))
@@ -23,14 +23,14 @@ export default function useRuneFloorPricePerMarketplaceQuery(
             marketplace: data.marketplace,
           })),
       ),
-    [token, marketplaces, xverseApi],
+    [rune, marketplaces, xverseApi],
   );
 
   return useQuery({
     refetchOnWindowFocus: backgroundRefetch,
     refetchOnReconnect: backgroundRefetch,
-    queryKey: ['get-rune-floor-price-per-marketplace', token],
-    enabled: Boolean(Object.keys(token).length) && network.type === 'Mainnet',
+    queryKey: ['get-rune-floor-price-per-marketplace', rune],
+    enabled: Boolean(Object.keys(rune).length) && network.type === 'Mainnet',
     queryFn,
   });
 }
diff --git a/src/app/hooks/queries/runes/useRuneUtxosQueryPerMarketplace.ts b/src/app/hooks/queries/runes/useRuneUtxosQueryPerMarketplace.ts
new file mode 100644
index 000000000..5b2bddefc
--- /dev/null
+++ b/src/app/hooks/queries/runes/useRuneUtxosQueryPerMarketplace.ts
@@ -0,0 +1,64 @@
+import useXverseApi from '@hooks/apiClients/useXverseApi';
+import useSelectedAccount from '@hooks/useSelectedAccount';
+import useWalletSelector from '@hooks/useWalletSelector';
+import type { FungibleToken } from '@secretkeylabs/xverse-core';
+import { useQuery } from '@tanstack/react-query';
+import { useCallback } from 'react';
+
+export default function useRuneUtxosQueryPerMarketplace(
+  rune: FungibleToken,
+  backgroundRefetch = true,
+) {
+  const { network } = useWalletSelector();
+  const { ordinalsAddress } = useSelectedAccount();
+  const xverseApi = useXverseApi();
+  if (network.type !== 'Mainnet') {
+    throw new Error('Only available on Mainnet');
+  }
+
+  const queryFn = useCallback(async () => {
+    const res = await xverseApi.listings.getListedUtxos({
+      address: ordinalsAddress,
+      rune: {
+        name: rune.name,
+        id: rune.ticker || '',
+      },
+    });
+
+    const marketplaces = Object.groupBy(
+      res.marketplaces,
+      (listingProvider) => listingProvider.name,
+    );
+
+    const sortedRes = Object.values(res.utxos)
+      .sort((a, b) => {
+        const amountA = Number(a.runes?.[0][1].amount);
+        const amountB = Number(b.runes?.[0][1].amount);
+        return amountB - amountA;
+      })
+      .map((item) => {
+        item.listings = item.listings.map((listing) =>
+          Object.assign(listing, { marketplace: marketplaces[listing.marketplaceName]?.[0] }),
+        );
+
+        return item;
+      });
+
+    const { listedItems, unlistedItems } = Object.groupBy(sortedRes, (item) =>
+      item.listings.length ? 'listedItems' : 'unlistedItems',
+    );
+
+    return {
+      listedItems,
+      unlistedItems,
+    };
+  }, [xverseApi, ordinalsAddress, rune.name, rune.ticker]);
+
+  return useQuery({
+    refetchOnWindowFocus: backgroundRefetch,
+    refetchOnReconnect: backgroundRefetch,
+    queryKey: ['get-listed-rune-utxos', ordinalsAddress, rune.name],
+    enabled: Boolean(ordinalsAddress && rune.name),
+    queryFn,
+  });
+}
diff --git a/src/app/routes/index.tsx b/src/app/routes/index.tsx
index ae1350bb7..f8c0348e1 100644
--- a/src/app/routes/index.tsx
+++ b/src/app/routes/index.tsx
@@ -81,6 +81,7 @@ import TransactionStatus from '@screens/transactionStatus';
 import MultipleMarketplaceListingResult from '@screens/transactionStatus/multipleMarketplaceListingResult';
 import TransferRunesRequest from '@screens/transferRunesRequest';
 import UnlistRuneScreen from '@screens/unlistRune';
+import UnlistRuneUtxoScreen from '@screens/unlistRuneUtxo';
 import WalletExists from '@screens/walletExists';
 import BtcSendRequest from 'app/screens/btcSendRequest';
 import ListRuneScreen from 'app/screens/listRune';
@@ -413,6 +414,10 @@ const router = createHashRouter([
         path: 'list-rune/:runeId',
         element: <ListRuneScreen />,
       },
+      {
+        path: 'unlist-rune/:runeId/utxo',
+        element: <UnlistRuneUtxoScreen />,
+      },
       {
         path: 'unlist-rune/:runeId',
         element: <UnlistRuneScreen />,
diff --git a/src/app/screens/listRune/index.tsx b/src/app/screens/listRune/index.tsx
index ebf1ec96f..8a53d551c 100644
--- a/src/app/screens/listRune/index.tsx
+++ b/src/app/screens/listRune/index.tsx
@@ -4,7 +4,7 @@ import TopRow from '@components/topRow';
 import useRuneFloorPricePerMarketplaceQuery from '@hooks/queries/runes/useRuneFloorPricePerMarketplaceQuery';
 import { useVisibleRuneFungibleTokens } from '@hooks/queries/runes/useRuneFungibleTokensQuery';
 import useRuneSellPsbtPerMarketplace from '@hooks/queries/runes/useRuneSellPsbtPerMarketplace';
-import useRuneUtxosQuery from '@hooks/queries/runes/useRuneUtxosQuery';
+import useRuneUtxosQueryPerMarketplace from '@hooks/queries/runes/useRuneUtxosQueryPerMarketplace';
 import useCoinRates from '@hooks/queries/useCoinRates';
 import useHasFeature from '@hooks/useHasFeature';
 import { useResetUserFlow } from '@hooks/useResetUserFlow';
@@ -20,13 +20,14 @@ import {
   getBtcFiatEquivalent,
   satsToBtc,
   type FungibleToken,
+  type GetListedUtxosResponseUtxo,
   type Marketplace,
 } from '@secretkeylabs/xverse-core';
 import Button, { LinkButton } from '@ui-library/button';
 import { StickyButtonContainer, StyledP } from '@ui-library/common.styled';
 import Spinner from '@ui-library/spinner';
 import { formatToXDecimalPlaces, ftDecimals } from '@utils/helper';
-import { getFullTxId, getTxIdFromFullTxId, getVoutFromFullTxId } from '@utils/runes';
+import { getTxIdFromFullTxId, getVoutFromFullTxId } from '@utils/runes';
 import BigNumber from 'bignumber.js';
 import { useEffect, useMemo, useReducer, useState } from 'react';
 import toast from 'react-hot-toast';
@@ -64,6 +65,8 @@ const joinedSelectedMarketplaces = (selectedMarketplaces: Marketplace[]) => {
   return [selectedMarketplaces.join(', '), last].filter((s) => s).join(' and ');
 };
 
+const getFullTxId = (item: GetListedUtxosResponseUtxo) => `${item.txid}:${item.vout.toString()}`;
+
 export default function ListRuneScreen() {
   const { t } = useTranslation('translation', { keyPrefix: 'LIST_RUNE_SCREEN' });
   const navigate = useNavigate();
@@ -85,13 +88,14 @@ export default function ListRuneScreen() {
   useTrackMixPanelPageViewed();
 
   const {
-    data: listItemsResponse,
+    data,
     isInitialLoading: listItemsLoading,
     isRefetching: listItemsRefetching,
     refetch,
-  } = useRuneUtxosQuery(selectedRune?.name ?? '', 'unlisted', false);
+  } = useRuneUtxosQueryPerMarketplace(selectedRune as FungibleToken, false);
+  const listItemsResponse = data?.unlistedItems || [];
 
-  const supportedMarketplaces: Marketplace[] = ['Unisat', 'Magic Eden'];
+  const supportedMarketplaces: Marketplace[] = ['Unisat', 'Magic Eden', 'OKX'];
   const {
     data: floorPriceData,
     isInitialLoading: floorPriceLoading,
diff --git a/src/app/screens/signMessageRequestInApp/index.tsx b/src/app/screens/signMessageRequestInApp/index.tsx
index c2c1dd276..44d5cd73a 100644
--- a/src/app/screens/signMessageRequestInApp/index.tsx
+++ b/src/app/screens/signMessageRequestInApp/index.tsx
@@ -110,7 +110,7 @@ function SignMessageRequestInApp() {
     setCurrentStepIndex(0);
   };
 
-  const handleGoBack = () => navigate(-1);
+  const handleGoBack = () => navigate(-2);
 
   const handleConnectAndConfirm = async () => {
     if (!selectedAccount) {
diff --git a/src/app/screens/swap/components/psbtConfirmation/psbtConfirmation.tsx b/src/app/screens/swap/components/psbtConfirmation/psbtConfirmation.tsx
index 7e86233cb..5307ed7f9 100644
--- a/src/app/screens/swap/components/psbtConfirmation/psbtConfirmation.tsx
+++ b/src/app/screens/swap/components/psbtConfirmation/psbtConfirmation.tsx
@@ -24,9 +24,10 @@ type Props = {
   orderInfo: OrderInfo;
   onClose: () => void;
   onConfirm: () => void;
+  customExecute?: (signedPsbt: string) => void;
 };
 
-export default function PsbtConfirmation({ orderInfo, onClose, onConfirm }: Props) {
+export default function PsbtConfirmation({ orderInfo, onClose, onConfirm, customExecute }: Props) {
   const [isLoading, setIsLoading] = useState(true);
   const [isSigning, setIsSigning] = useState(false);
   const [summary, setSummary] = useState<PSBTSummary | undefined>();
@@ -131,27 +132,31 @@ export default function PsbtConfirmation({ orderInfo, onClose, onConfirm }: Prop
         throw new Error(t('PSBT_CANT_SIGN_ERROR_TITLE'));
       }
 
-      const orderResponse = await handleExecuteOrder(signedPsbt);
+      if (customExecute) {
+        await customExecute(signedPsbt);
+      } else {
+        const orderResponse = await handleExecuteOrder(signedPsbt);
 
-      if (!orderResponse) {
-        return setIsSigning(false);
-      }
+        if (!orderResponse) {
+          return setIsSigning(false);
+        }
 
-      if (ledgerTransport) {
-        await ledgerTransport.close();
-      }
+        if (ledgerTransport) {
+          await ledgerTransport.close();
+        }
 
-      onConfirm();
+        onConfirm();
 
-      setIsSigning(false);
-      navigate('/tx-status', {
-        state: {
-          txid: orderResponse.txid,
-          currency: 'BTC',
-          error: '',
-          browserTx: false,
-        },
-      });
+        setIsSigning(false);
+        navigate('/tx-status', {
+          state: {
+            txid: orderResponse.txid,
+            currency: 'BTC',
+            error: '',
+            browserTx: false,
+          },
+        });
+      }
     } catch (err) {
       setIsSigning(false);
       if (err instanceof Error) {
diff --git a/src/app/screens/swap/index.tsx b/src/app/screens/swap/index.tsx
index 072d25d1d..42a316573 100644
--- a/src/app/screens/swap/index.tsx
+++ b/src/app/screens/swap/index.tsx
@@ -38,7 +38,7 @@ import { useTranslation } from 'react-i18next';
 import { useLocation, useNavigate } from 'react-router-dom';
 import styled from 'styled-components';
 import AmountInput from './components/amountInput';
-import PsbtConfimation from './components/psbtConfirmation/psbtConfirmation';
+import PsbtConfirmation from './components/psbtConfirmation/psbtConfirmation';
 import RouteItem from './components/routeItem';
 import TokenFromBottomSheet from './components/tokenFromBottomSheet';
 import TokenToBottomSheet from './components/tokenToBottomSheet';
@@ -425,7 +425,7 @@ export default function SwapScreen() {
 
   if (orderInfo?.order.psbt) {
     return (
-      <PsbtConfimation
+      <PsbtConfirmation
         orderInfo={orderInfo}
         onConfirm={onConfirmExecute}
         onClose={() => setOrderInfo(undefined)}
diff --git a/src/app/screens/transactionStatus/index.tsx b/src/app/screens/transactionStatus/index.tsx
index 048e385da..c832373b3 100644
--- a/src/app/screens/transactionStatus/index.tsx
+++ b/src/app/screens/transactionStatus/index.tsx
@@ -181,7 +181,7 @@ function TransactionStatus() {
 
   const multipleOrders = useMemo(() => !!orders?.length, [orders]);
   const failedMultipleOrders = useMemo(
-    () => orders?.filter((order) => !order.successfull).length,
+    () => orders?.filter((order) => !order.successful).length,
     [orders],
   );
 
diff --git a/src/app/screens/transactionStatus/marketplaceRuneListingResults.tsx b/src/app/screens/transactionStatus/marketplaceRuneListingResults.tsx
index 03081d71c..11616c34a 100644
--- a/src/app/screens/transactionStatus/marketplaceRuneListingResults.tsx
+++ b/src/app/screens/transactionStatus/marketplaceRuneListingResults.tsx
@@ -11,7 +11,7 @@ import { useTranslation } from 'react-i18next';
 import styled from 'styled-components';
 import theme from 'theme';
 
-const Container = styled.div<{ $successfull: boolean }>`
+const Container = styled.div<{ $successful: boolean }>`
   display: flex;
   align-items: center;
   flex-direction: row;
@@ -22,11 +22,11 @@ const Container = styled.div<{ $successfull: boolean }>`
   border-radius: ${(props) => props.theme.space.s};
   border: 1px solid;
   border-color: ${(props) =>
-    props.$successfull ? props.theme.colors.white_800 : props.theme.colors.white_900};
+    props.$successful ? props.theme.colors.white_800 : props.theme.colors.white_900};
   transition: background-color 0.1s ease, border-color 0.1s ease;
   width: 100%;
   gap: 10px;
-  cursor: ${(props) => (props.$successfull ? 'pointer' : 'auto')};
+  cursor: ${(props) => (props.$successful ? 'pointer' : 'auto')};
 `;
 
 const InfoContainer = styled.div`
@@ -43,10 +43,10 @@ type Props = {
   minPriceSats: number;
   marketplace: ListingProvider;
   rune: FungibleToken;
-  successfull: boolean;
+  successful: boolean;
 };
 
-function MarketplaceRuneListingResult({ minPriceSats, marketplace, rune, successfull }: Props) {
+function MarketplaceRuneListingResult({ minPriceSats, marketplace, rune, successful }: Props) {
   const { t } = useTranslation('translation', { keyPrefix: 'LIST_RUNE_SCREEN' });
   const floorPrice = formatNumber(minPriceSats);
 
@@ -57,19 +57,19 @@ function MarketplaceRuneListingResult({ minPriceSats, marketplace, rune, success
   };
 
   const handleClick = () =>
-    successfull && window.open(marketplaceToUrl[marketplace.name], '_blank', 'noopener,noreferrer');
+    successful && window.open(marketplaceToUrl[marketplace.name], '_blank', 'noopener,noreferrer');
 
   return (
     <Container
       data-testid="marketplace-listing-result"
-      $successfull={successfull}
+      $successful={successful}
       onClick={handleClick}
     >
       <div style={{ marginRight: theme.space.s }}>
         <TokenImage
           fungibleToken={{ image: marketplace.logo } as FungibleToken}
           size={32}
-          customProtocolIcon={successfull ? CheckCircle : XCircle}
+          customProtocolIcon={successful ? CheckCircle : XCircle}
           showProtocolIcon
         />
       </div>
@@ -81,7 +81,7 @@ function MarketplaceRuneListingResult({ minPriceSats, marketplace, rune, success
         </RowCenter>
         <RowCenter>
           <SubtitleContainer>
-            {successfull ? (
+            {successful ? (
               <StyledP typography="body_medium_m" color="white_200">
                 {t('LISTED_FOR', {
                   floor_price: floorPrice,
@@ -96,7 +96,7 @@ function MarketplaceRuneListingResult({ minPriceSats, marketplace, rune, success
           </SubtitleContainer>
         </RowCenter>
       </InfoContainer>
-      {successfull && <ArrowUpRight size="16" color={theme.colors.white_0} />}
+      {successful && <ArrowUpRight size="16" color={theme.colors.white_0} />}
     </Container>
   );
 }
diff --git a/src/app/screens/transactionStatus/multipleMarketplaceListingResult.tsx b/src/app/screens/transactionStatus/multipleMarketplaceListingResult.tsx
index f8971d1e5..6d5a3ed1a 100644
--- a/src/app/screens/transactionStatus/multipleMarketplaceListingResult.tsx
+++ b/src/app/screens/transactionStatus/multipleMarketplaceListingResult.tsx
@@ -52,7 +52,7 @@ export default function MultipleMarketplaceListingResult() {
     orders: [
       {
         marketplace: ListingProvider;
-        successfull: boolean;
+        successful: boolean;
       },
     ];
   };
@@ -66,14 +66,14 @@ export default function MultipleMarketplaceListingResult() {
       </BackButtonContainer>
       <HeaderContainer>{t('LISTING_STATUS')}</HeaderContainer>
       <MarketplacesContainer>
-        {orders?.map(({ marketplace, successfull }, index) => (
+        {orders?.map(({ marketplace, successful }, index) => (
           <MarketplaceRuneListingResult
             // eslint-disable-next-line
             key={index}
             minPriceSats={minPriceSats || 0}
             marketplace={marketplace}
             rune={rune}
-            successfull={successfull}
+            successful={successful}
           />
         ))}
       </MarketplacesContainer>
diff --git a/src/app/screens/unlistRune/index.tsx b/src/app/screens/unlistRune/index.tsx
index 55b8b2b03..221777024 100644
--- a/src/app/screens/unlistRune/index.tsx
+++ b/src/app/screens/unlistRune/index.tsx
@@ -1,7 +1,7 @@
 import BottomBar from '@components/tabBar';
 import TopRow from '@components/topRow';
 import { useVisibleRuneFungibleTokens } from '@hooks/queries/runes/useRuneFungibleTokensQuery';
-import useRuneUtxosQuery from '@hooks/queries/runes/useRuneUtxosQuery';
+import useRuneUtxosQueryPerMarketplace from '@hooks/queries/runes/useRuneUtxosQueryPerMarketplace';
 import useHasFeature from '@hooks/useHasFeature';
 import useTrackMixPanelPageViewed from '@hooks/useTrackMixPanelPageViewed';
 import { ArrowClockwise } from '@phosphor-icons/react';
@@ -12,17 +12,16 @@ import {
   TabButtonsContainer,
   TabContainer,
 } from '@screens/listRune/index.styled';
-import UnlistRuneItem from '@screens/unlistRune/unlistRuneItem';
-import { FeatureId } from '@secretkeylabs/xverse-core';
+import { FeatureId, type FungibleToken } from '@secretkeylabs/xverse-core';
 import { StyledP } from '@ui-library/common.styled';
 import Spinner from '@ui-library/spinner';
-import { ftDecimals } from '@utils/helper';
-import { getFullTxId, getTxIdFromFullTxId, getVoutFromFullTxId } from '@utils/runes';
-import BigNumber from 'bignumber.js';
 import { useTranslation } from 'react-i18next';
 import { useNavigate, useParams } from 'react-router-dom';
 import theme from 'theme';
 import { Container, Header, NoItemsContainer, UnlistRunesContainer } from './index.styled';
+import UnlistRuneItemPerMarketplace, {
+  type ListedUtxoWithProvider,
+} from './unlistRuneItemPerMarketplace';
 
 export default function UnlistRuneScreen() {
   const { t } = useTranslation('translation', { keyPrefix: 'LIST_RUNE_SCREEN' });
@@ -40,11 +39,13 @@ export default function UnlistRuneScreen() {
   useTrackMixPanelPageViewed();
 
   const {
-    data: listedItems,
+    data,
     isInitialLoading: isFetchingListedItems,
     isRefetching: isRefetchingListedItems,
     refetch,
-  } = useRuneUtxosQuery(selectedRune?.name ?? '', 'listed', false);
+  } = useRuneUtxosQueryPerMarketplace(selectedRune as FungibleToken, false);
+  const { listedItems } = data || {};
+
   const isLoading = isFetchingListedItems || isRefetchingListedItems;
   const showContent = !isLoading && !!listedItems?.length;
 
@@ -87,25 +88,13 @@ export default function UnlistRuneScreen() {
         )}
         {showContent && (
           <UnlistRunesContainer data-testid="listed">
-            {listedItems.map((item) => {
-              const key = getFullTxId(item);
-              const runeAmount = ftDecimals(
-                String(item.runes?.[0][1].amount),
-                selectedRune?.decimals ?? 0,
-              );
-              return (
-                <UnlistRuneItem
-                  key={key}
-                  txId={getTxIdFromFullTxId(key)}
-                  vout={getVoutFromFullTxId(key)}
-                  runeAmount={runeAmount}
-                  orderIds={item.listing.map((listing) => listing.orderId)}
-                  runeSymbol={item.runes?.[0][1].symbol ?? ''}
-                  listPrice={BigNumber(item.listing[0].totalPriceSats)}
-                  selectedRuneId={selectedRune?.principal ?? ''}
-                />
-              );
-            })}
+            {listedItems.map((item) => (
+              <UnlistRuneItemPerMarketplace
+                key={`${item.txid}:${item.vout}`}
+                item={item as ListedUtxoWithProvider}
+                selectedRune={selectedRune as FungibleToken}
+              />
+            ))}
           </UnlistRunesContainer>
         )}
         {!isLoading && !listedItems?.length && (
diff --git a/src/app/screens/unlistRune/unlistRuneItemPerMarketplace.tsx b/src/app/screens/unlistRune/unlistRuneItemPerMarketplace.tsx
new file mode 100644
index 000000000..b899ec3c8
--- /dev/null
+++ b/src/app/screens/unlistRune/unlistRuneItemPerMarketplace.tsx
@@ -0,0 +1,126 @@
+import TokenImage from '@components/tokenImage';
+import { CaretRight } from '@phosphor-icons/react';
+import {
+  satsToBtc,
+  type FungibleToken,
+  type GetListedUtxosResponseUtxo,
+  type ListingProvider,
+  type ListingWithMarketplace,
+} from '@secretkeylabs/xverse-core';
+import { StyledP } from '@ui-library/common.styled';
+import { ftDecimals } from '@utils/helper';
+import BigNumber from 'bignumber.js';
+import { useTranslation } from 'react-i18next';
+import { NumericFormat } from 'react-number-format';
+import { useLocation, useNavigate } from 'react-router-dom';
+import styled from 'styled-components';
+import Theme from 'theme';
+
+const Container = styled.div`
+  display: flex;
+  align-items: center;
+  padding: ${(props) => props.theme.space.s};
+  border-radius: ${(props) => props.theme.space.xs};
+  background-color: ${(props) => props.theme.colors.elevation1};
+  justify-content: space-between;
+  cursor: pointer;
+`;
+
+const MainWrapper = styled.div`
+  display: flex;
+  gap: ${(props) => props.theme.space.m};
+  width: 100%;
+  margin-right: 8px;
+  justify-content: space-between;
+`;
+
+const TokenImageMainContainer = styled.div<{ totalImages: number }>((props) => ({
+  display: 'flex',
+  alignItems: 'center',
+  width: `${(props.totalImages - 1) * 20 + 28}px`,
+}));
+
+const TokenImageContainer = styled.div`
+  margin-right: -8px;
+`;
+
+const TotalSatsText = styled.span((props) => ({
+  ...props.theme.typography.body_medium_s,
+  color: props.theme.colors.white_400,
+}));
+
+const RuneTitle = styled(StyledP)`
+  overflow: hidden;
+  text-overflow: ellipsis;
+  width: 100%;
+  margin-bottom: 2px;
+`;
+
+export type ListingWithListingProvider = ListingWithMarketplace & { marketplace: ListingProvider };
+export type ListedUtxoWithProvider = Omit<GetListedUtxosResponseUtxo, 'listings'> & {
+  listings: ListingWithListingProvider[];
+};
+
+type Props = {
+  item: ListedUtxoWithProvider;
+  selectedRune: FungibleToken;
+};
+
+function UnlistRuneItemPerMarketplace({ item, selectedRune }: Props) {
+  const { t } = useTranslation('translation', { keyPrefix: 'UNLIST_RUNE_SCREEN' });
+  const location = useLocation();
+  const navigate = useNavigate();
+
+  const runeAmount = ftDecimals(String(item.runes?.[0][1].amount), selectedRune?.decimals ?? 0);
+  const lowestListingTotalSats = BigNumber(Math.min(...item.listings.map((l) => l.totalPriceSats)));
+  const runeSymbol = item.runes?.[0][1].symbol ?? '';
+
+  const handleOnClick = () => {
+    navigate(`${location.pathname}/utxo`, {
+      state: {
+        item,
+        selectedRune,
+      },
+    });
+  };
+
+  return (
+    <Container data-testid="listed-rune-container" onClick={handleOnClick}>
+      <MainWrapper>
+        <div>
+          <NumericFormat
+            value={runeAmount}
+            displayType="text"
+            suffix={` ${runeSymbol}`}
+            thousandSeparator
+            decimalScale={2}
+            renderText={(value: string) => (
+              <RuneTitle typography="body_medium_m" color="white_0">
+                {value}
+              </RuneTitle>
+            )}
+          />
+          <TotalSatsText>
+            <span>{t('LOWEST_LISTING')} </span>
+            <span style={{ color: Theme.colors.white_0 }}>
+              {satsToBtc(lowestListingTotalSats).toNumber()} BTC
+            </span>
+          </TotalSatsText>
+        </div>
+        <TokenImageMainContainer totalImages={item.listings.length}>
+          {item.listings.map((listing) => (
+            <TokenImageContainer key={listing.marketplaceName}>
+              <TokenImage
+                fungibleToken={{ image: listing.marketplace.logo } as FungibleToken}
+                size={28}
+              />
+            </TokenImageContainer>
+          ))}
+        </TokenImageMainContainer>
+      </MainWrapper>
+      <CaretRight size="16px" />
+    </Container>
+  );
+}
+
+export default UnlistRuneItemPerMarketplace;
diff --git a/src/app/screens/unlistRuneUtxo/index.tsx b/src/app/screens/unlistRuneUtxo/index.tsx
new file mode 100644
index 000000000..d77b45914
--- /dev/null
+++ b/src/app/screens/unlistRuneUtxo/index.tsx
@@ -0,0 +1,236 @@
+import RequestsRoutes from '@common/utils/route-urls';
+import TokenImage from '@components/tokenImage';
+import TopRow from '@components/topRow';
+import useXverseApi from '@hooks/apiClients/useXverseApi';
+import useSelectedAccount from '@hooks/useSelectedAccount';
+import useTrackMixPanelPageViewed from '@hooks/useTrackMixPanelPageViewed';
+import PsbtConfirmation from '@screens/swap/components/psbtConfirmation/psbtConfirmation';
+import type {
+  ListedUtxoWithProvider,
+  ListingWithListingProvider,
+} from '@screens/unlistRune/unlistRuneItemPerMarketplace';
+import { satsToBtc, type FungibleToken } from '@secretkeylabs/xverse-core';
+import Button from '@ui-library/button';
+import { StyledHeading, StyledP } from '@ui-library/common.styled';
+import { ftDecimals } from '@utils/helper';
+import BigNumber from 'bignumber.js';
+import { useState } from 'react';
+import { useTranslation } from 'react-i18next';
+import { NumericFormat } from 'react-number-format';
+import { useLocation, useNavigate } from 'react-router-dom';
+
+import styled from 'styled-components';
+
+const Container = styled.div`
+  display: flex;
+  flex-direction: column;
+  height: 100%;
+  min-height: 400px;
+  padding: 0 ${(props) => props.theme.space.m};
+  overflow-y: auto;
+  &::-webkit-scrollbar {
+    display: none;
+  }
+`;
+
+const Header = styled.h1((props) => ({
+  ...props.theme.typography.headline_xs,
+  color: props.theme.colors.white_0,
+  marginBottom: props.theme.space.m,
+}));
+
+const InfoBox = styled.div<{ marginBottom: string; gap: string }>((props) => ({
+  display: 'flex',
+  flexDirection: 'column',
+  wordBreak: 'break-all',
+  marginBottom: props.marginBottom,
+  gap: props.gap,
+}));
+
+const ListingsContainer = styled.div`
+  display: flex;
+  align-items: center;
+  height: 76px;
+  padding: 22px ${(props) => props.theme.space.m};
+  border-radius: ${(props) => props.theme.space.xs};
+  background-color: ${(props) => props.theme.colors.elevation1};
+`;
+
+const MarketplaceInfoContainer = styled.div`
+  margin-left: 8px;
+  margin-right: 12px;
+  width: 174px;
+  display: flex;
+  gap: 2px;
+  flex-direction: column;
+`;
+
+const StyledButton = styled(Button)`
+  width: 100%;
+  max-width: 79px;
+`;
+
+export default function UnlistRuneUtxoScreen() {
+  useTrackMixPanelPageViewed();
+
+  const { t } = useTranslation('translation', { keyPrefix: 'UNLIST_RUNE_SCREEN' });
+  const navigate = useNavigate();
+  const location = useLocation();
+  const selectedAccount = useSelectedAccount();
+  const xverseApi = useXverseApi();
+
+  const [loading, setLoading] = useState(false);
+  const [unisatCancellation, setUnisatCancellation] = useState<{
+    psbt: string;
+    orderId: string;
+    listing: ListingWithListingProvider;
+  } | null>(null);
+
+  const { item, selectedRune } = location.state as {
+    item: ListedUtxoWithProvider;
+    selectedRune: FungibleToken;
+  };
+  const runeAmount = ftDecimals(String(item.runes?.[0][1].amount), selectedRune?.decimals ?? 0);
+  const runeSymbol = item.runes?.[0][1].symbol ?? '';
+  const runeLocation = `${item.txid}:${item.vout}`;
+
+  const handleUnlist = async (listing: ListingWithListingProvider) => {
+    if (!selectedAccount) {
+      return;
+    }
+
+    try {
+      setLoading(true);
+      const response = await xverseApi.listings.getRuneCancelOrder({
+        orderIdsPerMarketplace: [
+          { orderId: listing.orderId, marketplace: listing.marketplaceName },
+        ],
+        btcPublicKey: selectedAccount?.btcPublicKey,
+        ordinalsAddress: selectedAccount?.ordinalsAddress,
+        ordinalsPublicKey: selectedAccount?.ordinalsPublicKey,
+      });
+      const data = response[0];
+
+      if (listing.marketplaceName === 'Magic Eden' && data.magicEden) {
+        navigate(RequestsRoutes.SignMessageRequestInApp, {
+          state: {
+            requestPayload: {
+              payload: {
+                token: data.magicEden.token,
+                message: data.magicEden.message,
+                address: selectedAccount?.ordinalsAddress,
+                selectedRuneId: selectedRune.principal,
+                orderIds: [listing.orderId],
+              },
+            },
+          },
+        });
+      } else if (listing.marketplaceName === 'Unisat' && data.unisat) {
+        setUnisatCancellation({ psbt: data.unisat.psbt, orderId: data.orderId, listing });
+      }
+    } catch (error) {
+      console.error(error);
+    } finally {
+      setLoading(false);
+    }
+  };
+
+  if (unisatCancellation) {
+    return (
+      <PsbtConfirmation
+        orderInfo={{
+          providerCode: 'Unisat',
+          order: {
+            psbt: unisatCancellation.psbt,
+            orderId: unisatCancellation.orderId,
+            expiresInMilliseconds: null,
+          },
+        }}
+        onConfirm={() => {}}
+        onClose={() => setUnisatCancellation(null)}
+        customExecute={async (signedPsbt) => {
+          const response = await xverseApi.listings.submitRuneCancelOrder({
+            cancellationsPerMarketplace: [
+              {
+                marketplace: unisatCancellation.listing.marketplaceName,
+                orderId: unisatCancellation.listing.orderId,
+                psbt: signedPsbt,
+              },
+            ],
+          });
+
+          navigate('/tx-status', {
+            state: {
+              txid: response[0].unisat?.txid,
+              currency: 'BTC',
+              error: '',
+              browserTx: false,
+            },
+          });
+        }}
+      />
+    );
+  }
+
+  return (
+    <>
+      <TopRow onClick={() => navigate(-1)} />
+      <Container>
+        <Header>{t('LISTING')}</Header>
+        <InfoBox gap="2px" marginBottom="22px">
+          <StyledHeading color="white_400" typography="body_medium_m">
+            {t('AMOUNT')}
+          </StyledHeading>
+          <NumericFormat
+            value={runeAmount}
+            displayType="text"
+            suffix={` ${runeSymbol}`}
+            thousandSeparator
+            decimalScale={2}
+            renderText={(value: string) => (
+              <StyledP color="white_0" typography="body_medium_m">
+                {value}
+              </StyledP>
+            )}
+          />
+        </InfoBox>
+        <InfoBox gap="2px" marginBottom="24px">
+          <StyledHeading color="white_400" typography="body_medium_m">
+            {t('BUNDLE')}
+          </StyledHeading>
+          <StyledP color="white_0" typography="body_medium_m">
+            {runeLocation}
+          </StyledP>
+        </InfoBox>
+        <InfoBox gap="12px" marginBottom="22px">
+          <StyledHeading color="white_400" typography="body_medium_m">
+            {t('LISTED_ON')}
+          </StyledHeading>
+          {item.listings.map((listing) => (
+            <ListingsContainer key={listing.marketplaceName}>
+              <TokenImage
+                key={listing.marketplaceName}
+                fungibleToken={{ image: listing.marketplace.logo } as FungibleToken}
+                size={32}
+              />
+              <MarketplaceInfoContainer>
+                <StyledP color="white_0" typography="body_bold_m">
+                  {listing.marketplaceName}
+                </StyledP>
+                <StyledHeading color="white_400" typography="body_medium_m">
+                  {satsToBtc(BigNumber(listing.totalPriceSats)).toNumber()} BTC
+                </StyledHeading>
+              </MarketplaceInfoContainer>
+              <StyledButton
+                title={t('DELIST')}
+                variant="secondary"
+                onClick={() => handleUnlist(listing)}
+                loading={loading}
+              />
+            </ListingsContainer>
+          ))}
+        </InfoBox>
+      </Container>
+    </>
+  );
+}
diff --git a/src/locales/en.json b/src/locales/en.json
index faa0cc20a..f63ce8e6b 100644
--- a/src/locales/en.json
+++ b/src/locales/en.json
@@ -961,6 +961,14 @@
     "NO_LISTED_ITEMS": "There're no listed items for this rune.",
     "NO_UNLISTED_ITEMS": "There're no unlisted items for this rune."
   },
+  "UNLIST_RUNE_SCREEN": {
+    "AMOUNT": "Amount",
+    "BUNDLE": "Bundle",
+    "LISTED_ON": "Listed on",
+    "LISTING": "Listing",
+    "DELIST": "Delist",
+    "LOWEST_LISTING": "Lowest listing:"
+  },
   "COIN_DASHBOARD_SCREEN": {
     "SEND": "Send",
     "RECEIVE": "Receive",

From 39e7bd152935e32607a9ed0063412f1c3113b396 Mon Sep 17 00:00:00 2001
From: Christos Maris <christos@secretkeylabs.com>
Date: Fri, 6 Sep 2024 16:07:55 +0300
Subject: [PATCH 095/227] [ENG-4887] Implement Unisat Delisting Callout

---
 .../psbtConfirmation/psbtConfirmation.tsx     | 11 ++++--
 src/app/screens/unlistRuneUtxo/index.tsx      | 34 +++++++++++++++++--
 src/app/ui-library/dialog.tsx                 | 25 +++++++++++---
 src/locales/en.json                           |  9 ++++-
 4 files changed, 69 insertions(+), 10 deletions(-)

diff --git a/src/app/screens/swap/components/psbtConfirmation/psbtConfirmation.tsx b/src/app/screens/swap/components/psbtConfirmation/psbtConfirmation.tsx
index 5307ed7f9..1a14f3a0e 100644
--- a/src/app/screens/swap/components/psbtConfirmation/psbtConfirmation.tsx
+++ b/src/app/screens/swap/components/psbtConfirmation/psbtConfirmation.tsx
@@ -25,9 +25,16 @@ type Props = {
   onClose: () => void;
   onConfirm: () => void;
   customExecute?: (signedPsbt: string) => void;
+  customCallout?: { bodyText: string };
 };
 
-export default function PsbtConfirmation({ orderInfo, onClose, onConfirm, customExecute }: Props) {
+export default function PsbtConfirmation({
+  orderInfo,
+  onClose,
+  onConfirm,
+  customExecute,
+  customCallout,
+}: Props) {
   const [isLoading, setIsLoading] = useState(true);
   const [isSigning, setIsSigning] = useState(false);
   const [summary, setSummary] = useState<PSBTSummary | undefined>();
@@ -210,7 +217,7 @@ export default function PsbtConfirmation({ orderInfo, onClose, onConfirm, custom
       onBackClick={onClose}
       hideBottomBar
       showAccountHeader={false}
-      customCallout={quoteExpiryCallout}
+      customCallout={customCallout || quoteExpiryCallout}
     />
   );
 }
diff --git a/src/app/screens/unlistRuneUtxo/index.tsx b/src/app/screens/unlistRuneUtxo/index.tsx
index d77b45914..5dc00dccb 100644
--- a/src/app/screens/unlistRuneUtxo/index.tsx
+++ b/src/app/screens/unlistRuneUtxo/index.tsx
@@ -12,6 +12,7 @@ import type {
 import { satsToBtc, type FungibleToken } from '@secretkeylabs/xverse-core';
 import Button from '@ui-library/button';
 import { StyledHeading, StyledP } from '@ui-library/common.styled';
+import Dialog from '@ui-library/dialog';
 import { ftDecimals } from '@utils/helper';
 import BigNumber from 'bignumber.js';
 import { useState } from 'react';
@@ -80,11 +81,12 @@ export default function UnlistRuneUtxoScreen() {
   const xverseApi = useXverseApi();
 
   const [loading, setLoading] = useState(false);
-  const [unisatCancellation, setUnisatCancellation] = useState<{
+  const [unisatDialogCallback, setUnisatDialogCallback] = useState<null | { cb: () => void }>(null);
+  const [unisatCancellation, setUnisatCancellation] = useState<null | {
     psbt: string;
     orderId: string;
     listing: ListingWithListingProvider;
-  } | null>(null);
+  }>(null);
 
   const { item, selectedRune } = location.state as {
     item: ListedUtxoWithProvider;
@@ -148,6 +150,9 @@ export default function UnlistRuneUtxoScreen() {
         }}
         onConfirm={() => {}}
         onClose={() => setUnisatCancellation(null)}
+        customCallout={{
+          bodyText: t('UNISAT_DIALOG.CALLOUT'),
+        }}
         customExecute={async (signedPsbt) => {
           const response = await xverseApi.listings.submitRuneCancelOrder({
             cancellationsPerMarketplace: [
@@ -172,6 +177,23 @@ export default function UnlistRuneUtxoScreen() {
     );
   }
 
+  if (unisatDialogCallback) {
+    return (
+      <Dialog
+        title={t('UNISAT_DIALOG.TITLE')}
+        description={t('UNISAT_DIALOG.DESCRIPTION')}
+        rightButtonText={t('UNISAT_DIALOG.CONTINUE')}
+        onRightButtonClick={unisatDialogCallback.cb}
+        rightButtonDisabled={loading}
+        leftButtonText={t('UNISAT_DIALOG.BACK')}
+        onLeftButtonClick={() => setUnisatDialogCallback(null)}
+        leftButtonDisabled={loading}
+        onClose={() => setUnisatDialogCallback(null)}
+        type="default"
+      />
+    );
+  }
+
   return (
     <>
       <TopRow onClick={() => navigate(-1)} />
@@ -224,8 +246,14 @@ export default function UnlistRuneUtxoScreen() {
               <StyledButton
                 title={t('DELIST')}
                 variant="secondary"
-                onClick={() => handleUnlist(listing)}
                 loading={loading}
+                onClick={() => {
+                  if (listing.marketplaceName === 'Unisat') {
+                    setUnisatDialogCallback({ cb: handleUnlist.bind({}, listing) });
+                  } else {
+                    handleUnlist(listing);
+                  }
+                }}
               />
             </ListingsContainer>
           ))}
diff --git a/src/app/ui-library/dialog.tsx b/src/app/ui-library/dialog.tsx
index e91cee627..7aa35a866 100644
--- a/src/app/ui-library/dialog.tsx
+++ b/src/app/ui-library/dialog.tsx
@@ -1,6 +1,6 @@
-import styled, { useTheme } from 'styled-components';
 import ActionButton from '@components/button';
 import { XCircle } from '@phosphor-icons/react';
+import styled, { useTheme } from 'styled-components';
 
 type DialogType = 'default' | 'feedback';
 
@@ -88,7 +88,9 @@ interface Props {
   title: string;
   description: string;
   leftButtonText?: string;
+  leftButtonDisabled?: boolean;
   rightButtonText?: string;
+  rightButtonDisabled?: boolean;
   type?: DialogType;
   icon?: JSX.Element;
   onLeftButtonClick?: () => void;
@@ -102,7 +104,9 @@ function Dialog({
   title,
   description,
   leftButtonText,
+  leftButtonDisabled,
   rightButtonText,
+  rightButtonDisabled,
   type = 'default',
   icon,
   onLeftButtonClick,
@@ -131,14 +135,27 @@ function Dialog({
         {onRightButtonClick && onLeftButtonClick && (
           <ButtonContainer>
             <TransparentButtonContainer>
-              <ActionButton text={leftButtonText ?? 'No'} transparent onPress={onLeftButtonClick} />
+              <ActionButton
+                text={leftButtonText ?? 'No'}
+                transparent
+                onPress={onLeftButtonClick}
+                disabled={leftButtonDisabled}
+              />
             </TransparentButtonContainer>
-            <ActionButton text={rightButtonText ?? 'Yes'} onPress={onRightButtonClick} />
+            <ActionButton
+              text={rightButtonText ?? 'Yes'}
+              onPress={onRightButtonClick}
+              disabled={rightButtonDisabled}
+            />
           </ButtonContainer>
         )}
         {!onRightButtonClick && onLeftButtonClick && (
           <ButtonContainer>
-            <ActionButton text={leftButtonText ?? 'Yes'} onPress={onLeftButtonClick} />
+            <ActionButton
+              text={leftButtonText ?? 'Yes'}
+              onPress={onLeftButtonClick}
+              disabled={leftButtonDisabled}
+            />
           </ButtonContainer>
         )}
       </Container>
diff --git a/src/locales/en.json b/src/locales/en.json
index f63ce8e6b..6e6a1ec1c 100644
--- a/src/locales/en.json
+++ b/src/locales/en.json
@@ -967,7 +967,14 @@
     "LISTED_ON": "Listed on",
     "LISTING": "Listing",
     "DELIST": "Delist",
-    "LOWEST_LISTING": "Lowest listing:"
+    "LOWEST_LISTING": "Lowest listing:",
+    "UNISAT_DIALOG": {
+      "TITLE": "Delist on Unisat",
+      "DESCRIPTION": "Delisting on Unisat will perform on-chain delisting for your runes bundle on all marketplaces. The transaction needs to confirm before you can relist.",
+      "BACK": "Back",
+      "CONTINUE": "Continue",
+      "CALLOUT": "This transaction will perform on-chain delisting for your runes on all marketplaces and has to confirm before you can list again."
+    }
   },
   "COIN_DASHBOARD_SCREEN": {
     "SEND": "Send",

From e767dcd53ce1a1d418197af68031a7859364b6f0 Mon Sep 17 00:00:00 2001
From: Christos Maris <christos@secretkeylabs.com>
Date: Mon, 9 Sep 2024 14:44:33 +0300
Subject: [PATCH 096/227] [ENG-4887] Update per Review  Comments

---
 src/app/screens/unlistRuneUtxo/index.tsx | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/app/screens/unlistRuneUtxo/index.tsx b/src/app/screens/unlistRuneUtxo/index.tsx
index 5dc00dccb..a11b360f9 100644
--- a/src/app/screens/unlistRuneUtxo/index.tsx
+++ b/src/app/screens/unlistRuneUtxo/index.tsx
@@ -113,13 +113,13 @@ export default function UnlistRuneUtxoScreen() {
       });
       const data = response[0];
 
-      if (listing.marketplaceName === 'Magic Eden' && data.magicEden) {
+      if (listing.marketplaceName === 'Magic Eden' && data.type === 'withMessage') {
         navigate(RequestsRoutes.SignMessageRequestInApp, {
           state: {
             requestPayload: {
               payload: {
-                token: data.magicEden.token,
-                message: data.magicEden.message,
+                token: data.token,
+                message: data.message,
                 address: selectedAccount?.ordinalsAddress,
                 selectedRuneId: selectedRune.principal,
                 orderIds: [listing.orderId],
@@ -127,8 +127,8 @@ export default function UnlistRuneUtxoScreen() {
             },
           },
         });
-      } else if (listing.marketplaceName === 'Unisat' && data.unisat) {
-        setUnisatCancellation({ psbt: data.unisat.psbt, orderId: data.orderId, listing });
+      } else if (listing.marketplaceName === 'Unisat' && data.type === 'withPsbt') {
+        setUnisatCancellation({ psbt: data.psbt, orderId: data.orderId, listing });
       }
     } catch (error) {
       console.error(error);
@@ -166,7 +166,7 @@ export default function UnlistRuneUtxoScreen() {
 
           navigate('/tx-status', {
             state: {
-              txid: response[0].unisat?.txid,
+              txid: response[0].txid,
               currency: 'BTC',
               error: '',
               browserTx: false,

From e4d7ee7cdd5e41f391e718295f69837cab38a995 Mon Sep 17 00:00:00 2001
From: Tim Man <tim@secretkeylabs.com>
Date: Tue, 10 Sep 2024 19:10:18 +0800
Subject: [PATCH 097/227] test: make test slightly more stable by not swapping
 with a low amount (#579)

was hitting slippage errors
---
 tests/specs/swapExchange.spec.ts | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/tests/specs/swapExchange.spec.ts b/tests/specs/swapExchange.spec.ts
index 3d63862bc..df8a167b9 100644
--- a/tests/specs/swapExchange.spec.ts
+++ b/tests/specs/swapExchange.spec.ts
@@ -30,7 +30,7 @@ test.describe('Swap Flow Exchange', () => {
 
     // Had problems with loading of all tokens so I check that 'Bitcoin' is loaded
     await expect(wallet.labelTokenSubtitle.getByText('Bitcoin').first()).toBeVisible();
-    await expect(await wallet.divTokenRow.count()).toBeGreaterThan(0);
+    expect(await wallet.divTokenRow.count()).toBeGreaterThan(0);
     await wallet.divTokenRow.first().click();
     await expect(wallet.nameToken.first()).not.toContainText('Select asset');
     await expect(wallet.imageToken.first()).toBeVisible();
@@ -40,7 +40,7 @@ test.describe('Swap Flow Exchange', () => {
     await wallet.buttonDownArrow.nth(1).click();
     // Had problems with loading of all tokens so I check that a 'DOG' is loaded
     await expect(wallet.labelTokenSubtitle.getByText('DOG').first()).toBeVisible();
-    await expect(await wallet.divTokenRow.count()).toBeGreaterThan(0);
+    expect(await wallet.divTokenRow.count()).toBeGreaterThan(0);
     await wallet.divTokenRow.first().click();
     await expect(wallet.nameToken.last()).not.toContainText('Select asset');
     await expect(wallet.imageToken.last()).toBeVisible();
@@ -62,7 +62,7 @@ test.describe('Swap Flow Exchange', () => {
 
     const quoteAmount = await wallet.quoteAmount.first().innerText();
     const numericQuoteValue = parseFloat(quoteAmount.replace(/[^0-9.]/g, ''));
-    await expect(numericQuoteValue).toBeGreaterThan(0);
+    expect(numericQuoteValue).toBeGreaterThan(0);
 
     // Click on DotSwap
     await wallet.buttonSwapPlace.filter({ hasText: marketplace }).click();
@@ -77,14 +77,14 @@ test.describe('Swap Flow Exchange', () => {
     await wallet.buttonSwap.click();
     await wallet.checkVisualsSendTransactionReview('swap', false, selfBTC);
 
-    await expect(await wallet.confirmAmount.count()).toBeGreaterThan(3);
+    expect(await wallet.confirmAmount.count()).toBeGreaterThan(3);
 
     // Confirm Amount is the same as swapAmount
     const swapSendAmount = await wallet.confirmAmount
       .filter({ hasText: swapAmount.toString() })
       .innerText();
     const numericValueSwap = parseFloat(swapSendAmount.replace(/[^0-9.]/g, ''));
-    await expect(numericValueSwap).toEqual(swapAmount);
+    expect(numericValueSwap).toEqual(swapAmount);
 
     // Check Rune token name
     await expect(wallet.nameRune).toContainText(tokenName1);
@@ -98,7 +98,7 @@ test.describe('Swap Flow Exchange', () => {
 
     // Check BTC Balance after cancel the transaction
     const balanceAfterCancel = await wallet.getTokenBalance('Bitcoin');
-    await expect(initialBTCBalance).toEqual(balanceAfterCancel);
+    expect(initialBTCBalance).toEqual(balanceAfterCancel);
   });
 
   test('Exchange token via DotSwap with standard fee testnet #localexecution', async ({
@@ -122,7 +122,7 @@ test.describe('Swap Flow Exchange', () => {
 
     // Had problems with loading of all tokens so I check that 'Bitcoin' is loaded
     await expect(wallet.labelTokenSubtitle.getByText('Bitcoin').first()).toBeVisible();
-    await expect(await wallet.divTokenRow.count()).toBeGreaterThan(0);
+    expect(await wallet.divTokenRow.count()).toBeGreaterThan(0);
     await wallet.divTokenRow.first().click();
     await expect(wallet.nameToken.first()).not.toContainText('Select asset');
     await expect(wallet.imageToken.first()).toBeVisible();
@@ -132,14 +132,14 @@ test.describe('Swap Flow Exchange', () => {
     await wallet.buttonDownArrow.nth(1).click();
     // Had problems with loading of all tokens so I check that a 'DOG' is loaded
     await expect(wallet.labelTokenSubtitle.getByText('DOG').first()).toBeVisible();
-    await expect(await wallet.divTokenRow.count()).toBeGreaterThan(0);
+    expect(await wallet.divTokenRow.count()).toBeGreaterThan(0);
     await wallet.divTokenRow.filter({ hasText: 'COOK•RUNES•ON•TESTNET' }).click();
     await expect(wallet.nameToken.last()).not.toContainText('Select asset');
     await expect(wallet.imageToken.last()).toBeVisible();
     await expect(wallet.buttonGetQuotes).toBeDisabled();
 
     // tried a calculated value but had multiple problems with that, for now we stick to a specific value
-    const swapAmount = 0.00002646;
+    const swapAmount = 0.00010646;
 
     const numericUSDValue = await wallet.fillSwapAmount(swapAmount);
 
@@ -154,7 +154,7 @@ test.describe('Swap Flow Exchange', () => {
 
     const quoteAmount = await wallet.quoteAmount.first().innerText();
     const numericQuoteValue = parseFloat(quoteAmount.replace(/[^0-9.]/g, ''));
-    await expect(numericQuoteValue).toBeGreaterThan(0);
+    expect(numericQuoteValue).toBeGreaterThan(0);
 
     // Click on DotSwap
     await wallet.buttonSwapPlace.filter({ hasText: marketplace }).click();
@@ -167,7 +167,7 @@ test.describe('Swap Flow Exchange', () => {
     // Save the current fee amount for comparison
     const originalFee = await wallet.feeAmount.innerText();
     const numericOriginalFee = parseFloat(originalFee.replace(/[^0-9.]/g, ''));
-    await expect(numericOriginalFee).toBeGreaterThan(0);
+    expect(numericOriginalFee).toBeGreaterThan(0);
 
     await wallet.buttonSwap.click();
     await wallet.checkVisualsSendTransactionReview('swap', false, selfBTC);
@@ -177,7 +177,7 @@ test.describe('Swap Flow Exchange', () => {
       .filter({ hasText: swapAmount.toString() })
       .innerText();
     const numericValueSwap = parseFloat(swapSendAmount.replace(/[^0-9.]/g, ''));
-    await expect(numericValueSwap).toEqual(swapAmount);
+    expect(numericValueSwap).toEqual(swapAmount);
 
     // Check Rune token name
     await expect(wallet.nameRune).toContainText(tokenName1);

From b7ebf29aaa17a801bdb8181d130d5d9dcce8143c Mon Sep 17 00:00:00 2001
From: Christos Maris <christos@secretkeylabs.com>
Date: Tue, 10 Sep 2024 12:44:55 +0300
Subject: [PATCH 098/227] [ENG-4887] Update xverse-core version

---
 package-lock.json                             | 220 +++++++-----------
 package.json                                  |   2 +-
 .../hooks/queries/runes/useRuneSellPsbt.ts    |  71 ------
 src/app/screens/listRune/reducer.tsx          |   2 +-
 src/app/screens/unlistRune/unlistRuneItem.tsx | 191 ---------------
 5 files changed, 83 insertions(+), 403 deletions(-)
 delete mode 100644 src/app/hooks/queries/runes/useRuneSellPsbt.ts
 delete mode 100644 src/app/screens/unlistRune/unlistRuneItem.tsx

diff --git a/package-lock.json b/package-lock.json
index 24cfdbdb8..de87ecee2 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -15,7 +15,7 @@
         "@react-spring/web": "^9.6.1",
         "@sats-connect/core": "0.2.1",
         "@scure/btc-signer": "1.2.1",
-        "@secretkeylabs/xverse-core": "19.1.0",
+        "@secretkeylabs/xverse-core": "19.2.0",
         "@stacks/connect": "7.4.1",
         "@stacks/stacks-blockchain-api-types": "6.1.1",
         "@stacks/transactions": "6.16.1",
@@ -567,7 +567,6 @@
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/@bitcoinerlab/descriptors/-/descriptors-1.1.1.tgz",
       "integrity": "sha512-AMFkbBBg9T1iWtEmWB23oADk7zaOQix6wUPLXalhTyFDjhkFXDd6pCRfto/HAdaPg/ccM4GMTVgYLee9WdYFyQ==",
-      "license": "MIT",
       "dependencies": {
         "@bitcoinerlab/miniscript": "^1.2.1",
         "@bitcoinerlab/secp256k1": "^1.0.5",
@@ -588,7 +587,6 @@
       "version": "1.4.0",
       "resolved": "https://registry.npmjs.org/@bitcoinerlab/miniscript/-/miniscript-1.4.0.tgz",
       "integrity": "sha512-BsG3dmwQmgKHnRZecDgUsPjwcpnf1wgaZbolcMTByS10k1zYzIx97W51LzG7GvokRJ+wnzTX/GhC8Y3L2X0CQA==",
-      "license": "MIT",
       "dependencies": {
         "bip68": "^1.0.4"
       }
@@ -597,7 +595,6 @@
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/@bitcoinerlab/secp256k1/-/secp256k1-1.1.1.tgz",
       "integrity": "sha512-uhjW51WfVLpnHN7+G0saDcM/k9IqcyTbZ+bDgLF3AX8V/a3KXSE9vn7UPBrcdU72tp0J4YPR7BHp2m7MLAZ/1Q==",
-      "license": "MIT",
       "dependencies": {
         "@noble/hashes": "^1.1.5",
         "@noble/secp256k1": "^1.7.1"
@@ -1190,46 +1187,46 @@
       }
     },
     "node_modules/@scure/base": {
-      "version": "1.1.7",
-      "resolved": "https://registry.npmjs.org/@scure/base/-/base-1.1.7.tgz",
-      "integrity": "sha512-PPNYBslrLNNUQ/Yad37MHYsNQtK67EhWb6WtSvNLLPo7SdVZgkUjD6Dg+5On7zNwmskf8OX7I7Nx5oN+MIWE0g==",
+      "version": "1.1.8",
+      "resolved": "https://registry.npmjs.org/@scure/base/-/base-1.1.8.tgz",
+      "integrity": "sha512-6CyAclxj3Nb0XT7GHK6K4zK6k2xJm6E4Ft0Ohjt4WgegiFUHEtFb2CGzmPmGBwoIhrLsqNLYfLr04Y1GePrzZg==",
       "funding": {
         "url": "https://paulmillr.com/funding/"
       }
     },
     "node_modules/@scure/bip32": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/@scure/bip32/-/bip32-1.4.0.tgz",
-      "integrity": "sha512-sVUpc0Vq3tXCkDGYVWGIZTRfnvu8LoTDaev7vbwh0omSvVORONr960MQWdKqJDCReIEmTj3PAr73O3aoxz7OPg==",
-      "license": "MIT",
+      "version": "1.5.0",
+      "resolved": "https://registry.npmjs.org/@scure/bip32/-/bip32-1.5.0.tgz",
+      "integrity": "sha512-8EnFYkqEQdnkuGBVpCzKxyIwDCBLDVj3oiX0EKUFre/tOjL/Hqba1D6n/8RcmaQy4f95qQFrO2A8Sr6ybh4NRw==",
       "dependencies": {
-        "@noble/curves": "~1.4.0",
-        "@noble/hashes": "~1.4.0",
-        "@scure/base": "~1.1.6"
+        "@noble/curves": "~1.6.0",
+        "@noble/hashes": "~1.5.0",
+        "@scure/base": "~1.1.7"
       },
       "funding": {
         "url": "https://paulmillr.com/funding/"
       }
     },
     "node_modules/@scure/bip32/node_modules/@noble/curves": {
-      "version": "1.4.2",
-      "resolved": "https://registry.npmjs.org/@noble/curves/-/curves-1.4.2.tgz",
-      "integrity": "sha512-TavHr8qycMChk8UwMld0ZDRvatedkzWfH8IiaeGCfymOP5i0hSCozz9vHOL0nkwk7HRMlFnAiKpS2jrUmSybcw==",
-      "license": "MIT",
+      "version": "1.6.0",
+      "resolved": "https://registry.npmjs.org/@noble/curves/-/curves-1.6.0.tgz",
+      "integrity": "sha512-TlaHRXDehJuRNR9TfZDNQ45mMEd5dwUwmicsafcIX4SsNiqnCHKjE/1alYPd/lDRVhxdhUAlv8uEhMCI5zjIJQ==",
       "dependencies": {
-        "@noble/hashes": "1.4.0"
+        "@noble/hashes": "1.5.0"
+      },
+      "engines": {
+        "node": "^14.21.3 || >=16"
       },
       "funding": {
         "url": "https://paulmillr.com/funding/"
       }
     },
     "node_modules/@scure/bip32/node_modules/@noble/hashes": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/@noble/hashes/-/hashes-1.4.0.tgz",
-      "integrity": "sha512-V1JJ1WTRUqHHrOSh597hURcMqVKVGL/ea3kv0gSnEdsEZ0/+VyPghM1lMNGc00z7CIQorSvbKpuJkxvuHbvdbg==",
-      "license": "MIT",
+      "version": "1.5.0",
+      "resolved": "https://registry.npmjs.org/@noble/hashes/-/hashes-1.5.0.tgz",
+      "integrity": "sha512-1j6kQFb7QRru7eKN3ZDvRcP13rugwdxZqCjbiAVZfIJwgj2A65UmT4TgARXGlXgnRkORLTDTrO19ZErt7+QXgA==",
       "engines": {
-        "node": ">= 16"
+        "node": "^14.21.3 || >=16"
       },
       "funding": {
         "url": "https://paulmillr.com/funding/"
@@ -1278,9 +1275,9 @@
       }
     },
     "node_modules/@secretkeylabs/xverse-core": {
-      "version": "19.1.0",
-      "resolved": "https://npm.pkg.github.com/download/@secretkeylabs/xverse-core/19.1.0/fe6b53e68ea3d66c7fd1bbf8e791f865299811d8",
-      "integrity": "sha512-ssrdJAb9jpl1mGCfbS4K6S22sKLBXzK5LbYMiNBU8anyps4A79u/c7qkHUDMgDY4pWcuSMs8iS4mcpyshPFiQQ==",
+      "version": "19.2.0",
+      "resolved": "https://npm.pkg.github.com/download/@secretkeylabs/xverse-core/19.2.0/a424882ee1c1c4003c3a52a7a47173208f54423c",
+      "integrity": "sha512-mt8AD33cHTOunXPn5Hu1tj9xtjLFqxK1rMEpOxc+NoIAUPSLB2EfhljF3hdiKxG3VeEn88QOKbpsEKVH1u27mQ==",
       "license": "ISC",
       "dependencies": {
         "@bitcoinerlab/secp256k1": "^1.0.2",
@@ -1335,25 +1332,23 @@
       }
     },
     "node_modules/@secretkeylabs/xverse-core/node_modules/@noble/hashes": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/@noble/hashes/-/hashes-1.4.0.tgz",
-      "integrity": "sha512-V1JJ1WTRUqHHrOSh597hURcMqVKVGL/ea3kv0gSnEdsEZ0/+VyPghM1lMNGc00z7CIQorSvbKpuJkxvuHbvdbg==",
-      "license": "MIT",
+      "version": "1.5.0",
+      "resolved": "https://registry.npmjs.org/@noble/hashes/-/hashes-1.5.0.tgz",
+      "integrity": "sha512-1j6kQFb7QRru7eKN3ZDvRcP13rugwdxZqCjbiAVZfIJwgj2A65UmT4TgARXGlXgnRkORLTDTrO19ZErt7+QXgA==",
       "engines": {
-        "node": ">= 16"
+        "node": "^14.21.3 || >=16"
       },
       "funding": {
         "url": "https://paulmillr.com/funding/"
       }
     },
     "node_modules/@secretkeylabs/xverse-core/node_modules/@scure/bip39": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/@scure/bip39/-/bip39-1.3.0.tgz",
-      "integrity": "sha512-disdg7gHuTDZtY+ZdkmLpPCk7fxZSu3gBiEGuoC1XYxv9cGx3Z6cpTggCgW6odSOOIXCiDjuGejW+aJKCY/pIQ==",
-      "license": "MIT",
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/@scure/bip39/-/bip39-1.4.0.tgz",
+      "integrity": "sha512-BEEm6p8IueV/ZTfQLp/0vhw4NPnT9oWf5+28nvmeUICjP99f4vr2d+qc7AVGDDtwRep6ifR43Yed9ERVmiITzw==",
       "dependencies": {
-        "@noble/hashes": "~1.4.0",
-        "@scure/base": "~1.1.6"
+        "@noble/hashes": "~1.5.0",
+        "@scure/base": "~1.1.8"
       },
       "funding": {
         "url": "https://paulmillr.com/funding/"
@@ -1363,7 +1358,6 @@
       "version": "7.7.1",
       "resolved": "https://registry.npmjs.org/@stacks/connect/-/connect-7.7.1.tgz",
       "integrity": "sha512-MwLRhgRLOGo0Y4IDC0qp9RUX2SZubgse1aI2TN/fz2abNIh1LgmOKUua3w17YiBEZxDD9nyQ4KW1c33bdnrOPw==",
-      "license": "MIT",
       "dependencies": {
         "@stacks/auth": "^6.1.1",
         "@stacks/connect-ui": "6.4.1",
@@ -1377,7 +1371,6 @@
       "version": "6.4.1",
       "resolved": "https://registry.npmjs.org/@stacks/connect-ui/-/connect-ui-6.4.1.tgz",
       "integrity": "sha512-Y6Fp26MUsMQq08zFSWus40rS7RNHrHj6VDJrFUqM9VsksV3wftpsRcy7psQusUvW1DS7fPza67IlM1dcN4rvSg==",
-      "license": "MIT",
       "dependencies": {
         "@stencil/core": "^2.17.1"
       }
@@ -1390,14 +1383,12 @@
     "node_modules/@secretkeylabs/xverse-core/node_modules/@types/node": {
       "version": "11.11.6",
       "resolved": "https://registry.npmjs.org/@types/node/-/node-11.11.6.tgz",
-      "integrity": "sha512-Exw4yUWMBXM3X+8oqzJNRqZSwUAaS4+7NdvHqQuFi/d+synz++xmX3QIf+BFqneW8N31R8Ky+sikfZUXq07ggQ==",
-      "license": "MIT"
+      "integrity": "sha512-Exw4yUWMBXM3X+8oqzJNRqZSwUAaS4+7NdvHqQuFi/d+synz++xmX3QIf+BFqneW8N31R8Ky+sikfZUXq07ggQ=="
     },
     "node_modules/@secretkeylabs/xverse-core/node_modules/async-mutex": {
       "version": "0.4.1",
       "resolved": "https://registry.npmjs.org/async-mutex/-/async-mutex-0.4.1.tgz",
       "integrity": "sha512-WfoBo4E/TbCX1G95XTjbWTE3X2XLG0m1Xbv2cwOtuPdyH9CZvnaA5nCt1ucjaKEgW2A5IF71hxrRhr83Je5xjA==",
-      "license": "MIT",
       "dependencies": {
         "tslib": "^2.4.0"
       }
@@ -1406,7 +1397,6 @@
       "version": "3.0.3",
       "resolved": "https://registry.npmjs.org/bip39/-/bip39-3.0.3.tgz",
       "integrity": "sha512-P0dKrz4g0V0BjXfx7d9QNkJ/Txcz/k+hM9TnjqjUaXtuOfAvxXSw2rJw8DX0e3ZPwnK/IgDxoRqf0bvoVCqbMg==",
-      "license": "ISC",
       "dependencies": {
         "@types/node": "11.11.6",
         "create-hash": "^1.1.0",
@@ -1621,7 +1611,6 @@
       "version": "6.16.1",
       "resolved": "https://registry.npmjs.org/@stacks/storage/-/storage-6.16.1.tgz",
       "integrity": "sha512-bElxB03dg3XGTX8r/J8Os2tIsodcTglg7zeq6RU4FVUU7tUA+Agpmn9FKl8MmnsWfO4ls5UgeujyBaxUJ//yAw==",
-      "license": "MIT",
       "dependencies": {
         "@stacks/auth": "^6.16.1",
         "@stacks/common": "^6.16.0",
@@ -1660,7 +1649,6 @@
       "version": "6.16.1",
       "resolved": "https://registry.npmjs.org/@stacks/wallet-sdk/-/wallet-sdk-6.16.1.tgz",
       "integrity": "sha512-QYm/BfRpHZfD5FjvaOJp0hy8yeqde6qrEmSrcIl06IC2SNr4R5NOy0xK/RPUgJFB1/Gd16HbqS9EdyV3o6ybwg==",
-      "license": "MIT",
       "dependencies": {
         "@scure/bip32": "1.1.3",
         "@scure/bip39": "1.1.0",
@@ -1687,8 +1675,7 @@
           "type": "individual",
           "url": "https://paulmillr.com/funding/"
         }
-      ],
-      "license": "MIT"
+      ]
     },
     "node_modules/@stacks/wallet-sdk/node_modules/@scure/bip32": {
       "version": "1.1.3",
@@ -1700,7 +1687,6 @@
           "url": "https://paulmillr.com/funding/"
         }
       ],
-      "license": "MIT",
       "dependencies": {
         "@noble/hashes": "~1.1.3",
         "@noble/secp256k1": "~1.7.0",
@@ -2185,7 +2171,6 @@
       "version": "2.4.4",
       "resolved": "https://registry.npmjs.org/@types/sha.js/-/sha.js-2.4.4.tgz",
       "integrity": "sha512-Qukd+D6S2Hm0wLVt2Vh+/eWBIoUt+wF8jWjBsG4F8EFQRwKtYvtXCPcNl2OEUQ1R+eTr3xuSaBYUyM3WD1x/Qw==",
-      "license": "MIT",
       "dependencies": {
         "@types/node": "*"
       }
@@ -2213,8 +2198,7 @@
     "node_modules/@types/uuid": {
       "version": "8.3.4",
       "resolved": "https://registry.npmjs.org/@types/uuid/-/uuid-8.3.4.tgz",
-      "integrity": "sha512-c/I8ZRb51j+pYGAu5CrFMRxqZ2ke4y2grEBO5AUjgSkSk+qT2Ea+OdWElz/OiMf5MNpn2b17kuVBwZLQJXzihw==",
-      "license": "MIT"
+      "integrity": "sha512-c/I8ZRb51j+pYGAu5CrFMRxqZ2ke4y2grEBO5AUjgSkSk+qT2Ea+OdWElz/OiMf5MNpn2b17kuVBwZLQJXzihw=="
     },
     "node_modules/@types/webextension-polyfill": {
       "version": "0.9.2",
@@ -2686,7 +2670,6 @@
       "version": "1.0.4",
       "resolved": "https://registry.npmjs.org/@zondax/ledger-stacks/-/ledger-stacks-1.0.4.tgz",
       "integrity": "sha512-R8CB0CZ2poTzpcG0jhzzXZvXF7axIsmZFhp06aHCUjgz+1df63YbC4tUzyzmseekwqNWnaebWFejQKJ99WiHZA==",
-      "license": "Apache-2.0",
       "dependencies": {
         "@babel/runtime": "^7.12.5",
         "@ledgerhq/hw-transport": "^6.28.1",
@@ -2698,7 +2681,6 @@
       "version": "4.3.5",
       "resolved": "https://registry.npmjs.org/@stacks/common/-/common-4.3.5.tgz",
       "integrity": "sha512-UuViiQ7fn3vdtTe3739aRzbl+wbukekeQuXgqt8d7nB2HC2HodD7GcHhpUga165cO35CD6lQUtj3vXxJb5Ga+A==",
-      "license": "MIT",
       "dependencies": {
         "@types/bn.js": "^5.1.0",
         "@types/node": "^18.0.4",
@@ -2709,7 +2691,6 @@
       "version": "4.3.5",
       "resolved": "https://registry.npmjs.org/@stacks/network/-/network-4.3.5.tgz",
       "integrity": "sha512-TC4+AkuT6qi3MoEGxTftA+4BNp99QvGnI+qtKQkoA1m0KDr8b9hSBUhugJHRhQbWuo7D6q0+JagYEGxLID29Kw==",
-      "license": "MIT",
       "dependencies": {
         "@stacks/common": "^4.3.5",
         "cross-fetch": "^3.1.5"
@@ -2719,7 +2700,6 @@
       "version": "4.3.8",
       "resolved": "https://registry.npmjs.org/@stacks/transactions/-/transactions-4.3.8.tgz",
       "integrity": "sha512-5xYYv2TdXXM9PVixB79Pr99symQ8fhbVATjempGUxtL23/XUiRiLvJZohDxIE4VQ2EzbB4g4j8Y7oqPjj0h09Q==",
-      "license": "MIT",
       "dependencies": {
         "@noble/hashes": "^1.0.0",
         "@noble/secp256k1": "^1.5.5",
@@ -2735,10 +2715,9 @@
       }
     },
     "node_modules/@zondax/ledger-stacks/node_modules/@types/node": {
-      "version": "18.19.47",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-18.19.47.tgz",
-      "integrity": "sha512-1f7dB3BL/bpd9tnDJrrHb66Y+cVrhxSOTGorRNdHwYTUlTay3HuTDPKo9a/4vX9pMQkhYBcAbL4jQdNlhCFP9A==",
-      "license": "MIT",
+      "version": "18.19.50",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-18.19.50.tgz",
+      "integrity": "sha512-xonK+NRrMBRtkL1hVCc3G+uXtjh1Al4opBLjqVmipe5ZAaBYWW6cNAiBVZ1BvmkBhep698rP3UM3aRAdSALuhg==",
       "dependencies": {
         "undici-types": "~5.26.4"
       }
@@ -2747,7 +2726,6 @@
       "version": "3.0.10",
       "resolved": "https://registry.npmjs.org/base-x/-/base-x-3.0.10.tgz",
       "integrity": "sha512-7d0s06rR9rYaIWHkpfLIFICM/tkSVdoPC9qYAQRpxn9DdKNWNsKC0uk++akckyLq16Tx2WIinnZ6WRriAt6njQ==",
-      "license": "MIT",
       "dependencies": {
         "safe-buffer": "^5.0.1"
       }
@@ -2756,7 +2734,6 @@
       "version": "1.1.3",
       "resolved": "https://registry.npmjs.org/c32check/-/c32check-1.1.3.tgz",
       "integrity": "sha512-ADADE/PjAbJRlwpG3ShaOMbBUlJJZO7xaYSRD5Tub6PixQlgR4s36y9cvMf/YRGpkqX+QOxIdMw216iC320q9A==",
-      "license": "MIT",
       "dependencies": {
         "base-x": "^3.0.8",
         "buffer": "^5.6.0",
@@ -3325,7 +3302,6 @@
       "version": "3.0.1",
       "resolved": "https://registry.npmjs.org/base64url/-/base64url-3.0.1.tgz",
       "integrity": "sha512-ir1UPr3dkwexU7FdV8qBBbNDRUhMmIekYMFZfi+C/sLNnRESKPl23nB9b2pltqfOQNnGzsDdId90AEtG5tCx4A==",
-      "license": "MIT",
       "engines": {
         "node": ">=6.0.0"
       }
@@ -3379,7 +3355,6 @@
       "version": "1.5.0",
       "resolved": "https://registry.npmjs.org/bindings/-/bindings-1.5.0.tgz",
       "integrity": "sha512-p2q/t/mhvuOj/UeLlV6566GD/guowlr0hHxClI0W9m7MWYkL1F0hLo+0Aexs9HSPCtR1SXQ0TD3MMKrXZajbiQ==",
-      "license": "MIT",
       "dependencies": {
         "file-uri-to-path": "1.0.0"
       }
@@ -3388,7 +3363,6 @@
       "version": "2.1.1",
       "resolved": "https://registry.npmjs.org/bip174/-/bip174-2.1.1.tgz",
       "integrity": "sha512-mdFV5+/v0XyNYXjBS6CQPLo9ekCx4gtKZFnJm5PMto7Fs9hTTDpkkzOB7/FtluRI6JbUUAu+snTYfJRgHLZbZQ==",
-      "license": "MIT",
       "engines": {
         "node": ">=8.0.0"
       }
@@ -3397,7 +3371,6 @@
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/bip32/-/bip32-4.0.0.tgz",
       "integrity": "sha512-aOGy88DDlVUhspIXJN+dVEtclhIsfAUppD43V0j40cPTld3pv/0X/MlrZSZ6jowIaQQzFwP8M6rFU2z2mVYjDQ==",
-      "license": "MIT",
       "dependencies": {
         "@noble/hashes": "^1.2.0",
         "@scure/base": "^1.1.1",
@@ -3411,8 +3384,7 @@
     "node_modules/bip32-path": {
       "version": "0.4.2",
       "resolved": "https://registry.npmjs.org/bip32-path/-/bip32-path-0.4.2.tgz",
-      "integrity": "sha512-ZBMCELjJfcNMkz5bDuJ1WrYvjlhEF5k6mQ8vUr4N7MbVRsXei7ZOg8VhhwMfNiW68NWmLkgkc6WvTickrLGprQ==",
-      "license": "MIT"
+      "integrity": "sha512-ZBMCELjJfcNMkz5bDuJ1WrYvjlhEF5k6mQ8vUr4N7MbVRsXei7ZOg8VhhwMfNiW68NWmLkgkc6WvTickrLGprQ=="
     },
     "node_modules/bip39": {
       "version": "3.1.0",
@@ -3426,7 +3398,6 @@
       "version": "1.1.5",
       "resolved": "https://registry.npmjs.org/bip66/-/bip66-1.1.5.tgz",
       "integrity": "sha512-nemMHz95EmS38a26XbbdxIYj5csHd3RMP3H5bwQknX0WYHF01qhpufP42mLOwVICuH2JmhIhXiWs89MfUGL7Xw==",
-      "license": "MIT",
       "dependencies": {
         "safe-buffer": "^5.0.1"
       }
@@ -3435,7 +3406,6 @@
       "version": "1.0.4",
       "resolved": "https://registry.npmjs.org/bip68/-/bip68-1.0.4.tgz",
       "integrity": "sha512-O1htyufFTYy3EO0JkHg2CLykdXEtV2ssqw47Gq9A0WByp662xpJnMEB9m43LZjsSDjIAOozWRExlFQk2hlV1XQ==",
-      "license": "ISC",
       "engines": {
         "node": ">=4.5.0"
       }
@@ -3454,7 +3424,6 @@
       "version": "6.1.6",
       "resolved": "https://registry.npmjs.org/bitcoinjs-lib/-/bitcoinjs-lib-6.1.6.tgz",
       "integrity": "sha512-Fk8+Vc+e2rMoDU5gXkW9tD+313rhkm5h6N9HfZxXvYU9LedttVvmXKTgd9k5rsQJjkSfsv6XRM8uhJv94SrvcA==",
-      "license": "MIT",
       "dependencies": {
         "@noble/hashes": "^1.2.0",
         "bech32": "^2.0.0",
@@ -3471,7 +3440,6 @@
       "version": "2.2.0",
       "resolved": "https://registry.npmjs.org/bitcoinjs-message/-/bitcoinjs-message-2.2.0.tgz",
       "integrity": "sha512-103Wy3xg8Y9o+pdhGP4M3/mtQQuUWs6sPuOp1mYphSUoSMHjHTlkj32K4zxU8qMH0Ckv23emfkGlFWtoWZ7YFA==",
-      "license": "MIT",
       "dependencies": {
         "bech32": "^1.1.3",
         "bs58check": "^2.1.2",
@@ -3488,7 +3456,6 @@
       "version": "3.0.10",
       "resolved": "https://registry.npmjs.org/base-x/-/base-x-3.0.10.tgz",
       "integrity": "sha512-7d0s06rR9rYaIWHkpfLIFICM/tkSVdoPC9qYAQRpxn9DdKNWNsKC0uk++akckyLq16Tx2WIinnZ6WRriAt6njQ==",
-      "license": "MIT",
       "dependencies": {
         "safe-buffer": "^5.0.1"
       }
@@ -3496,14 +3463,12 @@
     "node_modules/bitcoinjs-message/node_modules/bech32": {
       "version": "1.1.4",
       "resolved": "https://registry.npmjs.org/bech32/-/bech32-1.1.4.tgz",
-      "integrity": "sha512-s0IrSOzLlbvX7yp4WBfPITzpAU8sqQcpsmwXDiKwrG4r491vwCO/XpejasRNl0piBMe/DvP4Tz0mIS/X1DPJBQ==",
-      "license": "MIT"
+      "integrity": "sha512-s0IrSOzLlbvX7yp4WBfPITzpAU8sqQcpsmwXDiKwrG4r491vwCO/XpejasRNl0piBMe/DvP4Tz0mIS/X1DPJBQ=="
     },
     "node_modules/bitcoinjs-message/node_modules/bs58": {
       "version": "4.0.1",
       "resolved": "https://registry.npmjs.org/bs58/-/bs58-4.0.1.tgz",
       "integrity": "sha512-Ok3Wdf5vOIlBrgCvTq96gBkJw+JUEzdBgyaza5HLtPm7yTHkjRy8+JzNyHF7BHa0bNWOQIp3m5YF0nnFcOIKLw==",
-      "license": "MIT",
       "dependencies": {
         "base-x": "^3.0.2"
       }
@@ -3512,7 +3477,6 @@
       "version": "2.1.2",
       "resolved": "https://registry.npmjs.org/bs58check/-/bs58check-2.1.2.tgz",
       "integrity": "sha512-0TS1jicxdU09dwJMNZtVAfzPi6Q6QeN0pM1Fkzrjn+XYHvzMKPU3pHVpva+769iNVSfIYWf7LJ6WR+BuuMf8cA==",
-      "license": "MIT",
       "dependencies": {
         "bs58": "^4.0.0",
         "create-hash": "^1.1.0",
@@ -3775,7 +3739,6 @@
       "version": "3.0.1",
       "resolved": "https://registry.npmjs.org/bs58check/-/bs58check-3.0.1.tgz",
       "integrity": "sha512-hjuuJvoWEybo7Hn/0xOrczQKKEKD63WguEjlhLExYs2wUBcebDC1jDNK17eEAD2lYfw82d5ASC1d7K3SWszjaQ==",
-      "license": "MIT",
       "dependencies": {
         "@noble/hashes": "^1.2.0",
         "bs58": "^5.0.0"
@@ -3808,7 +3771,6 @@
       "version": "1.0.4",
       "resolved": "https://registry.npmjs.org/buffer-equals/-/buffer-equals-1.0.4.tgz",
       "integrity": "sha512-99MsCq0j5+RhubVEtKQgKaD6EM+UP3xJgIvQqwJ3SOLDUekzxMX1ylXBng+Wa2sh7mGT0W6RUly8ojjr1Tt6nA==",
-      "license": "MIT",
       "engines": {
         "node": ">=0.10.0"
       }
@@ -4438,7 +4400,6 @@
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/cross-sha256/-/cross-sha256-1.2.0.tgz",
       "integrity": "sha512-KViLNMDZKV7jwFqjFx+rNhG26amnFYYQ0S+VaFlVvpk8tM+2XbFia/don/SjGHg9WQxnFVi6z64CGPuF3T+nNw==",
-      "license": "(MIT AND BSD-3-Clause)",
       "dependencies": {
         "buffer": "^5.6.0"
       }
@@ -5052,7 +5013,6 @@
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/drbg.js/-/drbg.js-1.0.1.tgz",
       "integrity": "sha512-F4wZ06PvqxYLFEZKkFxTDcns9oFNk34hvmJSEwdzsxVQ8YI5YaxtACgQatkYgv2VI2CFkUd2Y+xosPQnHv809g==",
-      "license": "MIT",
       "dependencies": {
         "browserify-aes": "^1.0.6",
         "create-hash": "^1.1.2",
@@ -5084,7 +5044,6 @@
       "version": "1.0.11",
       "resolved": "https://registry.npmjs.org/ecdsa-sig-formatter/-/ecdsa-sig-formatter-1.0.11.tgz",
       "integrity": "sha512-nagl3RYrbNv6kQkeJIpt6NJZy8twLB/2vtz6yN9Z4vRKHN4/QZJIEbqohALSgwKdnksuY3k5Addp5lg8sVoVcQ==",
-      "license": "Apache-2.0",
       "dependencies": {
         "safe-buffer": "^5.0.1"
       }
@@ -5093,7 +5052,6 @@
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/ecpair/-/ecpair-2.1.0.tgz",
       "integrity": "sha512-cL/mh3MtJutFOvFc27GPZE2pWL3a3k4YvzUWEOvilnfZVlH3Jwgx/7d6tlD7/75tNk8TG2m+7Kgtz0SI1tWcqw==",
-      "license": "MIT",
       "dependencies": {
         "randombytes": "^2.1.0",
         "typeforce": "^1.18.0",
@@ -6217,8 +6175,7 @@
     "node_modules/file-uri-to-path": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/file-uri-to-path/-/file-uri-to-path-1.0.0.tgz",
-      "integrity": "sha512-0Zt+s3L7Vf1biwWZ29aARiVYLx7iMGnEUl9x33fbB/j3jR81u/O2LbqK+Bm1CDSNDKVtJ/YjwY7TUd5SkeLQLw==",
-      "license": "MIT"
+      "integrity": "sha512-0Zt+s3L7Vf1biwWZ29aARiVYLx7iMGnEUl9x33fbB/j3jR81u/O2LbqK+Bm1CDSNDKVtJ/YjwY7TUd5SkeLQLw=="
     },
     "node_modules/fill-range": {
       "version": "7.0.1",
@@ -7531,7 +7488,6 @@
       "version": "1.0.10",
       "resolved": "https://registry.npmjs.org/is-generator-function/-/is-generator-function-1.0.10.tgz",
       "integrity": "sha512-jsEjy9l3yiXEQ+PsXdmBwEPcOxaXWLspKdplFUVI9vq1iZgIekeC0L167qeu86czQaxed3q/Uzuw0swL0irL8A==",
-      "license": "MIT",
       "dependencies": {
         "has-tostringtag": "^1.0.0"
       },
@@ -7923,7 +7879,6 @@
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/json-bigint/-/json-bigint-1.0.0.tgz",
       "integrity": "sha512-SiPv/8VpZuWbvLSMtTDU8hEfrZWg/mH/nV/b4o0CYbSxu1UIQPLdwKOCIyLQX+VIPO5vrLX3i8qtqFyhdPSUSQ==",
-      "license": "MIT",
       "dependencies": {
         "bignumber.js": "^9.0.0"
       }
@@ -8147,7 +8102,6 @@
       "version": "0.2.3",
       "resolved": "https://registry.npmjs.org/ledger-bitcoin/-/ledger-bitcoin-0.2.3.tgz",
       "integrity": "sha512-sWdvMTR5CkebNlM0Mam9ROdpsD7Y4087kj4cbIaCCq8IXShCQ44vE3j0wTmt+sHp13eETgY63OWN1rkuIfMfuQ==",
-      "license": "Apache-2.0",
       "dependencies": {
         "@bitcoinerlab/descriptors": "^1.0.2",
         "@bitcoinerlab/secp256k1": "^1.0.5",
@@ -8935,8 +8889,7 @@
     "node_modules/nan": {
       "version": "2.20.0",
       "resolved": "https://registry.npmjs.org/nan/-/nan-2.20.0.tgz",
-      "integrity": "sha512-bk3gXBZDGILuuo/6sKtr0DQmSThYHLtNCdSdXk9YkxD/jK6X2vmCyyXBBxyqZ4XcnzTyYEAThfX3DCEnLf6igw==",
-      "license": "MIT"
+      "integrity": "sha512-bk3gXBZDGILuuo/6sKtr0DQmSThYHLtNCdSdXk9YkxD/jK6X2vmCyyXBBxyqZ4XcnzTyYEAThfX3DCEnLf6igw=="
     },
     "node_modules/nano-time": {
       "version": "1.0.0",
@@ -10796,7 +10749,6 @@
       "resolved": "https://registry.npmjs.org/secp256k1/-/secp256k1-3.8.0.tgz",
       "integrity": "sha512-k5ke5avRZbtl9Tqx/SA7CbY3NF6Ro+Sj9cZxezFzuBlLDmyqPiL8hJJ+EmzD8Ig4LUDByHJ3/iPOVoRixs/hmw==",
       "hasInstallScript": true,
-      "license": "MIT",
       "dependencies": {
         "bindings": "^1.5.0",
         "bip66": "^1.1.5",
@@ -10814,8 +10766,7 @@
     "node_modules/secp256k1/node_modules/bn.js": {
       "version": "4.12.0",
       "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.0.tgz",
-      "integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA==",
-      "license": "MIT"
+      "integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA=="
     },
     "node_modules/select-hose": {
       "version": "2.0.0",
@@ -11131,7 +11082,6 @@
       "version": "4.2.0",
       "resolved": "https://registry.npmjs.org/smart-buffer/-/smart-buffer-4.2.0.tgz",
       "integrity": "sha512-94hK0Hh8rPqQl2xXc3HsaBoOXKV20MToPkcXvwbISWLEs+64sBq5kFgn2kJDHb1Pry9yrP0dxrCI9RRci7RXKg==",
-      "license": "MIT",
       "engines": {
         "node": ">= 6.0.0",
         "npm": ">= 3.0.0"
@@ -12101,8 +12051,7 @@
     "node_modules/typeforce": {
       "version": "1.18.0",
       "resolved": "https://registry.npmjs.org/typeforce/-/typeforce-1.18.0.tgz",
-      "integrity": "sha512-7uc1O8h1M1g0rArakJdf0uLRSSgFcYexrVoKo+bzJd32gd4gDy2L/Z+8/FjPnU9ydY3pEnVPtr9FyscYY60K1g==",
-      "license": "MIT"
+      "integrity": "sha512-7uc1O8h1M1g0rArakJdf0uLRSSgFcYexrVoKo+bzJd32gd4gDy2L/Z+8/FjPnU9ydY3pEnVPtr9FyscYY60K1g=="
     },
     "node_modules/typescript": {
       "version": "5.5.4",
@@ -12127,10 +12076,9 @@
       }
     },
     "node_modules/uglify-js": {
-      "version": "3.19.2",
-      "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.19.2.tgz",
-      "integrity": "sha512-S8KA6DDI47nQXJSi2ctQ629YzwOVs+bQML6DAtvy0wgNdpi+0ySpQK0g2pxBq2xfF2z3YCscu7NNA8nXT9PlIQ==",
-      "license": "BSD-2-Clause",
+      "version": "3.19.3",
+      "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.19.3.tgz",
+      "integrity": "sha512-v3Xu+yuwBXisp6QYTcH4UbH+xYJXqnq2m/LtQVWKWzYc1iehYnLixoQDN9FH6/j9/oybfd6W9Ghwkl8+UMKTKQ==",
       "bin": {
         "uglifyjs": "bin/uglifyjs"
       },
@@ -12244,7 +12192,6 @@
       "version": "0.12.5",
       "resolved": "https://registry.npmjs.org/util/-/util-0.12.5.tgz",
       "integrity": "sha512-kZf/K6hEIrWHI6XqOFUiiMa+79wE/D8Q+NCNAWclkyg3b4d2k7s0QGepNjiABc+aR3N1PAyHL7p6UcLY6LmrnA==",
-      "license": "MIT",
       "dependencies": {
         "inherits": "^2.0.3",
         "is-arguments": "^1.0.4",
@@ -12285,7 +12232,6 @@
       "version": "6.2.13",
       "resolved": "https://registry.npmjs.org/uuidv4/-/uuidv4-6.2.13.tgz",
       "integrity": "sha512-AXyzMjazYB3ovL3q051VLH06Ixj//Knx7QnUSi1T//Ie3io6CpsPu9nVMOx5MoLWh6xV0B9J0hIaxungxXUbPQ==",
-      "license": "MIT",
       "dependencies": {
         "@types/uuid": "8.3.4",
         "uuid": "8.3.2"
@@ -12733,7 +12679,6 @@
       "version": "2.0.6",
       "resolved": "https://registry.npmjs.org/wif/-/wif-2.0.6.tgz",
       "integrity": "sha512-HIanZn1zmduSF+BQhkE+YXIbEiH0xPr1012QbFEGB0xsKqJii0/SqJjyn8dFv6y36kOznMgMB+LGcbZTJ1xACQ==",
-      "license": "MIT",
       "dependencies": {
         "bs58check": "<3.0.0"
       }
@@ -12742,7 +12687,6 @@
       "version": "3.0.10",
       "resolved": "https://registry.npmjs.org/base-x/-/base-x-3.0.10.tgz",
       "integrity": "sha512-7d0s06rR9rYaIWHkpfLIFICM/tkSVdoPC9qYAQRpxn9DdKNWNsKC0uk++akckyLq16Tx2WIinnZ6WRriAt6njQ==",
-      "license": "MIT",
       "dependencies": {
         "safe-buffer": "^5.0.1"
       }
@@ -12751,7 +12695,6 @@
       "version": "4.0.1",
       "resolved": "https://registry.npmjs.org/bs58/-/bs58-4.0.1.tgz",
       "integrity": "sha512-Ok3Wdf5vOIlBrgCvTq96gBkJw+JUEzdBgyaza5HLtPm7yTHkjRy8+JzNyHF7BHa0bNWOQIp3m5YF0nnFcOIKLw==",
-      "license": "MIT",
       "dependencies": {
         "base-x": "^3.0.2"
       }
@@ -12760,7 +12703,6 @@
       "version": "2.1.2",
       "resolved": "https://registry.npmjs.org/bs58check/-/bs58check-2.1.2.tgz",
       "integrity": "sha512-0TS1jicxdU09dwJMNZtVAfzPi6Q6QeN0pM1Fkzrjn+XYHvzMKPU3pHVpva+769iNVSfIYWf7LJ6WR+BuuMf8cA==",
-      "license": "MIT",
       "dependencies": {
         "bs58": "^4.0.0",
         "create-hash": "^1.1.0",
@@ -13638,32 +13580,32 @@
       }
     },
     "@scure/base": {
-      "version": "1.1.7",
-      "resolved": "https://registry.npmjs.org/@scure/base/-/base-1.1.7.tgz",
-      "integrity": "sha512-PPNYBslrLNNUQ/Yad37MHYsNQtK67EhWb6WtSvNLLPo7SdVZgkUjD6Dg+5On7zNwmskf8OX7I7Nx5oN+MIWE0g=="
+      "version": "1.1.8",
+      "resolved": "https://registry.npmjs.org/@scure/base/-/base-1.1.8.tgz",
+      "integrity": "sha512-6CyAclxj3Nb0XT7GHK6K4zK6k2xJm6E4Ft0Ohjt4WgegiFUHEtFb2CGzmPmGBwoIhrLsqNLYfLr04Y1GePrzZg=="
     },
     "@scure/bip32": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/@scure/bip32/-/bip32-1.4.0.tgz",
-      "integrity": "sha512-sVUpc0Vq3tXCkDGYVWGIZTRfnvu8LoTDaev7vbwh0omSvVORONr960MQWdKqJDCReIEmTj3PAr73O3aoxz7OPg==",
+      "version": "1.5.0",
+      "resolved": "https://registry.npmjs.org/@scure/bip32/-/bip32-1.5.0.tgz",
+      "integrity": "sha512-8EnFYkqEQdnkuGBVpCzKxyIwDCBLDVj3oiX0EKUFre/tOjL/Hqba1D6n/8RcmaQy4f95qQFrO2A8Sr6ybh4NRw==",
       "requires": {
-        "@noble/curves": "~1.4.0",
-        "@noble/hashes": "~1.4.0",
-        "@scure/base": "~1.1.6"
+        "@noble/curves": "~1.6.0",
+        "@noble/hashes": "~1.5.0",
+        "@scure/base": "~1.1.7"
       },
       "dependencies": {
         "@noble/curves": {
-          "version": "1.4.2",
-          "resolved": "https://registry.npmjs.org/@noble/curves/-/curves-1.4.2.tgz",
-          "integrity": "sha512-TavHr8qycMChk8UwMld0ZDRvatedkzWfH8IiaeGCfymOP5i0hSCozz9vHOL0nkwk7HRMlFnAiKpS2jrUmSybcw==",
+          "version": "1.6.0",
+          "resolved": "https://registry.npmjs.org/@noble/curves/-/curves-1.6.0.tgz",
+          "integrity": "sha512-TlaHRXDehJuRNR9TfZDNQ45mMEd5dwUwmicsafcIX4SsNiqnCHKjE/1alYPd/lDRVhxdhUAlv8uEhMCI5zjIJQ==",
           "requires": {
-            "@noble/hashes": "1.4.0"
+            "@noble/hashes": "1.5.0"
           }
         },
         "@noble/hashes": {
-          "version": "1.4.0",
-          "resolved": "https://registry.npmjs.org/@noble/hashes/-/hashes-1.4.0.tgz",
-          "integrity": "sha512-V1JJ1WTRUqHHrOSh597hURcMqVKVGL/ea3kv0gSnEdsEZ0/+VyPghM1lMNGc00z7CIQorSvbKpuJkxvuHbvdbg=="
+          "version": "1.5.0",
+          "resolved": "https://registry.npmjs.org/@noble/hashes/-/hashes-1.5.0.tgz",
+          "integrity": "sha512-1j6kQFb7QRru7eKN3ZDvRcP13rugwdxZqCjbiAVZfIJwgj2A65UmT4TgARXGlXgnRkORLTDTrO19ZErt7+QXgA=="
         }
       }
     },
@@ -13695,9 +13637,9 @@
       }
     },
     "@secretkeylabs/xverse-core": {
-      "version": "19.1.0",
-      "resolved": "https://npm.pkg.github.com/download/@secretkeylabs/xverse-core/19.1.0/fe6b53e68ea3d66c7fd1bbf8e791f865299811d8",
-      "integrity": "sha512-ssrdJAb9jpl1mGCfbS4K6S22sKLBXzK5LbYMiNBU8anyps4A79u/c7qkHUDMgDY4pWcuSMs8iS4mcpyshPFiQQ==",
+      "version": "19.2.0",
+      "resolved": "https://npm.pkg.github.com/download/@secretkeylabs/xverse-core/19.2.0/a424882ee1c1c4003c3a52a7a47173208f54423c",
+      "integrity": "sha512-mt8AD33cHTOunXPn5Hu1tj9xtjLFqxK1rMEpOxc+NoIAUPSLB2EfhljF3hdiKxG3VeEn88QOKbpsEKVH1u27mQ==",
       "requires": {
         "@bitcoinerlab/secp256k1": "^1.0.2",
         "@noble/curves": "^1.2.0",
@@ -13742,17 +13684,17 @@
       },
       "dependencies": {
         "@noble/hashes": {
-          "version": "1.4.0",
-          "resolved": "https://registry.npmjs.org/@noble/hashes/-/hashes-1.4.0.tgz",
-          "integrity": "sha512-V1JJ1WTRUqHHrOSh597hURcMqVKVGL/ea3kv0gSnEdsEZ0/+VyPghM1lMNGc00z7CIQorSvbKpuJkxvuHbvdbg=="
+          "version": "1.5.0",
+          "resolved": "https://registry.npmjs.org/@noble/hashes/-/hashes-1.5.0.tgz",
+          "integrity": "sha512-1j6kQFb7QRru7eKN3ZDvRcP13rugwdxZqCjbiAVZfIJwgj2A65UmT4TgARXGlXgnRkORLTDTrO19ZErt7+QXgA=="
         },
         "@scure/bip39": {
-          "version": "1.3.0",
-          "resolved": "https://registry.npmjs.org/@scure/bip39/-/bip39-1.3.0.tgz",
-          "integrity": "sha512-disdg7gHuTDZtY+ZdkmLpPCk7fxZSu3gBiEGuoC1XYxv9cGx3Z6cpTggCgW6odSOOIXCiDjuGejW+aJKCY/pIQ==",
+          "version": "1.4.0",
+          "resolved": "https://registry.npmjs.org/@scure/bip39/-/bip39-1.4.0.tgz",
+          "integrity": "sha512-BEEm6p8IueV/ZTfQLp/0vhw4NPnT9oWf5+28nvmeUICjP99f4vr2d+qc7AVGDDtwRep6ifR43Yed9ERVmiITzw==",
           "requires": {
-            "@noble/hashes": "~1.4.0",
-            "@scure/base": "~1.1.6"
+            "@noble/hashes": "~1.5.0",
+            "@scure/base": "~1.1.8"
           }
         },
         "@stacks/connect": {
@@ -14897,9 +14839,9 @@
           }
         },
         "@types/node": {
-          "version": "18.19.47",
-          "resolved": "https://registry.npmjs.org/@types/node/-/node-18.19.47.tgz",
-          "integrity": "sha512-1f7dB3BL/bpd9tnDJrrHb66Y+cVrhxSOTGorRNdHwYTUlTay3HuTDPKo9a/4vX9pMQkhYBcAbL4jQdNlhCFP9A==",
+          "version": "18.19.50",
+          "resolved": "https://registry.npmjs.org/@types/node/-/node-18.19.50.tgz",
+          "integrity": "sha512-xonK+NRrMBRtkL1hVCc3G+uXtjh1Al4opBLjqVmipe5ZAaBYWW6cNAiBVZ1BvmkBhep698rP3UM3aRAdSALuhg==",
           "requires": {
             "undici-types": "~5.26.4"
           }
@@ -21861,9 +21803,9 @@
       "requires": {}
     },
     "uglify-js": {
-      "version": "3.19.2",
-      "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.19.2.tgz",
-      "integrity": "sha512-S8KA6DDI47nQXJSi2ctQ629YzwOVs+bQML6DAtvy0wgNdpi+0ySpQK0g2pxBq2xfF2z3YCscu7NNA8nXT9PlIQ=="
+      "version": "3.19.3",
+      "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.19.3.tgz",
+      "integrity": "sha512-v3Xu+yuwBXisp6QYTcH4UbH+xYJXqnq2m/LtQVWKWzYc1iehYnLixoQDN9FH6/j9/oybfd6W9Ghwkl8+UMKTKQ=="
     },
     "unbox-primitive": {
       "version": "1.0.2",
diff --git a/package.json b/package.json
index bd87877d9..ce6119476 100644
--- a/package.json
+++ b/package.json
@@ -43,7 +43,7 @@
     "@react-spring/web": "^9.6.1",
     "@sats-connect/core": "0.2.1",
     "@scure/btc-signer": "1.2.1",
-    "@secretkeylabs/xverse-core": "19.1.0",
+    "@secretkeylabs/xverse-core": "19.2.0",
     "@stacks/connect": "7.4.1",
     "@stacks/stacks-blockchain-api-types": "6.1.1",
     "@stacks/transactions": "6.16.1",
diff --git a/src/app/hooks/queries/runes/useRuneSellPsbt.ts b/src/app/hooks/queries/runes/useRuneSellPsbt.ts
deleted file mode 100644
index d2236b97d..000000000
--- a/src/app/hooks/queries/runes/useRuneSellPsbt.ts
+++ /dev/null
@@ -1,71 +0,0 @@
-import useRunesApi from '@hooks/apiClients/useRunesApi';
-import useSelectedAccount from '@hooks/useSelectedAccount';
-import useWalletSelector from '@hooks/useWalletSelector';
-import { BitcoinNetworkType } from '@sats-connect/core';
-import type { RuneSellRequest } from '@secretkeylabs/xverse-core';
-import { sanitizeRuneName } from '@utils/helper';
-import type { RuneItem } from '@utils/runes';
-import { useCallback, useState } from 'react';
-
-/*
-  Currently only supports MagicEden.
-  This hook returns a function where we call ME Sell Runes API to return a psbtBase64 for PSBT construction
- */
-const useRuneSellPsbt = (runeName: string, listingUtxos: Record<string, RuneItem>) => {
-  const { network } = useWalletSelector();
-  const { ordinalsAddress, ordinalsPublicKey, btcAddress } = useSelectedAccount();
-
-  const [loading, setLoading] = useState<boolean>(false);
-  const [signPsbtPayload, setSignPsbtPayload] = useState<null | object>(null);
-  const [error, setError] = useState<string | null>(null);
-  const runesApi = useRunesApi();
-
-  const getRuneSellPsbt = useCallback(async () => {
-    const sanitizedRuneName = sanitizeRuneName(runeName);
-    const utxosToList = Object.entries(listingUtxos)
-      .filter((item) => item[1].selected)
-      .map(([key, item]) => ({
-        location: key,
-        priceSats: Math.round(item.amount * item.priceSats),
-      }));
-    const expiresAt = new Date();
-    // setting the expiration date to 10 days from now
-    expiresAt.setDate(expiresAt.getDate() + 10);
-
-    const args: RuneSellRequest = {
-      side: 'sell',
-      rune: sanitizedRuneName,
-      makerRunesPublicKey: ordinalsPublicKey,
-      makerRunesAddress: ordinalsAddress,
-      makerReceiveAddress: btcAddress,
-      utxos: utxosToList,
-      expiresAt: expiresAt.toISOString(),
-    };
-
-    try {
-      setLoading(true);
-      setError(null);
-      const sellOrder = await runesApi.getRunesSellOrder(args);
-      const psbtBase64 = sellOrder.orderPsbtBase64;
-      const payload = {
-        network: {
-          type:
-            network.type === 'Mainnet' ? BitcoinNetworkType.Mainnet : BitcoinNetworkType.Testnet,
-        },
-        broadcast: false,
-        inputsToSign: undefined,
-        psbtBase64,
-        message: 'Sign Transaction',
-      };
-      setSignPsbtPayload(payload);
-    } catch (err) {
-      setError('Failed to create listing');
-    } finally {
-      setLoading(false);
-    }
-  }, [runeName, listingUtxos, btcAddress, network, ordinalsAddress, ordinalsPublicKey, runesApi]);
-
-  return { getRuneSellPsbt, loading, signPsbtPayload, error };
-};
-
-export default useRuneSellPsbt;
diff --git a/src/app/screens/listRune/reducer.tsx b/src/app/screens/listRune/reducer.tsx
index 16f20184e..7796ef994 100644
--- a/src/app/screens/listRune/reducer.tsx
+++ b/src/app/screens/listRune/reducer.tsx
@@ -1,6 +1,6 @@
 import type { RuneItem } from '@utils/runes';
 
-export type SupportedSections = 'SELECT_RUNES' | 'SELECT_MARKETPLACES' | 'SET_PRICES';
+type SupportedSections = 'SELECT_RUNES' | 'SELECT_MARKETPLACES' | 'SET_PRICES';
 
 interface ListRunesState {
   listItemsMap: Record<string, RuneItem>;
diff --git a/src/app/screens/unlistRune/unlistRuneItem.tsx b/src/app/screens/unlistRune/unlistRuneItem.tsx
deleted file mode 100644
index 86944e122..000000000
--- a/src/app/screens/unlistRune/unlistRuneItem.tsx
+++ /dev/null
@@ -1,191 +0,0 @@
-import RequestsRoutes from '@common/utils/route-urls';
-import useRunesApi from '@hooks/apiClients/useRunesApi';
-import useCoinRates from '@hooks/queries/useCoinRates';
-import useSelectedAccount from '@hooks/useSelectedAccount';
-import useWalletSelector from '@hooks/useWalletSelector';
-import { getBtcFiatEquivalent, satsToBtc } from '@secretkeylabs/xverse-core';
-import Button from '@ui-library/button';
-import { StyledP } from '@ui-library/common.styled';
-import { getTruncatedAddress } from '@utils/helper';
-import BigNumber from 'bignumber.js';
-import { useState } from 'react';
-import { useTranslation } from 'react-i18next';
-import { NumericFormat } from 'react-number-format';
-import { useNavigate } from 'react-router-dom';
-import styled from 'styled-components';
-
-const Container = styled.div`
-  display: flex;
-  align-items: center;
-  flex: 1;
-  padding: ${(props) => props.theme.space.s};
-  border-radius: ${(props) => props.theme.space.xs};
-  background-color: ${(props) => props.theme.colors.elevation1};
-  justify-content: space-between;
-`;
-
-const Wrapper = styled.div`
-  display: flex;
-  gap: ${(props) => props.theme.space.m};
-  width: 100%;
-`;
-
-const ListingDetailContainer = styled.div`
-  display: flex;
-  flex-direction: column;
-  justify-content: center;
-  flex: 1;
-  gap: ${(props) => props.theme.space.xxxs};
-`;
-
-const TxIdText = styled.span((props) => ({
-  ...props.theme.typography.body_medium_s,
-  color: props.theme.colors.white_400,
-}));
-
-const SubContainer = styled.div`
-  display: flex;
-  flex-direction: row;
-  justify-content: space-between;
-`;
-
-const RuneTitle = styled(StyledP)`
-  overflow: hidden;
-  text-overflow: ellipsis;
-  width: 100%;
-`;
-
-const StyledBundleSub = styled(StyledP)`
-  text-align: right;
-  width: 100%;
-`;
-
-const StyledButton = styled(Button)`
-  width: 100%;
-  max-width: 79px;
-`;
-
-type Props = {
-  runeAmount: string;
-  runeSymbol: string;
-  txId: string;
-  vout: string;
-  listPrice: BigNumber;
-  orderIds: string[];
-  selectedRuneId: string;
-};
-
-function UnlistRuneItem({
-  runeAmount,
-  runeSymbol,
-  txId,
-  vout,
-  listPrice,
-  orderIds,
-  selectedRuneId,
-}: Props) {
-  const { btcFiatRate } = useCoinRates();
-  const selectedAccount = useSelectedAccount();
-  const { fiatCurrency } = useWalletSelector();
-  const { t } = useTranslation('translation', { keyPrefix: 'COMMON' });
-  const runesApi = useRunesApi();
-  const navigate = useNavigate();
-  const [isLoading, setIsLoading] = useState(false);
-
-  const satsToFiat = (sats: string) =>
-    getBtcFiatEquivalent(new BigNumber(sats), new BigNumber(btcFiatRate)).toNumber().toFixed(2);
-
-  const handleUnlist = async () => {
-    if (!selectedAccount) {
-      return;
-    }
-
-    try {
-      setIsLoading(true);
-      const { token, message } = await runesApi.cancelRunesSellOrder({
-        orderIds,
-        makerPublicKey: selectedAccount?.ordinalsPublicKey,
-        makerAddress: selectedAccount?.ordinalsAddress,
-      });
-
-      navigate(RequestsRoutes.SignMessageRequestInApp, {
-        state: {
-          requestPayload: {
-            payload: {
-              token,
-              orderIds,
-              message,
-              address: selectedAccount?.ordinalsAddress,
-              selectedRuneId,
-            },
-          },
-        },
-      });
-    } catch (error) {
-      console.error(error);
-    } finally {
-      setIsLoading(false);
-    }
-  };
-
-  return (
-    <Container data-testid="listed-rune-container">
-      <Wrapper>
-        <ListingDetailContainer>
-          <SubContainer>
-            <div>
-              <NumericFormat
-                value={runeAmount}
-                displayType="text"
-                suffix={` ${runeSymbol}`}
-                thousandSeparator
-                decimalScale={2}
-                renderText={(value: string) => (
-                  <RuneTitle typography="body_medium_m" color="white_0">
-                    {value}
-                  </RuneTitle>
-                )}
-              />
-            </div>
-            <div>
-              <NumericFormat
-                value={satsToBtc(listPrice).toNumber()}
-                displayType="text"
-                suffix={` BTC`}
-                decimalScale={5}
-                renderText={(value: string) => (
-                  <StyledP data-testid="listed-price" typography="body_medium_m" color="white_0">
-                    {value}
-                  </StyledP>
-                )}
-              />
-            </div>
-          </SubContainer>
-          <SubContainer>
-            <TxIdText>{`${getTruncatedAddress(txId, 6)}:${vout}`}</TxIdText>
-            <NumericFormat
-              value={satsToFiat(String(listPrice))}
-              displayType="text"
-              prefix="~ $"
-              suffix={` ${fiatCurrency}`}
-              thousandSeparator
-              renderText={(value: string) => (
-                <StyledBundleSub typography="body_medium_s" color="white_200">
-                  {value}
-                </StyledBundleSub>
-              )}
-            />
-          </SubContainer>
-        </ListingDetailContainer>
-        <StyledButton
-          title={t('CANCEL')}
-          variant="secondary"
-          onClick={handleUnlist}
-          loading={isLoading}
-        />
-      </Wrapper>
-    </Container>
-  );
-}
-
-export default UnlistRuneItem;

From 2ffb45a5c9101a3374e320ec82b1c4771e92e713 Mon Sep 17 00:00:00 2001
From: "Jordan K." <65149726+jordankzf@users.noreply.github.com>
Date: Tue, 10 Sep 2024 22:41:59 +0800
Subject: [PATCH 099/227] Btc Sats Tracking Hotfix (#578)

* Use Sats instead of BTC

* Fix spacing between the fiat value and the currency
---
 src/app/screens/swap/components/amountInput/index.tsx | 2 +-
 src/app/screens/swap/index.tsx                        | 4 ++--
 src/app/screens/swap/quotesModal/quoteTile.tsx        | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/app/screens/swap/components/amountInput/index.tsx b/src/app/screens/swap/components/amountInput/index.tsx
index 0126fb80e..8cbd3143c 100644
--- a/src/app/screens/swap/components/amountInput/index.tsx
+++ b/src/app/screens/swap/components/amountInput/index.tsx
@@ -133,7 +133,7 @@ export default function AmountInput({ max, input, balance }: Props) {
           displayType="text"
           thousandSeparator
           prefix={`~${currencySymbolMap[input.fiatCurrency]}`}
-          suffix={input.fiatCurrency}
+          suffix={` ${input.fiatCurrency}`}
           renderText={(value: string) => (
             <ConvertedFiatP data-testid="usd-text" typography="body_s" color="white_400">
               {value || '--'}
diff --git a/src/app/screens/swap/index.tsx b/src/app/screens/swap/index.tsx
index 810711700..9a2d5150d 100644
--- a/src/app/screens/swap/index.tsx
+++ b/src/app/screens/swap/index.tsx
@@ -178,7 +178,7 @@ export default function SwapScreen() {
     trackSwapMixPanel(AnalyticsEvents.FetchSwapQuote, {
       fromToken,
       toToken,
-      amount: fromToken?.principal === 'BTC' ? btcToSats(new BigNumber(amount)).toString() : amount,
+      amount: amountForQuote,
       quote,
       btcUsdRate,
       runeFloorPrice,
@@ -396,7 +396,7 @@ export default function SwapScreen() {
       provider,
       fromToken,
       toToken,
-      amount,
+      amount: amountForQuote,
       quote,
       btcUsdRate,
       runeFloorPrice,
diff --git a/src/app/screens/swap/quotesModal/quoteTile.tsx b/src/app/screens/swap/quotesModal/quoteTile.tsx
index c0a174133..a26d6885d 100644
--- a/src/app/screens/swap/quotesModal/quoteTile.tsx
+++ b/src/app/screens/swap/quotesModal/quoteTile.tsx
@@ -122,7 +122,7 @@ function QuoteTile({
               displayType="text"
               thousandSeparator
               prefix="~ $"
-              suffix={fiatCurrency}
+              suffix={` ${fiatCurrency}`}
               renderText={(value: string) => (
                 <StyledP data-testid="usd-text" typography="body_s" color="white_200">
                   {value || '--'}

From ac9b111660794e6c78c4531d6f43ddec604c4bd4 Mon Sep 17 00:00:00 2001
From: jordankzf <jordan@secretkeylabs.com>
Date: Wed, 11 Sep 2024 16:58:36 +0800
Subject: [PATCH 100/227] Improve Fiat rate calculation for tracking

---
 .../hooks/queries/stx/useGetSip10TokenInfo.ts | 17 ++++++++++++----
 src/app/screens/swap/index.tsx                | 15 +++++++++++---
 src/app/screens/swap/mixpanel.ts              | 16 +++++++++++++--
 src/app/screens/swap/quoteSummary/index.tsx   | 20 +++++++++++++++----
 src/app/screens/swap/quotesModal/index.tsx    |  2 +-
 5 files changed, 56 insertions(+), 14 deletions(-)

diff --git a/src/app/hooks/queries/stx/useGetSip10TokenInfo.ts b/src/app/hooks/queries/stx/useGetSip10TokenInfo.ts
index 5cee14355..3f621bbce 100644
--- a/src/app/hooks/queries/stx/useGetSip10TokenInfo.ts
+++ b/src/app/hooks/queries/stx/useGetSip10TokenInfo.ts
@@ -1,15 +1,24 @@
 import useWalletSelector from '@hooks/useWalletSelector';
-import { getXverseApiClient } from '@secretkeylabs/xverse-core';
+import { getXverseApiClient, type SupportedCurrency } from '@secretkeylabs/xverse-core';
 import { useQuery } from '@tanstack/react-query';
 
-const useGetSip10TokenInfo = (principal?: string) => {
-  const { fiatCurrency, network } = useWalletSelector();
+const useGetSip10TokenInfo = ({
+  principal,
+  fiatCurrency,
+}: {
+  principal?: string;
+  fiatCurrency?: SupportedCurrency;
+}) => {
+  const { network, fiatCurrency: defaultFiatCurrency } = useWalletSelector();
 
   const xverseApiClient = getXverseApiClient(network.type);
 
   const fetchTokensInfo = async () => {
     if (principal) {
-      const coinsInfo = await xverseApiClient.getCoinsInfo([principal], fiatCurrency);
+      const coinsInfo = await xverseApiClient.getCoinsInfo(
+        [principal],
+        fiatCurrency ?? defaultFiatCurrency,
+      );
 
       const tokenInfo = coinsInfo.find((coin) => coin.contract === principal);
       return tokenInfo;
diff --git a/src/app/screens/swap/index.tsx b/src/app/screens/swap/index.tsx
index 9a2d5150d..966e18cad 100644
--- a/src/app/screens/swap/index.tsx
+++ b/src/app/screens/swap/index.tsx
@@ -139,7 +139,14 @@ export default function SwapScreen() {
   const { quotes, loading: quotesLoading, error: quotesError, fetchQuotes } = useGetQuotes();
   const { data: runeFloorPrice } = useRuneFloorPriceQuery(toToken?.name ?? '');
   const coinsMasterList = useMasterCoinsList();
-  const { tokenInfo: toTokenInfo } = useGetSip10TokenInfo(toToken?.ticker);
+  const { tokenInfo: sip10ToTokenInfoUSD } = useGetSip10TokenInfo({
+    principal: toToken?.ticker,
+    fiatCurrency: 'USD',
+  });
+  const { tokenInfo: sip10FromTokenInfoUSD } = useGetSip10TokenInfo({
+    principal: toToken?.ticker,
+    fiatCurrency: 'USD',
+  });
 
   useEffect(() => {
     if (defaultFrom) {
@@ -183,7 +190,8 @@ export default function SwapScreen() {
       btcUsdRate,
       runeFloorPrice,
       stxBtcRate,
-      toTokenInfo,
+      fromTokenInfo: sip10FromTokenInfoUSD,
+      toTokenInfo: sip10ToTokenInfoUSD,
     });
 
     fetchQuotes({
@@ -401,7 +409,8 @@ export default function SwapScreen() {
       btcUsdRate,
       runeFloorPrice,
       stxBtcRate,
-      toTokenInfo,
+      fromTokenInfo: sip10FromTokenInfoUSD,
+      toTokenInfo: sip10ToTokenInfoUSD,
     });
   };
 
diff --git a/src/app/screens/swap/mixpanel.ts b/src/app/screens/swap/mixpanel.ts
index 665a23a77..3b555bc98 100644
--- a/src/app/screens/swap/mixpanel.ts
+++ b/src/app/screens/swap/mixpanel.ts
@@ -23,6 +23,7 @@ function trackSwapMixPanel(
     btcUsdRate,
     runeFloorPrice,
     stxBtcRate,
+    fromTokenInfo,
     toTokenInfo,
   }: {
     provider?: Provider;
@@ -33,6 +34,7 @@ function trackSwapMixPanel(
     btcUsdRate: string;
     runeFloorPrice?: number;
     stxBtcRate?: string;
+    fromTokenInfo?: Coin;
     toTokenInfo?: Coin;
   },
 ) {
@@ -71,8 +73,8 @@ function trackSwapMixPanel(
             new BigNumber(stxBtcRate),
             new BigNumber(btcUsdRate),
           ).toFixed(2)
-        : fromToken?.tokenFiatRate
-        ? new BigNumber(fromToken?.tokenFiatRate).multipliedBy(amount).toFixed(2)
+        : fromTokenInfo?.tokenFiatRate
+        ? new BigNumber(fromTokenInfo?.tokenFiatRate).multipliedBy(amount).toFixed(2)
         : '--';
 
     receiveAmount = quote?.receiveAmount ? new BigNumber(quote?.receiveAmount) : undefined;
@@ -90,6 +92,16 @@ function trackSwapMixPanel(
     }
   }
 
+  // Don't track for zero-like fiat values
+  if (
+    Number.isNaN(parseFloat(fromAmount)) ||
+    parseFloat(fromAmount) <= 0 ||
+    Number.isNaN(parseFloat(toAmount)) ||
+    parseFloat(toAmount) <= 0
+  ) {
+    return;
+  }
+
   trackMixPanel(eventName, {
     ...(provider ? { provider: provider?.name } : {}),
     ...(from ? { from } : {}),
diff --git a/src/app/screens/swap/quoteSummary/index.tsx b/src/app/screens/swap/quoteSummary/index.tsx
index 38db3fa72..01164a5d8 100644
--- a/src/app/screens/swap/quoteSummary/index.tsx
+++ b/src/app/screens/swap/quoteSummary/index.tsx
@@ -171,7 +171,16 @@ export default function QuoteSummary({
   selectedIdentifiers,
 }: QuoteSummaryProps) {
   const { t } = useTranslation('translation');
-  const { tokenInfo: toTokenInfo } = useGetSip10TokenInfo(toToken?.ticker);
+  const { tokenInfo: sip10ToTokenInfoUSD } = useGetSip10TokenInfo({
+    principal: toToken?.ticker,
+    fiatCurrency: 'USD',
+  });
+
+  const { tokenInfo: sip10FromTokenInfoUSD } = useGetSip10TokenInfo({
+    principal: fromToken?.principal,
+    fiatCurrency: 'USD',
+  });
+
   const theme = useTheme();
   const { btcFiatRate, btcUsdRate, stxBtcRate } = useCoinRates();
   const { btcAddress, ordinalsAddress, btcPublicKey, ordinalsPublicKey, stxAddress, stxPublicKey } =
@@ -258,7 +267,8 @@ export default function QuoteSummary({
       btcUsdRate,
       runeFloorPrice,
       stxBtcRate,
-      toTokenInfo,
+      fromTokenInfo: sip10FromTokenInfoUSD,
+      toTokenInfo: sip10ToTokenInfoUSD,
     });
 
     if (selectedIdentifiers) {
@@ -363,10 +373,12 @@ export default function QuoteSummary({
         new BigNumber(btcFiatRate),
       ).toFixed(2);
     }
-    if (!toTokenInfo?.tokenFiatRate) {
+    if (!sip10ToTokenInfoUSD?.tokenFiatRate) {
       return '--';
     }
-    return new BigNumber(toTokenInfo?.tokenFiatRate).multipliedBy(quote.receiveAmount).toFixed(2);
+    return new BigNumber(sip10ToTokenInfoUSD?.tokenFiatRate)
+      .multipliedBy(quote.receiveAmount)
+      .toFixed(2);
   })();
 
   const showBadQuoteWarning =
diff --git a/src/app/screens/swap/quotesModal/index.tsx b/src/app/screens/swap/quotesModal/index.tsx
index 7ef1f5f2d..3e4050004 100644
--- a/src/app/screens/swap/quotesModal/index.tsx
+++ b/src/app/screens/swap/quotesModal/index.tsx
@@ -66,7 +66,7 @@ function QuotesModal({
   const { t } = useTranslation('translation', { keyPrefix: 'SWAP_SCREEN' });
 
   const { btcFiatRate, stxBtcRate } = useCoinRates();
-  const { tokenInfo: toTokenInfo } = useGetSip10TokenInfo(toToken?.ticker);
+  const { tokenInfo: toTokenInfo } = useGetSip10TokenInfo({ principal: toToken?.ticker });
 
   const sortQuotesByReceiveAmount = <T extends StxQuote | Quote>(quotes: T[]): T[] =>
     [...quotes].sort((a, b) => BigNumber(b.receiveAmount).comparedTo(a.receiveAmount));

From a0235f79029e3e4f6976d51835f51f702d1776f1 Mon Sep 17 00:00:00 2001
From: "Duska.T" <55587184+DuskaT021@users.noreply.github.com>
Date: Wed, 11 Sep 2024 13:21:12 +0200
Subject: [PATCH 101/227] test-fix: added the #localexecution tag to some flaky
 tests on testnet, that will be reverted later (#584)

* added the #localexecution tag to some flaky test on testnet, that will be reverted later

* added #localexecution to test Cancel send rare sats testnet
---
 tests/specs/runesSend.spec.ts                   | 2 +-
 tests/specs/swapME.spec.ts                      | 2 +-
 tests/specs/tabCollectiblesInscriptions.spec.ts | 7 +++++--
 tests/specs/tabCollectiblesRareSats.spec.ts     | 4 ++--
 tests/specs/transactionBTC.spec.ts              | 2 +-
 5 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/tests/specs/runesSend.spec.ts b/tests/specs/runesSend.spec.ts
index aa8493ca6..e934b71a2 100644
--- a/tests/specs/runesSend.spec.ts
+++ b/tests/specs/runesSend.spec.ts
@@ -41,7 +41,7 @@ test.describe('Send runes', () => {
     await expect(wallet.buttonInsufficientFunds).toBeDisabled();
   });
 
-  test('Cancel - send one rune testnet', async ({ page, extensionId }) => {
+  test('Cancel - send one rune testnet #localexecution', async ({ page, extensionId }) => {
     const wallet = new Wallet(page);
     await wallet.setupTest(extensionId, 'SEED_WORDS1', true);
 
diff --git a/tests/specs/swapME.spec.ts b/tests/specs/swapME.spec.ts
index 65ee2fd00..8e09a1292 100644
--- a/tests/specs/swapME.spec.ts
+++ b/tests/specs/swapME.spec.ts
@@ -11,7 +11,7 @@ test.describe('Swap Flow ME', () => {
   const marketplace = 'Magic Eden';
   const token = 'THE•MONEY•BEES';
 
-  test('Cancel swap token via ME', async ({ page, extensionId }) => {
+  test('Cancel swap token via ME #localexecution', async ({ page, extensionId }) => {
     // Restore wallet
     const wallet = new Wallet(page);
     await wallet.setupTest(extensionId, 'SEED_WORDS1', false);
diff --git a/tests/specs/tabCollectiblesInscriptions.spec.ts b/tests/specs/tabCollectiblesInscriptions.spec.ts
index 70695b810..ca55feb09 100644
--- a/tests/specs/tabCollectiblesInscriptions.spec.ts
+++ b/tests/specs/tabCollectiblesInscriptions.spec.ts
@@ -4,7 +4,10 @@ import Wallet from '../pages/wallet';
 const TEST_ORDINALS_ADDRESS = 'tb1pprpcu07x8fd02keqx9wtfncz99fhg6hepvpw34w9l2lnazmmf7rspw96ql';
 
 test.describe('Collectibles Tab - Inscriptions', () => {
-  test('Cancel send Collection Inscriptions testnet', async ({ page, extensionId }) => {
+  test('Cancel send Collection Inscriptions testnet #localexecution', async ({
+    page,
+    extensionId,
+  }) => {
     const wallet = new Wallet(page);
     await wallet.setupTest(extensionId, 'SEED_WORDS1', true);
 
@@ -171,7 +174,7 @@ test.describe('Collectibles Tab - Inscriptions', () => {
     await expect(await wallet.containersCollectibleItem.count()).toBeGreaterThanOrEqual(1);
   });
 
-  test('Cancel send single Inscriptions testnet', async ({ page, extensionId }) => {
+  test('Cancel send single Inscriptions testnet #localexecution', async ({ page, extensionId }) => {
     const wallet = new Wallet(page);
     await wallet.setupTest(extensionId, 'SEED_WORDS1', true);
 
diff --git a/tests/specs/tabCollectiblesRareSats.spec.ts b/tests/specs/tabCollectiblesRareSats.spec.ts
index ed135620c..aed4cd65f 100644
--- a/tests/specs/tabCollectiblesRareSats.spec.ts
+++ b/tests/specs/tabCollectiblesRareSats.spec.ts
@@ -4,7 +4,7 @@ import Wallet from '../pages/wallet';
 const TEST_ORDINALS_ADDRESS = 'tb1pprpcu07x8fd02keqx9wtfncz99fhg6hepvpw34w9l2lnazmmf7rspw96ql';
 
 test.describe('Collectibles Tab - Rare sats', () => {
-  test('Check rare sats testnet', async ({ page, extensionId }) => {
+  test('Check rare sats testnet #localexecution', async ({ page, extensionId }) => {
     const wallet = new Wallet(page);
     await wallet.setupTest(extensionId, 'SEED_WORDS1', true);
 
@@ -26,7 +26,7 @@ test.describe('Collectibles Tab - Rare sats', () => {
     await expect(wallet.buttonSupportRarity).toBeVisible();
   });
 
-  test('Cancel send rare sats testnet', async ({ page, extensionId }) => {
+  test('Cancel send rare sats testnet #localexecution', async ({ page, extensionId }) => {
     const wallet = new Wallet(page);
     await wallet.setupTest(extensionId, 'SEED_WORDS1', true);
 
diff --git a/tests/specs/transactionBTC.spec.ts b/tests/specs/transactionBTC.spec.ts
index 1f284f89b..b5361db43 100644
--- a/tests/specs/transactionBTC.spec.ts
+++ b/tests/specs/transactionBTC.spec.ts
@@ -53,7 +53,7 @@ test.describe('Transaction BTC', () => {
     await expect(initialBTCBalance).toEqual(displayBalanceNumerical);
   });
 
-  test('Cancel BTC transaction testnet', async ({ page, extensionId }) => {
+  test('Cancel BTC transaction testnet #localexecution', async ({ page, extensionId }) => {
     // Restore wallet and setup Testnet network
     const wallet = new Wallet(page);
     await wallet.setupTest(extensionId, 'SEED_WORDS1', true);

From 9b4cb979935f6bc9ed5ae639e56d59599604bc08 Mon Sep 17 00:00:00 2001
From: fede erbes <fedeerbes@gmail.com>
Date: Wed, 11 Sep 2024 17:37:57 +0200
Subject: [PATCH 102/227] fix: buttons in ADD_MULTIPLE_ACCOUNTS step alignment
 (#585)

---
 .../importLedgerAccount/stepControls.tsx      | 42 +++++++++----------
 1 file changed, 19 insertions(+), 23 deletions(-)

diff --git a/src/app/screens/ledger/importLedgerAccount/stepControls.tsx b/src/app/screens/ledger/importLedgerAccount/stepControls.tsx
index 69a6b9442..e55085649 100644
--- a/src/app/screens/ledger/importLedgerAccount/stepControls.tsx
+++ b/src/app/screens/ledger/importLedgerAccount/stepControls.tsx
@@ -3,10 +3,10 @@ import { useTranslation } from 'react-i18next';
 import styled from 'styled-components';
 import { ImportLedgerSteps } from './types';
 
-const ButtonContainer = styled.div((props) => ({
-  marginLeft: 3,
-  marginRight: 3,
-  marginTop: props.theme.space.xs,
+const VerticalButtonContainer = styled.div((props) => ({
+  display: 'flex',
+  gap: props.theme.space.s,
+  flexDirection: 'column',
   width: '100%',
 }));
 
@@ -100,25 +100,21 @@ function StepControls({
       );
     case ImportLedgerSteps.ADD_MULTIPLE_ACCOUNTS:
       return (
-        <>
-          <ButtonContainer>
-            <Button
-              disabled={isButtonDisabled}
-              loading={isButtonDisabled}
-              onClick={backToAssetSelection}
-              variant="secondary"
-              title={t('LEDGER_IMPORT_CANCEL_BUTTON')}
-            />
-          </ButtonContainer>
-          <ButtonContainer>
-            <Button
-              disabled={isButtonDisabled}
-              loading={isButtonDisabled}
-              onClick={handleClickMultipleAccounts}
-              title={t('LEDGER_IMPORT_YES_BUTTON')}
-            />
-          </ButtonContainer>
-        </>
+        <VerticalButtonContainer>
+          <Button
+            disabled={isButtonDisabled}
+            loading={isButtonDisabled}
+            onClick={handleClickMultipleAccounts}
+            title={t('LEDGER_IMPORT_YES_BUTTON')}
+          />
+          <Button
+            disabled={isButtonDisabled}
+            loading={isButtonDisabled}
+            onClick={backToAssetSelection}
+            variant="secondary"
+            title={t('LEDGER_IMPORT_CANCEL_BUTTON')}
+          />
+        </VerticalButtonContainer>
       );
     case ImportLedgerSteps.ADD_ADDRESS:
     case ImportLedgerSteps.ADD_ORDINALS_ADDRESS:

From 6436b2e12e3fd0c8d4114632b5aadefd47c4b7c9 Mon Sep 17 00:00:00 2001
From: GitHub Actions Bot <>
Date: Mon, 16 Sep 2024 03:41:14 +0000
Subject: [PATCH 103/227] release: v0.42.1

---
 package-lock.json | 4 ++--
 package.json      | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index e2f5dc011..479b8dde0 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "xverse-web-extension",
-  "version": "0.42.0",
+  "version": "0.42.1",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "xverse-web-extension",
-      "version": "0.42.0",
+      "version": "0.42.1",
       "dependencies": {
         "@aryzing/superqs": "0.0.6",
         "@ledgerhq/hw-transport-webusb": "^6.27.13",
diff --git a/package.json b/package.json
index 5bd0f9313..c97ed2a80 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "xverse-web-extension",
   "description": "A Bitcoin wallet for Web3",
-  "version": "0.42.0",
+  "version": "0.42.1",
   "private": true,
   "engines": {
     "node": "^18.18.2"

From 2ba747668fb9430e2ec37cf6963fedbdc07e89d8 Mon Sep 17 00:00:00 2001
From: "Duska.T" <55587184+DuskaT021@users.noreply.github.com>
Date: Mon, 16 Sep 2024 10:57:17 +0200
Subject: [PATCH 104/227] CI will no longer require UI test output (#589)

---
 .github/workflows/build-rc.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/build-rc.yml b/.github/workflows/build-rc.yml
index 29ba056be..517e2a059 100644
--- a/.github/workflows/build-rc.yml
+++ b/.github/workflows/build-rc.yml
@@ -130,7 +130,7 @@ jobs:
   publish-rc:
     # TODO also keep the develop PR description up to date
     if: ${{ github.base_ref == 'main' }}
-    needs: [UItest]
+    needs: build
     runs-on: ubuntu-latest
     permissions:
       contents: write

From 95e2cc1b8387555a2ac66933050043c7265def90 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Eduard=20Bardaj=C3=AD=20Puig?= <ebardaji@gmail.com>
Date: Mon, 9 Sep 2024 14:44:32 +0200
Subject: [PATCH 105/227] Avoid switching accounts when current account is
 target account (#575)

---
 .../signMessageRequest/useSignMessageRequest.ts       | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/src/app/screens/signMessageRequest/useSignMessageRequest.ts b/src/app/screens/signMessageRequest/useSignMessageRequest.ts
index 3f59bb949..548a86cb0 100644
--- a/src/app/screens/signMessageRequest/useSignMessageRequest.ts
+++ b/src/app/screens/signMessageRequest/useSignMessageRequest.ts
@@ -59,6 +59,7 @@ export const useSignMessageValidation = (requestPayload: SignMessagePayload | un
   const { t } = useTranslation('translation', { keyPrefix: 'REQUEST_ERRORS' });
   const selectedAccount = useSelectedAccount();
   const { accountsList, network } = useWalletSelector();
+  const { btcAddress } = useSelectedAccount();
   const { switchAccount } = useWalletReducer();
 
   const checkAddressAvailability = () => {
@@ -83,13 +84,17 @@ export const useSignMessageValidation = (requestPayload: SignMessagePayload | un
       return;
     }
     const account = checkAddressAvailability();
-    if (account) {
-      switchAccount(account);
-    } else {
+
+    if (!account) {
       setValidationError({
         error: t('ADDRESS_MISMATCH'),
       });
+      return;
     }
+
+    if (btcAddress === account.btcAddress) return;
+
+    switchAccount(account);
   };
 
   useEffect(() => {

From f021b2140e2b82bd45ed3192e0a3eb6e1749ee07 Mon Sep 17 00:00:00 2001
From: Mahmoud Aboelenein <mahmoud@secretkeylabs.com>
Date: Mon, 16 Sep 2024 13:49:56 +0300
Subject: [PATCH 106/227] updated estimate stacks txs util

---
 package-lock.json                                 | 15 ++++++++-------
 package.json                                      |  2 +-
 .../confirmStxTransactionComponent/index.tsx      |  6 +++---
 src/app/hooks/useRbfTransactionData.ts            |  6 +++---
 .../screens/sendStx/steps/Step2SelectAmount.tsx   |  6 +++---
 5 files changed, 18 insertions(+), 17 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 479b8dde0..49c08aede 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -15,7 +15,7 @@
         "@react-spring/web": "^9.6.1",
         "@sats-connect/core": "0.2.1",
         "@scure/btc-signer": "1.2.1",
-        "@secretkeylabs/xverse-core": "19.1.0",
+        "@secretkeylabs/xverse-core": "19.2.0-494a149",
         "@stacks/connect": "7.4.1",
         "@stacks/stacks-blockchain-api-types": "6.1.1",
         "@stacks/transactions": "6.16.1",
@@ -1277,9 +1277,10 @@
       }
     },
     "node_modules/@secretkeylabs/xverse-core": {
-      "version": "19.1.0",
-      "resolved": "https://npm.pkg.github.com/download/@secretkeylabs/xverse-core/19.1.0/fe6b53e68ea3d66c7fd1bbf8e791f865299811d8",
-      "integrity": "sha512-ssrdJAb9jpl1mGCfbS4K6S22sKLBXzK5LbYMiNBU8anyps4A79u/c7qkHUDMgDY4pWcuSMs8iS4mcpyshPFiQQ==",
+      "version": "19.2.0-494a149",
+      "resolved": "https://npm.pkg.github.com/download/@secretkeylabs/xverse-core/19.2.0-494a149/0838c9c15507c139aaf83b91aef6292ad413a017",
+      "integrity": "sha512-PnoAkcutPaCDCUGaou2WbJnrdxCPHEezFcj6A459lwIuBRiVxKncB8gfE1R9FRcr15FQsOUZMk8zJAjy1PkVhg==",
+      "license": "ISC",
       "dependencies": {
         "@bitcoinerlab/secp256k1": "^1.0.2",
         "@noble/curves": "^1.2.0",
@@ -13685,9 +13686,9 @@
       }
     },
     "@secretkeylabs/xverse-core": {
-      "version": "19.1.0",
-      "resolved": "https://npm.pkg.github.com/download/@secretkeylabs/xverse-core/19.1.0/fe6b53e68ea3d66c7fd1bbf8e791f865299811d8",
-      "integrity": "sha512-ssrdJAb9jpl1mGCfbS4K6S22sKLBXzK5LbYMiNBU8anyps4A79u/c7qkHUDMgDY4pWcuSMs8iS4mcpyshPFiQQ==",
+      "version": "19.2.0-494a149",
+      "resolved": "https://npm.pkg.github.com/download/@secretkeylabs/xverse-core/19.2.0-494a149/0838c9c15507c139aaf83b91aef6292ad413a017",
+      "integrity": "sha512-PnoAkcutPaCDCUGaou2WbJnrdxCPHEezFcj6A459lwIuBRiVxKncB8gfE1R9FRcr15FQsOUZMk8zJAjy1PkVhg==",
       "requires": {
         "@bitcoinerlab/secp256k1": "^1.0.2",
         "@noble/curves": "^1.2.0",
diff --git a/package.json b/package.json
index c97ed2a80..1363dc2f5 100644
--- a/package.json
+++ b/package.json
@@ -43,7 +43,7 @@
     "@react-spring/web": "^9.6.1",
     "@sats-connect/core": "0.2.1",
     "@scure/btc-signer": "1.2.1",
-    "@secretkeylabs/xverse-core": "19.1.0",
+    "@secretkeylabs/xverse-core": "19.2.0-494a149",
     "@stacks/connect": "7.4.1",
     "@stacks/stacks-blockchain-api-types": "6.1.1",
     "@stacks/transactions": "6.16.1",
diff --git a/src/app/components/confirmStxTransactionComponent/index.tsx b/src/app/components/confirmStxTransactionComponent/index.tsx
index 92e0ee7cc..a652c7b07 100644
--- a/src/app/components/confirmStxTransactionComponent/index.tsx
+++ b/src/app/components/confirmStxTransactionComponent/index.tsx
@@ -15,6 +15,7 @@ import Transport from '@ledgerhq/hw-transport-webusb';
 import { FadersHorizontal } from '@phosphor-icons/react';
 import type { StacksTransaction } from '@secretkeylabs/xverse-core';
 import {
+  estimateStacksTransaction,
   getNonce,
   getStxFiatEquivalent,
   microstacksToStx,
@@ -24,7 +25,7 @@ import {
   signTransaction,
   stxToMicrostacks,
 } from '@secretkeylabs/xverse-core';
-import { estimateTransaction, PostConditionMode } from '@stacks/transactions';
+import { PostConditionMode } from '@stacks/transactions';
 import SelectFeeRate from '@ui-components/selectFeeRate';
 import Button from '@ui-library/button';
 import Callout from '@ui-library/callout';
@@ -128,9 +129,8 @@ function ConfirmStxTransactionComponent({
     const fetchStxFees = async () => {
       try {
         setFeesLoading(true);
-        const [low, medium, high] = await estimateTransaction(
+        const [low, medium, high] = await estimateStacksTransaction(
           initialStxTransactions[0].payload,
-          undefined,
           selectedNetwork,
         );
 
diff --git a/src/app/hooks/useRbfTransactionData.ts b/src/app/hooks/useRbfTransactionData.ts
index 6ca23487f..2d8644f95 100644
--- a/src/app/hooks/useRbfTransactionData.ts
+++ b/src/app/hooks/useRbfTransactionData.ts
@@ -1,5 +1,6 @@
 import useStxWalletData from '@hooks/queries/useStxWalletData';
 import {
+  estimateStacksTransaction,
   mempoolApi,
   microstacksToStx,
   rbf,
@@ -9,7 +10,7 @@ import {
   type StacksTransaction,
   type StxTransactionData,
 } from '@secretkeylabs/xverse-core';
-import { deserializeTransaction, estimateTransaction } from '@stacks/transactions';
+import { deserializeTransaction } from '@stacks/transactions';
 import { isLedgerAccount } from '@utils/helper';
 import axios from 'axios';
 import BigNumber from 'bignumber.js';
@@ -137,9 +138,8 @@ const useRbfTransactionData = (transaction?: BtcTransactionData | StxTransaction
       const txRaw: string = await getRawTransaction(transaction.txid, network);
       const unsignedTx: StacksTransaction = deserializeTransaction(txRaw);
 
-      const [slow, medium, high] = await estimateTransaction(
+      const [slow, medium, high] = await estimateStacksTransaction(
         unsignedTx.payload,
-        undefined,
         selectedNetwork,
       );
 
diff --git a/src/app/screens/sendStx/steps/Step2SelectAmount.tsx b/src/app/screens/sendStx/steps/Step2SelectAmount.tsx
index 511d8e056..0c10a5877 100644
--- a/src/app/screens/sendStx/steps/Step2SelectAmount.tsx
+++ b/src/app/screens/sendStx/steps/Step2SelectAmount.tsx
@@ -6,6 +6,7 @@ import useSelectedAccount from '@hooks/useSelectedAccount';
 import useWalletSelector from '@hooks/useWalletSelector';
 import {
   buf2hex,
+  estimateStacksTransaction,
   generateUnsignedStxTokenTransferTransaction,
   generateUnsignedTransaction,
   getStxFiatEquivalent,
@@ -14,7 +15,7 @@ import {
   type FungibleToken,
   type StacksTransaction,
 } from '@secretkeylabs/xverse-core';
-import { deserializeTransaction, estimateTransaction } from '@stacks/transactions';
+import { deserializeTransaction } from '@stacks/transactions';
 import SelectFeeRate, { type FeeRates } from '@ui-components/selectFeeRate';
 import Button from '@ui-library/button';
 import Callout from '@ui-library/callout';
@@ -205,9 +206,8 @@ function Step2SelectAmount({
     const fetchStxFees = async () => {
       try {
         const unsignedTx: StacksTransaction = deserializeTransaction(unsignedSendStxTx);
-        const [low, medium, high] = await estimateTransaction(
+        const [low, medium, high] = await estimateStacksTransaction(
           unsignedTx.payload,
-          undefined,
           selectedNetwork,
         );
 

From 816a02d51f74eaa79619db85d4d4fc2e4fe62b40 Mon Sep 17 00:00:00 2001
From: Mahmoud Aboelenein <mahmoud@secretkeylabs.com>
Date: Wed, 11 Sep 2024 03:28:21 +0300
Subject: [PATCH 107/227] remove nonce manipulation

---
 src/app/components/confirmStxTransactionComponent/index.tsx | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/app/components/confirmStxTransactionComponent/index.tsx b/src/app/components/confirmStxTransactionComponent/index.tsx
index a652c7b07..8a102b1ca 100644
--- a/src/app/components/confirmStxTransactionComponent/index.tsx
+++ b/src/app/components/confirmStxTransactionComponent/index.tsx
@@ -224,8 +224,6 @@ function ConfirmStxTransactionComponent({
 
     if (initialStxTransactions.length === 1) {
       const transaction = initialStxTransactions[0];
-      const nonce = await nextBestNonce(selectedAccount.stxAddress, network);
-      transaction.setNonce(nonce);
       const signedContractCall = await signTransaction(
         transaction,
         seed,

From 221733bb8d6cdba4e6ee61bb51c2f14a944fb19c Mon Sep 17 00:00:00 2001
From: Mahmoud Aboelenein <mahmoud@secretkeylabs.com>
Date: Fri, 13 Sep 2024 14:14:50 +0300
Subject: [PATCH 108/227] update core version

---
 package-lock.json                                  | 14 +++++++-------
 package.json                                       |  2 +-
 .../confirmStxTransactionComponent/index.tsx       |  6 +++---
 src/app/hooks/useRbfTransactionData.ts             |  6 +++---
 .../screens/sendStx/steps/Step2SelectAmount.tsx    |  6 +++---
 5 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 49c08aede..a4282acc4 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -15,7 +15,7 @@
         "@react-spring/web": "^9.6.1",
         "@sats-connect/core": "0.2.1",
         "@scure/btc-signer": "1.2.1",
-        "@secretkeylabs/xverse-core": "19.2.0-494a149",
+        "@secretkeylabs/xverse-core": "19.2.1-63e5f1c",
         "@stacks/connect": "7.4.1",
         "@stacks/stacks-blockchain-api-types": "6.1.1",
         "@stacks/transactions": "6.16.1",
@@ -1277,9 +1277,9 @@
       }
     },
     "node_modules/@secretkeylabs/xverse-core": {
-      "version": "19.2.0-494a149",
-      "resolved": "https://npm.pkg.github.com/download/@secretkeylabs/xverse-core/19.2.0-494a149/0838c9c15507c139aaf83b91aef6292ad413a017",
-      "integrity": "sha512-PnoAkcutPaCDCUGaou2WbJnrdxCPHEezFcj6A459lwIuBRiVxKncB8gfE1R9FRcr15FQsOUZMk8zJAjy1PkVhg==",
+      "version": "19.2.1-63e5f1c",
+      "resolved": "https://npm.pkg.github.com/download/@secretkeylabs/xverse-core/19.2.1-63e5f1c/304e3363bc407395aa96d5d8a2c473a3013bdfdc",
+      "integrity": "sha512-TMBVX/bReXKCaBPghE4ZmThWrNH6OcKv9N1HvRxB4mXpvyzXAUCDg5ELABUPZRIFjSZZYYoMJiEhTbstgLCmFA==",
       "license": "ISC",
       "dependencies": {
         "@bitcoinerlab/secp256k1": "^1.0.2",
@@ -13686,9 +13686,9 @@
       }
     },
     "@secretkeylabs/xverse-core": {
-      "version": "19.2.0-494a149",
-      "resolved": "https://npm.pkg.github.com/download/@secretkeylabs/xverse-core/19.2.0-494a149/0838c9c15507c139aaf83b91aef6292ad413a017",
-      "integrity": "sha512-PnoAkcutPaCDCUGaou2WbJnrdxCPHEezFcj6A459lwIuBRiVxKncB8gfE1R9FRcr15FQsOUZMk8zJAjy1PkVhg==",
+      "version": "19.2.1-63e5f1c",
+      "resolved": "https://npm.pkg.github.com/download/@secretkeylabs/xverse-core/19.2.1-63e5f1c/304e3363bc407395aa96d5d8a2c473a3013bdfdc",
+      "integrity": "sha512-TMBVX/bReXKCaBPghE4ZmThWrNH6OcKv9N1HvRxB4mXpvyzXAUCDg5ELABUPZRIFjSZZYYoMJiEhTbstgLCmFA==",
       "requires": {
         "@bitcoinerlab/secp256k1": "^1.0.2",
         "@noble/curves": "^1.2.0",
diff --git a/package.json b/package.json
index 1363dc2f5..151b7b5bf 100644
--- a/package.json
+++ b/package.json
@@ -43,7 +43,7 @@
     "@react-spring/web": "^9.6.1",
     "@sats-connect/core": "0.2.1",
     "@scure/btc-signer": "1.2.1",
-    "@secretkeylabs/xverse-core": "19.2.0-494a149",
+    "@secretkeylabs/xverse-core": "19.2.1-63e5f1c",
     "@stacks/connect": "7.4.1",
     "@stacks/stacks-blockchain-api-types": "6.1.1",
     "@stacks/transactions": "6.16.1",
diff --git a/src/app/components/confirmStxTransactionComponent/index.tsx b/src/app/components/confirmStxTransactionComponent/index.tsx
index 8a102b1ca..644484171 100644
--- a/src/app/components/confirmStxTransactionComponent/index.tsx
+++ b/src/app/components/confirmStxTransactionComponent/index.tsx
@@ -15,7 +15,7 @@ import Transport from '@ledgerhq/hw-transport-webusb';
 import { FadersHorizontal } from '@phosphor-icons/react';
 import type { StacksTransaction } from '@secretkeylabs/xverse-core';
 import {
-  estimateStacksTransaction,
+  estimateStacksTransactionWithFallback,
   getNonce,
   getStxFiatEquivalent,
   microstacksToStx,
@@ -129,8 +129,8 @@ function ConfirmStxTransactionComponent({
     const fetchStxFees = async () => {
       try {
         setFeesLoading(true);
-        const [low, medium, high] = await estimateStacksTransaction(
-          initialStxTransactions[0].payload,
+        const [low, medium, high] = await estimateStacksTransactionWithFallback(
+          initialStxTransactions[0],
           selectedNetwork,
         );
 
diff --git a/src/app/hooks/useRbfTransactionData.ts b/src/app/hooks/useRbfTransactionData.ts
index 2d8644f95..e35d3043d 100644
--- a/src/app/hooks/useRbfTransactionData.ts
+++ b/src/app/hooks/useRbfTransactionData.ts
@@ -1,6 +1,6 @@
 import useStxWalletData from '@hooks/queries/useStxWalletData';
 import {
-  estimateStacksTransaction,
+  estimateStacksTransactionWithFallback,
   mempoolApi,
   microstacksToStx,
   rbf,
@@ -138,8 +138,8 @@ const useRbfTransactionData = (transaction?: BtcTransactionData | StxTransaction
       const txRaw: string = await getRawTransaction(transaction.txid, network);
       const unsignedTx: StacksTransaction = deserializeTransaction(txRaw);
 
-      const [slow, medium, high] = await estimateStacksTransaction(
-        unsignedTx.payload,
+      const [slow, medium, high] = await estimateStacksTransactionWithFallback(
+        unsignedTx,
         selectedNetwork,
       );
 
diff --git a/src/app/screens/sendStx/steps/Step2SelectAmount.tsx b/src/app/screens/sendStx/steps/Step2SelectAmount.tsx
index 0c10a5877..5660c05d9 100644
--- a/src/app/screens/sendStx/steps/Step2SelectAmount.tsx
+++ b/src/app/screens/sendStx/steps/Step2SelectAmount.tsx
@@ -6,7 +6,7 @@ import useSelectedAccount from '@hooks/useSelectedAccount';
 import useWalletSelector from '@hooks/useWalletSelector';
 import {
   buf2hex,
-  estimateStacksTransaction,
+  estimateStacksTransactionWithFallback,
   generateUnsignedStxTokenTransferTransaction,
   generateUnsignedTransaction,
   getStxFiatEquivalent,
@@ -206,8 +206,8 @@ function Step2SelectAmount({
     const fetchStxFees = async () => {
       try {
         const unsignedTx: StacksTransaction = deserializeTransaction(unsignedSendStxTx);
-        const [low, medium, high] = await estimateStacksTransaction(
-          unsignedTx.payload,
+        const [low, medium, high] = await estimateStacksTransactionWithFallback(
+          unsignedTx,
           selectedNetwork,
         );
 

From 9e8ffc8f2820de7629b60a6a4f47138e98796e06 Mon Sep 17 00:00:00 2001
From: Mahmoud Aboelenein <mahmoud@secretkeylabs.com>
Date: Mon, 16 Sep 2024 13:41:29 +0300
Subject: [PATCH 109/227] update core version

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

diff --git a/package-lock.json b/package-lock.json
index a4282acc4..34ec65bca 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -15,7 +15,7 @@
         "@react-spring/web": "^9.6.1",
         "@sats-connect/core": "0.2.1",
         "@scure/btc-signer": "1.2.1",
-        "@secretkeylabs/xverse-core": "19.2.1-63e5f1c",
+        "@secretkeylabs/xverse-core": "19.3.0",
         "@stacks/connect": "7.4.1",
         "@stacks/stacks-blockchain-api-types": "6.1.1",
         "@stacks/transactions": "6.16.1",
@@ -1277,9 +1277,9 @@
       }
     },
     "node_modules/@secretkeylabs/xverse-core": {
-      "version": "19.2.1-63e5f1c",
-      "resolved": "https://npm.pkg.github.com/download/@secretkeylabs/xverse-core/19.2.1-63e5f1c/304e3363bc407395aa96d5d8a2c473a3013bdfdc",
-      "integrity": "sha512-TMBVX/bReXKCaBPghE4ZmThWrNH6OcKv9N1HvRxB4mXpvyzXAUCDg5ELABUPZRIFjSZZYYoMJiEhTbstgLCmFA==",
+      "version": "19.3.0",
+      "resolved": "https://npm.pkg.github.com/download/@secretkeylabs/xverse-core/19.3.0/d3cb04654a1c9c05db125c1f2e6c97a5e71d1ea6",
+      "integrity": "sha512-EUGmg4xDy+H/EhSK+r17BHQ6t0e/qIkDXKdClKPCuMHtFvrQx6a7hDp8JisyvR9Wi3RxIMTGL8jif8Df/x7kmQ==",
       "license": "ISC",
       "dependencies": {
         "@bitcoinerlab/secp256k1": "^1.0.2",
@@ -13686,9 +13686,9 @@
       }
     },
     "@secretkeylabs/xverse-core": {
-      "version": "19.2.1-63e5f1c",
-      "resolved": "https://npm.pkg.github.com/download/@secretkeylabs/xverse-core/19.2.1-63e5f1c/304e3363bc407395aa96d5d8a2c473a3013bdfdc",
-      "integrity": "sha512-TMBVX/bReXKCaBPghE4ZmThWrNH6OcKv9N1HvRxB4mXpvyzXAUCDg5ELABUPZRIFjSZZYYoMJiEhTbstgLCmFA==",
+      "version": "19.3.0",
+      "resolved": "https://npm.pkg.github.com/download/@secretkeylabs/xverse-core/19.3.0/d3cb04654a1c9c05db125c1f2e6c97a5e71d1ea6",
+      "integrity": "sha512-EUGmg4xDy+H/EhSK+r17BHQ6t0e/qIkDXKdClKPCuMHtFvrQx6a7hDp8JisyvR9Wi3RxIMTGL8jif8Df/x7kmQ==",
       "requires": {
         "@bitcoinerlab/secp256k1": "^1.0.2",
         "@noble/curves": "^1.2.0",
diff --git a/package.json b/package.json
index 151b7b5bf..99c40d8d6 100644
--- a/package.json
+++ b/package.json
@@ -43,7 +43,7 @@
     "@react-spring/web": "^9.6.1",
     "@sats-connect/core": "0.2.1",
     "@scure/btc-signer": "1.2.1",
-    "@secretkeylabs/xverse-core": "19.2.1-63e5f1c",
+    "@secretkeylabs/xverse-core": "19.3.0",
     "@stacks/connect": "7.4.1",
     "@stacks/stacks-blockchain-api-types": "6.1.1",
     "@stacks/transactions": "6.16.1",

From f1b12b50410b7118c17a528a668ff110a1441824 Mon Sep 17 00:00:00 2001
From: Christos Maris <christos@secretkeylabs.com>
Date: Mon, 16 Sep 2024 20:26:09 +0300
Subject: [PATCH 110/227] [ENG-4896] Integrate OKX Listings

---
 .../runes/useRuneSellPsbtPerMarketplace.ts    | 19 +++---
 .../runes/useRuneUtxosQueryPerMarketplace.ts  |  2 +-
 src/app/hooks/useSignBatchPsbtTx.ts           |  2 +
 src/app/screens/listRune/index.tsx            |  3 +-
 .../screens/signBatchPsbtRequest/index.tsx    | 38 +++++++-----
 .../screens/signMessageRequestInApp/index.tsx | 58 ++++++++++++++-----
 src/app/screens/unlistRuneUtxo/index.tsx      |  4 +-
 7 files changed, 88 insertions(+), 38 deletions(-)

diff --git a/src/app/hooks/queries/runes/useRuneSellPsbtPerMarketplace.ts b/src/app/hooks/queries/runes/useRuneSellPsbtPerMarketplace.ts
index 51db2a39e..8085f3130 100644
--- a/src/app/hooks/queries/runes/useRuneSellPsbtPerMarketplace.ts
+++ b/src/app/hooks/queries/runes/useRuneSellPsbtPerMarketplace.ts
@@ -2,13 +2,17 @@ import useXverseApi from '@hooks/apiClients/useXverseApi';
 import useSelectedAccount from '@hooks/useSelectedAccount';
 import useWalletSelector from '@hooks/useWalletSelector';
 import { BitcoinNetworkType } from '@sats-connect/core';
-import type { CreateRuneListingRequest, Marketplace } from '@secretkeylabs/xverse-core';
+import type {
+  CreateRuneListingRequest,
+  FungibleToken,
+  Marketplace,
+} from '@secretkeylabs/xverse-core';
 import { sanitizeRuneName } from '@utils/helper';
 import type { RuneItem } from '@utils/runes';
 import { useCallback, useState } from 'react';
 
 const useRuneSellPsbtPerMarketplace = (
-  runeName: string,
+  rune: FungibleToken,
   listingUtxos: Record<string, RuneItem>,
   selectedMarketplaces: Marketplace[],
 ) => {
@@ -21,21 +25,20 @@ const useRuneSellPsbtPerMarketplace = (
   const xverseApi = useXverseApi();
 
   const getRuneSellPsbt = useCallback(async () => {
-    const sanitizedRuneName = sanitizeRuneName(runeName);
     const utxosToList = Object.entries(listingUtxos)
       .filter((item) => item[1].selected)
       .map(([key, item]) => ({
-        location: key.split(':')[0],
+        txid: key.split(':')[0],
         index: Number(key.split(':')[1]),
-        priceSats: item.priceSats,
-        amount: item.amount,
+        priceSatsPerRune: item.priceSats,
+        runeAmount: item.amount,
       }));
 
     const expiresAt = new Date();
     expiresAt.setDate(expiresAt.getDate() + 10); // 10 days from now
 
     const args: CreateRuneListingRequest = {
-      rune: sanitizedRuneName,
+      rune: { name: sanitizeRuneName(rune.name), id: rune.ticker || '' },
       makerRunesPublicKey: ordinalsPublicKey,
       makerRunesAddress: ordinalsAddress,
       makerReceiveAddress: btcAddress,
@@ -69,7 +72,7 @@ const useRuneSellPsbtPerMarketplace = (
       .catch(() => setError('Failed to create listing'))
       .finally(() => setLoading(false));
   }, [
-    runeName,
+    rune,
     listingUtxos,
     btcAddress,
     network,
diff --git a/src/app/hooks/queries/runes/useRuneUtxosQueryPerMarketplace.ts b/src/app/hooks/queries/runes/useRuneUtxosQueryPerMarketplace.ts
index 5b2bddefc..e3cc3e4cd 100644
--- a/src/app/hooks/queries/runes/useRuneUtxosQueryPerMarketplace.ts
+++ b/src/app/hooks/queries/runes/useRuneUtxosQueryPerMarketplace.ts
@@ -21,7 +21,7 @@ export default function useRuneUtxosQueryPerMarketplace(
       address: ordinalsAddress,
       rune: {
         name: rune.name,
-        id: rune.ticker || '',
+        id: rune.principal,
       },
     });
 
diff --git a/src/app/hooks/useSignBatchPsbtTx.ts b/src/app/hooks/useSignBatchPsbtTx.ts
index 615461df9..bcd050300 100644
--- a/src/app/hooks/useSignBatchPsbtTx.ts
+++ b/src/app/hooks/useSignBatchPsbtTx.ts
@@ -2,6 +2,7 @@ import { MESSAGE_SOURCE, SatsConnectMethods } from '@common/types/message-types'
 import useWalletSelector from '@hooks/useWalletSelector';
 import type { SignMultiplePsbtPayload, SignMultipleTransactionOptions } from '@sats-connect/core';
 import { signPsbt, type InputToSign } from '@secretkeylabs/xverse-core';
+import type { RuneItem } from '@utils/runes';
 import { decodeToken } from 'jsontokens';
 import { useMemo } from 'react';
 import { useLocation } from 'react-router-dom';
@@ -70,6 +71,7 @@ const useSignBatchPsbtTx = () => {
     cancelSignPsbt,
     selectedRune: locationState.selectedRune,
     minPriceSats: locationState.minPriceSats,
+    utxos: locationState.utxos as Record<string, RuneItem>,
   };
 };
 
diff --git a/src/app/screens/listRune/index.tsx b/src/app/screens/listRune/index.tsx
index 8a53d551c..2f94132db 100644
--- a/src/app/screens/listRune/index.tsx
+++ b/src/app/screens/listRune/index.tsx
@@ -143,7 +143,7 @@ export default function ListRuneScreen() {
     signPsbtPayload,
     loading: psbtLoading,
     error: psbtError,
-  } = useRuneSellPsbtPerMarketplace(selectedRune?.name ?? '', listItemsMap, [
+  } = useRuneSellPsbtPerMarketplace(selectedRune as FungibleToken, listItemsMap, [
     ...selectedMarketplaces,
   ]);
 
@@ -294,6 +294,7 @@ export default function ListRuneScreen() {
       navigate(`${RequestsRoutes.SignBatchBtcTx}?signBatchPsbtsInApp=true`, {
         state: {
           payload: signPsbtPayload,
+          utxos: listItemsMap,
           minPriceSats: Math.min(...Object.values(listItemsMap).map((item) => item.priceSats)),
           selectedRune,
         },
diff --git a/src/app/screens/signBatchPsbtRequest/index.tsx b/src/app/screens/signBatchPsbtRequest/index.tsx
index f35b765da..c01b6416c 100644
--- a/src/app/screens/signBatchPsbtRequest/index.tsx
+++ b/src/app/screens/signBatchPsbtRequest/index.tsx
@@ -73,8 +73,15 @@ function SignBatchPsbtRequest() {
   const { network } = useWalletSelector();
   const navigate = useNavigate();
   const { t } = useTranslation('translation', { keyPrefix: 'CONFIRM_TRANSACTION' });
-  const { payload, confirmSignPsbt, cancelSignPsbt, requestToken, selectedRune, minPriceSats } =
-    useSignBatchPsbtTx();
+  const {
+    payload,
+    utxos,
+    confirmSignPsbt,
+    cancelSignPsbt,
+    requestToken,
+    selectedRune,
+    minPriceSats,
+  } = useSignBatchPsbtTx();
   const [isSigning, setIsSigning] = useState(false);
   const [isSigningComplete, setIsSigningComplete] = useState(false);
   const [signingPsbtIndex, setSigningPsbtIndex] = useState(1);
@@ -275,6 +282,12 @@ function SignBatchPsbtRequest() {
                 id: selectedRune?.principal ?? '',
               },
               expiresAt: expiresAt.toISOString(),
+              utxos: Object.entries(utxos).map(([location, utxo]) => ({
+                txid: location.split(':')[0],
+                index: Number(location.split(':')[1]),
+                priceSatsPerRune: utxo.priceSats,
+                runeAmount: utxo.amount,
+              })),
             })),
           )
           .then((res) => {
@@ -297,18 +310,17 @@ function SignBatchPsbtRequest() {
               },
             });
           });
-      } else {
-        const signingMessage = {
-          source: MESSAGE_SOURCE,
-          method: SatsConnectMethods.signBatchPsbtResponse,
-          payload: {
-            signBatchPsbtRequest: requestToken,
-            signBatchPsbtResponse: signedPsbts,
-          },
-        };
-
-        chrome.tabs.sendMessage(+tabId, signingMessage);
       }
+      const signingMessage = {
+        source: MESSAGE_SOURCE,
+        method: SatsConnectMethods.signBatchPsbtResponse,
+        payload: {
+          signBatchPsbtRequest: requestToken,
+          signBatchPsbtResponse: signedPsbts,
+        },
+      };
+
+      chrome.tabs.sendMessage(+tabId, signingMessage);
     } catch (err) {
       setIsSigning(false);
       setIsSigningComplete(false);
diff --git a/src/app/screens/signMessageRequestInApp/index.tsx b/src/app/screens/signMessageRequestInApp/index.tsx
index 44d5cd73a..57c65cf91 100644
--- a/src/app/screens/signMessageRequestInApp/index.tsx
+++ b/src/app/screens/signMessageRequestInApp/index.tsx
@@ -6,6 +6,7 @@ import InfoContainer from '@components/infoContainer';
 import LedgerConnectionView from '@components/ledger/connectLedgerView';
 import TopRow from '@components/topRow';
 import useRunesApi from '@hooks/apiClients/useRunesApi';
+import useXverseApi from '@hooks/apiClients/useXverseApi';
 import useSeedVault from '@hooks/useSeedVault';
 import useSelectedAccount from '@hooks/useSelectedAccount';
 import useWalletSelector from '@hooks/useWalletSelector';
@@ -43,6 +44,7 @@ function SignMessageRequestInApp() {
   const navigate = useNavigate();
   const { getSeed } = useSeedVault();
   const runesApi = useRunesApi();
+  const xverseApi = useXverseApi();
 
   const [addressType, setAddressType] = useState('');
   const [isSigning, setIsSigning] = useState(false);
@@ -141,13 +143,27 @@ function SignMessageRequestInApp() {
         protocol: MessageSigningProtocols.BIP322,
       });
 
-      await runesApi.submitCancelRunesSellOrder({
-        orderIds: payload.orderIds,
-        makerPublicKey: selectedAccount?.ordinalsPublicKey!,
-        makerAddress: selectedAccount?.ordinalsAddress!,
-        token: payload.token,
-        signature: signedMessage.signature,
-      });
+      if (payload.marketplace === 'OKX') {
+        await xverseApi.listings.submitRuneCancelOrder({
+          cancellationsPerMarketplace: [
+            {
+              marketplace: payload.marketplace,
+              orderId: payload.orderIds[0],
+              type: 'withMessage',
+              token: payload.token,
+              signature: signedMessage.signature,
+            },
+          ],
+        });
+      } else {
+        await runesApi.submitCancelRunesSellOrder({
+          orderIds: payload.orderIds,
+          makerPublicKey: selectedAccount?.ordinalsPublicKey!,
+          makerAddress: selectedAccount?.ordinalsAddress!,
+          token: payload.token,
+          signature: signedMessage.signature,
+        });
+      }
 
       handleGoBack();
       toast(`${t('SIGNATURE_REQUEST.UNLISTED_SUCCESS')}`);
@@ -192,13 +208,27 @@ function SignMessageRequestInApp() {
       }
       const signedMessage = await confirmSignMessage();
 
-      await runesApi.submitCancelRunesSellOrder({
-        orderIds: payload.orderIds,
-        makerPublicKey: selectedAccount?.ordinalsPublicKey!,
-        makerAddress: selectedAccount?.ordinalsAddress!,
-        token: payload.token,
-        signature: signedMessage.signature,
-      });
+      if (payload.marketplace === 'OKX') {
+        await xverseApi.listings.submitRuneCancelOrder({
+          cancellationsPerMarketplace: [
+            {
+              marketplace: payload.marketplace,
+              orderId: payload.orderIds[0],
+              type: 'withMessage',
+              token: payload.token,
+              signature: signedMessage.signature,
+            },
+          ],
+        });
+      } else {
+        await runesApi.submitCancelRunesSellOrder({
+          orderIds: payload.orderIds,
+          makerPublicKey: selectedAccount?.ordinalsPublicKey!,
+          makerAddress: selectedAccount?.ordinalsAddress!,
+          token: payload.token,
+          signature: signedMessage.signature,
+        });
+      }
 
       handleGoBack();
       toast(`${t('SIGNATURE_REQUEST.UNLISTED_SUCCESS')}`);
diff --git a/src/app/screens/unlistRuneUtxo/index.tsx b/src/app/screens/unlistRuneUtxo/index.tsx
index a11b360f9..49f969534 100644
--- a/src/app/screens/unlistRuneUtxo/index.tsx
+++ b/src/app/screens/unlistRuneUtxo/index.tsx
@@ -113,7 +113,7 @@ export default function UnlistRuneUtxoScreen() {
       });
       const data = response[0];
 
-      if (listing.marketplaceName === 'Magic Eden' && data.type === 'withMessage') {
+      if (['Magic Eden', 'OKX'].includes(listing.marketplaceName) && data.type === 'withMessage') {
         navigate(RequestsRoutes.SignMessageRequestInApp, {
           state: {
             requestPayload: {
@@ -123,6 +123,7 @@ export default function UnlistRuneUtxoScreen() {
                 address: selectedAccount?.ordinalsAddress,
                 selectedRuneId: selectedRune.principal,
                 orderIds: [listing.orderId],
+                marketplace: listing.marketplaceName,
               },
             },
           },
@@ -159,6 +160,7 @@ export default function UnlistRuneUtxoScreen() {
               {
                 marketplace: unisatCancellation.listing.marketplaceName,
                 orderId: unisatCancellation.listing.orderId,
+                type: 'withPsbt',
                 psbt: signedPsbt,
               },
             ],

From ad0dcb58c319b46938d932202bcfcd642510972f Mon Sep 17 00:00:00 2001
From: Christos Maris <christos@secretkeylabs.com>
Date: Tue, 17 Sep 2024 16:05:11 +0300
Subject: [PATCH 111/227] [ENG-4902] Redirect Rune Swaps to Listing

---
 src/locales/en.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/locales/en.json b/src/locales/en.json
index 6e6a1ec1c..1a04a39ac 100644
--- a/src/locales/en.json
+++ b/src/locales/en.json
@@ -1383,7 +1383,7 @@
     "SELECT_BUNDLES": "Select bundles to proceed with the swap",
     "SWAP_FROM": "Swap from",
     "SWAP_TO": "Swap to",
-    "LIST_YOUR_RUNES": "List your Runes on Magic Eden",
+    "LIST_YOUR_RUNES": "List your Runes on a marketplace",
     "SLIPPAGE_WARNING": "Your transaction may be frontrun and result in an unfavorable trade",
     "BAD_QUOTE_WARNING_TITLE": "The quote you are receiving may result in significant value loss.",
     "BAD_QUOTE_WARNING_DESC": "The minimum amount you will receive will result in a loss of over {{percentage}}% of your trade’s value. This is due to low liquidity in the pool, causing discrepancies in pricing. Please review the details carefully before proceeding with the swap."

From 0ccca6a7b10a08072ab60b8ed2c8093114558714 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Eduard=20Bardaj=C3=AD=20Puig?= <ebardaji@gmail.com>
Date: Tue, 17 Sep 2024 23:45:09 +0100
Subject: [PATCH 112/227] Emit disconnect events

---
 package-lock.json                             | 37 +++++++++----------
 package.json                                  |  2 +-
 .../connectedAppsAndPermissions/index.tsx     | 15 +++++++-
 .../dispatchEvent/index.ts                    |  8 ++++
 .../extensionToContentScript/utils/index.ts   | 11 ++++++
 .../utils/rpc/wallet/renouncePermissions.ts   |  5 +++
 src/content-scripts/README.md                 |  2 +-
 7 files changed, 58 insertions(+), 22 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 47d09b91e..cc91193a0 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -13,7 +13,7 @@
         "@phosphor-icons/react": "^2.0.10",
         "@playwright/test": "1.46.1",
         "@react-spring/web": "^9.6.1",
-        "@sats-connect/core": "0.2.1",
+        "@sats-connect/core": "0.3.0-7e6dd81",
         "@scure/btc-signer": "1.2.1",
         "@secretkeylabs/xverse-core": "19.2.0",
         "@stacks/connect": "7.4.1",
@@ -1160,25 +1160,23 @@
       }
     },
     "node_modules/@sats-connect/core": {
-      "version": "0.2.1",
-      "resolved": "https://registry.npmjs.org/@sats-connect/core/-/core-0.2.1.tgz",
-      "integrity": "sha512-e7ARFqN4JE8kBiSUNOcEvBffiBK9v7k+/PlwgYY5lGyanmBOMj5twBn/f/4+52GBLZXkwhJtidIWZ8LgnBdlbw==",
+      "version": "0.3.0-7e6dd81",
+      "resolved": "https://registry.npmjs.org/@sats-connect/core/-/core-0.3.0-7e6dd81.tgz",
+      "integrity": "sha512-FMlUzTMITHReHiFMS56yvBNvCbc0TPb9W0958bb+pJq2/IdwoXuY74Xf22LyoertTzNmAC56cg53VtKzIyAaJA==",
       "license": "ISC",
       "dependencies": {
-        "axios": "1.6.8",
+        "axios": "1.7.4",
         "bitcoin-address-validation": "2.2.3",
         "buffer": "6.0.3",
         "jsontokens": "4.0.1",
-        "lodash.omit": "4.5.0"
-      },
-      "peerDependencies": {
+        "lodash.omit": "4.5.0",
         "valibot": "0.33.2"
       }
     },
     "node_modules/@sats-connect/core/node_modules/axios": {
-      "version": "1.6.8",
-      "resolved": "https://registry.npmjs.org/axios/-/axios-1.6.8.tgz",
-      "integrity": "sha512-v/ZHtJDU39mDpyBoFVkETcd/uNdxrWRrg3bKpOKzXFA6Bvqopts6ALSMU3y6ijYxbw2B+wPrIv46egTzJXCLGQ==",
+      "version": "1.7.4",
+      "resolved": "https://registry.npmjs.org/axios/-/axios-1.7.4.tgz",
+      "integrity": "sha512-DukmaFRnY6AzAALSH4J2M3k6PkaC+MfaAGdEERRWcC9q3/TWQwLpHR8ZRLKTdQ3aBDL64EdluRDjJqKw+BPZEw==",
       "license": "MIT",
       "dependencies": {
         "follow-redirects": "^1.15.6",
@@ -13556,21 +13554,22 @@
       "integrity": "sha512-7Lcn7IqGMV+vizMPoEl5F0XDshcdDYtMI6uJLQdQz5CfZAwy3vvGKYSUk789qndt5dEC4HfSjviSYlSoHGL2+A=="
     },
     "@sats-connect/core": {
-      "version": "0.2.1",
-      "resolved": "https://registry.npmjs.org/@sats-connect/core/-/core-0.2.1.tgz",
-      "integrity": "sha512-e7ARFqN4JE8kBiSUNOcEvBffiBK9v7k+/PlwgYY5lGyanmBOMj5twBn/f/4+52GBLZXkwhJtidIWZ8LgnBdlbw==",
+      "version": "0.3.0-7e6dd81",
+      "resolved": "https://registry.npmjs.org/@sats-connect/core/-/core-0.3.0-7e6dd81.tgz",
+      "integrity": "sha512-FMlUzTMITHReHiFMS56yvBNvCbc0TPb9W0958bb+pJq2/IdwoXuY74Xf22LyoertTzNmAC56cg53VtKzIyAaJA==",
       "requires": {
-        "axios": "1.6.8",
+        "axios": "1.7.4",
         "bitcoin-address-validation": "2.2.3",
         "buffer": "6.0.3",
         "jsontokens": "4.0.1",
-        "lodash.omit": "4.5.0"
+        "lodash.omit": "4.5.0",
+        "valibot": "0.33.2"
       },
       "dependencies": {
         "axios": {
-          "version": "1.6.8",
-          "resolved": "https://registry.npmjs.org/axios/-/axios-1.6.8.tgz",
-          "integrity": "sha512-v/ZHtJDU39mDpyBoFVkETcd/uNdxrWRrg3bKpOKzXFA6Bvqopts6ALSMU3y6ijYxbw2B+wPrIv46egTzJXCLGQ==",
+          "version": "1.7.4",
+          "resolved": "https://registry.npmjs.org/axios/-/axios-1.7.4.tgz",
+          "integrity": "sha512-DukmaFRnY6AzAALSH4J2M3k6PkaC+MfaAGdEERRWcC9q3/TWQwLpHR8ZRLKTdQ3aBDL64EdluRDjJqKw+BPZEw==",
           "requires": {
             "follow-redirects": "^1.15.6",
             "form-data": "^4.0.0",
diff --git a/package.json b/package.json
index 252b78286..b5752a35e 100644
--- a/package.json
+++ b/package.json
@@ -41,7 +41,7 @@
     "@phosphor-icons/react": "^2.0.10",
     "@playwright/test": "1.46.1",
     "@react-spring/web": "^9.6.1",
-    "@sats-connect/core": "0.2.1",
+    "@sats-connect/core": "0.3.0-7e6dd81",
     "@scure/btc-signer": "1.2.1",
     "@secretkeylabs/xverse-core": "19.2.0",
     "@stacks/connect": "7.4.1",
diff --git a/src/app/screens/settings/connectedAppsAndPermissions/index.tsx b/src/app/screens/settings/connectedAppsAndPermissions/index.tsx
index 716ad6ceb..10c931075 100644
--- a/src/app/screens/settings/connectedAppsAndPermissions/index.tsx
+++ b/src/app/screens/settings/connectedAppsAndPermissions/index.tsx
@@ -1,4 +1,6 @@
+import { dispatchEventToOrigin } from '@common/utils/messages/extensionToContentScript/dispatchEvent';
 import { usePermissionsStore, usePermissionsUtils } from '@components/permissionsManager';
+import type { Client } from '@components/permissionsManager/schemas';
 import * as utils from '@components/permissionsManager/utils';
 import BottomBar from '@components/tabBar';
 import TopRow from '@components/topRow';
@@ -27,6 +29,17 @@ function ConnectedAppsAndPermissionsScreen() {
     navigate('/settings');
   }, [navigate]);
 
+  const handleDisconnect = useCallback(
+    async (client: Client) => {
+      // TODO: Handle error state in UI when designs are finalized.
+      await removeClient(client.id);
+      dispatchEventToOrigin(client.origin, {
+        type: 'disconnect',
+      });
+    },
+    [removeClient],
+  );
+
   if (!store) {
     return null;
   }
@@ -44,7 +57,7 @@ function ConnectedAppsAndPermissionsScreen() {
               <Button
                 type="button"
                 onClick={() => {
-                  removeClient(client.id);
+                  handleDisconnect(client);
                 }}
               >
                 Disconnect
diff --git a/src/common/utils/messages/extensionToContentScript/dispatchEvent/index.ts b/src/common/utils/messages/extensionToContentScript/dispatchEvent/index.ts
index 361a15942..94bc504ec 100644
--- a/src/common/utils/messages/extensionToContentScript/dispatchEvent/index.ts
+++ b/src/common/utils/messages/extensionToContentScript/dispatchEvent/index.ts
@@ -6,6 +6,7 @@ import {
   sendMessageAuthorizedConnectedClients,
   sendMessageConnectedClient,
   sendMessageConnectedClients,
+  sendMessageToOrigin,
 } from '../utils';
 
 /**
@@ -46,3 +47,10 @@ export async function dispatchEventAuthorizedConnectedClients(
     data,
   });
 }
+
+export async function dispatchEventToOrigin(origin: string, data: WalletEvent) {
+  sendMessageToOrigin(origin, {
+    type: contentScriptWalletEventMessageName,
+    data,
+  });
+}
diff --git a/src/common/utils/messages/extensionToContentScript/utils/index.ts b/src/common/utils/messages/extensionToContentScript/utils/index.ts
index aa258fda1..e233c6bd2 100644
--- a/src/common/utils/messages/extensionToContentScript/utils/index.ts
+++ b/src/common/utils/messages/extensionToContentScript/utils/index.ts
@@ -157,3 +157,14 @@ export async function sendMessageAuthorizedConnectedClients(
     message,
   );
 }
+
+export async function sendMessageToOrigin(origin: string, message: ContentScriptMessage) {
+  const url = clientOriginToUrlMatchPattern(origin);
+  const clientTabs = (await chrome.tabs.query({ url })).filter(
+    (tab): tab is chrome.tabs.Tab & { readonly id: number } => typeof tab.id === 'number',
+  );
+  sendMessageContentScriptTabs(
+    clientTabs.map((tab) => tab.id),
+    message,
+  );
+}
diff --git a/src/common/utils/rpc/wallet/renouncePermissions.ts b/src/common/utils/rpc/wallet/renouncePermissions.ts
index 33a5e683b..afcc5c760 100644
--- a/src/common/utils/rpc/wallet/renouncePermissions.ts
+++ b/src/common/utils/rpc/wallet/renouncePermissions.ts
@@ -1,5 +1,6 @@
 /* eslint-disable import/prefer-default-export */
 import { getTabIdFromPort } from '@common/utils';
+import { dispatchEventToOrigin } from '@common/utils/messages/extensionToContentScript/dispatchEvent';
 import { makeContext } from '@common/utils/popup';
 import * as utils from '@components/permissionsManager/utils';
 import {
@@ -39,6 +40,10 @@ export const handleRenouncePermissions = async (
     utils.savePermissionsStore(store);
   });
 
+  dispatchEventToOrigin(origin, {
+    type: 'disconnect',
+  });
+
   sendRenouncePermissionsSuccessResponseMessage({
     tabId,
     messageId: parseResult.output.id,
diff --git a/src/content-scripts/README.md b/src/content-scripts/README.md
index 26f30e142..79df33e75 100644
--- a/src/content-scripts/README.md
+++ b/src/content-scripts/README.md
@@ -7,4 +7,4 @@ The content script listens for incomming messages using `chrome.runtime.onMessag
 
 The complete message list and schema definitions see [extensionToContentScript](../common/utils/messages/extensionToContentScript/).
 
-Messages that aren't notifications are assumed to be RPC responses and are forwarded to the tab using `window.postMessage()`.
+Messages that aren't events are assumed to be RPC responses and are forwarded to the tab using `window.postMessage()`.

From 2db5bec579c27ec96c86d005888cf70723d4b9ee Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Eduard=20Bardaj=C3=AD=20Puig?= <ebardaji@gmail.com>
Date: Tue, 17 Sep 2024 23:47:45 +0100
Subject: [PATCH 113/227] Allow skipping startup animation

---
 .env.example                      | 3 +++
 .github/workflows/build-rc.yml    | 2 ++
 .github/workflows/build.yml       | 1 +
 .github/workflows/playwright.yml  | 1 +
 src/app/screens/landing/index.tsx | 4 +++-
 5 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/.env.example b/.env.example
index 3e46d77c8..25817e64a 100644
--- a/.env.example
+++ b/.env.example
@@ -1,3 +1,6 @@
+# Behavior
+SKIP_ANIMATION_WALLET_STARTUP=false;
+
 # Providers
 TRANSAC_API_KEY=
 MOON_PAY_API_KEY=
diff --git a/.github/workflows/build-rc.yml b/.github/workflows/build-rc.yml
index 29ba056be..1522d063c 100644
--- a/.github/workflows/build-rc.yml
+++ b/.github/workflows/build-rc.yml
@@ -40,6 +40,8 @@ jobs:
           MOON_PAY_API_KEY: ${{ secrets.MOON_PAY_API_KEY }}
           MIX_PANEL_TOKEN: ${{ secrets.MIX_PANEL_TOKEN }}
           MIX_PANEL_EXPLORE_APP_TOKEN: ${{ secrets.MIX_PANEL_EXPLORE_APP_TOKEN }}
+          SKIP_ANIMATION_WALLET_STARTUP: 'false'
+
         run: npm run build
       - name: Upload Archive
         uses: actions/upload-artifact@v3
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 2e265923a..11573eef4 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -37,6 +37,7 @@ jobs:
           MOON_PAY_API_KEY: ${{ secrets.MOON_PAY_API_KEY }}
           MIX_PANEL_TOKEN: ${{ secrets.MIX_PANEL_TOKEN }}
           MIX_PANEL_EXPLORE_APP_TOKEN: ${{ secrets.MIX_PANEL_EXPLORE_APP_TOKEN }}
+          SKIP_ANIMATION_WALLET_STARTUP: 'false'
         run: npm run build --if-present
       - name: Install Playwright Browsers
         run: npx playwright install chromium --with-deps
diff --git a/.github/workflows/playwright.yml b/.github/workflows/playwright.yml
index d2a026cd0..d8e184658 100644
--- a/.github/workflows/playwright.yml
+++ b/.github/workflows/playwright.yml
@@ -35,6 +35,7 @@ jobs:
           MOON_PAY_API_KEY: ${{ secrets.MOON_PAY_API_KEY }}
           MIX_PANEL_TOKEN: ${{ secrets.MIX_PANEL_TOKEN }}
           MIX_PANEL_EXPLORE_APP_TOKEN: ${{ secrets.MIX_PANEL_EXPLORE_APP_TOKEN }}
+          SKIP_ANIMATION_WALLET_STARTUP: 'true'
         run: npm run build --if-present
       - name: Upload Archive
         uses: actions/upload-artifact@v3
diff --git a/src/app/screens/landing/index.tsx b/src/app/screens/landing/index.tsx
index 41e317546..c7e4c35f0 100644
--- a/src/app/screens/landing/index.tsx
+++ b/src/app/screens/landing/index.tsx
@@ -201,7 +201,9 @@ const RestoreButton = styled(Button)((props) => ({
 function Landing() {
   const { t } = useTranslation('translation', { keyPrefix: 'LANDING_SCREEN' });
   const [currentStepIndex, setCurrentStepIndex] = useState<number>(0);
-  const [animationComplete, setAnimationComplete] = useState(false);
+  const [animationComplete, setAnimationComplete] = useState(
+    process.env.SKIP_ANIMATION_WALLET_STARTUP === 'true',
+  );
   const [slideTransitions, setSlideTransitions] = useState(false);
   const [transitionDirection, setTransitionDirection] = useState<'left' | 'right'>('right');
   const navigate = useNavigate();

From c74155c6c75e2ab196e16c39784f334e509fff66 Mon Sep 17 00:00:00 2001
From: jordankzf <jordan@secretkeylabs.com>
Date: Wed, 18 Sep 2024 17:41:16 +0800
Subject: [PATCH 114/227] Introduce fromTokenUsdValue

---
 src/app/screens/swap/index.tsx              |  6 --
 src/app/screens/swap/mixpanel.ts            | 61 ++++++---------------
 src/app/screens/swap/quoteSummary/index.tsx |  1 -
 3 files changed, 17 insertions(+), 51 deletions(-)

diff --git a/src/app/screens/swap/index.tsx b/src/app/screens/swap/index.tsx
index 966e18cad..3c5cc4208 100644
--- a/src/app/screens/swap/index.tsx
+++ b/src/app/screens/swap/index.tsx
@@ -139,10 +139,6 @@ export default function SwapScreen() {
   const { quotes, loading: quotesLoading, error: quotesError, fetchQuotes } = useGetQuotes();
   const { data: runeFloorPrice } = useRuneFloorPriceQuery(toToken?.name ?? '');
   const coinsMasterList = useMasterCoinsList();
-  const { tokenInfo: sip10ToTokenInfoUSD } = useGetSip10TokenInfo({
-    principal: toToken?.ticker,
-    fiatCurrency: 'USD',
-  });
   const { tokenInfo: sip10FromTokenInfoUSD } = useGetSip10TokenInfo({
     principal: toToken?.ticker,
     fiatCurrency: 'USD',
@@ -191,7 +187,6 @@ export default function SwapScreen() {
       runeFloorPrice,
       stxBtcRate,
       fromTokenInfo: sip10FromTokenInfoUSD,
-      toTokenInfo: sip10ToTokenInfoUSD,
     });
 
     fetchQuotes({
@@ -410,7 +405,6 @@ export default function SwapScreen() {
       runeFloorPrice,
       stxBtcRate,
       fromTokenInfo: sip10FromTokenInfoUSD,
-      toTokenInfo: sip10ToTokenInfoUSD,
     });
   };
 
diff --git a/src/app/screens/swap/mixpanel.ts b/src/app/screens/swap/mixpanel.ts
index 3b555bc98..09cb23787 100644
--- a/src/app/screens/swap/mixpanel.ts
+++ b/src/app/screens/swap/mixpanel.ts
@@ -24,7 +24,6 @@ function trackSwapMixPanel(
     runeFloorPrice,
     stxBtcRate,
     fromTokenInfo,
-    toTokenInfo,
   }: {
     provider?: Provider;
     fromToken?: FungibleToken;
@@ -35,38 +34,35 @@ function trackSwapMixPanel(
     runeFloorPrice?: number;
     stxBtcRate?: string;
     fromTokenInfo?: Coin;
-    toTokenInfo?: Coin;
   },
 ) {
-  let fromAmount;
-  let receiveAmount;
-  let toAmount;
+  let fromTokenAmount;
+  let toTokenAmount;
+  let fromTokenUsdValue;
   let fromPrincipal;
   let toPrincipal;
 
   const from = getTrackingIdentifier(fromToken);
   const to = getTrackingIdentifier(toToken);
 
+  const receiveAmount = quote?.receiveAmount ? new BigNumber(quote?.receiveAmount) : undefined;
+
+  if (receiveAmount) {
+    toTokenAmount = receiveAmount.toFixed(2);
+  }
+
   if (fromToken && toToken && isRunesTx({ fromToken, toToken })) {
-    fromAmount =
+    fromTokenUsdValue =
       fromToken?.principal === 'BTC'
         ? getBtcFiatEquivalent(new BigNumber(amount), new BigNumber(btcUsdRate)).toFixed(2)
         : new BigNumber(fromToken?.tokenFiatRate ?? 0).multipliedBy(amount).toFixed(2);
-
-    receiveAmount = quote?.receiveAmount ? new BigNumber(quote?.receiveAmount) : undefined;
-    toAmount = receiveAmount
-      ? getBtcFiatEquivalent(
-          toToken?.protocol === 'btc'
-            ? receiveAmount
-            : receiveAmount.multipliedBy(runeFloorPrice ?? 0),
-          new BigNumber(btcUsdRate),
-        ).toFixed(2)
-      : undefined;
+    fromTokenAmount = amount;
   } else if (stxBtcRate) {
     fromPrincipal = fromToken?.principal;
     toPrincipal = toToken?.ticker;
 
-    fromAmount =
+    fromTokenAmount = amount;
+    fromTokenUsdValue =
       fromToken?.principal === 'STX'
         ? getStxFiatEquivalent(
             stxToMicrostacks(new BigNumber(amount)),
@@ -75,31 +71,7 @@ function trackSwapMixPanel(
           ).toFixed(2)
         : fromTokenInfo?.tokenFiatRate
         ? new BigNumber(fromTokenInfo?.tokenFiatRate).multipliedBy(amount).toFixed(2)
-        : '--';
-
-    receiveAmount = quote?.receiveAmount ? new BigNumber(quote?.receiveAmount) : undefined;
-    if (receiveAmount) {
-      toAmount =
-        toToken?.protocol === 'stx'
-          ? getStxFiatEquivalent(
-              stxToMicrostacks(receiveAmount),
-              new BigNumber(stxBtcRate),
-              new BigNumber(btcUsdRate),
-            ).toFixed(2)
-          : toTokenInfo?.tokenFiatRate
-          ? new BigNumber(toTokenInfo?.tokenFiatRate).multipliedBy(receiveAmount).toFixed(2)
-          : '--';
-    }
-  }
-
-  // Don't track for zero-like fiat values
-  if (
-    Number.isNaN(parseFloat(fromAmount)) ||
-    parseFloat(fromAmount) <= 0 ||
-    Number.isNaN(parseFloat(toAmount)) ||
-    parseFloat(toAmount) <= 0
-  ) {
-    return;
+        : 0;
   }
 
   trackMixPanel(eventName, {
@@ -108,8 +80,9 @@ function trackSwapMixPanel(
     ...(to ? { to } : {}),
     ...(fromPrincipal ? { fromPrincipal } : {}),
     ...(toPrincipal ? { toPrincipal } : {}),
-    fromAmount,
-    ...(toAmount ? { toAmount } : {}),
+    ...(fromTokenAmount ? { fromTokenAmount } : {}),
+    ...(fromTokenUsdValue ? { fromTokenUsdValue } : {}),
+    ...(toTokenAmount ? { toTokenAmount } : {}),
   });
 }
 
diff --git a/src/app/screens/swap/quoteSummary/index.tsx b/src/app/screens/swap/quoteSummary/index.tsx
index 01164a5d8..6b0d7e497 100644
--- a/src/app/screens/swap/quoteSummary/index.tsx
+++ b/src/app/screens/swap/quoteSummary/index.tsx
@@ -268,7 +268,6 @@ export default function QuoteSummary({
       runeFloorPrice,
       stxBtcRate,
       fromTokenInfo: sip10FromTokenInfoUSD,
-      toTokenInfo: sip10ToTokenInfoUSD,
     });
 
     if (selectedIdentifiers) {

From 181034a61ae54c1e4fe02de3180e0a25b80cc372 Mon Sep 17 00:00:00 2001
From: Christos Maris <christos@secretkeylabs.com>
Date: Wed, 18 Sep 2024 13:50:25 +0300
Subject: [PATCH 115/227] [ENG-4896] Bump Xverse-Core Version

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

diff --git a/package-lock.json b/package-lock.json
index 4afa8ac41..85331951d 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -15,7 +15,7 @@
         "@react-spring/web": "^9.6.1",
         "@sats-connect/core": "0.3.0-7e6dd81",
         "@scure/btc-signer": "1.2.1",
-        "@secretkeylabs/xverse-core": "19.3.0",
+        "@secretkeylabs/xverse-core": "20.0.0",
         "@stacks/connect": "7.4.1",
         "@stacks/stacks-blockchain-api-types": "6.1.1",
         "@stacks/transactions": "6.16.1",
@@ -1273,9 +1273,9 @@
       }
     },
     "node_modules/@secretkeylabs/xverse-core": {
-      "version": "19.3.0",
-      "resolved": "https://npm.pkg.github.com/download/@secretkeylabs/xverse-core/19.3.0/d3cb04654a1c9c05db125c1f2e6c97a5e71d1ea6",
-      "integrity": "sha512-EUGmg4xDy+H/EhSK+r17BHQ6t0e/qIkDXKdClKPCuMHtFvrQx6a7hDp8JisyvR9Wi3RxIMTGL8jif8Df/x7kmQ==",
+      "version": "20.0.0",
+      "resolved": "https://npm.pkg.github.com/download/@secretkeylabs/xverse-core/20.0.0/f06eec595cf8019dd5335399a800acb894123dc4",
+      "integrity": "sha512-Uy59WUgbz6xvjDrK3h6jCG6FXb5XlsP8d2lMnF/zmHIZbYR8S+GZ79FZk4rfOUxugsrC8t6EoCsJRNuA2t6VVQ==",
       "license": "ISC",
       "dependencies": {
         "@bitcoinerlab/secp256k1": "^1.0.2",
@@ -13636,9 +13636,9 @@
       }
     },
     "@secretkeylabs/xverse-core": {
-      "version": "19.3.0",
-      "resolved": "https://npm.pkg.github.com/download/@secretkeylabs/xverse-core/19.3.0/d3cb04654a1c9c05db125c1f2e6c97a5e71d1ea6",
-      "integrity": "sha512-EUGmg4xDy+H/EhSK+r17BHQ6t0e/qIkDXKdClKPCuMHtFvrQx6a7hDp8JisyvR9Wi3RxIMTGL8jif8Df/x7kmQ==",
+      "version": "20.0.0",
+      "resolved": "https://npm.pkg.github.com/download/@secretkeylabs/xverse-core/20.0.0/f06eec595cf8019dd5335399a800acb894123dc4",
+      "integrity": "sha512-Uy59WUgbz6xvjDrK3h6jCG6FXb5XlsP8d2lMnF/zmHIZbYR8S+GZ79FZk4rfOUxugsrC8t6EoCsJRNuA2t6VVQ==",
       "requires": {
         "@bitcoinerlab/secp256k1": "^1.0.2",
         "@noble/curves": "^1.2.0",
diff --git a/package.json b/package.json
index b8a4020fc..3038f1499 100644
--- a/package.json
+++ b/package.json
@@ -43,7 +43,7 @@
     "@react-spring/web": "^9.6.1",
     "@sats-connect/core": "0.3.0-7e6dd81",
     "@scure/btc-signer": "1.2.1",
-    "@secretkeylabs/xverse-core": "19.3.0",
+    "@secretkeylabs/xverse-core": "20.0.0",
     "@stacks/connect": "7.4.1",
     "@stacks/stacks-blockchain-api-types": "6.1.1",
     "@stacks/transactions": "6.16.1",

From 86db45228bb755bc37ec17afbb0aee7c4d87989f Mon Sep 17 00:00:00 2001
From: Christos Maris <christos@secretkeylabs.com>
Date: Wed, 18 Sep 2024 17:43:59 +0300
Subject: [PATCH 116/227] [ENG-5242] Add Mixpanel Tracking for
 Multi-Marketplace Listing

---
 package-lock.json                             | 14 ++++++-------
 package.json                                  |  2 +-
 .../runes/useRuneSellPsbtPerMarketplace.ts    | 20 +++++++++++++++----
 src/app/hooks/useSignBatchPsbtTx.ts           |  1 +
 .../screens/signBatchPsbtRequest/index.tsx    | 12 +++++++++++
 5 files changed, 37 insertions(+), 12 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 85331951d..531688fdf 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -15,7 +15,7 @@
         "@react-spring/web": "^9.6.1",
         "@sats-connect/core": "0.3.0-7e6dd81",
         "@scure/btc-signer": "1.2.1",
-        "@secretkeylabs/xverse-core": "20.0.0",
+        "@secretkeylabs/xverse-core": "20.0.1",
         "@stacks/connect": "7.4.1",
         "@stacks/stacks-blockchain-api-types": "6.1.1",
         "@stacks/transactions": "6.16.1",
@@ -1273,9 +1273,9 @@
       }
     },
     "node_modules/@secretkeylabs/xverse-core": {
-      "version": "20.0.0",
-      "resolved": "https://npm.pkg.github.com/download/@secretkeylabs/xverse-core/20.0.0/f06eec595cf8019dd5335399a800acb894123dc4",
-      "integrity": "sha512-Uy59WUgbz6xvjDrK3h6jCG6FXb5XlsP8d2lMnF/zmHIZbYR8S+GZ79FZk4rfOUxugsrC8t6EoCsJRNuA2t6VVQ==",
+      "version": "20.0.1",
+      "resolved": "https://npm.pkg.github.com/download/@secretkeylabs/xverse-core/20.0.1/79399cdc59d54f7354eadf349cf12cfbe834b552",
+      "integrity": "sha512-p7yLBBKqOUO6aLgnLAz5/x68+BQeWq96ZuHF2drNkEwXWcj2SHQYqaEaQgmsbR4/02CQ6+rIxtC/Zf6JZGS/qw==",
       "license": "ISC",
       "dependencies": {
         "@bitcoinerlab/secp256k1": "^1.0.2",
@@ -13636,9 +13636,9 @@
       }
     },
     "@secretkeylabs/xverse-core": {
-      "version": "20.0.0",
-      "resolved": "https://npm.pkg.github.com/download/@secretkeylabs/xverse-core/20.0.0/f06eec595cf8019dd5335399a800acb894123dc4",
-      "integrity": "sha512-Uy59WUgbz6xvjDrK3h6jCG6FXb5XlsP8d2lMnF/zmHIZbYR8S+GZ79FZk4rfOUxugsrC8t6EoCsJRNuA2t6VVQ==",
+      "version": "20.0.1",
+      "resolved": "https://npm.pkg.github.com/download/@secretkeylabs/xverse-core/20.0.1/79399cdc59d54f7354eadf349cf12cfbe834b552",
+      "integrity": "sha512-p7yLBBKqOUO6aLgnLAz5/x68+BQeWq96ZuHF2drNkEwXWcj2SHQYqaEaQgmsbR4/02CQ6+rIxtC/Zf6JZGS/qw==",
       "requires": {
         "@bitcoinerlab/secp256k1": "^1.0.2",
         "@noble/curves": "^1.2.0",
diff --git a/package.json b/package.json
index 3038f1499..85cb2a64e 100644
--- a/package.json
+++ b/package.json
@@ -43,7 +43,7 @@
     "@react-spring/web": "^9.6.1",
     "@sats-connect/core": "0.3.0-7e6dd81",
     "@scure/btc-signer": "1.2.1",
-    "@secretkeylabs/xverse-core": "20.0.0",
+    "@secretkeylabs/xverse-core": "20.0.1",
     "@stacks/connect": "7.4.1",
     "@stacks/stacks-blockchain-api-types": "6.1.1",
     "@stacks/transactions": "6.16.1",
diff --git a/src/app/hooks/queries/runes/useRuneSellPsbtPerMarketplace.ts b/src/app/hooks/queries/runes/useRuneSellPsbtPerMarketplace.ts
index 8085f3130..b0d97f263 100644
--- a/src/app/hooks/queries/runes/useRuneSellPsbtPerMarketplace.ts
+++ b/src/app/hooks/queries/runes/useRuneSellPsbtPerMarketplace.ts
@@ -2,12 +2,14 @@ import useXverseApi from '@hooks/apiClients/useXverseApi';
 import useSelectedAccount from '@hooks/useSelectedAccount';
 import useWalletSelector from '@hooks/useWalletSelector';
 import { BitcoinNetworkType } from '@sats-connect/core';
-import type {
-  CreateRuneListingRequest,
-  FungibleToken,
-  Marketplace,
+import {
+  AnalyticsEvents,
+  type CreateRuneListingRequest,
+  type FungibleToken,
+  type Marketplace,
 } from '@secretkeylabs/xverse-core';
 import { sanitizeRuneName } from '@utils/helper';
+import { trackMixPanel } from '@utils/mixpanel';
 import type { RuneItem } from '@utils/runes';
 import { useCallback, useState } from 'react';
 
@@ -67,6 +69,16 @@ const useRuneSellPsbtPerMarketplace = (
           })),
         };
 
+        trackMixPanel(AnalyticsEvents.ListRuneInitiated, {
+          marketplaces: selectedMarketplaces,
+          from: rune.name,
+          to: 'BTC',
+          runeTotalAmount: Object.values(listingUtxos)
+            .map((i) => i.amount)
+            .reduce((a, b) => a + b, 0),
+          priceInSatsPerRune: Object.values(listingUtxos)[0].priceSats,
+        });
+
         setSignPsbtPayload(payload);
       })
       .catch(() => setError('Failed to create listing'))
diff --git a/src/app/hooks/useSignBatchPsbtTx.ts b/src/app/hooks/useSignBatchPsbtTx.ts
index bcd050300..084d27530 100644
--- a/src/app/hooks/useSignBatchPsbtTx.ts
+++ b/src/app/hooks/useSignBatchPsbtTx.ts
@@ -72,6 +72,7 @@ const useSignBatchPsbtTx = () => {
     selectedRune: locationState.selectedRune,
     minPriceSats: locationState.minPriceSats,
     utxos: locationState.utxos as Record<string, RuneItem>,
+    locationState,
   };
 };
 
diff --git a/src/app/screens/signBatchPsbtRequest/index.tsx b/src/app/screens/signBatchPsbtRequest/index.tsx
index c01b6416c..a8d3239ba 100644
--- a/src/app/screens/signBatchPsbtRequest/index.tsx
+++ b/src/app/screens/signBatchPsbtRequest/index.tsx
@@ -40,6 +40,7 @@ import Callout from '@ui-library/callout';
 import Spinner from '@ui-library/spinner';
 import { isLedgerAccount } from '@utils/helper';
 import { trackMixPanel } from '@utils/mixpanel';
+import type { RuneItem } from '@utils/runes';
 import objecthash from 'object-hash';
 import { useCallback, useEffect, useMemo, useState } from 'react';
 import { useTranslation } from 'react-i18next';
@@ -81,6 +82,7 @@ function SignBatchPsbtRequest() {
     requestToken,
     selectedRune,
     minPriceSats,
+    locationState,
   } = useSignBatchPsbtTx();
   const [isSigning, setIsSigning] = useState(false);
   const [isSigningComplete, setIsSigningComplete] = useState(false);
@@ -265,6 +267,16 @@ function SignBatchPsbtRequest() {
       setIsSigning(false);
 
       if (inApp) {
+        trackMixPanel(AnalyticsEvents.ListRuneSigned, {
+          from: locationState.selectedRune.name,
+          to: 'BTC',
+          priceInSatsPerRune: locationState.minPriceSats,
+          marketplaces: locationState.payload.psbts.map((p) => p.marketplaceName),
+          runeTotalAmount: Object.values(locationState.utxos as Record<string, RuneItem>)
+            .map((i) => i.amount)
+            .reduce((a, b) => a + b, 0),
+        });
+
         const expiresAt = new Date();
         expiresAt.setDate(expiresAt.getDate() + 10); // 10 days from now
 

From 08ae057a2befb524513cf1bcd9e54f20f2561ae0 Mon Sep 17 00:00:00 2001
From: "Jordan K." <65149726+jordankzf@users.noreply.github.com>
Date: Thu, 19 Sep 2024 18:29:13 +0800
Subject: [PATCH 117/227] [ENG-5153] Line break rates drawer (#581)

* Character count approach

* CSS approach

---------

Co-authored-by: Den <36603049+dhriaznov@users.noreply.github.com>
---
 src/app/screens/swap/quotesModal/quoteTile.tsx | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/src/app/screens/swap/quotesModal/quoteTile.tsx b/src/app/screens/swap/quotesModal/quoteTile.tsx
index a26d6885d..551a47585 100644
--- a/src/app/screens/swap/quotesModal/quoteTile.tsx
+++ b/src/app/screens/swap/quotesModal/quoteTile.tsx
@@ -67,6 +67,13 @@ interface Props {
   unit?: string;
 }
 
+const TruncatedP = styled(StyledP)`
+  white-space: nowrap;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  width: 150px;
+`;
+
 function QuoteTile({
   provider,
   price,
@@ -101,9 +108,9 @@ function QuoteTile({
             displayType="text"
             thousandSeparator
             renderText={() => (
-              <StyledP data-testid="quote-label" typography="body_bold_m" color="white_0">
+              <TruncatedP data-testid="quote-label" typography="body_bold_m" color="white_0">
                 {formatNumber(price)} {unit}
-              </StyledP>
+              </TruncatedP>
             )}
           />
         </RowCenter>

From 197de4ef25b2898a0ea9306a60d967ddaaf7f912 Mon Sep 17 00:00:00 2001
From: Terence Ng <ngtere@live.com.sg>
Date: Thu, 19 Sep 2024 19:11:56 +0800
Subject: [PATCH 118/227] remove redundant useSelectors to use
 useWalletSelector (#601)

* initial commit

* final commit

* remove redundant variable
---
 src/app/components/tokenTile/index.tsx |  5 ++--
 src/app/hooks/useSelectedAccount.ts    | 28 ++++++------------
 src/app/hooks/useWalletReducer.ts      | 39 +++++++++-----------------
 3 files changed, 24 insertions(+), 48 deletions(-)

diff --git a/src/app/components/tokenTile/index.tsx b/src/app/components/tokenTile/index.tsx
index a44f6b2d9..284152719 100644
--- a/src/app/components/tokenTile/index.tsx
+++ b/src/app/components/tokenTile/index.tsx
@@ -4,13 +4,12 @@ import TokenImage from '@components/tokenImage';
 import useBtcWalletData from '@hooks/queries/useBtcWalletData';
 import useCoinRates from '@hooks/queries/useCoinRates';
 import useStxWalletData from '@hooks/queries/useStxWalletData';
+import useWalletSelector from '@hooks/useWalletSelector';
 import { getFiatEquivalent, type FungibleToken } from '@secretkeylabs/xverse-core';
-import type { StoreState } from '@stores/index';
 import type { CurrencyTypes } from '@utils/constants';
 import { getBalanceAmount, getFtTicker } from '@utils/tokens';
 import BigNumber from 'bignumber.js';
 import { NumericFormat } from 'react-number-format';
-import { useSelector } from 'react-redux';
 import styled from 'styled-components';
 
 const TileContainer = styled.button((props) => ({
@@ -119,7 +118,7 @@ function TokenTile({
   showProtocolIcon = true,
   hideBalance = false,
 }: Props) {
-  const { fiatCurrency } = useSelector((state: StoreState) => state.walletState);
+  const { fiatCurrency } = useWalletSelector();
   const { btcFiatRate, stxBtcRate } = useCoinRates();
   const { data: stxData } = useStxWalletData();
   const { data: btcBalance } = useBtcWalletData();
diff --git a/src/app/hooks/useSelectedAccount.ts b/src/app/hooks/useSelectedAccount.ts
index 74e67e1f0..8ba5f7d43 100644
--- a/src/app/hooks/useSelectedAccount.ts
+++ b/src/app/hooks/useSelectedAccount.ts
@@ -1,42 +1,32 @@
 import getSelectedAccount from '@common/utils/getSelectedAccount';
+import useWalletSelector from '@hooks/useWalletSelector';
 import type { Account } from '@secretkeylabs/xverse-core';
-import type { StoreState } from '@stores/index';
 import { useMemo } from 'react';
-import { useSelector } from 'react-redux';
 import useWalletReducer from './useWalletReducer';
 
 const useSelectedAccount = (): Account => {
   const { switchAccount } = useWalletReducer();
+  const {
+    selectedAccountIndex,
+    selectedAccountType,
+    accountsList: softwareAccountsList,
+    ledgerAccountsList,
+  } = useWalletSelector();
 
-  const selectedAccountIndex = useSelector(
-    (state: StoreState) => state.walletState.selectedAccountIndex,
-  );
-  const selectedAccountType = useSelector(
-    (state: StoreState) => state.walletState.selectedAccountType,
-  );
-  const softwareAccountsList = useSelector((state: StoreState) => state.walletState.accountsList);
-  const ledgerAccountsList = useSelector(
-    (state: StoreState) => state.walletState.ledgerAccountsList,
-  );
-
-  const selectedAccount = useMemo(() => {
+  return useMemo(() => {
     const existingAccount = getSelectedAccount({
       selectedAccountIndex,
       selectedAccountType,
       softwareAccountsList,
       ledgerAccountsList,
     });
-
     if (existingAccount) {
       return existingAccount;
     }
-
     const fallbackAccount = softwareAccountsList[0];
-
     if (fallbackAccount) {
       switchAccount(fallbackAccount);
     }
-
     return fallbackAccount;
   }, [
     selectedAccountIndex,
@@ -45,8 +35,6 @@ const useSelectedAccount = (): Account => {
     ledgerAccountsList,
     switchAccount,
   ]);
-
-  return selectedAccount;
 };
 
 export default useSelectedAccount;
diff --git a/src/app/hooks/useWalletReducer.ts b/src/app/hooks/useWalletReducer.ts
index 3afd0e8b9..12bc3238b 100644
--- a/src/app/hooks/useWalletReducer.ts
+++ b/src/app/hooks/useWalletReducer.ts
@@ -2,6 +2,7 @@ import { getDeviceAccountIndex } from '@common/utils/ledger';
 import { dispatchEventAuthorizedConnectedClients } from '@common/utils/messages/extensionToContentScript/dispatchEvent';
 import { makeAccountResourceId } from '@components/permissionsManager/resources';
 import useNetworkSelector from '@hooks/useNetwork';
+import useWalletSelector from '@hooks/useWalletSelector';
 import {
   AnalyticsEvents,
   StacksMainnet,
@@ -16,7 +17,6 @@ import {
   type NetworkType,
   type SettingsNetwork,
 } from '@secretkeylabs/xverse-core';
-import type { StoreState } from '@stores/index';
 import {
   ChangeNetworkAction,
   changeShowDataCollectionAlertAction,
@@ -38,7 +38,7 @@ import {
   trackMixPanel,
 } from '@utils/mixpanel';
 import { useCallback } from 'react';
-import { useDispatch, useSelector } from 'react-redux';
+import { useDispatch } from 'react-redux';
 import useSeedVault from './useSeedVault';
 import useWalletSession from './useWalletSession';
 
@@ -83,29 +83,18 @@ const createSingleAccount = async (
 };
 
 const useWalletReducer = () => {
-  const network = useSelector((state: StoreState) => state.walletState.network);
-  const encryptedSeed = useSelector((state: StoreState) => state.walletState.encryptedSeed);
-
-  const selectedAccountIndex = useSelector(
-    (state: StoreState) => state.walletState.selectedAccountIndex,
-  );
-  const selectedAccountType = useSelector(
-    (state: StoreState) => state.walletState.selectedAccountType,
-  );
-  const accounts = useSelector((state: StoreState) => state.walletState.accountsList);
-  const savedNames = useSelector((state: StoreState) => state.walletState.savedNames);
-
-  const softwareAccountsList = useSelector((state: StoreState) => state.walletState.accountsList);
-  const ledgerAccountsList = useSelector(
-    (state: StoreState) => state.walletState.ledgerAccountsList,
-  );
-
-  const showDataCollectionAlert = useSelector(
-    (state: StoreState) => state.walletState.showDataCollectionAlert,
-  );
-
-  const hideStx = useSelector((state: StoreState) => state.walletState.hideStx);
-
+  const {
+    network,
+    encryptedSeed,
+    selectedAccountIndex,
+    selectedAccountType,
+    accountsList: accounts,
+    savedNames,
+    accountsList: softwareAccountsList,
+    ledgerAccountsList,
+    showDataCollectionAlert,
+    hideStx,
+  } = useWalletSelector();
   const seedVault = useSeedVault();
   const selectedNetwork = useNetworkSelector();
 

From 94c644f0976aa362207743f875c1e65e3e7c76f1 Mon Sep 17 00:00:00 2001
From: jordankzf <jordan@secretkeylabs.com>
Date: Thu, 19 Sep 2024 19:30:28 +0800
Subject: [PATCH 119/227] Right align TruncatedP

---
 src/app/screens/swap/quotesModal/quoteTile.tsx | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/app/screens/swap/quotesModal/quoteTile.tsx b/src/app/screens/swap/quotesModal/quoteTile.tsx
index 551a47585..78ef7d2dd 100644
--- a/src/app/screens/swap/quotesModal/quoteTile.tsx
+++ b/src/app/screens/swap/quotesModal/quoteTile.tsx
@@ -72,6 +72,7 @@ const TruncatedP = styled(StyledP)`
   overflow: hidden;
   text-overflow: ellipsis;
   width: 150px;
+  text-align: right;
 `;
 
 function QuoteTile({

From 0994cd28ad60f3dc903ed2c779e7a5096ee20313 Mon Sep 17 00:00:00 2001
From: jordankzf <jordan@secretkeylabs.com>
Date: Thu, 19 Sep 2024 19:32:49 +0800
Subject: [PATCH 120/227] Address Haseeb's feedback

---
 src/app/screens/swap/quoteSummary/index.tsx | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/app/screens/swap/quoteSummary/index.tsx b/src/app/screens/swap/quoteSummary/index.tsx
index 6b0d7e497..bf7087b3c 100644
--- a/src/app/screens/swap/quoteSummary/index.tsx
+++ b/src/app/screens/swap/quoteSummary/index.tsx
@@ -176,6 +176,10 @@ export default function QuoteSummary({
     fiatCurrency: 'USD',
   });
 
+  const { tokenInfo: sip10ToTokenInfo } = useGetSip10TokenInfo({
+    principal: toToken?.ticker,
+  });
+
   const { tokenInfo: sip10FromTokenInfoUSD } = useGetSip10TokenInfo({
     principal: fromToken?.principal,
     fiatCurrency: 'USD',
@@ -372,10 +376,10 @@ export default function QuoteSummary({
         new BigNumber(btcFiatRate),
       ).toFixed(2);
     }
-    if (!sip10ToTokenInfoUSD?.tokenFiatRate) {
+    if (!sip10ToTokenInfo?.tokenFiatRate) {
       return '--';
     }
-    return new BigNumber(sip10ToTokenInfoUSD?.tokenFiatRate)
+    return new BigNumber(sip10ToTokenInfo?.tokenFiatRate)
       .multipliedBy(quote.receiveAmount)
       .toFixed(2);
   })();

From fe65912119daac21fd59e0e98a7afa3dcd08d71a Mon Sep 17 00:00:00 2001
From: Terence Ng <ngtere@live.com.sg>
Date: Fri, 20 Sep 2024 21:01:19 +0800
Subject: [PATCH 121/227] integrate new tx summary from core (#488)

* remove unused screen

* update new context

* commit

* commit

* commit

* commit

* commit

* commit

* use PR branch

* commit

* commit

* commit

* cleanup directory

* commit send section

* fixes

* commit todo for satribute help

* commit transfer section

* commit todo

* commit work

* commit new core version

* fix typos

* fix serializable issue

* fix rare sats logic / remove redundant logic

* use new core

* fix rare sat display even if zero

* fix rare sat not displaying remaining common sats when showing bundle size

* fix icon size

* fix margins / remove divider

* fix rare sats not displaying for non-bundles (you will transfer)

* fix link only when bundle

* fix margin issues + rare sats not displaying in transfer

* touchup

* touchup + use new core

* fix up delegate section

* chore: use isUserSummary, isAggregatedSummary, isScriptOutput, isPubKeyOutput and isAddressOutput from core; also fix checks to show closed and not mintable runes

* remove util functions from context

* fix receive runes displaying runes when have runes delegation (should not show)

* improve wording

* touchup

* fix: dont show sats amount in receive section when receiving in ordinal address

* fix: move rune delegation to return and check to show amount only for payment address in transfer section

* fix - revert logic and fix delegation + listings

* touchup

* add batch psbt work

* use newest core

* commit a fix to handle sats padding logic when combining both btc & ordinal address

* fix logic

* port logic over to core

* use latest core

* touchup rare sats logic to be like prod

* use latest core

* update lock

* REfactors and cleanups

* Clean up deps

* Decrease lock file changes

* save

* Fix batch sign psbt screen

* use real core build

* revert use github core build

* Merge branch 'develop' into terence/eng-4812-integrate-the-transaction-summary-parse-logic-from-core

* chore: add core release version and fix two issues from review

---------

Co-authored-by: fede erbes <fedeerbes@gmail.com>
Co-authored-by: Victor Kirov <victor.kirov@gmail.com>
---
 package-lock.json                             |  62 ++--
 package.json                                  |   5 +-
 .../hooks/useExtractTxSummary.ts              |  34 ++
 .../hooks/useParsedTxSummaryContext.ts        | 278 ---------------
 .../hooks/useTxSummaryContext.ts              |  55 +++
 .../confirmBtcTransaction/index.tsx           | 207 ++++++------
 .../confirmBtcTransaction/indexBatch.tsx      | 113 +++++++
 .../amountWithInscriptionSatribute.tsx        |  77 ++++-
 .../itemRow/bundleItem.tsx                    | 120 -------
 .../itemRow/inscription.tsx                   |  53 ++-
 .../itemRow/inscriptionSatributeRow.tsx       |  96 ++----
 .../itemRow/rareSatRow.tsx                    |  83 +++++
 .../itemRow/rareSats.tsx                      | 115 ++++---
 .../itemRow/runeAmount.tsx                    |  11 +-
 .../confirmBtcTransaction/receiveSection.tsx  | 203 -----------
 .../sections/feeSection.tsx                   | 115 +++++++
 .../inscribeSection}/ContentLabel/common.ts   |   0
 .../inscribeSection}/ContentLabel/index.tsx   |   0
 .../inscribeSection}/ContentLabel/preview.tsx |   0
 .../inscribeSection}/ContentLabel/utils.ts    |   0
 .../{ => sections}/inscribeSection/index.tsx  |   4 +-
 .../{ => sections}/inscribeSection/styles.tsx |   0
 .../sections/receiveSection.tsx               | 136 ++++++++
 .../runesSection}/burnSection.tsx             |  16 +-
 .../runesSection}/delegateSection.tsx         |  84 ++---
 .../runesSection}/etchSection.tsx             |   6 +-
 .../runesSection}/mintSection.tsx             |  24 +-
 .../runesSection/styles.tsx}                  |   0
 .../sections/sendSection.tsx                  | 127 +++++++
 .../sections/transferSection.tsx              | 157 +++++++++
 .../confirmBtcTransaction/sendSection.tsx     | 102 ------
 .../transactionSummary.tsx                    | 153 +++------
 .../confirmBtcTransaction/transferSection.tsx | 136 --------
 .../txInOutput/{txInOutput.tsx => index.tsx}  |  11 +-
 .../txInOutput/transactionOutput.tsx          |   8 +-
 .../components/confirmBtcTransaction/utils.ts | 316 ------------------
 src/app/components/transferFeeView/index.tsx  |  12 +-
 src/app/screens/btcSendRequest/index.tsx      |  21 +-
 src/app/screens/createInscription/index.tsx   |   2 +-
 src/app/screens/etchRune/index.tsx            |  13 +-
 .../screens/listRune/listMarketplaceItem.tsx  |   8 +-
 src/app/screens/mintRune/index.tsx            |  37 +-
 src/app/screens/rareSatsBundle/runeAmount.tsx |   8 +-
 src/app/screens/sendBtc/index.tsx             |  18 -
 src/app/screens/sendBtc/stepDisplay.tsx       |   4 -
 .../screens/sendInscriptionsRequest/index.tsx |   2 -
 .../useSendInscriptions.ts                    |  14 -
 src/app/screens/sendOrdinal/index.tsx         |  24 +-
 src/app/screens/sendOrdinal/stepDisplay.tsx   |   3 -
 src/app/screens/sendRune/index.tsx            |  14 -
 src/app/screens/sendRune/stepDisplay.tsx      |   5 +-
 .../restoreFunds/recoverRunes/index.tsx       |   6 +-
 .../screens/signBatchPsbtRequest/index.tsx    | 313 +++++++----------
 src/app/screens/signPsbtRequest/index.tsx     |  25 +-
 .../psbtConfirmation/psbtConfirmation.tsx     |   9 -
 .../marketplaceRuneListingResults.tsx         |   8 +-
 .../screens/transferRunesRequest/index.tsx    |   2 -
 .../useTransferRunesRequest.ts                |  14 +-
 src/app/utils/mappers.ts                      |  14 +
 src/locales/en.json                           |   7 +-
 60 files changed, 1472 insertions(+), 2018 deletions(-)
 create mode 100644 src/app/components/confirmBtcTransaction/hooks/useExtractTxSummary.ts
 delete mode 100644 src/app/components/confirmBtcTransaction/hooks/useParsedTxSummaryContext.ts
 create mode 100644 src/app/components/confirmBtcTransaction/hooks/useTxSummaryContext.ts
 create mode 100644 src/app/components/confirmBtcTransaction/indexBatch.tsx
 delete mode 100644 src/app/components/confirmBtcTransaction/itemRow/bundleItem.tsx
 create mode 100644 src/app/components/confirmBtcTransaction/itemRow/rareSatRow.tsx
 delete mode 100644 src/app/components/confirmBtcTransaction/receiveSection.tsx
 create mode 100644 src/app/components/confirmBtcTransaction/sections/feeSection.tsx
 rename src/app/components/confirmBtcTransaction/{ => sections/inscribeSection}/ContentLabel/common.ts (100%)
 rename src/app/components/confirmBtcTransaction/{ => sections/inscribeSection}/ContentLabel/index.tsx (100%)
 rename src/app/components/confirmBtcTransaction/{ => sections/inscribeSection}/ContentLabel/preview.tsx (100%)
 rename src/app/components/confirmBtcTransaction/{ => sections/inscribeSection}/ContentLabel/utils.ts (100%)
 rename src/app/components/confirmBtcTransaction/{ => sections}/inscribeSection/index.tsx (94%)
 rename src/app/components/confirmBtcTransaction/{ => sections}/inscribeSection/styles.tsx (100%)
 create mode 100644 src/app/components/confirmBtcTransaction/sections/receiveSection.tsx
 rename src/app/components/confirmBtcTransaction/{ => sections/runesSection}/burnSection.tsx (79%)
 rename src/app/components/confirmBtcTransaction/{ => sections/runesSection}/delegateSection.tsx (54%)
 rename src/app/components/confirmBtcTransaction/{ => sections/runesSection}/etchSection.tsx (98%)
 rename src/app/components/confirmBtcTransaction/{ => sections/runesSection}/mintSection.tsx (84%)
 rename src/app/components/confirmBtcTransaction/{runes.tsx => sections/runesSection/styles.tsx} (100%)
 create mode 100644 src/app/components/confirmBtcTransaction/sections/sendSection.tsx
 create mode 100644 src/app/components/confirmBtcTransaction/sections/transferSection.tsx
 delete mode 100644 src/app/components/confirmBtcTransaction/sendSection.tsx
 delete mode 100644 src/app/components/confirmBtcTransaction/transferSection.tsx
 rename src/app/components/confirmBtcTransaction/txInOutput/{txInOutput.tsx => index.tsx} (87%)
 delete mode 100644 src/app/components/confirmBtcTransaction/utils.ts
 create mode 100644 src/app/utils/mappers.ts

diff --git a/package-lock.json b/package-lock.json
index 531688fdf..f1b96036d 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -15,7 +15,7 @@
         "@react-spring/web": "^9.6.1",
         "@sats-connect/core": "0.3.0-7e6dd81",
         "@scure/btc-signer": "1.2.1",
-        "@secretkeylabs/xverse-core": "20.0.1",
+        "@secretkeylabs/xverse-core": "21.0.0",
         "@stacks/connect": "7.4.1",
         "@stacks/stacks-blockchain-api-types": "6.1.1",
         "@stacks/transactions": "6.16.1",
@@ -25,7 +25,7 @@
         "@tanstack/react-query-persist-client": "^4.29.3",
         "argon2-browser": "^1.18.0",
         "async-mutex": "^0.5.0",
-        "axios": "1.7.0",
+        "axios": "^1.7.7",
         "bignumber.js": "^9.1.0",
         "bip39": "^3.0.3",
         "classnames": "^2.3.2",
@@ -37,7 +37,6 @@
         "jsontokens": "^4.0.1",
         "mixpanel-browser": "^2.47.0",
         "nanoid": "^4.0.0",
-        "object-hash": "^3.0.0",
         "p-queue": "^7.3.4",
         "path": "^0.12.7",
         "qr-code-styling": "^1.5.0",
@@ -1273,9 +1272,9 @@
       }
     },
     "node_modules/@secretkeylabs/xverse-core": {
-      "version": "20.0.1",
-      "resolved": "https://npm.pkg.github.com/download/@secretkeylabs/xverse-core/20.0.1/79399cdc59d54f7354eadf349cf12cfbe834b552",
-      "integrity": "sha512-p7yLBBKqOUO6aLgnLAz5/x68+BQeWq96ZuHF2drNkEwXWcj2SHQYqaEaQgmsbR4/02CQ6+rIxtC/Zf6JZGS/qw==",
+      "version": "21.0.0",
+      "resolved": "https://npm.pkg.github.com/download/@secretkeylabs/xverse-core/21.0.0/4c13617c2d2ce6b1d5898a812ef004bc32f5feba",
+      "integrity": "sha512-avlA06EgbvPtttdrLtwb+WEOG1fplY1+FWk2TU9ppQ367ufehCLHmd4az0ggjUsMOykuHyJCGQl9DiG2jHi3zQ==",
       "license": "ISC",
       "dependencies": {
         "@bitcoinerlab/secp256k1": "^1.0.2",
@@ -1391,6 +1390,16 @@
         "tslib": "^2.4.0"
       }
     },
+    "node_modules/@secretkeylabs/xverse-core/node_modules/axios": {
+      "version": "1.7.0",
+      "resolved": "https://registry.npmjs.org/axios/-/axios-1.7.0.tgz",
+      "integrity": "sha512-IiB0wQeKyPRdsFVhBgIo31FbzOyf2M6wYl7/NVutFwFBRMiAbjNiydJIHKeLmPugF4kJLfA1uWZ82Is2QzqqFA==",
+      "dependencies": {
+        "follow-redirects": "^1.15.6",
+        "form-data": "^4.0.0",
+        "proxy-from-env": "^1.1.0"
+      }
+    },
     "node_modules/@secretkeylabs/xverse-core/node_modules/bip39": {
       "version": "3.0.3",
       "resolved": "https://registry.npmjs.org/bip39/-/bip39-3.0.3.tgz",
@@ -3197,9 +3206,9 @@
       }
     },
     "node_modules/axios": {
-      "version": "1.7.0",
-      "resolved": "https://registry.npmjs.org/axios/-/axios-1.7.0.tgz",
-      "integrity": "sha512-IiB0wQeKyPRdsFVhBgIo31FbzOyf2M6wYl7/NVutFwFBRMiAbjNiydJIHKeLmPugF4kJLfA1uWZ82Is2QzqqFA==",
+      "version": "1.7.7",
+      "resolved": "https://registry.npmjs.org/axios/-/axios-1.7.7.tgz",
+      "integrity": "sha512-S4kL7XrjgBmvdGut0sN3yJxqYzrDOnivkBiN0OFs6hLiUam3UPvswUo0kqGyhqUZGEOytHyumEdXsAkgCOUf3Q==",
       "dependencies": {
         "follow-redirects": "^1.15.6",
         "form-data": "^4.0.0",
@@ -9050,14 +9059,6 @@
         "node": ">=0.10.0"
       }
     },
-    "node_modules/object-hash": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/object-hash/-/object-hash-3.0.0.tgz",
-      "integrity": "sha512-RSn9F68PjH9HqtltsSnqYC1XXoWe9Bju5+213R98cNGttag9q9yAOTzdbsqvIa7aNm5WffBZFpWYr2aWrklWAw==",
-      "engines": {
-        "node": ">= 6"
-      }
-    },
     "node_modules/object-inspect": {
       "version": "1.12.3",
       "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.12.3.tgz",
@@ -13636,9 +13637,9 @@
       }
     },
     "@secretkeylabs/xverse-core": {
-      "version": "20.0.1",
-      "resolved": "https://npm.pkg.github.com/download/@secretkeylabs/xverse-core/20.0.1/79399cdc59d54f7354eadf349cf12cfbe834b552",
-      "integrity": "sha512-p7yLBBKqOUO6aLgnLAz5/x68+BQeWq96ZuHF2drNkEwXWcj2SHQYqaEaQgmsbR4/02CQ6+rIxtC/Zf6JZGS/qw==",
+      "version": "21.0.0",
+      "resolved": "https://npm.pkg.github.com/download/@secretkeylabs/xverse-core/21.0.0/4c13617c2d2ce6b1d5898a812ef004bc32f5feba",
+      "integrity": "sha512-avlA06EgbvPtttdrLtwb+WEOG1fplY1+FWk2TU9ppQ367ufehCLHmd4az0ggjUsMOykuHyJCGQl9DiG2jHi3zQ==",
       "requires": {
         "@bitcoinerlab/secp256k1": "^1.0.2",
         "@noble/curves": "^1.2.0",
@@ -13735,6 +13736,16 @@
             "tslib": "^2.4.0"
           }
         },
+        "axios": {
+          "version": "1.7.0",
+          "resolved": "https://registry.npmjs.org/axios/-/axios-1.7.0.tgz",
+          "integrity": "sha512-IiB0wQeKyPRdsFVhBgIo31FbzOyf2M6wYl7/NVutFwFBRMiAbjNiydJIHKeLmPugF4kJLfA1uWZ82Is2QzqqFA==",
+          "requires": {
+            "follow-redirects": "^1.15.6",
+            "form-data": "^4.0.0",
+            "proxy-from-env": "^1.1.0"
+          }
+        },
         "bip39": {
           "version": "3.0.3",
           "resolved": "https://registry.npmjs.org/bip39/-/bip39-3.0.3.tgz",
@@ -15211,9 +15222,9 @@
       "dev": true
     },
     "axios": {
-      "version": "1.7.0",
-      "resolved": "https://registry.npmjs.org/axios/-/axios-1.7.0.tgz",
-      "integrity": "sha512-IiB0wQeKyPRdsFVhBgIo31FbzOyf2M6wYl7/NVutFwFBRMiAbjNiydJIHKeLmPugF4kJLfA1uWZ82Is2QzqqFA==",
+      "version": "1.7.7",
+      "resolved": "https://registry.npmjs.org/axios/-/axios-1.7.7.tgz",
+      "integrity": "sha512-S4kL7XrjgBmvdGut0sN3yJxqYzrDOnivkBiN0OFs6hLiUam3UPvswUo0kqGyhqUZGEOytHyumEdXsAkgCOUf3Q==",
       "requires": {
         "follow-redirects": "^1.15.6",
         "form-data": "^4.0.0",
@@ -19588,11 +19599,6 @@
       "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
       "integrity": "sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg=="
     },
-    "object-hash": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/object-hash/-/object-hash-3.0.0.tgz",
-      "integrity": "sha512-RSn9F68PjH9HqtltsSnqYC1XXoWe9Bju5+213R98cNGttag9q9yAOTzdbsqvIa7aNm5WffBZFpWYr2aWrklWAw=="
-    },
     "object-inspect": {
       "version": "1.12.3",
       "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.12.3.tgz",
diff --git a/package.json b/package.json
index 85cb2a64e..9ef5382dc 100644
--- a/package.json
+++ b/package.json
@@ -43,7 +43,7 @@
     "@react-spring/web": "^9.6.1",
     "@sats-connect/core": "0.3.0-7e6dd81",
     "@scure/btc-signer": "1.2.1",
-    "@secretkeylabs/xverse-core": "20.0.1",
+    "@secretkeylabs/xverse-core": "21.0.0",
     "@stacks/connect": "7.4.1",
     "@stacks/stacks-blockchain-api-types": "6.1.1",
     "@stacks/transactions": "6.16.1",
@@ -53,7 +53,7 @@
     "@tanstack/react-query-persist-client": "^4.29.3",
     "argon2-browser": "^1.18.0",
     "async-mutex": "^0.5.0",
-    "axios": "1.7.0",
+    "axios": "^1.7.7",
     "bignumber.js": "^9.1.0",
     "bip39": "^3.0.3",
     "classnames": "^2.3.2",
@@ -65,7 +65,6 @@
     "jsontokens": "^4.0.1",
     "mixpanel-browser": "^2.47.0",
     "nanoid": "^4.0.0",
-    "object-hash": "^3.0.0",
     "p-queue": "^7.3.4",
     "path": "^0.12.7",
     "qr-code-styling": "^1.5.0",
diff --git a/src/app/components/confirmBtcTransaction/hooks/useExtractTxSummary.ts b/src/app/components/confirmBtcTransaction/hooks/useExtractTxSummary.ts
new file mode 100644
index 000000000..325d83128
--- /dev/null
+++ b/src/app/components/confirmBtcTransaction/hooks/useExtractTxSummary.ts
@@ -0,0 +1,34 @@
+import useTransactionContext from '@hooks/useTransactionContext';
+import type { TransactionSummary } from '@screens/sendBtc/helpers';
+import {
+  btcTransaction,
+  extractViewSummary,
+  type AggregatedSummary,
+  type NetworkType,
+  type UserTransactionSummary,
+} from '@secretkeylabs/xverse-core';
+import { useEffect, useState } from 'react';
+
+export default function useExtractTxSummary(
+  network: NetworkType,
+  summary?: TransactionSummary | btcTransaction.PsbtSummary,
+) {
+  const [data, setData] = useState<UserTransactionSummary | AggregatedSummary | undefined>(
+    undefined,
+  );
+  const [isLoading, setIsLoading] = useState<boolean>(false);
+
+  const context = useTransactionContext();
+  useEffect(() => {
+    if (!summary) return;
+
+    setIsLoading(true);
+    extractViewSummary(context, summary, network)
+      .then((extractedSummary) => {
+        setData(extractedSummary);
+      })
+      .finally(() => setIsLoading(false));
+  }, [context, network, summary]);
+
+  return { data, isLoading };
+}
diff --git a/src/app/components/confirmBtcTransaction/hooks/useParsedTxSummaryContext.ts b/src/app/components/confirmBtcTransaction/hooks/useParsedTxSummaryContext.ts
deleted file mode 100644
index e0bbf70cc..000000000
--- a/src/app/components/confirmBtcTransaction/hooks/useParsedTxSummaryContext.ts
+++ /dev/null
@@ -1,278 +0,0 @@
-import {
-  getInputsWithAssetsFromUserAddress,
-  getNetAmount,
-  getOutputsWithAssetsFromUserAddress,
-  getOutputsWithAssetsToUserAddress,
-  isScriptOutput,
-} from '@components/confirmBtcTransaction/utils';
-import useSelectedAccount from '@hooks/useSelectedAccount';
-import useWalletSelector from '@hooks/useWalletSelector';
-import type { TransactionSummary } from '@screens/sendBtc/helpers';
-import {
-  type Brc20Definition,
-  type btcTransaction,
-  type RuneSummary,
-  type RuneSummaryActions,
-} from '@secretkeylabs/xverse-core';
-import { createContext, useContext } from 'react';
-import type { Color } from 'theme';
-
-export type ParsedTxSummaryContextProps = {
-  summary?: TransactionSummary | btcTransaction.PsbtSummary;
-  runeSummary?: RuneSummary | RuneSummaryActions;
-  brc20Summary?: Brc20Definition & { status: string; statusColor: Color };
-};
-
-export const ParsedTxSummaryContext = createContext<ParsedTxSummaryContextProps>({
-  summary: undefined,
-  runeSummary: undefined,
-  brc20Summary: undefined,
-});
-
-type BundledOutputs = Record<
-  string,
-  {
-    outputs: (btcTransaction.TransactionOutput | btcTransaction.TransactionPubKeyOutput)[];
-    netBtcAmount: number;
-    runeTransfers: RuneSummary['transfers'];
-  }
->;
-
-export const useParsedTxSummaryContext = (): {
-  summary:
-    | (TransactionSummary & { dustFiltered?: boolean })
-    | btcTransaction.PsbtSummary
-    | undefined;
-  runeSummary: RuneSummary | RuneSummaryActions | undefined;
-  brc20Summary: (Brc20Definition & { status: string; statusColor: Color }) | undefined;
-  hasExternalInputs: boolean;
-  isUnconfirmedInput: boolean;
-  showCenotaphCallout: boolean;
-  netBtcAmount: number;
-  hasInsufficientRunes: boolean;
-  hasSigHashSingle: boolean;
-  transactionIsFinal: boolean;
-  hasOutputScript: boolean;
-  hasSigHashNone: boolean;
-  validMintingRune: undefined | boolean;
-  showSendSection: boolean;
-  showTransferSection: boolean;
-  showReceiveSection: boolean;
-  sendSection: {
-    bundledOutputs: BundledOutputs;
-    inscriptionsFromPayment: btcTransaction.IOInscription[];
-    satributesFromPayment: btcTransaction.IOSatribute[];
-  };
-  transferSection: {
-    showBtcAmount: boolean;
-    showRuneTransfers: boolean;
-    outputsFromOrdinal: (
-      | btcTransaction.TransactionOutput
-      | btcTransaction.TransactionPubKeyOutput
-    )[];
-    inputsFromOrdinal: btcTransaction.EnhancedInput[];
-    inscriptionsFromPayment: btcTransaction.IOInscription[];
-    satributesFromPayment: btcTransaction.IOSatribute[];
-  };
-  receiveSection: {
-    showBtcAmount: boolean;
-    showOrdinalSection: boolean;
-    showPaymentSection: boolean;
-    outputsToOrdinal: btcTransaction.TransactionOutput[];
-    showPaymentRunes: boolean;
-    ordinalRuneReceipts: RuneSummary['receipts'];
-    inscriptionsRareSatsInPayment: btcTransaction.TransactionOutput[];
-    outputsToPayment: btcTransaction.TransactionOutput[];
-    showOrdinalRunes: boolean;
-    paymentRuneReceipts: RuneSummary['receipts'];
-  };
-} => {
-  const { summary, runeSummary, brc20Summary } = useContext(ParsedTxSummaryContext);
-  const { btcAddress, ordinalsAddress } = useSelectedAccount();
-  const { hasActivatedRareSatsKey } = useWalletSelector();
-  const showCenotaphCallout = !!summary?.runeOp?.Cenotaph?.flaws;
-  const hasInsufficientRunes =
-    runeSummary?.transfers?.some((transfer) => !transfer.hasSufficientBalance) ?? false;
-  const validMintingRune =
-    !runeSummary?.mint ||
-    (runeSummary?.mint && runeSummary.mint.runeIsOpen && runeSummary.mint.runeIsMintable);
-  const hasOutputScript = summary?.outputs.some((output) => isScriptOutput(output)) ?? false;
-  const hasExternalInputs =
-    summary?.inputs.some(
-      (input) =>
-        input.extendedUtxo.address !== btcAddress && input.extendedUtxo.address !== ordinalsAddress,
-    ) ?? false;
-  const isUnconfirmedInput =
-    summary?.inputs.some(
-      (input) => !input.extendedUtxo.utxo.status.confirmed && input.walletWillSign,
-    ) ?? false;
-
-  // defaults for non-psbt transactions
-  const transactionIsFinal = (summary as btcTransaction.PsbtSummary)?.isFinal ?? true;
-  const hasSigHashNone = (summary as btcTransaction.PsbtSummary)?.hasSigHashNone ?? false;
-  const hasSigHashSingle = (summary as btcTransaction.PsbtSummary)?.hasSigHashSingle ?? false;
-
-  const netBtcAmount = getNetAmount({
-    inputs: summary?.inputs,
-    outputs: summary?.outputs,
-    btcAddress,
-    ordinalsAddress,
-  });
-
-  /* Send/Transfer Section */
-
-  const { inputsFromPayment, inputsFromOrdinal } = getInputsWithAssetsFromUserAddress({
-    inputs: summary?.inputs,
-    btcAddress,
-    ordinalsAddress,
-  });
-
-  const { outputsFromPayment, outputsFromOrdinal } = getOutputsWithAssetsFromUserAddress({
-    outputs: summary?.outputs,
-    btcAddress,
-    ordinalsAddress,
-  });
-
-  const showSendBtc = netBtcAmount < 0;
-  // if transaction is not final, then runes will be delegated and will show up in the delegation section
-  const showRuneTransfers = transactionIsFinal && (runeSummary?.transfers ?? []).length > 0;
-  const hasInscriptionsRareSatsInOrdinal =
-    (!transactionIsFinal && inputsFromOrdinal.length > 0) || outputsFromOrdinal.length > 0;
-
-  const showSendOrTransfer = showSendBtc || showRuneTransfers || hasInscriptionsRareSatsInOrdinal;
-  const showSendSection = showSendOrTransfer && transactionIsFinal && !hasExternalInputs;
-  const showTransferSection = showSendOrTransfer && (!transactionIsFinal || hasExternalInputs);
-
-  const bundledOutputs: BundledOutputs = {};
-  if (showSendSection) {
-    summary?.outputs.forEach((output) => {
-      if (output.type === 'script') return;
-      let destinationKey: string;
-      if (output.type === 'address') {
-        if ([ordinalsAddress, btcAddress].includes(output.address)) return; // ignore outputs to own address
-        destinationKey = output.address;
-      } else {
-        // TODO - we can have different destinations of the same type
-        destinationKey = output.type;
-      }
-      bundledOutputs[destinationKey] ||= {
-        outputs: [],
-        netBtcAmount: 0,
-        runeTransfers: [],
-      };
-      if (output.inscriptions.length || (output.satributes.length && hasActivatedRareSatsKey)) {
-        bundledOutputs[destinationKey].outputs =
-          bundledOutputs[destinationKey].outputs.concat(output);
-      } else {
-        bundledOutputs[destinationKey].netBtcAmount += output.amount;
-      }
-    });
-    runeSummary?.transfers.forEach((runeTransfer) => {
-      const outputAddress = runeTransfer.destinationAddresses[0];
-      if (bundledOutputs[outputAddress]) {
-        bundledOutputs[outputAddress].runeTransfers =
-          bundledOutputs[outputAddress].runeTransfers.concat(runeTransfer);
-      }
-    });
-  }
-  // TODO move to utils
-  const inscriptionsFromPayment: btcTransaction.IOInscription[] = [];
-  const satributesFromPayment: btcTransaction.IOSatribute[] = [];
-  (transactionIsFinal ? outputsFromPayment : inputsFromPayment).forEach(
-    (
-      item:
-        | btcTransaction.EnhancedInput
-        | btcTransaction.TransactionOutput
-        | btcTransaction.TransactionPubKeyOutput,
-    ) => {
-      inscriptionsFromPayment.push(...item.inscriptions);
-      satributesFromPayment.push(...item.satributes);
-    },
-  );
-
-  /* Receive section */
-
-  const { outputsToPayment, outputsToOrdinal } = getOutputsWithAssetsToUserAddress({
-    outputs: summary?.outputs,
-    btcAddress,
-    ordinalsAddress,
-  });
-
-  // if receiving runes from own addresses, hide it because it is change, unless it swap addresses (recover runes)
-  const filteredRuneReceipts: RuneSummary['receipts'] =
-    runeSummary?.receipts?.filter(
-      (receipt) =>
-        !receipt.sourceAddresses.some(
-          (address) =>
-            (address === ordinalsAddress && receipt.destinationAddress === ordinalsAddress) ||
-            (address === btcAddress && receipt.destinationAddress === btcAddress),
-        ),
-    ) ?? [];
-  const ordinalRuneReceipts = filteredRuneReceipts.filter(
-    (receipt) => receipt.destinationAddress === ordinalsAddress,
-  );
-  const paymentRuneReceipts = filteredRuneReceipts.filter(
-    (receipt) => receipt.destinationAddress === btcAddress,
-  );
-
-  const inscriptionsRareSatsInPayment = outputsToPayment.filter(
-    (output) =>
-      output.inscriptions.length > 0 || (hasActivatedRareSatsKey && output.satributes.length > 0),
-  );
-
-  // if transaction is not final, then runes will be delegated and will show up in the delegation section
-  const showOrdinalRunes = !!(transactionIsFinal && ordinalRuneReceipts.length);
-
-  // if transaction is not final, then runes will be delegated and will show up in the delegation section
-  const showPaymentRunes = !!(transactionIsFinal && paymentRuneReceipts.length);
-
-  const showReceiveBtc = netBtcAmount > 0;
-  const showOrdinalSection = showOrdinalRunes || outputsToOrdinal.length > 0;
-  const showPaymentSection =
-    showReceiveBtc || showPaymentRunes || inscriptionsRareSatsInPayment.length > 0;
-  const showReceiveSection = showOrdinalSection || showPaymentSection;
-
-  return {
-    summary,
-    runeSummary,
-    brc20Summary,
-    hasExternalInputs,
-    hasInsufficientRunes,
-    hasOutputScript,
-    hasSigHashNone,
-    hasSigHashSingle,
-    isUnconfirmedInput,
-    netBtcAmount,
-    showCenotaphCallout,
-    transactionIsFinal,
-    validMintingRune,
-    showSendSection,
-    showTransferSection,
-    showReceiveSection,
-    sendSection: {
-      bundledOutputs,
-      inscriptionsFromPayment,
-      satributesFromPayment,
-    },
-    transferSection: {
-      showBtcAmount: showSendBtc,
-      showRuneTransfers,
-      inputsFromOrdinal,
-      outputsFromOrdinal,
-      inscriptionsFromPayment,
-      satributesFromPayment,
-    },
-    receiveSection: {
-      showOrdinalSection,
-      showPaymentSection,
-      showBtcAmount: showReceiveBtc,
-      inscriptionsRareSatsInPayment,
-      ordinalRuneReceipts,
-      outputsToOrdinal,
-      outputsToPayment,
-      paymentRuneReceipts,
-      showOrdinalRunes,
-      showPaymentRunes,
-    },
-  };
-};
diff --git a/src/app/components/confirmBtcTransaction/hooks/useTxSummaryContext.ts b/src/app/components/confirmBtcTransaction/hooks/useTxSummaryContext.ts
new file mode 100644
index 000000000..734f98064
--- /dev/null
+++ b/src/app/components/confirmBtcTransaction/hooks/useTxSummaryContext.ts
@@ -0,0 +1,55 @@
+import {
+  type AggregatedSummary,
+  type Brc20Definition,
+  type EtchActionDetails,
+  type MintActionDetails,
+  type RuneMint,
+  type UserTransactionSummary,
+} from '@secretkeylabs/xverse-core';
+import { createContext, useContext } from 'react';
+import type { Color } from '../../../../theme';
+
+export type TxSummaryContextProps = {
+  extractedTxSummary?: UserTransactionSummary | AggregatedSummary;
+  runeMintDetails?: MintActionDetails;
+  runeEtchDetails?: EtchActionDetails;
+  brc20Summary?: Brc20Definition & { status: string; statusColor: Color };
+  batchMintDetails?: (RuneMint | undefined)[];
+};
+
+export const TxSummaryContext = createContext<TxSummaryContextProps>({
+  extractedTxSummary: undefined,
+  runeMintDetails: undefined,
+  runeEtchDetails: undefined,
+  brc20Summary: undefined,
+  batchMintDetails: undefined,
+});
+
+/**
+ * This is a hook for internal components to get the extracted transaction summary.
+ * The internal components would only be rendered if the extractedTxSummary is defined.
+ * This allows internal components to not have to check for undefined values.
+ */
+export const useTxSummaryContext = (): {
+  extractedTxSummary: UserTransactionSummary | AggregatedSummary;
+  runeMintDetails?: MintActionDetails;
+  runeEtchDetails?: EtchActionDetails;
+  brc20Summary?: Brc20Definition & { status: string; statusColor: Color };
+  batchMintDetails?: (RuneMint | undefined)[];
+} => {
+  const { extractedTxSummary, runeMintDetails, runeEtchDetails, brc20Summary, batchMintDetails } =
+    useContext(TxSummaryContext);
+
+  if (!extractedTxSummary) {
+    // This should never happen in production
+    throw new Error('extractedTxSummary is not defined for internal component');
+  }
+
+  return {
+    extractedTxSummary,
+    runeMintDetails,
+    runeEtchDetails,
+    brc20Summary,
+    batchMintDetails,
+  };
+};
diff --git a/src/app/components/confirmBtcTransaction/index.tsx b/src/app/components/confirmBtcTransaction/index.tsx
index 14c88c573..b2f612dc4 100644
--- a/src/app/components/confirmBtcTransaction/index.tsx
+++ b/src/app/components/confirmBtcTransaction/index.tsx
@@ -1,14 +1,15 @@
 import { delay } from '@common/utils/ledger';
-import {
-  ParsedTxSummaryContext,
-  type ParsedTxSummaryContextProps,
-  useParsedTxSummaryContext,
-} from '@components/confirmBtcTransaction/hooks/useParsedTxSummaryContext';
-import TransactionSummary from '@components/confirmBtcTransaction/transactionSummary';
 import type { Tab } from '@components/tabBar';
 import useSelectedAccount from '@hooks/useSelectedAccount';
+import useWalletSelector from '@hooks/useWalletSelector';
 import TransportFactory from '@ledgerhq/hw-transport-webusb';
-import type { Transport } from '@secretkeylabs/xverse-core';
+import {
+  type Brc20Definition,
+  type btcTransaction,
+  type EtchActionDetails,
+  type MintActionDetails,
+  type Transport,
+} from '@secretkeylabs/xverse-core';
 import Button from '@ui-library/button';
 import Callout, { type CalloutProps } from '@ui-library/callout';
 import { StickyHorizontalSplitButtonContainer, StyledP } from '@ui-library/common.styled';
@@ -18,8 +19,12 @@ import { isLedgerAccount } from '@utils/helper';
 import { useMemo, useState } from 'react';
 import { useTranslation } from 'react-i18next';
 import styled from 'styled-components';
+import type { Color } from '../../../theme';
 import SendLayout from '../../layouts/sendLayout';
+import useExtractTxSummary from './hooks/useExtractTxSummary';
+import { TxSummaryContext } from './hooks/useTxSummaryContext';
 import LedgerStepView, { Steps } from './ledgerStepView';
+import TransactionSummary from './transactionSummary';
 
 const LoaderContainer = styled.div(() => ({
   display: 'flex',
@@ -49,9 +54,10 @@ const SuccessActionsContainer = styled.div((props) => ({
 }));
 
 type Props = {
-  summary?: ParsedTxSummaryContextProps['summary'];
-  runeSummary?: ParsedTxSummaryContextProps['runeSummary'];
-  brc20Summary?: ParsedTxSummaryContextProps['brc20Summary'];
+  summary?: btcTransaction.TransactionSummary | btcTransaction.PsbtSummary;
+  runeMintDetails?: MintActionDetails;
+  runeEtchDetails?: EtchActionDetails;
+  brc20Summary?: Brc20Definition & { status: string; statusColor: Color };
   isLoading: boolean;
   isSubmitting: boolean;
   isBroadcast?: boolean;
@@ -77,7 +83,9 @@ type Props = {
 
 function ConfirmBtcTransaction({
   summary,
-  runeSummary,
+  runeMintDetails,
+  runeEtchDetails,
+  brc20Summary,
   isLoading,
   isSubmitting,
   isBroadcast,
@@ -95,28 +103,31 @@ function ConfirmBtcTransaction({
   feeRate,
   title,
   selectedBottomTab,
-  brc20Summary,
   customCallout,
 }: Props) {
+  const { network } = useWalletSelector();
+  const selectedAccount = useSelectedAccount();
+
+  const { data: extractedTxSummary, isLoading: extractTxSummaryLoading } = useExtractTxSummary(
+    network.type,
+    summary,
+  );
   const parsedTxSummaryContextValue = useMemo(
-    () => ({ summary, runeSummary, brc20Summary }),
-    [summary, runeSummary, brc20Summary],
+    () => ({ extractedTxSummary, runeMintDetails, runeEtchDetails, brc20Summary }),
+    [extractedTxSummary, runeMintDetails, runeEtchDetails, brc20Summary],
   );
+
   const [isModalVisible, setIsModalVisible] = useState(false);
   const [currentStep, setCurrentStep] = useState(Steps.ConnectLedger);
   const [isButtonDisabled, setIsButtonDisabled] = useState(false);
   const [isConnectSuccess, setIsConnectSuccess] = useState(false);
   const [isConnectFailed, setIsConnectFailed] = useState(false);
   const [isTxRejected, setIsTxRejected] = useState(false);
-  const { hasInsufficientRunes, hasSigHashNone, validMintingRune } = useParsedTxSummaryContext();
 
   const { t } = useTranslation('translation', { keyPrefix: 'CONFIRM_TRANSACTION' });
   const { t: signatureRequestTranslate } = useTranslation('translation', {
     keyPrefix: 'SIGNATURE_REQUEST',
   });
-  const selectedAccount = useSelectedAccount();
-
-  const hideBackButton = !onBackClick;
 
   const onConfirmPress = async () => {
     if (!isLedgerAccount(selectedAccount)) {
@@ -174,85 +185,95 @@ function ConfirmBtcTransaction({
     setCurrentStep(Steps.ConnectLedger);
   };
 
-  return isLoading ? (
-    <LoaderContainer>
-      <Spinner size={50} />
-    </LoaderContainer>
-  ) : (
-    <ParsedTxSummaryContext.Provider value={parsedTxSummaryContextValue}>
-      {/* TODO start a new layout. SendLayout was not intended for the review screens */}
-      <SendLayout
-        selectedBottomTab={selectedBottomTab ?? 'dashboard'}
-        onClickBack={onBackClick}
-        hideBackButton={hideBackButton}
-        showAccountHeader={showAccountHeader}
-        hideBottomBar={hideBottomBar}
-      >
-        <ReviewTransactionText typography="headline_s">
-          {title || t('REVIEW_TRANSACTION')}
-        </ReviewTransactionText>
-        {/* TODO: add sighash single warning */}
-        {hasSigHashNone && (
-          <SpacedCallout
-            variant="danger"
-            titleText={t('PSBT_SIG_HASH_NONE_DISCLAIMER_TITLE')}
-            bodyText={t('PSBT_SIG_HASH_NONE_DISCLAIMER')}
-          />
-        )}
-        {!isBroadcast && <SpacedCallout bodyText={t('PSBT_NO_BROADCAST_DISCLAIMER')} />}
-        {customCallout && <Callout {...customCallout} />}
-        <TransactionSummary
-          getFeeForFeeRate={getFeeForFeeRate}
-          onFeeRateSet={onFeeRateSet}
-          feeRate={feeRate}
-          isSubmitting={isSubmitting}
-        />
-        {!isLoading && (
-          <StickyHorizontalSplitButtonContainer>
-            <Button onClick={onCancel} title={cancelText} variant="secondary" />
-            <Button
-              onClick={onConfirmPress}
-              disabled={confirmDisabled || hasInsufficientRunes || !validMintingRune}
-              loading={isSubmitting}
-              title={hasInsufficientRunes ? t('INSUFFICIENT_BALANCE') : confirmText}
-              variant={isError || hasInsufficientRunes ? 'danger' : 'primary'}
+  if (isLoading || extractTxSummaryLoading) {
+    return (
+      <LoaderContainer>
+        <Spinner size={50} />
+      </LoaderContainer>
+    );
+  }
+
+  if (extractedTxSummary) {
+    const { hasSigHashNone, runes } = extractedTxSummary;
+    const { hasInsufficientBalance, hasInvalidMint } = runes;
+    return (
+      <TxSummaryContext.Provider value={parsedTxSummaryContextValue}>
+        {/* TODO start a new layout. SendLayout was not intended for the review screens */}
+        <SendLayout
+          selectedBottomTab={selectedBottomTab ?? 'dashboard'}
+          onClickBack={onBackClick}
+          hideBackButton={!onBackClick}
+          showAccountHeader={showAccountHeader}
+          hideBottomBar={hideBottomBar}
+        >
+          <ReviewTransactionText typography="headline_s">
+            {title || t('REVIEW_TRANSACTION')}
+          </ReviewTransactionText>
+          {/* TODO: add sighash single warning */}
+          {hasSigHashNone && (
+            <SpacedCallout
+              variant="danger"
+              titleText={t('PSBT_SIG_HASH_NONE_DISCLAIMER_TITLE')}
+              bodyText={t('PSBT_SIG_HASH_NONE_DISCLAIMER')}
             />
-          </StickyHorizontalSplitButtonContainer>
-        )}
-      </SendLayout>
-      <Sheet title="" visible={isModalVisible} onClose={() => setIsModalVisible(false)}>
-        <LedgerStepView
-          currentStep={currentStep}
-          isConnectSuccess={isConnectSuccess}
-          isConnectFailed={isConnectFailed}
-          isTxRejected={isTxRejected}
-          t={t}
-          signatureRequestTranslate={signatureRequestTranslate}
-        />
-        <SuccessActionsContainer>
-          {currentStep === Steps.ExternalInputs && !isTxRejected && !isConnectFailed ? (
-            <Button onClick={goToConfirmationStep} title={t('LEDGER.CONTINUE_BUTTON')} />
-          ) : (
-            <>
-              <Button
-                onClick={isTxRejected || isConnectFailed ? handleRetry : handleConnectAndConfirm}
-                title={signatureRequestTranslate(
-                  isTxRejected || isConnectFailed ? 'LEDGER.RETRY_BUTTON' : 'LEDGER.CONNECT_BUTTON',
-                )}
-                disabled={isButtonDisabled}
-                loading={isButtonDisabled}
-              />
+          )}
+          {!isBroadcast && <SpacedCallout bodyText={t('PSBT_NO_BROADCAST_DISCLAIMER')} />}
+          {customCallout && <Callout {...customCallout} />}
+          <TransactionSummary
+            feeRate={feeRate}
+            getFeeForFeeRate={getFeeForFeeRate}
+            onFeeRateSet={onFeeRateSet}
+            isSubmitting={isSubmitting}
+          />
+          {!isLoading && (
+            <StickyHorizontalSplitButtonContainer>
+              <Button onClick={onCancel} title={cancelText} variant="secondary" />
               <Button
-                onClick={onCancel}
-                title={signatureRequestTranslate('LEDGER.CANCEL_BUTTON')}
-                variant="secondary"
+                onClick={onConfirmPress}
+                disabled={confirmDisabled || hasInsufficientBalance || hasInvalidMint}
+                loading={isSubmitting}
+                title={hasInsufficientBalance ? t('INSUFFICIENT_BALANCE') : confirmText}
+                variant={isError || hasInsufficientBalance ? 'danger' : 'primary'}
               />
-            </>
+            </StickyHorizontalSplitButtonContainer>
           )}
-        </SuccessActionsContainer>
-      </Sheet>
-    </ParsedTxSummaryContext.Provider>
-  );
+        </SendLayout>
+        <Sheet title="" visible={isModalVisible} onClose={() => setIsModalVisible(false)}>
+          <LedgerStepView
+            currentStep={currentStep}
+            isConnectSuccess={isConnectSuccess}
+            isConnectFailed={isConnectFailed}
+            isTxRejected={isTxRejected}
+            t={t}
+            signatureRequestTranslate={signatureRequestTranslate}
+          />
+          <SuccessActionsContainer>
+            {currentStep === Steps.ExternalInputs && !isTxRejected && !isConnectFailed ? (
+              <Button onClick={goToConfirmationStep} title={t('LEDGER.CONTINUE_BUTTON')} />
+            ) : (
+              <>
+                <Button
+                  onClick={isTxRejected || isConnectFailed ? handleRetry : handleConnectAndConfirm}
+                  title={signatureRequestTranslate(
+                    isTxRejected || isConnectFailed
+                      ? 'LEDGER.RETRY_BUTTON'
+                      : 'LEDGER.CONNECT_BUTTON',
+                  )}
+                  disabled={isButtonDisabled}
+                  loading={isButtonDisabled}
+                />
+                <Button
+                  onClick={onCancel}
+                  title={signatureRequestTranslate('LEDGER.CANCEL_BUTTON')}
+                  variant="secondary"
+                />
+              </>
+            )}
+          </SuccessActionsContainer>
+        </Sheet>
+      </TxSummaryContext.Provider>
+    );
+  }
 }
 
 export default ConfirmBtcTransaction;
diff --git a/src/app/components/confirmBtcTransaction/indexBatch.tsx b/src/app/components/confirmBtcTransaction/indexBatch.tsx
new file mode 100644
index 000000000..979f89e8e
--- /dev/null
+++ b/src/app/components/confirmBtcTransaction/indexBatch.tsx
@@ -0,0 +1,113 @@
+import useTransactionContext from '@hooks/useTransactionContext';
+import useWalletSelector from '@hooks/useWalletSelector';
+import {
+  compileAggregatedSummary,
+  compileUserTransactionSummary,
+  parseSummaryForRunes,
+  type AggregatedSummary,
+  type BaseSummary,
+  type btcTransaction,
+  type UserTransactionSummary,
+} from '@secretkeylabs/xverse-core';
+import Callout from '@ui-library/callout';
+import { useEffect, useState } from 'react';
+import { useTranslation } from 'react-i18next';
+import styled from 'styled-components';
+import { TxSummaryContext, type TxSummaryContextProps } from './hooks/useTxSummaryContext';
+import TransactionSummary from './transactionSummary';
+
+const SpacedCallout = styled(Callout)`
+  margin-bottom: ${(props) => props.theme.space.m};
+`;
+
+type Props = {
+  summaries: {
+    extractedSummary: UserTransactionSummary | AggregatedSummary;
+    summary: btcTransaction.PsbtSummary;
+  }[];
+  isDuplicateTxs?: boolean;
+};
+
+function ConfirmBatchBtcTransactions({ summaries, isDuplicateTxs }: Props) {
+  const txnContext = useTransactionContext();
+  const { network } = useWalletSelector();
+
+  const [aggregatedParsedTxSummaryContext, setAggregatedParsedTxSummaryContext] =
+    useState<TxSummaryContextProps>();
+
+  useEffect(() => {
+    const summariesToAggregate = isDuplicateTxs && summaries.length ? [summaries[0]] : summaries;
+    (async () => {
+      const summary: btcTransaction.PsbtSummary = {
+        inputs: summariesToAggregate.map((psbt) => psbt.summary.inputs).flat(),
+        outputs: summariesToAggregate.map((psbt) => psbt.summary.outputs).flat(),
+        feeOutput: undefined,
+        isFinal: summariesToAggregate.reduce(
+          (acc, curr) => acc && curr.extractedSummary.isFinal,
+          true,
+        ),
+        hasSigHashNone: summariesToAggregate.some((psbt) => psbt.extractedSummary.hasSigHashNone),
+        hasSigHashSingle: summariesToAggregate.some(
+          (psbt) => psbt.extractedSummary.hasSigHashSingle,
+        ),
+      };
+      const runeSummary = await parseSummaryForRunes(txnContext, summary, network.type);
+      const base: BaseSummary = {
+        runes: {
+          mint: undefined,
+          burns: summariesToAggregate.map((psbt) => psbt.extractedSummary.runes.burns).flat(),
+          hasCenotaph: summariesToAggregate.some((psbt) => psbt.extractedSummary.runes.hasCenotaph),
+          hasInvalidMint: summariesToAggregate.some(
+            (psbt) => psbt.extractedSummary.runes.hasInvalidMint,
+          ),
+          hasInsufficientBalance: summariesToAggregate.some(
+            (psbt) => psbt.extractedSummary.runes.hasInsufficientBalance,
+          ),
+        },
+        inputs: summary.inputs,
+        outputs: summary.outputs,
+        feeRate: summary.feeRate,
+        isFinal: summary.isFinal,
+        hasSigHashNone: summary.hasSigHashNone,
+        hasSigHashSingle: summary.hasSigHashSingle,
+        hasExternalInputs: summariesToAggregate.some(
+          (psbt) => psbt.extractedSummary.hasExternalInputs,
+        ),
+        hasOutputScript: summariesToAggregate.some((psbt) => psbt.extractedSummary.hasOutputScript),
+        hasUnconfirmedInputs: summariesToAggregate.some(
+          (psbt) => psbt.extractedSummary.hasUnconfirmedInputs,
+        ),
+      };
+
+      setAggregatedParsedTxSummaryContext({
+        extractedTxSummary:
+          base.isFinal && !base.hasExternalInputs
+            ? compileUserTransactionSummary(txnContext, summary, runeSummary, base)
+            : compileAggregatedSummary(txnContext, summary, runeSummary, base),
+        batchMintDetails: summaries.map((psbt) => psbt.extractedSummary.runes.mint).flat(),
+      });
+    })();
+  }, [summaries, txnContext, network.type, isDuplicateTxs]);
+
+  const { t } = useTranslation('translation', { keyPrefix: 'CONFIRM_TRANSACTION' });
+
+  if (aggregatedParsedTxSummaryContext?.extractedTxSummary) {
+    const { hasSigHashNone } = aggregatedParsedTxSummaryContext.extractedTxSummary;
+
+    return (
+      <TxSummaryContext.Provider value={aggregatedParsedTxSummaryContext}>
+        {/* TODO: add sighash single warning */}
+        {hasSigHashNone && (
+          <SpacedCallout
+            variant="danger"
+            titleText={t('PSBT_SIG_HASH_NONE_DISCLAIMER_TITLE')}
+            bodyText={t('PSBT_SIG_HASH_NONE_DISCLAIMER')}
+          />
+        )}
+        <TransactionSummary isSubmitting={false} hideDetails />
+      </TxSummaryContext.Provider>
+    );
+  }
+}
+
+export default ConfirmBatchBtcTransactions;
diff --git a/src/app/components/confirmBtcTransaction/itemRow/amountWithInscriptionSatribute.tsx b/src/app/components/confirmBtcTransaction/itemRow/amountWithInscriptionSatribute.tsx
index 48738f870..4767a094f 100644
--- a/src/app/components/confirmBtcTransaction/itemRow/amountWithInscriptionSatribute.tsx
+++ b/src/app/components/confirmBtcTransaction/itemRow/amountWithInscriptionSatribute.tsx
@@ -2,16 +2,16 @@ import DropDownIcon from '@assets/img/transactions/dropDownIcon.svg';
 import useWalletSelector from '@hooks/useWalletSelector';
 import { WarningOctagon } from '@phosphor-icons/react';
 import { animated, config, useSpring } from '@react-spring/web';
-import { btcTransaction } from '@secretkeylabs/xverse-core';
+import { btcTransaction, type RareSatsType } from '@secretkeylabs/xverse-core';
 import { StyledP } from '@ui-library/common.styled';
 import Divider from '@ui-library/divider';
 import { useState } from 'react';
 import { useTranslation } from 'react-i18next';
 import styled from 'styled-components';
 import Theme from 'theme';
-import { mapTxSatributeInfoToBundleInfo } from '../utils';
-import BundleItem from './bundleItem';
 import Inscription from './inscription';
+import RareSatRow from './rareSatRow';
+import RareSats from './rareSats';
 
 const WarningContainer = styled.div`
   display: flex;
@@ -54,10 +54,28 @@ export default function AmountWithInscriptionSatribute({
   inscriptions,
   onShowInscription,
 }: {
-  satributes: btcTransaction.IOSatribute[];
-  inscriptions: btcTransaction.IOInscription[];
-  onShowInscription: (inscription: btcTransaction.IOInscription) => void;
+  satributes: btcTransaction.IOSatribute[] | Omit<btcTransaction.IOSatribute, 'offset'>[];
+  inscriptions:
+    | btcTransaction.IOInscription[]
+    | (btcTransaction.IOInscription & { satributes: RareSatsType[] })[]
+    | (Omit<btcTransaction.IOInscription, 'offset'> & { satributes: RareSatsType[] })[];
+  onShowInscription: (
+    inscription:
+      | (btcTransaction.IOInscription & { satributes: RareSatsType[] })
+      | (Omit<btcTransaction.IOInscription, 'offset'> & { satributes: RareSatsType[] }),
+  ) => void;
 }) {
+  const inscriptionsHaveSatributes = (
+    inscriptionsArr: (
+      | btcTransaction.IOInscription
+      | (btcTransaction.IOInscription & { satributes: RareSatsType[] })
+      | (Omit<btcTransaction.IOInscription, 'offset'> & { satributes: RareSatsType[] })
+    )[],
+  ): inscriptionsArr is (
+    | (btcTransaction.IOInscription & { satributes: RareSatsType[] })
+    | (Omit<btcTransaction.IOInscription, 'offset'> & { satributes: RareSatsType[] })
+  )[] => inscriptions.some((inscription) => 'satributes' in inscription);
+
   const [showBundleDetail, setShowBundleDetail] = useState(false);
 
   const { t } = useTranslation('translation');
@@ -77,15 +95,22 @@ export default function AmountWithInscriptionSatribute({
     config: { ...config.stiff },
   });
 
+  const inscriptionSatributes =
+    hasActivatedRareSatsKey && inscriptionsHaveSatributes(inscriptions)
+      ? inscriptions
+          .map((inscription) => inscription.satributes)
+          .filter((rareSatsArr) => rareSatsArr.length > 0)
+      : [];
   // we only show the satributes if the user has activated the rare sats key
   const satributesArray = hasActivatedRareSatsKey ? satributes : [];
+
   const amountOfAssets = satributesArray.length + inscriptions.length;
 
   return amountOfAssets > 0 ? (
     <WarningContainer>
       <WarningButton type="button" onClick={() => setShowBundleDetail((prevState) => !prevState)}>
         <Row>
-          <WarningOctagon weight="fill" color={Theme.colors.caution} />
+          <WarningOctagon weight="fill" color={Theme.colors.caution} size={16} />
           <Title typography="body_medium_s" color="caution">
             {t(
               `CONFIRM_TRANSACTION.${
@@ -96,11 +121,10 @@ export default function AmountWithInscriptionSatribute({
         </Row>
         <animated.img style={arrowRotation} src={DropDownIcon} alt="Drop Down" />
       </WarningButton>
-
       {showBundleDetail && (
         <ItemsContainer style={slideInStyles}>
-          {inscriptions.map((item: btcTransaction.IOInscription, index: number) => (
-            <div key={item.id}>
+          {inscriptions.map((item, index: number) => (
+            <>
               <Range>
                 <Inscription
                   inscription={item}
@@ -108,19 +132,36 @@ export default function AmountWithInscriptionSatribute({
                   onShowInscription={onShowInscription}
                 />
               </Range>
-              {(satributesArray.length || inscriptions.length > index + 1) && (
+              {(inscriptionSatributes.length > 0 || inscriptions.length > index + 1) && (
                 <Divider verticalMargin="s" />
               )}
-            </div>
+            </>
           ))}
-          {satributesArray.map((item: btcTransaction.IOSatribute, index: number) => (
-            <div key={item.offset}>
+          {inscriptionSatributes.length > 0 && (
+            <>
               <Range>
-                <BundleItem item={mapTxSatributeInfoToBundleInfo(item)} />
+                <RareSats
+                  buttonColor={Theme.colors.elevation2}
+                  satributes={[]}
+                  inscriptionSatributes={inscriptionSatributes}
+                />
               </Range>
-              {satributesArray.length > index + 1 && <Divider verticalMargin="s" />}
-            </div>
-          ))}
+              {satributesArray.length > 0 && <Divider verticalMargin="s" />}
+            </>
+          )}
+          {satributesArray.map(
+            (
+              item: btcTransaction.IOSatribute | Omit<btcTransaction.IOSatribute, 'offset'>,
+              index: number,
+            ) => (
+              <>
+                <Range>
+                  <RareSatRow item={item} />
+                </Range>
+                {satributesArray.length > index + 1 && <Divider verticalMargin="s" />}
+              </>
+            ),
+          )}
         </ItemsContainer>
       )}
     </WarningContainer>
diff --git a/src/app/components/confirmBtcTransaction/itemRow/bundleItem.tsx b/src/app/components/confirmBtcTransaction/itemRow/bundleItem.tsx
deleted file mode 100644
index 118072513..000000000
--- a/src/app/components/confirmBtcTransaction/itemRow/bundleItem.tsx
+++ /dev/null
@@ -1,120 +0,0 @@
-import OrdinalIcon from '@assets/img/rareSats/ic_ordinal_small.svg';
-import RareSatIcon from '@components/rareSatIcon/rareSatIcon';
-import { DotsThree, Eye } from '@phosphor-icons/react';
-import type { BundleSatRange, SatRangeInscription } from '@secretkeylabs/xverse-core';
-import { StyledP } from '@ui-library/common.styled';
-import { getSatLabel } from '@utils/rareSats';
-import { NumericFormat } from 'react-number-format';
-import styled from 'styled-components';
-import Theme from 'theme';
-
-const RangeContainer = styled.div``;
-
-const Range = styled.div`
-  display: flex;
-  border-radius: 6px;
-  border: 1px solid ${(props) => props.theme.colors.white_800};
-  padding: 1px;
-  flex-wrap: wrap;
-  flex-direction: row;
-  align-items: center;
-`;
-
-const Container = styled.div`
-  display: flex;
-  flex-direction: row;
-  justify-content: space-between;
-  align-items: center;
-  width: 100%;
-}`;
-
-const Column = styled.div`
-  display: flex;
-  flex: 1;
-  flex-direction: column;
-  align-items: flex-end;
-`;
-
-const SatsText = styled(StyledP)`
-  width: 100%;
-  text-align: right;
-`;
-const InscriptionRow = styled.button`
-  display: flex;
-  flex-direction: row;
-  align-items: center;
-  background-color: transparent;
-  cursor: ${(props) => (props.disabled ? 'default' : 'pointer')};
-`;
-const InscriptionText = styled(StyledP)`
-  text-wrap: nowrap;
-  overflow: hidden;
-  text-overflow: ellipsis;
-  width: 100%;
-  margin-left: 4px;
-`;
-
-const BundleText = styled(StyledP)`
-  text-align: right;
-  width: 100%;
-`;
-
-function BundleItem({
-  item,
-  ordinalEyePressed,
-}: {
-  item: BundleSatRange;
-  ordinalEyePressed?: (inscription: SatRangeInscription) => void;
-}) {
-  const renderedIcons = () => (
-    <RangeContainer>
-      <Range>
-        {item.satributes.map((satribute, index) => {
-          if (index > 4) return null;
-          if (index === 4) {
-            return <DotsThree color={Theme.colors.white_200} size="20" />;
-          }
-          return <RareSatIcon key={satribute} type={satribute} size={24} />;
-        })}
-      </Range>
-    </RangeContainer>
-  );
-
-  return (
-    <Container>
-      {renderedIcons()}
-      <Column>
-        <BundleText typography="body_medium_m">{getSatLabel(item.satributes)}</BundleText>
-        <NumericFormat
-          value={item.totalSats}
-          displayType="text"
-          suffix={item.totalSats > 1 ? ' Sats' : ' Sat'}
-          thousandSeparator
-          renderText={(value: string) => (
-            <SatsText typography="body_medium_m" color="white_400">
-              {value}
-            </SatsText>
-          )}
-        />
-        {item.inscriptions.map((inscription) => (
-          <InscriptionRow
-            type="button"
-            key={inscription.id}
-            onClick={() => {
-              ordinalEyePressed?.(inscription);
-            }}
-            disabled={!ordinalEyePressed}
-          >
-            <img src={OrdinalIcon} alt="ordinal" />
-            <InscriptionText typography="body_medium_m" color="white_0">
-              {inscription.inscription_number}
-            </InscriptionText>
-            {ordinalEyePressed && <Eye color={Theme.colors.white_0} size={20} weight="fill" />}
-          </InscriptionRow>
-        ))}
-      </Column>
-    </Container>
-  );
-}
-
-export default BundleItem;
diff --git a/src/app/components/confirmBtcTransaction/itemRow/inscription.tsx b/src/app/components/confirmBtcTransaction/itemRow/inscription.tsx
index 6a2022555..38c967f15 100644
--- a/src/app/components/confirmBtcTransaction/itemRow/inscription.tsx
+++ b/src/app/components/confirmBtcTransaction/itemRow/inscription.tsx
@@ -1,21 +1,14 @@
 import OrdinalIcon from '@assets/img/rareSats/ic_ordinal_small_over_card.svg';
 import { Eye } from '@phosphor-icons/react';
 import OrdinalImage from '@screens/ordinals/ordinalImage';
-import { btcTransaction } from '@secretkeylabs/xverse-core';
+import { btcTransaction, type RareSatsType } from '@secretkeylabs/xverse-core';
 import Avatar from '@ui-library/avatar';
 import { StyledP } from '@ui-library/common.styled';
 import { useTranslation } from 'react-i18next';
 import { NumericFormat } from 'react-number-format';
 import styled from 'styled-components';
 import Theme from 'theme';
-import { useParsedTxSummaryContext } from '../hooks/useParsedTxSummaryContext';
-
-type Props = {
-  inscription: btcTransaction.IOInscription;
-  bundleSize?: number;
-  hideTypeSizeInfo?: boolean;
-  onShowInscription: (inscription: btcTransaction.IOInscription) => void;
-};
+import { useTxSummaryContext } from '../hooks/useTxSummaryContext';
 
 const RowCenter = styled.div<{ spaceBetween?: boolean; gap?: boolean }>((props) => ({
   display: 'flex',
@@ -49,15 +42,25 @@ const Dot = styled(StyledP)`
   margin: 0 ${(props) => props.theme.space.xxs};
 `;
 
+type Props = {
+  inscription:
+    | (btcTransaction.IOInscription & { satributes: RareSatsType[] })
+    | (Omit<btcTransaction.IOInscription, 'offset'> & { satributes: RareSatsType[] });
+  hideTypeSizeInfo?: boolean;
+  onShowInscription: (
+    inscription:
+      | (btcTransaction.IOInscription & { satributes: RareSatsType[] })
+      | (Omit<btcTransaction.IOInscription, 'offset'> & { satributes: RareSatsType[] }),
+  ) => void;
+};
+
 export default function Inscription({
   inscription,
-  bundleSize,
   hideTypeSizeInfo = false,
   onShowInscription,
 }: Props) {
   const { t } = useTranslation('translation');
-  const { brc20Summary } = useParsedTxSummaryContext();
-
+  const { brc20Summary } = useTxSummaryContext();
   return (
     <RowCenter>
       <AvatarContainer>
@@ -78,25 +81,9 @@ export default function Inscription({
       <RowCenter spaceBetween gap>
         <div>
           {!hideTypeSizeInfo && (
-            <>
-              <StyledP typography="body_medium_m" color="white_0">
-                {t('COMMON.INSCRIPTION')}
-              </StyledP>
-              {bundleSize && (
-                <NumericFormat
-                  value={bundleSize}
-                  displayType="text"
-                  thousandSeparator
-                  prefix={`${t('COMMON.SIZE')}: `}
-                  suffix={` ${t('COMMON.SATS')}`}
-                  renderText={(value: string) => (
-                    <StyledP typography="body_medium_s" color="white_400">
-                      {value}
-                    </StyledP>
-                  )}
-                />
-              )}
-            </>
+            <StyledP typography="body_medium_m" color="white_0">
+              {t('COMMON.INSCRIPTION')}
+            </StyledP>
           )}
         </div>
         {brc20Summary ? (
@@ -132,9 +119,7 @@ export default function Inscription({
           <NumberTypeContainer>
             <InscriptionNumberContainer
               type="button"
-              onClick={() => {
-                onShowInscription(inscription);
-              }}
+              onClick={() => onShowInscription(inscription)}
             >
               <RowCenter>
                 <InscriptionNumber
diff --git a/src/app/components/confirmBtcTransaction/itemRow/inscriptionSatributeRow.tsx b/src/app/components/confirmBtcTransaction/itemRow/inscriptionSatributeRow.tsx
index 84f118497..9cf87a051 100644
--- a/src/app/components/confirmBtcTransaction/itemRow/inscriptionSatributeRow.tsx
+++ b/src/app/components/confirmBtcTransaction/itemRow/inscriptionSatributeRow.tsx
@@ -1,11 +1,7 @@
 import Link from '@assets/img/rareSats/link.svg';
 import useWalletSelector from '@hooks/useWalletSelector';
-import { btcTransaction } from '@secretkeylabs/xverse-core';
-import { StyledP } from '@ui-library/common.styled';
-import { useTranslation } from 'react-i18next';
-import { NumericFormat } from 'react-number-format';
+import { btcTransaction, type RareSatsType } from '@secretkeylabs/xverse-core';
 import styled from 'styled-components';
-import { getSatRangesWithInscriptions } from '../utils';
 import Inscription from './inscription';
 import RareSats from './rareSats';
 
@@ -18,77 +14,53 @@ const LinkContainer = styled.div`
   width: 32px;
   justify-content: center;
   margin-top: ${(props) => props.theme.space.xxxs};
-  margin-bottom: -6px;
+  margin-bottom: -10px;
 `;
 
-const BundleHeader = styled.div<{ topMargin? }>((props) => ({
-  display: 'flex',
-  flex: 1,
-  flexDirection: 'row',
-  justifyContent: 'space-between',
-  marginBottom: props.theme.space.s,
-  marginTop: props.topMargin ? props.theme.space.s : 0,
-}));
-
 type Props = {
-  inscriptions: btcTransaction.IOInscription[];
-  satributes: btcTransaction.IOSatribute[];
-  amount: number;
-  showAmount?: boolean;
-  topMargin?: boolean;
-  onShowInscription: (inscription: btcTransaction.IOInscription) => void;
+  bundleSize?: number;
+  inscriptions:
+    | (btcTransaction.IOInscription & { satributes: RareSatsType[] })[]
+    | (Omit<btcTransaction.IOInscription, 'offset'> & { satributes: RareSatsType[] })[];
+  satributes: btcTransaction.IOSatribute[] | Omit<btcTransaction.IOSatribute, 'offset'>[];
+  onShowInscription: (
+    inscription:
+      | (btcTransaction.IOInscription & { satributes: RareSatsType[] })
+      | (Omit<btcTransaction.IOInscription, 'offset'> & { satributes: RareSatsType[] }),
+  ) => void;
 };
 
 function InscriptionSatributeRow({
+  bundleSize,
   inscriptions,
   satributes,
-  amount,
-  showAmount = false,
-  topMargin = false,
   onShowInscription,
 }: Props) {
-  const { t } = useTranslation('translation');
   const { hasActivatedRareSatsKey } = useWalletSelector();
-  const satributesInfo = getSatRangesWithInscriptions({
-    satributes,
-    inscriptions,
-    amount,
-  });
-  // we only show rare sats if there are any and the user has enabled the feature
-  const showRareSats = satributesInfo.totalExoticSats > 0 && hasActivatedRareSatsKey;
-
   return (
     <Container>
-      {showAmount && (
-        <BundleHeader topMargin={topMargin}>
-          <StyledP typography="body_medium_m" color="white_400">
-            {t('COMMON.BUNDLE')}
-          </StyledP>
-          <NumericFormat
-            value={amount}
-            displayType="text"
-            thousandSeparator
-            prefix={`${t('COMMON.SIZE')}: `}
-            suffix={` ${t('COMMON.SATS')}`}
-            renderText={(value: string) => (
-              <StyledP typography="body_medium_m" color="white_400">
-                {value}
-              </StyledP>
+      {inscriptions.map((inscription, index) => {
+        const inscriptionSatributes = inscription.satributes.filter(
+          (rareSatsArr) => rareSatsArr.length > 0,
+        );
+        return (
+          <>
+            <Container key={inscription.number}>
+              <Inscription inscription={inscription} onShowInscription={onShowInscription} />
+              {(bundleSize && inscriptions.length > index + 1) ||
+                (hasActivatedRareSatsKey && inscriptionSatributes.length > 0 && (
+                  <LinkContainer>
+                    <img src={Link} alt="link" />
+                  </LinkContainer>
+                ))}
+            </Container>
+            {hasActivatedRareSatsKey && (
+              <RareSats bundleSize={bundleSize} inscriptionSatributes={inscriptionSatributes} />
             )}
-          />
-        </BundleHeader>
-      )}
-      {inscriptions.map((inscription, index) => (
-        <div key={inscription.number}>
-          <Inscription inscription={inscription} onShowInscription={onShowInscription} />
-          {!!(inscriptions.length > index + 1 || showRareSats) && (
-            <LinkContainer>
-              <img src={Link} alt="link" />
-            </LinkContainer>
-          )}
-        </div>
-      ))}
-      {showRareSats && <RareSats satributesInfo={satributesInfo} />}
+          </>
+        );
+      })}
+      {hasActivatedRareSatsKey && <RareSats bundleSize={bundleSize} satributes={satributes} />}
     </Container>
   );
 }
diff --git a/src/app/components/confirmBtcTransaction/itemRow/rareSatRow.tsx b/src/app/components/confirmBtcTransaction/itemRow/rareSatRow.tsx
new file mode 100644
index 000000000..22f59bb37
--- /dev/null
+++ b/src/app/components/confirmBtcTransaction/itemRow/rareSatRow.tsx
@@ -0,0 +1,83 @@
+import RareSatIcon from '@components/rareSatIcon/rareSatIcon';
+import { DotsThree } from '@phosphor-icons/react';
+import { btcTransaction } from '@secretkeylabs/xverse-core';
+import { StyledP } from '@ui-library/common.styled';
+import { getSatLabel } from '@utils/rareSats';
+import { NumericFormat } from 'react-number-format';
+import styled from 'styled-components';
+import Theme from 'theme';
+
+const RangeContainer = styled.div``;
+
+const Range = styled.div`
+  display: flex;
+  border-radius: 6px;
+  border: 1px solid ${(props) => props.theme.colors.white_800};
+  padding: 1px;
+  flex-wrap: wrap;
+  flex-direction: row;
+  align-items: center;
+`;
+
+const Container = styled.div`
+  display: flex;
+  flex-direction: row;
+  justify-content: space-between;
+  align-items: center;
+  width: 100%;
+`;
+
+const Column = styled.div`
+  display: flex;
+  flex: 1;
+  flex-direction: column;
+  align-items: flex-end;
+`;
+
+const SatsText = styled(StyledP)`
+  width: 100%;
+  text-align: right;
+`;
+
+const BundleText = styled(StyledP)`
+  text-align: right;
+  width: 100%;
+`;
+
+function RareSatRow({
+  item,
+}: {
+  item: btcTransaction.IOSatribute | Omit<btcTransaction.IOSatribute, 'offset'>;
+}) {
+  return (
+    <Container>
+      <RangeContainer>
+        <Range>
+          {item.types.map((rareSatType, index) => {
+            if (index > 4) return null;
+            if (index === 4) return <DotsThree color={Theme.colors.white_200} size="20" />;
+            return <RareSatIcon key={rareSatType} type={rareSatType} size={24} />;
+          })}
+        </Range>
+      </RangeContainer>
+      <Column>
+        <BundleText typography="body_medium_m">{getSatLabel(item.types)}</BundleText>
+        {item.amount > 0 && (
+          <NumericFormat
+            value={item.amount}
+            displayType="text"
+            suffix={item.amount > 1 ? ' Sats' : ' Sat'}
+            thousandSeparator
+            renderText={(value: string) => (
+              <SatsText typography="body_medium_m" color="white_400">
+                {value}
+              </SatsText>
+            )}
+          />
+        )}
+      </Column>
+    </Container>
+  );
+}
+
+export default RareSatRow;
diff --git a/src/app/components/confirmBtcTransaction/itemRow/rareSats.tsx b/src/app/components/confirmBtcTransaction/itemRow/rareSats.tsx
index 3fdf25e27..660cc77b9 100644
--- a/src/app/components/confirmBtcTransaction/itemRow/rareSats.tsx
+++ b/src/app/components/confirmBtcTransaction/itemRow/rareSats.tsx
@@ -1,31 +1,31 @@
 import DropDownIcon from '@assets/img/transactions/dropDownIcon.svg';
 import { Butterfly } from '@phosphor-icons/react';
 import { animated, config, useSpring } from '@react-spring/web';
+import { btcTransaction, type RareSatsType } from '@secretkeylabs/xverse-core';
 import { StyledP } from '@ui-library/common.styled';
 import Divider from '@ui-library/divider';
 import { useState } from 'react';
 import { useTranslation } from 'react-i18next';
-import { NumericFormat } from 'react-number-format';
 import styled from 'styled-components';
 import Theme from 'theme';
 import Avatar from '../../../ui-library/avatar';
-import { mapTxSatributeInfoToBundleInfo, type SatRangeTx } from '../utils';
-import BundleItem from './bundleItem';
+import RareSatRow from './rareSatRow';
 
 const SatsBundleContainer = styled.div`
   display: flex;
   flex-direction: column;
   border-radius: ${(props) => props.theme.space.s};
+  margin-top: ${(props) => props.theme.space.s};
   margin-bottom: ${(props) => props.theme.space.s};
 `;
 
-const SatsBundleButton = styled.button`
-  display: flex;
-  flex-direction: row;
-  align-items: center;
-  justify-content: space-between;
-  background-color: ${(props) => props.theme.colors.elevation1};
-`;
+const SatsBundleButton = styled.button<{ buttonColor?: string }>((props) => ({
+  display: 'flex',
+  flexDirection: 'row',
+  alignItems: 'center',
+  justifyContent: 'space-between',
+  backgroundColor: props.buttonColor ?? props.theme.colors.elevation1,
+}));
 
 const RangesContainer = styled(animated.div)((props) => ({
   borderRadius: props.theme.space.s,
@@ -44,7 +44,7 @@ const Row = styled.div`
   align-items: center;
 `;
 
-const BundleInfo = styled.div`
+const ButterflyHeader = styled.div`
   display: flex;
   flex-direction: column;
   align-items: flex-start;
@@ -52,11 +52,15 @@ const BundleInfo = styled.div`
 `;
 
 function RareSats({
-  satributesInfo,
+  satributes,
+  inscriptionSatributes,
   bundleSize,
+  buttonColor,
 }: {
-  satributesInfo: { satRanges: SatRangeTx[]; totalExoticSats: number };
+  satributes?: btcTransaction.IOSatribute[] | Omit<btcTransaction.IOSatribute, 'offset'>[];
+  inscriptionSatributes?: RareSatsType[];
   bundleSize?: number;
+  buttonColor?: string;
 }) {
   const [showBundleDetail, setShowBundleDetail] = useState(false);
 
@@ -76,51 +80,76 @@ function RareSats({
     config: { ...config.stiff },
   });
 
+  const totalExoticSats: number =
+    satributes?.reduce(
+      (accumulator, current) =>
+        accumulator + (!current.types.includes('COMMON') ? current.amount : 0),
+      0,
+    ) ?? 0;
+
+  if (!totalExoticSats && !inscriptionSatributes?.length) return null;
+
   return (
     <SatsBundleContainer>
       <SatsBundleButton
         type="button"
+        buttonColor={buttonColor}
         onClick={() => setShowBundleDetail((prevState) => !prevState)}
       >
         <Row>
           <Avatar icon={<Butterfly size={18} color={Theme.colors.elevation0} />} />
-          <BundleInfo>
-            <StyledP typography="body_medium_m" color="white_0">{`${
-              satributesInfo.totalExoticSats
-            } ${t(
-              satributesInfo.totalExoticSats > 1
-                ? 'NFT_DASHBOARD_SCREEN.RARE_SATS'
-                : 'NFT_DASHBOARD_SCREEN.RARE_SAT',
-            )}`}</StyledP>
-            {bundleSize && (
-              <NumericFormat
-                value={bundleSize}
-                displayType="text"
-                thousandSeparator
-                prefix={`${t('COMMON.SIZE')}: `}
-                suffix={` ${t('COMMON.SATS')}`}
-                renderText={(value: string) => (
-                  <StyledP typography="body_medium_s" color="white_400">
-                    {value}
-                  </StyledP>
-                )}
-              />
-            )}
-          </BundleInfo>
+          <ButterflyHeader>
+            <StyledP typography="body_medium_m" color="white_0">
+              {totalExoticSats > 0
+                ? `${totalExoticSats} ${t(
+                    totalExoticSats > 1
+                      ? 'NFT_DASHBOARD_SCREEN.RARE_SATS'
+                      : 'NFT_DASHBOARD_SCREEN.RARE_SAT',
+                  )}`
+                : `${t('NFT_DASHBOARD_SCREEN.RARE_SATS')}`}
+            </StyledP>
+          </ButterflyHeader>
         </Row>
         <animated.img style={arrowRotation} src={DropDownIcon} alt="Drop Down" />
       </SatsBundleButton>
-
       {showBundleDetail && (
         <RangesContainer style={slideInStyles}>
-          {satributesInfo.satRanges.map((item: SatRangeTx, index: number) => (
-            <div key={item.offset}>
+          {inscriptionSatributes && (
+            <Range>
+              <RareSatRow
+                item={{
+                  types: inscriptionSatributes,
+                  amount: 0,
+                  fromAddress: '',
+                  offset: -1,
+                }}
+              />
+            </Range>
+          )}
+          {totalExoticSats > 0 &&
+            satributes &&
+            satributes.map((item, i) => (
+              // eslint-disable-next-line react/jsx-key
+              <Range>
+                <RareSatRow item={item} />
+                {i < satributes.length - 1 && <Divider verticalMargin="s" />}
+              </Range>
+            ))}
+          {bundleSize && totalExoticSats !== bundleSize && (
+            <>
+              <Divider verticalMargin="s" />
               <Range>
-                <BundleItem item={mapTxSatributeInfoToBundleInfo(item)} />
+                <RareSatRow
+                  item={{
+                    types: ['COMMON'],
+                    amount: bundleSize - totalExoticSats,
+                    fromAddress: '',
+                    offset: -1,
+                  }}
+                />
               </Range>
-              {satributesInfo.satRanges.length > index + 1 && <Divider verticalMargin="s" />}
-            </div>
-          ))}
+            </>
+          )}
         </RangesContainer>
       )}
     </SatsBundleContainer>
diff --git a/src/app/components/confirmBtcTransaction/itemRow/runeAmount.tsx b/src/app/components/confirmBtcTransaction/itemRow/runeAmount.tsx
index b00a0b802..19d8cd8d8 100644
--- a/src/app/components/confirmBtcTransaction/itemRow/runeAmount.tsx
+++ b/src/app/components/confirmBtcTransaction/itemRow/runeAmount.tsx
@@ -1,4 +1,3 @@
-import { mapRuneBaseToFungibleToken } from '@components/confirmBtcTransaction/utils';
 import { RightAlignedStyledFiatAmountText } from '@components/fiatAmountText';
 import TokenImage from '@components/tokenImage';
 import useRuneFiatRateQuery from '@hooks/queries/runes/useRuneFiatRateQuery';
@@ -6,6 +5,7 @@ import useWalletSelector from '@hooks/useWalletSelector';
 import type { RuneBase } from '@secretkeylabs/xverse-core';
 import { StyledP } from '@ui-library/common.styled';
 import { ftDecimals } from '@utils/helper';
+import { mapRuneBaseToFungibleToken } from '@utils/mappers';
 import BigNumber from 'bignumber.js';
 import { useTranslation } from 'react-i18next';
 import { NumericFormat } from 'react-number-format';
@@ -42,16 +42,21 @@ const Column = styled.div`
 type Props = {
   rune: RuneBase;
   hasSufficientBalance?: boolean;
+  topMargin?: boolean;
 };
 
-export default function RuneAmount({ rune, hasSufficientBalance = true }: Props) {
+export default function RuneAmount({
+  rune,
+  hasSufficientBalance = true,
+  topMargin = false,
+}: Props) {
   const { t } = useTranslation('translation', { keyPrefix: 'CONFIRM_TRANSACTION' });
   const { runeName, amount, divisibility, symbol } = rune;
   const amountWithDecimals = ftDecimals(String(amount), divisibility);
   const { fiatCurrency } = useWalletSelector();
   const { data: runeFiatRate } = useRuneFiatRateQuery(rune);
   return (
-    <Container>
+    <Container topMargin={topMargin}>
       <AvatarContainer>
         <TokenImage
           currency="FT"
diff --git a/src/app/components/confirmBtcTransaction/receiveSection.tsx b/src/app/components/confirmBtcTransaction/receiveSection.tsx
deleted file mode 100644
index c956622e6..000000000
--- a/src/app/components/confirmBtcTransaction/receiveSection.tsx
+++ /dev/null
@@ -1,203 +0,0 @@
-import { useParsedTxSummaryContext } from '@components/confirmBtcTransaction/hooks/useParsedTxSummaryContext';
-import RuneAmount from '@components/confirmBtcTransaction/itemRow/runeAmount';
-import { ArrowRight } from '@phosphor-icons/react';
-import type { btcTransaction } from '@secretkeylabs/xverse-core';
-import { StyledP } from '@ui-library/common.styled';
-import { useTranslation } from 'react-i18next';
-import { NumericFormat } from 'react-number-format';
-import styled from 'styled-components';
-import Theme from 'theme';
-import Amount from './itemRow/amount';
-import InscriptionSatributeRow from './itemRow/inscriptionSatributeRow';
-
-const Container = styled.div((props) => ({
-  display: 'flex',
-  flexDirection: 'column',
-  background: props.theme.colors.elevation1,
-  borderRadius: 12,
-  paddingTop: props.theme.space.m,
-  justifyContent: 'center',
-  marginBottom: props.theme.space.s,
-}));
-
-const RowCenter = styled.div<{ spaceBetween?: boolean }>((props) => ({
-  display: 'flex',
-  flexDirection: 'row',
-  alignItems: 'center',
-  justifyContent: props.spaceBetween ? 'space-between' : 'initial',
-}));
-
-const Header = styled(RowCenter)((props) => ({
-  padding: `0 ${props.theme.space.m}`,
-}));
-
-const RowContainer = styled.div<{ noPadding?: boolean; noMargin?: boolean }>((props) => ({
-  padding: props.noPadding ? 0 : `0 ${props.theme.space.m}`,
-  marginTop: props.noMargin ? 0 : `${props.theme.space.m}`,
-}));
-
-const AddressLabel = styled(StyledP)((props) => ({
-  marginLeft: props.theme.space.xxs,
-}));
-
-const BundleHeader = styled.div((props) => ({
-  display: 'flex',
-  flex: 1,
-  flexDirection: 'row',
-  justifyContent: 'space-between',
-  marginBottom: props.theme.space.m,
-}));
-
-type Props = {
-  onShowInscription: (inscription: btcTransaction.IOInscription) => void;
-};
-function ReceiveSection({ onShowInscription }: Props) {
-  const { t } = useTranslation('translation');
-  const {
-    netBtcAmount,
-    showReceiveSection,
-    receiveSection: {
-      showOrdinalSection,
-      showPaymentSection,
-      showBtcAmount,
-      inscriptionsRareSatsInPayment,
-      ordinalRuneReceipts,
-      outputsToOrdinal,
-      paymentRuneReceipts,
-      showOrdinalRunes,
-      showPaymentRunes,
-    },
-  } = useParsedTxSummaryContext();
-
-  if (!showReceiveSection) return null;
-
-  return (
-    <>
-      {showOrdinalSection && (
-        <Container>
-          <Header spaceBetween>
-            <StyledP typography="body_medium_m" color="white_200">
-              {t('CONFIRM_TRANSACTION.YOU_WILL_RECEIVE')}
-            </StyledP>
-            <RowCenter>
-              <ArrowRight weight="bold" color={Theme.colors.white_0} size={16} />
-              <AddressLabel typography="body_medium_m">
-                {t('CONFIRM_TRANSACTION.YOUR_ORDINAL_ADDRESS')}
-              </AddressLabel>
-            </RowCenter>
-          </Header>
-          {showOrdinalRunes &&
-            ordinalRuneReceipts.map((receipt) => (
-              <RowContainer key={receipt.runeName}>
-                <BundleHeader>
-                  <div>
-                    <StyledP typography="body_medium_m" color="white_400">
-                      {t('COMMON.BUNDLE')}
-                    </StyledP>
-                  </div>
-                  <div>
-                    <NumericFormat
-                      value={546}
-                      displayType="text"
-                      thousandSeparator
-                      prefix={`${t('COMMON.SIZE')}: `}
-                      suffix={` ${t('COMMON.SATS')}`}
-                      renderText={(value: string) => (
-                        <StyledP typography="body_medium_m" color="white_400">
-                          {value}
-                        </StyledP>
-                      )}
-                    />
-                  </div>
-                </BundleHeader>
-                <RuneAmount rune={receipt} />
-              </RowContainer>
-            ))}
-          {outputsToOrdinal.length > 0 && (
-            <RowContainer>
-              {outputsToOrdinal
-                .sort((a, b) => b.inscriptions.length - a.inscriptions.length)
-                .map((output, index) => (
-                  <InscriptionSatributeRow
-                    // eslint-disable-next-line react/no-array-index-key
-                    key={index}
-                    inscriptions={output.inscriptions}
-                    satributes={output.satributes}
-                    amount={output.amount}
-                    showAmount
-                    onShowInscription={onShowInscription}
-                  />
-                ))}
-            </RowContainer>
-          )}
-        </Container>
-      )}
-      {showPaymentSection && (
-        <Container>
-          <Header spaceBetween>
-            <StyledP typography="body_medium_m" color="white_200">
-              {t('CONFIRM_TRANSACTION.YOU_WILL_RECEIVE')}
-            </StyledP>
-            <RowCenter>
-              <ArrowRight weight="bold" color={Theme.colors.white_0} size={16} />
-              <AddressLabel typography="body_medium_m">
-                {t('CONFIRM_TRANSACTION.YOUR_PAYMENT_ADDRESS')}
-              </AddressLabel>
-            </RowCenter>
-          </Header>
-          {showBtcAmount && (
-            <RowContainer>
-              <Amount amount={netBtcAmount} />
-            </RowContainer>
-          )}
-          {showPaymentRunes &&
-            paymentRuneReceipts.map((receipt) => (
-              <RowContainer key={receipt.runeName}>
-                <BundleHeader>
-                  <div>
-                    <StyledP typography="body_medium_m" color="white_400">
-                      {t('COMMON.BUNDLE')}
-                    </StyledP>
-                  </div>
-                  <div>
-                    <NumericFormat
-                      value={546}
-                      displayType="text"
-                      thousandSeparator
-                      prefix={`${t('COMMON.SIZE')}: `}
-                      suffix={` ${t('COMMON.SATS')}`}
-                      renderText={(value: string) => (
-                        <StyledP typography="body_medium_m" color="white_400">
-                          {value}
-                        </StyledP>
-                      )}
-                    />
-                  </div>
-                </BundleHeader>
-                <RuneAmount rune={receipt} />
-              </RowContainer>
-            ))}
-          {inscriptionsRareSatsInPayment.length > 0 && (
-            <RowContainer>
-              {inscriptionsRareSatsInPayment
-                .sort((a, b) => b.inscriptions.length - a.inscriptions.length)
-                .map((output, index) => (
-                  <InscriptionSatributeRow
-                    // eslint-disable-next-line react/no-array-index-key
-                    key={index}
-                    inscriptions={output.inscriptions}
-                    satributes={output.satributes}
-                    amount={output.amount}
-                    showAmount
-                    onShowInscription={onShowInscription}
-                  />
-                ))}
-            </RowContainer>
-          )}
-        </Container>
-      )}
-    </>
-  );
-}
-
-export default ReceiveSection;
diff --git a/src/app/components/confirmBtcTransaction/sections/feeSection.tsx b/src/app/components/confirmBtcTransaction/sections/feeSection.tsx
new file mode 100644
index 000000000..a23b65251
--- /dev/null
+++ b/src/app/components/confirmBtcTransaction/sections/feeSection.tsx
@@ -0,0 +1,115 @@
+import TransferFeeView from '@components/transferFeeView';
+import useCoinRates from '@hooks/queries/useCoinRates';
+import useBtcFeeRate from '@hooks/useBtcFeeRate';
+import useWalletSelector from '@hooks/useWalletSelector';
+import {
+  btcTransaction,
+  getBtcFiatEquivalent,
+  type RareSatsType,
+} from '@secretkeylabs/xverse-core';
+import SelectFeeRate from '@ui-components/selectFeeRate';
+import BigNumber from 'bignumber.js';
+import { useTranslation } from 'react-i18next';
+import styled from 'styled-components';
+import { useTxSummaryContext } from '../hooks/useTxSummaryContext';
+import AmountWithInscriptionSatribute from '../itemRow/amountWithInscriptionSatribute';
+
+const Container = styled.div((props) => ({
+  background: props.theme.colors.elevation1,
+  borderRadius: props.theme.radius(2),
+  padding: props.theme.space.m,
+  paddingBottom: 20,
+  marginBottom: props.theme.space.s,
+}));
+
+const Subtitle = styled.p`
+  ${(props) => props.theme.typography.body_medium_m};
+  color: ${(props) => props.theme.colors.white_200};
+  margin-top: ${(props) => props.theme.space.s};
+  margin-bottom: ${(props) => props.theme.space.xs};
+`;
+
+type Props = {
+  feeRate?: number;
+  getFeeForFeeRate?: (
+    feeRate: number,
+    useEffectiveFeeRate?: boolean,
+  ) => Promise<number | undefined>;
+  onFeeRateSet?: (feeRate: number) => void;
+  isSubmitting?: boolean;
+  onShowInscription: (
+    inscription:
+      | (btcTransaction.IOInscription & { satributes: RareSatsType[] })
+      | (Omit<btcTransaction.IOInscription, 'offset'> & { satributes: RareSatsType[] }),
+  ) => void;
+};
+
+function FeeSection({
+  feeRate,
+  getFeeForFeeRate,
+  onFeeRateSet,
+  isSubmitting,
+  onShowInscription,
+}: Props) {
+  const { fiatCurrency } = useWalletSelector();
+  const { t } = useTranslation('translation', { keyPrefix: 'CONFIRM_TRANSACTION' });
+  const { t: tUnits } = useTranslation('translation', { keyPrefix: 'UNITS' });
+  const { data: recommendedFees } = useBtcFeeRate();
+  const { btcFiatRate } = useCoinRates();
+
+  const { extractedTxSummary } = useTxSummaryContext();
+
+  const isUserSummary = extractedTxSummary.type === 'user';
+  const fees = isUserSummary ? extractedTxSummary.feeOutput.amount : extractedTxSummary.fee ?? 0;
+  const showFeeSelector = !!(feeRate && getFeeForFeeRate && onFeeRateSet);
+
+  const satsToFiat = (sats: string): string =>
+    getBtcFiatEquivalent(new BigNumber(sats), new BigNumber(btcFiatRate)).toString();
+
+  if (showFeeSelector && recommendedFees) {
+    return (
+      <>
+        <Subtitle>{t('FEES')}</Subtitle>
+        <Container>
+          <SelectFeeRate
+            fee={fees.toString()}
+            feeUnits="sats"
+            feeRate={String(feeRate)}
+            feeRateUnits={tUnits('SATS_PER_VB')}
+            setFeeRate={(newFeeRate) => onFeeRateSet(+newFeeRate)}
+            baseToFiat={satsToFiat}
+            fiatUnit={fiatCurrency}
+            getFeeForFeeRate={getFeeForFeeRate}
+            feeRates={{
+              medium: recommendedFees.regular,
+              high: recommendedFees.priority,
+            }}
+            feeRateLimits={recommendedFees.limits}
+            isLoading={isSubmitting}
+          />
+          <AmountWithInscriptionSatribute
+            inscriptions={isUserSummary ? extractedTxSummary.feeOutput.inscriptions : []}
+            satributes={isUserSummary ? extractedTxSummary.feeOutput.satributes : []}
+            onShowInscription={onShowInscription}
+          />
+        </Container>
+      </>
+    );
+  }
+
+  if (!showFeeSelector && fees > 0) {
+    return (
+      <TransferFeeView
+        fee={new BigNumber(fees)}
+        currency={t('SATS')}
+        satributes={isUserSummary ? extractedTxSummary.feeOutput.satributes : []}
+        inscriptions={isUserSummary ? extractedTxSummary.feeOutput.inscriptions : []}
+        onShowInscription={onShowInscription}
+      />
+    );
+  }
+
+  return null;
+}
+
+export default FeeSection;
diff --git a/src/app/components/confirmBtcTransaction/ContentLabel/common.ts b/src/app/components/confirmBtcTransaction/sections/inscribeSection/ContentLabel/common.ts
similarity index 100%
rename from src/app/components/confirmBtcTransaction/ContentLabel/common.ts
rename to src/app/components/confirmBtcTransaction/sections/inscribeSection/ContentLabel/common.ts
diff --git a/src/app/components/confirmBtcTransaction/ContentLabel/index.tsx b/src/app/components/confirmBtcTransaction/sections/inscribeSection/ContentLabel/index.tsx
similarity index 100%
rename from src/app/components/confirmBtcTransaction/ContentLabel/index.tsx
rename to src/app/components/confirmBtcTransaction/sections/inscribeSection/ContentLabel/index.tsx
diff --git a/src/app/components/confirmBtcTransaction/ContentLabel/preview.tsx b/src/app/components/confirmBtcTransaction/sections/inscribeSection/ContentLabel/preview.tsx
similarity index 100%
rename from src/app/components/confirmBtcTransaction/ContentLabel/preview.tsx
rename to src/app/components/confirmBtcTransaction/sections/inscribeSection/ContentLabel/preview.tsx
diff --git a/src/app/components/confirmBtcTransaction/ContentLabel/utils.ts b/src/app/components/confirmBtcTransaction/sections/inscribeSection/ContentLabel/utils.ts
similarity index 100%
rename from src/app/components/confirmBtcTransaction/ContentLabel/utils.ts
rename to src/app/components/confirmBtcTransaction/sections/inscribeSection/ContentLabel/utils.ts
diff --git a/src/app/components/confirmBtcTransaction/inscribeSection/index.tsx b/src/app/components/confirmBtcTransaction/sections/inscribeSection/index.tsx
similarity index 94%
rename from src/app/components/confirmBtcTransaction/inscribeSection/index.tsx
rename to src/app/components/confirmBtcTransaction/sections/inscribeSection/index.tsx
index 3a5c3586e..a0507087c 100644
--- a/src/app/components/confirmBtcTransaction/inscribeSection/index.tsx
+++ b/src/app/components/confirmBtcTransaction/sections/inscribeSection/index.tsx
@@ -3,8 +3,8 @@ import { ArrowDown } from '@phosphor-icons/react';
 import { StyledP } from '@ui-library/common.styled';
 import { getShortTruncatedAddress } from '@utils/helper';
 import { useTranslation } from 'react-i18next';
-import ContentLabel from '../ContentLabel';
-import { Pill, StyledPillLabel } from '../runes';
+import ContentLabel from './ContentLabel';
+import { Pill, StyledPillLabel } from '../runesSection/styles';
 import {
   ButtonIcon,
   CardContainer,
diff --git a/src/app/components/confirmBtcTransaction/inscribeSection/styles.tsx b/src/app/components/confirmBtcTransaction/sections/inscribeSection/styles.tsx
similarity index 100%
rename from src/app/components/confirmBtcTransaction/inscribeSection/styles.tsx
rename to src/app/components/confirmBtcTransaction/sections/inscribeSection/styles.tsx
diff --git a/src/app/components/confirmBtcTransaction/sections/receiveSection.tsx b/src/app/components/confirmBtcTransaction/sections/receiveSection.tsx
new file mode 100644
index 000000000..13da41007
--- /dev/null
+++ b/src/app/components/confirmBtcTransaction/sections/receiveSection.tsx
@@ -0,0 +1,136 @@
+import useSelectedAccount from '@hooks/useSelectedAccount';
+import type {
+  AggregatedOutputSummary,
+  btcTransaction,
+  RareSatsType,
+} from '@secretkeylabs/xverse-core';
+import { StyledP } from '@ui-library/common.styled';
+import { useTranslation } from 'react-i18next';
+import styled from 'styled-components';
+import { useTxSummaryContext } from '../hooks/useTxSummaryContext';
+import Amount from '../itemRow/amount';
+import AmountWithInscriptionSatribute from '../itemRow/amountWithInscriptionSatribute';
+import InscriptionSatributeRow from '../itemRow/inscriptionSatributeRow';
+import RuneAmount from '../itemRow/runeAmount';
+
+const Title = styled.p`
+  ${(props) => props.theme.typography.body_medium_m};
+  color: ${(props) => props.theme.colors.white_200};
+  margin-top: ${(props) => props.theme.space.s};
+  margin-bottom: ${(props) => props.theme.space.xs};
+`;
+
+const Container = styled.div((props) => ({
+  display: 'flex',
+  flexDirection: 'column',
+  background: props.theme.colors.elevation1,
+  borderRadius: 12,
+  paddingTop: props.theme.space.m,
+  justifyContent: 'center',
+  marginBottom: props.theme.space.s,
+}));
+
+const SubHeader = styled.div((props) => ({
+  display: 'flex',
+  flex: 1,
+  flexDirection: 'row',
+  justifyContent: 'space-between',
+  marginBottom: props.theme.space.s,
+}));
+
+const RowContainer = styled.div<{ noPadding?: boolean; noMargin?: boolean }>((props) => ({
+  padding: props.noPadding ? 0 : `0 ${props.theme.space.m}`,
+  marginBottom: props.noMargin ? 0 : props.theme.space.m,
+}));
+
+type Props = {
+  onShowInscription: (
+    inscription:
+      | (btcTransaction.IOInscription & { satributes: RareSatsType[] })
+      | (Omit<btcTransaction.IOInscription, 'offset'> & { satributes: RareSatsType[] }),
+  ) => void;
+};
+
+function ReceiveSection({ onShowInscription }: Props) {
+  const { t } = useTranslation('translation');
+  const { extractedTxSummary } = useTxSummaryContext();
+  const { ordinalsAddress, btcAddress } = useSelectedAccount();
+  const txIsFinal = extractedTxSummary.isFinal;
+
+  const extractReceiveDetails = (address: string, receive: AggregatedOutputSummary) => {
+    const { btcSatsAmount, inscriptions, satributes, runes } = receive;
+
+    const showReceipts =
+      btcSatsAmount > 0 || inscriptions.length || satributes.length || runes.length;
+
+    if (!showReceipts) {
+      return null;
+    }
+
+    return (
+      <>
+        <Title>{t('CONFIRM_TRANSACTION.YOU_WILL_RECEIVE')}</Title>
+        <Container>
+          <RowContainer noMargin>
+            <SubHeader>
+              <StyledP typography="body_medium_m" color="white_400">
+                {t('COMMON.TO')}
+              </StyledP>
+              <StyledP typography="body_medium_m" color="white_0">
+                {address === btcAddress && t('CONFIRM_TRANSACTION.YOUR_PAYMENT_ADDRESS')}
+                {address === ordinalsAddress && t('CONFIRM_TRANSACTION.YOUR_ORDINAL_ADDRESS')}
+              </StyledP>
+            </SubHeader>
+            {btcSatsAmount > 0 && (
+              <RowContainer
+                noPadding
+                noMargin={!runes.length && !inscriptions.length && !satributes.length}
+              >
+                <Amount amount={btcSatsAmount} />
+                <AmountWithInscriptionSatribute
+                  inscriptions={inscriptions}
+                  satributes={satributes}
+                  onShowInscription={onShowInscription}
+                />
+              </RowContainer>
+            )}
+            {txIsFinal &&
+              runes.map((receipt) => (
+                <RowContainer
+                  noPadding
+                  noMargin={!inscriptions.length && !satributes.length}
+                  key={receipt.runeName}
+                >
+                  <RuneAmount rune={receipt} />
+                </RowContainer>
+              ))}
+            <InscriptionSatributeRow
+              inscriptions={inscriptions}
+              satributes={satributes}
+              onShowInscription={onShowInscription}
+            />
+          </RowContainer>
+        </Container>
+      </>
+    );
+  };
+
+  return (
+    <>
+      {extractedTxSummary.type === 'user' && (
+        <>
+          {extractReceiveDetails(ordinalsAddress, extractedTxSummary.ordinalsAddressReceipts)}
+          {extractReceiveDetails(btcAddress, extractedTxSummary.paymentsAddressReceipts)}
+        </>
+      )}
+      {extractedTxSummary.type === 'aggregated' && (
+        <>
+          {extractReceiveDetails(ordinalsAddress, extractedTxSummary.receipts[ordinalsAddress])}
+          {extractReceiveDetails(btcAddress, extractedTxSummary.receipts[btcAddress])}
+        </>
+      )}
+    </>
+  );
+}
+
+export default ReceiveSection;
diff --git a/src/app/components/confirmBtcTransaction/burnSection.tsx b/src/app/components/confirmBtcTransaction/sections/runesSection/burnSection.tsx
similarity index 79%
rename from src/app/components/confirmBtcTransaction/burnSection.tsx
rename to src/app/components/confirmBtcTransaction/sections/runesSection/burnSection.tsx
index dd7883edc..14824fcba 100644
--- a/src/app/components/confirmBtcTransaction/burnSection.tsx
+++ b/src/app/components/confirmBtcTransaction/sections/runesSection/burnSection.tsx
@@ -1,8 +1,8 @@
-import RuneAmount from '@components/confirmBtcTransaction/itemRow/runeAmount';
-import type { RuneSummary } from '@secretkeylabs/xverse-core';
 import { InputFeedback } from '@ui-library/inputFeedback';
 import { useTranslation } from 'react-i18next';
 import styled from 'styled-components';
+import { useTxSummaryContext } from '../../hooks/useTxSummaryContext';
+import RuneAmount from '../../itemRow/runeAmount';
 
 const Container = styled.div((props) => ({
   display: 'flex',
@@ -30,21 +30,19 @@ const Header = styled(RowCenter)((props) => ({
   padding: `0 ${props.theme.space.m}`,
 }));
 
-type Props = {
-  burns?: RuneSummary['burns'];
-};
-
-function BurnSection({ burns }: Props) {
+function BurnSection() {
   const { t } = useTranslation('translation', { keyPrefix: 'CONFIRM_TRANSACTION' });
 
-  if (!burns?.length) return null;
+  const { extractedTxSummary } = useTxSummaryContext();
+
+  if (!extractedTxSummary.runes.burns?.length) return null;
 
   return (
     <Container>
       <Header spaceBetween>
         <InputFeedback variant="danger" message={t('YOU_WILL_BURN')} />
       </Header>
-      {burns.map((burn) => (
+      {extractedTxSummary.runes.burns.map((burn) => (
         <RowContainer key={burn.runeName}>
           <RuneAmount rune={burn} />
         </RowContainer>
diff --git a/src/app/components/confirmBtcTransaction/delegateSection.tsx b/src/app/components/confirmBtcTransaction/sections/runesSection/delegateSection.tsx
similarity index 54%
rename from src/app/components/confirmBtcTransaction/delegateSection.tsx
rename to src/app/components/confirmBtcTransaction/sections/runesSection/delegateSection.tsx
index 099f95306..e47389a3f 100644
--- a/src/app/components/confirmBtcTransaction/delegateSection.tsx
+++ b/src/app/components/confirmBtcTransaction/sections/runesSection/delegateSection.tsx
@@ -1,13 +1,20 @@
 import DropDownIcon from '@assets/img/transactions/dropDownIcon.svg';
-import RuneAmount from '@components/confirmBtcTransaction/itemRow/runeAmount';
 import { WarningOctagon } from '@phosphor-icons/react';
 import { animated, config, useSpring } from '@react-spring/web';
-import type { RuneSummary } from '@secretkeylabs/xverse-core';
 import { StyledP } from '@ui-library/common.styled';
 import { useState } from 'react';
 import { useTranslation } from 'react-i18next';
 import styled from 'styled-components';
-import Theme from 'theme';
+import Theme from '../../../../../theme';
+import { useTxSummaryContext } from '../../hooks/useTxSummaryContext';
+import RuneAmount from '../../itemRow/runeAmount';
+
+const Title = styled.p`
+  ${(props) => props.theme.typography.body_medium_m};
+  color: ${(props) => props.theme.colors.white_200};
+  margin-top: ${(props) => props.theme.space.s};
+  margin-bottom: ${(props) => props.theme.space.xs};
+`;
 
 const Container = styled.div((props) => ({
   display: 'flex',
@@ -21,7 +28,6 @@ const Container = styled.div((props) => ({
 
 const RowContainer = styled.div((props) => ({
   padding: `0 ${props.theme.space.m}`,
-  marginTop: `${props.theme.space.m}`,
 }));
 
 const RowCenter = styled.div<{ spaceBetween?: boolean }>((props) => ({
@@ -31,10 +37,6 @@ const RowCenter = styled.div<{ spaceBetween?: boolean }>((props) => ({
   justifyContent: props.spaceBetween ? 'space-between' : 'initial',
 }));
 
-const Header = styled(RowCenter)((props) => ({
-  padding: `0 ${props.theme.space.m}`,
-}));
-
 const WarningButton = styled.button`
   display: flex;
   flex-direction: row;
@@ -50,16 +52,17 @@ const DelegationDescription = styled(StyledP)`
   padding-bottom: ${(props) => props.theme.space.xs};
 `;
 
-const Title = styled(StyledP)`
+const Warning = styled(StyledP)`
   margin-left: ${(props) => props.theme.space.xxs};
 `;
 
-type Props = {
-  delegations?: RuneSummary['receipts'];
-};
-
-function DelegateSection({ delegations }: Props) {
+function DelegateSection() {
   const { t } = useTranslation('translation', { keyPrefix: 'CONFIRM_TRANSACTION' });
+  const { extractedTxSummary } = useTxSummaryContext();
+
+  const delegations = !extractedTxSummary.isFinal
+    ? Object.values(extractedTxSummary.transfers).flatMap((addressItem) => addressItem.runes)
+    : [];
 
   const [showDelegationInfo, setShowDelegationInfo] = useState(false);
 
@@ -78,32 +81,33 @@ function DelegateSection({ delegations }: Props) {
   if (!delegations?.length) return null;
 
   return (
-    <Container>
-      <Header>
-        <StyledP typography="body_medium_m" color="white_200">
-          {t('YOU_WILL_DELEGATE')}
-        </StyledP>
-      </Header>
-      {delegations.map((delegation) => (
-        <RowContainer key={delegation.runeName}>
-          <RuneAmount rune={delegation} />
-        </RowContainer>
-      ))}
-      <WarningButton type="button" onClick={() => setShowDelegationInfo((prevState) => !prevState)}>
-        <RowCenter>
-          <WarningOctagon weight="fill" color={Theme.colors.caution} size={16} />
-          <Title typography="body_medium_s" color="caution">
-            {t('UNKNOWN_RUNE_RECIPIENTS')}
-          </Title>
-        </RowCenter>
-        <animated.img style={arrowRotation} src={DropDownIcon} alt="Drop Down" />
-      </WarningButton>
-      <animated.div style={slideInStyles}>
-        <DelegationDescription typography="body_medium_s" color="white_200">
-          {t('RUNE_DELEGATION_DESCRIPTION')}
-        </DelegationDescription>
-      </animated.div>
-    </Container>
+    <>
+      <Title>{t('YOU_WILL_DELEGATE')}</Title>
+      <Container>
+        {delegations.map((delegation) => (
+          <RowContainer key={delegation.runeName}>
+            <RuneAmount rune={delegation} />
+          </RowContainer>
+        ))}
+        <WarningButton
+          type="button"
+          onClick={() => setShowDelegationInfo((prevState) => !prevState)}
+        >
+          <RowCenter>
+            <WarningOctagon weight="fill" color={Theme.colors.caution} size={16} />
+            <Warning typography="body_medium_s" color="caution">
+              {t('UNKNOWN_RUNE_RECIPIENTS')}
+            </Warning>
+          </RowCenter>
+          <animated.img style={arrowRotation} src={DropDownIcon} alt="Drop Down" />
+        </WarningButton>
+        <animated.div style={slideInStyles}>
+          <DelegationDescription typography="body_medium_s" color="white_200">
+            {t('RUNE_DELEGATION_DESCRIPTION')}
+          </DelegationDescription>
+        </animated.div>
+      </Container>
+    </>
   );
 }
 
diff --git a/src/app/components/confirmBtcTransaction/etchSection.tsx b/src/app/components/confirmBtcTransaction/sections/runesSection/etchSection.tsx
similarity index 98%
rename from src/app/components/confirmBtcTransaction/etchSection.tsx
rename to src/app/components/confirmBtcTransaction/sections/runesSection/etchSection.tsx
index 7910bc777..902a76307 100644
--- a/src/app/components/confirmBtcTransaction/etchSection.tsx
+++ b/src/app/components/confirmBtcTransaction/sections/runesSection/etchSection.tsx
@@ -11,8 +11,8 @@ import { ftDecimals, getShortTruncatedAddress } from '@utils/helper';
 import { useCallback, useEffect, useState } from 'react';
 import { useTranslation } from 'react-i18next';
 import { NumericFormat } from 'react-number-format';
-import Theme from '../../../theme';
-import InscribeSection from './inscribeSection';
+import Theme from '../../../../../theme';
+import InscribeSection from '../inscribeSection';
 import {
   AddressLabel,
   Container,
@@ -23,7 +23,7 @@ import {
   RuneImage,
   RuneSymbol,
   RuneValue,
-} from './runes';
+} from './styles';
 
 type Props = {
   etch?: EtchActionDetails;
diff --git a/src/app/components/confirmBtcTransaction/mintSection.tsx b/src/app/components/confirmBtcTransaction/sections/runesSection/mintSection.tsx
similarity index 84%
rename from src/app/components/confirmBtcTransaction/mintSection.tsx
rename to src/app/components/confirmBtcTransaction/sections/runesSection/mintSection.tsx
index 2789261ad..52453382d 100644
--- a/src/app/components/confirmBtcTransaction/mintSection.tsx
+++ b/src/app/components/confirmBtcTransaction/sections/runesSection/mintSection.tsx
@@ -1,11 +1,12 @@
 import useSelectedAccount from '@hooks/useSelectedAccount';
 import { ArrowRight } from '@phosphor-icons/react';
-import type { MintActionDetails, RuneSummary } from '@secretkeylabs/xverse-core';
+import type { MintActionDetails, RuneMint } from '@secretkeylabs/xverse-core';
 import { StyledP } from '@ui-library/common.styled';
 import { ftDecimals, getShortTruncatedAddress } from '@utils/helper';
 import { useTranslation } from 'react-i18next';
 import { NumericFormat } from 'react-number-format';
-import Theme from '../../../theme';
+import Theme from '../../../../../theme';
+import { useTxSummaryContext } from '../../hooks/useTxSummaryContext';
 import {
   AddressLabel,
   Container,
@@ -18,25 +19,24 @@ import {
   RuneSymbol,
   RuneValue,
   StyledPillLabel,
-} from './runes';
+} from './styles';
 
-type Props = {
-  mints?: RuneSummary['mint'][] | MintActionDetails[] | undefined[];
-};
-
-function MintSection({ mints }: Props) {
+function MintSection() {
   const { t } = useTranslation('translation', { keyPrefix: 'CONFIRM_TRANSACTION' });
   const { ordinalsAddress } = useSelectedAccount();
-  if (!mints) return null;
+
+  const { extractedTxSummary, runeMintDetails, batchMintDetails } = useTxSummaryContext();
+
+  if (!extractedTxSummary.runes.mint || !runeMintDetails || !batchMintDetails) return null;
 
   const isMintActionDetails = (
-    obj: RuneSummary['mint'] | MintActionDetails | undefined,
+    obj: RuneMint | MintActionDetails | undefined,
   ): obj is MintActionDetails => obj !== undefined && 'repeats' in obj;
 
   return (
     <>
-      {mints.map(
-        (mint: RuneSummary['mint'] | MintActionDetails | undefined) =>
+      {[extractedTxSummary.runes.mint, runeMintDetails, ...batchMintDetails].map(
+        (mint: RuneMint | MintActionDetails | undefined) =>
           mint && (
             <Container key={mint.runeName}>
               <Header>
diff --git a/src/app/components/confirmBtcTransaction/runes.tsx b/src/app/components/confirmBtcTransaction/sections/runesSection/styles.tsx
similarity index 100%
rename from src/app/components/confirmBtcTransaction/runes.tsx
rename to src/app/components/confirmBtcTransaction/sections/runesSection/styles.tsx
diff --git a/src/app/components/confirmBtcTransaction/sections/sendSection.tsx b/src/app/components/confirmBtcTransaction/sections/sendSection.tsx
new file mode 100644
index 000000000..95e921861
--- /dev/null
+++ b/src/app/components/confirmBtcTransaction/sections/sendSection.tsx
@@ -0,0 +1,127 @@
+import type { btcTransaction, RareSatsType } from '@secretkeylabs/xverse-core';
+import { StyledP } from '@ui-library/common.styled';
+import { getTruncatedAddress } from '@utils/helper';
+import { useTranslation } from 'react-i18next';
+import { NumericFormat } from 'react-number-format';
+import styled from 'styled-components';
+import { useTxSummaryContext } from '../hooks/useTxSummaryContext';
+import Amount from '../itemRow/amount';
+import AmountWithInscriptionSatribute from '../itemRow/amountWithInscriptionSatribute';
+import InscriptionSatributeRow from '../itemRow/inscriptionSatributeRow';
+import RuneAmount from '../itemRow/runeAmount';
+
+const Title = styled.p`
+  ${(props) => props.theme.typography.body_medium_m};
+  color: ${(props) => props.theme.colors.white_200};
+  margin-top: ${(props) => props.theme.space.s};
+  margin-bottom: ${(props) => props.theme.space.xs};
+`;
+
+const Container = styled.div((props) => ({
+  display: 'flex',
+  flexDirection: 'column',
+  background: props.theme.colors.elevation1,
+  borderRadius: props.theme.radius(2),
+  paddingTop: props.theme.space.m,
+  justifyContent: 'center',
+  marginBottom: props.theme.space.s,
+}));
+
+const RowContainer = styled.div<{ noPadding?: boolean; noMargin?: boolean }>((props) => ({
+  padding: props.noPadding ? 0 : `0 ${props.theme.space.m}`,
+  marginBottom: props.noMargin ? 0 : props.theme.space.m,
+}));
+
+const SubHeader = styled.div((props) => ({
+  display: 'flex',
+  flex: 1,
+  flexDirection: 'row',
+  justifyContent: 'space-between',
+  marginBottom: props.theme.space.s,
+}));
+
+function SendSection({
+  onShowInscription,
+}: {
+  onShowInscription: (
+    inscription:
+      | (btcTransaction.IOInscription & { satributes: RareSatsType[] })
+      | (Omit<btcTransaction.IOInscription, 'offset'> & { satributes: RareSatsType[] }),
+  ) => void;
+}) {
+  const { t } = useTranslation('translation');
+
+  const { extractedTxSummary } = useTxSummaryContext();
+
+  if (extractedTxSummary.type !== 'user' || !extractedTxSummary.transfers.length) return null;
+
+  return (
+    <>
+      <Title>{t('CONFIRM_TRANSACTION.YOU_WILL_SEND')}</Title>
+      {extractedTxSummary.transfers.map((transfer) => (
+        <Container key={transfer.scriptHex}>
+          <RowContainer noMargin>
+            <SubHeader>
+              <StyledP typography="body_medium_m" color="white_400">
+                {t('COMMON.TO')}
+              </StyledP>
+              <StyledP typography="body_medium_m" color="white_0">
+                {/* TODO - clarify what to display when not an address type */}
+                {transfer.address
+                  ? getTruncatedAddress(transfer.address, 6)
+                  : transfer.destinationType}
+              </StyledP>
+            </SubHeader>
+            {transfer.btcSatsAmount > 0 && (
+              <>
+                <Amount amount={transfer.btcSatsAmount} />
+                <AmountWithInscriptionSatribute
+                  inscriptions={[]}
+                  satributes={[]}
+                  onShowInscription={onShowInscription}
+                />
+              </>
+            )}
+            {transfer.bundles.map((bundle) => (
+              <>
+                <SubHeader>
+                  <StyledP typography="body_medium_m" color="white_400">
+                    {t('COMMON.BUNDLE')}
+                  </StyledP>
+                  <NumericFormat
+                    value={bundle.amount}
+                    displayType="text"
+                    thousandSeparator
+                    prefix={`${t('COMMON.SIZE')}: `}
+                    suffix={` ${t('COMMON.SATS')}`}
+                    renderText={(value: string) => (
+                      <StyledP typography="body_medium_m" color="white_400">
+                        {value}
+                      </StyledP>
+                    )}
+                  />
+                </SubHeader>
+                {bundle.runes.map((runeTransfer, i) => (
+                  <RuneAmount
+                    key={runeTransfer.runeId}
+                    rune={runeTransfer}
+                    topMargin={i === 0 && transfer.btcSatsAmount > 0}
+                    hasSufficientBalance
+                  />
+                ))}
+                <InscriptionSatributeRow
+                  bundleSize={bundle.amount}
+                  inscriptions={bundle.inscriptions}
+                  satributes={bundle.satributes}
+                  onShowInscription={onShowInscription}
+                />
+              </>
+            ))}
+          </RowContainer>
+        </Container>
+      ))}
+    </>
+  );
+}
+
+export default SendSection;
diff --git a/src/app/components/confirmBtcTransaction/sections/transferSection.tsx b/src/app/components/confirmBtcTransaction/sections/transferSection.tsx
new file mode 100644
index 000000000..bd2d2046f
--- /dev/null
+++ b/src/app/components/confirmBtcTransaction/sections/transferSection.tsx
@@ -0,0 +1,157 @@
+import useSelectedAccount from '@hooks/useSelectedAccount';
+import { WarningOctagon } from '@phosphor-icons/react';
+import type {
+  AggregatedInputSummary,
+  btcTransaction,
+  RareSatsType,
+} from '@secretkeylabs/xverse-core';
+import { StyledP } from '@ui-library/common.styled';
+import { useTranslation } from 'react-i18next';
+import styled from 'styled-components';
+import Theme from '../../../../theme';
+import { useTxSummaryContext } from '../hooks/useTxSummaryContext';
+import Amount from '../itemRow/amount';
+import AmountWithInscriptionSatribute from '../itemRow/amountWithInscriptionSatribute';
+import InscriptionSatributeRow from '../itemRow/inscriptionSatributeRow';
+import RuneAmount from '../itemRow/runeAmount';
+
+const Title = styled.p`
+  ${(props) => props.theme.typography.body_medium_m};
+  color: ${(props) => props.theme.colors.white_200};
+  margin-top: ${(props) => props.theme.space.s};
+  margin-bottom: ${(props) => props.theme.space.xs};
+`;
+
+const Container = styled.div((props) => ({
+  display: 'flex',
+  flexDirection: 'column',
+  background: props.theme.colors.elevation1,
+  borderRadius: props.theme.radius(2),
+  paddingTop: props.theme.space.m,
+  justifyContent: 'center',
+  marginBottom: props.theme.space.s,
+}));
+
+const RowContainer = styled.div<{ noPadding?: boolean; noMargin?: boolean }>((props) => ({
+  padding: props.noPadding ? 0 : `0 ${props.theme.space.m}`,
+  marginBottom: props.noMargin ? 0 : props.theme.space.m,
+}));
+
+const WarningContainer = styled.div((props) => ({
+  display: 'flex',
+  flexDirection: 'row',
+  alignItems: 'center',
+  gap: props.theme.space.xs,
+  marginTop: props.theme.space.s,
+}));
+
+const WarningText = styled(StyledP)`
+  flex: 1 0 0;
+`;
+
+const SubHeader = styled.div((props) => ({
+  display: 'flex',
+  flex: 1,
+  flexDirection: 'row',
+  justifyContent: 'space-between',
+  marginBottom: props.theme.space.s,
+}));
+
+type Props = {
+  onShowInscription: (
+    inscription:
+      | (btcTransaction.IOInscription & { satributes: RareSatsType[] })
+      | (Omit<btcTransaction.IOInscription, 'offset'> & { satributes: RareSatsType[] }),
+  ) => void;
+};
+
+function TransferSection({ onShowInscription }: Props) {
+  const { btcAddress, ordinalsAddress } = useSelectedAccount();
+  const { t } = useTranslation('translation');
+  const { extractedTxSummary } = useTxSummaryContext();
+
+  if (
+    extractedTxSummary.type !== 'aggregated' ||
+    !Object.values(extractedTxSummary.transfers).length
+  ) {
+    return null;
+  }
+
+  const txIsFinal = extractedTxSummary.isFinal;
+
+  const extractTransferDetails = (address: string, transfer: AggregatedInputSummary) => {
+    const { btcSatsAmount, inscriptions, satributes, runes } = transfer;
+
+    const showTransfers =
+      (txIsFinal && btcSatsAmount > 0) ||
+      inscriptions.length ||
+      satributes.length ||
+      (txIsFinal && runes.length);
+
+    if (!showTransfers) return null;
+
+    return (
+      <>
+        <Title>{t('CONFIRM_TRANSACTION.YOU_WILL_TRANSFER')}</Title>
+        <Container>
+          <RowContainer noMargin>
+            <SubHeader>
+              <StyledP typography="body_medium_m" color="white_400">
+                {t('COMMON.FROM')}
+              </StyledP>
+              <StyledP typography="body_medium_m" color="white_0">
+                {address === btcAddress && t('CONFIRM_TRANSACTION.YOUR_PAYMENT_ADDRESS')}
+                {address === ordinalsAddress && t('CONFIRM_TRANSACTION.YOUR_ORDINAL_ADDRESS')}
+              </StyledP>
+            </SubHeader>
+            {txIsFinal && btcSatsAmount > 0 && (
+              <RowContainer
+                noPadding
+                noMargin={!runes.length && !inscriptions.length && !satributes.length}
+              >
+                <Amount amount={btcSatsAmount} />
+                <AmountWithInscriptionSatribute
+                  inscriptions={inscriptions}
+                  satributes={satributes}
+                  onShowInscription={onShowInscription}
+                />
+                <WarningContainer>
+                  <WarningOctagon weight="fill" color={Theme.colors.caution} size={16} />
+                  <WarningText typography="body_medium_s" color="caution">
+                    {t('CONFIRM_TRANSACTION.BTC_TRANSFER_WARNING')}
+                  </WarningText>
+                </WarningContainer>
+              </RowContainer>
+            )}
+            {txIsFinal &&
+              runes.map((runeTransfer) => (
+                <RowContainer
+                  key={runeTransfer.runeName}
+                  noPadding
+                  noMargin={!inscriptions.length && !satributes.length}
+                >
+                  <RuneAmount rune={runeTransfer} hasSufficientBalance />
+                </RowContainer>
+              ))}
+            <InscriptionSatributeRow
+              inscriptions={inscriptions}
+              satributes={satributes}
+              onShowInscription={onShowInscription}
+            />
+          </RowContainer>
+        </Container>
+      </>
+    );
+  };
+
+  return (
+    <>
+      {extractedTxSummary.transfers[btcAddress] &&
+        extractTransferDetails(btcAddress, extractedTxSummary.transfers[btcAddress])}
+      {extractedTxSummary.transfers[ordinalsAddress] &&
+        extractTransferDetails(ordinalsAddress, extractedTxSummary.transfers[ordinalsAddress])}
+    </>
+  );
+}
+
+export default TransferSection;
diff --git a/src/app/components/confirmBtcTransaction/sendSection.tsx b/src/app/components/confirmBtcTransaction/sendSection.tsx
deleted file mode 100644
index 833352000..000000000
--- a/src/app/components/confirmBtcTransaction/sendSection.tsx
+++ /dev/null
@@ -1,102 +0,0 @@
-import { useParsedTxSummaryContext } from '@components/confirmBtcTransaction/hooks/useParsedTxSummaryContext';
-import RuneAmount from '@components/confirmBtcTransaction/itemRow/runeAmount';
-import type { btcTransaction } from '@secretkeylabs/xverse-core';
-import { StyledP } from '@ui-library/common.styled';
-import { getTruncatedAddress } from '@utils/helper';
-import { useTranslation } from 'react-i18next';
-import styled from 'styled-components';
-import Amount from './itemRow/amount';
-import AmountWithInscriptionSatribute from './itemRow/amountWithInscriptionSatribute';
-import InscriptionSatributeRow from './itemRow/inscriptionSatributeRow';
-
-const Title = styled.p`
-  ${(props) => props.theme.typography.body_medium_m};
-  color: ${(props) => props.theme.colors.white_200};
-  margin-top: ${(props) => props.theme.space.s};
-  margin-bottom: ${(props) => props.theme.space.xs};
-`;
-
-const Container = styled.div((props) => ({
-  display: 'flex',
-  flexDirection: 'column',
-  background: props.theme.colors.elevation1,
-  borderRadius: props.theme.radius(2),
-  paddingTop: props.theme.space.m,
-  justifyContent: 'center',
-  marginBottom: props.theme.space.s,
-}));
-
-const RowContainer = styled.div((props) => ({
-  padding: `0 ${props.theme.space.m}`,
-  marginBottom: props.theme.space.s,
-}));
-
-const BundleHeader = styled.div((props) => ({
-  display: 'flex',
-  flex: 1,
-  flexDirection: 'row',
-  justifyContent: 'space-between',
-  marginBottom: props.theme.space.s,
-}));
-
-function SendSection({
-  onShowInscription,
-}: {
-  onShowInscription: (inscription: btcTransaction.IOInscription) => void;
-}) {
-  const { t } = useTranslation('translation');
-  const {
-    showSendSection,
-    sendSection: { bundledOutputs, inscriptionsFromPayment, satributesFromPayment },
-  } = useParsedTxSummaryContext();
-
-  if (!showSendSection || !Object.entries(bundledOutputs).length) return null;
-
-  return (
-    <>
-      <Title>{t('CONFIRM_TRANSACTION.YOU_WILL_SEND')}</Title>
-      {Object.entries(bundledOutputs).map(([address, bundle], index) => (
-        <Container key={address}>
-          <RowContainer>
-            <BundleHeader>
-              <StyledP typography="body_medium_m" color="white_400">
-                {t('COMMON.TO')}
-              </StyledP>
-              <StyledP typography="body_medium_m" color="white_0">
-                {getTruncatedAddress(address, 6)}
-              </StyledP>
-            </BundleHeader>
-            <Amount amount={bundle.netBtcAmount} />
-            <AmountWithInscriptionSatribute
-              inscriptions={inscriptionsFromPayment}
-              satributes={satributesFromPayment}
-              onShowInscription={onShowInscription}
-            />
-            {bundle.runeTransfers.map((runeTransfer) => (
-              <RuneAmount
-                // eslint-disable-next-line react/no-array-index-key
-                key={index}
-                rune={runeTransfer}
-                hasSufficientBalance={runeTransfer.hasSufficientBalance}
-              />
-            ))}
-            {bundle.outputs.map((output) => (
-              <InscriptionSatributeRow
-                // eslint-disable-next-line react/no-array-index-key
-                key={index}
-                inscriptions={output.inscriptions}
-                satributes={output.satributes}
-                amount={output.amount}
-                topMargin={bundle.netBtcAmount > 0 || bundle.runeTransfers.length > 0}
-                showAmount
-                onShowInscription={onShowInscription}
-              />
-            ))}
-          </RowContainer>
-        </Container>
-      ))}
-    </>
-  );
-}
-
-export default SendSection;
diff --git a/src/app/components/confirmBtcTransaction/transactionSummary.tsx b/src/app/components/confirmBtcTransaction/transactionSummary.tsx
index 2bd9dcf01..60705b248 100644
--- a/src/app/components/confirmBtcTransaction/transactionSummary.tsx
+++ b/src/app/components/confirmBtcTransaction/transactionSummary.tsx
@@ -1,39 +1,21 @@
+import AssetModal from '@components/assetModal';
 import TransactionDetailComponent from '@components/transactionDetailComponent';
 import useWalletSelector from '@hooks/useWalletSelector';
-
-import AssetModal from '@components/assetModal';
-import BurnSection from '@components/confirmBtcTransaction/burnSection';
-import MintSection from '@components/confirmBtcTransaction/mintSection';
-import TransferFeeView from '@components/transferFeeView';
-import useCoinRates from '@hooks/queries/useCoinRates';
-import useBtcFeeRate from '@hooks/useBtcFeeRate';
-import {
-  btcTransaction,
-  getBtcFiatEquivalent,
-  type RuneSummaryActions,
-} from '@secretkeylabs/xverse-core';
-import SelectFeeRate from '@ui-components/selectFeeRate';
+import { btcTransaction, type RareSatsType } from '@secretkeylabs/xverse-core';
 import Callout from '@ui-library/callout';
-import BigNumber from 'bignumber.js';
 import { useState } from 'react';
 import { useTranslation } from 'react-i18next';
 import styled from 'styled-components';
-import DelegateSection from './delegateSection';
-import EtchSection from './etchSection';
-import { useParsedTxSummaryContext } from './hooks/useParsedTxSummaryContext';
-import AmountWithInscriptionSatribute from './itemRow/amountWithInscriptionSatribute';
-import ReceiveSection from './receiveSection';
-import SendSection from './sendSection';
-import TransferSection from './transferSection';
-import TxInOutput from './txInOutput/txInOutput';
-
-const Container = styled.div((props) => ({
-  background: props.theme.colors.elevation1,
-  borderRadius: props.theme.radius(2),
-  padding: props.theme.space.m,
-  paddingBottom: 20,
-  marginBottom: props.theme.space.s,
-}));
+import { useTxSummaryContext } from './hooks/useTxSummaryContext';
+import FeeSection from './sections/feeSection';
+import ReceiveSection from './sections/receiveSection';
+import BurnSection from './sections/runesSection/burnSection';
+import DelegateSection from './sections/runesSection/delegateSection';
+import EtchSection from './sections/runesSection/etchSection';
+import MintSection from './sections/runesSection/mintSection';
+import SendSection from './sections/sendSection';
+import TransferSection from './sections/transferSection';
+import TxInOutput from './txInOutput';
 
 const WarningCallout = styled(Callout)`
   margin-bottom: ${(props) => props.theme.space.m};
@@ -47,40 +29,35 @@ const Subtitle = styled.p`
 `;
 
 type Props = {
+  feeRate?: number;
   getFeeForFeeRate?: (
     feeRate: number,
     useEffectiveFeeRate?: boolean,
   ) => Promise<number | undefined>;
   onFeeRateSet?: (feeRate: number) => void;
-  feeRate?: number;
   isSubmitting?: boolean;
+  hideDetails?: boolean;
 };
 
-function TransactionSummary({ isSubmitting, getFeeForFeeRate, onFeeRateSet, feeRate }: Props) {
+function TransactionSummary({
+  feeRate,
+  getFeeForFeeRate,
+  onFeeRateSet,
+  isSubmitting,
+  hideDetails,
+}: Props) {
   const [inscriptionToShow, setInscriptionToShow] = useState<
-    btcTransaction.IOInscription | undefined
+    | (btcTransaction.IOInscription & { satributes: RareSatsType[] })
+    | (Omit<btcTransaction.IOInscription, 'offset'> & { satributes: RareSatsType[] })
+    | undefined
   >(undefined);
 
-  const { btcFiatRate } = useCoinRates();
-  const { network, fiatCurrency } = useWalletSelector();
+  const { network } = useWalletSelector();
   const { t } = useTranslation('translation', { keyPrefix: 'CONFIRM_TRANSACTION' });
-  const { t: tUnits } = useTranslation('translation', { keyPrefix: 'UNITS' });
-  const { data: recommendedFees } = useBtcFeeRate();
-  const {
-    summary,
-    runeSummary,
-    isUnconfirmedInput,
-    hasOutputScript,
-    showCenotaphCallout,
-    transactionIsFinal,
-  } = useParsedTxSummaryContext();
-
-  const satsToFiat = (sats: string) =>
-    getBtcFiatEquivalent(new BigNumber(sats), new BigNumber(btcFiatRate)).toString();
-
-  const showFeeSelector = !!(feeRate && getFeeForFeeRate && onFeeRateSet);
+  const { extractedTxSummary, runeEtchDetails } = useTxSummaryContext();
 
-  const hasRuneDelegation = !transactionIsFinal;
+  const { hasUnconfirmedInputs, hasOutputScript, runes } = extractedTxSummary;
+  const { hasCenotaph, mint } = runes;
 
   return (
     <>
@@ -94,70 +71,38 @@ function TransactionSummary({ isSubmitting, getFeeForFeeRate, onFeeRateSet, feeR
           }}
         />
       )}
-      {isUnconfirmedInput && (
+      {hasUnconfirmedInputs && (
         <WarningCallout bodyText={t('UNCONFIRMED_UTXO_WARNING')} variant="warning" />
       )}
-      {showCenotaphCallout && (
-        <WarningCallout variant="danger" bodyText={t('RUNES_CENOTAPH_WARNING')} />
-      )}
-      {runeSummary?.mint && !runeSummary?.mint?.runeIsOpen && (
+      {hasCenotaph && <WarningCallout variant="danger" bodyText={t('RUNES_CENOTAPH_WARNING')} />}
+      {mint && !mint.runeIsOpen && (
         <WarningCallout bodyText={t('RUNE_TERM_ENDED')} variant="danger" />
       )}
-      {runeSummary?.mint && !runeSummary?.mint?.runeIsMintable && (
+      {mint && !mint.runeIsMintable && (
         <WarningCallout bodyText={t('RUNE_IS_CLOSED')} variant="danger" />
       )}
-      {hasRuneDelegation && <DelegateSection delegations={runeSummary?.receipts} />}
+      <DelegateSection />
       <SendSection onShowInscription={setInscriptionToShow} />
       <TransferSection onShowInscription={setInscriptionToShow} />
       <ReceiveSection onShowInscription={setInscriptionToShow} />
-      {!hasRuneDelegation && <BurnSection burns={runeSummary?.burns} />}
-      <MintSection mints={[runeSummary?.mint]} />
-      <EtchSection etch={(runeSummary as RuneSummaryActions)?.etch} />
-      <Subtitle>{t('TRANSACTION_DETAILS')}</Subtitle>
+      <BurnSection />
+      <MintSection />
+      <EtchSection etch={runeEtchDetails} />
+      {!hideDetails && <Subtitle>{t('TRANSACTION_DETAILS')}</Subtitle>}
       <TransactionDetailComponent title={t('NETWORK')} value={network.type} />
-      <TxInOutput />
-      {hasOutputScript && !runeSummary && <WarningCallout bodyText={t('SCRIPT_OUTPUT_TX')} />}
-      {summary?.feeOutput && !showFeeSelector && (
-        <TransferFeeView
-          fee={new BigNumber(summary.feeOutput.amount)}
-          currency={t('SATS')}
-          satributes={summary?.feeOutput.satributes}
-          inscriptions={summary?.feeOutput.inscriptions}
-          onShowInscription={setInscriptionToShow}
-        />
+      {!hideDetails && (
+        <>
+          <TxInOutput />
+          {hasOutputScript && !runes && <WarningCallout bodyText={t('SCRIPT_OUTPUT_TX')} />}
+          <FeeSection
+            feeRate={feeRate}
+            getFeeForFeeRate={getFeeForFeeRate}
+            onFeeRateSet={onFeeRateSet}
+            isSubmitting={isSubmitting}
+            onShowInscription={setInscriptionToShow}
+          />
+        </>
       )}
-      {summary?.feeOutput &&
-        showFeeSelector &&
-        onFeeRateSet &&
-        getFeeForFeeRate &&
-        recommendedFees && (
-          <>
-            <Subtitle>{t('FEES')}</Subtitle>
-            <Container>
-              <SelectFeeRate
-                fee={summary.feeOutput.amount.toString()}
-                feeUnits="sats"
-                feeRate={String(feeRate)}
-                feeRateUnits={tUnits('SATS_PER_VB')}
-                setFeeRate={(newFeeRate) => onFeeRateSet(+newFeeRate)}
-                baseToFiat={satsToFiat}
-                fiatUnit={fiatCurrency}
-                getFeeForFeeRate={getFeeForFeeRate}
-                feeRates={{
-                  medium: recommendedFees.regular,
-                  high: recommendedFees.priority,
-                }}
-                feeRateLimits={recommendedFees.limits}
-                isLoading={isSubmitting}
-              />
-              <AmountWithInscriptionSatribute
-                inscriptions={summary.feeOutput.inscriptions}
-                satributes={summary.feeOutput.satributes}
-                onShowInscription={setInscriptionToShow}
-              />
-            </Container>
-          </>
-        )}
     </>
   );
 }
diff --git a/src/app/components/confirmBtcTransaction/transferSection.tsx b/src/app/components/confirmBtcTransaction/transferSection.tsx
deleted file mode 100644
index 44edfa9be..000000000
--- a/src/app/components/confirmBtcTransaction/transferSection.tsx
+++ /dev/null
@@ -1,136 +0,0 @@
-import { useParsedTxSummaryContext } from '@components/confirmBtcTransaction/hooks/useParsedTxSummaryContext';
-import RuneAmount from '@components/confirmBtcTransaction/itemRow/runeAmount';
-import { WarningOctagon } from '@phosphor-icons/react';
-import { type btcTransaction } from '@secretkeylabs/xverse-core';
-import { StyledP } from '@ui-library/common.styled';
-import Divider from '@ui-library/divider';
-import { useTranslation } from 'react-i18next';
-import styled from 'styled-components';
-import Theme from 'theme';
-import Amount from './itemRow/amount';
-import AmountWithInscriptionSatribute from './itemRow/amountWithInscriptionSatribute';
-import InscriptionSatributeRow from './itemRow/inscriptionSatributeRow';
-
-const Title = styled.p`
-  ${(props) => props.theme.typography.body_medium_m};
-  color: ${(props) => props.theme.colors.white_200};
-  margin-top: ${(props) => props.theme.space.s};
-  margin-bottom: ${(props) => props.theme.space.xs};
-`;
-
-const Container = styled.div((props) => ({
-  display: 'flex',
-  flexDirection: 'column',
-  background: props.theme.colors.elevation1,
-  borderRadius: props.theme.radius(2),
-  paddingTop: props.theme.space.m,
-  justifyContent: 'center',
-  marginBottom: props.theme.space.s,
-}));
-
-const RowContainer = styled.div<{ noPadding?: boolean; noMargin?: boolean }>((props) => ({
-  padding: props.noPadding ? 0 : `0 ${props.theme.space.m}`,
-}));
-
-const WarningContainer = styled.div((props) => ({
-  display: 'flex',
-  flexDirection: 'row',
-  alignItems: 'center',
-  gap: props.theme.space.xs,
-  marginTop: props.theme.space.s,
-}));
-
-const WarningText = styled(StyledP)`
-  flex: 1 0 0;
-`;
-
-type Props = { onShowInscription: (inscription: btcTransaction.IOInscription) => void };
-
-function TransferSection({ onShowInscription }: Props) {
-  const { t } = useTranslation('translation');
-  const {
-    runeSummary,
-    netBtcAmount,
-    showTransferSection,
-    transactionIsFinal,
-    transferSection: {
-      showBtcAmount,
-      showRuneTransfers,
-      outputsFromOrdinal,
-      inputsFromOrdinal,
-      inscriptionsFromPayment,
-      satributesFromPayment,
-    },
-  } = useParsedTxSummaryContext();
-
-  if (!showTransferSection) return null;
-
-  return (
-    <>
-      <Title>{t('CONFIRM_TRANSACTION.YOU_WILL_TRANSFER')}</Title>
-      <Container>
-        <RowContainer noMargin>
-          {showBtcAmount && (
-            <>
-              <Amount amount={-netBtcAmount} />
-              <AmountWithInscriptionSatribute
-                inscriptions={inscriptionsFromPayment}
-                satributes={satributesFromPayment}
-                onShowInscription={onShowInscription}
-              />
-              <WarningContainer>
-                <WarningOctagon weight="fill" color={Theme.colors.caution} size={16} />
-                <WarningText typography="body_medium_s" color="caution">
-                  {t('CONFIRM_TRANSACTION.BTC_TRANSFER_WARNING')}
-                </WarningText>
-              </WarningContainer>
-            </>
-          )}
-          {showRuneTransfers &&
-            runeSummary?.transfers?.map((transfer, index) => (
-              <>
-                {showBtcAmount && index === 0 && <Divider verticalMargin="s" />}
-                <RuneAmount rune={transfer} hasSufficientBalance={transfer.hasSufficientBalance} />
-                {runeSummary?.transfers.length > index + 1 && <Divider verticalMargin="s" />}
-              </>
-            ))}
-          {transactionIsFinal
-            ? outputsFromOrdinal.map((output, index) => (
-                <>
-                  {(showRuneTransfers || showBtcAmount) && index === 0 && (
-                    <Divider verticalMargin="s" />
-                  )}
-                  <InscriptionSatributeRow
-                    // eslint-disable-next-line react/no-array-index-key
-                    key={index}
-                    inscriptions={output.inscriptions}
-                    satributes={output.satributes}
-                    amount={output.amount}
-                    onShowInscription={onShowInscription}
-                  />
-                  {outputsFromOrdinal.length > index + 1 && <Divider verticalMargin="s" />}
-                </>
-              ))
-            : inputsFromOrdinal.map((input, index) => (
-                <>
-                  {(showRuneTransfers || showBtcAmount) && index === 0 && (
-                    <Divider verticalMargin="s" />
-                  )}
-                  <InscriptionSatributeRow
-                    // eslint-disable-next-line react/no-array-index-key
-                    key={index}
-                    inscriptions={input.inscriptions}
-                    satributes={input.satributes}
-                    amount={input.extendedUtxo.utxo.value}
-                    onShowInscription={onShowInscription}
-                  />
-                  {inputsFromOrdinal.length > index + 1 && <Divider verticalMargin="s" />}
-                </>
-              ))}
-        </RowContainer>
-      </Container>
-    </>
-  );
-}
-
-export default TransferSection;
diff --git a/src/app/components/confirmBtcTransaction/txInOutput/txInOutput.tsx b/src/app/components/confirmBtcTransaction/txInOutput/index.tsx
similarity index 87%
rename from src/app/components/confirmBtcTransaction/txInOutput/txInOutput.tsx
rename to src/app/components/confirmBtcTransaction/txInOutput/index.tsx
index ee2201638..6e854ad1b 100644
--- a/src/app/components/confirmBtcTransaction/txInOutput/txInOutput.tsx
+++ b/src/app/components/confirmBtcTransaction/txInOutput/index.tsx
@@ -1,11 +1,10 @@
 import DropDownIcon from '@assets/img/transactions/dropDownIcon.svg';
-import { useParsedTxSummaryContext } from '@components/confirmBtcTransaction/hooks/useParsedTxSummaryContext';
 import { animated, config, useSpring } from '@react-spring/web';
 import { StyledP } from '@ui-library/common.styled';
 import { useState } from 'react';
 import { useTranslation } from 'react-i18next';
 import styled from 'styled-components';
-import { isScriptOutput } from '../utils';
+import { useTxSummaryContext } from '../hooks/useTxSummaryContext';
 import TransactionInput from './transactionInput';
 import TransactionOutput from './transactionOutput';
 
@@ -46,7 +45,7 @@ function TxInOutput() {
   const [isExpanded, setIsExpanded] = useState(false);
 
   const { t } = useTranslation('translation', { keyPrefix: 'CONFIRM_TRANSACTION' });
-  const { summary } = useParsedTxSummaryContext();
+  const { extractedTxSummary } = useTxSummaryContext();
 
   const slideInStyles = useSpring({
     config: { ...config.gentle, duration: 400 },
@@ -76,18 +75,18 @@ function TxInOutput() {
       </Button>
       {isExpanded && (
         <ExpandedContainer style={slideInStyles}>
-          {summary?.inputs.map((input) => (
+          {extractedTxSummary.inputs.map((input) => (
             <TransactionInput input={input} key={input.extendedUtxo.outpoint} />
           ))}
           <OutputTitleText typography="body_medium_m" color="white_400">
             {t('OUTPUT')}
           </OutputTitleText>
-          {summary?.outputs.map((output, index) => (
+          {extractedTxSummary.outputs.map((output, index) => (
             <TransactionOutput
               // eslint-disable-next-line react/no-array-index-key
               key={index}
               output={output}
-              scriptOutputCount={isScriptOutput(output) ? scriptOutputCount++ : undefined}
+              scriptOutputCount={output.type === 'script' ? scriptOutputCount++ : undefined}
             />
           ))}
         </ExpandedContainer>
diff --git a/src/app/components/confirmBtcTransaction/txInOutput/transactionOutput.tsx b/src/app/components/confirmBtcTransaction/txInOutput/transactionOutput.tsx
index c684fb8e6..7d466f7b6 100644
--- a/src/app/components/confirmBtcTransaction/txInOutput/transactionOutput.tsx
+++ b/src/app/components/confirmBtcTransaction/txInOutput/transactionOutput.tsx
@@ -8,7 +8,6 @@ import { getTruncatedAddress } from '@utils/helper';
 import BigNumber from 'bignumber.js';
 import { useTranslation } from 'react-i18next';
 import styled from 'styled-components';
-import { isAddressOutput, isPubKeyOutput, isScriptOutput } from '../utils';
 
 const TransferDetailContainer = styled.div((props) => ({
   paddingBottom: props.theme.space.m,
@@ -37,8 +36,9 @@ type Props = {
 function TransactionOutput({ output, scriptOutputCount }: Props) {
   const { btcAddress, ordinalsAddress, btcPublicKey, ordinalsPublicKey } = useSelectedAccount();
   const { t } = useTranslation('translation', { keyPrefix: 'CONFIRM_TRANSACTION' });
-  const isOutputWithScript = isScriptOutput(output);
-  const isOutputWithPubKey = isPubKeyOutput(output);
+  const isOutputWithScript = output.type === 'script';
+  const isOutputWithAddress = output.type === 'address';
+  const isOutputWithPubKey = !isOutputWithScript && !isOutputWithAddress;
 
   const detailViewIcon = isOutputWithScript ? ScriptIcon : OutputIcon;
   const detailViewHideCopyButton =
@@ -93,7 +93,7 @@ function TransactionOutput({ output, scriptOutputCount }: Props) {
         hideCopyButton={detailViewHideCopyButton}
         dataTestID="confirm-amount"
         amount={`${satsToBtc(
-          new BigNumber(isAddressOutput(output) ? output.amount.toString() : '0'),
+          new BigNumber(isOutputWithAddress ? output.amount.toString() : '0'),
         ).toFixed()} BTC`}
         address={isOutputWithScript || isOutputWithPubKey ? '' : output.address}
         outputScript={isOutputWithScript ? output.script : undefined}
diff --git a/src/app/components/confirmBtcTransaction/utils.ts b/src/app/components/confirmBtcTransaction/utils.ts
deleted file mode 100644
index c7ec80165..000000000
--- a/src/app/components/confirmBtcTransaction/utils.ts
+++ /dev/null
@@ -1,316 +0,0 @@
-import type {
-  btcTransaction,
-  BundleSatRange,
-  FungibleToken,
-  RuneBase,
-} from '@secretkeylabs/xverse-core';
-
-// TODO this should all be in core and unit tested
-
-export type SatRangeTx = {
-  totalSats: number;
-  offset: number;
-  fromAddress: string;
-  inscriptions: (Omit<btcTransaction.IOInscription, 'contentType' | 'number'> & {
-    content_type: string;
-    inscription_number: number;
-  })[];
-  satributes: btcTransaction.IOSatribute['types'];
-};
-
-const DUMMY_OFFSET = -1;
-
-export const isScriptOutput = (
-  output: btcTransaction.EnhancedOutput,
-): output is btcTransaction.TransactionScriptOutput =>
-  (output as btcTransaction.TransactionScriptOutput).script !== undefined;
-
-export const isPubKeyOutput = (
-  output: btcTransaction.EnhancedOutput,
-): output is btcTransaction.TransactionPubKeyOutput =>
-  !!(output as btcTransaction.TransactionPubKeyOutput).pubKeys?.length;
-
-export const isAddressOutput = (
-  output: btcTransaction.EnhancedOutput,
-): output is btcTransaction.TransactionOutput =>
-  (output as btcTransaction.TransactionOutput).address !== undefined;
-
-type CommonInputOutputUtilProps = {
-  inputs?: btcTransaction.EnhancedInput[];
-  outputs?: btcTransaction.EnhancedOutput[];
-  btcAddress: string;
-  ordinalsAddress: string;
-};
-
-export const getNetAmount = ({
-  inputs,
-  outputs,
-  btcAddress,
-  ordinalsAddress,
-}: CommonInputOutputUtilProps) => {
-  if (!inputs || !outputs) {
-    return 0;
-  }
-
-  const initialValue = 0;
-
-  const totalUserSpend = inputs.reduce((accumulator: number, input) => {
-    const isFromUserAddress = [btcAddress, ordinalsAddress].includes(input.extendedUtxo.address);
-    if (isFromUserAddress) {
-      return accumulator + input.extendedUtxo.utxo.value;
-    }
-    return accumulator;
-  }, initialValue);
-
-  const totalUserReceive = outputs.reduce((accumulator: number, output) => {
-    const isToUserAddress =
-      isAddressOutput(output) && [btcAddress, ordinalsAddress].includes(output.address);
-    if (isToUserAddress) {
-      return accumulator + output.amount;
-    }
-    return accumulator;
-  }, initialValue);
-
-  return totalUserReceive - totalUserSpend;
-};
-
-export const getOutputsWithAssetsFromUserAddress = ({
-  btcAddress,
-  ordinalsAddress,
-  outputs,
-}: Omit<CommonInputOutputUtilProps, 'inputs'>): {
-  outputsFromPayment: (btcTransaction.TransactionOutput | btcTransaction.TransactionPubKeyOutput)[];
-  outputsFromOrdinal: (btcTransaction.TransactionOutput | btcTransaction.TransactionPubKeyOutput)[];
-} => {
-  // we want to discard outputs that are script, are not from user address and do not have inscriptions or satributes
-  const outputsFromPayment: (
-    | btcTransaction.TransactionOutput
-    | btcTransaction.TransactionPubKeyOutput
-  )[] = [];
-  const outputsFromOrdinal: (
-    | btcTransaction.TransactionOutput
-    | btcTransaction.TransactionPubKeyOutput
-  )[] = [];
-  outputs?.forEach((output) => {
-    if (isScriptOutput(output)) {
-      return;
-    }
-
-    const itemsFromPayment: (btcTransaction.IOInscription | btcTransaction.IOSatribute)[] = [];
-    const itemsFromOrdinal: (btcTransaction.IOInscription | btcTransaction.IOSatribute)[] = [];
-    [...output.inscriptions, ...output.satributes].forEach((item) => {
-      if (item.fromAddress === btcAddress) {
-        return itemsFromPayment.push(item);
-      }
-      if (item.fromAddress === ordinalsAddress) {
-        itemsFromOrdinal.push(item);
-      }
-    });
-
-    if (itemsFromOrdinal.length > 0) {
-      outputsFromOrdinal.push(output);
-    }
-    if (itemsFromPayment.length > 0) {
-      outputsFromPayment.push(output);
-    }
-  });
-
-  return { outputsFromPayment, outputsFromOrdinal };
-};
-
-export const getInputsWithAssetsFromUserAddress = ({
-  btcAddress,
-  ordinalsAddress,
-  inputs,
-}: Omit<CommonInputOutputUtilProps, 'outputs'>): {
-  inputsFromPayment: btcTransaction.EnhancedInput[];
-  inputsFromOrdinal: btcTransaction.EnhancedInput[];
-} => {
-  // we want to discard inputs that are not from user address and do not have inscriptions or satributes
-  const inputsFromPayment: btcTransaction.EnhancedInput[] = [];
-  const inputsFromOrdinal: btcTransaction.EnhancedInput[] = [];
-  inputs?.forEach((input) => {
-    if (!input.inscriptions.length && !input.satributes.length) {
-      return;
-    }
-
-    if (input.extendedUtxo.address === btcAddress) {
-      return inputsFromPayment.push(input);
-    }
-    if (input.extendedUtxo.address === ordinalsAddress) {
-      inputsFromOrdinal.push(input);
-    }
-  });
-
-  return { inputsFromPayment, inputsFromOrdinal };
-};
-
-export const getOutputsWithAssetsToUserAddress = ({
-  btcAddress,
-  ordinalsAddress,
-  outputs,
-}: Omit<CommonInputOutputUtilProps, 'inputs'>): {
-  outputsToPayment: btcTransaction.TransactionOutput[];
-  outputsToOrdinal: btcTransaction.TransactionOutput[];
-} => {
-  const outputsToPayment: btcTransaction.TransactionOutput[] = [];
-  const outputsToOrdinal: btcTransaction.TransactionOutput[] = [];
-  outputs?.forEach((output) => {
-    // we want to discard outputs that are not spendable or are not to user address
-    if (
-      isScriptOutput(output) ||
-      isPubKeyOutput(output) ||
-      ![btcAddress, ordinalsAddress].includes(output.address)
-    ) {
-      return;
-    }
-
-    if (output.address === btcAddress) {
-      return outputsToPayment.push(output);
-    }
-
-    // we don't want to show amount to ordinals address, because it's not spendable
-    if (
-      output.address === ordinalsAddress &&
-      (output.inscriptions.length > 0 || output.satributes.length > 0)
-    ) {
-      outputsToOrdinal.push(output);
-    }
-  });
-
-  return { outputsToPayment, outputsToOrdinal };
-};
-
-export const mapTxSatributeInfoToBundleInfo = (item: btcTransaction.IOSatribute | SatRangeTx) => {
-  const commonProps = {
-    offset: item.offset,
-    block: 0,
-    range: {
-      start: '0',
-      end: '0',
-    },
-    yearMined: 0,
-  };
-
-  // SatRangeTx
-  if ('totalSats' in item) {
-    return {
-      ...commonProps,
-      totalSats: item.totalSats,
-      inscriptions: item.inscriptions,
-      satributes: item.satributes,
-    } as BundleSatRange;
-  }
-
-  // btcTransaction.IOSatribute
-  return {
-    ...commonProps,
-    totalSats: item.amount,
-    inscriptions: [],
-    satributes: item.types,
-  } as BundleSatRange;
-};
-
-export const getSatRangesWithInscriptions = ({
-  satributes,
-  inscriptions,
-  amount,
-}: {
-  inscriptions: btcTransaction.IOInscription[];
-  satributes: btcTransaction.IOSatribute[];
-  amount: number;
-}) => {
-  const satRanges: {
-    [offset: number]: SatRangeTx;
-  } = {};
-
-  satributes.forEach((satribute) => {
-    const { types, amount: totalSats, ...rest } = satribute;
-    satRanges[rest.offset] = { ...rest, satributes: types, totalSats, inscriptions: [] };
-  });
-
-  inscriptions.forEach((inscription) => {
-    const { contentType, number, ...inscriptionRest } = inscription;
-    const mappedInscription = {
-      ...inscriptionRest,
-      content_type: contentType,
-      inscription_number: number,
-    };
-    if (satRanges[inscription.offset]) {
-      satRanges[inscription.offset] = {
-        ...satRanges[inscription.offset],
-        inscriptions: [...satRanges[inscription.offset].inscriptions, mappedInscription],
-      };
-      return;
-    }
-
-    satRanges[inscription.offset] = {
-      totalSats: 1,
-      offset: inscription.offset,
-      fromAddress: inscription.fromAddress,
-      inscriptions: [mappedInscription],
-      satributes: ['COMMON'],
-    };
-  });
-
-  const { amountOfExoticsOrInscribedSats, totalExoticSats } = Object.values(satRanges).reduce(
-    (acc, range) => ({
-      amountOfExoticsOrInscribedSats: acc.amountOfExoticsOrInscribedSats + range.totalSats,
-      totalExoticSats:
-        acc.totalExoticSats + (!range.satributes.includes('COMMON') ? range.totalSats : 0),
-    }),
-    {
-      amountOfExoticsOrInscribedSats: 0,
-      totalExoticSats: 0,
-    },
-  );
-
-  if (amountOfExoticsOrInscribedSats < amount) {
-    satRanges[DUMMY_OFFSET] = {
-      totalSats: amount - amountOfExoticsOrInscribedSats,
-      offset: DUMMY_OFFSET,
-      fromAddress: '',
-      inscriptions: [],
-      satributes: ['COMMON'],
-    };
-  }
-
-  // sort should be: inscribed rare, rare, inscribed common, common
-  const satRangesArray = Object.values(satRanges).sort((a, b) => {
-    // Check conditions for each category
-    const aHasInscriptions = a.inscriptions.length > 0;
-    const bHasInscriptions = b.inscriptions.length > 0;
-    const aHasRareSatributes = a.satributes.some((s) => s !== 'COMMON');
-    const bHasRareSatributes = b.satributes.some((s) => s !== 'COMMON');
-
-    // sats not rare and not inscribed at bottom
-    if (!aHasInscriptions && !aHasRareSatributes) return 1;
-
-    // sats inscribed and rare at top
-    if (aHasInscriptions && aHasRareSatributes) return -1;
-
-    // sats not inscribed and rare below inscribed and rare
-    if (bHasInscriptions && bHasRareSatributes) return 1;
-
-    // sats inscribed and not rare above sats not inscribed and not rare
-    if (aHasRareSatributes) return -1;
-    if (bHasRareSatributes) return 1;
-
-    // equal ranges
-    return 0;
-  });
-
-  return { satRanges: satRangesArray, totalExoticSats };
-};
-
-export const mapRuneBaseToFungibleToken = (rune: RuneBase): FungibleToken => ({
-  protocol: 'runes',
-  name: rune.runeName,
-  principal: rune.runeId,
-  assetName: '',
-  balance: '',
-  total_received: '',
-  total_sent: '',
-  runeSymbol: rune.symbol,
-  runeInscriptionId: rune.inscriptionId,
-});
diff --git a/src/app/components/transferFeeView/index.tsx b/src/app/components/transferFeeView/index.tsx
index ed6b775fe..2dffa4b04 100644
--- a/src/app/components/transferFeeView/index.tsx
+++ b/src/app/components/transferFeeView/index.tsx
@@ -6,6 +6,7 @@ import {
   btcTransaction,
   getBtcFiatEquivalent,
   getFiatEquivalent,
+  type RareSatsType,
 } from '@secretkeylabs/xverse-core';
 import { StyledP } from '@ui-library/common.styled';
 import BigNumber from 'bignumber.js';
@@ -46,9 +47,16 @@ type Props = {
   feePerVByte?: BigNumber;
   fee: BigNumber;
   currency: string;
-  inscriptions?: btcTransaction.IOInscription[];
+  inscriptions?:
+    | btcTransaction.IOInscription[]
+    | (btcTransaction.IOInscription & { satributes: RareSatsType[] })[]
+    | (Omit<btcTransaction.IOInscription, 'offset'> & { satributes: RareSatsType[] })[];
   satributes?: btcTransaction.IOSatribute[];
-  onShowInscription?: (inscription: btcTransaction.IOInscription) => void;
+  onShowInscription?: (
+    inscription:
+      | (btcTransaction.IOInscription & { satributes: RareSatsType[] })
+      | (Omit<btcTransaction.IOInscription, 'offset'> & { satributes: RareSatsType[] }),
+  ) => void;
 };
 
 function TransferFeeView({
diff --git a/src/app/screens/btcSendRequest/index.tsx b/src/app/screens/btcSendRequest/index.tsx
index 2fd7caf8b..6efeb832e 100644
--- a/src/app/screens/btcSendRequest/index.tsx
+++ b/src/app/screens/btcSendRequest/index.tsx
@@ -1,20 +1,12 @@
 import { makeRPCError, makeRpcSuccessResponse, sendRpcResponse } from '@common/utils/rpc/helpers';
 import ConfirmBtcTransaction from '@components/confirmBtcTransaction';
 import useBtcFeeRate from '@hooks/useBtcFeeRate';
-import useHasFeature from '@hooks/useHasFeature';
 import useSelectedAccount from '@hooks/useSelectedAccount';
 import useTransactionContext from '@hooks/useTransactionContext';
 import useWalletSelector from '@hooks/useWalletSelector';
 import { RpcErrorCode } from '@sats-connect/core';
 import type { TransactionSummary } from '@screens/sendBtc/helpers';
-import {
-  AnalyticsEvents,
-  btcTransaction,
-  FeatureId,
-  parseSummaryForRunes,
-  type RuneSummary,
-  type Transport,
-} from '@secretkeylabs/xverse-core';
+import { AnalyticsEvents, btcTransaction, type Transport } from '@secretkeylabs/xverse-core';
 import Spinner from '@ui-library/spinner';
 import { BITCOIN_DUST_AMOUNT_SATS } from '@utils/constants';
 import { trackMixPanel } from '@utils/mixpanel';
@@ -50,8 +42,6 @@ function BtcSendRequest() {
   const [feeRate, setFeeRate] = useState('');
   const [transaction, setTransaction] = useState<btcTransaction.EnhancedTransaction | undefined>();
   const [summary, setSummary] = useState<TransactionSummary | undefined>();
-  const [runeSummary, setRuneSummary] = useState<RuneSummary | undefined>();
-  const hasRunesSupport = useHasFeature(FeatureId.RUNES_SUPPORT);
   const [isLoading, setIsLoading] = useState(false);
   const [isSubmitting, setIsSubmitting] = useState(false);
 
@@ -74,7 +64,6 @@ function BtcSendRequest() {
   useEffect(() => {
     if (!payload || !transactionContext || !feeRate) {
       setSummary(undefined);
-      setRuneSummary(undefined);
       return;
     }
     const generateTxnAndSummary = async () => {
@@ -84,13 +73,6 @@ function BtcSendRequest() {
         const newSummary = await newTransaction.getSummary();
         setTransaction(newTransaction);
         setSummary(newSummary);
-        if (newSummary && hasRunesSupport) {
-          setRuneSummary(
-            await parseSummaryForRunes(transactionContext, newSummary, transactionContext.network, {
-              separateTransfersOnNoExternalInputs: true,
-            }),
-          );
-        }
       } catch (e) {
         setTransaction(undefined);
         setSummary(undefined);
@@ -231,7 +213,6 @@ function BtcSendRequest() {
   return (
     <ConfirmBtcTransaction
       summary={summary}
-      runeSummary={runeSummary}
       isLoading={isLoading}
       confirmText={t('COMMON.CONFIRM')}
       cancelText={t('COMMON.CANCEL')}
diff --git a/src/app/screens/createInscription/index.tsx b/src/app/screens/createInscription/index.tsx
index 5e46b157b..f906924f2 100644
--- a/src/app/screens/createInscription/index.tsx
+++ b/src/app/screens/createInscription/index.tsx
@@ -27,7 +27,7 @@ import ConfirmScreen from '@components/confirmScreen';
 import useWalletSelector from '@hooks/useWalletSelector';
 import { isLedgerAccount } from '@utils/helper';
 
-import InscribeSection from '@components/confirmBtcTransaction/inscribeSection';
+import InscribeSection from 'app/components/confirmBtcTransaction/sections/inscribeSection';
 import useBtcClient from '@hooks/apiClients/useBtcClient';
 import useCoinRates from '@hooks/queries/useCoinRates';
 import useConfirmedBtcBalance from '@hooks/queries/useConfirmedBtcBalance';
diff --git a/src/app/screens/etchRune/index.tsx b/src/app/screens/etchRune/index.tsx
index 9ad6169d9..61eb7ecb9 100644
--- a/src/app/screens/etchRune/index.tsx
+++ b/src/app/screens/etchRune/index.tsx
@@ -67,18 +67,7 @@ function EtchRune() {
       {orderTx && orderTx.summary && !etchError && (
         <ConfirmBtcTransaction
           summary={orderTx.summary}
-          runeSummary={{
-            etch: etchRequest,
-            burns: [],
-            receipts: [],
-            transfers: [],
-            inputsHadRunes: false,
-            txnHasExternalInputs: orderTx.summary?.inputs.some(
-              (input) =>
-                input.extendedUtxo.address !== btcAddress &&
-                input.extendedUtxo.address !== ordinalsAddress,
-            ),
-          }}
+          runeEtchDetails={etchRequest}
           feeRate={+feeRate}
           confirmText={t('CONFIRM')}
           cancelText={t('CANCEL')}
diff --git a/src/app/screens/listRune/listMarketplaceItem.tsx b/src/app/screens/listRune/listMarketplaceItem.tsx
index 261033a01..98250941a 100644
--- a/src/app/screens/listRune/listMarketplaceItem.tsx
+++ b/src/app/screens/listRune/listMarketplaceItem.tsx
@@ -1,4 +1,3 @@
-import { RowCenter } from '@components/confirmBtcTransaction/runes';
 import TokenImage from '@components/tokenImage';
 import type { FungibleToken, ListingProvider } from '@secretkeylabs/xverse-core';
 import Checkbox from '@ui-library/checkbox';
@@ -24,6 +23,13 @@ const Container = styled.div<{ $selected: boolean }>`
   transition: background-color 0.1s ease, border-color 0.1s ease;
 `;
 
+const RowCenter = styled.div({
+  display: 'flex',
+  flexDirection: 'row',
+  alignItems: 'center',
+  justifyContent: 'space-between',
+});
+
 const InfoContainer = styled.div`
   display: flex;
   flex: 1;
diff --git a/src/app/screens/mintRune/index.tsx b/src/app/screens/mintRune/index.tsx
index 134ccb7c8..5d118d152 100644
--- a/src/app/screens/mintRune/index.tsx
+++ b/src/app/screens/mintRune/index.tsx
@@ -1,6 +1,5 @@
 import ConfirmBtcTransaction from '@components/confirmBtcTransaction';
 import RequestError from '@components/requests/requestError';
-import useSelectedAccount from '@hooks/useSelectedAccount';
 import { RUNE_DISPLAY_DEFAULTS, type Transport } from '@secretkeylabs/xverse-core';
 import Spinner from '@ui-library/spinner';
 import { useCallback, useEffect } from 'react';
@@ -18,7 +17,6 @@ const LoaderContainer = styled.div(() => ({
 
 function MintRune() {
   const { t } = useTranslation('translation', { keyPrefix: 'CONFIRM_TRANSACTION' });
-  const { btcAddress, ordinalsAddress } = useSelectedAccount();
   const navigate = useNavigate();
   const {
     mintRequest,
@@ -70,29 +68,18 @@ function MintRune() {
       {orderTx && orderTx.summary && runeInfo && !mintError && (
         <ConfirmBtcTransaction
           summary={orderTx.summary}
-          runeSummary={{
-            burns: [],
-            inputsHadRunes: false,
-            txnHasExternalInputs: orderTx.summary?.inputs.some(
-              (input) =>
-                input.extendedUtxo.address !== btcAddress &&
-                input.extendedUtxo.address !== ordinalsAddress,
-            ),
-            receipts: [],
-            transfers: [],
-            mint: {
-              runeName: runeInfo.entry.spaced_rune,
-              runeId: runeInfo.id,
-              amount: BigInt(runeInfo.entry.terms.amount?.toNumber() ?? 0),
-              divisibility: runeInfo.entry.divisibility.toNumber(),
-              symbol: runeInfo.entry.symbol,
-              inscriptionId: runeInfo.parent ?? '',
-              runeIsOpen: runeInfo.mintable,
-              runeIsMintable: runeInfo.mintable,
-              destinationAddress: mintRequest.destinationAddress,
-              repeats: mintRequest.repeats,
-              runeSize: RUNE_DISPLAY_DEFAULTS.size,
-            },
+          runeMintDetails={{
+            runeId: runeInfo.id,
+            runeName: runeInfo.entry.spaced_rune,
+            amount: BigInt(runeInfo.entry.terms.amount?.toNumber() ?? 0),
+            divisibility: runeInfo.entry.divisibility.toNumber(),
+            symbol: runeInfo.entry.symbol,
+            inscriptionId: runeInfo.parent ?? '',
+            runeIsOpen: runeInfo.mintable,
+            runeIsMintable: runeInfo.mintable,
+            destinationAddress: mintRequest.destinationAddress,
+            repeats: mintRequest.repeats,
+            runeSize: RUNE_DISPLAY_DEFAULTS.size,
           }}
           feeRate={+feeRate}
           confirmText={t('CONFIRM')}
diff --git a/src/app/screens/rareSatsBundle/runeAmount.tsx b/src/app/screens/rareSatsBundle/runeAmount.tsx
index 2fc483e48..77b119744 100644
--- a/src/app/screens/rareSatsBundle/runeAmount.tsx
+++ b/src/app/screens/rareSatsBundle/runeAmount.tsx
@@ -1,4 +1,3 @@
-import { mapRuneBaseToFungibleToken } from '@components/confirmBtcTransaction/utils';
 import { RightAlignedStyledFiatAmountText } from '@components/fiatAmountText';
 import TokenImage from '@components/tokenImage';
 import useRuneFiatRateQuery from '@hooks/queries/runes/useRuneFiatRateQuery';
@@ -6,18 +5,19 @@ import useWalletSelector from '@hooks/useWalletSelector';
 import type { RuneBase } from '@secretkeylabs/xverse-core';
 import { StyledP } from '@ui-library/common.styled';
 import { ftDecimals } from '@utils/helper';
+import { mapRuneBaseToFungibleToken } from '@utils/mappers';
 import BigNumber from 'bignumber.js';
 import { useTranslation } from 'react-i18next';
 import { NumericFormat } from 'react-number-format';
 import styled from 'styled-components';
 
-const Container = styled.div<{ topMargin?: boolean }>((props) => ({
+const Container = styled.div<{ $topMargin?: boolean }>((props) => ({
   width: '100%',
   display: 'flex',
   flexDirection: 'row',
   alignItems: 'center',
   marginBottom: props.theme.space.s,
-  marginTop: props.topMargin ? props.theme.space.s : 0,
+  marginTop: props.$topMargin ? props.theme.space.s : 0,
   backgroundColor: props.theme.colors.elevation1,
   padding: props.theme.space.m,
   borderRadius: props.theme.space.xs,
@@ -60,7 +60,7 @@ export default function RuneAmount({
   const { fiatCurrency } = useWalletSelector();
   const { data: runeFiatRate } = useRuneFiatRateQuery(rune);
   return (
-    <Container topMargin={topMargin}>
+    <Container $topMargin={topMargin}>
       <AvatarContainer>
         <TokenImage
           currency="FT"
diff --git a/src/app/screens/sendBtc/index.tsx b/src/app/screens/sendBtc/index.tsx
index 1fc18872a..b0cf9afbf 100644
--- a/src/app/screens/sendBtc/index.tsx
+++ b/src/app/screens/sendBtc/index.tsx
@@ -1,15 +1,11 @@
 import useBtcFeeRate from '@hooks/useBtcFeeRate';
 import useDebounce from '@hooks/useDebounce';
-import useHasFeature from '@hooks/useHasFeature';
 import { useResetUserFlow } from '@hooks/useResetUserFlow';
 import useSelectedAccount from '@hooks/useSelectedAccount';
 import useTransactionContext from '@hooks/useTransactionContext';
 import {
   AnalyticsEvents,
   btcTransaction,
-  FeatureId,
-  parseSummaryForRunes,
-  type RuneSummary,
   type Transport,
 } from '@secretkeylabs/xverse-core';
 import { isInOptions, isLedgerAccount } from '@utils/helper';
@@ -47,8 +43,6 @@ function SendBtcScreen() {
 
   const [transaction, setTransaction] = useState<btcTransaction.EnhancedTransaction | undefined>();
   const [summary, setSummary] = useState<TransactionSummary | undefined>();
-  const [runeSummary, setRuneSummary] = useState<RuneSummary | undefined>();
-  const hasRunesSupport = useHasFeature(FeatureId.RUNES_SUPPORT);
 
   useEffect(() => {
     if (!feeRate && btcFeeRate && !feeRatesLoading) {
@@ -76,7 +70,6 @@ function SendBtcScreen() {
     if (!debouncedRecipient || !feeRate) {
       setTransaction(undefined);
       setSummary(undefined);
-      setRuneSummary(undefined);
       return;
     }
 
@@ -94,16 +87,6 @@ function SendBtcScreen() {
           if (sendMax) {
             setAmountSats(transactionDetails.summary.outputs[0].amount.toString());
           }
-          if (hasRunesSupport) {
-            setRuneSummary(
-              await parseSummaryForRunes(
-                transactionContext,
-                transactionDetails.summary,
-                transactionContext.network,
-                { separateTransfersOnNoExternalInputs: true },
-              ),
-            );
-          }
         } else {
           setTransaction(undefined);
           setSummary(undefined);
@@ -202,7 +185,6 @@ function SendBtcScreen() {
   return (
     <StepDisplay
       summary={summary}
-      runeSummary={runeSummary}
       currentStep={currentStep}
       setCurrentStep={setCurrentStep}
       recipientAddress={recipientAddress}
diff --git a/src/app/screens/sendBtc/stepDisplay.tsx b/src/app/screens/sendBtc/stepDisplay.tsx
index a43a6c5b6..1292c8a6d 100644
--- a/src/app/screens/sendBtc/stepDisplay.tsx
+++ b/src/app/screens/sendBtc/stepDisplay.tsx
@@ -1,6 +1,5 @@
 import RecipientSelector from '@components/recipientSelector';
 import TokenImage from '@components/tokenImage';
-import type { RuneSummary } from '@secretkeylabs/xverse-core';
 import ConfirmBtcTransaction from 'app/components/confirmBtcTransaction';
 import { useTranslation } from 'react-i18next';
 import styled from 'styled-components';
@@ -30,7 +29,6 @@ const Container = styled.div`
 
 type Props = {
   summary: TransactionSummary | undefined;
-  runeSummary: RuneSummary | undefined;
   currentStep: Step;
   setCurrentStep: (step: Step) => void;
   recipientAddress: string;
@@ -51,7 +49,6 @@ type Props = {
 
 function StepDisplay({
   summary,
-  runeSummary,
   currentStep,
   setCurrentStep,
   recipientAddress,
@@ -121,7 +118,6 @@ function StepDisplay({
       return (
         <ConfirmBtcTransaction
           summary={summary}
-          runeSummary={runeSummary}
           isLoading={false}
           confirmText={t('COMMON.CONFIRM')}
           cancelText={t('COMMON.CANCEL')}
diff --git a/src/app/screens/sendInscriptionsRequest/index.tsx b/src/app/screens/sendInscriptionsRequest/index.tsx
index 9f7f14488..c3462da69 100644
--- a/src/app/screens/sendInscriptionsRequest/index.tsx
+++ b/src/app/screens/sendInscriptionsRequest/index.tsx
@@ -27,7 +27,6 @@ function SendInscriptionsRequest() {
     isLoading,
     transaction,
     summary,
-    runeSummary,
     txError,
   } = useSendInscriptions();
 
@@ -61,7 +60,6 @@ function SendInscriptionsRequest() {
       {transaction && summary && !txError && (
         <ConfirmBtcTransaction
           summary={summary}
-          runeSummary={runeSummary}
           showAccountHeader
           isLoading={isLoading}
           confirmText={t('CONFIRM')}
diff --git a/src/app/screens/sendInscriptionsRequest/useSendInscriptions.ts b/src/app/screens/sendInscriptionsRequest/useSendInscriptions.ts
index 2a2fa9bc0..21afe69ba 100644
--- a/src/app/screens/sendInscriptionsRequest/useSendInscriptions.ts
+++ b/src/app/screens/sendInscriptionsRequest/useSendInscriptions.ts
@@ -2,15 +2,11 @@ import { getPopupPayload } from '@common/utils/popup';
 import { makeRPCError, makeRpcSuccessResponse, sendRpcResponse } from '@common/utils/rpc/helpers';
 import { sendUserRejectionMessage } from '@common/utils/rpc/responseMessages/errors';
 import useBtcFeeRate from '@hooks/useBtcFeeRate';
-import useHasFeature from '@hooks/useHasFeature';
 import useTransactionContext from '@hooks/useTransactionContext';
 import { RpcErrorCode, sendInscriptionsSchema } from '@sats-connect/core';
 import { type TransactionSummary } from '@screens/sendBtc/helpers';
 import {
   btcTransaction,
-  FeatureId,
-  parseSummaryForRunes,
-  type RuneSummary,
   type Transport,
 } from '@secretkeylabs/xverse-core';
 import { useEffect, useState } from 'react';
@@ -35,11 +31,9 @@ const useSendInscriptions = () => {
   const [feeRate, setFeeRate] = useState<string>('');
   const [transaction, setTransaction] = useState<btcTransaction.EnhancedTransaction | undefined>();
   const [summary, setSummary] = useState<TransactionSummary | undefined>();
-  const [runeSummary, setRuneSummary] = useState<RuneSummary | undefined>();
 
   const [isExecuting, setIsExecuting] = useState<boolean>(false);
   const [isLoading, setIsLoading] = useState<boolean>(false);
-  const hasRunesSupport = useHasFeature(FeatureId.RUNES_SUPPORT);
   const {
     popupPayloadSendInscriptions: {
       context: { tabId },
@@ -73,13 +67,6 @@ const useSendInscriptions = () => {
       setFeeRate(desiredFeeRate.toString());
       setTransaction(tx);
       setSummary(txSummary);
-      if (hasRunesSupport) {
-        setRuneSummary(
-          await parseSummaryForRunes(txContext, txSummary, txContext.network, {
-            separateTransfersOnNoExternalInputs: true,
-          }),
-        );
-      }
     } catch (e) {
       setTransaction(undefined);
       setSummary(undefined);
@@ -148,7 +135,6 @@ const useSendInscriptions = () => {
   return {
     transaction,
     summary,
-    runeSummary,
     txError,
     feeRate,
     isLoading,
diff --git a/src/app/screens/sendOrdinal/index.tsx b/src/app/screens/sendOrdinal/index.tsx
index 4725ceb23..57cce0010 100644
--- a/src/app/screens/sendOrdinal/index.tsx
+++ b/src/app/screens/sendOrdinal/index.tsx
@@ -1,18 +1,10 @@
 import useAddressInscription from '@hooks/queries/ordinals/useAddressInscription';
 import useBtcFeeRate from '@hooks/useBtcFeeRate';
-import useHasFeature from '@hooks/useHasFeature';
 import { useResetUserFlow } from '@hooks/useResetUserFlow';
 import useSelectedAccount from '@hooks/useSelectedAccount';
 import useTransactionContext from '@hooks/useTransactionContext';
 import type { TransactionSummary } from '@screens/sendBtc/helpers';
-import {
-  AnalyticsEvents,
-  btcTransaction,
-  FeatureId,
-  parseSummaryForRunes,
-  type RuneSummary,
-  type Transport,
-} from '@secretkeylabs/xverse-core';
+import { AnalyticsEvents, btcTransaction, type Transport } from '@secretkeylabs/xverse-core';
 import { isInOptions, isLedgerAccount } from '@utils/helper';
 import { trackMixPanel } from '@utils/mixpanel';
 import RoutePaths from 'app/routes/paths';
@@ -48,9 +40,7 @@ function SendOrdinalScreen() {
   const [isSubmitting, setIsSubmitting] = useState(false);
   const [transaction, setTransaction] = useState<btcTransaction.EnhancedTransaction | undefined>();
   const [summary, setSummary] = useState<TransactionSummary | undefined>();
-  const [runeSummary, setRuneSummary] = useState<RuneSummary | undefined>();
   const [insufficientFundsError, setInsufficientFundsError] = useState(false);
-  const hasRunesSupport = useHasFeature(FeatureId.RUNES_SUPPORT);
 
   useResetUserFlow(RoutePaths.SendOrdinal);
 
@@ -67,7 +57,6 @@ function SendOrdinalScreen() {
     if (!recipientAddress || !feeRate) {
       setTransaction(undefined);
       setSummary(undefined);
-      setRuneSummary(undefined);
       setInsufficientFundsError(false);
       return;
     }
@@ -92,16 +81,6 @@ function SendOrdinalScreen() {
         if (!transactionDetails) return;
         setTransaction(transactionDetails);
         setSummary(await transactionDetails.getSummary());
-        if (hasRunesSupport) {
-          setRuneSummary(
-            await parseSummaryForRunes(
-              context,
-              await transactionDetails.getSummary(),
-              context.network,
-              { separateTransfersOnNoExternalInputs: true },
-            ),
-          );
-        }
       } catch (e) {
         if (e instanceof Error) {
           // don't log the error if it's just an insufficient funds error
@@ -208,7 +187,6 @@ function SendOrdinalScreen() {
   return (
     <StepDisplay
       summary={summary}
-      runeSummary={runeSummary}
       ordinal={selectedOrdinal}
       currentStep={currentStep}
       setCurrentStep={setCurrentStep}
diff --git a/src/app/screens/sendOrdinal/stepDisplay.tsx b/src/app/screens/sendOrdinal/stepDisplay.tsx
index b7be5811e..12d0763db 100644
--- a/src/app/screens/sendOrdinal/stepDisplay.tsx
+++ b/src/app/screens/sendOrdinal/stepDisplay.tsx
@@ -37,7 +37,6 @@ const Container = styled.div`
 
 type Props = {
   summary: TransactionSummary | undefined;
-  runeSummary: RuneSummary | undefined;
   ordinal?: Inscription;
   currentStep: Step;
   setCurrentStep: (step: Step) => void;
@@ -56,7 +55,6 @@ type Props = {
 
 function StepDisplay({
   summary,
-  runeSummary,
   ordinal,
   currentStep,
   setCurrentStep,
@@ -130,7 +128,6 @@ function StepDisplay({
       return (
         <ConfirmBtcTransaction
           summary={summary}
-          runeSummary={runeSummary}
           brc20Summary={brc20Summary}
           isLoading={false}
           confirmText={t('COMMON.CONFIRM')}
diff --git a/src/app/screens/sendRune/index.tsx b/src/app/screens/sendRune/index.tsx
index 7507b4c22..8c67e4cdd 100644
--- a/src/app/screens/sendRune/index.tsx
+++ b/src/app/screens/sendRune/index.tsx
@@ -9,8 +9,6 @@ import {
   AnalyticsEvents,
   FeatureId,
   btcTransaction,
-  parseSummaryForRunes,
-  type RuneSummary,
   type Transport,
 } from '@secretkeylabs/xverse-core';
 import { isInOptions, isLedgerAccount } from '@utils/helper';
@@ -34,7 +32,6 @@ function SendRuneScreen() {
   const { t } = useTranslation('translation');
   const { data: btcFeeRate, isLoading: feeRatesLoading } = useBtcFeeRate();
   const selectedAccount = useSelectedAccount();
-  const { network } = useWalletSelector();
   const { data: runesCoinsList } = useRuneFungibleTokensQuery();
   // TODO: can we remove location.state here?
   const [recipientAddress, setRecipientAddress] = useState<string>(
@@ -51,7 +48,6 @@ function SendRuneScreen() {
   const transactionContext = useTransactionContext();
   const [transaction, setTransaction] = useState<btcTransaction.EnhancedTransaction | undefined>();
   const [summary, setSummary] = useState<TransactionSummary | undefined>();
-  const [runeSummary, setRuneSummary] = useState<RuneSummary | undefined>();
   const [searchParams] = useSearchParams();
   const hasRunesSupport = useHasFeature(FeatureId.RUNES_SUPPORT);
 
@@ -98,7 +94,6 @@ function SendRuneScreen() {
     if (!recipientAddress || !feeRate || bigAmount.isNaN() || bigAmount.isLessThanOrEqualTo(0)) {
       setTransaction(undefined);
       setSummary(undefined);
-      setRuneSummary(undefined);
       return;
     }
 
@@ -119,14 +114,6 @@ function SendRuneScreen() {
         setTransaction(transactionDetails.transaction);
         if (transactionDetails.summary) {
           setSummary(transactionDetails.summary);
-          setRuneSummary(
-            await parseSummaryForRunes(
-              transactionContext,
-              transactionDetails.summary,
-              network.type,
-              { separateTransfersOnNoExternalInputs: true },
-            ),
-          );
         }
       } catch (e) {
         if (!(e instanceof Error) || !e.message.includes('Insufficient funds')) {
@@ -232,7 +219,6 @@ function SendRuneScreen() {
   return (
     <StepDisplay
       summary={summary}
-      runeSummary={runeSummary}
       token={fungibleToken}
       amountToSend={amountToSend}
       setAmountToSend={setAmount}
diff --git a/src/app/screens/sendRune/stepDisplay.tsx b/src/app/screens/sendRune/stepDisplay.tsx
index 34335609d..7489ba954 100644
--- a/src/app/screens/sendRune/stepDisplay.tsx
+++ b/src/app/screens/sendRune/stepDisplay.tsx
@@ -1,7 +1,7 @@
 import ConfirmBtcTransaction from '@components/confirmBtcTransaction';
 import RecipientSelector from '@components/recipientSelector';
 import TokenImage from '@components/tokenImage';
-import type { FungibleToken, RuneSummary } from '@secretkeylabs/xverse-core';
+import type { FungibleToken } from '@secretkeylabs/xverse-core';
 import { useTranslation } from 'react-i18next';
 import styled from 'styled-components';
 import SendLayout from '../../layouts/sendLayout';
@@ -31,7 +31,6 @@ const Container = styled.div`
 type Props = {
   token: FungibleToken;
   summary: TransactionSummary | undefined;
-  runeSummary: RuneSummary | undefined;
   amountToSend: string;
   setAmountToSend: (amount: string) => void;
   useTokenValue: boolean;
@@ -56,7 +55,6 @@ type Props = {
 function StepDisplay({
   token,
   summary,
-  runeSummary,
   amountToSend,
   setAmountToSend,
   useTokenValue,
@@ -135,7 +133,6 @@ function StepDisplay({
       return (
         <ConfirmBtcTransaction
           summary={summary}
-          runeSummary={runeSummary}
           isLoading={false}
           confirmText={t('COMMON.CONFIRM')}
           cancelText={t('COMMON.CANCEL')}
diff --git a/src/app/screens/settings/advanced/restoreFunds/recoverRunes/index.tsx b/src/app/screens/settings/advanced/restoreFunds/recoverRunes/index.tsx
index c78f8efb2..81328be87 100644
--- a/src/app/screens/settings/advanced/restoreFunds/recoverRunes/index.tsx
+++ b/src/app/screens/settings/advanced/restoreFunds/recoverRunes/index.tsx
@@ -86,10 +86,7 @@ function RecoverRunes() {
   const generateTransactionAndSummary = async (desiredFeeRate: number) => {
     const tx = await runesTransaction.recoverRunes(context, desiredFeeRate);
     const txSummary = await tx.getSummary();
-    const txRuneSummary = await parseSummaryForRunes(context, txSummary, context.network, {
-      separateTransfersOnNoExternalInputs: true,
-    });
-
+    const txRuneSummary = await parseSummaryForRunes(context, txSummary, context.network);
     return { transaction: tx, summary: txSummary, runeSummary: txRuneSummary };
   };
 
@@ -184,7 +181,6 @@ function RecoverRunes() {
     ) : (
       <ConfirmBtcTransaction
         summary={summary}
-        runeSummary={runeSummary}
         title={t('TITLE')}
         isLoading={isLoading}
         isSubmitting={isBroadcasting}
diff --git a/src/app/screens/signBatchPsbtRequest/index.tsx b/src/app/screens/signBatchPsbtRequest/index.tsx
index a8d3239ba..95c404127 100644
--- a/src/app/screens/signBatchPsbtRequest/index.tsx
+++ b/src/app/screens/signBatchPsbtRequest/index.tsx
@@ -1,24 +1,14 @@
 import { MESSAGE_SOURCE, SatsConnectMethods } from '@common/types/message-types';
 import { delay } from '@common/utils/ledger';
 import AccountHeaderComponent from '@components/accountHeader';
-import AssetModal from '@components/assetModal';
-import BurnSection from '@components/confirmBtcTransaction/burnSection';
-import DelegateSection from '@components/confirmBtcTransaction/delegateSection';
-import {
-  ParsedTxSummaryContext,
-  type ParsedTxSummaryContextProps,
-} from '@components/confirmBtcTransaction/hooks/useParsedTxSummaryContext';
-import MintSection from '@components/confirmBtcTransaction/mintSection';
-import ReceiveSection from '@components/confirmBtcTransaction/receiveSection';
+
+import { TxSummaryContext } from '@components/confirmBtcTransaction/hooks/useTxSummaryContext';
+import ConfirmBatchBtcTransactions from '@components/confirmBtcTransaction/indexBatch';
 import TransactionSummary from '@components/confirmBtcTransaction/transactionSummary';
-import TransferSection from '@components/confirmBtcTransaction/transferSection';
-import { isScriptOutput } from '@components/confirmBtcTransaction/utils';
 import InfoContainer from '@components/infoContainer';
 import LoadingTransactionStatus from '@components/loadingTransactionStatus';
 import type { ConfirmationStatus } from '@components/loadingTransactionStatus/circularSvgAnimation';
-import TransactionDetailComponent from '@components/transactionDetailComponent';
 import useXverseApi from '@hooks/apiClients/useXverseApi';
-import useHasFeature from '@hooks/useHasFeature';
 import useSearchParamsState from '@hooks/useSearchParamsState';
 import useSelectedAccount from '@hooks/useSelectedAccount';
 import useSignBatchPsbtTx from '@hooks/useSignBatchPsbtTx';
@@ -30,19 +20,17 @@ import type { SignMultiplePsbtPayload } from '@sats-connect/core';
 import { SigHash } from '@scure/btc-signer';
 import {
   AnalyticsEvents,
-  FeatureId,
   btcTransaction,
-  parseSummaryForRunes,
-  type RuneSummary,
+  extractViewSummary,
+  type AggregatedSummary,
+  type UserTransactionSummary,
 } from '@secretkeylabs/xverse-core';
 import Button from '@ui-library/button';
-import Callout from '@ui-library/callout';
 import Spinner from '@ui-library/spinner';
 import { isLedgerAccount } from '@utils/helper';
 import { trackMixPanel } from '@utils/mixpanel';
 import type { RuneItem } from '@utils/runes';
-import objecthash from 'object-hash';
-import { useCallback, useEffect, useMemo, useState } from 'react';
+import { useEffect, useMemo, useState } from 'react';
 import { useTranslation } from 'react-i18next';
 import { useLocation, useNavigate } from 'react-router-dom';
 import {
@@ -66,8 +54,11 @@ interface TxResponse {
   batchAuctionId?: string;
 }
 
-type PsbtSummary = btcTransaction.PsbtSummary;
-type ParsedPsbt = { summary: PsbtSummary; runeSummary: RuneSummary | undefined };
+type ParsedPsbt = {
+  extractedSummary: UserTransactionSummary | AggregatedSummary;
+  summary: btcTransaction.PsbtSummary;
+};
+
 function SignBatchPsbtRequest() {
   const [inApp] = useSearchParamsState('signBatchPsbtsInApp', false);
   const selectedAccount = useSelectedAccount();
@@ -84,71 +75,77 @@ function SignBatchPsbtRequest() {
     minPriceSats,
     locationState,
   } = useSignBatchPsbtTx();
+  const { search } = useLocation();
+  const params = new URLSearchParams(search);
+  const tabId = params.get('tabId') ?? '0';
+  const txnContext = useTransactionContext();
+  useTrackMixPanelPageViewed();
+  const xverseApi = useXverseApi();
+
   const [isSigning, setIsSigning] = useState(false);
   const [isSigningComplete, setIsSigningComplete] = useState(false);
   const [signingPsbtIndex, setSigningPsbtIndex] = useState(1);
   const [currentPsbtIndex, setCurrentPsbtIndex] = useState(0);
   const [reviewTransaction, setReviewTransaction] = useState(false);
-  const { search } = useLocation();
-  const params = new URLSearchParams(search);
-  const tabId = params.get('tabId') ?? '0';
   const [isLoading, setIsLoading] = useState(true);
-  const txnContext = useTransactionContext();
-  const [inscriptionToShow, setInscriptionToShow] = useState<
-    btcTransaction.IOInscription | undefined
-  >(undefined);
-  const hasRunesSupport = useHasFeature(FeatureId.RUNES_SUPPORT);
-  useTrackMixPanelPageViewed();
   const [parsedPsbts, setParsedPsbts] = useState<ParsedPsbt[]>([]);
-  const xverseApi = useXverseApi();
 
-  const individualParsedTxSummaryContext = useMemo(
+  const individualTxSummaryContext = useMemo(
     () => ({
-      summary: parsedPsbts[currentPsbtIndex]?.summary,
-      runeSummary: parsedPsbts[currentPsbtIndex]?.runeSummary,
+      extractedTxSummary: parsedPsbts[currentPsbtIndex]?.extractedSummary,
     }),
     [parsedPsbts, currentPsbtIndex],
   );
 
-  const aggregatedParsedTxSummaryContext: ParsedTxSummaryContextProps = useMemo(
-    () => ({
-      summary: {
-        inputs: parsedPsbts.map((psbt) => psbt.summary.inputs).flat(),
-        outputs: parsedPsbts.map((psbt) => psbt.summary.outputs).flat(),
-        feeOutput: undefined,
-        isFinal: parsedPsbts.reduce((acc, psbt) => acc && psbt.summary.isFinal, true),
-        hasSigHashNone: parsedPsbts.reduce(
-          (acc, psbt) => acc || (psbt.summary as btcTransaction.PsbtSummary)?.hasSigHashNone,
-          false,
-        ),
-        hasSigHashSingle: parsedPsbts.reduce(
-          (acc, psbt) => acc || (psbt.summary as btcTransaction.PsbtSummary)?.hasSigHashSingle,
-          false,
-        ),
-      } as PsbtSummary,
-      runeSummary: {
-        burns: parsedPsbts.map((psbt) => psbt.runeSummary?.burns ?? []).flat(),
-        transfers: parsedPsbts.map((psbt) => psbt.runeSummary?.transfers ?? []).flat(),
-        receipts: parsedPsbts.map((psbt) => psbt.runeSummary?.receipts ?? []).flat(),
-        mint: undefined,
-        inputsHadRunes: false,
-      } as RuneSummary,
-    }),
-    [parsedPsbts],
-  );
+  useEffect(() => {
+    if (payload.network.type !== network.type) {
+      navigate('/tx-status', {
+        state: {
+          txid: '',
+          currency: 'BTC',
+          error: t('NETWORK_MISMATCH'),
+          browserTx: true,
+        },
+      });
+    }
+
+    const checkAddressMismatch = (input) => {
+      if (
+        input.address !== selectedAccount.btcAddress &&
+        input.address !== selectedAccount.ordinalsAddress
+      ) {
+        navigate('/tx-status', {
+          state: {
+            txid: '',
+            currency: 'BTC',
+            error: t('ADDRESS_MISMATCH'),
+            browserTx: true,
+          },
+        });
+      }
+    };
 
-  const handlePsbtParsing = useCallback(
-    async (psbt: SignMultiplePsbtPayload, index: number): Promise<ParsedPsbt | undefined> => {
+    payload.psbts?.forEach((psbt) => psbt.inputsToSign?.forEach(checkAddressMismatch));
+  }, []);
+
+  useEffect(() => {
+    const handlePsbtParsing = async (psbt: SignMultiplePsbtPayload): Promise<ParsedPsbt> => {
       try {
         const parsedPsbt = new btcTransaction.EnhancedPsbt(txnContext, psbt.psbtBase64);
         const summary = await parsedPsbt.getSummary();
-        const runeSummary = hasRunesSupport
-          ? await parseSummaryForRunes(txnContext, summary, network.type, {
-              separateTransfersOnNoExternalInputs: true,
-            })
-          : undefined;
-        return { summary, runeSummary };
+        const extractedSummary = await extractViewSummary(txnContext, summary, network.type);
+        return { extractedSummary, summary };
       } catch (err) {
+        throw new Error('PSBT parsing failed');
+      }
+    };
+
+    (async () => {
+      const parsedPsbtsRes = await Promise.allSettled(payload.psbts.map(handlePsbtParsing));
+      setIsLoading(false);
+
+      const index = parsedPsbtsRes.findIndex((item) => item.status === 'rejected');
+      if (index !== -1) {
         navigate('/tx-status', {
           state: {
             txid: '',
@@ -158,61 +155,15 @@ function SignBatchPsbtRequest() {
             browserTx: true,
           },
         });
-        return undefined;
-      }
-    },
-    [txnContext],
-  );
-
-  useEffect(() => {
-    (async () => {
-      const parsedPsbtsRes = await Promise.all(payload.psbts.map(handlePsbtParsing));
-      if (parsedPsbtsRes.some((item) => item === undefined)) {
-        setIsLoading(false);
         return;
       }
-      const validParsedPsbts = parsedPsbtsRes.filter(
-        (item): item is ParsedPsbt => item !== undefined,
+
+      const validParsedPsbts = parsedPsbtsRes.map(
+        (item) => (item.status === 'fulfilled' && item.value) as ParsedPsbt,
       );
       setParsedPsbts(validParsedPsbts);
-      setIsLoading(false);
     })();
-  }, [payload.psbts.length, handlePsbtParsing]);
-
-  const checkAddressMismatch = (input) => {
-    if (
-      input.address !== selectedAccount.btcAddress &&
-      input.address !== selectedAccount.ordinalsAddress
-    ) {
-      navigate('/tx-status', {
-        state: {
-          txid: '',
-          currency: 'BTC',
-          error: t('ADDRESS_MISMATCH'),
-          browserTx: true,
-        },
-      });
-    }
-  };
-
-  const checkIfMismatch = () => {
-    if (payload.network.type !== network.type) {
-      navigate('/tx-status', {
-        state: {
-          txid: '',
-          currency: 'BTC',
-          error: t('NETWORK_MISMATCH'),
-          browserTx: true,
-        },
-      });
-    }
-
-    payload.psbts?.forEach((psbt) => psbt.inputsToSign?.forEach(checkAddressMismatch));
-  };
-
-  useEffect(() => {
-    checkIfMismatch();
-  }, []);
+  }, [payload.psbts, txnContext, network, navigate, t]);
 
   const onSignPsbtConfirmed = async () => {
     try {
@@ -360,28 +311,7 @@ function SignBatchPsbtRequest() {
     window.close();
   };
 
-  const hasOutputScript = useMemo(
-    () => parsedPsbts.some((psbt) => psbt.summary.outputs.some((output) => isScriptOutput(output))),
-    [parsedPsbts.length],
-  );
-
   const signingStatus: ConfirmationStatus = isSigningComplete ? 'SUCCESS' : 'LOADING';
-  const runeBurns = parsedPsbts.map((psbt) => psbt.runeSummary?.burns ?? []).flat();
-  const distinctRuneDelegations = new Set();
-  const runeDelegations = parsedPsbts
-    .filter((psbt) => !psbt.summary.isFinal)
-    .map((psbt) => psbt.runeSummary?.receipts ?? [])
-    .flat()
-    .filter((delegation) => {
-      const key = objecthash(delegation);
-      if (distinctRuneDelegations.has(key)) {
-        return false;
-      }
-
-      distinctRuneDelegations.add(key);
-      return true;
-    });
-  const hasSomeRuneDelegation = runeDelegations.length > 0;
 
   if (isSigning || isSigningComplete) {
     return (
@@ -402,67 +332,56 @@ function SignBatchPsbtRequest() {
     );
   }
 
-  return (
-    <>
-      <AccountHeaderComponent disableMenuOption disableAccountSwitch />
-      {isLoading ? (
+  const renderBody = () => {
+    if (isLoading) {
+      return (
         <LoaderContainer>
           <Spinner color="white" size={50} />
         </LoaderContainer>
-      ) : (
-        <>
-          <OuterContainer>
-            {isLedgerAccount(selectedAccount) ? (
-              <Container>
-                <InfoContainer bodyText="External transaction requests are not yet supported on a Ledger account. Switch to a different account to sign transactions from the application." />
-              </Container>
+      );
+    }
+
+    const isLedger = isLedgerAccount(selectedAccount);
+
+    return (
+      <>
+        <OuterContainer>
+          <Container>
+            {isLedger ? (
+              <InfoContainer bodyText="External transaction requests are not yet supported on a Ledger account. Switch to a different account to sign transactions from the application." />
             ) : (
-              <Container>
-                <ParsedTxSummaryContext.Provider value={aggregatedParsedTxSummaryContext}>
-                  <ReviewTransactionText>
-                    {t('SIGN_TRANSACTIONS', { count: parsedPsbts.length })}
-                  </ReviewTransactionText>
-                  <BundleLinkContainer onClick={() => setReviewTransaction(true)}>
-                    <BundleLinkText>{t('REVIEW_ALL')}</BundleLinkText>
-                    <ArrowRight size={12} weight="bold" />
-                  </BundleLinkContainer>
-                  {inscriptionToShow && (
-                    <AssetModal
-                      onClose={() => setInscriptionToShow(undefined)}
-                      inscription={{
-                        content_type: inscriptionToShow.contentType,
-                        id: inscriptionToShow.id,
-                        inscription_number: inscriptionToShow.number,
-                      }}
-                    />
-                  )}
-                  {hasSomeRuneDelegation && <DelegateSection delegations={runeDelegations} />}
-                  <TransferSection onShowInscription={setInscriptionToShow} />
-                  <ReceiveSection onShowInscription={setInscriptionToShow} />
-                  {!hasSomeRuneDelegation && <BurnSection burns={runeBurns} />}
-                  <MintSection mints={parsedPsbts.map((psbt) => psbt.runeSummary?.mint)} />
-                  <TransactionDetailComponent title={t('NETWORK')} value={network.type} />
-                  {hasOutputScript &&
-                    !parsedPsbts.some((psbt) => psbt.runeSummary !== undefined) && (
-                      <Callout bodyText={t('SCRIPT_OUTPUT_TX')} />
-                    )}
-                </ParsedTxSummaryContext.Provider>
-              </Container>
+              <>
+                <ReviewTransactionText>
+                  {t('SIGN_TRANSACTIONS', { count: parsedPsbts.length })}
+                </ReviewTransactionText>
+                <BundleLinkContainer onClick={() => setReviewTransaction(true)}>
+                  <BundleLinkText>{t('REVIEW_ALL')}</BundleLinkText>
+                  <ArrowRight size={12} weight="bold" />
+                </BundleLinkContainer>
+                <ConfirmBatchBtcTransactions summaries={parsedPsbts} isDuplicateTxs={inApp} />
+              </>
             )}
-          </OuterContainer>
-          <ButtonsContainer>
-            <TransparentButtonContainer>
-              <Button title={t('CANCEL')} variant="secondary" onClick={onCancelClick} />
-            </TransparentButtonContainer>
-            <Button
-              title={t('CONFIRM_ALL')}
-              onClick={onSignPsbtConfirmed}
-              loading={isSigning}
-              disabled={isLedgerAccount(selectedAccount)}
-            />
-          </ButtonsContainer>
-        </>
-      )}
+          </Container>
+        </OuterContainer>
+        <ButtonsContainer>
+          <TransparentButtonContainer>
+            <Button title={t('CANCEL')} variant="secondary" onClick={onCancelClick} />
+          </TransparentButtonContainer>
+          <Button
+            title={t('CONFIRM_ALL')}
+            onClick={onSignPsbtConfirmed}
+            loading={isSigning}
+            disabled={isLedger}
+          />
+        </ButtonsContainer>
+      </>
+    );
+  };
+
+  return (
+    <>
+      <AccountHeaderComponent disableMenuOption disableAccountSwitch />
+      {renderBody()}
       <StyledSheet
         header=""
         visible={reviewTransaction}
@@ -477,9 +396,9 @@ function SignBatchPsbtRequest() {
               {t('TRANSACTION')} {currentPsbtIndex + 1}/{parsedPsbts.length}
             </ReviewTransactionText>
             {!!parsedPsbts[currentPsbtIndex] && (
-              <ParsedTxSummaryContext.Provider value={individualParsedTxSummaryContext}>
+              <TxSummaryContext.Provider value={individualTxSummaryContext}>
                 <TransactionSummary />
-              </ParsedTxSummaryContext.Provider>
+              </TxSummaryContext.Provider>
             )}
           </ModalContainer>
         </OuterContainer>
diff --git a/src/app/screens/signPsbtRequest/index.tsx b/src/app/screens/signPsbtRequest/index.tsx
index b309ec074..46e306fd8 100644
--- a/src/app/screens/signPsbtRequest/index.tsx
+++ b/src/app/screens/signPsbtRequest/index.tsx
@@ -2,21 +2,11 @@ import { makeRPCError, sendRpcResponse } from '@common/utils/rpc/helpers';
 import ConfirmBtcTransaction from '@components/confirmBtcTransaction';
 import RequestError from '@components/requests/requestError';
 import useSubmitRuneSellPsbt from '@hooks/queries/runes/useSubmitRuneSellPsbt';
-import useHasFeature from '@hooks/useHasFeature';
 import useSelectedAccount from '@hooks/useSelectedAccount';
 import useTrackMixPanelPageViewed from '@hooks/useTrackMixPanelPageViewed';
-import useTransactionContext from '@hooks/useTransactionContext';
-import useWalletSelector from '@hooks/useWalletSelector';
 import { RpcErrorCode } from '@sats-connect/core';
 import { SigHash } from '@scure/btc-signer';
-import {
-  AnalyticsEvents,
-  FeatureId,
-  btcTransaction,
-  parseSummaryForRunes,
-  type RuneSummary,
-  type Transport,
-} from '@secretkeylabs/xverse-core';
+import { AnalyticsEvents, btcTransaction, type Transport } from '@secretkeylabs/xverse-core';
 import { trackMixPanel } from '@utils/mixpanel';
 import { useEffect, useState } from 'react';
 import { useTranslation } from 'react-i18next';
@@ -30,7 +20,6 @@ function SignPsbtRequest() {
   const navigate = useNavigate();
   const selectedAccount = useSelectedAccount();
   const { t } = useTranslation('translation', { keyPrefix: 'CONFIRM_TRANSACTION' });
-  const txnContext = useTransactionContext();
   const location = useLocation();
   const [searchParams] = useSearchParams();
   const magicEdenPsbt = searchParams.get('magicEdenPsbt');
@@ -38,8 +27,6 @@ function SignPsbtRequest() {
   const [isLoading, setIsLoading] = useState(true);
   const [isSigning, setIsSigning] = useState(false);
   const [summary, setSummary] = useState<PSBTSummary | undefined>();
-  const [runeSummary, setRuneSummary] = useState<RuneSummary | undefined>(undefined);
-  const hasRunesSupport = useHasFeature(FeatureId.RUNES_SUPPORT);
   const { payload, parsedPsbt, confirmSignPsbt, cancelSignPsbt, onCloseError, requestId, tabId } =
     useSignPsbt();
   const { validationError, setValidationError } = useSignPsbtValidationGate({
@@ -51,8 +38,6 @@ function SignPsbtRequest() {
 
   useTrackMixPanelPageViewed();
 
-  const { network } = useWalletSelector();
-
   const { submitRuneSellPsbt } = useSubmitRuneSellPsbt();
 
   useEffect(() => {
@@ -63,13 +48,6 @@ function SignPsbtRequest() {
       // TODO move this block into useSignPsbt
       .then(async (txSummary) => {
         setSummary(txSummary);
-        if (hasRunesSupport) {
-          setRuneSummary(
-            await parseSummaryForRunes(txnContext, txSummary, network.type, {
-              separateTransfersOnNoExternalInputs: true,
-            }),
-          );
-        }
         setIsLoading(false);
       })
       .catch((err) => {
@@ -180,7 +158,6 @@ function SignPsbtRequest() {
   return (
     <ConfirmBtcTransaction
       summary={summary}
-      runeSummary={runeSummary}
       isLoading={isLoading}
       isSubmitting={isSigning}
       isBroadcast={payload.broadcast}
diff --git a/src/app/screens/swap/components/psbtConfirmation/psbtConfirmation.tsx b/src/app/screens/swap/components/psbtConfirmation/psbtConfirmation.tsx
index 1a14f3a0e..443f0c55d 100644
--- a/src/app/screens/swap/components/psbtConfirmation/psbtConfirmation.tsx
+++ b/src/app/screens/swap/components/psbtConfirmation/psbtConfirmation.tsx
@@ -6,9 +6,7 @@ import useWalletSelector from '@hooks/useWalletSelector';
 import type { OrderInfo } from '@screens/swap/types';
 import {
   btcTransaction,
-  parseSummaryForRunes,
   type ExecuteUtxoOrderRequest,
-  type RuneSummary,
   type Transport,
 } from '@secretkeylabs/xverse-core';
 import { useEffect, useMemo, useState } from 'react';
@@ -38,7 +36,6 @@ export default function PsbtConfirmation({
   const [isLoading, setIsLoading] = useState(true);
   const [isSigning, setIsSigning] = useState(false);
   const [summary, setSummary] = useState<PSBTSummary | undefined>();
-  const [runeSummary, setRuneSummary] = useState<RuneSummary | undefined>(undefined);
   const [validationError, setValidationError] = useState<{
     error: string;
     errorTitle: string;
@@ -82,11 +79,6 @@ export default function PsbtConfirmation({
       .getSummary()
       .then(async (txSummary) => {
         setSummary(txSummary);
-        setRuneSummary(
-          await parseSummaryForRunes(txnContext, txSummary, network.type, {
-            separateTransfersOnNoExternalInputs: true,
-          }),
-        );
         setIsLoading(false);
       })
       .catch((err) => {
@@ -206,7 +198,6 @@ export default function PsbtConfirmation({
   return (
     <ConfirmBtcTransaction
       summary={summary}
-      runeSummary={runeSummary}
       isLoading={isLoading}
       isSubmitting={isSigning}
       isBroadcast
diff --git a/src/app/screens/transactionStatus/marketplaceRuneListingResults.tsx b/src/app/screens/transactionStatus/marketplaceRuneListingResults.tsx
index 11616c34a..edaa7694d 100644
--- a/src/app/screens/transactionStatus/marketplaceRuneListingResults.tsx
+++ b/src/app/screens/transactionStatus/marketplaceRuneListingResults.tsx
@@ -1,6 +1,5 @@
 import CheckCircle from '@assets/img/listings/CheckCircle.svg';
 import XCircle from '@assets/img/listings/XCircle.svg';
-import { RowCenter } from '@components/confirmBtcTransaction/runes';
 import TokenImage from '@components/tokenImage';
 import { ArrowUpRight } from '@phosphor-icons/react';
 import type { FungibleToken, ListingProvider, Marketplace } from '@secretkeylabs/xverse-core';
@@ -29,6 +28,13 @@ const Container = styled.div<{ $successful: boolean }>`
   cursor: ${(props) => (props.$successful ? 'pointer' : 'auto')};
 `;
 
+const RowCenter = styled.div({
+  display: 'flex',
+  flexDirection: 'row',
+  alignItems: 'center',
+  justifyContent: 'space-between',
+});
+
 const InfoContainer = styled.div`
   display: flex;
   flex: 1;
diff --git a/src/app/screens/transferRunesRequest/index.tsx b/src/app/screens/transferRunesRequest/index.tsx
index 4600ad272..f6b89139d 100644
--- a/src/app/screens/transferRunesRequest/index.tsx
+++ b/src/app/screens/transferRunesRequest/index.tsx
@@ -37,7 +37,6 @@ function TransferRunesRequestInner({ data, context }: TransferRunesRequestInnerP
     isLoading,
     transaction,
     summary,
-    runesSummary,
     txError,
   } = useTransferRunes({
     tabId: context.tabId,
@@ -76,7 +75,6 @@ function TransferRunesRequestInner({ data, context }: TransferRunesRequestInnerP
         <ConfirmBtcTransaction
           showAccountHeader
           summary={summary}
-          runeSummary={runesSummary}
           isLoading={isLoading}
           confirmText={t('CONFIRM')}
           cancelText={t('CANCEL')}
diff --git a/src/app/screens/transferRunesRequest/useTransferRunesRequest.ts b/src/app/screens/transferRunesRequest/useTransferRunesRequest.ts
index 941685bfa..2a2a21468 100644
--- a/src/app/screens/transferRunesRequest/useTransferRunesRequest.ts
+++ b/src/app/screens/transferRunesRequest/useTransferRunesRequest.ts
@@ -7,12 +7,10 @@ import { RpcErrorCode, type TransferRunesRequest } from '@sats-connect/core';
 import { type TransactionSummary } from '@screens/sendBtc/helpers';
 import {
   btcTransaction,
-  parseSummaryForRunes,
   runesTransaction,
-  type RuneSummary,
   type Transport,
 } from '@secretkeylabs/xverse-core';
-import { useCallback, useEffect, useMemo, useState } from 'react';
+import { useCallback, useEffect, useState } from 'react';
 
 type Args = {
   tabId: number;
@@ -27,7 +25,6 @@ const useTransferRunes = ({ tabId, messageId, recipients }: Args) => {
   const [feeRate, setFeeRate] = useState<string>('');
   const [transaction, setTransaction] = useState<btcTransaction.EnhancedTransaction | undefined>();
   const [summary, setSummary] = useState<TransactionSummary | undefined>();
-  const [runesSummary, setRunesSummary] = useState<RuneSummary | undefined>();
   const [isExecuting, setIsExecuting] = useState<boolean>(false);
   const [isLoading, setIsLoading] = useState<boolean>(false);
   const { data: btcFeeRates } = useBtcFeeRate();
@@ -47,10 +44,7 @@ const useTransferRunes = ({ tabId, messageId, recipients }: Args) => {
         Number(desiredFeeRate),
       );
       const txSummary = await tx.getSummary();
-      const parsedRunesSummary = await parseSummaryForRunes(txContext, txSummary, network.type, {
-        separateTransfersOnNoExternalInputs: true,
-      });
-      return { tx, txSummary, parsedRunesSummary };
+      return { tx, txSummary };
     },
     [network.type, recipients, txContext],
   );
@@ -60,13 +54,12 @@ const useTransferRunes = ({ tabId, messageId, recipients }: Args) => {
       try {
         if (!desiredFeeRate) return;
         setIsLoading(true);
-        const { tx, txSummary, parsedRunesSummary } = await generateTransferTxAndSummary(
+        const { tx, txSummary } = await generateTransferTxAndSummary(
           desiredFeeRate,
         );
         setFeeRate(desiredFeeRate.toString());
         setTransaction(tx);
         setSummary(txSummary);
-        setRunesSummary(parsedRunesSummary);
       } catch (e) {
         setTransaction(undefined);
         setSummary(undefined);
@@ -139,7 +132,6 @@ const useTransferRunes = ({ tabId, messageId, recipients }: Args) => {
   return {
     transaction,
     summary,
-    runesSummary,
     txError,
     feeRate,
     isLoading,
diff --git a/src/app/utils/mappers.ts b/src/app/utils/mappers.ts
new file mode 100644
index 000000000..20f0fa2dc
--- /dev/null
+++ b/src/app/utils/mappers.ts
@@ -0,0 +1,14 @@
+import type { FungibleToken, RuneBase } from '@secretkeylabs/xverse-core';
+
+// eslint-disable-next-line import/prefer-default-export
+export const mapRuneBaseToFungibleToken = (rune: RuneBase): FungibleToken => ({
+  protocol: 'runes',
+  name: rune.runeName,
+  principal: rune.runeId,
+  assetName: '',
+  balance: '',
+  total_received: '',
+  total_sent: '',
+  runeSymbol: rune.symbol,
+  runeInscriptionId: rune.inscriptionId,
+});
diff --git a/src/locales/en.json b/src/locales/en.json
index 1a04a39ac..55152f584 100644
--- a/src/locales/en.json
+++ b/src/locales/en.json
@@ -16,7 +16,8 @@
     "CONFIRM": "Confirm",
     "APPLY": "Apply",
     "IN": "In",
-    "TO": "To"
+    "TO": "To",
+    "FROM": "From"
   },
   "UNITS": {
     "SATS_PER_VB": "sats/vB"
@@ -704,8 +705,8 @@
     "VIEW_ADDRESS": "View address",
     "ADD_STACKS_ADDRESS": "Add a Stacks address",
     "NFTS": "NFTs",
-    "RARE_SAT": "Rare sat",
-    "RARE_SATS": "Rare sats",
+    "RARE_SAT": "Rare Sat",
+    "RARE_SATS": "Rare Sats",
     "NEW_FEATURE": "New Feature, Rare Sats",
     "NEW_FEAT_RARE_SATS_DESCRIPTION": "Enable rare sats to display rare, interesting and unique sats in your wallet. You can change this setting at any time.",
     "NEW_FEAT_RARE_SATS_ORDINALS_ENABLE": "Enable rare sats to display rare, interesting and unique sats in your wallet. Note than enabling rare sats will also enable Ordinals. You can change this setting at any time.",

From f339f9a5e07c8d30f40809da0dbdb821a2f1ce5f Mon Sep 17 00:00:00 2001
From: "Jordan K." <65149726+jordankzf@users.noreply.github.com>
Date: Fri, 20 Sep 2024 23:14:30 +0800
Subject: [PATCH 122/227] Fix linebreak (#605)

---
 .../screens/swap/quotesModal/quoteTile.tsx    | 22 ++++++++++++++-----
 1 file changed, 16 insertions(+), 6 deletions(-)

diff --git a/src/app/screens/swap/quotesModal/quoteTile.tsx b/src/app/screens/swap/quotesModal/quoteTile.tsx
index 78ef7d2dd..dcd959dce 100644
--- a/src/app/screens/swap/quotesModal/quoteTile.tsx
+++ b/src/app/screens/swap/quotesModal/quoteTile.tsx
@@ -67,12 +67,12 @@ interface Props {
   unit?: string;
 }
 
-const TruncatedP = styled(StyledP)`
+const TruncatedP = styled(StyledP)<{ $textAlign: string }>`
   white-space: nowrap;
   overflow: hidden;
   text-overflow: ellipsis;
-  width: 150px;
-  text-align: right;
+  width: 120px;
+  text-align: ${({ $textAlign }) => $textAlign};
 `;
 
 function QuoteTile({
@@ -101,15 +101,25 @@ function QuoteTile({
       <TokenImage currency={image.currency} fungibleToken={image.ft} size={32} />
       <InfoContainer>
         <RowCenter>
-          <StyledP data-testid="place-name" typography="body_bold_m" color="white_0">
+          <TruncatedP
+            $textAlign="left"
+            data-testid="place-name"
+            typography="body_bold_m"
+            color="white_0"
+          >
             {provider}
-          </StyledP>
+          </TruncatedP>
           <NumericFormat
             value={price}
             displayType="text"
             thousandSeparator
             renderText={() => (
-              <TruncatedP data-testid="quote-label" typography="body_bold_m" color="white_0">
+              <TruncatedP
+                $textAlign="right"
+                data-testid="quote-label"
+                typography="body_bold_m"
+                color="white_0"
+              >
                 {formatNumber(price)} {unit}
               </TruncatedP>
             )}

From b0b4101a1b45fc973c74df8b8edcef7a612dd9a9 Mon Sep 17 00:00:00 2001
From: fede erbes <fedeerbes@gmail.com>
Date: Sat, 21 Sep 2024 23:03:11 +0200
Subject: [PATCH 123/227] fix: btc amount warning msg in tx review screen
 (#606)

---
 src/locales/en.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/locales/en.json b/src/locales/en.json
index 55152f584..43649fdee 100644
--- a/src/locales/en.json
+++ b/src/locales/en.json
@@ -410,7 +410,7 @@
     "RUNES_CENOTAPH_WARNING": "This transaction will burn all input Runes. Make sure you trust the requesting app.",
     "YOU_WILL_SEND": "You will send",
     "TRANSACTION_DETAILS": "Transaction details",
-    "BTC_TRANSFER_WARNING": "This amount may include the tx fee & postage associated to transferred ordinals, runes & BRC-20.",
+    "BTC_TRANSFER_WARNING": "This amount may include the network fee.",
     "LEDGER": {
       "CONNECT": {
         "TITLE": "Connect your hardware wallet",

From c861ac0b74ad60f5392eee91b4fe4f94fc0fe7cb Mon Sep 17 00:00:00 2001
From: "Duska.T" <55587184+DuskaT021@users.noreply.github.com>
Date: Thu, 26 Sep 2024 11:10:08 +0200
Subject: [PATCH 124/227] e2e-fix: Fixed failing test and improved locators for
 the sendRune flow tests (#614)

* e2e-fix: fixed two failing tests for the runes flow
---
 tests/specs/runesList.spec.ts |  2 +-
 tests/specs/runesSend.spec.ts | 26 ++++++++++++++++++--------
 2 files changed, 19 insertions(+), 9 deletions(-)

diff --git a/tests/specs/runesList.spec.ts b/tests/specs/runesList.spec.ts
index 7ce3a5970..1a3c9213c 100644
--- a/tests/specs/runesList.spec.ts
+++ b/tests/specs/runesList.spec.ts
@@ -81,7 +81,7 @@ test.describe('List runes', () => {
     const num1Currency = parseFloat(sendCurrencyAmount.replace(/[^0-9.]/g, ''));
 
     // click on continue
-    await wallet.buttonContinue.click();
+    await page.getByRole('button', { name: 'Continue' }).click();
 
     // Check Visuals Review transaction
     await expect(wallet.confirmTotalAmount).toBeVisible();
diff --git a/tests/specs/runesSend.spec.ts b/tests/specs/runesSend.spec.ts
index e934b71a2..2daa4f077 100644
--- a/tests/specs/runesSend.spec.ts
+++ b/tests/specs/runesSend.spec.ts
@@ -66,13 +66,18 @@ test.describe('Send runes', () => {
     await wallet.buttonNext.click();
 
     await wallet.checkVisualsSendPage2('send-rune');
-    await wallet.inputSendAmount.fill(price.toString());
-    await expect(wallet.buttonNext).toBeEnabled();
+    await page.getByRole('textbox', { name: '0' }).fill(price.toString());
+    await page.getByRole('button', { name: 'Edit' }).click();
+    await page.getByRole('button', { name: /custom/i }).click();
+    await page.getByRole('dialog').getByPlaceholder('0').fill('3');
+    await page.getByRole('button', { name: 'Apply' }).click();
+    await page.getByRole('button', { name: 'Next' }).click();
 
     const displayBalance = await wallet.labelBalanceAmountSelector.innerText();
     const displayBalanceNumerical = parseFloat(displayBalance.replace(/[^0-9.]/g, ''));
     await expect(originalBalanceAmount).toEqual(displayBalanceNumerical);
-    await wallet.buttonNext.click();
+
+    await page.getByRole('button', { name: 'Next' }).click();
 
     await wallet.checkVisualsSendTransactionReview(
       'send-rune',
@@ -124,17 +129,22 @@ test.describe('Send runes', () => {
     await wallet.invalidAddressCheck(wallet.receiveAddress);
 
     await wallet.receiveAddress.fill(TEST_ORDINALS_ADDRESS);
-    await expect(wallet.buttonNext).toBeEnabled();
-    await wallet.buttonNext.click();
+    await page.getByRole('button', { name: 'Next' }).click();
 
     await wallet.checkVisualsSendPage2('send-rune');
-    await wallet.inputSendAmount.fill(price.toString());
-    await expect(wallet.buttonNext).toBeEnabled();
+    await page.getByRole('textbox', { name: '0' }).fill('3');
+
+    await page.getByRole('button', { name: 'Edit' }).click();
+    await page.getByRole('button', { name: /custom/i }).click();
+    await page.getByRole('dialog').getByPlaceholder('0').fill('3');
+    await page.getByRole('button', { name: 'Apply' }).click();
+    await expect(page.getByRole('button', { name: 'Next' })).toBeVisible();
+    await page.getByRole('button', { name: 'Next' }).click();
 
     const displayBalance = await wallet.labelBalanceAmountSelector.innerText();
     const displayBalanceNumerical = parseFloat(displayBalance.replace(/[^0-9.]/g, ''));
     await expect(originalBalanceAmount).toEqual(displayBalanceNumerical);
-    await wallet.buttonNext.click();
+    await page.getByRole('button', { name: 'Next' }).click();
 
     await wallet.checkVisualsSendTransactionReview(
       'send-rune',

From 9caf32fc54977a8628b60577fe16d272963c3856 Mon Sep 17 00:00:00 2001
From: fede erbes <fedeerbes@gmail.com>
Date: Fri, 27 Sep 2024 07:49:04 +0200
Subject: [PATCH 125/227] chore: add core version which includes utxo cache
 improvements (#610)

* chore: add core version which includes utxo cache improvements

* chore: use updated version of core and add getAllKeys prop to UtxoCache
---
 package-lock.json                      | 14 +++++++-------
 package.json                           |  2 +-
 src/app/hooks/useTransactionContext.ts |  1 +
 3 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index f1b96036d..fa9a57d19 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -15,7 +15,7 @@
         "@react-spring/web": "^9.6.1",
         "@sats-connect/core": "0.3.0-7e6dd81",
         "@scure/btc-signer": "1.2.1",
-        "@secretkeylabs/xverse-core": "21.0.0",
+        "@secretkeylabs/xverse-core": "21.1.0-f744550",
         "@stacks/connect": "7.4.1",
         "@stacks/stacks-blockchain-api-types": "6.1.1",
         "@stacks/transactions": "6.16.1",
@@ -1272,9 +1272,9 @@
       }
     },
     "node_modules/@secretkeylabs/xverse-core": {
-      "version": "21.0.0",
-      "resolved": "https://npm.pkg.github.com/download/@secretkeylabs/xverse-core/21.0.0/4c13617c2d2ce6b1d5898a812ef004bc32f5feba",
-      "integrity": "sha512-avlA06EgbvPtttdrLtwb+WEOG1fplY1+FWk2TU9ppQ367ufehCLHmd4az0ggjUsMOykuHyJCGQl9DiG2jHi3zQ==",
+      "version": "21.1.0-f744550",
+      "resolved": "https://npm.pkg.github.com/download/@secretkeylabs/xverse-core/21.1.0-f744550/5151e463356e2578c29bdffaacbd2cd35f6ae9ed",
+      "integrity": "sha512-APgkCZ73BlS2rCMedHOIELnq+nda4mbb767GI/QHlgxeg0JEXMVj0UMFlniY4AsoNZW4EJCFTdx7yiaBHgWqlQ==",
       "license": "ISC",
       "dependencies": {
         "@bitcoinerlab/secp256k1": "^1.0.2",
@@ -13637,9 +13637,9 @@
       }
     },
     "@secretkeylabs/xverse-core": {
-      "version": "21.0.0",
-      "resolved": "https://npm.pkg.github.com/download/@secretkeylabs/xverse-core/21.0.0/4c13617c2d2ce6b1d5898a812ef004bc32f5feba",
-      "integrity": "sha512-avlA06EgbvPtttdrLtwb+WEOG1fplY1+FWk2TU9ppQ367ufehCLHmd4az0ggjUsMOykuHyJCGQl9DiG2jHi3zQ==",
+      "version": "21.1.0-f744550",
+      "resolved": "https://npm.pkg.github.com/download/@secretkeylabs/xverse-core/21.1.0-f744550/5151e463356e2578c29bdffaacbd2cd35f6ae9ed",
+      "integrity": "sha512-APgkCZ73BlS2rCMedHOIELnq+nda4mbb767GI/QHlgxeg0JEXMVj0UMFlniY4AsoNZW4EJCFTdx7yiaBHgWqlQ==",
       "requires": {
         "@bitcoinerlab/secp256k1": "^1.0.2",
         "@noble/curves": "^1.2.0",
diff --git a/package.json b/package.json
index 9ef5382dc..fd22fd4b8 100644
--- a/package.json
+++ b/package.json
@@ -43,7 +43,7 @@
     "@react-spring/web": "^9.6.1",
     "@sats-connect/core": "0.3.0-7e6dd81",
     "@scure/btc-signer": "1.2.1",
-    "@secretkeylabs/xverse-core": "21.0.0",
+    "@secretkeylabs/xverse-core": "21.1.0-f744550",
     "@stacks/connect": "7.4.1",
     "@stacks/stacks-blockchain-api-types": "6.1.1",
     "@stacks/transactions": "6.16.1",
diff --git a/src/app/hooks/useTransactionContext.ts b/src/app/hooks/useTransactionContext.ts
index ded91882f..1ef680760 100644
--- a/src/app/hooks/useTransactionContext.ts
+++ b/src/app/hooks/useTransactionContext.ts
@@ -15,6 +15,7 @@ const useTransactionContext = () => {
     () =>
       new UtxoCache({
         cacheStorageController: {
+          getAllKeys: async () => Object.keys(localStorage),
           get: async (key: string) => {
             const value = localStorage.getItem(key);
             return value;

From 52d68d71eedc6f199a41f6f11b9b42009ce446b8 Mon Sep 17 00:00:00 2001
From: Mahmoud Aboelenein <mahmoud@secretkeylabs.com>
Date: Fri, 27 Sep 2024 08:49:24 +0300
Subject: [PATCH 126/227] ENG-4775, ENG-4776,ENG-4777,
 ENG-4778-Connection-manager (#594)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* init connected apps screen and disconnect app

* added lastTimeUsed and finalize ui

* Remove unused var

* Use React-aware permission store helpers

* Remove unused code

* update styling

* create new client metadata table

* update exports

* code review fixes

* fix casing

* sort clients by last used

---------

Co-authored-by: Eduard Bardají Puig <ebardaji@gmail.com>
---
 .../components/permissionsManager/index.tsx   |  38 +++-
 .../components/permissionsManager/schemas.ts  |  26 ++-
 .../components/permissionsManager/types.ts    |   8 +-
 .../components/permissionsManager/utils.ts    |  71 ++++++--
 src/app/hooks/useChromeLocalStorage.ts        |   2 +-
 .../connectedAppsAndPermissions/client.tsx    |  93 ++++++++++
 .../index.styles.ts                           |  81 +++++++--
 .../connectedAppsAndPermissions/index.tsx     | 162 ++++++++++--------
 src/app/screens/settings/index.tsx            |  12 +-
 src/app/screens/transactionRequest/index.tsx  |   2 +
 src/common/utils/rpc/btc/getBalance.ts        |   6 +
 .../utils/rpc/ordinals/getInscriptions.ts     |   6 +
 src/common/utils/rpc/runes/getBalance.ts      |   6 +
 src/common/utils/rpc/wallet/getWalletType.ts  |   6 +
 .../utils/rpc/wallet/renouncePermissions.ts   |   2 +-
 src/locales/en.json                           |   9 +-
 16 files changed, 417 insertions(+), 113 deletions(-)
 create mode 100644 src/app/screens/settings/connectedAppsAndPermissions/client.tsx

diff --git a/src/app/components/permissionsManager/index.tsx b/src/app/components/permissionsManager/index.tsx
index 997b105ed..41830c6f4 100644
--- a/src/app/components/permissionsManager/index.tsx
+++ b/src/app/components/permissionsManager/index.tsx
@@ -85,7 +85,7 @@ function PermissionsUtilsProvider({ children }: { children: React.ReactNode }) {
   // Queries
 
   const getClientPermissions = useCallback(
-    async (clientId: Client['id']) => {
+    (clientId: Client['id']) => {
       if (!store) {
         // eslint-disable-next-line no-console
         console.warn('[PermissionsUtilsProvider.getClientPermissions]: Store is not loaded yet.');
@@ -96,6 +96,19 @@ function PermissionsUtilsProvider({ children }: { children: React.ReactNode }) {
     },
     [store],
   );
+
+  const getClientMetadata = useCallback(
+    (clientId: Client['id']) => {
+      if (!store) {
+        // eslint-disable-next-line no-console
+        console.warn('[PermissionsUtilsProvider.getClientMetadata]: Store is not loaded yet.');
+        return undefined;
+      }
+
+      return utils.getClientMetadata(store, clientId);
+    },
+    [store],
+  );
   const getClientPermission = useCallback(
     async (clientId: Client['id'], resourceId: Resource['id']) => {
       if (!store) {
@@ -109,7 +122,7 @@ function PermissionsUtilsProvider({ children }: { children: React.ReactNode }) {
     [store],
   );
   const getResource = useCallback(
-    async (resourceId: Resource['id']) => {
+    (resourceId: Resource['id']) => {
       if (!store) {
         // eslint-disable-next-line no-console
         console.warn('[PermissionsUtilsProvider.getResource]: Store is not loaded yet.');
@@ -132,7 +145,7 @@ function PermissionsUtilsProvider({ children }: { children: React.ReactNode }) {
           return;
         }
 
-        utils.addClient(store.clients, client);
+        utils.addClient(store, client);
         await utils.savePermissionsStore(store);
       });
     },
@@ -224,13 +237,26 @@ function PermissionsUtilsProvider({ children }: { children: React.ReactNode }) {
           return;
         }
 
-        utils.removeClient(store.clients, store.permissions, clientId);
+        utils.removeClient(store, clientId);
         await utils.savePermissionsStore(store);
       });
     },
     [store],
   );
 
+  const removeAllClients = useCallback(async () => {
+    await utils.permissionsStoreMutex.runExclusive(async () => {
+      if (!store) {
+        // eslint-disable-next-line no-console
+        console.warn('[PermissionsUtilsProvider.removeAllClients]: Store is not loaded yet.');
+        return;
+      }
+
+      utils.removeAllClients(store);
+      await utils.savePermissionsStore(store);
+    });
+  }, [store]);
+
   const contextValue = useMemo(
     () => ({
       addClient,
@@ -240,8 +266,10 @@ function PermissionsUtilsProvider({ children }: { children: React.ReactNode }) {
       removePermission,
       removeAllClientPermissions,
       getClientPermissions,
+      getClientMetadata,
       getClientPermission,
       removeClient,
+      removeAllClients,
       getResource,
     }),
     [
@@ -251,7 +279,9 @@ function PermissionsUtilsProvider({ children }: { children: React.ReactNode }) {
       setPermission,
       removePermission,
       removeAllClientPermissions,
+      removeAllClients,
       getClientPermissions,
+      getClientMetadata,
       getClientPermission,
       removeClient,
       getResource,
diff --git a/src/app/components/permissionsManager/schemas.ts b/src/app/components/permissionsManager/schemas.ts
index 5728b4fc2..ae2908cee 100644
--- a/src/app/components/permissionsManager/schemas.ts
+++ b/src/app/components/permissionsManager/schemas.ts
@@ -26,6 +26,29 @@ export const clientsTableSchema = v.set(clientSchema);
  */
 export type ClientsTable = v.InferOutput<typeof clientsTableSchema>;
 
+/**
+ * @public
+ */
+export const clientMetadataSchema = v.object({
+  clientId: clientSchema.entries.id,
+  lastUsed: v.optional(v.number()),
+});
+
+/**
+ * @public
+ */
+export type ClientMetadata = v.InferOutput<typeof clientMetadataSchema>;
+
+/**
+ * @public
+ */
+export const clientMetadataTableSchema = v.set(clientMetadataSchema);
+
+/**
+ * @public
+ */
+export type ClientMetadataTable = v.InferOutput<typeof clientMetadataTableSchema>;
+
 // Resources
 
 /**
@@ -96,8 +119,9 @@ export type PermissionsTable = v.InferOutput<typeof permissionsTableSchema>;
  * @public
  */
 export const permissionsStoreSchema = v.object({
-  version: v.literal(2),
+  version: v.literal(3),
   clients: clientsTableSchema,
+  clientMetadata: clientMetadataTableSchema,
   resources: resourcesTableSchema,
   permissions: permissionsTableSchema,
 });
diff --git a/src/app/components/permissionsManager/types.ts b/src/app/components/permissionsManager/types.ts
index 72eb87c51..4cf154d3e 100644
--- a/src/app/components/permissionsManager/types.ts
+++ b/src/app/components/permissionsManager/types.ts
@@ -1,4 +1,4 @@
-import type { Client, Permission, PermissionsStore, Resource } from './schemas';
+import type { Client, ClientMetadata, Permission, PermissionsStore, Resource } from './schemas';
 
 export type TPermissionsStoreContext<TError = unknown> =
   | {
@@ -11,8 +11,9 @@ export type TPermissionsStoreContext<TError = unknown> =
 
 export type TPermissionsUtilsContext = {
   // Queries
-  getResource: (resourceId: Resource['id']) => Promise<Resource | undefined>;
-  getClientPermissions: (clientId: Client['id']) => Promise<Permission[]>;
+  getResource: (resourceId: Resource['id']) => Resource | undefined;
+  getClientPermissions: (clientId: Client['id']) => Permission[];
+  getClientMetadata: (clientId: Client['id']) => ClientMetadata | undefined;
   getClientPermission: (
     clientId: Client['id'],
     resourceId: Resource['id'],
@@ -26,4 +27,5 @@ export type TPermissionsUtilsContext = {
   setPermission: (permission: Permission) => Promise<void>;
   removePermission: (clientId: Client['id'], resourceId: Resource['id']) => Promise<void>;
   removeAllClientPermissions: (clientId: Client['id']) => Promise<void>;
+  removeAllClients: () => Promise<void>;
 };
diff --git a/src/app/components/permissionsManager/utils.ts b/src/app/components/permissionsManager/utils.ts
index 523c21ac3..b8db1ae53 100644
--- a/src/app/components/permissionsManager/utils.ts
+++ b/src/app/components/permissionsManager/utils.ts
@@ -7,6 +7,8 @@ import { permissionsPersistantStoreKeyName } from './constants';
 import {
   permissionsStoreSchema,
   type Client,
+  type ClientMetadata,
+  type ClientMetadataTable,
   type ClientsTable,
   type Permission,
   type PermissionsStore,
@@ -73,29 +75,70 @@ export async function getClient(permissionStore: PermissionsStore, clientId: Cli
   return [...permissionStore.clients].find((c) => c.id === clientId);
 }
 
+/**
+ * Get a client Metadata by its ID.
+ * @public
+ */
+export function getClientMetadata(
+  permissionStore: PermissionsStore,
+  clientId: Client['id'],
+): ClientMetadata {
+  const metadata = [...permissionStore.clientMetadata].find((c) => c.clientId === clientId);
+  // If the metadata doesn't exist, create it
+  if (!metadata) {
+    permissionStore.clientMetadata.add({ clientId });
+    return { clientId };
+  }
+  return metadata;
+}
+
 // Mutations
 
-export function addClient(clients: ClientsTable, client: Client) {
-  if (![...clients].some((c) => c.id === client.id)) {
-    clients.add(client);
+export function addClient(permissionStore: PermissionsStore, client: Client) {
+  if (![...permissionStore.clients].some((c) => c.id === client.id)) {
+    permissionStore.clients.add(client);
+    permissionStore.clientMetadata.add({ clientId: client.id, lastUsed: new Date().getTime() });
   }
 }
+
+export function updateClientMetadata(
+  permissionStore: PermissionsStore,
+  clientId: Client['id'],
+  updatedData: Partial<ClientMetadata>,
+) {
+  const updatedMetadata = Array.from(permissionStore.clientMetadata).map((item) =>
+    item.clientId === clientId ? { ...item, ...updatedData } : item,
+  );
+  permissionStore.clientMetadata = new Set(updatedMetadata);
+}
+
 export function removeAllClientPermissions(permissions: PermissionsTable, clientId: Client['id']) {
   const clientPermissions = [...permissions].filter((p) => p.clientId === clientId);
   clientPermissions.forEach((p) => permissions.delete(p));
 }
-export function removeClient(
-  clients: ClientsTable,
-  permissions: PermissionsTable,
-  clientId: Client['id'],
-) {
-  removeAllClientPermissions(permissions, clientId);
 
-  const client = [...clients].find((c) => c.id === clientId);
+function removeClientMetadata(clientMetadata: ClientMetadataTable, clientId: Client['id']) {
+  const metadata = [...clientMetadata].find((p) => p.clientId === clientId);
+  if (metadata) {
+    clientMetadata.delete(metadata);
+  }
+}
+
+export function removeClient(permissionStore: PermissionsStore, clientId: Client['id']) {
+  removeAllClientPermissions(permissionStore.permissions, clientId);
+  removeClientMetadata(permissionStore.clientMetadata, clientId);
+  const client = [...permissionStore.clients].find((c) => c.id === clientId);
   if (client) {
-    clients.delete(client);
+    permissionStore.clients.delete(client);
   }
 }
+
+export function removeAllClients(permissionStore: PermissionsStore) {
+  permissionStore.clients.clear();
+  permissionStore.clientMetadata.clear();
+  permissionStore.permissions.clear();
+}
+
 export function addResource(resources: ResourcesTable, resource: Resource) {
   if (![...resources].some((r) => r.id === resource.id)) {
     resources.add(resource);
@@ -154,6 +197,9 @@ export function savePermissionsStore(permissionsStore: PermissionsStore) {
 function makeClientsTable() {
   return new Set<Client>();
 }
+function makeClientsMetadataTable() {
+  return new Set<ClientMetadata>();
+}
 function makeResourcesTable() {
   return new Set<Resource>();
 }
@@ -162,8 +208,9 @@ function makePermissionsTable() {
 }
 function makePermissionsStore(): PermissionsStore {
   return {
-    version: 2,
+    version: 3,
     clients: makeClientsTable(),
+    clientMetadata: makeClientsMetadataTable(),
     resources: makeResourcesTable(),
     permissions: makePermissionsTable(),
   };
diff --git a/src/app/hooks/useChromeLocalStorage.ts b/src/app/hooks/useChromeLocalStorage.ts
index 021c44edb..1514f36fe 100644
--- a/src/app/hooks/useChromeLocalStorage.ts
+++ b/src/app/hooks/useChromeLocalStorage.ts
@@ -5,7 +5,7 @@ const useChromeLocalStorage = <T extends unknown>(key: string, defaultValue?: T)
   const queryClient = useQueryClient();
 
   const { data: value, isFetching } = useQuery({
-    queryKey: ['chromeLocalStorage', key],
+    queryKey: ['chromeLocalStorage', key, defaultValue],
     queryFn: async () => {
       const result = await chromeStorage.local.getItem<T>(key);
       return result === undefined ? defaultValue : result;
diff --git a/src/app/screens/settings/connectedAppsAndPermissions/client.tsx b/src/app/screens/settings/connectedAppsAndPermissions/client.tsx
new file mode 100644
index 000000000..3e6d30710
--- /dev/null
+++ b/src/app/screens/settings/connectedAppsAndPermissions/client.tsx
@@ -0,0 +1,93 @@
+import { usePermissionsUtils } from '@components/permissionsManager';
+import type { Client as ClientType } from '@components/permissionsManager/schemas';
+import { CaretRight } from '@phosphor-icons/react';
+import { getAppIconFromWebManifest } from '@secretkeylabs/xverse-core';
+import { useQuery } from '@tanstack/react-query';
+import { useTheme } from 'styled-components';
+import type { ConnectedApp } from '.';
+import {
+  Client,
+  ClientDescription,
+  ClientHeader,
+  ClientName,
+  DappIcon,
+  DappIconPlaceholder,
+  PermissionContainer,
+  PermissionText,
+} from './index.styles';
+
+async function getWebsiteInfo(url: string): Promise<{ name: string; icon: string }> {
+  try {
+    const parsedUrl = new URL(url);
+    const { hostname } = parsedUrl;
+    const appIcon = await getAppIconFromWebManifest(url);
+    return { name: hostname, icon: appIcon };
+  } catch (error) {
+    return { name: '', icon: '' };
+  }
+}
+
+type PermissionsProps = {
+  clientId: string;
+  color?: string;
+};
+export function ClientPermissions({ clientId, color }: PermissionsProps) {
+  const utils = usePermissionsUtils();
+  const sortedPermissions = utils
+    .getClientPermissions(clientId)
+    .sort((p1, p2) => p1.resourceId.localeCompare(p2.resourceId));
+
+  return sortedPermissions.map((p) => {
+    const resource = utils.getResource(p.resourceId);
+    if (!resource) return null;
+
+    return (
+      <PermissionContainer key={p.resourceId}>
+        {[...p.actions].map((a) => (
+          <PermissionText color={color} key={a}>
+            {a}
+          </PermissionText>
+        ))}
+      </PermissionContainer>
+    );
+  });
+}
+
+interface Props {
+  client: ConnectedApp;
+  setSelectedApp: (app: ConnectedApp) => void;
+}
+
+export default function ClientApp({ client, setSelectedApp }: Props) {
+  const theme = useTheme();
+  const { data: appDetails } = useQuery({
+    queryKey: ['websiteInfo', client.id],
+    queryFn: () => getWebsiteInfo(client.id),
+    placeholderData: { name: client.name, icon: '' },
+    enabled: !!client.id,
+  });
+
+  const handleSelectApp = () => {
+    setSelectedApp({
+      ...client,
+      name: appDetails?.name || client.name,
+    });
+  };
+
+  return (
+    <Client key={client.id} onClick={handleSelectApp}>
+      <ClientDescription>
+        {appDetails?.icon ? (
+          <DappIcon src={appDetails.icon} alt="Dapp logo" />
+        ) : (
+          <DappIconPlaceholder width={32} height={32} color="white" />
+        )}
+        <ClientHeader>
+          <ClientName>{appDetails?.name}</ClientName>
+          <ClientPermissions clientId={client.id} color={theme.colors.white_200} />
+        </ClientHeader>
+      </ClientDescription>
+      <CaretRight size={16} color="white" />
+    </Client>
+  );
+}
diff --git a/src/app/screens/settings/connectedAppsAndPermissions/index.styles.ts b/src/app/screens/settings/connectedAppsAndPermissions/index.styles.ts
index 29edd0662..5d32a06a0 100644
--- a/src/app/screens/settings/connectedAppsAndPermissions/index.styles.ts
+++ b/src/app/screens/settings/connectedAppsAndPermissions/index.styles.ts
@@ -1,5 +1,6 @@
 /* eslint-disable import/prefer-default-export */
 
+import { Globe } from '@phosphor-icons/react';
 import styled from 'styled-components';
 
 export const Container = styled.div((props) => ({
@@ -10,33 +11,81 @@ export const Container = styled.div((props) => ({
   paddingRight: props.theme.space.m,
 }));
 
-export const ClientHeader = styled('div')({
+export const Client = styled('button')((props) => ({
   display: 'flex',
+  alignItems: 'center',
   justifyContent: 'space-between',
-});
+  backgroundColor: props.theme.colors.elevation1,
+  padding: props.theme.space.s,
+  marginBottom: props.theme.space.s,
+  borderRadius: props.theme.space.s,
+}));
 
-export const ClientName = styled('div')({
-  fontWeight: 'bold',
+export const ClientDescription = styled('div')({
+  display: 'flex',
+  alignItems: 'center',
 });
 
-export const Row = styled('div')({
-  paddingLeft: '10px',
+export const ClientHeader = styled('div')({
+  display: 'flex',
+  flexDirection: 'column',
+  justifyContent: 'center',
+  alignItems: 'flex-start',
 });
 
+export const DappIconPlaceholder = styled(Globe)((props) => ({
+  width: 32,
+  height: 32,
+  marginRight: props.theme.space.s,
+}));
+
+export const DappIcon = styled('img')((props) => ({
+  width: 32,
+  height: 32,
+  marginRight: props.theme.space.s,
+  borderRadius: props.theme.radius(1),
+}));
+
 export const PermissionContainer = styled('div')({
   display: 'flex',
   flexDirection: 'column',
 });
 
-export const PermissionTitle = styled('div')({
-  fontWeight: 'bold',
-});
+export const ButtonContainer = styled('div')((props) => ({
+  marginTop: 'auto',
+  marginBottom: props.theme.space.l,
+}));
 
-export const PermissionDescription = styled('div')({
-  paddingLeft: '10px',
-});
+export const ClientName = styled('div')((props) => ({
+  ...props.theme.typography.body_medium_m,
+  color: props.theme.colors.white_0,
+}));
 
-export const Button = styled('button')({
-  borderRadius: '4px',
-  padding: '0.2em 0.5em',
-});
+export const ClientPropertyContainer = styled('div')((props) => ({
+  display: 'flex',
+  flexDirection: 'column',
+  marginTop: props.theme.space.xs,
+}));
+
+export const Row = styled('div')((props) => ({
+  display: 'flex',
+  justifyContent: 'space-between',
+  alignItems: 'center',
+  marginBottom: props.theme.space.m,
+}));
+
+export const ClientProperty = styled('div')((props) => ({
+  ...props.theme.typography.body_medium_m,
+  color: props.theme.colors.white_400,
+}));
+
+export const ClientPropertyValue = styled('div')((props) => ({
+  ...props.theme.typography.body_medium_m,
+  color: props.theme.colors.white_0,
+}));
+
+export const PermissionText = styled('div')(({ theme, color }) => ({
+  ...theme.typography.body_m,
+  color: color || theme.colors.white_0,
+  textTransform: 'capitalize',
+}));
diff --git a/src/app/screens/settings/connectedAppsAndPermissions/index.tsx b/src/app/screens/settings/connectedAppsAndPermissions/index.tsx
index 10c931075..8df7aa416 100644
--- a/src/app/screens/settings/connectedAppsAndPermissions/index.tsx
+++ b/src/app/screens/settings/connectedAppsAndPermissions/index.tsx
@@ -1,97 +1,125 @@
 import { dispatchEventToOrigin } from '@common/utils/messages/extensionToContentScript/dispatchEvent';
 import { usePermissionsStore, usePermissionsUtils } from '@components/permissionsManager';
-import type { Client } from '@components/permissionsManager/schemas';
-import * as utils from '@components/permissionsManager/utils';
+import type { Client as ClientType } from '@components/permissionsManager/schemas';
 import BottomBar from '@components/tabBar';
 import TopRow from '@components/topRow';
-import { useCallback } from 'react';
+import Button from '@ui-library/button';
+import { formatDate } from '@utils/date';
+import { useCallback, useMemo, useState } from 'react';
+import toast from 'react-hot-toast';
 import { useTranslation } from 'react-i18next';
 import { useNavigate } from 'react-router-dom';
 import { SubTitle, Title } from '../index.styles';
+import ClientApp, { ClientPermissions } from './client';
 import {
-  Button,
-  ClientHeader,
-  ClientName,
+  ButtonContainer,
+  ClientProperty,
+  ClientPropertyContainer,
+  ClientPropertyValue,
   Container,
-  PermissionContainer,
-  PermissionDescription,
-  PermissionTitle,
   Row,
 } from './index.styles';
 
+export type ConnectedApp = ClientType & { lastUsed: number };
+
 function ConnectedAppsAndPermissionsScreen() {
   const { t } = useTranslation('translation', { keyPrefix: 'CONNECTED_APPS' });
+  const [selectedApp, setSelectedApp] = useState<ConnectedApp | null>(null);
   const navigate = useNavigate();
-  const { removeClient } = usePermissionsUtils();
+  const { removeClient, removeAllClients, getClientMetadata } = usePermissionsUtils();
   const { store } = usePermissionsStore();
 
+  const getClientsSortedByLastUsed = useCallback((): ConnectedApp[] | undefined => {
+    if (!store || !store.clients) {
+      return undefined;
+    }
+
+    const clientsArray = Array.from(store.clients);
+
+    return clientsArray
+      .map((client) => {
+        const lastUsed = getClientMetadata(client.id)?.lastUsed || 0;
+        return { ...client, lastUsed };
+      })
+      .sort((a, b) => b.lastUsed - a.lastUsed);
+  }, [store, getClientMetadata]);
+
+  const clientsSortedByLastUsed = useMemo(
+    () => getClientsSortedByLastUsed(),
+    [getClientsSortedByLastUsed],
+  );
+
   const handleBackButtonClick = useCallback(() => {
+    if (selectedApp) {
+      setSelectedApp(null);
+      return;
+    }
     navigate('/settings');
-  }, [navigate]);
+  }, [navigate, selectedApp]);
 
-  const handleDisconnect = useCallback(
-    async (client: Client) => {
-      // TODO: Handle error state in UI when designs are finalized.
-      await removeClient(client.id);
-      dispatchEventToOrigin(client.origin, {
+  const handleDisconnect = useCallback(async () => {
+    if (selectedApp) {
+      await removeClient(selectedApp.id);
+      dispatchEventToOrigin(selectedApp.origin, {
         type: 'disconnect',
       });
-    },
-    [removeClient],
-  );
-
-  if (!store) {
-    return null;
-  }
+      toast.success(t('DISCONNECT_SUCCESS'));
+      setSelectedApp(null);
+      return;
+    }
+    if (store) {
+      store.clients.forEach((client) => {
+        dispatchEventToOrigin(client.origin, {
+          type: 'disconnect',
+        });
+      });
+      await removeAllClients();
+    }
+    toast.success(t('DISCONNECT_ALL_SUCCESS'));
+  }, [selectedApp, removeClient, removeAllClients, t, store]);
 
   return (
     <>
       <TopRow onClick={handleBackButtonClick} />
       <Container>
-        <Title>{t('TITLE')}</Title>
-        <SubTitle> {store.clients.size === 0 ? t('EMPTY_MESSAGE') : t('SUBTITLE')}</SubTitle>
-        {[...store.clients].map((client) => (
-          <div key={client.id}>
-            <ClientHeader>
-              <ClientName>{client.name}</ClientName>
-              <Button
-                type="button"
-                onClick={() => {
-                  handleDisconnect(client);
-                }}
-              >
-                Disconnect
-              </Button>
-            </ClientHeader>
-            {utils
-              .getClientPermissions(store.permissions, client.id)
-              .sort((p1, p2) => p1.resourceId.localeCompare(p2.resourceId))
-              .map((p) => (
-                <div key={p.resourceId}>
-                  {(() => {
-                    const resource = utils.getResource(store.resources, p.resourceId);
-
-                    if (!resource) {
-                      return null;
-                    }
-
-                    return (
-                      <Row key={p.resourceId}>
-                        <PermissionContainer>
-                          <PermissionTitle>{resource.name}</PermissionTitle>
-                          <PermissionDescription>
-                            {[...p.actions].map((a) => (
-                              <div key={a}>{a}</div>
-                            ))}
-                          </PermissionDescription>
-                        </PermissionContainer>
-                      </Row>
-                    );
-                  })()}
-                </div>
-              ))}
-          </div>
-        ))}
+        {selectedApp ? (
+          <>
+            <Title>{selectedApp.name}</Title>
+            <ClientPropertyContainer>
+              <Row>
+                <ClientProperty>{t('URL')}</ClientProperty>
+                <ClientPropertyValue>{selectedApp.name}</ClientPropertyValue>
+              </Row>
+              <Row>
+                <ClientProperty>{t('LAST_USED')}</ClientProperty>
+                <ClientPropertyValue>
+                  {selectedApp.lastUsed ? formatDate(new Date(selectedApp.lastUsed)) : '-'}
+                </ClientPropertyValue>
+              </Row>
+              <Row>
+                <ClientProperty>{t('PERMISSIONS')}</ClientProperty>
+                <ClientPermissions clientId={selectedApp.id} />
+              </Row>
+            </ClientPropertyContainer>
+          </>
+        ) : (
+          <>
+            <Title>{t('TITLE')}</Title>
+            <SubTitle>{store?.clients.size === 0 ? t('EMPTY_MESSAGE') : t('SUBTITLE')}</SubTitle>
+            {clientsSortedByLastUsed?.map((client) => (
+              <ClientApp key={client.id} setSelectedApp={setSelectedApp} client={client} />
+            ))}
+          </>
+        )}
+        {(store?.clients?.size ?? 0) > 0 || selectedApp ? (
+          <ButtonContainer>
+            <Button
+              title={selectedApp ? t('DISCONNECT') : t('DISCONNECT_ALL')}
+              variant="secondary"
+              onClick={handleDisconnect}
+            />
+          </ButtonContainer>
+        ) : null}
       </Container>
       <BottomBar tab="settings" />
     </>
diff --git a/src/app/screens/settings/index.tsx b/src/app/screens/settings/index.tsx
index 39b470845..b0b4209ec 100644
--- a/src/app/screens/settings/index.tsx
+++ b/src/app/screens/settings/index.tsx
@@ -57,13 +57,11 @@ function Setting() {
           showDivider
         />
         <SettingComponent text={t('CATEGORIES.SECURITY')} onClick={openSecurity} showDivider />
-        {process.env.NODE_ENV !== 'production' && (
-          <SettingComponent
-            text={t('CATEGORIES.CONNECTED_APPS')}
-            onClick={openConnectedAppsAndPermissionsScreen}
-            showDivider
-          />
-        )}
+        <SettingComponent
+          text={t('CATEGORIES.CONNECTED_APPS')}
+          onClick={openConnectedAppsAndPermissionsScreen}
+          showDivider
+        />
         <SettingComponent
           text={t('CATEGORIES.ADVANCED')}
           onClick={openAdvancedSettings}
diff --git a/src/app/screens/transactionRequest/index.tsx b/src/app/screens/transactionRequest/index.tsx
index 718149ea9..77e4a500d 100644
--- a/src/app/screens/transactionRequest/index.tsx
+++ b/src/app/screens/transactionRequest/index.tsx
@@ -167,9 +167,11 @@ function TransactionRequest() {
     } else if (payload.txType === 'smart_contract') {
       await handleContractDeployRequest(payload, requestAccount);
     } else {
+      console.log(payload);
       navigate(RoutePaths.ConfirmStacksTransaction, {
         state: {
           unsignedTx: payload.txHex,
+          fee: payload.fee,
           sponsored: payload.sponsored,
           isBrowserTx: true,
           tabId,
diff --git a/src/common/utils/rpc/btc/getBalance.ts b/src/common/utils/rpc/btc/getBalance.ts
index 55e8d3b75..ce1271791 100644
--- a/src/common/utils/rpc/btc/getBalance.ts
+++ b/src/common/utils/rpc/btc/getBalance.ts
@@ -69,6 +69,12 @@ const handleGetBalance = async (message: RpcRequestMessage, port: chrome.runtime
     return;
   }
 
+  await utils.permissionsStoreMutex.runExclusive(async () => {
+    // Update the last used time for the client
+    utils.updateClientMetadata(store, origin, { lastUsed: new Date().getTime() });
+    await utils.savePermissionsStore(store);
+  });
+
   const {
     selectedAccountIndex,
     selectedAccountType,
diff --git a/src/common/utils/rpc/ordinals/getInscriptions.ts b/src/common/utils/rpc/ordinals/getInscriptions.ts
index 924ff7222..c3dd42a2f 100644
--- a/src/common/utils/rpc/ordinals/getInscriptions.ts
+++ b/src/common/utils/rpc/ordinals/getInscriptions.ts
@@ -84,6 +84,12 @@ const handleGetInscriptions = async (message: RpcRequestMessage, port: chrome.ru
     return;
   }
 
+  await utils.permissionsStoreMutex.runExclusive(async () => {
+    // Update the last used time for the client
+    utils.updateClientMetadata(store, origin, { lastUsed: new Date().getTime() });
+    await utils.savePermissionsStore(store);
+  });
+
   const ordinalsApi = new OrdinalsApi({ network: network.type });
 
   try {
diff --git a/src/common/utils/rpc/runes/getBalance.ts b/src/common/utils/rpc/runes/getBalance.ts
index cef30dcb0..876dfbde1 100644
--- a/src/common/utils/rpc/runes/getBalance.ts
+++ b/src/common/utils/rpc/runes/getBalance.ts
@@ -88,6 +88,12 @@ const handleGetRunesBalance = async (message: RpcRequestMessage, port: chrome.ru
     return;
   }
 
+  await utils.permissionsStoreMutex.runExclusive(async () => {
+    // Update the last used time for the client
+    utils.updateClientMetadata(store, origin, { lastUsed: new Date().getTime() });
+    await utils.savePermissionsStore(store);
+  });
+
   const runesApi = getRunesClient(network.type);
 
   try {
diff --git a/src/common/utils/rpc/wallet/getWalletType.ts b/src/common/utils/rpc/wallet/getWalletType.ts
index a8a3fb9af..d48a41234 100644
--- a/src/common/utils/rpc/wallet/getWalletType.ts
+++ b/src/common/utils/rpc/wallet/getWalletType.ts
@@ -41,6 +41,12 @@ export const handleGetWalletType = async (
     return;
   }
 
+  await utils.permissionsStoreMutex.runExclusive(async () => {
+    // Update the last used time for the client
+    utils.updateClientMetadata(store, origin, { lastUsed: new Date().getTime() });
+    await utils.savePermissionsStore(store);
+  });
+
   const {
     selectedAccountIndex,
     selectedAccountType,
diff --git a/src/common/utils/rpc/wallet/renouncePermissions.ts b/src/common/utils/rpc/wallet/renouncePermissions.ts
index afcc5c760..377caab3a 100644
--- a/src/common/utils/rpc/wallet/renouncePermissions.ts
+++ b/src/common/utils/rpc/wallet/renouncePermissions.ts
@@ -36,7 +36,7 @@ export const handleRenouncePermissions = async (
   }
 
   await utils.permissionsStoreMutex.runExclusive(async () => {
-    utils.removeClient(store.clients, store.permissions, origin);
+    utils.removeClient(store, origin);
     utils.savePermissionsStore(store);
   });
 
diff --git a/src/locales/en.json b/src/locales/en.json
index 43649fdee..05300ce24 100644
--- a/src/locales/en.json
+++ b/src/locales/en.json
@@ -892,7 +892,14 @@
   "CONNECTED_APPS": {
     "TITLE": "Connected Apps",
     "SUBTITLE": "You are connected to the following apps.",
-    "EMPTY_MESSAGE": "You're not currently connected to any app."
+    "EMPTY_MESSAGE": "You're not currently connected to any app.",
+    "DISCONNECT_SUCCESS": "App disconnected",
+    "DISCONNECT_ALL_SUCCESS": "All apps disconnected",
+    "DISCONNECT": "Disconnect",
+    "DISCONNECT_ALL": "Disconnect all",
+    "URL": "URL",
+    "LAST_USED": "Last used",
+    "PERMISSIONS": "Permissions"
   },
   "EXPLORE_SCREEN": {
     "TITLE": "Explore",

From 3a250d7ca5ded608e99e8058ecc1eb7dfd54daa2 Mon Sep 17 00:00:00 2001
From: Terence Ng <ngtere@live.com.sg>
Date: Fri, 27 Sep 2024 15:01:30 +0800
Subject: [PATCH 127/227] Feat/star hide set avatar inscriptions (#591)

* feat: star/unstar collections, standalone inscriptions, and inscriptions in a collection (#569)

* commit initial draft

* use latest core

* use latest core and support inscription in collection

* complete UI work

* fix final touchups

* fix standalone inscription not handled

* touchup namings

* touchup namings

* typo

* commit lock

* use latest UI

* touchup

* fix keys

* fix conditionals

* use latest core

* use release core

* code review

* [ENG-3634][ENG-3635] Inscriptions - hide a collection / manage hidden collections (#567)

* [ENG-3634][ENG-3635] Inscriptions - hide a collection / manage hidden collections

* Add a todo

* commit initial draft

* use latest core

* use latest core and support inscription in collection

* Update the three dots menu button to match Figma and be consistent on different screens

* complete UI work

* Add HiddenCollectibles screen, upgrade `@phosphor-icons/react` package

* fix final touchups

* fix standalone inscription not handled

* touchup namings

* touchup namings

* typo

* commit lock

* use latest UI

* touchup

* fix errors

* touchup (incomplete)

* update naming

* fix keys

* fix conditionals

* use latest core

* fix logics

* chore: add dedicated route for hidden items and fix logic and ui issues founded

* chore: update core version and fix small issue and copy improvements

* chore: update core to v19.2.1

* fix: toast message right margin when no action is present

* chore: change starredCollectibleIds back to array to keep the order in which id were added and fix some ui issues found during testing

* chore: remove unused comments, use dynamic tab params in hidden dashboard and remove unnecessary check

* chore: DRY

---------

Co-authored-by: Terence Ng <ngtere@live.com.sg>
Co-authored-by: fede erbes <fedeerbes@gmail.com>

* fix bug (#593)

* feat: star/unstar collections, standalone inscriptions, and inscriptions in a collection (#569)

* commit initial draft

* use latest core

* use latest core and support inscription in collection

* complete UI work

* fix final touchups

* fix standalone inscription not handled

* touchup namings

* touchup namings

* typo

* commit lock

* use latest UI

* touchup

* fix keys

* fix conditionals

* use latest core

* use release core

* code review

* [ENG-3634][ENG-3635] Inscriptions - hide a collection / manage hidden collections (#567)

* [ENG-3634][ENG-3635] Inscriptions - hide a collection / manage hidden collections

* Add a todo

* commit initial draft

* use latest core

* use latest core and support inscription in collection

* Update the three dots menu button to match Figma and be consistent on different screens

* complete UI work

* Add HiddenCollectibles screen, upgrade `@phosphor-icons/react` package

* fix final touchups

* fix standalone inscription not handled

* touchup namings

* touchup namings

* typo

* commit lock

* use latest UI

* touchup

* fix errors

* touchup (incomplete)

* update naming

* fix keys

* fix conditionals

* use latest core

* fix logics

* chore: add dedicated route for hidden items and fix logic and ui issues founded

* chore: update core version and fix small issue and copy improvements

* chore: update core to v19.2.1

* fix: toast message right margin when no action is present

* chore: change starredCollectibleIds back to array to keep the order in which id were added and fix some ui issues found during testing

* chore: remove unused comments, use dynamic tab params in hidden dashboard and remove unnecessary check

* chore: DRY

---------

Co-authored-by: Terence Ng <ngtere@live.com.sg>
Co-authored-by: fede erbes <fedeerbes@gmail.com>

* fix bug

---------

Co-authored-by: Den <36603049+dhriaznov@users.noreply.github.com>
Co-authored-by: fede erbes <fedeerbes@gmail.com>

* remove collectibleId from hiddenCollectible (not needed)

* add new lock

* Fix back button redirect for ordinals

* feat: nft as avatar feature (#597)

feat: accept NFT as Avatar source
Co-authored-by: Cloud Le <fluctlight-kayaba@users.noreply.github.com>

* update new lock

* feat: clean-up invalid Avatar on launch (#607)

* feat: clean-up invalid Avatar on launch

* feat: conditionally remove avatar when hide collection

* feat: disable SetAvatar action for hidden collection

* Update src/app/screens/ordinalsCollection/index.tsx

* Make some code tweaks

* chore: better naming for conditional that not click instantly

* chore: use stacks instead of stack for avatar related feature

* feat: optimize avatarCleanup hook, better network performance

* chore: optimize accountList loop

---------

Co-authored-by: Cloud Le <fluctlight-kayaba@users.noreply.github.com>
Co-authored-by: Den <36603049+dhriaznov@users.noreply.github.com>
Co-authored-by: Denys Hriaznov <hriaznov.dev@gmail.com>

* chore: fix style check warning

* fix: unhide icons, hidden collectibles button not showing when collectible list is empty and standalone unhide button not showing (#616)

* fix: menu show/hide logic not counting for standalone inscriptions and hide state in some cases (#617)

* remove comment and touchup structure

* chore: abstract Inscription Collection Menu sheet with useOptionsSheet (#620)

Co-authored-by: Cloud Le <fluctlight-kayaba@users.noreply.github.com>

---------

Co-authored-by: Den <36603049+dhriaznov@users.noreply.github.com>
Co-authored-by: fede erbes <fedeerbes@gmail.com>
Co-authored-by: Denys Hriaznov <hriaznov.dev@gmail.com>
Co-authored-by: Kayaba Akihiko <kayaba.fluctlight@gmail.com>
Co-authored-by: Cloud Le <fluctlight-kayaba@users.noreply.github.com>
---
 package-lock.json                             |  14 +-
 package.json                                  |   2 +-
 src/app/components/accountHeader/index.tsx    |  18 +-
 .../components/accountRow/accountAvatar.tsx   |  46 +++
 src/app/components/accountRow/index.styled.ts |  11 +
 src/app/components/accountRow/index.tsx       |  67 ++--
 .../collectibleCollectionGridItem/index.tsx   |  33 +-
 .../sections/inscribeSection/index.tsx        |   2 +-
 src/app/components/squareButton/index.tsx     |  42 ++-
 src/app/components/topRow/index.tsx           |  47 ++-
 .../useAddressCollectionInscriptions.ts       |  55 +++
 .../queries/ordinals/useAddressInscription.ts |   8 +-
 .../useAddressInscriptionCollections.ts       |  40 ---
 .../ordinals/useAddressInscriptions.ts        |  43 ++-
 .../queries/ordinals/useInscriptionDetails.ts |   8 +-
 src/app/hooks/useAvatarCleanup.ts             |  55 +++
 src/app/hooks/useOptionsDialog.ts             |  30 ++
 src/app/hooks/useOptionsSheet.ts              |  20 ++
 src/app/routes/index.tsx                      |  13 +-
 .../screens/confirmNftTransaction/index.tsx   |  20 +-
 src/app/screens/createInscription/index.tsx   |   2 +-
 src/app/screens/home/index.tsx                |   2 +
 src/app/screens/nftCollection/index.tsx       |   4 +-
 .../collectiblesTabs/index.styled.ts          |  91 +++++
 .../index.tsx}                                | 179 ++++------
 .../collectiblesTabs/skeletonLoader.tsx       |  15 +
 src/app/screens/nftDashboard/hidden/index.tsx | 193 ++++++++++
 src/app/screens/nftDashboard/index.tsx        |  15 +-
 .../nftDashboard/inscriptionsTabGridItem.tsx  |  45 ++-
 .../screens/nftDashboard/useNftDashboard.tsx  |  66 +++-
 src/app/screens/nftDetail/index.styled.ts     |   4 +-
 src/app/screens/nftDetail/index.tsx           | 119 ++++++-
 src/app/screens/ordinalDetail/index.styled.ts |   2 +-
 src/app/screens/ordinalDetail/index.tsx       | 229 +++++++++++-
 .../ordinalAttributeComponent.tsx             |  32 +-
 .../screens/ordinalDetail/useOrdinalDetail.ts |  32 +-
 .../ordinalsCollection/index.styled.ts        | 131 +++++++
 src/app/screens/ordinalsCollection/index.tsx  | 329 +++++++++++-------
 src/app/screens/sendBtc/index.tsx             |   6 +-
 .../useSendInscriptions.ts                    |   5 +-
 src/app/screens/sendOrdinal/index.tsx         |  13 +
 .../useTransferRunesRequest.ts                |  10 +-
 .../stores/wallet/actions/actionCreators.ts   |  69 ++++
 src/app/stores/wallet/actions/types.ts        |  73 +++-
 src/app/stores/wallet/reducer.ts              |  95 ++++-
 src/app/ui-library/snackBar.tsx               |  39 ++-
 src/locales/en.json                           |  31 +-
 47 files changed, 1913 insertions(+), 492 deletions(-)
 create mode 100644 src/app/components/accountRow/accountAvatar.tsx
 create mode 100644 src/app/hooks/queries/ordinals/useAddressCollectionInscriptions.ts
 delete mode 100644 src/app/hooks/queries/ordinals/useAddressInscriptionCollections.ts
 create mode 100644 src/app/hooks/useAvatarCleanup.ts
 create mode 100644 src/app/hooks/useOptionsDialog.ts
 create mode 100644 src/app/hooks/useOptionsSheet.ts
 create mode 100644 src/app/screens/nftDashboard/collectiblesTabs/index.styled.ts
 rename src/app/screens/nftDashboard/{collectiblesTabs.tsx => collectiblesTabs/index.tsx} (63%)
 create mode 100644 src/app/screens/nftDashboard/collectiblesTabs/skeletonLoader.tsx
 create mode 100644 src/app/screens/nftDashboard/hidden/index.tsx
 create mode 100644 src/app/screens/ordinalsCollection/index.styled.ts

diff --git a/package-lock.json b/package-lock.json
index fa9a57d19..7b539c47e 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -10,7 +10,7 @@
       "dependencies": {
         "@aryzing/superqs": "0.0.6",
         "@ledgerhq/hw-transport-webusb": "^6.27.13",
-        "@phosphor-icons/react": "^2.0.10",
+        "@phosphor-icons/react": "^2.1.0",
         "@playwright/test": "1.46.1",
         "@react-spring/web": "^9.6.1",
         "@sats-connect/core": "0.3.0-7e6dd81",
@@ -997,9 +997,9 @@
       }
     },
     "node_modules/@phosphor-icons/react": {
-      "version": "2.0.10",
-      "resolved": "https://registry.npmjs.org/@phosphor-icons/react/-/react-2.0.10.tgz",
-      "integrity": "sha512-q5ITPNFhmEiYZLZOvEhjo2phlfxoOmit7vE1tBYMxcMqnZX2vdbMw3deDE7wCegpBKM/q/p39BJmhhoPcjZyCg==",
+      "version": "2.1.7",
+      "resolved": "https://registry.npmjs.org/@phosphor-icons/react/-/react-2.1.7.tgz",
+      "integrity": "sha512-g2e2eVAn1XG2a+LI09QU3IORLhnFNAFkNbo2iwbX6NOKSLOwvEMmTa7CgOzEbgNWR47z8i8kwjdvYZ5fkGx1mQ==",
       "engines": {
         "node": ">=10"
       },
@@ -13466,9 +13466,9 @@
       }
     },
     "@phosphor-icons/react": {
-      "version": "2.0.10",
-      "resolved": "https://registry.npmjs.org/@phosphor-icons/react/-/react-2.0.10.tgz",
-      "integrity": "sha512-q5ITPNFhmEiYZLZOvEhjo2phlfxoOmit7vE1tBYMxcMqnZX2vdbMw3deDE7wCegpBKM/q/p39BJmhhoPcjZyCg==",
+      "version": "2.1.7",
+      "resolved": "https://registry.npmjs.org/@phosphor-icons/react/-/react-2.1.7.tgz",
+      "integrity": "sha512-g2e2eVAn1XG2a+LI09QU3IORLhnFNAFkNbo2iwbX6NOKSLOwvEMmTa7CgOzEbgNWR47z8i8kwjdvYZ5fkGx1mQ==",
       "requires": {}
     },
     "@playwright/test": {
diff --git a/package.json b/package.json
index fd22fd4b8..aef902432 100644
--- a/package.json
+++ b/package.json
@@ -38,7 +38,7 @@
   "dependencies": {
     "@aryzing/superqs": "0.0.6",
     "@ledgerhq/hw-transport-webusb": "^6.27.13",
-    "@phosphor-icons/react": "^2.0.10",
+    "@phosphor-icons/react": "^2.1.0",
     "@playwright/test": "1.46.1",
     "@react-spring/web": "^9.6.1",
     "@sats-connect/core": "0.3.0-7e6dd81",
diff --git a/src/app/components/accountHeader/index.tsx b/src/app/components/accountHeader/index.tsx
index 4a77ed6b6..fc4d95b9c 100644
--- a/src/app/components/accountHeader/index.tsx
+++ b/src/app/components/accountHeader/index.tsx
@@ -10,14 +10,14 @@ import useSelectedAccount from '@hooks/useSelectedAccount';
 import { DotsThreeVertical } from '@phosphor-icons/react';
 import { OPTIONS_DIALOG_WIDTH } from '@utils/constants';
 
-const SelectedAccountContainer = styled.div<{ showBorderBottom?: boolean }>((props) => ({
+const SelectedAccountContainer = styled.div<{ $showBorderBottom?: boolean }>((props) => ({
   display: 'flex',
   flexDirection: 'row',
   position: 'relative',
   alignItems: 'center',
   justifyContent: 'space-between',
-  padding: `${props.theme.spacing(10)}px ${props.theme.space.m}`,
-  borderBottom: props.showBorderBottom ? `0.5px solid ${props.theme.colors.elevation3}` : 'none',
+  padding: `${props.theme.space.l} ${props.theme.space.m}`,
+  borderBottom: props.$showBorderBottom ? `0.5px solid ${props.theme.colors.elevation3}` : 'none',
 }));
 
 const OptionsButton = styled.button(() => ({
@@ -25,6 +25,14 @@ const OptionsButton = styled.button(() => ({
   alignItems: 'center',
   justifyContent: 'flex-end',
   background: 'transparent',
+  opacity: 0.7,
+  transition: 'opacity 0.1s ease',
+  '&:hover': {
+    opacity: 1,
+  },
+  '&:active': {
+    opacity: 0.6,
+  },
 }));
 
 const ButtonRow = styled.button`
@@ -94,7 +102,7 @@ function AccountHeaderComponent({
   };
 
   return (
-    <SelectedAccountContainer showBorderBottom={showBorderBottom}>
+    <SelectedAccountContainer $showBorderBottom={showBorderBottom}>
       <AccountRow
         account={selectedAccount!}
         isSelected
@@ -103,7 +111,7 @@ function AccountHeaderComponent({
       />
       {!disableMenuOption && (
         <OptionsButton aria-label="Open Header Options" onClick={openOptionsDialog}>
-          <DotsThreeVertical size={20} fill="white" />
+          <DotsThreeVertical size={20} fill="white" weight="bold" />
         </OptionsButton>
       )}
       {showOptionsDialog && (
diff --git a/src/app/components/accountRow/accountAvatar.tsx b/src/app/components/accountRow/accountAvatar.tsx
new file mode 100644
index 000000000..c8e28463c
--- /dev/null
+++ b/src/app/components/accountRow/accountAvatar.tsx
@@ -0,0 +1,46 @@
+import NftImage from '@screens/nftDashboard/nftImage';
+import OrdinalImage from '@screens/ordinals/ordinalImage';
+import { type Account } from '@secretkeylabs/xverse-core';
+import { getAccountGradient } from '@utils/gradient';
+
+import type { AvatarInfo } from '@stores/wallet/actions/types';
+import { AvatarContainer, GradientCircle } from './index.styled';
+
+type Props = {
+  account: Account | null;
+  isSelected: boolean;
+  isAccountListView?: boolean;
+  avatar?: AvatarInfo | null;
+};
+
+function AccountAvatar({ account, avatar, isSelected, isAccountListView = false }: Props) {
+  if (avatar?.type === 'inscription') {
+    return (
+      <AvatarContainer $isBig={isAccountListView} $isSelected={isSelected}>
+        <OrdinalImage ordinal={avatar.inscription} />
+      </AvatarContainer>
+    );
+  }
+
+  if (avatar?.type === 'stacks') {
+    return (
+      <AvatarContainer $isBig={isAccountListView} $isSelected={isSelected}>
+        <NftImage metadata={avatar.nft.token_metadata} />
+      </AvatarContainer>
+    );
+  }
+
+  const gradient = getAccountGradient(account?.stxAddress || account?.btcAddress!);
+
+  return (
+    <GradientCircle
+      $firstGradient={gradient[0]}
+      $secondGradient={gradient[1]}
+      $thirdGradient={gradient[2]}
+      $isBig={isAccountListView}
+      $isSelected={isSelected}
+    />
+  );
+}
+
+export default AccountAvatar;
diff --git a/src/app/components/accountRow/index.styled.ts b/src/app/components/accountRow/index.styled.ts
index 2d969fdc1..dda96509c 100644
--- a/src/app/components/accountRow/index.styled.ts
+++ b/src/app/components/accountRow/index.styled.ts
@@ -31,6 +31,17 @@ export const GradientCircle = styled.div<{
   opacity: props.$isSelected ? 1 : 0.5,
 }));
 
+export const AvatarContainer = styled.div<{
+  $isBig: boolean;
+  $isSelected: boolean;
+}>((props) => ({
+  width: props.$isBig ? 32 : 20,
+  height: props.$isBig ? 32 : 20,
+  borderRadius: props.$isBig ? 16 : 10,
+  opacity: props.$isSelected ? 1 : 0.5,
+  overflow: 'hidden',
+}));
+
 export const CurrentAccountContainer = styled.div((props) => ({
   display: 'flex',
   flexDirection: 'column',
diff --git a/src/app/components/accountRow/index.tsx b/src/app/components/accountRow/index.tsx
index 6e8354717..05d3743ce 100644
--- a/src/app/components/accountRow/index.tsx
+++ b/src/app/components/accountRow/index.tsx
@@ -1,22 +1,27 @@
 import LedgerBadge from '@assets/img/ledger/ledger_badge.svg';
 import BarLoader from '@components/barLoader';
 import OptionsDialog from '@components/optionsDialog/optionsDialog';
+import useOptionsDialog from '@hooks/useOptionsDialog';
 import useWalletReducer from '@hooks/useWalletReducer';
 import useWalletSelector from '@hooks/useWalletSelector';
 import { CaretDown, DotsThreeVertical } from '@phosphor-icons/react';
 import { currencySymbolMap, type Account } from '@secretkeylabs/xverse-core';
+import { removeAccountAvatarAction } from '@stores/wallet/actions/actionCreators';
 import Button from '@ui-library/button';
 import Input from '@ui-library/input';
 import Sheet from '@ui-library/sheet';
+import SnackBar from '@ui-library/snackBar';
 import Spinner from '@ui-library/spinner';
-import { EMPTY_LABEL, LoaderSize, OPTIONS_DIALOG_WIDTH } from '@utils/constants';
-import { getAccountGradient } from '@utils/gradient';
+import { EMPTY_LABEL, LoaderSize } from '@utils/constants';
 import { isLedgerAccount, validateAccountName } from '@utils/helper';
 import { useEffect, useRef, useState } from 'react';
+import toast from 'react-hot-toast';
 import { useTranslation } from 'react-i18next';
 import { NumericFormat } from 'react-number-format';
+import { useDispatch } from 'react-redux';
 import 'react-tooltip/dist/react-tooltip.css';
 import Theme from 'theme';
+import AccountAvatar from './accountAvatar';
 import {
   AccountInfoContainer,
   AccountName,
@@ -26,7 +31,6 @@ import {
   Container,
   CurrentAccountContainer,
   CurrentAccountTextContainer,
-  GradientCircle,
   InputLabel,
   ModalButtonContainer,
   ModalContent,
@@ -50,24 +54,23 @@ function AccountRow({
   isAccountListView?: boolean;
   disabledAccountSelect?: boolean;
 }) {
+  const dispatch = useDispatch();
+  const menuDialog = useOptionsDialog();
   const { t } = useTranslation('translation', { keyPrefix: 'DASHBOARD_SCREEN' });
   const { t: optionsDialogTranslation } = useTranslation('translation', {
     keyPrefix: 'OPTIONS_DIALOG',
   });
-  const { accountsList, ledgerAccountsList, fiatCurrency, accountBalances } = useWalletSelector();
+  const { accountsList, ledgerAccountsList, fiatCurrency, accountBalances, avatarIds } =
+    useWalletSelector();
+  const accountAvatar = avatarIds[account?.btcAddress ?? ''];
   const totalBalance = accountBalances[account?.btcAddress ?? ''];
-  const gradient = getAccountGradient(account?.stxAddress || account?.btcAddress!);
   const btcCopiedTooltipTimeoutRef = useRef<NodeJS.Timeout | undefined>();
   const stxCopiedTooltipTimeoutRef = useRef<NodeJS.Timeout | undefined>();
-  const [showOptionsDialog, setShowOptionsDialog] = useState(false);
   const [showRemoveAccountModal, setShowRemoveAccountModal] = useState(false);
   const [showRenameAccountModal, setShowRenameAccountModal] = useState(false);
   const [accountName, setAccountName] = useState('');
   const [accountNameError, setAccountNameError] = useState<string | null>(null);
   const [isAccountNameChangeLoading, setIsAccountNameChangeLoading] = useState(false);
-  const [optionsDialogIndents, setOptionsDialogIndents] = useState<
-    { top: string; left: string } | undefined
-  >();
   const { removeLedgerAccount, renameAccount, updateLedgerAccounts } = useWalletReducer();
 
   useEffect(
@@ -90,27 +93,12 @@ function AccountRow({
     } else {
       setAccountNameError(null);
     }
-  }, [accountName]);
+  }, [accountName, accountsList, ledgerAccountsList, optionsDialogTranslation]);
 
   const handleClick = () => {
     onAccountSelected(account!);
   };
 
-  const openOptionsDialog = (event: React.MouseEvent<HTMLButtonElement>) => {
-    setShowOptionsDialog(true);
-
-    setOptionsDialogIndents({
-      top: `${(event.target as HTMLElement).parentElement?.getBoundingClientRect().top}px`,
-      left: `calc(${
-        (event.target as HTMLElement).parentElement?.getBoundingClientRect().right
-      }px - ${OPTIONS_DIALOG_WIDTH}px)`,
-    });
-  };
-
-  const closeOptionsDialog = () => {
-    setShowOptionsDialog(false);
-  };
-
   const handleRemoveAccountModalOpen = () => {
     setShowRemoveAccountModal(true);
   };
@@ -127,6 +115,13 @@ function AccountRow({
     setShowRenameAccountModal(false);
   };
 
+  const handleRemoveAvatar = () => {
+    dispatch(removeAccountAvatarAction({ address: account?.btcAddress ?? '' }));
+    toast.custom(
+      <SnackBar text={optionsDialogTranslation('NFT_AVATAR.REMOVE_TOAST')} type="neutral" />,
+    );
+  };
+
   const handleRemoveLedgerAccount = async () => {
     if (!account) {
       return;
@@ -196,12 +191,11 @@ function AccountRow({
   return (
     <Container>
       <AccountInfoContainer $disableClick={disabledAccountSelect} onClick={handleClick}>
-        <GradientCircle
-          $firstGradient={gradient[0]}
-          $secondGradient={gradient[1]}
-          $thirdGradient={gradient[2]}
-          $isBig={isAccountListView}
-          $isSelected={isSelected}
+        <AccountAvatar
+          account={account}
+          avatar={accountAvatar}
+          isSelected={isSelected}
+          isAccountListView={isAccountListView}
         />
         <CurrentAccountContainer>
           {account && (
@@ -249,16 +243,21 @@ function AccountRow({
       </AccountInfoContainer>
 
       {isAccountListView && (
-        <OptionsButton aria-label="Open Account Options" onClick={openOptionsDialog}>
+        <OptionsButton aria-label="Open Account Options" onClick={menuDialog.open}>
           <DotsThreeVertical size={20} fill="white" />
         </OptionsButton>
       )}
 
-      {showOptionsDialog && (
-        <OptionsDialog closeDialog={closeOptionsDialog} optionsDialogIndents={optionsDialogIndents}>
+      {menuDialog.isVisible && (
+        <OptionsDialog closeDialog={menuDialog.close} optionsDialogIndents={menuDialog.indents}>
           <ButtonRow onClick={handleRenameAccountModalOpen}>
             {optionsDialogTranslation('RENAME_ACCOUNT')}
           </ButtonRow>
+          {accountAvatar?.type && (
+            <ButtonRow onClick={handleRemoveAvatar}>
+              {optionsDialogTranslation('NFT_AVATAR.REMOVE_ACTION')}
+            </ButtonRow>
+          )}
           {isLedgerAccount(account) && (
             <ButtonRow onClick={handleRemoveAccountModalOpen}>
               {optionsDialogTranslation('REMOVE_FROM_LIST')}
diff --git a/src/app/components/collectibleCollectionGridItem/index.tsx b/src/app/components/collectibleCollectionGridItem/index.tsx
index 6a459c22a..b788ad74c 100644
--- a/src/app/components/collectibleCollectionGridItem/index.tsx
+++ b/src/app/components/collectibleCollectionGridItem/index.tsx
@@ -1,8 +1,12 @@
+import useSelectedAccount from '@hooks/useSelectedAccount';
+import useWalletSelector from '@hooks/useWalletSelector';
+import { Star } from '@phosphor-icons/react';
 import type { Inscription, NonFungibleToken } from '@secretkeylabs/xverse-core';
 import { StyledP } from '@ui-library/common.styled';
 import type { ReactNode } from 'react';
 import styled from 'styled-components';
 import type { Color } from 'theme';
+import Theme from 'theme';
 
 const InfoContainer = styled.div`
   display: flex;
@@ -11,6 +15,12 @@ const InfoContainer = styled.div`
   width: 100%;
 `;
 
+const StyledItemIdContainer = styled.div`
+  display: flex;
+  gap: 4px;
+  width: 100%;
+`;
+
 const StyledItemId = styled(StyledP)`
   text-align: left;
   text-wrap: nowrap;
@@ -19,6 +29,10 @@ const StyledItemId = styled(StyledP)`
   text-overflow: ellipsis;
 `;
 
+const StyledStar = styled(Star)`
+  margin-top: 2px;
+`;
+
 const StyledItemSub = styled(StyledP)`
   text-align: left;
   text-overflow: ellipsis;
@@ -57,6 +71,9 @@ type Props = {
   onClick?: (item: Inscription | NonFungibleToken) => void;
 };
 
+const isInscription = (item?: Inscription | NonFungibleToken): item is Inscription =>
+  item !== undefined && 'id' in item;
+
 function CollectibleCollectionGridItem({
   item,
   itemId,
@@ -72,13 +89,23 @@ function CollectibleCollectionGridItem({
         }
       : undefined;
 
+  const { ordinalsAddress } = useSelectedAccount();
+  const { starredCollectibleIds } = useWalletSelector();
+  const inscriptionStarred =
+    isInscription(item) && starredCollectibleIds[ordinalsAddress]?.some(({ id }) => id === item.id);
+
   return (
     <GridItemContainer data-testid="collection-item" onClick={handleOnClick}>
       <ImageContainer>{children}</ImageContainer>
       <InfoContainer>
-        <StyledItemId typography="body_bold_m" color="white_0">
-          {itemId}
-        </StyledItemId>
+        <StyledItemIdContainer>
+          {inscriptionStarred && (
+            <StyledStar size={14} color={Theme.colors.white_0} weight="fill" />
+          )}
+          <StyledItemId typography="body_bold_m" color="white_0">
+            {itemId}
+          </StyledItemId>
+        </StyledItemIdContainer>
         {itemSubText && (
           <StyledItemSub typography="body_medium_m" color={itemSubTextColor ?? 'white_400'}>
             {itemSubText}
diff --git a/src/app/components/confirmBtcTransaction/sections/inscribeSection/index.tsx b/src/app/components/confirmBtcTransaction/sections/inscribeSection/index.tsx
index a0507087c..82701674e 100644
--- a/src/app/components/confirmBtcTransaction/sections/inscribeSection/index.tsx
+++ b/src/app/components/confirmBtcTransaction/sections/inscribeSection/index.tsx
@@ -3,8 +3,8 @@ import { ArrowDown } from '@phosphor-icons/react';
 import { StyledP } from '@ui-library/common.styled';
 import { getShortTruncatedAddress } from '@utils/helper';
 import { useTranslation } from 'react-i18next';
-import ContentLabel from './ContentLabel';
 import { Pill, StyledPillLabel } from '../runesSection/styles';
+import ContentLabel from './ContentLabel';
 import {
   ButtonIcon,
   CardContainer,
diff --git a/src/app/components/squareButton/index.tsx b/src/app/components/squareButton/index.tsx
index 8620cf6c5..72fbe6d8b 100644
--- a/src/app/components/squareButton/index.tsx
+++ b/src/app/components/squareButton/index.tsx
@@ -1,11 +1,15 @@
 import styled from 'styled-components';
 
-const Button = styled.button<{ $isTransparent?: boolean }>((props) => ({
+const Button = styled.button<{
+  $isTransparent?: boolean;
+  $hasText?: boolean;
+  $radiusSize?: number;
+}>((props) => ({
   display: 'flex',
   flexDirection: 'column',
   alignItems: 'center',
-  borderRadius: '16px',
-  rowGap: '8px',
+  borderRadius: props.$radiusSize ? props.$radiusSize : '16px',
+  rowGap: props.$hasText ? '8px' : '0px',
   backgroundColor: 'transparent',
   ':hover > div': {
     backgroundColor: props.$isTransparent
@@ -20,12 +24,10 @@ const Icon = styled.img`
   height: 20px;
 `;
 
-const Wrapper = styled.div<{
-  $isTransparent?: boolean;
-}>((props) => ({
+const Wrapper = styled.div<{ $isTransparent?: boolean; $size?: number }>((props) => ({
   display: 'flex',
-  width: 48,
-  height: 48,
+  width: props.$size ? props.$size : 48,
+  height: props.$size ? props.$size : 48,
   justifyContent: 'center',
   alignItems: 'center',
   transition: 'background-color 0.2s ease, opacity 0.2s ease',
@@ -49,18 +51,34 @@ const IconContainer = styled.div({
 });
 
 type Props = {
-  text: string;
+  text?: string;
   onPress: () => void;
   src?: string;
   icon?: JSX.Element;
   isTransparent?: boolean;
   hoverDialogId?: string;
+  size?: number;
+  radiusSize?: number;
 };
 
-function SquareButton({ src, text, icon, onPress, isTransparent, hoverDialogId }: Props) {
+function SquareButton({
+  src,
+  text,
+  icon,
+  onPress,
+  isTransparent,
+  hoverDialogId,
+  size,
+  radiusSize,
+}: Props) {
   return (
-    <Button onClick={onPress} $isTransparent={isTransparent}>
-      <Wrapper id={hoverDialogId} $isTransparent={isTransparent}>
+    <Button
+      onClick={onPress}
+      $isTransparent={isTransparent}
+      $hasText={!!text}
+      $radiusSize={radiusSize}
+    >
+      <Wrapper id={hoverDialogId} $isTransparent={isTransparent} $size={size}>
         {src && <Icon src={src} alt={text} />}
         {icon && <IconContainer>{icon}</IconContainer>}
       </Wrapper>
diff --git a/src/app/components/topRow/index.tsx b/src/app/components/topRow/index.tsx
index 4d2621063..f7cf1fec8 100644
--- a/src/app/components/topRow/index.tsx
+++ b/src/app/components/topRow/index.tsx
@@ -1,13 +1,11 @@
-import { ArrowLeft, DotsThreeVertical } from '@phosphor-icons/react';
+import { ArrowLeft, DotsThreeVertical, Star } from '@phosphor-icons/react';
 import styled from 'styled-components';
 import Theme from 'theme';
 
 const TopSectionContainer = styled.div((props) => ({
   display: 'flex',
-  minHeight: 18,
-  marginTop: props.theme.space.l,
-  marginBottom: props.theme.spacing(9),
-  marginLeft: props.theme.space.m,
+  minHeight: 20,
+  margin: `${props.theme.space.l} ${props.theme.space.m}`,
   flexDirection: 'row',
   justifyContent: 'center',
   alignItems: 'center',
@@ -32,14 +30,25 @@ const BackButton = styled.button((props) => ({
   },
 }));
 
-const MenuButton = styled.button((props) => ({
+const MenuButton = styled.button({
   display: 'flex',
   justifyContent: 'flex-end',
   backgroundColor: 'transparent',
-  padding: props.theme.space.xxs,
   position: 'absolute',
-  right: props.theme.space.xxs,
-}));
+  right: 0,
+  opacity: 0.7,
+  transition: 'opacity 0.1s ease',
+  '&:hover': {
+    opacity: 1,
+  },
+  '&:active': {
+    opacity: 0.6,
+  },
+});
+
+const StyledMenuButton = styled(MenuButton)<{ $marginRight: boolean }>`
+  margin-right: ${(props) => (props.$marginRight ? '36px' : '0px')};
+`;
 
 type Props = {
   title?: string;
@@ -47,9 +56,19 @@ type Props = {
   showBackButton?: boolean;
   className?: string;
   onMenuClick?: (e: React.MouseEvent<HTMLButtonElement>) => void;
+  onStarClick?: (e: React.MouseEvent<HTMLButtonElement>) => void;
+  isStarred?: boolean;
 };
 
-function TopRow({ title, onClick, showBackButton = true, className, onMenuClick }: Props) {
+function TopRow({
+  title,
+  onClick,
+  showBackButton = true,
+  className,
+  onMenuClick,
+  onStarClick,
+  isStarred,
+}: Props) {
   return (
     <TopSectionContainer className={className}>
       {showBackButton && (
@@ -58,9 +77,15 @@ function TopRow({ title, onClick, showBackButton = true, className, onMenuClick
         </BackButton>
       )}
       {title && <HeaderText>{title}</HeaderText>}
+      {onStarClick && (
+        <StyledMenuButton onClick={onStarClick} $marginRight={Boolean(onMenuClick)}>
+          {!isStarred && <Star size={20} color={Theme.colors.white_0} />}
+          {isStarred && <Star size={20} color={Theme.colors.tangerine} weight="fill" />}
+        </StyledMenuButton>
+      )}
       {onMenuClick && (
         <MenuButton onClick={onMenuClick}>
-          <DotsThreeVertical size={20} color={Theme.colors.white_200} />
+          <DotsThreeVertical size={20} color={Theme.colors.white_0} weight="bold" />
         </MenuButton>
       )}
     </TopSectionContainer>
diff --git a/src/app/hooks/queries/ordinals/useAddressCollectionInscriptions.ts b/src/app/hooks/queries/ordinals/useAddressCollectionInscriptions.ts
new file mode 100644
index 000000000..45e90e10d
--- /dev/null
+++ b/src/app/hooks/queries/ordinals/useAddressCollectionInscriptions.ts
@@ -0,0 +1,55 @@
+import useSelectedAccount from '@hooks/useSelectedAccount';
+import useWalletSelector from '@hooks/useWalletSelector';
+import { getXverseApiClient } from '@secretkeylabs/xverse-core';
+import { useInfiniteQuery } from '@tanstack/react-query';
+import { handleRetries, InvalidParamsError } from '@utils/query';
+
+const PAGE_SIZE = 30;
+
+/**
+ * Get a specific collection belonging to an address
+ */
+const useAddressCollectionInscriptions = (collectionId?: string) => {
+  const { ordinalsAddress } = useSelectedAccount();
+  const { network } = useWalletSelector();
+  const xverseApi = getXverseApiClient(network.type);
+  const { starredCollectibleIds } = useWalletSelector();
+  const starredIds = starredCollectibleIds[ordinalsAddress]?.map(({ id }) => id);
+
+  const getCollectionInscriptionsByAddress = async ({ pageParam = 0 }) => {
+    if (!ordinalsAddress || !collectionId) {
+      throw new InvalidParamsError('ordinalsAddress and collectionId are required');
+    }
+    return xverseApi.getCollectionSpecificInscriptions(
+      ordinalsAddress,
+      collectionId,
+      pageParam,
+      PAGE_SIZE,
+      {
+        starredCollectibleIds: starredIds,
+      },
+    );
+  };
+
+  return useInfiniteQuery(
+    ['address-collection-inscriptions', ordinalsAddress, collectionId, starredIds],
+    getCollectionInscriptionsByAddress,
+    {
+      enabled: !!(collectionId && ordinalsAddress),
+      retry: handleRetries,
+      getNextPageParam: (lastpage, pages) => {
+        const currentLength = pages
+          .map((page) => page.data)
+          .filter(Boolean)
+          .flat().length;
+        if (currentLength < lastpage.total) {
+          return currentLength;
+        }
+        return false;
+      },
+      staleTime: 60 * 1000, // 1 min
+    },
+  );
+};
+
+export default useAddressCollectionInscriptions;
diff --git a/src/app/hooks/queries/ordinals/useAddressInscription.ts b/src/app/hooks/queries/ordinals/useAddressInscription.ts
index d9537ede9..c35cf2e5b 100644
--- a/src/app/hooks/queries/ordinals/useAddressInscription.ts
+++ b/src/app/hooks/queries/ordinals/useAddressInscription.ts
@@ -1,6 +1,6 @@
 import useSelectedAccount from '@hooks/useSelectedAccount';
 import useWalletSelector from '@hooks/useWalletSelector';
-import { getInscription, type Inscription } from '@secretkeylabs/xverse-core';
+import { getXverseApiClient, type Inscription } from '@secretkeylabs/xverse-core';
 import { useQuery } from '@tanstack/react-query';
 import { handleRetries, InvalidParamsError } from '@utils/query';
 
@@ -10,18 +10,20 @@ import { handleRetries, InvalidParamsError } from '@utils/query';
 const useAddressInscription = (ordinalId?: string, ordinal?: Inscription | null) => {
   const { ordinalsAddress } = useSelectedAccount();
   const { network } = useWalletSelector();
+  const xverseApi = getXverseApiClient(network.type);
+
   const fetchOrdinals = async (): Promise<Inscription> => {
     if (ordinal && ordinal.id === ordinalId) return ordinal;
     if (!ordinalsAddress || !ordinalId) {
       throw new InvalidParamsError('ordinalsAddress and ordinalId are required');
     }
-    return getInscription(network.type, ordinalsAddress, ordinalId);
+    return xverseApi.getInscription(ordinalsAddress, ordinalId);
   };
 
   return useQuery({
     enabled: !!(ordinal || (ordinalsAddress && ordinalId)),
     retry: handleRetries,
-    queryKey: ['ordinal-details', ordinalsAddress, ordinalId],
+    queryKey: ['address-inscription', ordinalsAddress, ordinalId],
     queryFn: fetchOrdinals,
   });
 };
diff --git a/src/app/hooks/queries/ordinals/useAddressInscriptionCollections.ts b/src/app/hooks/queries/ordinals/useAddressInscriptionCollections.ts
deleted file mode 100644
index a403d5dbc..000000000
--- a/src/app/hooks/queries/ordinals/useAddressInscriptionCollections.ts
+++ /dev/null
@@ -1,40 +0,0 @@
-import useSelectedAccount from '@hooks/useSelectedAccount';
-import useWalletSelector from '@hooks/useWalletSelector';
-import { getCollections } from '@secretkeylabs/xverse-core';
-import { useInfiniteQuery } from '@tanstack/react-query';
-import { handleRetries, InvalidParamsError } from '@utils/query';
-
-const PAGE_SIZE = 30;
-
-/**
- * Get collections belonging to an address
- */
-const useAddressInscriptionCollections = () => {
-  const { ordinalsAddress } = useSelectedAccount();
-  const { network } = useWalletSelector();
-
-  const getCollectionsByAddress = async ({ pageParam = 0 }) => {
-    if (!ordinalsAddress) {
-      throw new InvalidParamsError('ordinalsAddress is required');
-    }
-    return getCollections(network.type, ordinalsAddress, pageParam || 0, PAGE_SIZE);
-  };
-
-  return useInfiniteQuery(['inscription-collections', ordinalsAddress], getCollectionsByAddress, {
-    enabled: !!ordinalsAddress,
-    retry: handleRetries,
-    getNextPageParam: (lastpage, pages) => {
-      const currentLength = pages
-        .map((page) => page.results)
-        .filter(Boolean)
-        .flat().length;
-      if (currentLength < lastpage.total) {
-        return currentLength;
-      }
-      return false;
-    },
-    staleTime: 1 * 60 * 1000, // 1 min
-  });
-};
-
-export default useAddressInscriptionCollections;
diff --git a/src/app/hooks/queries/ordinals/useAddressInscriptions.ts b/src/app/hooks/queries/ordinals/useAddressInscriptions.ts
index a2392a6de..0223be318 100644
--- a/src/app/hooks/queries/ordinals/useAddressInscriptions.ts
+++ b/src/app/hooks/queries/ordinals/useAddressInscriptions.ts
@@ -1,40 +1,47 @@
 import useSelectedAccount from '@hooks/useSelectedAccount';
 import useWalletSelector from '@hooks/useWalletSelector';
-import { getCollectionSpecificInscriptions } from '@secretkeylabs/xverse-core';
+import { getXverseApiClient } from '@secretkeylabs/xverse-core';
 import { useInfiniteQuery } from '@tanstack/react-query';
 import { handleRetries, InvalidParamsError } from '@utils/query';
 
 const PAGE_SIZE = 30;
 
 /**
- * Get inscriptions belonging to an address, filtered by collection id
+ * Get collections belonging to an address
  */
-const useAddressInscriptions = (collectionId?: string) => {
+const useAddressInscriptions = (showHiddenOnly?: boolean) => {
   const { ordinalsAddress } = useSelectedAccount();
   const { network } = useWalletSelector();
+  const xverseApi = getXverseApiClient(network.type);
+  const { hiddenCollectibleIds, starredCollectibleIds } = useWalletSelector();
+  const starredIds = starredCollectibleIds[ordinalsAddress]?.map(({ id }) => id);
 
-  const getInscriptionsByAddress = async ({ pageParam = 0 }) => {
-    if (!ordinalsAddress || !collectionId) {
-      throw new InvalidParamsError('ordinalsAddress and collectionId are required');
+  const getCollectionsByAddress = async ({ pageParam = 0 }) => {
+    if (!ordinalsAddress) {
+      throw new InvalidParamsError('ordinalsAddress is required');
     }
-    return getCollectionSpecificInscriptions(
-      network.type,
-      ordinalsAddress,
-      collectionId,
-      pageParam || 0, // offset,
-      PAGE_SIZE, // limit
-    );
+    return xverseApi.getCollections(ordinalsAddress, pageParam, PAGE_SIZE, {
+      hiddenCollectibleIds: Object.keys(hiddenCollectibleIds[ordinalsAddress] ?? {}),
+      starredCollectibleIds: starredIds,
+      showHiddenOnly,
+    });
   };
 
   return useInfiniteQuery(
-    ['inscriptions', ordinalsAddress, collectionId], // cache key
-    getInscriptionsByAddress,
+    [
+      'address-inscriptions',
+      ordinalsAddress,
+      Object.keys(hiddenCollectibleIds[ordinalsAddress] ?? {}),
+      starredIds,
+      showHiddenOnly,
+    ],
+    getCollectionsByAddress,
     {
-      enabled: !!(collectionId && ordinalsAddress),
+      enabled: !!ordinalsAddress,
       retry: handleRetries,
       getNextPageParam: (lastpage, pages) => {
         const currentLength = pages
-          .map((page) => page.data)
+          .map((page) => page.results)
           .filter(Boolean)
           .flat().length;
         if (currentLength < lastpage.total) {
@@ -42,7 +49,7 @@ const useAddressInscriptions = (collectionId?: string) => {
         }
         return false;
       },
-      staleTime: 1 * 60 * 1000, // 1 min
+      staleTime: 60 * 1000, // 1 min
     },
   );
 };
diff --git a/src/app/hooks/queries/ordinals/useInscriptionDetails.ts b/src/app/hooks/queries/ordinals/useInscriptionDetails.ts
index 029de57d9..daf1ea115 100644
--- a/src/app/hooks/queries/ordinals/useInscriptionDetails.ts
+++ b/src/app/hooks/queries/ordinals/useInscriptionDetails.ts
@@ -3,13 +3,9 @@ import { useQuery } from '@tanstack/react-query';
 
 const useInscriptionDetails = (id: string) => {
   const OrdinalsApi = useOrdinalsApi();
-
   return useQuery({
-    queryKey: [`inscription-${id}`],
-    queryFn: async () => {
-      const response = await OrdinalsApi.getInscription(id);
-      return response;
-    },
+    queryKey: [`inscription-details-${id}`],
+    queryFn: () => OrdinalsApi.getInscription(id),
   });
 };
 
diff --git a/src/app/hooks/useAvatarCleanup.ts b/src/app/hooks/useAvatarCleanup.ts
new file mode 100644
index 000000000..e9703c9c4
--- /dev/null
+++ b/src/app/hooks/useAvatarCleanup.ts
@@ -0,0 +1,55 @@
+import {
+  getNftCollections,
+  getXverseApiClient,
+  isOrdinalOwnedByAccount,
+  type Account,
+} from '@secretkeylabs/xverse-core';
+import { removeAccountAvatarAction } from '@stores/wallet/actions/actionCreators';
+import type { AvatarInfo } from '@stores/wallet/actions/types';
+import { useCallback, useEffect } from 'react';
+import { useDispatch } from 'react-redux';
+import useNetworkSelector from './useNetwork';
+import useWalletSelector from './useWalletSelector';
+
+/* Check and clear NFT Avatar that being used, but no-longer belongs to this Wallet */
+export default function useAvatarCleanup() {
+  const dispatch = useDispatch();
+  const { avatarIds, network, accountsList } = useWalletSelector();
+  const selectedNetwork = useNetworkSelector();
+  const xverseApi = getXverseApiClient(network.type);
+
+  const checkAndRemoveInvalidAvatar = useCallback(
+    async (account: Account, avatar: AvatarInfo | null) => {
+      if (avatar?.type === 'inscription') {
+        const inscription = await xverseApi.getInscription(
+          account.ordinalsAddress,
+          avatar.inscription.id,
+        );
+
+        if (!isOrdinalOwnedByAccount(inscription, account)) {
+          dispatch(removeAccountAvatarAction({ address: account.btcAddress }));
+        }
+      } else if (avatar?.type === 'stacks') {
+        const nftList = await getNftCollections(account.stxAddress, selectedNetwork);
+        const isNftOwnedByAccount = nftList.results.some((collection) =>
+          collection.all_nfts.some((nft) => {
+            const fullyQualifiedTokenId = `${nft.asset_identifier}:${nft.identifier.tokenId}`;
+            return fullyQualifiedTokenId === avatar.nft.fully_qualified_token_id;
+          }),
+        );
+
+        if (!isNftOwnedByAccount) {
+          dispatch(removeAccountAvatarAction({ address: account.btcAddress }));
+        }
+      }
+    },
+    [dispatch, selectedNetwork, xverseApi],
+  );
+
+  useEffect(() => {
+    if (!avatarIds) return;
+    accountsList
+      .filter((account) => !!avatarIds[account.btcAddress])
+      .forEach((account) => checkAndRemoveInvalidAvatar(account, avatarIds[account.btcAddress]));
+  }, [checkAndRemoveInvalidAvatar, avatarIds, accountsList]);
+}
diff --git a/src/app/hooks/useOptionsDialog.ts b/src/app/hooks/useOptionsDialog.ts
new file mode 100644
index 000000000..451d0fca2
--- /dev/null
+++ b/src/app/hooks/useOptionsDialog.ts
@@ -0,0 +1,30 @@
+import { OPTIONS_DIALOG_WIDTH } from '@utils/constants';
+import { useState } from 'react';
+
+export default function useOptionsDialog(dialogWidth = OPTIONS_DIALOG_WIDTH) {
+  const [isVisible, setIsVisible] = useState(false);
+  const [indents, setIndents] = useState<{ top: string; left: string } | undefined>();
+
+  const handleOpen = (event: React.MouseEvent<HTMLButtonElement>) => {
+    const parentBoundingRect = (event.target as HTMLElement).parentElement?.getBoundingClientRect();
+
+    setIsVisible(true);
+    setIndents({
+      top: `${parentBoundingRect?.top}px`,
+      left: `calc(${parentBoundingRect?.right}px - ${dialogWidth}px)`,
+    });
+  };
+
+  const handleClose = () => {
+    setIsVisible(false);
+  };
+
+  return {
+    isVisible,
+    setIsVisible,
+    indents,
+    setIndents,
+    open: handleOpen,
+    close: handleClose,
+  };
+}
diff --git a/src/app/hooks/useOptionsSheet.ts b/src/app/hooks/useOptionsSheet.ts
new file mode 100644
index 000000000..3ae0661ef
--- /dev/null
+++ b/src/app/hooks/useOptionsSheet.ts
@@ -0,0 +1,20 @@
+import { useState } from 'react';
+
+export default function useOptionsSheet(initialVisibility = false) {
+  const [isVisible, setIsVisible] = useState(initialVisibility);
+
+  const handleOpen = () => {
+    setIsVisible(true);
+  };
+
+  const handleClose = () => {
+    setIsVisible(false);
+  };
+
+  return {
+    isVisible,
+    setIsVisible,
+    open: handleOpen,
+    close: handleClose,
+  };
+}
diff --git a/src/app/routes/index.tsx b/src/app/routes/index.tsx
index f8c0348e1..cbf6cc238 100644
--- a/src/app/routes/index.tsx
+++ b/src/app/routes/index.tsx
@@ -38,6 +38,7 @@ import ManageTokens from '@screens/manageTokens';
 import MintRune from '@screens/mintRune';
 import NftCollection from '@screens/nftCollection';
 import NftDashboard from '@screens/nftDashboard';
+import Index from '@screens/nftDashboard/hidden';
 import SupportedRarities from '@screens/nftDashboard/supportedRarities';
 import NftDetailScreen from '@screens/nftDetail';
 import OrdinalDetailScreen from '@screens/ordinalDetail';
@@ -551,6 +552,14 @@ const router = createHashRouter([
           </AuthGuard>
         ),
       },
+      {
+        path: 'nft-dashboard/hidden',
+        element: (
+          <AuthGuard>
+            <Index />
+          </AuthGuard>
+        ),
+      },
       {
         path: 'nft-dashboard/rare-sats-bundle',
         element: (
@@ -560,7 +569,7 @@ const router = createHashRouter([
         ),
       },
       {
-        path: 'nft-dashboard/ordinals-collection/:id',
+        path: 'nft-dashboard/ordinals-collection/:id/:from?',
         element: (
           <AuthGuard>
             <OrdinalsCollection />
@@ -572,7 +581,7 @@ const router = createHashRouter([
         element: <NftDetailScreen />,
       },
       {
-        path: 'nft-dashboard/ordinal-detail/:id',
+        path: 'nft-dashboard/ordinal-detail/:id/:from?',
         element: <OrdinalDetailScreen />,
       },
       {
diff --git a/src/app/screens/confirmNftTransaction/index.tsx b/src/app/screens/confirmNftTransaction/index.tsx
index 82e4f3350..b88c00808 100644
--- a/src/app/screens/confirmNftTransaction/index.tsx
+++ b/src/app/screens/confirmNftTransaction/index.tsx
@@ -21,12 +21,14 @@ import {
   type StacksTransaction,
 } from '@secretkeylabs/xverse-core';
 import { deserializeTransaction } from '@stacks/transactions';
+import { removeAccountAvatarAction } from '@stores/wallet/actions/actionCreators';
 import { useMutation } from '@tanstack/react-query';
 import { isLedgerAccount } from '@utils/helper';
 import { trackMixPanel } from '@utils/mixpanel';
 import BigNumber from 'bignumber.js';
 import { useEffect, useMemo, useState } from 'react';
 import { useTranslation } from 'react-i18next';
+import { useDispatch } from 'react-redux';
 import { useLocation, useNavigate, useParams } from 'react-router-dom';
 import styled from 'styled-components';
 
@@ -71,9 +73,12 @@ const ReviewTransactionText = styled.h1((props) => ({
 }));
 
 function ConfirmNftTransaction() {
+  const dispatch = useDispatch();
   const { t } = useTranslation('translation', { keyPrefix: 'CONFIRM_TRANSACTION' });
   const isGalleryOpen: boolean = document.documentElement.clientWidth > 360;
   const selectedAccount = useSelectedAccount();
+  const { avatarIds } = useWalletSelector();
+  const currentAvatar = avatarIds[selectedAccount.btcAddress];
   const [fee, setFee] = useState<BigNumber>();
   const navigate = useNavigate();
   const location = useLocation();
@@ -107,11 +112,24 @@ function ConfirmNftTransaction() {
           isNft: true,
         },
       });
+
       setTimeout(() => {
         refetch();
       }, 1000);
+
+      if (currentAvatar?.type === 'stacks' && currentAvatar.nft?.token_id === nft?.token_id) {
+        dispatch(removeAccountAvatarAction({ address: selectedAccount.btcAddress }));
+      }
     }
-  }, [stxTxBroadcastData]);
+  }, [
+    dispatch,
+    navigate,
+    refetch,
+    stxTxBroadcastData,
+    selectedAccount.btcAddress,
+    nft,
+    currentAvatar,
+  ]);
 
   useEffect(() => {
     if (txError) {
diff --git a/src/app/screens/createInscription/index.tsx b/src/app/screens/createInscription/index.tsx
index f906924f2..f35fd0809 100644
--- a/src/app/screens/createInscription/index.tsx
+++ b/src/app/screens/createInscription/index.tsx
@@ -27,7 +27,6 @@ import ConfirmScreen from '@components/confirmScreen';
 import useWalletSelector from '@hooks/useWalletSelector';
 import { isLedgerAccount } from '@utils/helper';
 
-import InscribeSection from 'app/components/confirmBtcTransaction/sections/inscribeSection';
 import useBtcClient from '@hooks/apiClients/useBtcClient';
 import useCoinRates from '@hooks/queries/useCoinRates';
 import useConfirmedBtcBalance from '@hooks/queries/useConfirmedBtcBalance';
@@ -38,6 +37,7 @@ import { StyledP } from '@ui-library/common.styled';
 import Sheet from '@ui-library/sheet';
 import Spinner from '@ui-library/spinner';
 import { trackMixPanel } from '@utils/mixpanel';
+import InscribeSection from 'app/components/confirmBtcTransaction/sections/inscribeSection';
 import CompleteScreen from './CompleteScreen';
 import EditFee from './EditFee';
 import ErrorModal from './ErrorModal';
diff --git a/src/app/screens/home/index.tsx b/src/app/screens/home/index.tsx
index 08af56b25..13048de76 100644
--- a/src/app/screens/home/index.tsx
+++ b/src/app/screens/home/index.tsx
@@ -19,6 +19,7 @@ import useCoinRates from '@hooks/queries/useCoinRates';
 import useFeeMultipliers from '@hooks/queries/useFeeMultipliers';
 import useSpamTokens from '@hooks/queries/useSpamTokens';
 import useStxWalletData from '@hooks/queries/useStxWalletData';
+import useAvatarCleanup from '@hooks/useAvatarCleanup';
 import useHasFeature from '@hooks/useHasFeature';
 import useNotificationBanners from '@hooks/useNotificationBanners';
 import useSelectedAccount from '@hooks/useSelectedAccount';
@@ -133,6 +134,7 @@ function Home() {
 
   useFeeMultipliers();
   useAppConfig();
+  useAvatarCleanup();
   useTrackMixPanelPageViewed();
   const { removeFromSpamTokens } = useSpamTokens();
 
diff --git a/src/app/screens/nftCollection/index.tsx b/src/app/screens/nftCollection/index.tsx
index 3d4f8a067..38ff17e39 100644
--- a/src/app/screens/nftCollection/index.tsx
+++ b/src/app/screens/nftCollection/index.tsx
@@ -8,7 +8,7 @@ import WebGalleryButton from '@components/webGalleryButton';
 import WrenchErrorMessage from '@components/wrenchErrorMessage';
 import useNftDetail from '@hooks/queries/useNftDetail';
 import { ArrowLeft } from '@phosphor-icons/react';
-import { GridContainer } from '@screens/nftDashboard/collectiblesTabs';
+import { GridContainer } from '@screens/nftDashboard/collectiblesTabs/index.styled';
 import Nft from '@screens/nftDashboard/nft';
 import NftImage from '@screens/nftDashboard/nftImage';
 import type { NonFungibleToken, StacksCollectionData } from '@secretkeylabs/xverse-core';
@@ -239,7 +239,7 @@ function NftCollection() {
         <>
           {isEmpty && <NoCollectiblesText>{t('NO_COLLECTIBLES')}</NoCollectiblesText>}
           {!!isError && <WrenchErrorMessage />}
-          <StyledGridContainer isGalleryOpen={isGalleryOpen}>
+          <StyledGridContainer $isGalleryOpen={isGalleryOpen}>
             {isLoading ? (
               <TilesSkeletonLoader
                 isGalleryOpen={isGalleryOpen}
diff --git a/src/app/screens/nftDashboard/collectiblesTabs/index.styled.ts b/src/app/screens/nftDashboard/collectiblesTabs/index.styled.ts
new file mode 100644
index 000000000..50af867c7
--- /dev/null
+++ b/src/app/screens/nftDashboard/collectiblesTabs/index.styled.ts
@@ -0,0 +1,91 @@
+import WrenchErrorMessage from '@components/wrenchErrorMessage';
+import Button from '@ui-library/button';
+import { StyledP, StyledTabList } from '@ui-library/common.styled';
+import styled from 'styled-components';
+
+export const GridContainer = styled.div<{
+  $isGalleryOpen: boolean;
+}>((props) => ({
+  display: 'grid',
+  columnGap: props.$isGalleryOpen ? props.theme.space.xl : props.theme.space.m,
+  rowGap: props.$isGalleryOpen ? props.theme.space.xl : props.theme.space.l,
+  marginTop: props.theme.space.l,
+  gridTemplateColumns: props.$isGalleryOpen
+    ? 'repeat(auto-fill,minmax(220px,1fr))'
+    : 'repeat(auto-fill,minmax(150px,1fr))',
+}));
+
+export const RareSatsTabContainer = styled.div((props) => ({
+  marginTop: props.theme.space.l,
+}));
+
+export const StickyStyledTabList = styled(StyledTabList)`
+  position: sticky;
+  background: ${(props) => props.theme.colors.elevation0};
+  top: -1px;
+  z-index: 1;
+  padding: ${(props) => props.theme.space.m} 0;
+`;
+
+export const StyledTotalItems = styled(StyledP)`
+  margin-top: ${(props) => props.theme.space.s};
+`;
+
+export const NoticeContainer = styled.div((props) => ({
+  marginTop: props.theme.space.m,
+  display: 'flex',
+  flexDirection: 'column',
+  alignItems: 'center',
+}));
+
+export const StyledWrenchErrorMessage = styled(WrenchErrorMessage)`
+  margin-top: ${(props) => props.theme.space.xxl};
+`;
+
+export const NoCollectiblesText = styled.div((props) => ({
+  ...props.theme.typography.body_bold_m,
+  color: props.theme.colors.white_200,
+  marginTop: props.theme.space.xl,
+  textAlign: 'center',
+}));
+
+export const LoadMoreButtonContainer = styled.div((props) => ({
+  display: 'flex',
+  justifyContent: 'center',
+  alignItems: 'center',
+  marginBottom: props.theme.spacing(30),
+  marginTop: props.theme.space.xl,
+  button: {
+    width: 156,
+  },
+}));
+
+export const LoaderContainer = styled.div({
+  display: 'flex',
+  flexDirection: 'column',
+});
+
+export const CountLoaderContainer = styled.div((props) => ({
+  marginTop: props.theme.space.s,
+  marginBottom: props.theme.space.l,
+}));
+
+export const StyledButton = styled(Button)`
+  &.tertiary {
+    color: ${(props) => props.theme.colors.white_200};
+    padding: 0;
+    width: auto;
+    min-height: 20px;
+
+    &:hover:enabled {
+      opacity: 0.8;
+    }
+  }
+`;
+
+export const TopBarContainer = styled.div((props) => ({
+  display: 'flex',
+  justifyContent: 'space-between',
+  alignItems: 'center',
+  marginTop: props.theme.space.s,
+}));
diff --git a/src/app/screens/nftDashboard/collectiblesTabs.tsx b/src/app/screens/nftDashboard/collectiblesTabs/index.tsx
similarity index 63%
rename from src/app/screens/nftDashboard/collectiblesTabs.tsx
rename to src/app/screens/nftDashboard/collectiblesTabs/index.tsx
index 1c91435d9..412e37ddf 100644
--- a/src/app/screens/nftDashboard/collectiblesTabs.tsx
+++ b/src/app/screens/nftDashboard/collectiblesTabs/index.tsx
@@ -1,102 +1,34 @@
-import { StyledBarLoader, TilesSkeletonLoader } from '@components/tilesSkeletonLoader';
-import WrenchErrorMessage from '@components/wrenchErrorMessage';
 import useTrackMixPanelPageViewed from '@hooks/useTrackMixPanelPageViewed';
+import { TrayArrowDown } from '@phosphor-icons/react';
 import { mapRareSatsAPIResponseToBundle, type Bundle } from '@secretkeylabs/xverse-core';
 import Button from '@ui-library/button';
-import { StyledP, StyledTabList } from '@ui-library/common.styled';
+import { StyledP } from '@ui-library/common.styled';
 import { TabItem } from '@ui-library/tabs';
 import { useEffect, useState } from 'react';
 import { useTranslation } from 'react-i18next';
 import { useNavigate, useSearchParams } from 'react-router-dom';
 import { TabPanel, Tabs } from 'react-tabs';
-import styled from 'styled-components';
-import Notice from './notice';
-import RareSatsTabGridItem from './rareSatsTabGridItem';
-import type { NftDashboardState } from './useNftDashboard';
+import Theme from 'theme';
+import Notice from '../notice';
+import RareSatsTabGridItem from '../rareSatsTabGridItem';
+import type { NftDashboardState } from '../useNftDashboard';
+
+import {
+  LoadMoreButtonContainer,
+  NoCollectiblesText,
+  NoticeContainer,
+  RareSatsTabContainer,
+  StickyStyledTabList,
+  StyledButton,
+  StyledTotalItems,
+  StyledWrenchErrorMessage,
+  TopBarContainer,
+} from './index.styled';
+import SkeletonLoader from './skeletonLoader';
 
 const MAX_SATS_ITEMS_EXTENSION = 5;
 const MAX_SATS_ITEMS_GALLERY = 20;
 
-export const GridContainer = styled.div<{
-  isGalleryOpen: boolean;
-}>((props) => ({
-  display: 'grid',
-  columnGap: props.isGalleryOpen ? props.theme.space.xl : props.theme.space.m,
-  rowGap: props.isGalleryOpen ? props.theme.space.xl : props.theme.space.l,
-  marginTop: props.theme.space.l,
-  gridTemplateColumns: props.isGalleryOpen
-    ? 'repeat(auto-fill,minmax(220px,1fr))'
-    : 'repeat(auto-fill,minmax(150px,1fr))',
-}));
-
-const RareSatsTabContainer = styled.div<{
-  isGalleryOpen: boolean;
-}>((props) => ({
-  marginTop: props.theme.space.l,
-}));
-
-const StickyStyledTabList = styled(StyledTabList)`
-  position: sticky;
-  background: ${(props) => props.theme.colors.elevation0};
-  top: -1px;
-  z-index: 1;
-  padding: ${(props) => props.theme.space.m} 0;
-`;
-
-const StyledTotalItems = styled(StyledP)`
-  margin-top: ${(props) => props.theme.space.s};
-`;
-
-const NoticeContainer = styled.div((props) => ({
-  marginTop: props.theme.space.m,
-  display: 'flex',
-  flexDirection: 'column',
-  alignItems: 'center',
-}));
-
-const StyledWrenchErrorMessage = styled(WrenchErrorMessage)`
-  margin-top: ${(props) => props.theme.space.xxl};
-`;
-
-const NoCollectiblesText = styled.div((props) => ({
-  ...props.theme.typography.body_bold_m,
-  color: props.theme.colors.white_200,
-  marginTop: props.theme.spacing(16),
-  textAlign: 'center',
-}));
-
-const LoadMoreButtonContainer = styled.div((props) => ({
-  display: 'flex',
-  justifyContent: 'center',
-  alignItems: 'center',
-  marginBottom: props.theme.spacing(30),
-  marginTop: props.theme.space.xl,
-  button: {
-    width: 156,
-  },
-}));
-
-const LoaderContainer = styled.div({
-  display: 'flex',
-  flexDirection: 'column',
-});
-
-const CountLoaderContainer = styled.div((props) => ({
-  marginTop: props.theme.spacing(6),
-  marginBottom: props.theme.spacing(12),
-}));
-
-function SkeletonLoader({ isGalleryOpen }: { isGalleryOpen: boolean }) {
-  return (
-    <LoaderContainer>
-      <CountLoaderContainer>
-        <StyledBarLoader width={85} height={20} />
-      </CountLoaderContainer>
-      <TilesSkeletonLoader isGalleryOpen={isGalleryOpen} tileSize={isGalleryOpen ? 276 : 151} />
-    </LoaderContainer>
-  );
-}
-
 type TabButton = {
   key: string;
   label: string;
@@ -122,21 +54,24 @@ const tabKeyToIndex = (key?: string | null) => {
   return tabs.findIndex((tab) => tab.key === key);
 };
 
+type Props = {
+  className?: string;
+  nftListView: React.ReactNode;
+  inscriptionListView: React.ReactNode;
+  nftDashboard: NftDashboardState;
+};
+
 export default function CollectiblesTabs({
   className,
   nftListView,
   inscriptionListView,
   nftDashboard,
-}: {
-  className?: string;
-  nftListView: React.ReactNode;
-  inscriptionListView: React.ReactNode;
-  nftDashboard: NftDashboardState;
-}) {
+}: Props) {
   const { t } = useTranslation('translation', { keyPrefix: 'NFT_DASHBOARD_SCREEN' });
   const navigate = useNavigate();
   const [searchParams, setSearchParams] = useSearchParams();
   const [tabIndex, setTabIndex] = useState(tabKeyToIndex(searchParams?.get('tab')));
+
   const {
     isGalleryOpen,
     rareSatsQuery,
@@ -157,18 +92,15 @@ export default function CollectiblesTabs({
     [tabIndex],
   );
 
-  const handleSelectTab = (index: number) => {
-    setTabIndex(index);
-  };
+  const handleSelectTab = (index: number) => setTabIndex(index);
 
   useEffect(() => {
     setSearchParams({ tab: tabs[tabIndex]?.key });
-  }, [tabIndex, setSearchParams]);
+  }, [tabIndex]);
 
   const ordinalBundleCount = rareSatsQuery?.data?.pages?.[0]?.total || 0;
   const showNoBundlesNotice =
     ordinalBundleCount === 0 && !rareSatsQuery.isLoading && !rareSatsQuery.error;
-
   const visibleTabButtons = tabs.filter((tab: TabButton) => {
     if (tab.key === 'rareSats' && !hasActivatedRareSatsKey) {
       return false;
@@ -181,7 +113,7 @@ export default function CollectiblesTabs({
 
   return (
     <Tabs className={className} selectedIndex={tabIndex} onSelect={handleSelectTab}>
-      {/* TODO: replace with Tabs component from `src/app/components/tabs/index.tsx` */}
+      {/* TODO: replace with Tabs component from `src/app/ui-library/tabs.tsx` */}
       {visibleTabButtons.length > 1 && (
         <StickyStyledTabList data-testid="tab-list">
           {visibleTabButtons.map(({ key, label }) => (
@@ -197,24 +129,34 @@ export default function CollectiblesTabs({
       )}
       {hasActivatedOrdinalsKey && (
         <TabPanel>
-          {inscriptionsQuery.isInitialLoading ? (
-            <SkeletonLoader isGalleryOpen={isGalleryOpen} />
-          ) : (
-            <>
-              {totalInscriptions > 0 && (
-                <StyledTotalItems
-                  data-testid="total-items"
-                  typography="body_medium_m"
-                  color="white_200"
-                >
-                  {totalInscriptions === 1
-                    ? t('TOTAL_ITEMS_ONE')
-                    : t('TOTAL_ITEMS', { count: totalInscriptions })}
-                </StyledTotalItems>
-              )}
-              {inscriptionListView}
-            </>
-          )}
+          <div>
+            {inscriptionsQuery.isInitialLoading ? (
+              <SkeletonLoader isGalleryOpen={isGalleryOpen} />
+            ) : (
+              <>
+                <TopBarContainer>
+                  {totalInscriptions > 0 ? (
+                    <StyledP data-testid="total-items" typography="body_medium_m" color="white_200">
+                      {totalInscriptions === 1
+                        ? t('TOTAL_ITEMS_ONE')
+                        : t('TOTAL_ITEMS', { count: totalInscriptions })}
+                    </StyledP>
+                  ) : (
+                    <div />
+                  )}
+                  <StyledButton
+                    variant="tertiary"
+                    icon={<TrayArrowDown size={20} color={Theme.colors.white_200} />}
+                    title={t('HIDDEN_COLLECTIBLES')}
+                    onClick={() => {
+                      navigate(`/nft-dashboard/hidden?tab=${tabs[tabIndex]?.key}`);
+                    }}
+                  />
+                </TopBarContainer>
+                {inscriptionListView}
+              </>
+            )}
+          </div>
         </TabPanel>
       )}
       <TabPanel>
@@ -248,7 +190,6 @@ export default function CollectiblesTabs({
                 : t('TOTAL_ITEMS', { count: ordinalBundleCount })}
             </StyledTotalItems>
           )}
-
           {!rareSatsQuery.isLoading && showNoticeAlert && (
             <NoticeContainer>
               <Notice
@@ -269,7 +210,7 @@ export default function CollectiblesTabs({
           {rareSatsQuery.isInitialLoading ? (
             <SkeletonLoader isGalleryOpen={isGalleryOpen} />
           ) : (
-            <RareSatsTabContainer data-testid="rareSats-container" isGalleryOpen={isGalleryOpen}>
+            <RareSatsTabContainer data-testid="rareSats-container">
               {!rareSatsQuery.error &&
                 !rareSatsQuery.isLoading &&
                 rareSatsQuery.data?.pages
diff --git a/src/app/screens/nftDashboard/collectiblesTabs/skeletonLoader.tsx b/src/app/screens/nftDashboard/collectiblesTabs/skeletonLoader.tsx
new file mode 100644
index 000000000..faed4ea84
--- /dev/null
+++ b/src/app/screens/nftDashboard/collectiblesTabs/skeletonLoader.tsx
@@ -0,0 +1,15 @@
+import { StyledBarLoader, TilesSkeletonLoader } from '@components/tilesSkeletonLoader';
+import { CountLoaderContainer, LoaderContainer } from './index.styled';
+
+function SkeletonLoader({ isGalleryOpen }: { isGalleryOpen: boolean }) {
+  return (
+    <LoaderContainer>
+      <CountLoaderContainer>
+        <StyledBarLoader width={85} height={20} />
+      </CountLoaderContainer>
+      <TilesSkeletonLoader isGalleryOpen={isGalleryOpen} tileSize={isGalleryOpen ? 276 : 151} />
+    </LoaderContainer>
+  );
+}
+
+export default SkeletonLoader;
diff --git a/src/app/screens/nftDashboard/hidden/index.tsx b/src/app/screens/nftDashboard/hidden/index.tsx
new file mode 100644
index 000000000..32b3a0dd6
--- /dev/null
+++ b/src/app/screens/nftDashboard/hidden/index.tsx
@@ -0,0 +1,193 @@
+import AccountHeaderComponent from '@components/accountHeader';
+import BottomTabBar from '@components/tabBar';
+import TopRow from '@components/topRow';
+import useSelectedAccount from '@hooks/useSelectedAccount';
+import { ArrowLeft, TrayArrowUp } from '@phosphor-icons/react';
+import { removeAllFromHideCollectiblesAction } from '@stores/wallet/actions/actionCreators';
+import { StyledHeading, StyledP } from '@ui-library/common.styled';
+import Sheet from '@ui-library/sheet';
+import { useState } from 'react';
+import { useTranslation } from 'react-i18next';
+import { useDispatch } from 'react-redux';
+import { useNavigate, useSearchParams } from 'react-router-dom';
+import { TabPanel, Tabs } from 'react-tabs';
+import styled from 'styled-components';
+import Theme from '../../../../theme';
+import { StyledButton } from '../collectiblesTabs/index.styled';
+import SkeletonLoader from '../collectiblesTabs/skeletonLoader';
+import useNftDashboard from '../useNftDashboard';
+
+const Container = styled.div`
+  display: flex;
+  flex-direction: column;
+  flex: 1;
+  overflow-y: auto;
+  ${(props) => props.theme.scrollbar}
+`;
+
+const PageHeader = styled.div`
+  padding: ${(props) => props.theme.space.s};
+  padding-bottom: ${(props) => props.theme.space.l};
+  border-bottom: 0.5px solid ${(props) => props.theme.colors.elevation3};
+  max-width: 1224px;
+  margin-left: auto;
+  margin-right: auto;
+  width: 100%;
+`;
+
+const CollectiblesContainer = styled.div`
+  padding: 0 ${(props) => props.theme.space.s};
+  padding-bottom: ${(props) => props.theme.space.xl};
+  max-width: 1224px;
+  margin-left: auto;
+  margin-right: auto;
+  width: 100%;
+`;
+
+const RowCenterSpaceBetween = styled.div<{ addMarginBottom?: boolean }>`
+  display: flex;
+  flex-direction: row;
+  align-items: center;
+  justify-content: space-between;
+  margin-bottom: ${(props) => (props.addMarginBottom ? props.theme.space.m : 0)};
+`;
+
+const BackButton = styled.button`
+  display: flex;
+  flex-direction: row;
+  align-items: center;
+  gap: ${(props) => props.theme.space.xxs};
+  background: transparent;
+  margin-bottom: ${(props) => props.theme.space.xl};
+  color: ${(props) => props.theme.colors.white_0};
+`;
+
+const ItemCountContainer = styled.div<{ isGalleryOpen: boolean }>`
+  margin-top: ${(props) => (props.isGalleryOpen ? props.theme.space.l : props.theme.space.m)};
+`;
+
+function Index() {
+  const { t } = useTranslation('translation', { keyPrefix: 'NFT_DASHBOARD_SCREEN' });
+  const { t: tCommon } = useTranslation('translation', { keyPrefix: 'COMMON' });
+  const { t: tCollectibles } = useTranslation('translation', {
+    keyPrefix: 'COLLECTIBLE_COLLECTION_SCREEN',
+  });
+  const [searchParams] = useSearchParams();
+  const tab = searchParams?.get('tab');
+  const nftDashboard = useNftDashboard();
+  const { ordinalsAddress } = useSelectedAccount();
+  const navigate = useNavigate();
+  const dispatch = useDispatch();
+  const {
+    isGalleryOpen,
+    hiddenInscriptionsQuery,
+    totalHiddenInscriptions,
+    HiddenInscriptionListView,
+  } = nftDashboard;
+
+  const [isOptionsModalVisible, setIsOptionsModalVisible] = useState(false);
+
+  const handleBackButtonClick = () => {
+    navigate(`/nft-dashboard?tab=${tab}`);
+  };
+
+  const handleUnHideAll = () => {
+    dispatch(removeAllFromHideCollectiblesAction({ address: ordinalsAddress }));
+    handleBackButtonClick();
+  };
+
+  const openOptionsDialog = () => {
+    setIsOptionsModalVisible(true);
+  };
+
+  const closeOptionsDialog = () => {
+    setIsOptionsModalVisible(false);
+  };
+
+  return (
+    <>
+      {isGalleryOpen ? (
+        <AccountHeaderComponent disableMenuOption={isGalleryOpen} showBorderBottom={false} />
+      ) : (
+        <TopRow
+          onClick={handleBackButtonClick}
+          onMenuClick={totalHiddenInscriptions > 0 ? openOptionsDialog : undefined}
+        />
+      )}
+      <Container>
+        <PageHeader>
+          {isGalleryOpen && (
+            <BackButton onClick={handleBackButtonClick}>
+              <ArrowLeft size={16} color="currentColor" />
+              <StyledP data-testid="back-to-gallery" typography="body_m" color="white_0">
+                {tCollectibles('BACK_TO_GALLERY')}
+              </StyledP>
+            </BackButton>
+          )}
+          <RowCenterSpaceBetween addMarginBottom={isGalleryOpen}>
+            <StyledHeading typography={isGalleryOpen ? 'headline_xl' : 'headline_s'}>
+              {t('HIDDEN_COLLECTIBLES')}
+            </StyledHeading>
+            {isGalleryOpen && totalHiddenInscriptions > 0 ? (
+              <StyledButton
+                variant="tertiary"
+                icon={<TrayArrowUp size={20} color={Theme.colors.white_200} />}
+                title={t('UNHIDE_ALL')}
+                onClick={handleUnHideAll}
+              />
+            ) : null}
+          </RowCenterSpaceBetween>
+        </PageHeader>
+        <CollectiblesContainer>
+          <Tabs>
+            {/* TODO: add tab selector once we support nft */}
+            <TabPanel>
+              <div>
+                <div>
+                  {hiddenInscriptionsQuery.isInitialLoading ? (
+                    <SkeletonLoader isGalleryOpen={isGalleryOpen} />
+                  ) : (
+                    <>
+                      <ItemCountContainer isGalleryOpen={isGalleryOpen}>
+                        {totalHiddenInscriptions > 0 ? (
+                          <StyledP
+                            data-testid="total-items"
+                            typography="body_medium_m"
+                            color="white_200"
+                          >
+                            {totalHiddenInscriptions === 1
+                              ? t('TOTAL_ITEMS_ONE')
+                              : t('TOTAL_ITEMS', { count: totalHiddenInscriptions })}
+                          </StyledP>
+                        ) : (
+                          <div />
+                        )}
+                      </ItemCountContainer>
+                      <HiddenInscriptionListView />
+                    </>
+                  )}
+                </div>
+              </div>
+            </TabPanel>
+          </Tabs>
+        </CollectiblesContainer>
+      </Container>
+      {!isGalleryOpen && <BottomTabBar tab="nft" />}
+      {isOptionsModalVisible && (
+        <Sheet
+          title={tCommon('OPTIONS')}
+          visible={isOptionsModalVisible}
+          onClose={closeOptionsDialog}
+        >
+          <StyledButton
+            variant="tertiary"
+            icon={<TrayArrowUp size={24} color={Theme.colors.white_200} />}
+            title={t('UNHIDE_ALL')}
+            onClick={handleUnHideAll}
+          />
+        </Sheet>
+      )}
+    </>
+  );
+}
+export default Index;
diff --git a/src/app/screens/nftDashboard/index.tsx b/src/app/screens/nftDashboard/index.tsx
index 5027a5bb3..a9b98eac3 100644
--- a/src/app/screens/nftDashboard/index.tsx
+++ b/src/app/screens/nftDashboard/index.tsx
@@ -31,7 +31,7 @@ const PageHeader = styled.div`
   width: 100%;
 `;
 
-const StyledCollectiblesTabs = styled(CollectiblesTabs)`
+const CollectiblesContainer = styled.div`
   padding: 0 ${(props) => props.theme.space.s};
   padding-bottom: ${(props) => props.theme.space.xl};
   max-width: 1224px;
@@ -90,7 +90,6 @@ function NftDashboard() {
     onActivateRareSatsAlertEnablePress,
     isGalleryOpen,
   } = nftDashboard;
-
   return (
     <>
       {isOrdinalReceiveAlertVisible && (
@@ -142,11 +141,13 @@ function NftDashboard() {
             )}
           </ButtonContainer>
         </PageHeader>
-        <StyledCollectiblesTabs
-          nftListView={<NftListView />}
-          inscriptionListView={<InscriptionListView />}
-          nftDashboard={nftDashboard}
-        />
+        <CollectiblesContainer>
+          <CollectiblesTabs
+            nftListView={<NftListView />}
+            inscriptionListView={<InscriptionListView />}
+            nftDashboard={nftDashboard}
+          />
+        </CollectiblesContainer>
       </Container>
       {!isGalleryOpen && <BottomTabBar tab="nft" />}
     </>
diff --git a/src/app/screens/nftDashboard/inscriptionsTabGridItem.tsx b/src/app/screens/nftDashboard/inscriptionsTabGridItem.tsx
index c83077702..2d9701bb1 100644
--- a/src/app/screens/nftDashboard/inscriptionsTabGridItem.tsx
+++ b/src/app/screens/nftDashboard/inscriptionsTabGridItem.tsx
@@ -1,4 +1,7 @@
 import CollectibleCollage from '@components/collectibleCollage/collectibleCollage';
+import useSelectedAccount from '@hooks/useSelectedAccount';
+import useWalletSelector from '@hooks/useWalletSelector';
+import { Star } from '@phosphor-icons/react';
 import OrdinalImage from '@screens/ordinals/ordinalImage';
 import type { InscriptionCollectionsData } from '@secretkeylabs/xverse-core';
 import { StyledP } from '@ui-library/common.styled';
@@ -10,6 +13,7 @@ import {
 } from '@utils/inscriptions';
 import { useNavigate } from 'react-router-dom';
 import styled from 'styled-components';
+import Theme from '../../../theme';
 
 const CollectionContainer = styled.div((props) => ({
   display: 'flex',
@@ -28,6 +32,16 @@ const InfoContainer = styled.div`
   width: 100%;
 `;
 
+const StyledItemIdContainer = styled.div`
+  display: flex;
+  gap: 4px;
+  width: 100%;
+`;
+
+const StyledStar = styled(Star)`
+  margin-top: 2px;
+`;
+
 const StyledItemId = styled(StyledP)`
   text-align: left;
   text-wrap: nowrap;
@@ -46,15 +60,30 @@ const StyledItemSub = styled(StyledP)`
 
 function InscriptionsTabGridItem({ item: collection }: { item: InscriptionCollectionsData }) {
   const navigate = useNavigate();
+  const { starredCollectibleIds, hiddenCollectibleIds } = useWalletSelector();
+  const { ordinalsAddress } = useSelectedAccount();
+  const collectionStarred = starredCollectibleIds[ordinalsAddress]?.some(
+    ({ id }) => id === collection.collection_id,
+  );
+  const standaloneInscriptionStarred =
+    !collection.collection_id &&
+    collection.total_inscriptions === 1 &&
+    starredCollectibleIds[ordinalsAddress]?.some(
+      ({ id }) => id === collection.thumbnail_inscriptions?.[0].id,
+    );
+
+  const isItemHidden = Object.keys(hiddenCollectibleIds[ordinalsAddress] ?? {}).some(
+    (id) => id === getCollectionKey(collection),
+  );
 
   const handleClickCollectionId = (e: React.MouseEvent<HTMLButtonElement>) => {
     const collectionId = e.currentTarget.value;
-    navigate(`/nft-dashboard/ordinals-collection/${collectionId}`);
+    navigate(`/nft-dashboard/ordinals-collection/${collectionId}/${isItemHidden ? 'hidden' : ''}`);
   };
 
   const handleClickInscriptionId = (e: React.MouseEvent<HTMLButtonElement>) => {
     const inscriptionId = e.currentTarget.value;
-    navigate(`/nft-dashboard/ordinal-detail/${inscriptionId}`);
+    navigate(`/nft-dashboard/ordinal-detail/${inscriptionId}/${isItemHidden ? 'hidden' : ''}`);
   };
 
   const itemId = getInscriptionsTabGridItemId(collection);
@@ -79,9 +108,15 @@ function InscriptionsTabGridItem({ item: collection }: { item: InscriptionCollec
         )}
       </ThumbnailContainer>
       <InfoContainer>
-        <StyledItemId data-testid="inscription-name" typography="body_bold_m" color="white_0">
-          {itemId}
-        </StyledItemId>
+        <StyledItemIdContainer>
+          {(collectionStarred || standaloneInscriptionStarred) && (
+            <StyledStar size={14} color={Theme.colors.white_0} weight="fill" />
+          )}
+          <StyledItemId data-testid="inscription-name" typography="body_bold_m" color="white_0">
+            {itemId}
+          </StyledItemId>
+        </StyledItemIdContainer>
+
         <StyledItemSub
           data-testid="inscription-amount"
           typography="body_medium_m"
diff --git a/src/app/screens/nftDashboard/useNftDashboard.tsx b/src/app/screens/nftDashboard/useNftDashboard.tsx
index c78ab17d0..5b43a8f04 100644
--- a/src/app/screens/nftDashboard/useNftDashboard.tsx
+++ b/src/app/screens/nftDashboard/useNftDashboard.tsx
@@ -1,4 +1,4 @@
-import useAddressInscriptionCollections from '@hooks/queries/ordinals/useAddressInscriptionCollections';
+import useAddressInscriptions from '@hooks/queries/ordinals/useAddressInscriptions';
 import { useAddressRareSats } from '@hooks/queries/ordinals/useAddressRareSats';
 import useStacksCollectibles from '@hooks/queries/useStacksCollectibles';
 import useWalletSelector from '@hooks/useWalletSelector';
@@ -17,7 +17,7 @@ import { useTranslation } from 'react-i18next';
 import { useIsVisible } from 'react-is-visible';
 import { useDispatch } from 'react-redux';
 import styled from 'styled-components';
-import { GridContainer } from './collectiblesTabs';
+import { GridContainer } from './collectiblesTabs/index.styled';
 import InscriptionsTabGridItem from './inscriptionsTabGridItem';
 import NftTabGridItem from './nftTabGridItem';
 
@@ -75,7 +75,8 @@ export type NftDashboardState = {
   showNewFeatureAlert: boolean;
   isOrdinalReceiveAlertVisible: boolean;
   stacksNftsQuery: ReturnType<typeof useStacksCollectibles>;
-  inscriptionsQuery: ReturnType<typeof useAddressInscriptionCollections>;
+  inscriptionsQuery: ReturnType<typeof useAddressInscriptions>;
+  hiddenInscriptionsQuery: ReturnType<typeof useAddressInscriptions>;
   rareSatsQuery: ReturnType<typeof useAddressRareSats>;
   openInGalleryView: () => void;
   onReceiveModalOpen: () => void;
@@ -83,6 +84,7 @@ export type NftDashboardState = {
   onOrdinalReceiveAlertOpen: () => void;
   onOrdinalReceiveAlertClose: () => void;
   InscriptionListView: () => JSX.Element;
+  HiddenInscriptionListView: () => JSX.Element;
   NftListView: () => JSX.Element;
   onActivateRareSatsAlertCrossPress: () => void;
   onActivateRareSatsAlertDenyPress: () => void;
@@ -94,6 +96,7 @@ export type NftDashboardState = {
   showNoticeAlert?: boolean;
   totalNfts: number;
   totalInscriptions: number;
+  totalHiddenInscriptions: number;
 };
 
 const useNftDashboard = (): NftDashboardState => {
@@ -106,10 +109,13 @@ const useNftDashboard = (): NftDashboardState => {
   const [showNoticeAlert, setShowNoticeAlert] = useState(false);
   const [isOrdinalReceiveAlertVisible, setIsOrdinalReceiveAlertVisible] = useState(false);
   const stacksNftsQuery = useStacksCollectibles();
-  const inscriptionsQuery = useAddressInscriptionCollections();
+  const inscriptionsQuery = useAddressInscriptions();
+  const hiddenInscriptionsQuery = useAddressInscriptions(true);
   const rareSatsQuery = useAddressRareSats();
 
   const totalInscriptions = inscriptionsQuery.data?.pages?.[0]?.total_inscriptions ?? 0;
+  const totalHiddenInscriptions = hiddenInscriptionsQuery.data?.pages?.[0]?.total_inscriptions ?? 0;
+
   const totalNfts = stacksNftsQuery.data?.total_nfts ?? 0;
 
   const isGalleryOpen: boolean = useMemo(() => document.documentElement.clientWidth > 360, []);
@@ -168,7 +174,7 @@ const useNftDashboard = (): NftDashboardState => {
 
     return (
       <>
-        <GridContainer isGalleryOpen={isGalleryOpen}>
+        <GridContainer $isGalleryOpen={isGalleryOpen}>
           {inscriptionsQuery.data?.pages
             ?.map((page) => page?.results)
             .flat()
@@ -191,6 +197,51 @@ const useNftDashboard = (): NftDashboardState => {
     );
   }, [inscriptionsQuery, isGalleryOpen, totalInscriptions, t]);
 
+  const HiddenInscriptionListView = useCallback(() => {
+    if (
+      hiddenInscriptionsQuery.error &&
+      !(hiddenInscriptionsQuery.error instanceof InvalidParamsError)
+    ) {
+      return (
+        <ErrorContainer>
+          <Wrench size={48} />
+          <ErrorTextContainer>
+            <ErrorText>{t('ERROR_RETRIEVING')}</ErrorText>
+            <ErrorText>{t('TRY_AGAIN')}</ErrorText>
+          </ErrorTextContainer>
+        </ErrorContainer>
+      );
+    }
+
+    if (totalHiddenInscriptions === 0) {
+      return <NoCollectiblesText>{t('NO_COLLECTIBLES')}</NoCollectiblesText>;
+    }
+
+    return (
+      <>
+        <GridContainer $isGalleryOpen={isGalleryOpen}>
+          {hiddenInscriptionsQuery.data?.pages
+            ?.map((page) => page?.results)
+            .flat()
+            .map((collection: InscriptionCollectionsData) => (
+              <InscriptionsTabGridItem key={getCollectionKey(collection)} item={collection} />
+            ))}
+        </GridContainer>
+        {hiddenInscriptionsQuery.hasNextPage && (
+          <LoadMoreButtonContainer>
+            <Button
+              variant="secondary"
+              title={t('LOAD_MORE')}
+              loading={hiddenInscriptionsQuery.isFetchingNextPage}
+              disabled={hiddenInscriptionsQuery.isFetchingNextPage}
+              onClick={() => hiddenInscriptionsQuery.fetchNextPage()}
+            />
+          </LoadMoreButtonContainer>
+        )}
+      </>
+    );
+  }, [hiddenInscriptionsQuery, isGalleryOpen, totalHiddenInscriptions, t]);
+
   const NftListView = useCallback(() => {
     if (stacksNftsQuery.error && !(stacksNftsQuery.error instanceof InvalidParamsError)) {
       return (
@@ -209,7 +260,7 @@ const useNftDashboard = (): NftDashboardState => {
     }
 
     return (
-      <GridContainer isGalleryOpen={isGalleryOpen}>
+      <GridContainer $isGalleryOpen={isGalleryOpen}>
         {stacksNftsQuery.data?.results.map((collection: StacksCollectionData) => (
           <IsVisibleOrPlaceholder key={collection.collection_id}>
             <NftTabGridItem item={collection} />
@@ -246,12 +297,14 @@ const useNftDashboard = (): NftDashboardState => {
     isOrdinalReceiveAlertVisible,
     stacksNftsQuery,
     inscriptionsQuery,
+    hiddenInscriptionsQuery,
     openInGalleryView,
     onReceiveModalOpen,
     onReceiveModalClose,
     onOrdinalReceiveAlertOpen,
     onOrdinalReceiveAlertClose,
     InscriptionListView,
+    HiddenInscriptionListView,
     NftListView,
     onActivateRareSatsAlertCrossPress,
     onActivateRareSatsAlertDenyPress,
@@ -264,6 +317,7 @@ const useNftDashboard = (): NftDashboardState => {
     rareSatsQuery,
     totalNfts,
     totalInscriptions,
+    totalHiddenInscriptions,
   };
 };
 
diff --git a/src/app/screens/nftDetail/index.styled.ts b/src/app/screens/nftDetail/index.styled.ts
index 19be80ec7..f9b546b94 100644
--- a/src/app/screens/nftDetail/index.styled.ts
+++ b/src/app/screens/nftDetail/index.styled.ts
@@ -15,7 +15,7 @@ export const ExtensionContainer = styled.div((props) => ({
 }));
 
 export const GalleryReceiveButtonContainer = styled.div((props) => ({
-  marginRight: props.theme.spacing(3),
+  marginRight: props.theme.spacing(6),
   width: '100%',
 }));
 
@@ -116,7 +116,7 @@ export const GridContainer = styled.div((props) => ({
 }));
 
 export const ShareButtonContainer = styled.div((props) => ({
-  marginLeft: props.theme.spacing(3),
+  marginRight: props.theme.spacing(6),
   width: '100%',
 }));
 
diff --git a/src/app/screens/nftDetail/index.tsx b/src/app/screens/nftDetail/index.tsx
index c4b4b3ec0..8330afc55 100644
--- a/src/app/screens/nftDetail/index.tsx
+++ b/src/app/screens/nftDetail/index.tsx
@@ -1,15 +1,36 @@
 import SquaresFour from '@assets/img/nftDashboard/squares_four.svg';
 import AccountHeaderComponent from '@components/accountHeader';
-import ActionButton from '@components/button';
 import CollectibleDetailTile from '@components/collectibleDetailTile';
 import SquareButton from '@components/squareButton';
 import BottomTabBar from '@components/tabBar';
 import TopRow from '@components/topRow';
-import { ArrowLeft, ArrowUp, Share } from '@phosphor-icons/react';
+import useOptionsSheet from '@hooks/useOptionsSheet';
+import useSelectedAccount from '@hooks/useSelectedAccount';
+import useWalletSelector from '@hooks/useWalletSelector';
+import {
+  ArrowLeft,
+  ArrowUp,
+  DotsThreeVertical,
+  Share,
+  UserCircleCheck,
+  UserCircleMinus,
+} from '@phosphor-icons/react';
 import NftImage from '@screens/nftDashboard/nftImage';
+import { StyledButton } from '@screens/ordinalsCollection/index.styled';
 import type { Attribute } from '@secretkeylabs/xverse-core';
+import {
+  removeAccountAvatarAction,
+  setAccountAvatarAction,
+} from '@stores/wallet/actions/actionCreators';
+import ActionButton from '@ui-library/button';
+import Sheet from '@ui-library/sheet';
+import SnackBar from '@ui-library/snackBar';
 import { EMPTY_LABEL } from '@utils/constants';
+import { useCallback } from 'react';
+import toast from 'react-hot-toast';
 import { useTranslation } from 'react-i18next';
+import { useDispatch } from 'react-redux';
+import Theme from '../../../theme';
 import {
   ActionButtonLoader,
   ActionButtonsLoader,
@@ -58,6 +79,10 @@ import NftAttribute from './nftAttribute';
 import useNftDetailScreen from './useNftDetail';
 
 function NftDetailScreen() {
+  const dispatch = useDispatch();
+  const optionsSheet = useOptionsSheet();
+  const { t: optionsDialogT } = useTranslation('translation', { keyPrefix: 'OPTIONS_DIALOG' });
+  const { t: commonT } = useTranslation('translation', { keyPrefix: 'COMMON' });
   const { t } = useTranslation('translation', { keyPrefix: 'NFT_DETAIL_SCREEN' });
   const {
     nft,
@@ -74,6 +99,51 @@ function NftDetailScreen() {
     handleOnSendClick,
     galleryTitle,
   } = useNftDetailScreen();
+  const selectedAccount = useSelectedAccount();
+  const { avatarIds } = useWalletSelector();
+  const currentAvatar = avatarIds[selectedAccount.btcAddress];
+  const isNftSelectedAsAvatar =
+    currentAvatar?.type === 'stacks' && currentAvatar.nft.token_id === nftData?.token_id;
+
+  const handleSetAvatar = useCallback(() => {
+    const address = selectedAccount.btcAddress;
+
+    if (address && nftData?.token_id) {
+      dispatch(
+        setAccountAvatarAction({
+          address,
+          avatar: { type: 'stacks', nft: nftData },
+        }),
+      );
+
+      const toastId = toast.custom(
+        <SnackBar
+          text={optionsDialogT('NFT_AVATAR.SET_TOAST')}
+          type="neutral"
+          action={{
+            text: commonT('UNDO'),
+            onClick: () => {
+              if (currentAvatar?.type) {
+                dispatch(setAccountAvatarAction({ address, avatar: currentAvatar }));
+              } else {
+                dispatch(removeAccountAvatarAction({ address }));
+              }
+
+              toast.remove(toastId);
+            },
+          }}
+        />,
+      );
+    }
+
+    optionsSheet.close();
+  }, [dispatch, optionsDialogT, commonT, selectedAccount, nftData, optionsSheet, currentAvatar]);
+
+  const handleRemoveAvatar = useCallback(() => {
+    dispatch(removeAccountAvatarAction({ address: selectedAccount.btcAddress }));
+    toast.custom(<SnackBar text={optionsDialogT('NFT_AVATAR.REMOVE_TOAST')} type="neutral" />);
+    optionsSheet.close();
+  }, [dispatch, optionsDialogT, selectedAccount, optionsSheet]);
 
   const nftAttributes = nftData?.nft_token_attributes?.length !== 0 && (
     <>
@@ -258,18 +328,17 @@ function NftDetailScreen() {
               <GalleryReceiveButtonContainer>
                 <ActionButton
                   icon={<ArrowUp weight="bold" size="16" />}
-                  text={t('SEND')}
-                  onPress={handleOnSendClick}
+                  title={t('SEND')}
+                  onClick={handleOnSendClick}
                 />
               </GalleryReceiveButtonContainer>
-
               <ShareButtonContainer>
                 <ActionButton
+                  id={`copy-nft-url-${nftData?.asset_id}`}
                   icon={<Share weight="bold" color="white" size="16" />}
-                  text={t('SHARE')}
-                  onPress={onSharePress}
-                  hoverDialogId={`copy-nft-url-${nftData?.asset_id}`}
-                  transparent
+                  title={t('SHARE')}
+                  onClick={onSharePress}
+                  variant="secondary"
                 />
                 <StyledTooltip
                   anchorId={`copy-nft-url-${nftData?.asset_id}`}
@@ -279,6 +348,13 @@ function NftDetailScreen() {
                   place="top"
                 />
               </ShareButtonContainer>
+              <SquareButton
+                icon={<DotsThreeVertical size={20} color={Theme.colors.white_0} weight="bold" />}
+                onPress={optionsSheet.open}
+                isTransparent
+                size={44}
+                radiusSize={12}
+              />
             </GalleryRowContainer>
             {nftDetails}
             <Button isGallery={isGalleryOpen} onClick={onExplorerPress}>
@@ -300,7 +376,7 @@ function NftDetailScreen() {
       {isGalleryOpen ? (
         <AccountHeaderComponent disableMenuOption={isGalleryOpen} disableAccountSwitch />
       ) : (
-        <TopRow onClick={handleBackButtonClick} />
+        <TopRow onClick={handleBackButtonClick} onMenuClick={optionsSheet.open} />
       )}
       {isGalleryOpen ? galleryView : extensionView}
       {!isGalleryOpen && (
@@ -308,6 +384,29 @@ function NftDetailScreen() {
           <BottomTabBar tab="nft" />
         </BottomBarContainer>
       )}
+      {optionsSheet.isVisible && (
+        <Sheet
+          title={commonT('OPTIONS')}
+          visible={optionsSheet.isVisible}
+          onClose={optionsSheet.close}
+        >
+          {isNftSelectedAsAvatar ? (
+            <StyledButton
+              variant="tertiary"
+              icon={<UserCircleMinus size={24} color={Theme.colors.white_200} />}
+              title={optionsDialogT('NFT_AVATAR.REMOVE_ACTION')}
+              onClick={handleRemoveAvatar}
+            />
+          ) : (
+            <StyledButton
+              variant="tertiary"
+              icon={<UserCircleCheck size={24} color={Theme.colors.white_200} />}
+              title={optionsDialogT('NFT_AVATAR.SET_ACTION')}
+              onClick={handleSetAvatar}
+            />
+          )}
+        </Sheet>
+      )}
     </>
   );
 }
diff --git a/src/app/screens/ordinalDetail/index.styled.ts b/src/app/screens/ordinalDetail/index.styled.ts
index 98ec80ca2..e691812eb 100644
--- a/src/app/screens/ordinalDetail/index.styled.ts
+++ b/src/app/screens/ordinalDetail/index.styled.ts
@@ -148,7 +148,7 @@ export const DescriptionContainer = styled.div((props) => ({
 }));
 
 export const StyledWebGalleryButton = styled(WebGalleryButton)`
-  margintop: ${(props) => props.theme.space.s};
+  margin-top: ${(props) => props.theme.space.xs};
 `;
 
 export const ViewInExplorerButton = styled.button<DetailSectionProps>((props) => ({
diff --git a/src/app/screens/ordinalDetail/index.tsx b/src/app/screens/ordinalDetail/index.tsx
index 2006993c1..52dc44216 100644
--- a/src/app/screens/ordinalDetail/index.tsx
+++ b/src/app/screens/ordinalDetail/index.tsx
@@ -6,14 +6,42 @@ import RareSatIcon from '@components/rareSatIcon/rareSatIcon';
 import SquareButton from '@components/squareButton';
 import BottomTabBar from '@components/tabBar';
 import TopRow from '@components/topRow';
+import useOptionsSheet from '@hooks/useOptionsSheet';
 import { useResetUserFlow } from '@hooks/useResetUserFlow';
-import { ArrowUp, Share } from '@phosphor-icons/react';
+import useSelectedAccount from '@hooks/useSelectedAccount';
+import useWalletSelector from '@hooks/useWalletSelector';
+import {
+  ArrowUp,
+  DotsThreeVertical,
+  Share,
+  Star,
+  TrayArrowDown,
+  TrayArrowUp,
+  UserCircleCheck,
+  UserCircleMinus,
+} from '@phosphor-icons/react';
 import OrdinalImage from '@screens/ordinals/ordinalImage';
+import { StyledButton } from '@screens/ordinalsCollection/index.styled';
+import {
+  addToHideCollectiblesAction,
+  addToStarCollectiblesAction,
+  removeAccountAvatarAction,
+  removeFromHideCollectiblesAction,
+  removeFromStarCollectiblesAction,
+  setAccountAvatarAction,
+} from '@stores/wallet/actions/actionCreators';
 import Button from '@ui-library/button';
 import { StyledP } from '@ui-library/common.styled';
+import Sheet from '@ui-library/sheet';
+import SnackBar from '@ui-library/snackBar';
 import { EMPTY_LABEL } from '@utils/constants';
 import { getRareSatsColorsByRareSatsType, getRareSatsLabelByType } from '@utils/rareSats';
+import { useCallback } from 'react';
+import toast from 'react-hot-toast';
 import { useTranslation } from 'react-i18next';
+import { useDispatch } from 'react-redux';
+import { useNavigate } from 'react-router-dom';
+import Theme from '../../../theme';
 import {
   ActionButtonLoader,
   ActionButtonsLoader,
@@ -62,8 +90,12 @@ import OrdinalAttributeComponent from './ordinalAttributeComponent';
 import useOrdinalDetail from './useOrdinalDetail';
 
 function OrdinalDetailScreen() {
+  const optionsSheet = useOptionsSheet();
+  const { t: optionsDialogT } = useTranslation('translation', { keyPrefix: 'OPTIONS_DIALOG' });
   const { t } = useTranslation('translation', { keyPrefix: 'NFT_DETAIL_SCREEN' });
   const { t: commonT } = useTranslation('translation', { keyPrefix: 'COMMON' });
+  const navigate = useNavigate();
+
   const ordinalDetails = useOrdinalDetail();
   const {
     ordinal,
@@ -87,11 +119,133 @@ function OrdinalDetailScreen() {
     onCopyClick,
     backButtonText,
   } = ordinalDetails;
-
+  const selectedAccount = useSelectedAccount();
+  const { starredCollectibleIds, hiddenCollectibleIds, avatarIds } = useWalletSelector();
+  const currentAvatar = avatarIds[selectedAccount.btcAddress];
+  const isInscriptionSelectedAsAvatar =
+    currentAvatar?.type === 'inscription' && currentAvatar.inscription.id === ordinal?.id;
+  const inscriptionStarred = starredCollectibleIds[ordinalsAddress]?.some(
+    ({ id }) => id === ordinal?.id,
+  );
+  const isStandaloneInscription = !ordinal?.collection_id;
+  const isInscriptionHidden = Object.keys(hiddenCollectibleIds[ordinalsAddress] ?? {}).some(
+    (id) => id === ordinal?.id,
+  );
+  const isInscriptionCollectionHidden = Object.keys(
+    hiddenCollectibleIds[ordinalsAddress] ?? {},
+  ).some((id) => id === ordinal?.collection_id);
+  const isHidden = isInscriptionHidden || isInscriptionCollectionHidden;
   const isBrc20Ordinal = Boolean(brc20Details);
+  const dispatch = useDispatch();
 
   useResetUserFlow('/ordinal-detail');
 
+  const handleStarClick = () => {
+    if (inscriptionStarred) {
+      const toastId = toast.custom(
+        <SnackBar
+          text={t('UNSTAR_INSCRIPTION')}
+          type="neutral"
+          dismissToast={() => toast.remove(toastId)}
+        />,
+      );
+      dispatch(
+        removeFromStarCollectiblesAction({ address: ordinalsAddress, id: ordinal?.id ?? '' }),
+      );
+    } else {
+      const toastId = toast.custom(
+        <SnackBar
+          text={t('STAR_INSCRIPTION')}
+          type="neutral"
+          dismissToast={() => toast.remove(toastId)}
+        />,
+      );
+      dispatch(
+        addToStarCollectiblesAction({
+          address: ordinalsAddress,
+          id: ordinal?.id ?? '',
+          collectionId: ordinal?.collection_id ?? '',
+        }),
+      );
+    }
+  };
+
+  const handleClickUndoHiding = (toastId: string) => {
+    dispatch(removeFromHideCollectiblesAction({ address: ordinalsAddress, id: ordinal?.id ?? '' }));
+    toast.remove(toastId);
+    toast.custom(<SnackBar text={t('INSCRIPTION_UNHIDDEN')} type="neutral" />, { duration: 2000 });
+  };
+
+  const handleHideStandaloneInscription = () => {
+    dispatch(addToHideCollectiblesAction({ address: ordinalsAddress, id: ordinal?.id ?? '' }));
+
+    if (isInscriptionSelectedAsAvatar) {
+      dispatch(removeAccountAvatarAction({ address: selectedAccount.btcAddress }));
+    }
+
+    optionsSheet.close();
+    navigate('/nft-dashboard?tab=inscriptions');
+    const toastId = toast.custom(
+      <SnackBar
+        text={t('INSCRIPTION_HIDDEN')}
+        type="neutral"
+        action={{
+          text: commonT('UNDO'),
+          onClick: () => handleClickUndoHiding(toastId),
+        }}
+      />,
+      { duration: 4000 },
+    );
+  };
+
+  const handleUnHideStandaloneInscription = () => {
+    const isLastHiddenItem = Object.keys(hiddenCollectibleIds[ordinalsAddress] ?? {}).length === 1;
+    dispatch(removeFromHideCollectiblesAction({ address: ordinalsAddress, id: ordinal?.id ?? '' }));
+    optionsSheet.close();
+    toast.custom(<SnackBar text={t('INSCRIPTION_UNHIDDEN')} type="neutral" />);
+    navigate(`/nft-dashboard/${isLastHiddenItem ? '' : 'hidden'}?tab=inscriptions`);
+  };
+
+  const handleSetAvatar = useCallback(() => {
+    const address = selectedAccount.btcAddress;
+
+    if (address && ordinal?.id) {
+      dispatch(
+        setAccountAvatarAction({
+          address,
+          avatar: { type: 'inscription', inscription: ordinal },
+        }),
+      );
+
+      const toastId = toast.custom(
+        <SnackBar
+          text={optionsDialogT('NFT_AVATAR.SET_TOAST')}
+          type="neutral"
+          action={{
+            text: commonT('UNDO'),
+            onClick: () => {
+              if (currentAvatar?.type) {
+                dispatch(setAccountAvatarAction({ address, avatar: currentAvatar }));
+              } else {
+                dispatch(removeAccountAvatarAction({ address }));
+              }
+
+              toast.remove(toastId);
+            },
+          }}
+        />,
+      );
+    }
+
+    optionsSheet.close();
+  }, [dispatch, optionsDialogT, commonT, selectedAccount, ordinal, optionsSheet, currentAvatar]);
+
+  const handleRemoveAvatar = useCallback(() => {
+    dispatch(removeAccountAvatarAction({ address: selectedAccount.btcAddress }));
+    toast.custom(<SnackBar text={optionsDialogT('NFT_AVATAR.REMOVE_TOAST')} type="neutral" />);
+    optionsSheet.close();
+  }, [dispatch, selectedAccount.btcAddress, optionsDialogT, optionsSheet]);
+
   const ordinalDetailAttributes = (
     <OrdinalDetailsContainer isGallery={isGalleryOpen}>
       {!isGalleryOpen && ordinal?.collection_id && (
@@ -462,6 +616,30 @@ function OrdinalDetailScreen() {
                   variant="light"
                 />
               </GalleryButtonContainer>
+              {!isHidden && (
+                <SquareButton
+                  icon={
+                    inscriptionStarred ? (
+                      <Star size={16} color={Theme.colors.tangerine} weight="fill" />
+                    ) : (
+                      <Star size={16} color={Theme.colors.white_0} weight="bold" />
+                    )
+                  }
+                  onPress={handleStarClick}
+                  isTransparent
+                  size={44}
+                  radiusSize={12}
+                />
+              )}
+              {(!isHidden || isStandaloneInscription) && (
+                <SquareButton
+                  icon={<DotsThreeVertical size={20} color={Theme.colors.white_0} weight="bold" />}
+                  onPress={optionsSheet.open}
+                  isTransparent
+                  size={44}
+                  radiusSize={12}
+                />
+              )}
             </ButtonContainer>
             <DescriptionText>{t('DATA')}</DescriptionText>
             {rareSats}
@@ -486,7 +664,12 @@ function OrdinalDetailScreen() {
       {isGalleryOpen ? (
         <AccountHeaderComponent disableMenuOption={isGalleryOpen} disableAccountSwitch />
       ) : (
-        <TopRow onClick={handleBackButtonClick} />
+        <TopRow
+          onClick={handleBackButtonClick}
+          onStarClick={isHidden ? undefined : handleStarClick}
+          isStarred={inscriptionStarred}
+          onMenuClick={!isHidden || isStandaloneInscription ? optionsSheet.open : undefined}
+        />
       )}
       {showSendOridnalsAlert && (
         <AlertMessage
@@ -503,6 +686,46 @@ function OrdinalDetailScreen() {
           <BottomTabBar tab="nft" />
         </BottomBarContainer>
       )}
+      {optionsSheet.isVisible && (
+        <Sheet
+          title={commonT('OPTIONS')}
+          visible={optionsSheet.isVisible}
+          onClose={optionsSheet.close}
+        >
+          {!isHidden &&
+            (isInscriptionSelectedAsAvatar ? (
+              <StyledButton
+                variant="tertiary"
+                icon={<UserCircleMinus size={24} color={Theme.colors.white_200} />}
+                title={optionsDialogT('NFT_AVATAR.REMOVE_ACTION')}
+                onClick={handleRemoveAvatar}
+              />
+            ) : (
+              <StyledButton
+                variant="tertiary"
+                icon={<UserCircleCheck size={24} color={Theme.colors.white_200} />}
+                title={optionsDialogT('NFT_AVATAR.SET_ACTION')}
+                onClick={handleSetAvatar}
+              />
+            ))}
+          {isStandaloneInscription &&
+            (isInscriptionHidden ? (
+              <StyledButton
+                variant="tertiary"
+                icon={<TrayArrowUp size={24} color={Theme.colors.white_200} />}
+                title={t('UNHIDE_INSCRIPTION')}
+                onClick={handleUnHideStandaloneInscription}
+              />
+            ) : (
+              <StyledButton
+                variant="tertiary"
+                icon={<TrayArrowDown size={24} color={Theme.colors.white_200} />}
+                title={t('HIDE_INSCRIPTION')}
+                onClick={handleHideStandaloneInscription}
+              />
+            ))}
+        </Sheet>
+      )}
     </>
   );
 }
diff --git a/src/app/screens/ordinalDetail/ordinalAttributeComponent.tsx b/src/app/screens/ordinalDetail/ordinalAttributeComponent.tsx
index c44dfb242..594eccf55 100644
--- a/src/app/screens/ordinalDetail/ordinalAttributeComponent.tsx
+++ b/src/app/screens/ordinalDetail/ordinalAttributeComponent.tsx
@@ -7,49 +7,47 @@ const Container = styled.div((props) => ({
   display: 'flex',
   flexDirection: 'column',
   alignItems: 'flex-start',
-  marginTop: props.theme.spacing(8),
+  marginTop: props.theme.space.m,
   width: '100%',
 }));
 
-const RowContainer = styled.div((props) => ({
+const RowContainer = styled.div({
   display: 'flex',
   flexDirection: 'row',
   alignItems: 'flex-start',
   width: '100%',
-}));
+});
 
 const TitleText = styled.h1((props) => ({
-  ...props.theme.body_medium_m,
+  ...props.theme.typography.body_medium_m,
   color: props.theme.colors.white_400,
   textAlign: 'center',
 }));
 
-interface ValueTextProps {
+const ValueText = styled.p<{
   color?: string;
   fullWidth?: boolean;
-}
-
-const ValueText = styled.p<ValueTextProps>((props) => ({
-  ...props.theme.body_medium_m,
+}>((props) => ({
+  ...props.theme.typography.body_medium_m,
   textAlign: 'left',
-  color: props.color || props.theme.colors.white[0],
+  color: props.color || props.theme.colors.white_0,
   width: props.fullWidth ? '100%' : 'auto',
   overflowWrap: 'break-word',
   wordWrap: 'break-word',
   wordBreak: 'break-word',
 }));
 
-const OrdinalsTag = styled.div({
+const OrdinalsTag = styled.div((props) => ({
   display: 'flex',
   flexDirection: 'row',
   justifyContent: 'center',
   alignItems: 'center',
-  marginLeft: 2,
+  marginLeft: props.theme.space.xxxs,
   background: 'rgba(39, 42, 68, 0.6)',
   borderRadius: 40,
   height: 22,
   padding: '3px 6px',
-});
+}));
 
 const ButtonIcon = styled.img({
   width: 12,
@@ -57,14 +55,14 @@ const ButtonIcon = styled.img({
 });
 
 const Text = styled.h1((props) => ({
-  ...props.theme.body_bold_m,
+  ...props.theme.typography.body_bold_m,
   textTransform: 'uppercase',
   color: props.theme.colors.white_0,
   fontSize: 10,
-  marginLeft: props.theme.spacing(2),
+  marginLeft: props.theme.space.xxs,
 }));
 
-interface Props {
+type Props = {
   title: string;
   value?: string;
   isAddress?: boolean;
@@ -72,7 +70,7 @@ interface Props {
   valueColor?: string;
   customValue?: React.ReactNode;
   suffix?: string;
-}
+};
 
 function OrdinalAttributeComponent({
   title,
diff --git a/src/app/screens/ordinalDetail/useOrdinalDetail.ts b/src/app/screens/ordinalDetail/useOrdinalDetail.ts
index 0b5ad5792..1df7a2655 100644
--- a/src/app/screens/ordinalDetail/useOrdinalDetail.ts
+++ b/src/app/screens/ordinalDetail/useOrdinalDetail.ts
@@ -22,13 +22,12 @@ import { useTheme } from 'styled-components';
 export default function useOrdinalDetail() {
   const navigate = useNavigate();
   const selectedAccount = useSelectedAccount();
-  const { network, hasActivatedRareSatsKey } = useWalletSelector();
-  const { id } = useParams();
+  const { network, hasActivatedRareSatsKey, hiddenCollectibleIds } = useWalletSelector();
+  const { id, from } = useParams();
   const { data: ordinalData, isLoading } = useAddressInscription(id!);
   const { data: collectionMarketData } = useInscriptionCollectionMarketData(
     ordinalData?.collection_id,
   );
-
   const { isPending, pendingTxHash } = usePendingOrdinalTxs(ordinalData?.tx_id);
   const textContent = useTextOrdinalContent(ordinalData!);
   const { setSelectedSatBundleDetails } = useSatBundleDataReducer();
@@ -39,6 +38,11 @@ export default function useOrdinalDetail() {
   );
   const theme = useTheme();
   const { t } = useTranslation('translation', { keyPrefix: 'NFT_DETAIL_SCREEN' });
+  const { t: tCollectibles } = useTranslation('translation', {
+    keyPrefix: 'COLLECTIBLE_COLLECTION_SCREEN',
+  });
+
+  const comesFromHidden = from === 'hidden';
 
   const [showSendOridnalsAlert, setshowSendOridnalsAlert] = useState(false);
 
@@ -53,10 +57,24 @@ export default function useOrdinalDetail() {
     [textContent, ordinalData?.content_type],
   );
 
+  const isInscriptionHidden = Object.keys(
+    hiddenCollectibleIds[selectedAccount.ordinalsAddress] ?? {},
+  ).some((ordinalId) => ordinalId === ordinalData?.id);
+
   const handleBackButtonClick = () => {
-    if (ordinalData?.collection_id)
-      navigate(`/nft-dashboard/ordinals-collection/${ordinalData?.collection_id}`);
-    else navigate('/nft-dashboard?tab=inscriptions');
+    if (isGalleryOpen) {
+      if (comesFromHidden || isInscriptionHidden) {
+        navigate('/nft-dashboard/hidden?tab=inscriptions');
+      } else if (ordinalData?.collection_id) {
+        navigate(`/nft-dashboard/ordinals-collection/${ordinalData?.collection_id}`);
+      } else {
+        navigate('/nft-dashboard?tab=inscriptions');
+      }
+
+      return;
+    }
+
+    navigate(-1);
   };
 
   const openInGalleryView = async () => {
@@ -114,6 +132,8 @@ export default function useOrdinalDetail() {
 
   const backButtonText = ordinalData?.collection_id
     ? t('BACK_TO_COLLECTION')
+    : comesFromHidden || isInscriptionHidden
+    ? tCollectibles('BACK_TO_HIDDEN_COLLECTIBLES')
     : t('MOVE_TO_ASSET_DETAIL');
 
   return {
diff --git a/src/app/screens/ordinalsCollection/index.styled.ts b/src/app/screens/ordinalsCollection/index.styled.ts
new file mode 100644
index 000000000..8fe290c2c
--- /dev/null
+++ b/src/app/screens/ordinalsCollection/index.styled.ts
@@ -0,0 +1,131 @@
+import { BetterBarLoader } from '@components/barLoader';
+import Separator from '@components/separator';
+import WebGalleryButton from '@components/webGalleryButton';
+import WrenchErrorMessage from '@components/wrenchErrorMessage';
+import { GridContainer } from '@screens/nftDashboard/collectiblesTabs/index.styled';
+import Button from '@ui-library/button';
+import styled from 'styled-components';
+
+interface DetailSectionProps {
+  isGalleryOpen?: boolean;
+}
+
+/* layout */
+// TODO tim: create a reusable layout
+export const Container = styled.div`
+  display: flex;
+  flex-direction: column;
+  flex: 1;
+  ${(props) => props.theme.scrollbar}
+`;
+
+export const PageHeader = styled.div<DetailSectionProps>`
+  padding: ${(props) => props.theme.space.xs};
+  padding-top: 0;
+  max-width: 1224px;
+  margin-top: ${(props) => (props.isGalleryOpen ? props.theme.space.xxl : props.theme.space.l)};
+  margin-left: auto;
+  margin-right: auto;
+  width: 100%;
+`;
+
+// TODO tim: use media queries for this once we get responsive layouts with breakpoints
+export const PageHeaderContent = styled.div<DetailSectionProps>`
+  display: flex;
+  flex-direction: ${(props) => (props.isGalleryOpen ? 'row' : 'column')};
+  justify-content: ${(props) => (props.isGalleryOpen ? 'space-between' : 'initial')};
+  row-gap: ${(props) => props.theme.space.xl};
+`;
+
+export const AttributesContainer = styled.div<DetailSectionProps>`
+  display: flex;
+  flex-direction: ${(props) => (props.isGalleryOpen ? 'column' : 'row')};
+  justify-content: ${(props) => (props.isGalleryOpen ? 'space-between' : 'initial')};
+  column-gap: ${(props) => props.theme.space.m};
+`;
+
+export const BottomBarContainer = styled.div({
+  marginTop: 'auto',
+});
+
+export const StyledSeparator = styled(Separator)`
+  margin-bottom: ${(props) => props.theme.space.xxl};
+`;
+
+export const StyledGridContainer = styled(GridContainer)`
+  margin-top: ${(props) => props.theme.space.s};
+  padding: 0 ${(props) => props.theme.space.xs};
+  padding-bottom: ${(props) => props.theme.space.xl};
+  max-width: 1224px;
+  margin-left: auto;
+  margin-right: auto;
+  width: 100%;
+`;
+
+/* components */
+
+export const StyledWebGalleryButton = styled(WebGalleryButton)`
+  margin-top: ${(props) => props.theme.space.xs};
+`;
+
+export const StyledWrenchErrorMessage = styled(WrenchErrorMessage)`
+  margin-top: ${(props) => props.theme.space.xxl};
+`;
+
+export const BackButtonContainer = styled.div`
+  display: flex;
+  flex-direction: row;
+  margin-bottom: ${(props) => props.theme.space.xxl};
+`;
+
+export const BackButton = styled.button((props) => ({
+  display: 'flex',
+  alignItems: 'center',
+  gap: props.theme.space.xxs,
+  background: 'transparent',
+  marginBottom: props.theme.spacing(12),
+  color: props.theme.colors.white_0,
+}));
+
+export const NoCollectiblesText = styled.p((props) => ({
+  ...props.theme.body_bold_m,
+  color: props.theme.colors.white_200,
+  marginTop: props.theme.spacing(16),
+  marginBottom: 'auto',
+  textAlign: 'center',
+}));
+
+export const LoadMoreButtonContainer = styled.div((props) => ({
+  display: 'flex',
+  justifyContent: 'center',
+  alignItems: 'center',
+  marginBottom: props.theme.spacing(30),
+  marginTop: props.theme.space.xl,
+  button: {
+    width: 156,
+  },
+}));
+
+export const StyledBarLoader = styled(BetterBarLoader)((props) => ({
+  padding: 0,
+  borderRadius: props.theme.radius(1),
+  marginTop: props.theme.spacing(2),
+}));
+
+export const StyledButton = styled(Button)`
+  &.tertiary {
+    justify-content: flex-start;
+    color: ${(props) => props.theme.colors.white_200};
+    padding-left: 0;
+
+    &:hover:enabled {
+      opacity: 0.8;
+    }
+  }
+`;
+
+export const CollectionNameDiv = styled.div`
+  display: flex;
+  align-items: center;
+  gap: ${(props) => props.theme.space.s};
+`;
diff --git a/src/app/screens/ordinalsCollection/index.tsx b/src/app/screens/ordinalsCollection/index.tsx
index 4dfbb3f1c..828fcf92d 100644
--- a/src/app/screens/ordinalsCollection/index.tsx
+++ b/src/app/screens/ordinalsCollection/index.tsx
@@ -1,154 +1,97 @@
 import AccountHeaderComponent from '@components/accountHeader';
-import { BetterBarLoader } from '@components/barLoader';
 import CollectibleCollectionGridItem from '@components/collectibleCollectionGridItem';
 import CollectibleDetailTile from '@components/collectibleDetailTile';
-import Separator from '@components/separator';
+import SquareButton from '@components/squareButton';
 import BottomTabBar from '@components/tabBar';
 import { TilesSkeletonLoader } from '@components/tilesSkeletonLoader';
 import TopRow from '@components/topRow';
-import WebGalleryButton from '@components/webGalleryButton';
-import WrenchErrorMessage from '@components/wrenchErrorMessage';
-import useAddressInscriptions from '@hooks/queries/ordinals/useAddressInscriptions';
+import useAddressCollectionInscriptions from '@hooks/queries/ordinals/useAddressCollectionInscriptions';
 import useInscriptionCollectionMarketData from '@hooks/queries/ordinals/useCollectionMarketData';
+import useOptionsSheet from '@hooks/useOptionsSheet';
 import { useResetUserFlow } from '@hooks/useResetUserFlow';
-import { ArrowLeft } from '@phosphor-icons/react';
-import { GridContainer } from '@screens/nftDashboard/collectiblesTabs';
+import useSelectedAccount from '@hooks/useSelectedAccount';
+import useWalletSelector from '@hooks/useWalletSelector';
+import {
+  ArrowLeft,
+  DotsThreeVertical,
+  Star,
+  TrayArrowDown,
+  TrayArrowUp,
+} from '@phosphor-icons/react';
 import OrdinalImage from '@screens/ordinals/ordinalImage';
+import {
+  addToHideCollectiblesAction,
+  addToStarCollectiblesAction,
+  removeAccountAvatarAction,
+  removeFromHideCollectiblesAction,
+  removeFromStarCollectiblesAction,
+} from '@stores/wallet/actions/actionCreators';
 import Button from '@ui-library/button';
 import { StyledHeading, StyledP } from '@ui-library/common.styled';
+import Sheet from '@ui-library/sheet';
+import SnackBar from '@ui-library/snackBar';
 import { EMPTY_LABEL } from '@utils/constants';
 import {
   getInscriptionsCollectionGridItemId,
   getInscriptionsCollectionGridItemSubText,
   getInscriptionsCollectionGridItemSubTextColor,
 } from '@utils/inscriptions';
-import { useMemo } from 'react';
+import { useMemo, useState } from 'react';
+import toast from 'react-hot-toast';
 import { useTranslation } from 'react-i18next';
+import { useDispatch } from 'react-redux';
 import { useNavigate, useParams } from 'react-router-dom';
-import styled from 'styled-components';
-
-interface DetailSectionProps {
-  isGalleryOpen?: boolean;
-}
-
-/* layout */
-// TODO tim: create a reusable layout
-const Container = styled.div`
-  display: flex;
-  flex-direction: column;
-  flex: 1;
-  ${(props) => props.theme.scrollbar}
-`;
-
-const PageHeader = styled.div<DetailSectionProps>`
-  padding: ${(props) => props.theme.space.xs};
-  padding-top: 0;
-  max-width: 1224px;
-  margin-top: ${(props) => (props.isGalleryOpen ? props.theme.space.xxl : props.theme.space.l)};
-  margin-left: auto;
-  margin-right: auto;
-  width: 100%;
-`;
-
-// TODO tim: use media queries for this once we get responsive layouts with breakpoints
-const PageHeaderContent = styled.div<DetailSectionProps>`
-  display: flex;
-  flex-direction: ${(props) => (props.isGalleryOpen ? 'row' : 'column')};
-  justify-content: ${(props) => (props.isGalleryOpen ? 'space-between' : 'initial')};
-  row-gap: ${(props) => props.theme.space.xl};
-`;
-
-const AttributesContainer = styled.div<DetailSectionProps>`
-  display: flex;
-  flex-direction: ${(props) => (props.isGalleryOpen ? 'column' : 'row')};
-  justify-content: ${(props) => (props.isGalleryOpen ? 'space-between' : 'initial')};
-  column-gap: ${(props) => props.theme.space.m};
-`;
-
-const BottomBarContainer = styled.div({
-  marginTop: 'auto',
-});
-
-const StyledSeparator = styled(Separator)`
-  margin-bottom: ${(props) => props.theme.space.xxl};
-`;
-
-const StyledGridContainer = styled(GridContainer)`
-  margin-top: ${(props) => props.theme.space.s};
-  padding: 0 ${(props) => props.theme.space.xs};
-  padding-bottom: ${(props) => props.theme.space.xl};
-  max-width: 1224px;
-  margin-left: auto;
-  margin-right: auto;
-  width: 100%;
-`;
-
-/* components */
-
-const StyledWebGalleryButton = styled(WebGalleryButton)`
-  margin-top: ${(props) => props.theme.space.xs};
-`;
-
-const StyledWrenchErrorMessage = styled(WrenchErrorMessage)`
-  margin-top: ${(props) => props.theme.space.xxl};
-`;
-
-const BackButtonContainer = styled.div`
-  display: flex;
-  flex-direction: row;
-  margin-bottom: ${(props) => props.theme.space.xxl};
-`;
-
-const BackButton = styled.button((props) => ({
-  display: 'flex',
-  alignItems: 'center',
-  gap: props.theme.space.xxs,
-  background: 'transparent',
-  marginBottom: props.theme.spacing(12),
-  color: props.theme.colors.white_0,
-}));
-
-const NoCollectiblesText = styled.p((props) => ({
-  ...props.theme.body_bold_m,
-  color: props.theme.colors.white_200,
-  marginTop: props.theme.spacing(16),
-  marginBottom: 'auto',
-  textAlign: 'center',
-}));
-
-const LoadMoreButtonContainer = styled.div((props) => ({
-  display: 'flex',
-  justifyContent: 'center',
-  alignItems: 'center',
-  marginBottom: props.theme.spacing(30),
-  marginTop: props.theme.space.xl,
-  button: {
-    width: 156,
-  },
-}));
-
-const StyledBarLoader = styled(BetterBarLoader)((props) => ({
-  padding: 0,
-  borderRadius: props.theme.radius(1),
-  marginTop: props.theme.spacing(2),
-}));
+import Theme from 'theme';
+import {
+  AttributesContainer,
+  BackButton,
+  BackButtonContainer,
+  BottomBarContainer,
+  CollectionNameDiv,
+  Container,
+  LoadMoreButtonContainer,
+  NoCollectiblesText,
+  PageHeader,
+  PageHeaderContent,
+  StyledBarLoader,
+  StyledButton,
+  StyledGridContainer,
+  StyledSeparator,
+  StyledWebGalleryButton,
+  StyledWrenchErrorMessage,
+} from './index.styled';
 
 function OrdinalsCollection() {
   const { t } = useTranslation('translation', { keyPrefix: 'COLLECTIBLE_COLLECTION_SCREEN' });
+  const { t: tCommon } = useTranslation('translation', { keyPrefix: 'COMMON' });
   const navigate = useNavigate();
-  const { id: collectionId } = useParams();
+  const { btcAddress, ordinalsAddress } = useSelectedAccount();
+  const { id: collectionId, from } = useParams();
+  const { starredCollectibleIds, hiddenCollectibleIds, avatarIds } = useWalletSelector();
+  const currentAvatar = avatarIds[btcAddress];
+  const optionsSheet = useOptionsSheet();
   const { data, error, isLoading, hasNextPage, isFetchingNextPage, fetchNextPage } =
-    useAddressInscriptions(collectionId);
+    useAddressCollectionInscriptions(collectionId);
   const { data: collectionMarketData, isLoading: isLoadingMarketData } =
     useInscriptionCollectionMarketData(collectionId);
-
+  const dispatch = useDispatch();
   const isGalleryOpen: boolean = useMemo(() => document.documentElement.clientWidth > 360, []);
 
+  const collectionStarred = starredCollectibleIds[ordinalsAddress]?.some(
+    ({ id }) => id === collectionId,
+  );
+  const collectionHidden = Object.keys(hiddenCollectibleIds[ordinalsAddress] ?? {}).some(
+    (id) => id === collectionId,
+  );
+
+  const comesFromHidden = from === 'hidden';
+
   useResetUserFlow('/ordinals-collection');
 
-  const handleBackButtonClick = () => {
-    navigate('/nft-dashboard?tab=inscriptions');
-  };
+  const handleBackButtonClick = () =>
+    navigate(
+      `/nft-dashboard${comesFromHidden || collectionHidden ? '/hidden' : ''}?tab=inscriptions`,
+    );
 
   const openInGalleryView = async () => {
     await chrome.tabs.create({
@@ -156,8 +99,54 @@ function OrdinalsCollection() {
     });
   };
 
-  const isEmpty = !isLoading && !error && data?.pages?.[0]?.total === 0;
+  const handleClickUndoHiding = (toastId: string) => {
+    dispatch(
+      removeFromHideCollectiblesAction({ address: ordinalsAddress, id: collectionId ?? '' }),
+    );
+    toast.remove(toastId);
+    toast.custom(<SnackBar text={t('COLLECTION_UNHIDDEN')} type="neutral" />, { duration: 4000 });
+  };
+
+  const handleHideCollection = () => {
+    dispatch(addToHideCollectiblesAction({ address: ordinalsAddress, id: collectionId ?? '' }));
+
+    if (currentAvatar?.type === 'inscription') {
+      const shouldHideAvatar = data?.pages
+        ?.map((page) => page?.data)
+        .flat()
+        .some((inscription) => inscription.id === currentAvatar.inscription.id);
+
+      if (shouldHideAvatar) {
+        dispatch(removeAccountAvatarAction({ address: btcAddress }));
+      }
+    }
 
+    optionsSheet.close();
+    navigate('/nft-dashboard?tab=inscriptions');
+    const toastId = toast.custom(
+      <SnackBar
+        text={t('COLLECTION_HIDDEN')}
+        type="neutral"
+        action={{
+          text: tCommon('UNDO'),
+          onClick: () => handleClickUndoHiding(toastId),
+        }}
+      />,
+      { duration: 4000 },
+    );
+  };
+
+  const handleUnHideCollection = () => {
+    const isLastHiddenItem = Object.keys(hiddenCollectibleIds[ordinalsAddress] ?? {}).length === 1;
+    dispatch(
+      removeFromHideCollectiblesAction({ address: ordinalsAddress, id: collectionId ?? '' }),
+    );
+    optionsSheet.close();
+    toast.custom(<SnackBar text={t('COLLECTION_UNHIDDEN')} type="neutral" />);
+    navigate(`/nft-dashboard/${isLastHiddenItem ? '' : 'hidden'}?tab=inscriptions`);
+  };
+
+  const isEmpty = !isLoading && !error && data?.pages?.[0]?.total === 0;
   const collectionHeading = data?.pages?.[0].collection_name;
   const estPortfolioValue =
     data && data?.pages?.[0].portfolio_value !== 0
@@ -167,12 +156,41 @@ function OrdinalsCollection() {
     ? `${collectionMarketData?.floor_price?.toFixed(8)} BTC`
     : EMPTY_LABEL;
 
+  const handleStarClick = () => {
+    if (collectionStarred) {
+      const toastId = toast.custom(
+        <SnackBar
+          text={t('UNSTAR_COLLECTION')}
+          type="neutral"
+          dismissToast={() => toast.remove(toastId)}
+        />,
+      );
+      dispatch(
+        removeFromStarCollectiblesAction({ address: ordinalsAddress, id: collectionId ?? '' }),
+      );
+    } else {
+      const toastId = toast.custom(
+        <SnackBar
+          text={t('STAR_COLLECTION')}
+          type="neutral"
+          dismissToast={() => toast.remove(toastId)}
+        />,
+      );
+      dispatch(addToStarCollectiblesAction({ address: ordinalsAddress, id: collectionId ?? '' }));
+    }
+  };
+
   return (
     <>
       {isGalleryOpen ? (
         <AccountHeaderComponent disableMenuOption={isGalleryOpen} disableAccountSwitch />
       ) : (
-        <TopRow onClick={handleBackButtonClick} />
+        <TopRow
+          onClick={handleBackButtonClick}
+          onMenuClick={optionsSheet.open}
+          onStarClick={collectionHidden ? undefined : handleStarClick}
+          isStarred={collectionStarred}
+        />
       )}
       <Container>
         <PageHeader isGalleryOpen={isGalleryOpen}>
@@ -181,7 +199,7 @@ function OrdinalsCollection() {
               <BackButton onClick={handleBackButtonClick}>
                 <ArrowLeft size={16} color="currentColor" />
                 <StyledP data-testid="back-to-gallery" typography="body_m" color="white_0">
-                  {t('BACK_TO_GALLERY')}
+                  {t(collectionHidden ? 'BACK_TO_HIDDEN_COLLECTIBLES' : 'BACK_TO_GALLERY')}
                 </StyledP>
               </BackButton>
             </BackButtonContainer>
@@ -191,9 +209,39 @@ function OrdinalsCollection() {
               <StyledP typography="body_bold_m" color="white_400">
                 {t('COLLECTION')}
               </StyledP>
-              <StyledHeading typography="headline_s" color="white_0">
-                {collectionHeading || <StyledBarLoader width={200} height={28} />}
-              </StyledHeading>
+              <CollectionNameDiv>
+                <StyledHeading typography="headline_s" color="white_0">
+                  {collectionHeading || <StyledBarLoader width={200} height={28} />}
+                </StyledHeading>
+                {isGalleryOpen && (
+                  <>
+                    {collectionHidden ? null : (
+                      <SquareButton
+                        icon={
+                          collectionStarred ? (
+                            <Star size={16} color={Theme.colors.tangerine} weight="fill" />
+                          ) : (
+                            <Star size={16} color={Theme.colors.white_0} weight="bold" />
+                          )
+                        }
+                        onPress={handleStarClick}
+                        isTransparent
+                        size={44}
+                        radiusSize={12}
+                      />
+                    )}
+                    <SquareButton
+                      icon={
+                        <DotsThreeVertical size={20} color={Theme.colors.white_0} weight="bold" />
+                      }
+                      onPress={optionsSheet.open}
+                      isTransparent
+                      size={44}
+                      radiusSize={12}
+                    />
+                  </>
+                )}
+              </CollectionNameDiv>
               {!isGalleryOpen && <StyledWebGalleryButton onClick={openInGalleryView} />}
             </div>
             <AttributesContainer isGalleryOpen={isGalleryOpen}>
@@ -216,7 +264,7 @@ function OrdinalsCollection() {
         <div>
           {isEmpty && <NoCollectiblesText>{t('NO_COLLECTIBLES')}</NoCollectiblesText>}
           {!!error && <StyledWrenchErrorMessage />}
-          <StyledGridContainer isGalleryOpen={isGalleryOpen}>
+          <StyledGridContainer $isGalleryOpen={isGalleryOpen}>
             {isLoading ? (
               <TilesSkeletonLoader
                 isGalleryOpen={isGalleryOpen}
@@ -233,7 +281,7 @@ function OrdinalsCollection() {
                     itemId={getInscriptionsCollectionGridItemId(inscription)}
                     itemSubText={getInscriptionsCollectionGridItemSubText(inscription)}
                     itemSubTextColor={getInscriptionsCollectionGridItemSubTextColor(inscription)}
-                    onClick={() => navigate(`/nft-dashboard/ordinal-detail/${inscription.id}`)}
+                    onClick={() => navigate(`/nft-dashboard/ordinal-detail/${inscription?.id}`)}
                   >
                     <OrdinalImage ordinal={inscription} />
                   </CollectibleCollectionGridItem>
@@ -258,6 +306,29 @@ function OrdinalsCollection() {
           <BottomTabBar tab="nft" />
         </BottomBarContainer>
       )}
+      {optionsSheet.isVisible && (
+        <Sheet
+          title={tCommon('OPTIONS')}
+          visible={optionsSheet.isVisible}
+          onClose={optionsSheet.close}
+        >
+          {collectionHidden ? (
+            <StyledButton
+              variant="tertiary"
+              icon={<TrayArrowUp size={24} color={Theme.colors.white_200} />}
+              title={t('UNHIDE_COLLECTION')}
+              onClick={handleUnHideCollection}
+            />
+          ) : (
+            <StyledButton
+              variant="tertiary"
+              icon={<TrayArrowDown size={24} color={Theme.colors.white_200} />}
+              title={t('HIDE_COLLECTION')}
+              onClick={handleHideCollection}
+            />
+          )}
+        </Sheet>
+      )}
     </>
   );
 }
diff --git a/src/app/screens/sendBtc/index.tsx b/src/app/screens/sendBtc/index.tsx
index b0cf9afbf..66596e0f0 100644
--- a/src/app/screens/sendBtc/index.tsx
+++ b/src/app/screens/sendBtc/index.tsx
@@ -3,11 +3,7 @@ import useDebounce from '@hooks/useDebounce';
 import { useResetUserFlow } from '@hooks/useResetUserFlow';
 import useSelectedAccount from '@hooks/useSelectedAccount';
 import useTransactionContext from '@hooks/useTransactionContext';
-import {
-  AnalyticsEvents,
-  btcTransaction,
-  type Transport,
-} from '@secretkeylabs/xverse-core';
+import { AnalyticsEvents, btcTransaction, type Transport } from '@secretkeylabs/xverse-core';
 import { isInOptions, isLedgerAccount } from '@utils/helper';
 import { trackMixPanel } from '@utils/mixpanel';
 import { useEffect, useState } from 'react';
diff --git a/src/app/screens/sendInscriptionsRequest/useSendInscriptions.ts b/src/app/screens/sendInscriptionsRequest/useSendInscriptions.ts
index 21afe69ba..4f049ab8f 100644
--- a/src/app/screens/sendInscriptionsRequest/useSendInscriptions.ts
+++ b/src/app/screens/sendInscriptionsRequest/useSendInscriptions.ts
@@ -5,10 +5,7 @@ import useBtcFeeRate from '@hooks/useBtcFeeRate';
 import useTransactionContext from '@hooks/useTransactionContext';
 import { RpcErrorCode, sendInscriptionsSchema } from '@sats-connect/core';
 import { type TransactionSummary } from '@screens/sendBtc/helpers';
-import {
-  btcTransaction,
-  type Transport,
-} from '@secretkeylabs/xverse-core';
+import { btcTransaction, type Transport } from '@secretkeylabs/xverse-core';
 import { useEffect, useState } from 'react';
 import * as v from 'valibot';
 
diff --git a/src/app/screens/sendOrdinal/index.tsx b/src/app/screens/sendOrdinal/index.tsx
index 57cce0010..56d56a32e 100644
--- a/src/app/screens/sendOrdinal/index.tsx
+++ b/src/app/screens/sendOrdinal/index.tsx
@@ -3,17 +3,21 @@ import useBtcFeeRate from '@hooks/useBtcFeeRate';
 import { useResetUserFlow } from '@hooks/useResetUserFlow';
 import useSelectedAccount from '@hooks/useSelectedAccount';
 import useTransactionContext from '@hooks/useTransactionContext';
+import useWalletSelector from '@hooks/useWalletSelector';
 import type { TransactionSummary } from '@screens/sendBtc/helpers';
 import { AnalyticsEvents, btcTransaction, type Transport } from '@secretkeylabs/xverse-core';
+import { removeAccountAvatarAction } from '@stores/wallet/actions/actionCreators';
 import { isInOptions, isLedgerAccount } from '@utils/helper';
 import { trackMixPanel } from '@utils/mixpanel';
 import RoutePaths from 'app/routes/paths';
 import { useEffect, useState } from 'react';
+import { useDispatch } from 'react-redux';
 import { useLocation, useNavigate, useParams } from 'react-router-dom';
 import StepDisplay from './stepDisplay';
 import { getPreviousStep, Step } from './steps';
 
 function SendOrdinalScreen() {
+  const dispatch = useDispatch();
   const navigate = useNavigate();
   const isInOption = isInOptions();
 
@@ -28,6 +32,8 @@ function SendOrdinalScreen() {
   const context = useTransactionContext();
   const { data: selectedOrdinal } = useAddressInscription(isRareSat ? undefined : id);
   const selectedAccount = useSelectedAccount();
+  const { avatarIds } = useWalletSelector();
+  const currentAvatar = avatarIds[selectedAccount.btcAddress];
   const { data: btcFeeRate, isLoading: feeRatesLoading } = useBtcFeeRate();
   const [currentStep, setCurrentStep] = useState<Step>(Step.SelectRecipient);
   const [feeRate, setFeeRate] = useState('');
@@ -167,6 +173,13 @@ function SendOrdinalScreen() {
           browserTx: isInOption,
         },
       });
+
+      if (
+        currentAvatar?.type === 'inscription' &&
+        currentAvatar.inscription?.id === selectedOrdinal?.id
+      ) {
+        dispatch(removeAccountAvatarAction({ address: selectedAccount.btcAddress }));
+      }
     } catch (e) {
       console.error(e);
       navigate('/tx-status', {
diff --git a/src/app/screens/transferRunesRequest/useTransferRunesRequest.ts b/src/app/screens/transferRunesRequest/useTransferRunesRequest.ts
index 2a2a21468..25e2a5a36 100644
--- a/src/app/screens/transferRunesRequest/useTransferRunesRequest.ts
+++ b/src/app/screens/transferRunesRequest/useTransferRunesRequest.ts
@@ -5,11 +5,7 @@ import useTransactionContext from '@hooks/useTransactionContext';
 import useWalletSelector from '@hooks/useWalletSelector';
 import { RpcErrorCode, type TransferRunesRequest } from '@sats-connect/core';
 import { type TransactionSummary } from '@screens/sendBtc/helpers';
-import {
-  btcTransaction,
-  runesTransaction,
-  type Transport,
-} from '@secretkeylabs/xverse-core';
+import { btcTransaction, runesTransaction, type Transport } from '@secretkeylabs/xverse-core';
 import { useCallback, useEffect, useState } from 'react';
 
 type Args = {
@@ -54,9 +50,7 @@ const useTransferRunes = ({ tabId, messageId, recipients }: Args) => {
       try {
         if (!desiredFeeRate) return;
         setIsLoading(true);
-        const { tx, txSummary } = await generateTransferTxAndSummary(
-          desiredFeeRate,
-        );
+        const { tx, txSummary } = await generateTransferTxAndSummary(desiredFeeRate);
         setFeeRate(desiredFeeRate.toString());
         setTransaction(tx);
         setSummary(txSummary);
diff --git a/src/app/stores/wallet/actions/actionCreators.ts b/src/app/stores/wallet/actions/actionCreators.ts
index 39b62ea90..bcc9a2c29 100644
--- a/src/app/stores/wallet/actions/actionCreators.ts
+++ b/src/app/stores/wallet/actions/actionCreators.ts
@@ -246,3 +246,72 @@ export const updateSavedNamesAction = (
   networkType,
   names,
 });
+
+export function addToStarCollectiblesAction(params: {
+  address: string;
+  id: string;
+  collectionId?: string;
+}): actions.AddToStarCollectibles {
+  return {
+    type: actions.AddToStarCollectiblesKey,
+    ...params,
+  };
+}
+
+export function removeFromStarCollectiblesAction(params: {
+  address: string;
+  id: string;
+}): actions.RemoveFromStarCollectibles {
+  return {
+    type: actions.RemoveFromStarCollectiblesKey,
+    ...params,
+  };
+}
+
+export function addToHideCollectiblesAction(params: {
+  address: string;
+  id: string;
+}): actions.AddToHideCollectibles {
+  return {
+    type: actions.AddToHideCollectiblesKey,
+    ...params,
+  };
+}
+
+export function removeFromHideCollectiblesAction(params: {
+  address: string;
+  id: string;
+}): actions.RemoveFromHideCollectibles {
+  return {
+    type: actions.RemoveFromHideCollectiblesKey,
+    ...params,
+  };
+}
+
+export function removeAllFromHideCollectiblesAction(params: {
+  address: string;
+}): actions.RemoveAllFromHideCollectibles {
+  return {
+    type: actions.RemoveAllFromHideCollectiblesKey,
+    ...params,
+  };
+}
+
+export function setAccountAvatarAction(params: {
+  address: string;
+  avatar: actions.AvatarInfo;
+}): actions.SetAccountAvatar {
+  return {
+    type: actions.SetAccountAvatarKey,
+    ...params,
+  };
+}
+
+export function removeAccountAvatarAction(params: {
+  address: string;
+}): actions.RemoveAccountAvatar {
+  return {
+    type: actions.RemoveAccountAvatarKey,
+    ...params,
+  };
+}
diff --git a/src/app/stores/wallet/actions/types.ts b/src/app/stores/wallet/actions/types.ts
index 9156a3505..280c7b2ae 100644
--- a/src/app/stores/wallet/actions/types.ts
+++ b/src/app/stores/wallet/actions/types.ts
@@ -3,7 +3,9 @@ import type {
   AccountType,
   AppInfo,
   FungibleToken,
+  Inscription,
   NetworkType,
+  NftData,
   SettingsNetwork,
   SupportedCurrency,
 } from '@secretkeylabs/xverse-core';
@@ -35,6 +37,13 @@ export const SetSpamTokenKey = 'SetSpamTokenKey';
 export const SetSpamTokensKey = 'SetSpamTokensKey';
 export const SetShowSpamTokensKey = 'SetShowSpamTokensKey';
 export const UpdateSavedNamesKey = 'UpdateSavedNamesKey';
+export const AddToStarCollectiblesKey = 'AddToStarCollectiblesKey';
+export const RemoveFromStarCollectiblesKey = 'RemoveFromStarCollectiblesKey';
+export const AddToHideCollectiblesKey = 'AddToHideCollectiblesKey';
+export const RemoveFromHideCollectiblesKey = 'RemoveFromHideCollectiblesKey';
+export const RemoveAllFromHideCollectiblesKey = 'RemoveAllFromHideCollectiblesKey';
+export const SetAccountAvatarKey = 'SetAccountAvatarKey';
+export const RemoveAccountAvatarKey = 'RemoveAccountAvatarKey';
 
 export enum WalletSessionPeriods {
   LOW = 15,
@@ -76,6 +85,9 @@ export interface WalletState {
   savedNames: {
     [key in NetworkType]?: { id: number; name?: string }[];
   };
+  hiddenCollectibleIds: Record<string, Record<string, string>>;
+  starredCollectibleIds: Record<string, Array<{ id: string; collectionId: string }>>;
+  avatarIds: Record<string, AvatarInfo | null>;
 }
 
 export interface StoreEncryptedSeed {
@@ -215,6 +227,58 @@ export interface UpdateSavedNames {
   names: { id: number; name?: string }[];
 }
 
+export interface AddToStarCollectibles {
+  type: typeof AddToStarCollectiblesKey;
+  address: string;
+  id: string;
+  collectionId?: string;
+}
+
+export interface RemoveFromStarCollectibles {
+  type: typeof RemoveFromStarCollectiblesKey;
+  address: string;
+  id: string;
+}
+
+export interface AddToHideCollectibles {
+  type: typeof AddToHideCollectiblesKey;
+  address: string;
+  id: string;
+  collectionId?: string;
+}
+
+export interface RemoveFromHideCollectibles {
+  type: typeof RemoveFromHideCollectiblesKey;
+  address: string;
+  id: string;
+}
+
+export interface RemoveAllFromHideCollectibles {
+  type: typeof RemoveAllFromHideCollectiblesKey;
+  address: string;
+}
+
+export interface SetAccountAvatar {
+  type: typeof SetAccountAvatarKey;
+  address: string;
+  avatar: AvatarInfo;
+}
+
+export interface RemoveAccountAvatar {
+  type: typeof RemoveAccountAvatarKey;
+  address: string;
+}
+
+export type AvatarInfo =
+  | {
+      type: 'inscription';
+      inscription: Inscription;
+    }
+  | {
+      type: 'stacks';
+      nft: NftData;
+    };
+
 export type WalletActions =
   | ResetWallet
   | UpdateSoftwareAccounts
@@ -242,4 +306,11 @@ export type WalletActions =
   | SetSpamToken
   | SetSpamTokens
   | SetShowSpamTokens
-  | UpdateSavedNames;
+  | UpdateSavedNames
+  | AddToStarCollectibles
+  | RemoveFromStarCollectibles
+  | AddToHideCollectibles
+  | RemoveFromHideCollectibles
+  | RemoveAllFromHideCollectibles
+  | SetAccountAvatar
+  | RemoveAccountAvatar;
diff --git a/src/app/stores/wallet/reducer.ts b/src/app/stores/wallet/reducer.ts
index f5f744b68..64883909e 100644
--- a/src/app/stores/wallet/reducer.ts
+++ b/src/app/stores/wallet/reducer.ts
@@ -1,17 +1,24 @@
 import { defaultMainnet, initialNetworksList } from '@secretkeylabs/xverse-core';
 import { REHYDRATE } from 'redux-persist';
 import {
+  AddToHideCollectiblesKey,
+  AddToStarCollectiblesKey,
   ChangeFiatCurrencyKey,
   ChangeHasActivatedOrdinalsKey,
-  ChangeHasActivatedRBFKey,
   ChangeHasActivatedRareSatsKey,
+  ChangeHasActivatedRBFKey,
   ChangeNetworkKey,
   ChangeShowBtcReceiveAlertKey,
   ChangeShowDataCollectionAlertKey,
   ChangeShowOrdinalReceiveAlertKey,
   RareSatsNoticeDismissedKey,
+  RemoveAccountAvatarKey,
+  RemoveAllFromHideCollectiblesKey,
+  RemoveFromHideCollectiblesKey,
+  RemoveFromStarCollectiblesKey,
   ResetWalletKey,
   SelectAccountKey,
+  SetAccountAvatarKey,
   SetAccountBalanceKey,
   SetBrc20ManageTokensKey,
   SetFeeMultiplierKey,
@@ -28,8 +35,8 @@ import {
   UpdateLedgerAccountsKey,
   UpdateSavedNamesKey,
   UpdateSoftwareAccountsKey,
-  WalletSessionPeriods,
   type WalletActions,
+  WalletSessionPeriods,
   type WalletState,
 } from './actions/types';
 
@@ -85,6 +92,9 @@ export const initialWalletState: WalletState = {
   spamTokens: [],
   showSpamTokens: false,
   savedNames: {},
+  hiddenCollectibleIds: {},
+  starredCollectibleIds: {},
+  avatarIds: {},
 };
 
 /**
@@ -272,6 +282,87 @@ const walletReducer = (
           [action.networkType]: action.names,
         },
       };
+    case AddToStarCollectiblesKey:
+      return {
+        ...state,
+        starredCollectibleIds: {
+          ...state.starredCollectibleIds,
+          [action.address]: [
+            ...(state.starredCollectibleIds[action.address] ?? []),
+            { id: action.id, collectionId: action.collectionId ?? '' },
+          ],
+        },
+      };
+    case RemoveFromStarCollectiblesKey: {
+      const starredCollectibleIds = state.starredCollectibleIds[action.address] ?? [];
+      const updatedStarCollectibleIds = starredCollectibleIds.filter(
+        (collectible) => collectible.id !== action.id,
+      );
+      return {
+        ...state,
+        starredCollectibleIds: {
+          ...state.starredCollectibleIds,
+          [action.address]: updatedStarCollectibleIds,
+        },
+      };
+    }
+    case AddToHideCollectiblesKey: {
+      const starredCollectibleIds = state.starredCollectibleIds[action.address] ?? [];
+      const updatedStarCollectibleIds = starredCollectibleIds.filter(
+        (collectible) => collectible.id !== action.id && collectible.collectionId !== action.id,
+      );
+      return {
+        ...state,
+        hiddenCollectibleIds: {
+          ...state.hiddenCollectibleIds,
+          [action.address]: {
+            ...state.hiddenCollectibleIds[action.address],
+            [action.id]: action.id ?? '',
+          },
+        },
+        starredCollectibleIds: {
+          ...state.starredCollectibleIds,
+          [action.address]: updatedStarCollectibleIds,
+        },
+      };
+    }
+    case RemoveFromHideCollectiblesKey: {
+      // eslint-disable-next-line @typescript-eslint/naming-convention
+      const { [action.id]: _, ...hiddenCollectibleIds } =
+        state.hiddenCollectibleIds[action.address];
+      return {
+        ...state,
+        hiddenCollectibleIds: {
+          ...state.hiddenCollectibleIds,
+          [action.address]: hiddenCollectibleIds,
+        },
+      };
+    }
+    case RemoveAllFromHideCollectiblesKey:
+      return {
+        ...state,
+        hiddenCollectibleIds: {
+          ...state.hiddenCollectibleIds,
+          [action.address]: {},
+        },
+      };
+    case SetAccountAvatarKey:
+      return {
+        ...state,
+        avatarIds: {
+          ...state.avatarIds,
+          [action.address]: action.avatar,
+        },
+      };
+    case RemoveAccountAvatarKey: {
+      return {
+        ...state,
+        avatarIds: {
+          ...state.avatarIds,
+          [action.address]: null,
+        },
+      };
+    }
     default:
       return state;
   }
diff --git a/src/app/ui-library/snackBar.tsx b/src/app/ui-library/snackBar.tsx
index 18517ecd4..1a200abfa 100644
--- a/src/app/ui-library/snackBar.tsx
+++ b/src/app/ui-library/snackBar.tsx
@@ -3,13 +3,6 @@ import styled from 'styled-components';
 
 type ToastType = 'success' | 'error' | 'neutral';
 
-interface ToastProps {
-  text: string;
-  type: ToastType;
-  dismissToast?: () => void;
-  action?: { text: string; onClick: () => void };
-}
-
 const getBackgroundColor = (type: ToastType, theme: any): string => {
   const colors = {
     success: theme.colors.feedback.success,
@@ -35,7 +28,7 @@ const ToastContainer = styled.div<{ type: ToastType }>`
   border-radius: 12px;
   box-shadow: 0px 7px 16px -4px rgba(25, 25, 48, 0.25);
   min-height: 44px;
-  padding: 12px 20px;
+  padding: ${(props) => props.theme.space.s} ${(props) => props.theme.space.m};
   width: auto;
   max-width: 328px;
   align-items: center;
@@ -43,21 +36,33 @@ const ToastContainer = styled.div<{ type: ToastType }>`
   margin-bottom: 80px;
 `;
 
-const ToastMessage = styled.h1<{ type: ToastType }>`
+const ToastMessage = styled.p<{ type: ToastType; addMarginRight: boolean }>`
   ${({ theme }) => theme.typography.body_medium_m};
   color: ${(props) => getTextColor(props.type, props.theme)};
-  margin-left: ${(props) => props.theme.space.s};
-  margin-right: ${(props) => props.theme.space.l};
 `;
 
-const ToastDismissButton = styled.h1<{ type: ToastType }>`
+const ToastDismissButton = styled.div<{ type: ToastType }>`
+  display: flex;
   ${({ theme }) => theme.typography.body_medium_m};
   color: ${(props) => getTextColor(props.type, props.theme)};
   background: transparent;
   cursor: pointer;
+  margin-right: ${(props) => props.theme.space.s};
+`;
+
+const ToastActionButton = styled(ToastDismissButton)`
+  margin-left: ${(props) => props.theme.space.l};
+  margin-right: 0;
 `;
 
-function SnackBar({ text, type, dismissToast, action }: ToastProps) {
+type Props = {
+  text: string;
+  type: ToastType;
+  dismissToast?: () => void;
+  action?: { text: string; onClick: () => void };
+};
+
+function SnackBar({ text, type, dismissToast, action }: Props) {
   return (
     <ToastContainer type={type}>
       {type !== 'neutral' && dismissToast && (
@@ -67,12 +72,14 @@ function SnackBar({ text, type, dismissToast, action }: ToastProps) {
         </ToastDismissButton>
       )}
 
-      <ToastMessage type={type}>{text}</ToastMessage>
+      <ToastMessage type={type} addMarginRight={Boolean(action)}>
+        {text}
+      </ToastMessage>
 
       {action?.text && (
-        <ToastDismissButton onClick={action?.onClick} type={type}>
+        <ToastActionButton onClick={action?.onClick} type={type}>
           {action?.text}
-        </ToastDismissButton>
+        </ToastActionButton>
       )}
     </ToastContainer>
   );
diff --git a/src/locales/en.json b/src/locales/en.json
index 05300ce24..d5f05bfa8 100644
--- a/src/locales/en.json
+++ b/src/locales/en.json
@@ -17,7 +17,9 @@
     "APPLY": "Apply",
     "IN": "In",
     "TO": "To",
-    "FROM": "From"
+    "FROM": "From",
+    "OPTIONS": "Options",
+    "UNDO": "Undo"
   },
   "UNITS": {
     "SATS_PER_VB": "sats/vB"
@@ -705,8 +707,8 @@
     "VIEW_ADDRESS": "View address",
     "ADD_STACKS_ADDRESS": "Add a Stacks address",
     "NFTS": "NFTs",
-    "RARE_SAT": "Rare Sat",
-    "RARE_SATS": "Rare Sats",
+    "RARE_SAT": "Rare sat",
+    "RARE_SATS": "Rare sats",
     "NEW_FEATURE": "New Feature, Rare Sats",
     "NEW_FEAT_RARE_SATS_DESCRIPTION": "Enable rare sats to display rare, interesting and unique sats in your wallet. You can change this setting at any time.",
     "NEW_FEAT_RARE_SATS_ORDINALS_ENABLE": "Enable rare sats to display rare, interesting and unique sats in your wallet. Note than enabling rare sats will also enable Ordinals. You can change this setting at any time.",
@@ -716,7 +718,9 @@
     "RARE_SATS_NOTICE_DETAIL": "Xverse supports most rare sats, but your sats may have other attributes.",
     "SEE_SUPPORTED": "See supported rarities",
     "FROM_RARE_SAT_BUNDLE": "This inscription belongs to the same bundle as other assets. Transferring it will involve transferring the full bundle.",
-    "HOLDS_RARE_SAT": "This inscription holds a rare sat."
+    "HOLDS_RARE_SAT": "This inscription holds a rare sat.",
+    "HIDDEN_COLLECTIBLES": "Hidden collectibles",
+    "UNHIDE_ALL": "Unhide all"
   },
   "RESTORE_FUND_SCREEN": {
     "TITLE": "Recover assets",
@@ -759,6 +763,12 @@
     "RARE_SATS": "Rare Sats",
     "NFT_DETAIL": "Item detail",
     "WEB_GALLERY": "Open gallery",
+    "STAR_INSCRIPTION": "Item starred",
+    "UNSTAR_INSCRIPTION": "Item un-starred",
+    "HIDE_INSCRIPTION": "Hide",
+    "UNHIDE_INSCRIPTION": "Unhide",
+    "INSCRIPTION_HIDDEN": "Item hidden",
+    "INSCRIPTION_UNHIDDEN": "Item un-hidden",
     "SEND": "Send",
     "SHARE": "Share",
     "OWNED_BY": "Owned by",
@@ -921,6 +931,12 @@
       "ALREADY_EXISTS_ERR": "You already have an account with this name",
       "NAME_RULES": "Your account's name can only include alphabetical and numerical characters.",
       "RESET_NAME": "Reset name"
+    },
+    "NFT_AVATAR": {
+      "SET_ACTION": "Set as avatar",
+      "SET_TOAST": "Item set as avatar",
+      "REMOVE_ACTION": "Remove avatar",
+      "REMOVE_TOAST": "Avatar removed"
     }
   },
   "BUY_SCREEN": {
@@ -1510,10 +1526,17 @@
   },
   "COLLECTIBLE_COLLECTION_SCREEN": {
     "BACK_TO_GALLERY": "Back to gallery",
+    "BACK_TO_HIDDEN_COLLECTIBLES": "Back to hidden collectibles",
     "COLLECTION_FLOOR_PRICE": "Collection floor price",
     "EST_PORTFOLIO_VALUE": "Est. portfolio value",
     "COLLECTION": "Collection",
     "LOAD_MORE": "Load more",
+    "STAR_COLLECTION": "Collection starred",
+    "UNSTAR_COLLECTION": "Collection un-starred",
+    "HIDE_COLLECTION": "Hide collection",
+    "UNHIDE_COLLECTION": "Unhide collection",
+    "COLLECTION_HIDDEN": "Collection hidden",
+    "COLLECTION_UNHIDDEN": "Collection un-hidden",
     "ERRORS": {
       "FAILED_TO_FETCH": "Failed to fetch data"
     }

From a8f59bd10741df2bf1a05b0fa3a459adbafae952 Mon Sep 17 00:00:00 2001
From: GitHub Actions Bot <>
Date: Fri, 27 Sep 2024 07:08:35 +0000
Subject: [PATCH 128/227] release: v0.43.0

---
 package-lock.json | 4 ++--
 package.json      | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 7b539c47e..f59cccbcc 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "xverse-web-extension",
-  "version": "0.42.1",
+  "version": "0.43.0",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "xverse-web-extension",
-      "version": "0.42.1",
+      "version": "0.43.0",
       "dependencies": {
         "@aryzing/superqs": "0.0.6",
         "@ledgerhq/hw-transport-webusb": "^6.27.13",
diff --git a/package.json b/package.json
index aef902432..1f73b42c0 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "xverse-web-extension",
   "description": "A Bitcoin wallet for Web3",
-  "version": "0.42.1",
+  "version": "0.43.0",
   "private": true,
   "engines": {
     "node": "^18.18.2"

From 983fe771372725e1a2f84cee6999fd6f8313b963 Mon Sep 17 00:00:00 2001
From: christos-xverse <christos@secretkeylabs.com>
Date: Fri, 27 Sep 2024 11:32:55 +0300
Subject: [PATCH 129/227] [ENG-5258][ENG-5246] Refactor the BatchSign and
 MessageSign Screens (#604)

* [ENG-5258] Refactor the BatchSign and MessageSign Screens

* Update per PR review comments

* [ENG-5258] Refactor the Message Signing Screen

* Rename run batch sign to add listing

* Fix message signing issues

* Fix batch sign issues

* On batch sign, don't show summary on duplicate inputs

* Remove unused file

* Move string to localisation file

---------

Co-authored-by: Victor Kirov <victor.kirov@gmail.com>
Co-authored-by: Terence Ng <ngtere@live.com.sg>
---
 package-lock.json                             |   2 +-
 package.json                                  |   2 +-
 .../batchPsbtSigning}/index.styled.ts         |   0
 src/app/components/batchPsbtSigning/index.tsx | 324 +++++++++++++
 .../confirmBtcTransaction/indexBatch.tsx      |  41 +-
 .../sections/runesSection/mintSection.tsx     |   4 +-
 .../messageSigning}/index.styled.ts           |   0
 .../messageSigning}/index.tsx                 | 163 +++----
 src/app/hooks/useSignBatchPsbtTx.ts           |  79 ----
 src/app/routes/index.tsx                      |  17 +-
 src/app/screens/listRune/index.tsx            |   2 +-
 .../screens/runeListingBatchSigning/index.tsx |  96 ++++
 .../screens/signBatchPsbtRequest/index.tsx    | 430 ++----------------
 src/app/screens/signMessageRequest/index.tsx  | 319 ++-----------
 .../useSignMessageRequest.ts                  |  31 +-
 .../signRuneDelistingMessage/index.tsx        |  71 +++
 src/app/screens/unlistRuneUtxo/index.tsx      |   2 +-
 src/common/utils/route-urls.ts                |   3 +-
 src/locales/en.json                           |   7 +-
 19 files changed, 657 insertions(+), 936 deletions(-)
 rename src/app/{screens/signBatchPsbtRequest => components/batchPsbtSigning}/index.styled.ts (100%)
 create mode 100644 src/app/components/batchPsbtSigning/index.tsx
 rename src/app/{screens/signMessageRequest => components/messageSigning}/index.styled.ts (100%)
 rename src/app/{screens/signMessageRequestInApp => components/messageSigning}/index.tsx (64%)
 delete mode 100644 src/app/hooks/useSignBatchPsbtTx.ts
 create mode 100644 src/app/screens/runeListingBatchSigning/index.tsx
 create mode 100644 src/app/screens/signRuneDelistingMessage/index.tsx

diff --git a/package-lock.json b/package-lock.json
index f59cccbcc..90a90c20d 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -25,7 +25,7 @@
         "@tanstack/react-query-persist-client": "^4.29.3",
         "argon2-browser": "^1.18.0",
         "async-mutex": "^0.5.0",
-        "axios": "^1.7.7",
+        "axios": "1.7.7",
         "bignumber.js": "^9.1.0",
         "bip39": "^3.0.3",
         "classnames": "^2.3.2",
diff --git a/package.json b/package.json
index 1f73b42c0..4be008cf6 100644
--- a/package.json
+++ b/package.json
@@ -53,7 +53,7 @@
     "@tanstack/react-query-persist-client": "^4.29.3",
     "argon2-browser": "^1.18.0",
     "async-mutex": "^0.5.0",
-    "axios": "^1.7.7",
+    "axios": "1.7.7",
     "bignumber.js": "^9.1.0",
     "bip39": "^3.0.3",
     "classnames": "^2.3.2",
diff --git a/src/app/screens/signBatchPsbtRequest/index.styled.ts b/src/app/components/batchPsbtSigning/index.styled.ts
similarity index 100%
rename from src/app/screens/signBatchPsbtRequest/index.styled.ts
rename to src/app/components/batchPsbtSigning/index.styled.ts
diff --git a/src/app/components/batchPsbtSigning/index.tsx b/src/app/components/batchPsbtSigning/index.tsx
new file mode 100644
index 000000000..f8b651de4
--- /dev/null
+++ b/src/app/components/batchPsbtSigning/index.tsx
@@ -0,0 +1,324 @@
+import AccountHeaderComponent from '@components/accountHeader';
+import { TxSummaryContext } from '@components/confirmBtcTransaction/hooks/useTxSummaryContext';
+import ConfirmBatchBtcTransactions from '@components/confirmBtcTransaction/indexBatch';
+import TransactionSummary from '@components/confirmBtcTransaction/transactionSummary';
+import InfoContainer from '@components/infoContainer';
+import LoadingTransactionStatus from '@components/loadingTransactionStatus';
+import type { ConfirmationStatus } from '@components/loadingTransactionStatus/circularSvgAnimation';
+import useSelectedAccount from '@hooks/useSelectedAccount';
+import useTrackMixPanelPageViewed from '@hooks/useTrackMixPanelPageViewed';
+import useTransactionContext from '@hooks/useTransactionContext';
+import useWalletSelector from '@hooks/useWalletSelector';
+import { ArrowLeft, ArrowRight } from '@phosphor-icons/react';
+import type { SignMultiplePsbtPayload } from '@sats-connect/core';
+import * as btc from '@scure/btc-signer';
+import {
+  AnalyticsEvents,
+  btcTransaction,
+  extractViewSummary,
+  type AggregatedSummary,
+  type UserTransactionSummary,
+} from '@secretkeylabs/xverse-core';
+import Button from '@ui-library/button';
+import Spinner from '@ui-library/spinner';
+import { isLedgerAccount } from '@utils/helper';
+import { trackMixPanel } from '@utils/mixpanel';
+import { useEffect, useMemo, useState } from 'react';
+import { useTranslation } from 'react-i18next';
+import { useNavigate } from 'react-router-dom';
+import {
+  BundleLinkContainer,
+  BundleLinkText,
+  ButtonsContainer,
+  Container,
+  LoaderContainer,
+  ModalContainer,
+  OuterContainer,
+  ReviewTransactionText,
+  StyledSheet,
+  TransparentButtonContainer,
+  TxReviewModalControls,
+} from './index.styled';
+
+type ParsedPsbt = {
+  extractedSummary: UserTransactionSummary | AggregatedSummary;
+  summary: btcTransaction.PsbtSummary;
+};
+
+interface BatchPsbtSigningProps {
+  psbts: SignMultiplePsbtPayload[];
+  onSigned: (signedPsbts: string[]) => void | Promise<void>;
+  onCancel: () => void;
+  allowedSigHash?: btc.SigHash[];
+}
+
+function BatchPsbtSigning({ onSigned, psbts, onCancel, allowedSigHash }: BatchPsbtSigningProps) {
+  const selectedAccount = useSelectedAccount();
+  const { network } = useWalletSelector();
+  const navigate = useNavigate();
+  const { t } = useTranslation('translation', { keyPrefix: 'CONFIRM_TRANSACTION' });
+  const [isSigning, setIsSigning] = useState(false);
+  const [isSigningComplete, setIsSigningComplete] = useState(false);
+  const [signingPsbtIndex, setSigningPsbtIndex] = useState(1);
+  const [currentPsbtIndex, setCurrentPsbtIndex] = useState(0);
+  const [reviewTransaction, setReviewTransaction] = useState(false);
+  const [isLoading, setIsLoading] = useState(true);
+  const txnContext = useTransactionContext();
+  useTrackMixPanelPageViewed();
+  const [parsedPsbts, setParsedPsbts] = useState<ParsedPsbt[]>([]);
+
+  const individualTxSummaryContext = useMemo(
+    () => ({
+      extractedTxSummary: parsedPsbts[currentPsbtIndex]?.extractedSummary,
+    }),
+    [parsedPsbts, currentPsbtIndex],
+  );
+
+  useEffect(() => {
+    const handlePsbtParsing = async (psbt: SignMultiplePsbtPayload): Promise<ParsedPsbt> => {
+      try {
+        const parsedPsbt = new btcTransaction.EnhancedPsbt(txnContext, psbt.psbtBase64);
+        const summary = await parsedPsbt.getSummary();
+        const extractedSummary = await extractViewSummary(txnContext, summary, network.type);
+        return { extractedSummary, summary };
+      } catch (err) {
+        throw new Error('PSBT parsing failed');
+      }
+    };
+
+    (async () => {
+      const parsedPsbtsRes = await Promise.allSettled(psbts.map(handlePsbtParsing));
+      setIsLoading(false);
+
+      const index = parsedPsbtsRes.findIndex((item) => item.status === 'rejected');
+      if (index !== -1) {
+        navigate('/tx-status', {
+          state: {
+            txid: '',
+            currency: 'BTC',
+            errorTitle: t('PSBT_CANT_PARSE_ERROR_TITLE'),
+            error: t('PSBT_INDEX_CANT_PARSE_ERROR_DESCRIPTION', { index }),
+            browserTx: true,
+          },
+        });
+        return;
+      }
+
+      const validParsedPsbts = parsedPsbtsRes.map(
+        (item) => (item.status === 'fulfilled' && item.value) as ParsedPsbt,
+      );
+      setParsedPsbts(validParsedPsbts);
+    })();
+  }, [psbts, txnContext, network, navigate, t]);
+
+  const onSignPsbtConfirmed = async () => {
+    try {
+      if (isLedgerAccount(selectedAccount)) {
+        return;
+      }
+      setIsSigning(true);
+
+      const signedPsbts: string[] = [];
+
+      for (let i = 0; i < psbts.length; i++) {
+        const psbt = psbts[i];
+        const enhancedPsbt = new btcTransaction.EnhancedPsbt(
+          txnContext,
+          psbt.psbtBase64,
+          psbt.inputsToSign,
+        );
+
+        const psbtBase64 = await enhancedPsbt.getSignedPsbtBase64({
+          finalize: false,
+          allowedSigHash,
+        });
+        signedPsbts.push(psbtBase64);
+
+        if (i !== psbts.length - 1) {
+          setSigningPsbtIndex((prevIndex) => prevIndex + 1);
+        }
+      }
+
+      trackMixPanel(AnalyticsEvents.TransactionConfirmed, {
+        protocol: 'bitcoin',
+        action: 'sign-psbt',
+        wallet_type: selectedAccount.accountType || 'software',
+        batch: psbts.length,
+      });
+      setIsSigningComplete(true);
+      setIsSigning(false);
+
+      onSigned(signedPsbts);
+    } catch (err) {
+      setIsSigning(false);
+      setIsSigningComplete(false);
+
+      if (err instanceof Error) {
+        navigate('/tx-status', {
+          state: {
+            txid: '',
+            currency: 'BTC',
+            errorTitle: t('PSBT_CANT_SIGN_ERROR_TITLE'),
+            error: err.message,
+            browserTx: true,
+          },
+        });
+      }
+    }
+  };
+
+  const closeCallback = () => {
+    window.close();
+  };
+
+  const signingStatus: ConfirmationStatus = isSigningComplete ? 'SUCCESS' : 'LOADING';
+
+  if (isSigning || isSigningComplete) {
+    return (
+      <LoadingTransactionStatus
+        status={signingStatus}
+        resultTexts={{
+          title: t('TRANSACTIONS_SIGNED'),
+          description: '',
+        }}
+        loadingTexts={{
+          title: `${t('SIGNING_TRANSACTIONS')} ${signingPsbtIndex}/${psbts.length}...`,
+          description: t('THIS_MAY_TAKE_A_FEW_MINUTES'),
+        }}
+        loadingPercentage={isSigningComplete ? 1 : signingPsbtIndex / psbts.length}
+        primaryAction={{ onPress: closeCallback, text: t('CLOSE') }}
+        withLoadingBgCircle
+      />
+    );
+  }
+
+  const visitedInputs = new Set<string>();
+  const hasDuplicateInputs = parsedPsbts.some((parsedPsbt) => {
+    const inputLocations = parsedPsbt.summary.inputs.map(
+      (input) => input.extendedUtxo.utxo.txid + input.extendedUtxo.utxo.vout,
+    );
+    const hasDuplicate = inputLocations.some((input) => {
+      if (visitedInputs.has(input)) {
+        return true;
+      }
+      visitedInputs.add(input);
+      return false;
+    });
+    return hasDuplicate;
+  });
+
+  const renderBody = () => {
+    if (hasDuplicateInputs) {
+      // if there are duplicate inputs on the individual transactions, we won't show a summary
+      // and will have to ask the user to review each txn individually
+      return null;
+    }
+
+    if (isLoading) {
+      return (
+        <LoaderContainer>
+          <Spinner color="white" size={50} />
+        </LoaderContainer>
+      );
+    }
+
+    const isLedger = isLedgerAccount(selectedAccount);
+
+    return (
+      <>
+        <OuterContainer>
+          <Container>
+            {isLedger ? (
+              <InfoContainer bodyText={t('LEDGER.BATCH_NOT_SUPPORTED')} />
+            ) : (
+              <>
+                <ReviewTransactionText>
+                  {t('SIGN_TRANSACTIONS', { count: parsedPsbts.length })}
+                </ReviewTransactionText>
+                <BundleLinkContainer onClick={() => setReviewTransaction(true)}>
+                  <BundleLinkText>{t('REVIEW_ALL')}</BundleLinkText>
+                  <ArrowRight size={12} weight="bold" />
+                </BundleLinkContainer>
+                <ConfirmBatchBtcTransactions summaries={parsedPsbts} />
+              </>
+            )}
+          </Container>
+        </OuterContainer>
+        <ButtonsContainer>
+          <TransparentButtonContainer>
+            <Button title={t('CANCEL')} variant="secondary" onClick={onCancel} />
+          </TransparentButtonContainer>
+          <Button
+            title={t('CONFIRM_ALL')}
+            onClick={onSignPsbtConfirmed}
+            loading={isSigning}
+            disabled={isLedger}
+          />
+        </ButtonsContainer>
+      </>
+    );
+  };
+
+  const reviewDoneText = hasDuplicateInputs ? t('CONFIRM_ALL') : t('DONE');
+  const onReviewDone = hasDuplicateInputs
+    ? onSignPsbtConfirmed
+    : () => {
+        setReviewTransaction(false);
+        setCurrentPsbtIndex(0);
+      };
+
+  return (
+    <>
+      <AccountHeaderComponent disableMenuOption disableAccountSwitch />
+      {renderBody()}
+      <StyledSheet
+        header=""
+        visible={reviewTransaction || hasDuplicateInputs}
+        onClose={() => {
+          setReviewTransaction(false);
+          setCurrentPsbtIndex(0);
+        }}
+      >
+        <OuterContainer>
+          <ModalContainer>
+            <ReviewTransactionText>
+              {t('TRANSACTION')} {currentPsbtIndex + 1}/{parsedPsbts.length}
+            </ReviewTransactionText>
+            {!!parsedPsbts[currentPsbtIndex] && (
+              <TxSummaryContext.Provider value={individualTxSummaryContext}>
+                <TransactionSummary />
+              </TxSummaryContext.Provider>
+            )}
+          </ModalContainer>
+        </OuterContainer>
+        <TxReviewModalControls>
+          <Button
+            title={t('PREVIOUS')}
+            variant="secondary"
+            onClick={() => {
+              setCurrentPsbtIndex((prevIndex) => prevIndex - 1);
+            }}
+            icon={<ArrowLeft color="white" size={16} weight="bold" />}
+            disabled={currentPsbtIndex === 0}
+          />
+          {currentPsbtIndex < parsedPsbts.length - 1 && (
+            <Button
+              title={t('NEXT')}
+              variant="secondary"
+              onClick={() => {
+                setCurrentPsbtIndex((prevIndex) => prevIndex + 1);
+              }}
+              icon={<ArrowRight color="white" size={16} weight="bold" />}
+              iconPosition="right"
+            />
+          )}
+          {currentPsbtIndex === parsedPsbts.length - 1 && (
+            <Button title={reviewDoneText} onClick={onReviewDone} />
+          )}
+        </TxReviewModalControls>
+      </StyledSheet>
+    </>
+  );
+}
+
+export default BatchPsbtSigning;
diff --git a/src/app/components/confirmBtcTransaction/indexBatch.tsx b/src/app/components/confirmBtcTransaction/indexBatch.tsx
index 979f89e8e..59ae5d412 100644
--- a/src/app/components/confirmBtcTransaction/indexBatch.tsx
+++ b/src/app/components/confirmBtcTransaction/indexBatch.tsx
@@ -25,10 +25,9 @@ type Props = {
     extractedSummary: UserTransactionSummary | AggregatedSummary;
     summary: btcTransaction.PsbtSummary;
   }[];
-  isDuplicateTxs?: boolean;
 };
 
-function ConfirmBatchBtcTransactions({ summaries, isDuplicateTxs }: Props) {
+function ConfirmBatchBtcTransactions({ summaries }: Props) {
   const txnContext = useTransactionContext();
   const { network } = useWalletSelector();
 
@@ -36,31 +35,23 @@ function ConfirmBatchBtcTransactions({ summaries, isDuplicateTxs }: Props) {
     useState<TxSummaryContextProps>();
 
   useEffect(() => {
-    const summariesToAggregate = isDuplicateTxs && summaries.length ? [summaries[0]] : summaries;
     (async () => {
       const summary: btcTransaction.PsbtSummary = {
-        inputs: summariesToAggregate.map((psbt) => psbt.summary.inputs).flat(),
-        outputs: summariesToAggregate.map((psbt) => psbt.summary.outputs).flat(),
+        inputs: summaries.map((psbt) => psbt.summary.inputs).flat(),
+        outputs: summaries.map((psbt) => psbt.summary.outputs).flat(),
         feeOutput: undefined,
-        isFinal: summariesToAggregate.reduce(
-          (acc, curr) => acc && curr.extractedSummary.isFinal,
-          true,
-        ),
-        hasSigHashNone: summariesToAggregate.some((psbt) => psbt.extractedSummary.hasSigHashNone),
-        hasSigHashSingle: summariesToAggregate.some(
-          (psbt) => psbt.extractedSummary.hasSigHashSingle,
-        ),
+        isFinal: summaries.every((curr) => curr.extractedSummary.isFinal),
+        hasSigHashNone: summaries.some((psbt) => psbt.extractedSummary.hasSigHashNone),
+        hasSigHashSingle: summaries.some((psbt) => psbt.extractedSummary.hasSigHashSingle),
       };
       const runeSummary = await parseSummaryForRunes(txnContext, summary, network.type);
       const base: BaseSummary = {
         runes: {
           mint: undefined,
-          burns: summariesToAggregate.map((psbt) => psbt.extractedSummary.runes.burns).flat(),
-          hasCenotaph: summariesToAggregate.some((psbt) => psbt.extractedSummary.runes.hasCenotaph),
-          hasInvalidMint: summariesToAggregate.some(
-            (psbt) => psbt.extractedSummary.runes.hasInvalidMint,
-          ),
-          hasInsufficientBalance: summariesToAggregate.some(
+          burns: summaries.map((psbt) => psbt.extractedSummary.runes.burns).flat(),
+          hasCenotaph: summaries.some((psbt) => psbt.extractedSummary.runes.hasCenotaph),
+          hasInvalidMint: summaries.some((psbt) => psbt.extractedSummary.runes.hasInvalidMint),
+          hasInsufficientBalance: summaries.some(
             (psbt) => psbt.extractedSummary.runes.hasInsufficientBalance,
           ),
         },
@@ -70,13 +61,9 @@ function ConfirmBatchBtcTransactions({ summaries, isDuplicateTxs }: Props) {
         isFinal: summary.isFinal,
         hasSigHashNone: summary.hasSigHashNone,
         hasSigHashSingle: summary.hasSigHashSingle,
-        hasExternalInputs: summariesToAggregate.some(
-          (psbt) => psbt.extractedSummary.hasExternalInputs,
-        ),
-        hasOutputScript: summariesToAggregate.some((psbt) => psbt.extractedSummary.hasOutputScript),
-        hasUnconfirmedInputs: summariesToAggregate.some(
-          (psbt) => psbt.extractedSummary.hasUnconfirmedInputs,
-        ),
+        hasExternalInputs: summaries.some((psbt) => psbt.extractedSummary.hasExternalInputs),
+        hasOutputScript: summaries.some((psbt) => psbt.extractedSummary.hasOutputScript),
+        hasUnconfirmedInputs: summaries.some((psbt) => psbt.extractedSummary.hasUnconfirmedInputs),
       };
 
       setAggregatedParsedTxSummaryContext({
@@ -87,7 +74,7 @@ function ConfirmBatchBtcTransactions({ summaries, isDuplicateTxs }: Props) {
         batchMintDetails: summaries.map((psbt) => psbt.extractedSummary.runes.mint).flat(),
       });
     })();
-  }, [summaries, txnContext, network.type, isDuplicateTxs]);
+  }, [summaries, txnContext, network.type]);
 
   const { t } = useTranslation('translation', { keyPrefix: 'CONFIRM_TRANSACTION' });
 
diff --git a/src/app/components/confirmBtcTransaction/sections/runesSection/mintSection.tsx b/src/app/components/confirmBtcTransaction/sections/runesSection/mintSection.tsx
index 52453382d..4b3c72ad9 100644
--- a/src/app/components/confirmBtcTransaction/sections/runesSection/mintSection.tsx
+++ b/src/app/components/confirmBtcTransaction/sections/runesSection/mintSection.tsx
@@ -25,9 +25,9 @@ function MintSection() {
   const { t } = useTranslation('translation', { keyPrefix: 'CONFIRM_TRANSACTION' });
   const { ordinalsAddress } = useSelectedAccount();
 
-  const { extractedTxSummary, runeMintDetails, batchMintDetails } = useTxSummaryContext();
+  const { extractedTxSummary, runeMintDetails, batchMintDetails = [] } = useTxSummaryContext();
 
-  if (!extractedTxSummary.runes.mint || !runeMintDetails || !batchMintDetails) return null;
+  if (!extractedTxSummary.runes.mint && !runeMintDetails && !batchMintDetails) return null;
 
   const isMintActionDetails = (
     obj: RuneMint | MintActionDetails | undefined,
diff --git a/src/app/screens/signMessageRequest/index.styled.ts b/src/app/components/messageSigning/index.styled.ts
similarity index 100%
rename from src/app/screens/signMessageRequest/index.styled.ts
rename to src/app/components/messageSigning/index.styled.ts
diff --git a/src/app/screens/signMessageRequestInApp/index.tsx b/src/app/components/messageSigning/index.tsx
similarity index 64%
rename from src/app/screens/signMessageRequestInApp/index.tsx
rename to src/app/components/messageSigning/index.tsx
index 57c65cf91..e93eb5935 100644
--- a/src/app/screens/signMessageRequestInApp/index.tsx
+++ b/src/app/components/messageSigning/index.tsx
@@ -4,24 +4,24 @@ import { delay } from '@common/utils/ledger';
 import ConfirmScreen from '@components/confirmScreen';
 import InfoContainer from '@components/infoContainer';
 import LedgerConnectionView from '@components/ledger/connectLedgerView';
-import TopRow from '@components/topRow';
-import useRunesApi from '@hooks/apiClients/useRunesApi';
-import useXverseApi from '@hooks/apiClients/useXverseApi';
 import useSeedVault from '@hooks/useSeedVault';
 import useSelectedAccount from '@hooks/useSelectedAccount';
 import useWalletSelector from '@hooks/useWalletSelector';
 import Transport from '@ledgerhq/hw-transport-webusb';
-import CollapsableContainer from '@screens/signatureRequest/collapsableContainer';
+import CollapsibleContainer from '@screens/signatureRequest/collapsableContainer';
 import SignatureRequestMessage from '@screens/signatureRequest/signatureRequestMessage';
-import { bip0322Hash, MessageSigningProtocols, signMessage } from '@secretkeylabs/xverse-core';
+import {
+  bip0322Hash,
+  MessageSigningProtocols,
+  signMessage,
+  type SignedMessage,
+} from '@secretkeylabs/xverse-core';
 import Button from '@ui-library/button';
 import Sheet from '@ui-library/sheet';
 import { getTruncatedAddress, isHardwareAccount } from '@utils/helper';
 import { handleLedgerMessageSigning } from '@utils/ledger';
-import { useEffect, useState } from 'react';
-import toast from 'react-hot-toast';
+import { useState } from 'react';
 import { useTranslation } from 'react-i18next';
-import { useLocation, useNavigate } from 'react-router-dom';
 import {
   ActionDisclaimer,
   MainContainer,
@@ -33,20 +33,32 @@ import {
   SigningAddressType,
   SigningAddressValue,
   SuccessActionsContainer,
-} from '../signMessageRequest/index.styled';
+} from './index.styled';
+
+interface MessageSigningProps {
+  address: string;
+  message: string;
+  protocol: MessageSigningProtocols;
+  onSigned: (signedMessage: SignedMessage) => Promise<void>;
+  onSignedError?: (error: unknown) => void;
+  onCancel: () => void;
+  header?: React.ReactNode;
+}
 
-function SignMessageRequestInApp() {
+function MessageSigning({
+  address,
+  message,
+  protocol,
+  onSigned,
+  onSignedError,
+  onCancel,
+  header,
+}: MessageSigningProps) {
   const { t } = useTranslation('translation');
   const { accountsList, network } = useWalletSelector();
   const selectedAccount = useSelectedAccount();
-  const location = useLocation();
-  const { payload } = location.state?.requestPayload || {};
-  const navigate = useNavigate();
   const { getSeed } = useSeedVault();
-  const runesApi = useRunesApi();
-  const xverseApi = useXverseApi();
 
-  const [addressType, setAddressType] = useState('');
   const [isSigning, setIsSigning] = useState(false);
 
   // Ledger state
@@ -58,24 +70,6 @@ function SignMessageRequestInApp() {
   const [isTxRejected, setIsTxRejected] = useState(false);
   const [isTxInvalid, setIsTxInvalid] = useState(false);
 
-  useEffect(() => {
-    const checkAddressAvailability = () => {
-      const account = accountsList.filter((acc) => {
-        if (acc.btcAddress === payload.address) {
-          setAddressType(t('SIGNATURE_REQUEST.SIGNING_ADDRESS_SEGWIT'));
-          return true;
-        }
-        if (acc.ordinalsAddress === payload?.address) {
-          setAddressType(t('SIGNATURE_REQUEST.SIGNING_ADDRESS_TAPROOT'));
-          return true;
-        }
-        return false;
-      });
-      return isHardwareAccount(selectedAccount) ? account[0] || selectedAccount : account[0];
-    };
-    checkAddressAvailability();
-  }, [accountsList, payload, selectedAccount, t]);
-
   const getConfirmationError = (type: 'title' | 'subtitle') => {
     if (type === 'title') {
       if (isTxRejected) {
@@ -100,10 +94,6 @@ function SignMessageRequestInApp() {
     return t('SIGNATURE_REQUEST.LEDGER.CONFIRM.ERROR_SUBTITLE');
   };
 
-  const handleCancelClick = () => {
-    navigate(`/coinDashboard/FT?ftKey=${payload.selectedRuneId}&protocol=runes`);
-  };
-
   const handleRetry = async () => {
     setIsTxRejected(false);
     setIsTxInvalid(false);
@@ -112,8 +102,6 @@ function SignMessageRequestInApp() {
     setCurrentStepIndex(0);
   };
 
-  const handleGoBack = () => navigate(-2);
-
   const handleConnectAndConfirm = async () => {
     if (!selectedAccount) {
       return;
@@ -137,37 +125,14 @@ function SignMessageRequestInApp() {
       const signedMessage = await handleLedgerMessageSigning({
         transport,
         addressIndex: selectedAccount.deviceAccountIndex,
-        address: payload.address,
+        address,
         networkType: network.type,
-        message: payload.message,
-        protocol: MessageSigningProtocols.BIP322,
+        message,
+        protocol,
       });
-
-      if (payload.marketplace === 'OKX') {
-        await xverseApi.listings.submitRuneCancelOrder({
-          cancellationsPerMarketplace: [
-            {
-              marketplace: payload.marketplace,
-              orderId: payload.orderIds[0],
-              type: 'withMessage',
-              token: payload.token,
-              signature: signedMessage.signature,
-            },
-          ],
-        });
-      } else {
-        await runesApi.submitCancelRunesSellOrder({
-          orderIds: payload.orderIds,
-          makerPublicKey: selectedAccount?.ordinalsPublicKey!,
-          makerAddress: selectedAccount?.ordinalsAddress!,
-          token: payload.token,
-          signature: signedMessage.signature,
-        });
-      }
-
-      handleGoBack();
-      toast(`${t('SIGNATURE_REQUEST.UNLISTED_SUCCESS')}`);
+      await onSigned(signedMessage);
     } catch (e: any) {
+      onSignedError?.(e);
       if (e.name === 'LockedDeviceError') {
         setCurrentStepIndex(0);
         setIsConnectSuccess(false);
@@ -190,16 +155,15 @@ function SignMessageRequestInApp() {
     const seedPhrase = await getSeed();
     return signMessage({
       accounts: accountsList,
-      message: payload.message,
-      address: payload.address,
+      message,
+      address,
       seedPhrase,
       network: network.type,
-      protocol: MessageSigningProtocols.BIP322,
+      protocol,
     });
   };
 
   const confirmCallback = async () => {
-    if (!payload) return;
     try {
       setIsSigning(true);
       if (isHardwareAccount(selectedAccount)) {
@@ -207,57 +171,40 @@ function SignMessageRequestInApp() {
         return;
       }
       const signedMessage = await confirmSignMessage();
-
-      if (payload.marketplace === 'OKX') {
-        await xverseApi.listings.submitRuneCancelOrder({
-          cancellationsPerMarketplace: [
-            {
-              marketplace: payload.marketplace,
-              orderId: payload.orderIds[0],
-              type: 'withMessage',
-              token: payload.token,
-              signature: signedMessage.signature,
-            },
-          ],
-        });
-      } else {
-        await runesApi.submitCancelRunesSellOrder({
-          orderIds: payload.orderIds,
-          makerPublicKey: selectedAccount?.ordinalsPublicKey!,
-          makerAddress: selectedAccount?.ordinalsAddress!,
-          token: payload.token,
-          signature: signedMessage.signature,
-        });
-      }
-
-      handleGoBack();
-      toast(`${t('SIGNATURE_REQUEST.UNLISTED_SUCCESS')}`);
+      await onSigned(signedMessage);
     } catch (err) {
-      toast(`${t('SIGNATURE_REQUEST.UNLISTED_ERROR')}`);
+      onSignedError?.(err);
     } finally {
       setIsSigning(false);
     }
   };
 
+  const addressType =
+    address === selectedAccount.btcAddress
+      ? t('SIGNATURE_REQUEST.SIGNING_ADDRESS_PAYMENT')
+      : address === selectedAccount.ordinalsAddress
+      ? t('SIGNATURE_REQUEST.SIGNING_ADDRESS_ORDINALS')
+      : undefined;
+
   return (
     <>
       <ConfirmScreen
         onConfirm={confirmCallback}
-        onCancel={handleCancelClick}
+        onCancel={onCancel}
         cancelText={t('SIGNATURE_REQUEST.CANCEL_BUTTON')}
         confirmText={t('SIGNATURE_REQUEST.SIGN_BUTTON')}
         loading={isSigning}
       >
-        <TopRow onClick={handleGoBack} />
+        {header}
         <MainContainer>
           <RequestType>{t('SIGNATURE_REQUEST.TITLE')}</RequestType>
-          <SignatureRequestMessage message={payload.message} />
-          <CollapsableContainer
-            text={bip0322Hash(payload.message)}
+          <SignatureRequestMessage message={message} />
+          <CollapsibleContainer
+            text={bip0322Hash(message)}
             title={t('SIGNATURE_REQUEST.MESSAGE_HASH_HEADER')}
           >
-            <MessageHash>{bip0322Hash(payload.message)}</MessageHash>
-          </CollapsableContainer>
+            <MessageHash>{bip0322Hash(message)}</MessageHash>
+          </CollapsibleContainer>
           <SigningAddressContainer>
             <SigningAddressTitle>
               {t('SIGNATURE_REQUEST.SIGNING_ADDRESS_TITLE')}
@@ -265,7 +212,7 @@ function SignMessageRequestInApp() {
             <SigningAddress>
               {addressType && <SigningAddressType>{addressType}</SigningAddressType>}
               <SigningAddressValue data-testid="signing-address">
-                {getTruncatedAddress(payload.address, 6)}
+                {getTruncatedAddress(address, 6)}
               </SigningAddressValue>
             </SigningAddress>
           </SigningAddressContainer>
@@ -313,7 +260,7 @@ function SignMessageRequestInApp() {
             variant="primary"
           />
           <Button
-            onClick={handleCancelClick}
+            onClick={onCancel}
             title={t('SIGNATURE_REQUEST.LEDGER.CANCEL_BUTTON')}
             variant="secondary"
           />
@@ -323,4 +270,4 @@ function SignMessageRequestInApp() {
   );
 }
 
-export default SignMessageRequestInApp;
+export default MessageSigning;
diff --git a/src/app/hooks/useSignBatchPsbtTx.ts b/src/app/hooks/useSignBatchPsbtTx.ts
deleted file mode 100644
index 084d27530..000000000
--- a/src/app/hooks/useSignBatchPsbtTx.ts
+++ /dev/null
@@ -1,79 +0,0 @@
-import { MESSAGE_SOURCE, SatsConnectMethods } from '@common/types/message-types';
-import useWalletSelector from '@hooks/useWalletSelector';
-import type { SignMultiplePsbtPayload, SignMultipleTransactionOptions } from '@sats-connect/core';
-import { signPsbt, type InputToSign } from '@secretkeylabs/xverse-core';
-import type { RuneItem } from '@utils/runes';
-import { decodeToken } from 'jsontokens';
-import { useMemo } from 'react';
-import { useLocation } from 'react-router-dom';
-import useSeedVault from './useSeedVault';
-
-const useSignBatchPsbtTx = () => {
-  const { accountsList, network } = useWalletSelector();
-  const location = useLocation();
-  const locationState = useMemo(() => location.state || {}, []);
-  const { search } = location;
-  const { getSeed } = useSeedVault();
-  const params = new URLSearchParams(search);
-  const inApp = params.get('signBatchPsbtsInApp') ?? false;
-  const requestToken = params.get('signBatchPsbtRequest') ?? '';
-
-  const request = useMemo(
-    () =>
-      inApp ? locationState : (decodeToken(requestToken) as any as SignMultipleTransactionOptions),
-    [requestToken],
-  );
-  const tabId = params.get('tabId') ?? '0';
-
-  const confirmSignPsbt = async (psbt: SignMultiplePsbtPayload) => {
-    const txId = '';
-    const seedPhrase = await getSeed();
-    const signingResponse = await signPsbt(
-      seedPhrase,
-      accountsList,
-      psbt.inputsToSign || [],
-      psbt.psbtBase64,
-      false,
-      network.type,
-    );
-
-    return {
-      txId,
-      signingResponse,
-    };
-  };
-
-  const cancelSignPsbt = () => {
-    const signingMessage = {
-      source: MESSAGE_SOURCE,
-      method: SatsConnectMethods.signBatchPsbtResponse,
-      payload: { signBatchPsbtRequest: requestToken, signBatchPsbtResponse: 'cancel' },
-    };
-    chrome.tabs.sendMessage(+tabId, signingMessage);
-  };
-
-  const getSigningAddresses = (inputsToSign: InputToSign[]) => {
-    const signingAddresses: Array<string> = [];
-    inputsToSign.forEach((inputToSign) => {
-      inputToSign.signingIndexes.forEach((signingIndex) => {
-        signingAddresses[signingIndex] = inputToSign.address;
-      });
-    });
-    return signingAddresses;
-  };
-
-  return {
-    payload: request.payload,
-    tabId,
-    requestToken,
-    getSigningAddresses,
-    confirmSignPsbt,
-    cancelSignPsbt,
-    selectedRune: locationState.selectedRune,
-    minPriceSats: locationState.minPriceSats,
-    utxos: locationState.utxos as Record<string, RuneItem>,
-    locationState,
-  };
-};
-
-export default useSignBatchPsbtTx;
diff --git a/src/app/routes/index.tsx b/src/app/routes/index.tsx
index cbf6cc238..482cceaa4 100644
--- a/src/app/routes/index.tsx
+++ b/src/app/routes/index.tsx
@@ -47,6 +47,7 @@ import RareSatsBundle from '@screens/rareSatsBundle';
 import RareSatsDetailScreen from '@screens/rareSatsDetail/rareSatsDetail';
 import Receive from '@screens/receive';
 import RestoreWallet from '@screens/restoreWallet';
+import RuneListingBatchSigningScreen from '@screens/runeListingBatchSigning';
 import SendBrc20OneStepScreen from '@screens/sendBrc20OneStep';
 import SendBtcScreen from '@screens/sendBtc';
 import SendInscriptionsRequest from '@screens/sendInscriptionsRequest';
@@ -71,8 +72,8 @@ import BackupWalletScreen from '@screens/settings/security/backupWallet';
 import ChangePasswordScreen from '@screens/settings/security/changePassword';
 import SignBatchPsbtRequest from '@screens/signBatchPsbtRequest';
 import SignMessageRequest from '@screens/signMessageRequest';
-import SignMessageRequestInApp from '@screens/signMessageRequestInApp';
 import SignPsbtRequest from '@screens/signPsbtRequest';
+import SignRuneDelistingMessage from '@screens/signRuneDelistingMessage';
 import SignatureRequest from '@screens/signatureRequest';
 import SpeedUpTransactionScreen from '@screens/speedUpTransaction';
 import Stacking from '@screens/stacking';
@@ -256,13 +257,21 @@ const router = createHashRouter([
         ),
       },
       {
-        path: 'batch-psbt-signing-request',
+        path: RequestsRoutes.SignBatchBtcTx,
         element: (
           <AuthGuard>
             <SignBatchPsbtRequest />
           </AuthGuard>
         ),
       },
+      {
+        path: RequestsRoutes.RuneListingBatchSigning,
+        element: (
+          <AuthGuard>
+            <RuneListingBatchSigningScreen />
+          </AuthGuard>
+        ),
+      },
       {
         path: RequestsRoutes.SendBtcTx,
         element: (
@@ -444,10 +453,10 @@ const router = createHashRouter([
         ),
       },
       {
-        path: RequestsRoutes.SignMessageRequestInApp,
+        path: RequestsRoutes.SignRuneDelistingMessage,
         element: (
           <AuthGuard>
-            <SignMessageRequestInApp />
+            <SignRuneDelistingMessage />
           </AuthGuard>
         ),
       },
diff --git a/src/app/screens/listRune/index.tsx b/src/app/screens/listRune/index.tsx
index 2f94132db..0a5ca07b1 100644
--- a/src/app/screens/listRune/index.tsx
+++ b/src/app/screens/listRune/index.tsx
@@ -291,7 +291,7 @@ export default function ListRuneScreen() {
 
   useEffect(() => {
     if (signPsbtPayload) {
-      navigate(`${RequestsRoutes.SignBatchBtcTx}?signBatchPsbtsInApp=true`, {
+      navigate(RequestsRoutes.RuneListingBatchSigning, {
         state: {
           payload: signPsbtPayload,
           utxos: listItemsMap,
diff --git a/src/app/screens/runeListingBatchSigning/index.tsx b/src/app/screens/runeListingBatchSigning/index.tsx
new file mode 100644
index 000000000..0a347ce8b
--- /dev/null
+++ b/src/app/screens/runeListingBatchSigning/index.tsx
@@ -0,0 +1,96 @@
+import BatchPsbtSigning from '@components/batchPsbtSigning';
+import useXverseApi from '@hooks/apiClients/useXverseApi';
+import useSelectedAccount from '@hooks/useSelectedAccount';
+import type { SignMultiplePsbtPayload } from '@sats-connect/core';
+import * as btc from '@scure/btc-signer';
+import { AnalyticsEvents } from '@secretkeylabs/xverse-core';
+import { trackMixPanel } from '@utils/mixpanel';
+import type { RuneItem } from '@utils/runes';
+import { useLocation, useNavigate } from 'react-router-dom';
+
+type ListingPsbt = SignMultiplePsbtPayload & {
+  marketplaceName: string;
+  batchAuctionId: string;
+};
+
+function RuneListingBatchSigning() {
+  const location = useLocation();
+  const xverseApi = useXverseApi();
+  const selectedAccount = useSelectedAccount();
+  const navigate = useNavigate();
+
+  const { psbts } = location.state.payload as { psbts: ListingPsbt[] };
+
+  const onSigned = async (signedPsbts: string[]) => {
+    trackMixPanel(AnalyticsEvents.ListRuneSigned, {
+      from: location.state.selectedRune.name,
+      to: 'BTC',
+      priceInSatsPerRune: location.state.minPriceSats,
+      marketplaces: location.state.payload.psbts.map((p) => p.marketplaceName),
+      runeTotalAmount: Object.values(location.state.utxos as Record<string, RuneItem>)
+        .map((i) => i.amount)
+        .reduce((a, b) => a + b, 0),
+    });
+
+    const expiresAt = new Date();
+    expiresAt.setDate(expiresAt.getDate() + 10); // 10 days from now
+
+    try {
+      const orders = await xverseApi.listings.submitRuneSellOrder(
+        signedPsbts.map((psbtBase64, idx) => ({
+          psbtBase64,
+          marketplaceName: psbts[idx].marketplaceName,
+          batchAuctionId: psbts[idx].batchAuctionId,
+          ordinalsPublicKey: selectedAccount.ordinalsPublicKey,
+          ordinalsAddress: selectedAccount.ordinalsAddress,
+          btcAddress: selectedAccount.btcAddress,
+          rune: {
+            name: location.state.selectedRune?.assetName ?? '',
+            id: location.state.selectedRune?.principal ?? '',
+          },
+          expiresAt: expiresAt.toISOString(),
+          utxos: Object.entries(location.state.utxos as Record<string, RuneItem>).map(
+            ([runeLocation, utxo]) => ({
+              txid: runeLocation.split(':')[0],
+              index: Number(runeLocation.split(':')[1]),
+              priceSatsPerRune: utxo.priceSats,
+              runeAmount: utxo.amount,
+            }),
+          ),
+        })),
+      );
+
+      navigate('/tx-status', {
+        state: {
+          runeListed: location.state.selectedRune,
+          orders,
+          minPriceSats: location.state.minPriceSats,
+        },
+      });
+    } catch (e) {
+      const error = e instanceof Error ? e.message : '';
+      navigate('/tx-status', {
+        state: {
+          txid: '',
+          error,
+          browserTx: true,
+        },
+      });
+    }
+  };
+
+  const onCancel = () => {
+    navigate('/');
+  };
+
+  return (
+    <BatchPsbtSigning
+      psbts={psbts}
+      onSigned={onSigned}
+      onCancel={onCancel}
+      allowedSigHash={[btc.SigHash.SINGLE_ANYONECANPAY]}
+    />
+  );
+}
+
+export default RuneListingBatchSigning;
diff --git a/src/app/screens/signBatchPsbtRequest/index.tsx b/src/app/screens/signBatchPsbtRequest/index.tsx
index 95c404127..faade2408 100644
--- a/src/app/screens/signBatchPsbtRequest/index.tsx
+++ b/src/app/screens/signBatchPsbtRequest/index.tsx
@@ -1,101 +1,47 @@
 import { MESSAGE_SOURCE, SatsConnectMethods } from '@common/types/message-types';
-import { delay } from '@common/utils/ledger';
-import AccountHeaderComponent from '@components/accountHeader';
-
-import { TxSummaryContext } from '@components/confirmBtcTransaction/hooks/useTxSummaryContext';
-import ConfirmBatchBtcTransactions from '@components/confirmBtcTransaction/indexBatch';
-import TransactionSummary from '@components/confirmBtcTransaction/transactionSummary';
-import InfoContainer from '@components/infoContainer';
-import LoadingTransactionStatus from '@components/loadingTransactionStatus';
-import type { ConfirmationStatus } from '@components/loadingTransactionStatus/circularSvgAnimation';
-import useXverseApi from '@hooks/apiClients/useXverseApi';
-import useSearchParamsState from '@hooks/useSearchParamsState';
+import BatchPsbtSigning from '@components/batchPsbtSigning';
 import useSelectedAccount from '@hooks/useSelectedAccount';
-import useSignBatchPsbtTx from '@hooks/useSignBatchPsbtTx';
-import useTrackMixPanelPageViewed from '@hooks/useTrackMixPanelPageViewed';
-import useTransactionContext from '@hooks/useTransactionContext';
 import useWalletSelector from '@hooks/useWalletSelector';
-import { ArrowLeft, ArrowRight } from '@phosphor-icons/react';
-import type { SignMultiplePsbtPayload } from '@sats-connect/core';
-import { SigHash } from '@scure/btc-signer';
-import {
-  AnalyticsEvents,
-  btcTransaction,
-  extractViewSummary,
-  type AggregatedSummary,
-  type UserTransactionSummary,
-} from '@secretkeylabs/xverse-core';
-import Button from '@ui-library/button';
-import Spinner from '@ui-library/spinner';
-import { isLedgerAccount } from '@utils/helper';
-import { trackMixPanel } from '@utils/mixpanel';
-import type { RuneItem } from '@utils/runes';
-import { useEffect, useMemo, useState } from 'react';
+import type { SignMultipleTransactionOptions } from '@sats-connect/core';
+import { decodeToken } from 'jsontokens';
+import { useEffect } from 'react';
 import { useTranslation } from 'react-i18next';
 import { useLocation, useNavigate } from 'react-router-dom';
-import {
-  BundleLinkContainer,
-  BundleLinkText,
-  ButtonsContainer,
-  Container,
-  LoaderContainer,
-  ModalContainer,
-  OuterContainer,
-  ReviewTransactionText,
-  StyledSheet,
-  TransparentButtonContainer,
-  TxReviewModalControls,
-} from './index.styled';
-
-interface TxResponse {
-  txId: string;
-  psbtBase64: string;
-  marketplaceName?: string;
-  batchAuctionId?: string;
-}
-
-type ParsedPsbt = {
-  extractedSummary: UserTransactionSummary | AggregatedSummary;
-  summary: btcTransaction.PsbtSummary;
-};
 
 function SignBatchPsbtRequest() {
-  const [inApp] = useSearchParamsState('signBatchPsbtsInApp', false);
-  const selectedAccount = useSelectedAccount();
-  const { network } = useWalletSelector();
   const navigate = useNavigate();
+  const selectedAccount = useSelectedAccount();
   const { t } = useTranslation('translation', { keyPrefix: 'CONFIRM_TRANSACTION' });
-  const {
-    payload,
-    utxos,
-    confirmSignPsbt,
-    cancelSignPsbt,
-    requestToken,
-    selectedRune,
-    minPriceSats,
-    locationState,
-  } = useSignBatchPsbtTx();
+  const { network } = useWalletSelector();
   const { search } = useLocation();
   const params = new URLSearchParams(search);
   const tabId = params.get('tabId') ?? '0';
-  const txnContext = useTransactionContext();
-  useTrackMixPanelPageViewed();
-  const xverseApi = useXverseApi();
+  const requestToken = params.get('signBatchPsbtRequest') ?? '';
+  const { payload } = decodeToken(requestToken) as any as SignMultipleTransactionOptions;
+
+  const onSigned = (signedPsbts: string[]) => {
+    const signingMessage = {
+      source: MESSAGE_SOURCE,
+      method: SatsConnectMethods.signBatchPsbtResponse,
+      payload: {
+        signBatchPsbtRequest: requestToken,
+        signBatchPsbtResponse: signedPsbts.map((psbtBase64) => ({ psbtBase64 })),
+      },
+    };
 
-  const [isSigning, setIsSigning] = useState(false);
-  const [isSigningComplete, setIsSigningComplete] = useState(false);
-  const [signingPsbtIndex, setSigningPsbtIndex] = useState(1);
-  const [currentPsbtIndex, setCurrentPsbtIndex] = useState(0);
-  const [reviewTransaction, setReviewTransaction] = useState(false);
-  const [isLoading, setIsLoading] = useState(true);
-  const [parsedPsbts, setParsedPsbts] = useState<ParsedPsbt[]>([]);
+    chrome.tabs.sendMessage(+tabId, signingMessage);
+  };
+
+  const onCancel = () => {
+    const signingMessage = {
+      source: MESSAGE_SOURCE,
+      method: SatsConnectMethods.signBatchPsbtResponse,
+      payload: { signBatchPsbtRequest: requestToken, signBatchPsbtResponse: 'cancel' },
+    };
 
-  const individualTxSummaryContext = useMemo(
-    () => ({
-      extractedTxSummary: parsedPsbts[currentPsbtIndex]?.extractedSummary,
-    }),
-    [parsedPsbts, currentPsbtIndex],
-  );
+    chrome.tabs.sendMessage(+tabId, signingMessage);
+    window.close();
+  };
 
   useEffect(() => {
     if (payload.network.type !== network.type) {
@@ -107,6 +53,7 @@ function SignBatchPsbtRequest() {
           browserTx: true,
         },
       });
+      return;
     }
 
     const checkAddressMismatch = (input) => {
@@ -122,321 +69,16 @@ function SignBatchPsbtRequest() {
             browserTx: true,
           },
         });
+        return true;
       }
+      return false;
     };
 
-    payload.psbts?.forEach((psbt) => psbt.inputsToSign?.forEach(checkAddressMismatch));
+    payload.psbts?.some((psbt) => psbt.inputsToSign?.some(checkAddressMismatch));
+    // eslint-disable-next-line react-hooks/exhaustive-deps -- Only run this once on load
   }, []);
 
-  useEffect(() => {
-    const handlePsbtParsing = async (psbt: SignMultiplePsbtPayload): Promise<ParsedPsbt> => {
-      try {
-        const parsedPsbt = new btcTransaction.EnhancedPsbt(txnContext, psbt.psbtBase64);
-        const summary = await parsedPsbt.getSummary();
-        const extractedSummary = await extractViewSummary(txnContext, summary, network.type);
-        return { extractedSummary, summary };
-      } catch (err) {
-        throw new Error('PSBT parsing failed');
-      }
-    };
-
-    (async () => {
-      const parsedPsbtsRes = await Promise.allSettled(payload.psbts.map(handlePsbtParsing));
-      setIsLoading(false);
-
-      const index = parsedPsbtsRes.findIndex((item) => item.status === 'rejected');
-      if (index !== -1) {
-        navigate('/tx-status', {
-          state: {
-            txid: '',
-            currency: 'BTC',
-            errorTitle: t('PSBT_CANT_PARSE_ERROR_TITLE'),
-            error: t('PSBT_INDEX_CANT_PARSE_ERROR_DESCRIPTION', { index }),
-            browserTx: true,
-          },
-        });
-        return;
-      }
-
-      const validParsedPsbts = parsedPsbtsRes.map(
-        (item) => (item.status === 'fulfilled' && item.value) as ParsedPsbt,
-      );
-      setParsedPsbts(validParsedPsbts);
-    })();
-  }, [payload.psbts, txnContext, network, navigate, t]);
-
-  const onSignPsbtConfirmed = async () => {
-    try {
-      if (isLedgerAccount(selectedAccount)) {
-        // setIsModalVisible(true);
-        return;
-      }
-      setIsSigning(true);
-
-      const signedPsbts: TxResponse[] = [];
-      // eslint-disable-next-line no-restricted-syntax
-      for (const psbt of payload.psbts) {
-        // eslint-disable-next-line no-await-in-loop
-        await delay(100);
-        // eslint-disable-next-line no-await-in-loop
-        const enhancedPsbt = new btcTransaction.EnhancedPsbt(txnContext, psbt.psbtBase64);
-
-        let txId: string;
-        let psbtBase64: string;
-        if (inApp) {
-          txId = '';
-          psbtBase64 = await enhancedPsbt.getSignedPsbtBase64({
-            finalize: false,
-            ledgerTransport: undefined,
-            allowedSigHash:
-              psbt.marketplaceName === 'Magic Eden' ? [SigHash.SINGLE_ANYONECANPAY] : undefined,
-          });
-        } else {
-          const signedPsbt = await confirmSignPsbt(psbt);
-
-          txId = signedPsbt.txId;
-          psbtBase64 = signedPsbt.signingResponse;
-        }
-
-        signedPsbts.push({
-          txId,
-          psbtBase64,
-          marketplaceName: psbt.marketplaceName,
-          batchAuctionId: psbt.batchAuctionId,
-        });
-        if (payload.psbts.findIndex((item) => item === psbt) !== payload.psbts.length - 1) {
-          setSigningPsbtIndex((prevIndex) => prevIndex + 1);
-        }
-      }
-      trackMixPanel(AnalyticsEvents.TransactionConfirmed, {
-        protocol: 'bitcoin',
-        action: 'sign-psbt',
-        wallet_type: selectedAccount.accountType || 'software',
-        batch: payload.psbts.length,
-      });
-      setIsSigningComplete(true);
-      setIsSigning(false);
-
-      if (inApp) {
-        trackMixPanel(AnalyticsEvents.ListRuneSigned, {
-          from: locationState.selectedRune.name,
-          to: 'BTC',
-          priceInSatsPerRune: locationState.minPriceSats,
-          marketplaces: locationState.payload.psbts.map((p) => p.marketplaceName),
-          runeTotalAmount: Object.values(locationState.utxos as Record<string, RuneItem>)
-            .map((i) => i.amount)
-            .reduce((a, b) => a + b, 0),
-        });
-
-        const expiresAt = new Date();
-        expiresAt.setDate(expiresAt.getDate() + 10); // 10 days from now
-
-        await xverseApi.listings
-          .submitRuneSellOrder(
-            signedPsbts.map((psbt) => ({
-              psbtBase64: psbt.psbtBase64,
-              marketplaceName: psbt.marketplaceName as string,
-              batchAuctionId: psbt.batchAuctionId,
-              ordinalsPublicKey: selectedAccount.ordinalsPublicKey,
-              ordinalsAddress: selectedAccount.ordinalsAddress,
-              btcAddress: selectedAccount.btcAddress,
-              rune: {
-                name: selectedRune?.assetName ?? '',
-                id: selectedRune?.principal ?? '',
-              },
-              expiresAt: expiresAt.toISOString(),
-              utxos: Object.entries(utxos).map(([location, utxo]) => ({
-                txid: location.split(':')[0],
-                index: Number(location.split(':')[1]),
-                priceSatsPerRune: utxo.priceSats,
-                runeAmount: utxo.amount,
-              })),
-            })),
-          )
-          .then((res) => {
-            if (res) {
-              navigate('/tx-status', {
-                state: {
-                  runeListed: selectedRune,
-                  orders: res,
-                  minPriceSats,
-                },
-              });
-            }
-          })
-          .catch((_) => {
-            navigate('/tx-status', {
-              state: {
-                txid: '',
-                error: '',
-                browserTx: true,
-              },
-            });
-          });
-      }
-      const signingMessage = {
-        source: MESSAGE_SOURCE,
-        method: SatsConnectMethods.signBatchPsbtResponse,
-        payload: {
-          signBatchPsbtRequest: requestToken,
-          signBatchPsbtResponse: signedPsbts,
-        },
-      };
-
-      chrome.tabs.sendMessage(+tabId, signingMessage);
-    } catch (err) {
-      setIsSigning(false);
-      setIsSigningComplete(false);
-
-      if (err instanceof Error) {
-        navigate('/tx-status', {
-          state: {
-            txid: '',
-            currency: 'BTC',
-            errorTitle: t('PSBT_CANT_SIGN_ERROR_TITLE'),
-            error: err.message,
-            browserTx: true,
-          },
-        });
-      }
-    }
-  };
-
-  const onCancelClick = async () => {
-    cancelSignPsbt();
-    window.close();
-  };
-
-  const closeCallback = () => {
-    window.close();
-  };
-
-  const signingStatus: ConfirmationStatus = isSigningComplete ? 'SUCCESS' : 'LOADING';
-
-  if (isSigning || isSigningComplete) {
-    return (
-      <LoadingTransactionStatus
-        status={signingStatus}
-        resultTexts={{
-          title: t('TRANSACTIONS_SIGNED'),
-          description: '',
-        }}
-        loadingTexts={{
-          title: `${t('SIGNING_TRANSACTIONS')} ${signingPsbtIndex}/${payload.psbts.length}...`,
-          description: t('THIS_MAY_TAKE_A_FEW_MINUTES'),
-        }}
-        loadingPercentage={isSigningComplete ? 1 : signingPsbtIndex / payload.psbts.length}
-        primaryAction={{ onPress: closeCallback, text: t('CLOSE') }}
-        withLoadingBgCircle
-      />
-    );
-  }
-
-  const renderBody = () => {
-    if (isLoading) {
-      return (
-        <LoaderContainer>
-          <Spinner color="white" size={50} />
-        </LoaderContainer>
-      );
-    }
-
-    const isLedger = isLedgerAccount(selectedAccount);
-
-    return (
-      <>
-        <OuterContainer>
-          <Container>
-            {isLedger ? (
-              <InfoContainer bodyText="External transaction requests are not yet supported on a Ledger account. Switch to a different account to sign transactions from the application." />
-            ) : (
-              <>
-                <ReviewTransactionText>
-                  {t('SIGN_TRANSACTIONS', { count: parsedPsbts.length })}
-                </ReviewTransactionText>
-                <BundleLinkContainer onClick={() => setReviewTransaction(true)}>
-                  <BundleLinkText>{t('REVIEW_ALL')}</BundleLinkText>
-                  <ArrowRight size={12} weight="bold" />
-                </BundleLinkContainer>
-                <ConfirmBatchBtcTransactions summaries={parsedPsbts} isDuplicateTxs={inApp} />
-              </>
-            )}
-          </Container>
-        </OuterContainer>
-        <ButtonsContainer>
-          <TransparentButtonContainer>
-            <Button title={t('CANCEL')} variant="secondary" onClick={onCancelClick} />
-          </TransparentButtonContainer>
-          <Button
-            title={t('CONFIRM_ALL')}
-            onClick={onSignPsbtConfirmed}
-            loading={isSigning}
-            disabled={isLedger}
-          />
-        </ButtonsContainer>
-      </>
-    );
-  };
-
-  return (
-    <>
-      <AccountHeaderComponent disableMenuOption disableAccountSwitch />
-      {renderBody()}
-      <StyledSheet
-        header=""
-        visible={reviewTransaction}
-        onClose={() => {
-          setReviewTransaction(false);
-          setCurrentPsbtIndex(0);
-        }}
-      >
-        <OuterContainer>
-          <ModalContainer>
-            <ReviewTransactionText>
-              {t('TRANSACTION')} {currentPsbtIndex + 1}/{parsedPsbts.length}
-            </ReviewTransactionText>
-            {!!parsedPsbts[currentPsbtIndex] && (
-              <TxSummaryContext.Provider value={individualTxSummaryContext}>
-                <TransactionSummary />
-              </TxSummaryContext.Provider>
-            )}
-          </ModalContainer>
-        </OuterContainer>
-        <TxReviewModalControls>
-          {currentPsbtIndex > 0 && (
-            <Button
-              title={t('PREVIOUS')}
-              variant="secondary"
-              onClick={() => {
-                setCurrentPsbtIndex((prevIndex) => prevIndex - 1);
-              }}
-              icon={<ArrowLeft color="white" size={16} weight="bold" />}
-            />
-          )}
-          {currentPsbtIndex < parsedPsbts.length - 1 && (
-            <Button
-              title={t('NEXT')}
-              variant="secondary"
-              onClick={() => {
-                setCurrentPsbtIndex((prevIndex) => prevIndex + 1);
-              }}
-              icon={<ArrowRight color="white" size={16} weight="bold" />}
-              iconPosition="right"
-            />
-          )}
-          {currentPsbtIndex === parsedPsbts.length - 1 && (
-            <Button
-              title={t('DONE')}
-              onClick={() => {
-                setReviewTransaction(false);
-                setCurrentPsbtIndex(0);
-              }}
-            />
-          )}
-        </TxReviewModalControls>
-      </StyledSheet>
-    </>
-  );
+  return <BatchPsbtSigning psbts={payload.psbts} onSigned={onSigned} onCancel={onCancel} />;
 }
 
 export default SignBatchPsbtRequest;
diff --git a/src/app/screens/signMessageRequest/index.tsx b/src/app/screens/signMessageRequest/index.tsx
index a49448c37..a94d84715 100644
--- a/src/app/screens/signMessageRequest/index.tsx
+++ b/src/app/screens/signMessageRequest/index.tsx
@@ -1,145 +1,42 @@
-import ledgerConnectDefaultIcon from '@assets/img/ledger/ledger_connect_default.svg';
-import ledgerConnectBtcIcon from '@assets/img/ledger/ledger_import_connect_btc.svg';
 import { MESSAGE_SOURCE, SatsConnectMethods } from '@common/types/message-types';
-import { delay } from '@common/utils/ledger';
 import { sendSignMessageSuccessResponseMessage } from '@common/utils/rpc/responseMessages/bitcoin';
 import { sendUserRejectionMessage } from '@common/utils/rpc/responseMessages/errors';
 import AccountHeaderComponent from '@components/accountHeader';
-import BottomModal from '@components/bottomModal';
-import ConfirmScreen from '@components/confirmScreen';
-import InfoContainer from '@components/infoContainer';
-import LedgerConnectionView from '@components/ledger/connectLedgerView';
+import MessageSigning from '@components/messageSigning';
 import RequestError from '@components/requests/requestError';
-import useSelectedAccount from '@hooks/useSelectedAccount';
-import useWalletSelector from '@hooks/useWalletSelector';
-import Transport from '@ledgerhq/hw-transport-webusb';
 import { MessageSigningProtocols, type Return } from '@sats-connect/core';
-import CollapsableContainer from '@screens/signatureRequest/collapsableContainer';
-import SignatureRequestMessage from '@screens/signatureRequest/signatureRequestMessage';
 import { finalizeMessageSignature } from '@screens/signatureRequest/utils';
 import { bip0322Hash, legacyHash } from '@secretkeylabs/xverse-core';
-import Button from '@ui-library/button';
-import { getTruncatedAddress, isHardwareAccount } from '@utils/helper';
-import { handleLedgerMessageSigning } from '@utils/ledger';
-import { useEffect, useState } from 'react';
-import { useTranslation } from 'react-i18next';
-import {
-  ActionDisclaimer,
-  MainContainer,
-  MessageHash,
-  RequestType,
-  SigningAddress,
-  SigningAddressContainer,
-  SigningAddressTitle,
-  SigningAddressType,
-  SigningAddressValue,
-  SuccessActionsContainer,
-} from './index.styled';
-import { useSignMessageRequest, useSignMessageValidation } from './useSignMessageRequest';
+import { useSignMessageRequestParams, useSignMessageValidation } from './useSignMessageRequest';
 
 function SignMessageRequest() {
-  const { t } = useTranslation('translation');
-  const selectedAccount = useSelectedAccount();
-  const { accountsList, network } = useWalletSelector();
-  const { payload, tabId, requestToken, confirmSignMessage, requestId } = useSignMessageRequest();
+  const { payload, tabId, requestToken, requestId } = useSignMessageRequestParams();
   const { validationError, setValidationError } = useSignMessageValidation(payload);
 
-  const [addressType, setAddressType] = useState('');
-  const [isSigning, setIsSigning] = useState(false);
-
-  // Ledger state
-  const [isModalVisible, setIsModalVisible] = useState(false);
-  const [isConnectSuccess, setIsConnectSuccess] = useState(false);
-  const [isConnectFailed, setIsConnectFailed] = useState(false);
-  const [isButtonDisabled, setIsButtonDisabled] = useState(false);
-  const [currentStepIndex, setCurrentStepIndex] = useState(0);
-  const [isTxApproved, setIsTxApproved] = useState(false);
-  const [isTxRejected, setIsTxRejected] = useState(false);
-  const [isTxInvalid, setIsTxInvalid] = useState(false);
-
-  useEffect(() => {
-    const checkAddressAvailability = () => {
-      const account = accountsList.filter((acc) => {
-        if (acc.btcAddress === payload.address) {
-          setAddressType(t('SIGNATURE_REQUEST.SIGNING_ADDRESS_SEGWIT'));
-          return true;
-        }
-        if (acc.ordinalsAddress === payload?.address) {
-          setAddressType(t('SIGNATURE_REQUEST.SIGNING_ADDRESS_TAPROOT'));
-          return true;
-        }
-        return false;
+  const cancelCallback = () => {
+    if (requestToken) {
+      finalizeMessageSignature({ requestPayload: requestToken, tabId: +tabId, data: 'cancel' });
+    } else {
+      sendUserRejectionMessage({
+        tabId: +tabId,
+        messageId: requestId,
       });
-      return isHardwareAccount(selectedAccount) ? account[0] || selectedAccount : account[0];
-    };
-    checkAddressAvailability();
-  }, [payload]);
-
-  const getConfirmationError = (type: 'title' | 'subtitle') => {
-    if (type === 'title') {
-      if (isTxRejected) {
-        return t('SIGNATURE_REQUEST.LEDGER.CONFIRM.DENIED.ERROR_TITLE');
-      }
-
-      if (isTxInvalid) {
-        return t('SIGNATURE_REQUEST.LEDGER.CONFIRM.INVALID.ERROR_TITLE');
-      }
-
-      return t('SIGNATURE_REQUEST.LEDGER.CONFIRM.ERROR_TITLE');
-    }
-
-    if (isTxRejected) {
-      return t('SIGNATURE_REQUEST.LEDGER.CONFIRM.DENIED.ERROR_SUBTITLE');
     }
-
-    if (isTxInvalid) {
-      return t('SIGNATURE_REQUEST.LEDGER.CONFIRM.INVALID.ERROR_SUBTITLE');
-    }
-
-    return t('SIGNATURE_REQUEST.LEDGER.CONFIRM.ERROR_SUBTITLE');
+    window.close();
   };
 
-  const handleConnectAndConfirm = async () => {
-    if (!selectedAccount) {
-      console.error('No account selected');
-      return;
-    }
-    setIsButtonDisabled(true);
-
-    const transport = await Transport.create();
-
-    if (!transport) {
-      setIsConnectSuccess(false);
-      setIsConnectFailed(true);
-      setIsButtonDisabled(false);
-      return;
-    }
-
-    setIsConnectSuccess(true);
-    await delay(1500);
-    setCurrentStepIndex(1);
-
-    try {
-      const signedMessage = await handleLedgerMessageSigning({
-        transport,
-        addressIndex: selectedAccount.deviceAccountIndex,
-        address: payload.address,
-        networkType: network.type,
-        message: payload.message,
-        protocol: payload.protocol,
-      });
-      if (requestToken) {
-        const signingMessage = {
-          source: MESSAGE_SOURCE,
-          method: SatsConnectMethods.signMessageResponse,
-          payload: {
-            signMessageRequest: requestToken,
-            signMessageResponse: signedMessage.signature,
-          },
-        };
-        chrome.tabs.sendMessage(+tabId, signingMessage);
-        window.close();
-      }
+  const onSigned = async (signedMessage) => {
+    if (requestToken) {
+      const signingMessage = {
+        source: MESSAGE_SOURCE,
+        method: SatsConnectMethods.signMessageResponse,
+        payload: {
+          signMessageRequest: requestToken,
+          signMessageResponse: signedMessage.signature,
+        },
+      };
+      chrome.tabs.sendMessage(+tabId, signingMessage);
+    } else {
       const signMessageResult: Return<'signMessage'> = {
         address: payload.address,
         messageHash:
@@ -147,96 +44,19 @@ function SignMessageRequest() {
             ? bip0322Hash(payload.message)
             : legacyHash(payload.message).toString('base64'),
         signature: signedMessage.signature,
-        protocol: signedMessage.protocol as MessageSigningProtocols,
+        protocol: signedMessage.protocol,
       };
-
       sendSignMessageSuccessResponseMessage({
         tabId: +tabId,
         messageId: requestId,
         result: signMessageResult,
       });
-      window.close();
-    } catch (e: any) {
-      setValidationError({ error: e.message });
-      if (e.name === 'LockedDeviceError') {
-        setCurrentStepIndex(0);
-        setIsConnectSuccess(false);
-        setIsConnectFailed(true);
-      } else if (e.statusCode === 28160) {
-        setIsConnectSuccess(false);
-        setIsConnectFailed(true);
-      } else if (e.cause === 27012) {
-        setIsTxInvalid(true);
-      } else {
-        setIsTxRejected(true);
-      }
-    } finally {
-      await transport.close();
-      setIsButtonDisabled(false);
-    }
-  };
-
-  const cancelCallback = () => {
-    if (requestToken) {
-      finalizeMessageSignature({ requestPayload: requestToken, tabId: +tabId, data: 'cancel' });
-    } else {
-      sendUserRejectionMessage({
-        tabId: +tabId,
-        messageId: requestId,
-      });
     }
     window.close();
   };
 
-  const confirmCallback = async () => {
-    if (!payload) return;
-    try {
-      setIsSigning(true);
-      if (isHardwareAccount(selectedAccount)) {
-        setIsModalVisible(true);
-        return;
-      }
-      const signedMessage = await confirmSignMessage();
-      if (requestToken) {
-        const signingMessage = {
-          source: MESSAGE_SOURCE,
-          method: SatsConnectMethods.signMessageResponse,
-          payload: {
-            signMessageRequest: requestToken,
-            signMessageResponse: signedMessage.signature,
-          },
-        };
-        chrome.tabs.sendMessage(+tabId, signingMessage);
-      } else {
-        const signMessageResult: Return<'signMessage'> = {
-          address: payload.address,
-          messageHash:
-            payload.protocol === MessageSigningProtocols.BIP322
-              ? bip0322Hash(payload.message)
-              : legacyHash(payload.message).toString('base64'),
-          signature: signedMessage.signature,
-          protocol: signedMessage.protocol,
-        };
-        sendSignMessageSuccessResponseMessage({
-          tabId: +tabId,
-          messageId: requestId,
-          result: signMessageResult,
-        });
-      }
-      window.close();
-    } catch (err) {
-      setValidationError({ error: (err as any).message });
-    } finally {
-      setIsSigning(false);
-    }
-  };
-
-  const handleRetry = async () => {
-    setIsTxRejected(false);
-    setIsTxInvalid(false);
-    setIsConnectFailed(false);
-    setIsConnectSuccess(false);
-    setCurrentStepIndex(0);
+  const onSignedError = (err) => {
+    setValidationError({ error: (err as any).message });
   };
 
   if (validationError) {
@@ -244,84 +64,15 @@ function SignMessageRequest() {
   }
 
   return (
-    <>
-      <ConfirmScreen
-        onConfirm={confirmCallback}
-        onCancel={cancelCallback}
-        cancelText={t('SIGNATURE_REQUEST.CANCEL_BUTTON')}
-        confirmText={t('SIGNATURE_REQUEST.SIGN_BUTTON')}
-        loading={isSigning}
-      >
-        <AccountHeaderComponent disableMenuOption disableAccountSwitch />
-        <MainContainer>
-          <RequestType>{t('SIGNATURE_REQUEST.TITLE')}</RequestType>
-          <SignatureRequestMessage message={payload.message} />
-          <CollapsableContainer
-            text={bip0322Hash(payload.message)}
-            title={t('SIGNATURE_REQUEST.MESSAGE_HASH_HEADER')}
-          >
-            <MessageHash>{bip0322Hash(payload.message)}</MessageHash>
-          </CollapsableContainer>
-          <SigningAddressContainer>
-            <SigningAddressTitle>
-              {t('SIGNATURE_REQUEST.SIGNING_ADDRESS_TITLE')}
-            </SigningAddressTitle>
-            <SigningAddress>
-              {addressType && <SigningAddressType>{addressType}</SigningAddressType>}
-              <SigningAddressValue>{getTruncatedAddress(payload.address, 6)}</SigningAddressValue>
-            </SigningAddress>
-          </SigningAddressContainer>
-          <ActionDisclaimer>{t('SIGNATURE_REQUEST.ACTION_DISCLAIMER')}</ActionDisclaimer>
-          <InfoContainer bodyText={t('SIGNATURE_REQUEST.SIGNING_WARNING')} type="Info" />
-        </MainContainer>
-      </ConfirmScreen>
-      <BottomModal header="" visible={isModalVisible} onClose={() => setIsModalVisible(false)}>
-        {currentStepIndex === 0 && (
-          <LedgerConnectionView
-            title={t('SIGNATURE_REQUEST.LEDGER.CONNECT.TITLE')}
-            text={t('SIGNATURE_REQUEST.LEDGER.CONNECT.SUBTITLE', {
-              name: 'Bitcoin',
-            })}
-            titleFailed={t('SIGNATURE_REQUEST.LEDGER.CONNECT.ERROR_TITLE')}
-            textFailed={t('SIGNATURE_REQUEST.LEDGER.CONNECT.ERROR_SUBTITLE')}
-            imageDefault={ledgerConnectBtcIcon}
-            isConnectSuccess={isConnectSuccess}
-            isConnectFailed={isConnectFailed}
-          />
-        )}
-        {currentStepIndex === 1 && (
-          <LedgerConnectionView
-            title={t('SIGNATURE_REQUEST.LEDGER.CONFIRM.TITLE')}
-            text={t('SIGNATURE_REQUEST.LEDGER.CONFIRM.SUBTITLE')}
-            titleFailed={getConfirmationError('title')}
-            textFailed={getConfirmationError('subtitle')}
-            imageDefault={ledgerConnectDefaultIcon}
-            isConnectSuccess={isTxApproved}
-            isConnectFailed={isTxRejected || isTxInvalid || isConnectFailed}
-          />
-        )}
-        <SuccessActionsContainer>
-          <Button
-            onClick={
-              isTxRejected || isTxInvalid || isConnectFailed ? handleRetry : handleConnectAndConfirm
-            }
-            title={t(
-              isTxRejected || isTxInvalid || isConnectFailed
-                ? 'SIGNATURE_REQUEST.LEDGER.RETRY_BUTTON'
-                : 'SIGNATURE_REQUEST.LEDGER.CONNECT_BUTTON',
-            )}
-            disabled={isButtonDisabled}
-            loading={isButtonDisabled}
-            variant="primary"
-          />
-          <Button
-            onClick={cancelCallback}
-            title={t('SIGNATURE_REQUEST.LEDGER.CANCEL_BUTTON')}
-            variant="secondary"
-          />
-        </SuccessActionsContainer>
-      </BottomModal>
-    </>
+    <MessageSigning
+      address={payload.address}
+      message={payload.message}
+      protocol={payload.protocol as MessageSigningProtocols}
+      onSigned={onSigned}
+      onSignedError={onSignedError}
+      onCancel={cancelCallback}
+      header={<AccountHeaderComponent disableMenuOption disableAccountSwitch />}
+    />
   );
 }
 
diff --git a/src/app/screens/signMessageRequest/useSignMessageRequest.ts b/src/app/screens/signMessageRequest/useSignMessageRequest.ts
index 548a86cb0..6bbfec52e 100644
--- a/src/app/screens/signMessageRequest/useSignMessageRequest.ts
+++ b/src/app/screens/signMessageRequest/useSignMessageRequest.ts
@@ -1,4 +1,3 @@
-import useSeedVault from '@hooks/useSeedVault';
 import useSelectedAccount from '@hooks/useSelectedAccount';
 import useWalletReducer from '@hooks/useWalletReducer';
 import useWalletSelector from '@hooks/useWalletSelector';
@@ -8,7 +7,6 @@ import {
   type SignMessageOptions,
   type SignMessagePayload,
 } from '@sats-connect/core';
-import { signMessage } from '@secretkeylabs/xverse-core';
 import { isHardwareAccount } from '@utils/helper';
 import { decodeToken } from 'jsontokens';
 import { useEffect, useMemo, useState } from 'react';
@@ -16,7 +14,7 @@ import { useTranslation } from 'react-i18next';
 import { useLocation } from 'react-router-dom';
 import SuperJSON from 'superjson';
 
-const useSignMessageRequestParams = () => {
+export const useSignMessageRequestParams = () => {
   const { search } = useLocation();
   const { network } = useWalletSelector();
   const params = useMemo(() => new URLSearchParams(search), [search]);
@@ -108,30 +106,3 @@ export const useSignMessageValidation = (requestPayload: SignMessagePayload | un
 
   return { validationError, validateSignMessage, setValidationError };
 };
-
-export const useSignMessageRequest = () => {
-  const { network, accountsList } = useWalletSelector();
-  const { getSeed } = useSeedVault();
-  const { payload, requestToken, tabId, requestId } = useSignMessageRequestParams();
-
-  const confirmSignMessage = async () => {
-    const { address, message } = payload;
-    const seedPhrase = await getSeed();
-    return signMessage({
-      accounts: accountsList,
-      message,
-      address,
-      protocol: payload.protocol,
-      seedPhrase,
-      network: network.type,
-    });
-  };
-
-  return {
-    payload,
-    requestToken,
-    tabId,
-    requestId,
-    confirmSignMessage,
-  };
-};
diff --git a/src/app/screens/signRuneDelistingMessage/index.tsx b/src/app/screens/signRuneDelistingMessage/index.tsx
new file mode 100644
index 000000000..aa67b5fad
--- /dev/null
+++ b/src/app/screens/signRuneDelistingMessage/index.tsx
@@ -0,0 +1,71 @@
+import MessageSigning from '@components/messageSigning';
+import TopRow from '@components/topRow';
+import useRunesApi from '@hooks/apiClients/useRunesApi';
+import useXverseApi from '@hooks/apiClients/useXverseApi';
+import useSelectedAccount from '@hooks/useSelectedAccount';
+import { MessageSigningProtocols } from '@sats-connect/core';
+import toast from 'react-hot-toast';
+import { useTranslation } from 'react-i18next';
+import { useLocation, useNavigate } from 'react-router-dom';
+
+function SignRuneDelistingMessage() {
+  const { t } = useTranslation('translation');
+  const runesApi = useRunesApi();
+  const xverseApi = useXverseApi();
+  const selectedAccount = useSelectedAccount();
+  const location = useLocation();
+  const navigate = useNavigate();
+
+  const { payload } = location.state?.requestPayload || {};
+
+  const handleGoBack = () => navigate(-2);
+
+  const onSigned = async (signedMessage) => {
+    if (payload.marketplace === 'OKX') {
+      await xverseApi.listings.submitRuneCancelOrder({
+        cancellationsPerMarketplace: [
+          {
+            marketplace: payload.marketplace,
+            orderId: payload.orderIds[0],
+            type: 'withMessage',
+            token: payload.token,
+            signature: signedMessage.signature,
+          },
+        ],
+      });
+    } else {
+      await runesApi.submitCancelRunesSellOrder({
+        orderIds: payload.orderIds,
+        makerPublicKey: selectedAccount?.ordinalsPublicKey!,
+        makerAddress: selectedAccount?.ordinalsAddress!,
+        token: payload.token,
+        signature: signedMessage.signature,
+      });
+    }
+
+    handleGoBack();
+    toast(`${t('SIGNATURE_REQUEST.UNLISTED_SUCCESS')}`);
+  };
+
+  const onSignedError = () => {
+    toast(`${t('SIGNATURE_REQUEST.UNLISTED_ERROR')}`);
+  };
+
+  const handleCancelClick = () => {
+    navigate(`/coinDashboard/FT?ftKey=${payload.selectedRuneId}&protocol=runes`);
+  };
+
+  return (
+    <MessageSigning
+      address={selectedAccount.ordinalsAddress}
+      message={payload.message}
+      protocol={MessageSigningProtocols.BIP322}
+      onSigned={onSigned}
+      onSignedError={onSignedError}
+      onCancel={handleCancelClick}
+      header={<TopRow onClick={handleGoBack} />}
+    />
+  );
+}
+
+export default SignRuneDelistingMessage;
diff --git a/src/app/screens/unlistRuneUtxo/index.tsx b/src/app/screens/unlistRuneUtxo/index.tsx
index 49f969534..e91e97cc5 100644
--- a/src/app/screens/unlistRuneUtxo/index.tsx
+++ b/src/app/screens/unlistRuneUtxo/index.tsx
@@ -114,7 +114,7 @@ export default function UnlistRuneUtxoScreen() {
       const data = response[0];
 
       if (['Magic Eden', 'OKX'].includes(listing.marketplaceName) && data.type === 'withMessage') {
-        navigate(RequestsRoutes.SignMessageRequestInApp, {
+        navigate(RequestsRoutes.SignRuneDelistingMessage, {
           state: {
             requestPayload: {
               payload: {
diff --git a/src/common/utils/route-urls.ts b/src/common/utils/route-urls.ts
index a67a7775b..c7f96ee5c 100644
--- a/src/common/utils/route-urls.ts
+++ b/src/common/utils/route-urls.ts
@@ -4,12 +4,13 @@ enum RequestsRoutes {
   AuthenticationRequest = '/authentication-request',
   SignatureRequest = '/signature-request',
   SignMessageRequest = '/sign-message-request',
-  SignMessageRequestInApp = '/sign-message-request-in-app',
+  SignRuneDelistingMessage = '/sign-rune-delisting-message',
   AddressRequest = '/btc-select-address-request',
   StxAddressRequest = '/stx-select-address-request',
   StxAccountRequest = '/stx-select-account-request',
   SignBtcTx = '/psbt-signing-request',
   SignBatchBtcTx = '/batch-psbt-signing-request',
+  RuneListingBatchSigning = '/rune-listing-batch-signing',
   SendBtcTx = '/btc-send-request',
   CreateInscription = '/create-inscription',
   CreateRepeatInscriptions = '/create-repeat-inscriptions',
diff --git a/src/locales/en.json b/src/locales/en.json
index d5f05bfa8..8ead71045 100644
--- a/src/locales/en.json
+++ b/src/locales/en.json
@@ -441,7 +441,8 @@
       "CLOSE_BUTTON": "Close",
       "CANCEL_BUTTON": "Cancel",
       "SEE_TRANSACTION_BUTTON": "See transaction",
-      "RETRY_BUTTON": "Try again"
+      "RETRY_BUTTON": "Try again",
+      "BATCH_NOT_SUPPORTED": "External transaction requests are not yet supported on a Ledger account. Switch to a different account to sign transactions from the application."
     },
     "INSCRIBE": {
       "TITLE": "You will inscribe",
@@ -1124,8 +1125,8 @@
     "SIGNING_WARNING": "By signing this message, you prove that you are the owner of an account without broadcasting any on chain transactions. This signature cannot be used to send transactions on your behalf. You should only sign messages you trust.",
     "SIGNING_ADDRESS_TITLE": "Signing with address",
     "SIGNING_ADDRESS_STX": "Your Stacks address",
-    "SIGNING_ADDRESS_SEGWIT": "Your Bitcoin payment address",
-    "SIGNING_ADDRESS_TAPROOT": "Your Ordinals address",
+    "SIGNING_ADDRESS_PAYMENT": "Your Bitcoin payment address",
+    "SIGNING_ADDRESS_ORDINALS": "Your Ordinals address",
     "SIGN_BUTTON": "Sign",
     "CANCEL_BUTTON": "Cancel",
     "SIGNATURE_ERROR_TITLE": "Signature Error",

From 86f1da63a11fe91636e71caf4aed31af6c7152b4 Mon Sep 17 00:00:00 2001
From: Terence Ng <ngtere@live.com.sg>
Date: Fri, 27 Sep 2024 16:36:05 +0800
Subject: [PATCH 130/227] use latest core (#624)

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

diff --git a/package-lock.json b/package-lock.json
index 90a90c20d..774fcf382 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -15,7 +15,7 @@
         "@react-spring/web": "^9.6.1",
         "@sats-connect/core": "0.3.0-7e6dd81",
         "@scure/btc-signer": "1.2.1",
-        "@secretkeylabs/xverse-core": "21.1.0-f744550",
+        "@secretkeylabs/xverse-core": "22.0.0",
         "@stacks/connect": "7.4.1",
         "@stacks/stacks-blockchain-api-types": "6.1.1",
         "@stacks/transactions": "6.16.1",
@@ -1272,9 +1272,9 @@
       }
     },
     "node_modules/@secretkeylabs/xverse-core": {
-      "version": "21.1.0-f744550",
-      "resolved": "https://npm.pkg.github.com/download/@secretkeylabs/xverse-core/21.1.0-f744550/5151e463356e2578c29bdffaacbd2cd35f6ae9ed",
-      "integrity": "sha512-APgkCZ73BlS2rCMedHOIELnq+nda4mbb767GI/QHlgxeg0JEXMVj0UMFlniY4AsoNZW4EJCFTdx7yiaBHgWqlQ==",
+      "version": "22.0.0",
+      "resolved": "https://npm.pkg.github.com/download/@secretkeylabs/xverse-core/22.0.0/98fd68782ac28ba89a404418cbb19dfcf40d13eb",
+      "integrity": "sha512-vsOAcNxKKD6/rmi4/XfZ+oSxUbjIO2lSeuyI6Hr14woeuan1gEWtw3UEdkqjm3zaO7Jr2ySoOyVf7BvoDVk4JA==",
       "license": "ISC",
       "dependencies": {
         "@bitcoinerlab/secp256k1": "^1.0.2",
@@ -13637,9 +13637,9 @@
       }
     },
     "@secretkeylabs/xverse-core": {
-      "version": "21.1.0-f744550",
-      "resolved": "https://npm.pkg.github.com/download/@secretkeylabs/xverse-core/21.1.0-f744550/5151e463356e2578c29bdffaacbd2cd35f6ae9ed",
-      "integrity": "sha512-APgkCZ73BlS2rCMedHOIELnq+nda4mbb767GI/QHlgxeg0JEXMVj0UMFlniY4AsoNZW4EJCFTdx7yiaBHgWqlQ==",
+      "version": "22.0.0",
+      "resolved": "https://npm.pkg.github.com/download/@secretkeylabs/xverse-core/22.0.0/98fd68782ac28ba89a404418cbb19dfcf40d13eb",
+      "integrity": "sha512-vsOAcNxKKD6/rmi4/XfZ+oSxUbjIO2lSeuyI6Hr14woeuan1gEWtw3UEdkqjm3zaO7Jr2ySoOyVf7BvoDVk4JA==",
       "requires": {
         "@bitcoinerlab/secp256k1": "^1.0.2",
         "@noble/curves": "^1.2.0",
diff --git a/package.json b/package.json
index 4be008cf6..87382c809 100644
--- a/package.json
+++ b/package.json
@@ -43,7 +43,7 @@
     "@react-spring/web": "^9.6.1",
     "@sats-connect/core": "0.3.0-7e6dd81",
     "@scure/btc-signer": "1.2.1",
-    "@secretkeylabs/xverse-core": "21.1.0-f744550",
+    "@secretkeylabs/xverse-core": "22.0.0",
     "@stacks/connect": "7.4.1",
     "@stacks/stacks-blockchain-api-types": "6.1.1",
     "@stacks/transactions": "6.16.1",

From 82185410f1979cdb61590792d9c8df138b4daacd Mon Sep 17 00:00:00 2001
From: Terence Ng <ngtere@live.com.sg>
Date: Fri, 27 Sep 2024 17:23:35 +0800
Subject: [PATCH 131/227] use latest core (#625)

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

diff --git a/package-lock.json b/package-lock.json
index 774fcf382..d1c5a2afa 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -13,7 +13,7 @@
         "@phosphor-icons/react": "^2.1.0",
         "@playwright/test": "1.46.1",
         "@react-spring/web": "^9.6.1",
-        "@sats-connect/core": "0.3.0-7e6dd81",
+        "@sats-connect/core": "0.3.0",
         "@scure/btc-signer": "1.2.1",
         "@secretkeylabs/xverse-core": "22.0.0",
         "@stacks/connect": "7.4.1",
@@ -1159,10 +1159,9 @@
       }
     },
     "node_modules/@sats-connect/core": {
-      "version": "0.3.0-7e6dd81",
-      "resolved": "https://registry.npmjs.org/@sats-connect/core/-/core-0.3.0-7e6dd81.tgz",
-      "integrity": "sha512-FMlUzTMITHReHiFMS56yvBNvCbc0TPb9W0958bb+pJq2/IdwoXuY74Xf22LyoertTzNmAC56cg53VtKzIyAaJA==",
-      "license": "ISC",
+      "version": "0.3.0",
+      "resolved": "https://registry.npmjs.org/@sats-connect/core/-/core-0.3.0.tgz",
+      "integrity": "sha512-4Qy4/Mm4lJrDLnEqzVjC8p3xcHnOcG0GzIOcnuVQa7SbdiAPSqYxAlFECwbSHhsxyiEoE7faC528B3AUHim1Ag==",
       "dependencies": {
         "axios": "1.7.4",
         "bitcoin-address-validation": "2.2.3",
@@ -13555,9 +13554,9 @@
       "integrity": "sha512-7Lcn7IqGMV+vizMPoEl5F0XDshcdDYtMI6uJLQdQz5CfZAwy3vvGKYSUk789qndt5dEC4HfSjviSYlSoHGL2+A=="
     },
     "@sats-connect/core": {
-      "version": "0.3.0-7e6dd81",
-      "resolved": "https://registry.npmjs.org/@sats-connect/core/-/core-0.3.0-7e6dd81.tgz",
-      "integrity": "sha512-FMlUzTMITHReHiFMS56yvBNvCbc0TPb9W0958bb+pJq2/IdwoXuY74Xf22LyoertTzNmAC56cg53VtKzIyAaJA==",
+      "version": "0.3.0",
+      "resolved": "https://registry.npmjs.org/@sats-connect/core/-/core-0.3.0.tgz",
+      "integrity": "sha512-4Qy4/Mm4lJrDLnEqzVjC8p3xcHnOcG0GzIOcnuVQa7SbdiAPSqYxAlFECwbSHhsxyiEoE7faC528B3AUHim1Ag==",
       "requires": {
         "axios": "1.7.4",
         "bitcoin-address-validation": "2.2.3",
diff --git a/package.json b/package.json
index 87382c809..2244b4f64 100644
--- a/package.json
+++ b/package.json
@@ -41,7 +41,7 @@
     "@phosphor-icons/react": "^2.1.0",
     "@playwright/test": "1.46.1",
     "@react-spring/web": "^9.6.1",
-    "@sats-connect/core": "0.3.0-7e6dd81",
+    "@sats-connect/core": "0.3.0",
     "@scure/btc-signer": "1.2.1",
     "@secretkeylabs/xverse-core": "22.0.0",
     "@stacks/connect": "7.4.1",

From a5310959a469834189afa53eeecc32fea1967c09 Mon Sep 17 00:00:00 2001
From: Victor Kirov <victor.kirov@gmail.com>
Date: Fri, 27 Sep 2024 13:40:30 +0300
Subject: [PATCH 132/227] Remove requirement of sending the sighash type per
 input on sign psbt reqs

---
 package-lock.json                                 | 14 +++++++-------
 package.json                                      |  2 +-
 src/app/components/batchPsbtSigning/index.tsx     |  5 +----
 src/app/screens/runeListingBatchSigning/index.tsx | 10 +---------
 src/app/screens/signPsbtRequest/index.tsx         |  2 --
 src/app/screens/signPsbtRequest/useSignPsbt.ts    |  2 --
 src/common/utils/rpc/btc/signPsbt.ts              |  3 ---
 7 files changed, 10 insertions(+), 28 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index d1c5a2afa..3c6d5d93a 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -15,7 +15,7 @@
         "@react-spring/web": "^9.6.1",
         "@sats-connect/core": "0.3.0",
         "@scure/btc-signer": "1.2.1",
-        "@secretkeylabs/xverse-core": "22.0.0",
+        "@secretkeylabs/xverse-core": "22.0.0-1e28035",
         "@stacks/connect": "7.4.1",
         "@stacks/stacks-blockchain-api-types": "6.1.1",
         "@stacks/transactions": "6.16.1",
@@ -1271,9 +1271,9 @@
       }
     },
     "node_modules/@secretkeylabs/xverse-core": {
-      "version": "22.0.0",
-      "resolved": "https://npm.pkg.github.com/download/@secretkeylabs/xverse-core/22.0.0/98fd68782ac28ba89a404418cbb19dfcf40d13eb",
-      "integrity": "sha512-vsOAcNxKKD6/rmi4/XfZ+oSxUbjIO2lSeuyI6Hr14woeuan1gEWtw3UEdkqjm3zaO7Jr2ySoOyVf7BvoDVk4JA==",
+      "version": "22.0.0-1e28035",
+      "resolved": "https://npm.pkg.github.com/download/@secretkeylabs/xverse-core/22.0.0-1e28035/508451931f3dc958282d07db4b97dafe638ffb0c",
+      "integrity": "sha512-jPN0XuCctyzN1zv66OLKeDFQbvuNP5FKQ8yDmak0uCq2GG2ILW8U2wUDaJhARMG1YmuquOIoooFBUDfTYFKfKw==",
       "license": "ISC",
       "dependencies": {
         "@bitcoinerlab/secp256k1": "^1.0.2",
@@ -13636,9 +13636,9 @@
       }
     },
     "@secretkeylabs/xverse-core": {
-      "version": "22.0.0",
-      "resolved": "https://npm.pkg.github.com/download/@secretkeylabs/xverse-core/22.0.0/98fd68782ac28ba89a404418cbb19dfcf40d13eb",
-      "integrity": "sha512-vsOAcNxKKD6/rmi4/XfZ+oSxUbjIO2lSeuyI6Hr14woeuan1gEWtw3UEdkqjm3zaO7Jr2ySoOyVf7BvoDVk4JA==",
+      "version": "22.0.0-1e28035",
+      "resolved": "https://npm.pkg.github.com/download/@secretkeylabs/xverse-core/22.0.0-1e28035/508451931f3dc958282d07db4b97dafe638ffb0c",
+      "integrity": "sha512-jPN0XuCctyzN1zv66OLKeDFQbvuNP5FKQ8yDmak0uCq2GG2ILW8U2wUDaJhARMG1YmuquOIoooFBUDfTYFKfKw==",
       "requires": {
         "@bitcoinerlab/secp256k1": "^1.0.2",
         "@noble/curves": "^1.2.0",
diff --git a/package.json b/package.json
index 2244b4f64..b3de2880d 100644
--- a/package.json
+++ b/package.json
@@ -43,7 +43,7 @@
     "@react-spring/web": "^9.6.1",
     "@sats-connect/core": "0.3.0",
     "@scure/btc-signer": "1.2.1",
-    "@secretkeylabs/xverse-core": "22.0.0",
+    "@secretkeylabs/xverse-core": "22.0.0-1e28035",
     "@stacks/connect": "7.4.1",
     "@stacks/stacks-blockchain-api-types": "6.1.1",
     "@stacks/transactions": "6.16.1",
diff --git a/src/app/components/batchPsbtSigning/index.tsx b/src/app/components/batchPsbtSigning/index.tsx
index f8b651de4..8cbf51b0c 100644
--- a/src/app/components/batchPsbtSigning/index.tsx
+++ b/src/app/components/batchPsbtSigning/index.tsx
@@ -11,7 +11,6 @@ import useTransactionContext from '@hooks/useTransactionContext';
 import useWalletSelector from '@hooks/useWalletSelector';
 import { ArrowLeft, ArrowRight } from '@phosphor-icons/react';
 import type { SignMultiplePsbtPayload } from '@sats-connect/core';
-import * as btc from '@scure/btc-signer';
 import {
   AnalyticsEvents,
   btcTransaction,
@@ -49,10 +48,9 @@ interface BatchPsbtSigningProps {
   psbts: SignMultiplePsbtPayload[];
   onSigned: (signedPsbts: string[]) => void | Promise<void>;
   onCancel: () => void;
-  allowedSigHash?: btc.SigHash[];
 }
 
-function BatchPsbtSigning({ onSigned, psbts, onCancel, allowedSigHash }: BatchPsbtSigningProps) {
+function BatchPsbtSigning({ onSigned, psbts, onCancel }: BatchPsbtSigningProps) {
   const selectedAccount = useSelectedAccount();
   const { network } = useWalletSelector();
   const navigate = useNavigate();
@@ -130,7 +128,6 @@ function BatchPsbtSigning({ onSigned, psbts, onCancel, allowedSigHash }: BatchPs
 
         const psbtBase64 = await enhancedPsbt.getSignedPsbtBase64({
           finalize: false,
-          allowedSigHash,
         });
         signedPsbts.push(psbtBase64);
 
diff --git a/src/app/screens/runeListingBatchSigning/index.tsx b/src/app/screens/runeListingBatchSigning/index.tsx
index 0a347ce8b..5d227909b 100644
--- a/src/app/screens/runeListingBatchSigning/index.tsx
+++ b/src/app/screens/runeListingBatchSigning/index.tsx
@@ -2,7 +2,6 @@ import BatchPsbtSigning from '@components/batchPsbtSigning';
 import useXverseApi from '@hooks/apiClients/useXverseApi';
 import useSelectedAccount from '@hooks/useSelectedAccount';
 import type { SignMultiplePsbtPayload } from '@sats-connect/core';
-import * as btc from '@scure/btc-signer';
 import { AnalyticsEvents } from '@secretkeylabs/xverse-core';
 import { trackMixPanel } from '@utils/mixpanel';
 import type { RuneItem } from '@utils/runes';
@@ -83,14 +82,7 @@ function RuneListingBatchSigning() {
     navigate('/');
   };
 
-  return (
-    <BatchPsbtSigning
-      psbts={psbts}
-      onSigned={onSigned}
-      onCancel={onCancel}
-      allowedSigHash={[btc.SigHash.SINGLE_ANYONECANPAY]}
-    />
-  );
+  return <BatchPsbtSigning psbts={psbts} onSigned={onSigned} onCancel={onCancel} />;
 }
 
 export default RuneListingBatchSigning;
diff --git a/src/app/screens/signPsbtRequest/index.tsx b/src/app/screens/signPsbtRequest/index.tsx
index 46e306fd8..4dfcad44d 100644
--- a/src/app/screens/signPsbtRequest/index.tsx
+++ b/src/app/screens/signPsbtRequest/index.tsx
@@ -5,7 +5,6 @@ import useSubmitRuneSellPsbt from '@hooks/queries/runes/useSubmitRuneSellPsbt';
 import useSelectedAccount from '@hooks/useSelectedAccount';
 import useTrackMixPanelPageViewed from '@hooks/useTrackMixPanelPageViewed';
 import { RpcErrorCode } from '@sats-connect/core';
-import { SigHash } from '@scure/btc-signer';
 import { AnalyticsEvents, btcTransaction, type Transport } from '@secretkeylabs/xverse-core';
 import { trackMixPanel } from '@utils/mixpanel';
 import { useEffect, useState } from 'react';
@@ -70,7 +69,6 @@ function SignPsbtRequest() {
       const signedPsbt = await parsedPsbt?.getSignedPsbtBase64({
         finalize: payload.broadcast,
         ledgerTransport,
-        allowedSigHash: magicEdenPsbt && runeId ? [SigHash.SINGLE_ANYONECANPAY] : undefined,
       });
       const response = await confirmSignPsbt(signedPsbt);
       trackMixPanel(AnalyticsEvents.TransactionConfirmed, {
diff --git a/src/app/screens/signPsbtRequest/useSignPsbt.ts b/src/app/screens/signPsbtRequest/useSignPsbt.ts
index faa9ff9ba..a2288f6ef 100644
--- a/src/app/screens/signPsbtRequest/useSignPsbt.ts
+++ b/src/app/screens/signPsbtRequest/useSignPsbt.ts
@@ -46,12 +46,10 @@ const useSignPsbtParams = (network: SettingsNetwork) => {
         requestToken: null,
       };
     }
-    const allowedSigHash = params.get('allowedSigHash') ?? '';
     const signInputs = JSON.parse(params.get('signInputs')!) as Record<string, number[]>;
     const inputsToSign: InputToSign[] = Object.keys(signInputs).map((address) => ({
       address,
       signingIndexes: signInputs[address],
-      sigHash: +allowedSigHash,
     }));
     const rpcPayload: SignTransactionPayload = {
       psbtBase64: params.get('psbt') ?? '',
diff --git a/src/common/utils/rpc/btc/signPsbt.ts b/src/common/utils/rpc/btc/signPsbt.ts
index b9007ba7f..ef94f949a 100644
--- a/src/common/utils/rpc/btc/signPsbt.ts
+++ b/src/common/utils/rpc/btc/signPsbt.ts
@@ -16,7 +16,6 @@ const SignPsbtSchema = z.object({
   psbt: z.string(),
   signInputs: z.record(z.array(z.number())), // Record<string, number[]>
   broadcast: z.boolean().optional(),
-  allowedSignHash: z.number().optional(),
 });
 
 export const handleSignPsbt = async (
@@ -40,8 +39,6 @@ export const handleSignPsbt = async (
   ];
 
   if (message.params.broadcast) requestParams.push(['broadcast', String(message.params.broadcast)]);
-  if (message.params.allowedSignHash)
-    requestParams.push(['allowedSigHash', message.params.allowedSignHash.toString()]);
 
   const { urlParams, tabId } = makeSearchParamsWithDefaults(port, requestParams);
 

From 46f95c1864900a0238cf96409cba5b5a76b543d8 Mon Sep 17 00:00:00 2001
From: Victor Kirov <victor.kirov@gmail.com>
Date: Fri, 27 Sep 2024 14:32:12 +0300
Subject: [PATCH 133/227] bump core

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

diff --git a/package-lock.json b/package-lock.json
index 3c6d5d93a..4a977eab9 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -15,7 +15,7 @@
         "@react-spring/web": "^9.6.1",
         "@sats-connect/core": "0.3.0",
         "@scure/btc-signer": "1.2.1",
-        "@secretkeylabs/xverse-core": "22.0.0-1e28035",
+        "@secretkeylabs/xverse-core": "23.0.0",
         "@stacks/connect": "7.4.1",
         "@stacks/stacks-blockchain-api-types": "6.1.1",
         "@stacks/transactions": "6.16.1",
@@ -1271,9 +1271,9 @@
       }
     },
     "node_modules/@secretkeylabs/xverse-core": {
-      "version": "22.0.0-1e28035",
-      "resolved": "https://npm.pkg.github.com/download/@secretkeylabs/xverse-core/22.0.0-1e28035/508451931f3dc958282d07db4b97dafe638ffb0c",
-      "integrity": "sha512-jPN0XuCctyzN1zv66OLKeDFQbvuNP5FKQ8yDmak0uCq2GG2ILW8U2wUDaJhARMG1YmuquOIoooFBUDfTYFKfKw==",
+      "version": "23.0.0",
+      "resolved": "https://npm.pkg.github.com/download/@secretkeylabs/xverse-core/23.0.0/d5f2b2868344504e3933bca5efca5ff67331e192",
+      "integrity": "sha512-jXkrCtO7aRCBerbz0ktO+1oHiDy8Ef0eMoXQe+YExxba1kVgSh5XevDRXT8vtzf5SQKr7Kg4thxhnMbQ9UofSg==",
       "license": "ISC",
       "dependencies": {
         "@bitcoinerlab/secp256k1": "^1.0.2",
@@ -13636,9 +13636,9 @@
       }
     },
     "@secretkeylabs/xverse-core": {
-      "version": "22.0.0-1e28035",
-      "resolved": "https://npm.pkg.github.com/download/@secretkeylabs/xverse-core/22.0.0-1e28035/508451931f3dc958282d07db4b97dafe638ffb0c",
-      "integrity": "sha512-jPN0XuCctyzN1zv66OLKeDFQbvuNP5FKQ8yDmak0uCq2GG2ILW8U2wUDaJhARMG1YmuquOIoooFBUDfTYFKfKw==",
+      "version": "23.0.0",
+      "resolved": "https://npm.pkg.github.com/download/@secretkeylabs/xverse-core/23.0.0/d5f2b2868344504e3933bca5efca5ff67331e192",
+      "integrity": "sha512-jXkrCtO7aRCBerbz0ktO+1oHiDy8Ef0eMoXQe+YExxba1kVgSh5XevDRXT8vtzf5SQKr7Kg4thxhnMbQ9UofSg==",
       "requires": {
         "@bitcoinerlab/secp256k1": "^1.0.2",
         "@noble/curves": "^1.2.0",
diff --git a/package.json b/package.json
index b3de2880d..d5647e96e 100644
--- a/package.json
+++ b/package.json
@@ -43,7 +43,7 @@
     "@react-spring/web": "^9.6.1",
     "@sats-connect/core": "0.3.0",
     "@scure/btc-signer": "1.2.1",
-    "@secretkeylabs/xverse-core": "22.0.0-1e28035",
+    "@secretkeylabs/xverse-core": "23.0.0",
     "@stacks/connect": "7.4.1",
     "@stacks/stacks-blockchain-api-types": "6.1.1",
     "@stacks/transactions": "6.16.1",

From 0a15fdaba8faf9aab10e57a87f352de688a1929c Mon Sep 17 00:00:00 2001
From: fede erbes <fedeerbes@gmail.com>
Date: Fri, 27 Sep 2024 17:32:22 +0200
Subject: [PATCH 134/227] fix: remove unused dependency (#629)

---
 package-lock.json | 1 -
 package.json      | 1 -
 2 files changed, 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 4a977eab9..bc96e7796 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -14,7 +14,6 @@
         "@playwright/test": "1.46.1",
         "@react-spring/web": "^9.6.1",
         "@sats-connect/core": "0.3.0",
-        "@scure/btc-signer": "1.2.1",
         "@secretkeylabs/xverse-core": "23.0.0",
         "@stacks/connect": "7.4.1",
         "@stacks/stacks-blockchain-api-types": "6.1.1",
diff --git a/package.json b/package.json
index d5647e96e..26075e48a 100644
--- a/package.json
+++ b/package.json
@@ -42,7 +42,6 @@
     "@playwright/test": "1.46.1",
     "@react-spring/web": "^9.6.1",
     "@sats-connect/core": "0.3.0",
-    "@scure/btc-signer": "1.2.1",
     "@secretkeylabs/xverse-core": "23.0.0",
     "@stacks/connect": "7.4.1",
     "@stacks/stacks-blockchain-api-types": "6.1.1",

From 5d481906f3fd861fadf76687698c5e4a51d711dd Mon Sep 17 00:00:00 2001
From: Den <36603049+dhriaznov@users.noreply.github.com>
Date: Mon, 30 Sep 2024 13:13:08 +0200
Subject: [PATCH 135/227] [ENG-5321] Improve handling of toast messages
 gracefully in star & hide in collectibles (#631)

---
 src/app/App.tsx                      |  3 ++-
 src/app/components/dots/index.tsx    |  4 +---
 src/app/components/toaster/index.tsx | 25 +++++++++++++++++++++++++
 3 files changed, 28 insertions(+), 4 deletions(-)
 create mode 100644 src/app/components/toaster/index.tsx

diff --git a/src/app/App.tsx b/src/app/App.tsx
index 365944a72..97cd485a2 100644
--- a/src/app/App.tsx
+++ b/src/app/App.tsx
@@ -1,12 +1,12 @@
 import { PermissionsProvider } from '@components/permissionsManager';
 import StartupLoadingScreen from '@components/startupLoadingScreen';
+import Toaster from '@components/toaster';
 import { CheckCircle, XCircle } from '@phosphor-icons/react';
 import { setXClientVersion } from '@secretkeylabs/xverse-core';
 import rootStore from '@stores/index';
 import { QueryClientProvider } from '@tanstack/react-query';
 import { ReactQueryDevtools } from '@tanstack/react-query-devtools';
 import { queryClient } from '@utils/query';
-import { Toaster } from 'react-hot-toast';
 import { Provider } from 'react-redux';
 import { RouterProvider } from 'react-router-dom';
 import { PersistGate } from 'redux-persist/integration/react';
@@ -42,6 +42,7 @@ function App(): React.ReactNode {
                 <PermissionsProvider>
                   <RouterProvider router={router} />
                   <Toaster
+                    max={1}
                     position="bottom-center"
                     containerStyle={{ bottom: 32 }}
                     toastOptions={{
diff --git a/src/app/components/dots/index.tsx b/src/app/components/dots/index.tsx
index 1c0a8c5af..f9503fedd 100644
--- a/src/app/components/dots/index.tsx
+++ b/src/app/components/dots/index.tsx
@@ -1,5 +1,3 @@
-import { nanoid } from 'nanoid';
-import { useMemo } from 'react';
 import styled from 'styled-components';
 
 const Container = styled.div({
@@ -32,7 +30,7 @@ type Props = {
   handleClickDot?: (index: number) => void;
 };
 
-export default function Steps({
+export default function Dots({
   numDots,
   activeIndex,
   dotStrategy,
diff --git a/src/app/components/toaster/index.tsx b/src/app/components/toaster/index.tsx
new file mode 100644
index 000000000..72740d4ee
--- /dev/null
+++ b/src/app/components/toaster/index.tsx
@@ -0,0 +1,25 @@
+import React, { useEffect } from 'react';
+import toast, { Toaster, useToasterStore } from 'react-hot-toast';
+
+// this solution is from https://github.com/timolins/react-hot-toast/issues/31
+function useMaxToasts(max: number) {
+  const { toasts } = useToasterStore();
+
+  useEffect(() => {
+    toasts
+      .filter((t) => t.visible) // Only consider visible toasts
+      .filter((_, i) => i >= max) // Is toast index over limit?
+      .forEach((t) => toast.remove(t.id)); // Dismiss
+  }, [toasts, max]);
+}
+
+export default function ToasterComponent({
+  max = 3,
+  ...props
+}: React.ComponentProps<typeof Toaster> & {
+  max?: number;
+}) {
+  useMaxToasts(max);
+
+  return <Toaster {...props} />;
+}

From ce412864d13f6205a86ca5366b0b130e94778eba Mon Sep 17 00:00:00 2001
From: Den <36603049+dhriaznov@users.noreply.github.com>
Date: Mon, 30 Sep 2024 13:37:10 +0200
Subject: [PATCH 136/227] [ENG-5328] Settings - Use Xverse as default wallet -
 toggle on/off does not respond (#633)

---
 src/app/hooks/useChromeLocalStorage.ts | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/app/hooks/useChromeLocalStorage.ts b/src/app/hooks/useChromeLocalStorage.ts
index 1514f36fe..cba729bb2 100644
--- a/src/app/hooks/useChromeLocalStorage.ts
+++ b/src/app/hooks/useChromeLocalStorage.ts
@@ -5,12 +5,15 @@ const useChromeLocalStorage = <T extends unknown>(key: string, defaultValue?: T)
   const queryClient = useQueryClient();
 
   const { data: value, isFetching } = useQuery({
-    queryKey: ['chromeLocalStorage', key, defaultValue],
+    // eslint-disable-next-line @tanstack/query/exhaustive-deps
+    queryKey: ['chromeLocalStorage', key],
     queryFn: async () => {
       const result = await chromeStorage.local.getItem<T>(key);
       return result === undefined ? defaultValue : result;
     },
     refetchOnWindowFocus: false,
+    refetchOnMount: false,
+    staleTime: 60 * 60 * 1000, // 1 hour
   });
 
   const mutation = useMutation({

From f2ff12ef59d4322085048778e2855b7f12eb1488 Mon Sep 17 00:00:00 2001
From: Terence Ng <ngtere@live.com.sg>
Date: Mon, 30 Sep 2024 21:30:18 +0800
Subject: [PATCH 137/227] fix side effect (#634)

---
 src/app/screens/nftDashboard/nftImage.tsx | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/app/screens/nftDashboard/nftImage.tsx b/src/app/screens/nftDashboard/nftImage.tsx
index 07aa50521..c3249d26e 100644
--- a/src/app/screens/nftDashboard/nftImage.tsx
+++ b/src/app/screens/nftDashboard/nftImage.tsx
@@ -94,6 +94,10 @@ function NftImage({ metadata, isInCollage = false }: Props) {
         playsInline
         controls
         preload="auto"
+        onClick={(event) => {
+          // Prevent playback when clicking anywhere other than the controls
+          event.preventDefault();
+        }}
       />
     );
   }

From 1af178c6b85c3db169108d266292fc892f326eda Mon Sep 17 00:00:00 2001
From: Kayaba Akihiko <kayaba.fluctlight@gmail.com>
Date: Tue, 1 Oct 2024 00:07:35 +0700
Subject: [PATCH 138/227] fix: purely navigate back to previous page from
 sendOrdinal (#632)

* fix: just purely navigate back to previous page from sendOrdinal

* fix: prevent fromRune params with undefined (type string) value

---------

Co-authored-by: Your Name <fluctlight-kayaba@users.noreply.github.com>
Co-authored-by: Den <36603049+dhriaznov@users.noreply.github.com>
---
 src/app/screens/rareSatsBundle/index.tsx | 14 +++++++-------
 src/app/screens/sendOrdinal/index.tsx    |  6 +-----
 2 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/src/app/screens/rareSatsBundle/index.tsx b/src/app/screens/rareSatsBundle/index.tsx
index 39662d69b..220d7f587 100644
--- a/src/app/screens/rareSatsBundle/index.tsx
+++ b/src/app/screens/rareSatsBundle/index.tsx
@@ -80,13 +80,13 @@ function RareSatsBundle() {
   };
 
   const openInGalleryView = async () => {
-    await chrome.tabs.create({
-      url: chrome.runtime.getURL(
-        `options.html#/nft-dashboard/rare-sats-bundle?fromRune=${
-          searchParams.get('fromRune') || runeId
-        }`,
-      ),
-    });
+    let baseUrl = 'options.html#/nft-dashboard/rare-sats-bundle';
+    const fromRune = searchParams.get('fromRune') || runeId;
+
+    if (fromRune) {
+      baseUrl += `?fromRune=${fromRune}`;
+    }
+    await chrome.tabs.create({ url: chrome.runtime.getURL(baseUrl) });
   };
 
   const onCloseAlert = () => setShowSendOrdinalsAlert(false);
diff --git a/src/app/screens/sendOrdinal/index.tsx b/src/app/screens/sendOrdinal/index.tsx
index 56d56a32e..f4325f6f8 100644
--- a/src/app/screens/sendOrdinal/index.tsx
+++ b/src/app/screens/sendOrdinal/index.tsx
@@ -120,11 +120,7 @@ function SendOrdinalScreen() {
       window.close();
       return;
     }
-    navigate(
-      isRareSat
-        ? `/nft-dashboard/rare-sats-bundle${fromRune ? `?fromRune=${fromRune}` : ''}`
-        : `/nft-dashboard/ordinal-detail/${selectedOrdinal?.id}`,
-    );
+    navigate(-1);
   };
 
   const handleBackButtonClick = () => {

From d3c524d5f6186108cd1e55fd794351a73d70b5e9 Mon Sep 17 00:00:00 2001
From: Terence Ng <ngtere@live.com.sg>
Date: Tue, 1 Oct 2024 16:43:49 +0800
Subject: [PATCH 139/227] fix top bar missing (#636)

---
 src/app/screens/btcSendRequest/index.tsx | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/app/screens/btcSendRequest/index.tsx b/src/app/screens/btcSendRequest/index.tsx
index 6efeb832e..0f8870221 100644
--- a/src/app/screens/btcSendRequest/index.tsx
+++ b/src/app/screens/btcSendRequest/index.tsx
@@ -224,6 +224,7 @@ function BtcSendRequest() {
       isSubmitting={isSubmitting}
       isBroadcast
       hideBottomBar
+      showAccountHeader
     />
   );
 }

From dacf383559c445347d708980641f9cd8893a7273 Mon Sep 17 00:00:00 2001
From: Christos Maris <christos@secretkeylabs.com>
Date: Tue, 1 Oct 2024 14:06:48 +0300
Subject: [PATCH 140/227]  [ENG-5340] Export necessary functionality from the
 extension to core

---
 .../marketplaceRuneListingResults.tsx         | 20 ++++++++++---------
 src/app/utils/constants.ts                    |  2 --
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/src/app/screens/transactionStatus/marketplaceRuneListingResults.tsx b/src/app/screens/transactionStatus/marketplaceRuneListingResults.tsx
index edaa7694d..34093f1ae 100644
--- a/src/app/screens/transactionStatus/marketplaceRuneListingResults.tsx
+++ b/src/app/screens/transactionStatus/marketplaceRuneListingResults.tsx
@@ -2,9 +2,12 @@ import CheckCircle from '@assets/img/listings/CheckCircle.svg';
 import XCircle from '@assets/img/listings/XCircle.svg';
 import TokenImage from '@components/tokenImage';
 import { ArrowUpRight } from '@phosphor-icons/react';
-import type { FungibleToken, ListingProvider, Marketplace } from '@secretkeylabs/xverse-core';
+import {
+  marketplaceRuneDashboardUrl,
+  type FungibleToken,
+  type ListingProvider,
+} from '@secretkeylabs/xverse-core';
 import { StyledP } from '@ui-library/common.styled';
-import { MAGIC_EDEN_RUNES_URL, OKX_RUNES_URL, UNISAT_RUNES_URL } from '@utils/constants';
 import { formatNumber } from '@utils/helper';
 import { useTranslation } from 'react-i18next';
 import styled from 'styled-components';
@@ -56,14 +59,13 @@ function MarketplaceRuneListingResult({ minPriceSats, marketplace, rune, success
   const { t } = useTranslation('translation', { keyPrefix: 'LIST_RUNE_SCREEN' });
   const floorPrice = formatNumber(minPriceSats);
 
-  const marketplaceToUrl: { [key in Marketplace]: string } = {
-    'Magic Eden': `${MAGIC_EDEN_RUNES_URL}/${rune.name}`,
-    Unisat: `${UNISAT_RUNES_URL}/market?tick=${rune.name}`,
-    OKX: `${OKX_RUNES_URL}/token/${rune.name}/${rune.ticker}`,
-  };
-
   const handleClick = () =>
-    successful && window.open(marketplaceToUrl[marketplace.name], '_blank', 'noopener,noreferrer');
+    successful &&
+    window.open(
+      marketplaceRuneDashboardUrl(rune, marketplace.name),
+      '_blank',
+      'noopener,noreferrer',
+    );
 
   return (
     <Container
diff --git a/src/app/utils/constants.ts b/src/app/utils/constants.ts
index 1cd4105a8..971e2eff7 100644
--- a/src/app/utils/constants.ts
+++ b/src/app/utils/constants.ts
@@ -35,8 +35,6 @@ export const MIX_PANEL_TOKEN = process.env.MIX_PANEL_TOKEN;
 export const MIX_PANEL_EXPLORE_APP_TOKEN = process.env.MIX_PANEL_EXPLORE_APP_TOKEN;
 
 export const MAGIC_EDEN_RUNES_URL = 'https://magiceden.io/runes';
-export const UNISAT_RUNES_URL = 'https://unisat.io/runes';
-export const OKX_RUNES_URL = 'https://www.okx.com/web3/marketplace/runes';
 
 export type CurrencyTypes = 'STX' | 'BTC' | 'FT' | 'NFT' | 'Ordinal' | 'brc20-Ordinal' | 'RareSat';
 export enum LoaderSize {

From 7cc9788c854303eff5fb6a89f2bf37b601e815f7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Eduard=20Bardaj=C3=AD=20Puig?= <ebardaji@gmail.com>
Date: Tue, 1 Oct 2024 12:56:33 +0100
Subject: [PATCH 141/227] Change nullish coalescing to ternary (#639)

---
 src/app/components/rareSatIcon/rareSatIcon.tsx | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/app/components/rareSatIcon/rareSatIcon.tsx b/src/app/components/rareSatIcon/rareSatIcon.tsx
index 9a2a4e376..79130d074 100644
--- a/src/app/components/rareSatIcon/rareSatIcon.tsx
+++ b/src/app/components/rareSatIcon/rareSatIcon.tsx
@@ -35,8 +35,8 @@ import styled from 'styled-components';
 
 const Image = styled.img<{ size?: number }>`
   object-fit: cover;
-  width: ${(props) => `${props.size}px` ?? '100%'};
-  height: ${(props) => `${props.size}px` ?? '100%'};
+  width: ${(props) => (typeof props.size === 'undefined' ? '100%' : `${props.size}px`)};
+  height: ${(props) => (typeof props.size === 'undefined' ? '100%' : `${props.size}px`)};
 `;
 
 interface Props {

From ac2ffc93728995c8199c6344fbf102d24ee6df07 Mon Sep 17 00:00:00 2001
From: Victor Kirov <victor.kirov@gmail.com>
Date: Tue, 1 Oct 2024 16:03:30 +0300
Subject: [PATCH 142/227] Remove inscribed sats warning (#642)

---
 .../itemRow/amountWithInscriptionSatribute.tsx       |  8 ++++++--
 .../sections/receiveSection.tsx                      |  6 ------
 .../confirmBtcTransaction/sections/sendSection.tsx   | 12 +-----------
 .../sections/transferSection.tsx                     |  6 ------
 4 files changed, 7 insertions(+), 25 deletions(-)

diff --git a/src/app/components/confirmBtcTransaction/itemRow/amountWithInscriptionSatribute.tsx b/src/app/components/confirmBtcTransaction/itemRow/amountWithInscriptionSatribute.tsx
index 4767a094f..167bc0efc 100644
--- a/src/app/components/confirmBtcTransaction/itemRow/amountWithInscriptionSatribute.tsx
+++ b/src/app/components/confirmBtcTransaction/itemRow/amountWithInscriptionSatribute.tsx
@@ -106,7 +106,11 @@ export default function AmountWithInscriptionSatribute({
 
   const amountOfAssets = satributesArray.length + inscriptions.length;
 
-  return amountOfAssets > 0 ? (
+  if (amountOfAssets === 0) {
+    return null;
+  }
+
+  return (
     <WarningContainer>
       <WarningButton type="button" onClick={() => setShowBundleDetail((prevState) => !prevState)}>
         <Row>
@@ -165,5 +169,5 @@ export default function AmountWithInscriptionSatribute({
         </ItemsContainer>
       )}
     </WarningContainer>
-  ) : null;
+  );
 }
diff --git a/src/app/components/confirmBtcTransaction/sections/receiveSection.tsx b/src/app/components/confirmBtcTransaction/sections/receiveSection.tsx
index 13da41007..06e7dde8f 100644
--- a/src/app/components/confirmBtcTransaction/sections/receiveSection.tsx
+++ b/src/app/components/confirmBtcTransaction/sections/receiveSection.tsx
@@ -9,7 +9,6 @@ import { useTranslation } from 'react-i18next';
 import styled from 'styled-components';
 import { useTxSummaryContext } from '../hooks/useTxSummaryContext';
 import Amount from '../itemRow/amount';
-import AmountWithInscriptionSatribute from '../itemRow/amountWithInscriptionSatribute';
 import InscriptionSatributeRow from '../itemRow/inscriptionSatributeRow';
 import RuneAmount from '../itemRow/runeAmount';
 
@@ -87,11 +86,6 @@ function ReceiveSection({ onShowInscription }: Props) {
                 noMargin={!runes.length && !inscriptions.length && !satributes.length}
               >
                 <Amount amount={btcSatsAmount} />
-                <AmountWithInscriptionSatribute
-                  inscriptions={inscriptions}
-                  satributes={satributes}
-                  onShowInscription={onShowInscription}
-                />
               </RowContainer>
             )}
             {txIsFinal &&
diff --git a/src/app/components/confirmBtcTransaction/sections/sendSection.tsx b/src/app/components/confirmBtcTransaction/sections/sendSection.tsx
index 95e921861..00dfaf9d1 100644
--- a/src/app/components/confirmBtcTransaction/sections/sendSection.tsx
+++ b/src/app/components/confirmBtcTransaction/sections/sendSection.tsx
@@ -6,7 +6,6 @@ import { NumericFormat } from 'react-number-format';
 import styled from 'styled-components';
 import { useTxSummaryContext } from '../hooks/useTxSummaryContext';
 import Amount from '../itemRow/amount';
-import AmountWithInscriptionSatribute from '../itemRow/amountWithInscriptionSatribute';
 import InscriptionSatributeRow from '../itemRow/inscriptionSatributeRow';
 import RuneAmount from '../itemRow/runeAmount';
 
@@ -72,16 +71,7 @@ function SendSection({
                   : transfer.destinationType}
               </StyledP>
             </SubHeader>
-            {transfer.btcSatsAmount > 0 && (
-              <>
-                <Amount amount={transfer.btcSatsAmount} />
-                <AmountWithInscriptionSatribute
-                  inscriptions={[]}
-                  satributes={[]}
-                  onShowInscription={onShowInscription}
-                />
-              </>
-            )}
+            {transfer.btcSatsAmount > 0 && <Amount amount={transfer.btcSatsAmount} />}
             {transfer.bundles.map((bundle) => (
               <>
                 <SubHeader>
diff --git a/src/app/components/confirmBtcTransaction/sections/transferSection.tsx b/src/app/components/confirmBtcTransaction/sections/transferSection.tsx
index bd2d2046f..71d4b259c 100644
--- a/src/app/components/confirmBtcTransaction/sections/transferSection.tsx
+++ b/src/app/components/confirmBtcTransaction/sections/transferSection.tsx
@@ -11,7 +11,6 @@ import styled from 'styled-components';
 import Theme from '../../../../theme';
 import { useTxSummaryContext } from '../hooks/useTxSummaryContext';
 import Amount from '../itemRow/amount';
-import AmountWithInscriptionSatribute from '../itemRow/amountWithInscriptionSatribute';
 import InscriptionSatributeRow from '../itemRow/inscriptionSatributeRow';
 import RuneAmount from '../itemRow/runeAmount';
 
@@ -110,11 +109,6 @@ function TransferSection({ onShowInscription }: Props) {
                 noMargin={!runes.length && !inscriptions.length && !satributes.length}
               >
                 <Amount amount={btcSatsAmount} />
-                <AmountWithInscriptionSatribute
-                  inscriptions={inscriptions}
-                  satributes={satributes}
-                  onShowInscription={onShowInscription}
-                />
                 <WarningContainer>
                   <WarningOctagon weight="fill" color={Theme.colors.caution} size={16} />
                   <WarningText typography="body_medium_s" color="caution">

From 69cdb39a68f76d3a29ebe6276f1399d48dbad888 Mon Sep 17 00:00:00 2001
From: Christos Maris <christos@secretkeylabs.com>
Date: Tue, 1 Oct 2024 18:27:05 +0300
Subject: [PATCH 143/227] fixup!  [ENG-5340] Export necessary functionality
 from the extension to core

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

diff --git a/package-lock.json b/package-lock.json
index 7b539c47e..0c1a58758 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -15,7 +15,7 @@
         "@react-spring/web": "^9.6.1",
         "@sats-connect/core": "0.3.0-7e6dd81",
         "@scure/btc-signer": "1.2.1",
-        "@secretkeylabs/xverse-core": "21.1.0-f744550",
+        "@secretkeylabs/xverse-core": "23.0.1",
         "@stacks/connect": "7.4.1",
         "@stacks/stacks-blockchain-api-types": "6.1.1",
         "@stacks/transactions": "6.16.1",
@@ -1272,9 +1272,9 @@
       }
     },
     "node_modules/@secretkeylabs/xverse-core": {
-      "version": "21.1.0-f744550",
-      "resolved": "https://npm.pkg.github.com/download/@secretkeylabs/xverse-core/21.1.0-f744550/5151e463356e2578c29bdffaacbd2cd35f6ae9ed",
-      "integrity": "sha512-APgkCZ73BlS2rCMedHOIELnq+nda4mbb767GI/QHlgxeg0JEXMVj0UMFlniY4AsoNZW4EJCFTdx7yiaBHgWqlQ==",
+      "version": "23.0.1",
+      "resolved": "https://npm.pkg.github.com/download/@secretkeylabs/xverse-core/23.0.1/1a1a79322ef831b276c2b56616b917020e19cac2",
+      "integrity": "sha512-6nReBiHWnz0TKLeX3do3H6HqqjdAu6AUBKm0mwTv7pJk2kPIb4mKLsUTaBeA3UeqB5/1+AzujDG9ijFmSNIkAA==",
       "license": "ISC",
       "dependencies": {
         "@bitcoinerlab/secp256k1": "^1.0.2",
@@ -13637,9 +13637,9 @@
       }
     },
     "@secretkeylabs/xverse-core": {
-      "version": "21.1.0-f744550",
-      "resolved": "https://npm.pkg.github.com/download/@secretkeylabs/xverse-core/21.1.0-f744550/5151e463356e2578c29bdffaacbd2cd35f6ae9ed",
-      "integrity": "sha512-APgkCZ73BlS2rCMedHOIELnq+nda4mbb767GI/QHlgxeg0JEXMVj0UMFlniY4AsoNZW4EJCFTdx7yiaBHgWqlQ==",
+      "version": "23.0.1",
+      "resolved": "https://npm.pkg.github.com/download/@secretkeylabs/xverse-core/23.0.1/1a1a79322ef831b276c2b56616b917020e19cac2",
+      "integrity": "sha512-6nReBiHWnz0TKLeX3do3H6HqqjdAu6AUBKm0mwTv7pJk2kPIb4mKLsUTaBeA3UeqB5/1+AzujDG9ijFmSNIkAA==",
       "requires": {
         "@bitcoinerlab/secp256k1": "^1.0.2",
         "@noble/curves": "^1.2.0",
diff --git a/package.json b/package.json
index aef902432..74d0b933d 100644
--- a/package.json
+++ b/package.json
@@ -43,7 +43,7 @@
     "@react-spring/web": "^9.6.1",
     "@sats-connect/core": "0.3.0-7e6dd81",
     "@scure/btc-signer": "1.2.1",
-    "@secretkeylabs/xverse-core": "21.1.0-f744550",
+    "@secretkeylabs/xverse-core": "23.0.1",
     "@stacks/connect": "7.4.1",
     "@stacks/stacks-blockchain-api-types": "6.1.1",
     "@stacks/transactions": "6.16.1",

From 84cb04b08874293a1148799d31e96a16e4f54473 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Eduard=20Bardaj=C3=AD=20Puig?= <ebardaji@gmail.com>
Date: Tue, 1 Oct 2024 17:52:28 +0100
Subject: [PATCH 144/227] Remove unreachable expressions (#641)

---
 src/app/screens/swap/useMasterCoinsList.tsx        | 11 +++++------
 src/app/screens/swap/useVisibleMasterCoinsList.tsx | 13 ++++++-------
 2 files changed, 11 insertions(+), 13 deletions(-)

diff --git a/src/app/screens/swap/useMasterCoinsList.tsx b/src/app/screens/swap/useMasterCoinsList.tsx
index 51cfd440e..2beb12cb8 100644
--- a/src/app/screens/swap/useMasterCoinsList.tsx
+++ b/src/app/screens/swap/useMasterCoinsList.tsx
@@ -36,12 +36,11 @@ const useMasterCoinsList = () => {
   const isStacksSwapsEnabled = useHasFeature(FeatureId.STACKS_SWAPS);
 
   const coinsMasterList = useMemo(
-    () =>
-      [
-        ...(runesFtList || []),
-        btcFt,
-        ...(!hideStx && isStacksSwapsEnabled ? [stxFt, ...(sip10FtList ?? [])] : []),
-      ] ?? [],
+    () => [
+      ...(runesFtList || []),
+      btcFt,
+      ...(!hideStx && isStacksSwapsEnabled ? [stxFt, ...(sip10FtList ?? [])] : []),
+    ],
     [runesFtList, hideStx, isStacksSwapsEnabled, sip10FtList],
   );
 
diff --git a/src/app/screens/swap/useVisibleMasterCoinsList.tsx b/src/app/screens/swap/useVisibleMasterCoinsList.tsx
index c50669170..d8d0a0267 100644
--- a/src/app/screens/swap/useVisibleMasterCoinsList.tsx
+++ b/src/app/screens/swap/useVisibleMasterCoinsList.tsx
@@ -14,13 +14,12 @@ const useVisibleMasterCoinsList = () => {
   const { hideStx } = useWalletSelector();
 
   const coinsMasterList = useMemo(
-    () =>
-      [
-        ...sip10FtList,
-        ...runesFtList,
-        btcFt,
-        ...(!hideStx && isStacksSwapsEnabled ? [stxFt] : []),
-      ] ?? [],
+    () => [
+      ...sip10FtList,
+      ...runesFtList,
+      btcFt,
+      ...(!hideStx && isStacksSwapsEnabled ? [stxFt] : []),
+    ],
     [sip10FtList, runesFtList, hideStx, isStacksSwapsEnabled],
   );
 

From 6cc6bbd41f850874ca6985a451058273f07f6045 Mon Sep 17 00:00:00 2001
From: Victor Kirov <victor.kirov@gmail.com>
Date: Wed, 2 Oct 2024 10:32:42 +0300
Subject: [PATCH 145/227] Disable rune listing on ledger (#644)

* Disable rune listing on ledger

* Switch where we get account type from
---
 src/app/screens/coinDashboard/coinHeader.tsx | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/app/screens/coinDashboard/coinHeader.tsx b/src/app/screens/coinDashboard/coinHeader.tsx
index 8dcdedd08..e74337d8b 100644
--- a/src/app/screens/coinDashboard/coinHeader.tsx
+++ b/src/app/screens/coinDashboard/coinHeader.tsx
@@ -58,7 +58,7 @@ type Props = {
 
 export default function CoinHeader({ currency, fungibleToken }: Props) {
   const selectedAccount = useSelectedAccount();
-  const { fiatCurrency, network } = useWalletSelector();
+  const { fiatCurrency, network, selectedAccountType } = useWalletSelector();
   const { data: btcBalance } = useBtcWalletData();
   const { data: stxData } = useStxWalletData();
   const { btcFiatRate, stxBtcRate } = useCoinRates();
@@ -69,7 +69,10 @@ export default function CoinHeader({ currency, fungibleToken }: Props) {
 
   const showRunesListing =
     (useHasFeature(FeatureId.RUNES_LISTING) || process.env.NODE_ENV === 'development') &&
-    network.type === 'Mainnet';
+    network.type === 'Mainnet' &&
+    fungibleToken?.protocol === 'runes' &&
+    // TODO: remove this once we implement ledger batch PSBT signing flow
+    selectedAccountType !== 'ledger';
 
   const handleReceiveModalOpen = () => {
     setOpenReceiveModal(true);
@@ -252,7 +255,7 @@ export default function CoinHeader({ currency, fungibleToken }: Props) {
         {showSwaps && (
           <SmallActionButton src={ArrowSwap} text={t('SWAP')} onPress={navigateToSwaps} />
         )}
-        {showRunesListing && fungibleToken?.protocol === 'runes' && (
+        {showRunesListing && (
           <SmallActionButton
             src={List}
             text={t('LIST')}

From ed46432992bfc35bf1802c73f47d16a28703c276 Mon Sep 17 00:00:00 2001
From: Victor Kirov <victor.kirov@gmail.com>
Date: Wed, 2 Oct 2024 12:06:15 +0300
Subject: [PATCH 146/227] [ENG-5351] Fix find next RC tag script (#645)

* Fix find next RC tag script

* Refactor
---
 scripts/find-tag.sh | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/scripts/find-tag.sh b/scripts/find-tag.sh
index ade904106..4cef40c73 100755
--- a/scripts/find-tag.sh
+++ b/scripts/find-tag.sh
@@ -10,10 +10,17 @@ if [[ -z "$TAG" ]]; then
   exit 1
 fi
 
-if cat releases.json | jq '.[].tag_name' | grep $TAG; then
+if cat releases.json  | grep $TAG; then
   echo found releases matching $TAG
-  LATEST_TAG=$(cat releases.json | jq -r '.[].tag_name' | grep $TAG | head -1)
-  LATEST_RC=$(echo $LATEST_TAG | grep rc | sed 's/.*-rc.\(.*\)/\1/')
+
+  for i in $(cat releases.json  | grep $TAG); do
+    LATEST_RUNNING=$(echo $i | grep rc | sed 's/.*-rc.\(.*\)/\1/')
+
+    if [[ -z "$LATEST_RC" || $LATEST_RUNNING -gt $LATEST_RC ]]; then
+      LATEST_RC=$LATEST_RUNNING
+    fi
+  done
+
   if [[ -z "$LATEST_RC" ]]; then
     echo $TAG was already released
     exit 1;

From 1854b0392932f1f076728cd0c2bcdc59b1fa1bc2 Mon Sep 17 00:00:00 2001
From: Victor Kirov <victor.kirov@gmail.com>
Date: Wed, 2 Oct 2024 12:25:39 +0300
Subject: [PATCH 147/227] Add back the JQ calls in the script for RC Tag (#646)

---
 scripts/find-tag.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/scripts/find-tag.sh b/scripts/find-tag.sh
index 4cef40c73..d959711de 100755
--- a/scripts/find-tag.sh
+++ b/scripts/find-tag.sh
@@ -10,10 +10,10 @@ if [[ -z "$TAG" ]]; then
   exit 1
 fi
 
-if cat releases.json  | grep $TAG; then
+if cat releases.json  | jq -r '.[].tag_name' | grep $TAG; then
   echo found releases matching $TAG
 
-  for i in $(cat releases.json  | grep $TAG); do
+  for i in $(cat releases.json  | jq -r '.[].tag_name' | grep $TAG); do
     LATEST_RUNNING=$(echo $i | grep rc | sed 's/.*-rc.\(.*\)/\1/')
 
     if [[ -z "$LATEST_RC" || $LATEST_RUNNING -gt $LATEST_RC ]]; then

From 182a334163514d77d8428d6325407aca695c18e2 Mon Sep 17 00:00:00 2001
From: Christos Maris <christos@secretkeylabs.com>
Date: Wed, 2 Oct 2024 14:59:54 +0300
Subject: [PATCH 148/227] [ENG-5348] Fix Bug When Listing UTXO with Multiple
 Runes

---
 src/app/screens/listRune/index.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/app/screens/listRune/index.tsx b/src/app/screens/listRune/index.tsx
index 2f94132db..14e0cdf89 100644
--- a/src/app/screens/listRune/index.tsx
+++ b/src/app/screens/listRune/index.tsx
@@ -93,7 +93,7 @@ export default function ListRuneScreen() {
     isRefetching: listItemsRefetching,
     refetch,
   } = useRuneUtxosQueryPerMarketplace(selectedRune as FungibleToken, false);
-  const listItemsResponse = data?.unlistedItems || [];
+  const listItemsResponse = data?.unlistedItems?.filter((i) => i.runes.length === 1) || [];
 
   const supportedMarketplaces: Marketplace[] = ['Unisat', 'Magic Eden', 'OKX'];
   const {

From 2f003c633d4f97e1b7b4182eec6665a8ce1141c8 Mon Sep 17 00:00:00 2001
From: christos-xverse <christos@secretkeylabs.com>
Date: Wed, 2 Oct 2024 15:42:25 +0300
Subject: [PATCH 149/227] Revert " [ENG-5340] Export necessary functionality
 from the extension to core"

---
 package-lock.json                             | 14 ++++++-------
 package.json                                  |  2 +-
 .../marketplaceRuneListingResults.tsx         | 20 +++++++++----------
 src/app/utils/constants.ts                    |  2 ++
 4 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 0c1a58758..7b539c47e 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -15,7 +15,7 @@
         "@react-spring/web": "^9.6.1",
         "@sats-connect/core": "0.3.0-7e6dd81",
         "@scure/btc-signer": "1.2.1",
-        "@secretkeylabs/xverse-core": "23.0.1",
+        "@secretkeylabs/xverse-core": "21.1.0-f744550",
         "@stacks/connect": "7.4.1",
         "@stacks/stacks-blockchain-api-types": "6.1.1",
         "@stacks/transactions": "6.16.1",
@@ -1272,9 +1272,9 @@
       }
     },
     "node_modules/@secretkeylabs/xverse-core": {
-      "version": "23.0.1",
-      "resolved": "https://npm.pkg.github.com/download/@secretkeylabs/xverse-core/23.0.1/1a1a79322ef831b276c2b56616b917020e19cac2",
-      "integrity": "sha512-6nReBiHWnz0TKLeX3do3H6HqqjdAu6AUBKm0mwTv7pJk2kPIb4mKLsUTaBeA3UeqB5/1+AzujDG9ijFmSNIkAA==",
+      "version": "21.1.0-f744550",
+      "resolved": "https://npm.pkg.github.com/download/@secretkeylabs/xverse-core/21.1.0-f744550/5151e463356e2578c29bdffaacbd2cd35f6ae9ed",
+      "integrity": "sha512-APgkCZ73BlS2rCMedHOIELnq+nda4mbb767GI/QHlgxeg0JEXMVj0UMFlniY4AsoNZW4EJCFTdx7yiaBHgWqlQ==",
       "license": "ISC",
       "dependencies": {
         "@bitcoinerlab/secp256k1": "^1.0.2",
@@ -13637,9 +13637,9 @@
       }
     },
     "@secretkeylabs/xverse-core": {
-      "version": "23.0.1",
-      "resolved": "https://npm.pkg.github.com/download/@secretkeylabs/xverse-core/23.0.1/1a1a79322ef831b276c2b56616b917020e19cac2",
-      "integrity": "sha512-6nReBiHWnz0TKLeX3do3H6HqqjdAu6AUBKm0mwTv7pJk2kPIb4mKLsUTaBeA3UeqB5/1+AzujDG9ijFmSNIkAA==",
+      "version": "21.1.0-f744550",
+      "resolved": "https://npm.pkg.github.com/download/@secretkeylabs/xverse-core/21.1.0-f744550/5151e463356e2578c29bdffaacbd2cd35f6ae9ed",
+      "integrity": "sha512-APgkCZ73BlS2rCMedHOIELnq+nda4mbb767GI/QHlgxeg0JEXMVj0UMFlniY4AsoNZW4EJCFTdx7yiaBHgWqlQ==",
       "requires": {
         "@bitcoinerlab/secp256k1": "^1.0.2",
         "@noble/curves": "^1.2.0",
diff --git a/package.json b/package.json
index 74d0b933d..aef902432 100644
--- a/package.json
+++ b/package.json
@@ -43,7 +43,7 @@
     "@react-spring/web": "^9.6.1",
     "@sats-connect/core": "0.3.0-7e6dd81",
     "@scure/btc-signer": "1.2.1",
-    "@secretkeylabs/xverse-core": "23.0.1",
+    "@secretkeylabs/xverse-core": "21.1.0-f744550",
     "@stacks/connect": "7.4.1",
     "@stacks/stacks-blockchain-api-types": "6.1.1",
     "@stacks/transactions": "6.16.1",
diff --git a/src/app/screens/transactionStatus/marketplaceRuneListingResults.tsx b/src/app/screens/transactionStatus/marketplaceRuneListingResults.tsx
index 34093f1ae..edaa7694d 100644
--- a/src/app/screens/transactionStatus/marketplaceRuneListingResults.tsx
+++ b/src/app/screens/transactionStatus/marketplaceRuneListingResults.tsx
@@ -2,12 +2,9 @@ import CheckCircle from '@assets/img/listings/CheckCircle.svg';
 import XCircle from '@assets/img/listings/XCircle.svg';
 import TokenImage from '@components/tokenImage';
 import { ArrowUpRight } from '@phosphor-icons/react';
-import {
-  marketplaceRuneDashboardUrl,
-  type FungibleToken,
-  type ListingProvider,
-} from '@secretkeylabs/xverse-core';
+import type { FungibleToken, ListingProvider, Marketplace } from '@secretkeylabs/xverse-core';
 import { StyledP } from '@ui-library/common.styled';
+import { MAGIC_EDEN_RUNES_URL, OKX_RUNES_URL, UNISAT_RUNES_URL } from '@utils/constants';
 import { formatNumber } from '@utils/helper';
 import { useTranslation } from 'react-i18next';
 import styled from 'styled-components';
@@ -59,13 +56,14 @@ function MarketplaceRuneListingResult({ minPriceSats, marketplace, rune, success
   const { t } = useTranslation('translation', { keyPrefix: 'LIST_RUNE_SCREEN' });
   const floorPrice = formatNumber(minPriceSats);
 
+  const marketplaceToUrl: { [key in Marketplace]: string } = {
+    'Magic Eden': `${MAGIC_EDEN_RUNES_URL}/${rune.name}`,
+    Unisat: `${UNISAT_RUNES_URL}/market?tick=${rune.name}`,
+    OKX: `${OKX_RUNES_URL}/token/${rune.name}/${rune.ticker}`,
+  };
+
   const handleClick = () =>
-    successful &&
-    window.open(
-      marketplaceRuneDashboardUrl(rune, marketplace.name),
-      '_blank',
-      'noopener,noreferrer',
-    );
+    successful && window.open(marketplaceToUrl[marketplace.name], '_blank', 'noopener,noreferrer');
 
   return (
     <Container
diff --git a/src/app/utils/constants.ts b/src/app/utils/constants.ts
index 971e2eff7..1cd4105a8 100644
--- a/src/app/utils/constants.ts
+++ b/src/app/utils/constants.ts
@@ -35,6 +35,8 @@ export const MIX_PANEL_TOKEN = process.env.MIX_PANEL_TOKEN;
 export const MIX_PANEL_EXPLORE_APP_TOKEN = process.env.MIX_PANEL_EXPLORE_APP_TOKEN;
 
 export const MAGIC_EDEN_RUNES_URL = 'https://magiceden.io/runes';
+export const UNISAT_RUNES_URL = 'https://unisat.io/runes';
+export const OKX_RUNES_URL = 'https://www.okx.com/web3/marketplace/runes';
 
 export type CurrencyTypes = 'STX' | 'BTC' | 'FT' | 'NFT' | 'Ordinal' | 'brc20-Ordinal' | 'RareSat';
 export enum LoaderSize {

From 4c2af1dbf989a0edd555f37f0236af98653abd23 Mon Sep 17 00:00:00 2001
From: christos-xverse <christos@secretkeylabs.com>
Date: Wed, 2 Oct 2024 15:42:26 +0300
Subject: [PATCH 150/227] Revert "[ENG-5348] Fix Bug When Listing UTXO with
 Multiple Runes"

---
 src/app/screens/listRune/index.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/app/screens/listRune/index.tsx b/src/app/screens/listRune/index.tsx
index 14e0cdf89..2f94132db 100644
--- a/src/app/screens/listRune/index.tsx
+++ b/src/app/screens/listRune/index.tsx
@@ -93,7 +93,7 @@ export default function ListRuneScreen() {
     isRefetching: listItemsRefetching,
     refetch,
   } = useRuneUtxosQueryPerMarketplace(selectedRune as FungibleToken, false);
-  const listItemsResponse = data?.unlistedItems?.filter((i) => i.runes.length === 1) || [];
+  const listItemsResponse = data?.unlistedItems || [];
 
   const supportedMarketplaces: Marketplace[] = ['Unisat', 'Magic Eden', 'OKX'];
   const {

From c029bdade5cd1757432c664d414b14879ec10cc3 Mon Sep 17 00:00:00 2001
From: Christos Maris <christos@secretkeylabs.com>
Date: Wed, 2 Oct 2024 14:59:54 +0300
Subject: [PATCH 151/227] Fix Bug When Listing UTXO with Multiple Runes

---
 src/app/screens/listRune/index.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/app/screens/listRune/index.tsx b/src/app/screens/listRune/index.tsx
index 0a5ca07b1..100c38e15 100644
--- a/src/app/screens/listRune/index.tsx
+++ b/src/app/screens/listRune/index.tsx
@@ -93,7 +93,7 @@ export default function ListRuneScreen() {
     isRefetching: listItemsRefetching,
     refetch,
   } = useRuneUtxosQueryPerMarketplace(selectedRune as FungibleToken, false);
-  const listItemsResponse = data?.unlistedItems || [];
+  const listItemsResponse = data?.unlistedItems?.filter((i) => i.runes.length === 1) || [];
 
   const supportedMarketplaces: Marketplace[] = ['Unisat', 'Magic Eden', 'OKX'];
   const {

From 781018332c13c5f014d9090269c70eb7579d0ac6 Mon Sep 17 00:00:00 2001
From: fede erbes <fedeerbes@gmail.com>
Date: Wed, 2 Oct 2024 15:59:38 +0200
Subject: [PATCH 152/227] fix: remove wrong check for amm providers section
 header (#653)

---
 src/app/screens/swap/quotesModal/index.tsx | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/src/app/screens/swap/quotesModal/index.tsx b/src/app/screens/swap/quotesModal/index.tsx
index 3e4050004..313df379c 100644
--- a/src/app/screens/swap/quotesModal/index.tsx
+++ b/src/app/screens/swap/quotesModal/index.tsx
@@ -132,12 +132,11 @@ function QuotesModal({
         <StyledP typography="body_m" color="white_200">
           {t('QUOTE_TITLE')}
         </StyledP>
-        {ammProviders.length > 0 ||
-          (stxProviders.length > 0 && (
-            <Heading typography="headline_s" color="white_0">
-              {t('EXCHANGE')}
-            </Heading>
-          ))}
+        {ammProviders.length > 0 && (
+          <Heading typography="headline_s" color="white_0">
+            {t('EXCHANGE')}
+          </Heading>
+        )}
         {sortedAmmQuotes.map((amm) => (
           <QuoteTile
             key={amm.provider.name}

From 3472503ec67b3b269b5125c8a2397f9f5ac42554 Mon Sep 17 00:00:00 2001
From: Terence Ng <ngtere@live.com.sg>
Date: Thu, 3 Oct 2024 17:02:57 +0800
Subject: [PATCH 153/227] remove duplicate selector (#630)

* remove duplicate

* remove unnecessary offset

---------

Co-authored-by: Den <36603049+dhriaznov@users.noreply.github.com>
---
 .../itemRow/rareSats.tsx                      |  2 -
 src/app/hooks/useWalletReducer.ts             | 42 +++++++------------
 2 files changed, 15 insertions(+), 29 deletions(-)

diff --git a/src/app/components/confirmBtcTransaction/itemRow/rareSats.tsx b/src/app/components/confirmBtcTransaction/itemRow/rareSats.tsx
index 660cc77b9..235a67b7f 100644
--- a/src/app/components/confirmBtcTransaction/itemRow/rareSats.tsx
+++ b/src/app/components/confirmBtcTransaction/itemRow/rareSats.tsx
@@ -121,7 +121,6 @@ function RareSats({
                   types: inscriptionSatributes,
                   amount: 0,
                   fromAddress: '',
-                  offset: -1,
                 }}
               />
             </Range>
@@ -144,7 +143,6 @@ function RareSats({
                     types: ['COMMON'],
                     amount: bundleSize - totalExoticSats,
                     fromAddress: '',
-                    offset: -1,
                   }}
                 />
               </Range>
diff --git a/src/app/hooks/useWalletReducer.ts b/src/app/hooks/useWalletReducer.ts
index 12bc3238b..6dd40d5a4 100644
--- a/src/app/hooks/useWalletReducer.ts
+++ b/src/app/hooks/useWalletReducer.ts
@@ -90,7 +90,6 @@ const useWalletReducer = () => {
     selectedAccountType,
     accountsList: accounts,
     savedNames,
-    accountsList: softwareAccountsList,
     ledgerAccountsList,
     showDataCollectionAlert,
     hideStx,
@@ -122,7 +121,7 @@ const useWalletReducer = () => {
         savedNames[network.type],
       );
 
-      const selectedAccount = softwareAccountsList.find((account) => account.id === selectedIndex);
+      const selectedAccount = accounts.find((account) => account.id === selectedIndex);
 
       if (!selectedAccount) {
         // if the selected account index does not exist, we cannot update it
@@ -135,7 +134,7 @@ const useWalletReducer = () => {
       );
 
       if (!accountsMatch) {
-        const newAccountsList = softwareAccountsList.map((account) =>
+        const newAccountsList = accounts.map((account) =>
           account.id === selectedIndex ? recreatedAccount : account,
         );
 
@@ -149,7 +148,7 @@ const useWalletReducer = () => {
       selectedAccountIndex,
       selectedAccountType,
       selectedNetwork,
-      softwareAccountsList,
+      accounts,
       savedNames,
     ],
   );
@@ -213,21 +212,18 @@ const useWalletReducer = () => {
   };
 
   const loadAccountNames = () => {
-    const updatedSavedNames = softwareAccountsList.reduce<{ id: number; name: string }[]>(
-      (acc, account) => {
-        if (account.accountName) {
-          acc.push({ id: account.id, name: account.accountName });
-        }
-        return acc;
-      },
-      [],
-    );
+    const updatedSavedNames = accounts.reduce<{ id: number; name: string }[]>((acc, account) => {
+      if (account.accountName) {
+        acc.push({ id: account.id, name: account.accountName });
+      }
+      return acc;
+    }, []);
     dispatch(updateSavedNamesAction(network.type, updatedSavedNames));
   };
 
   const loadWallet = async () => {
     const seedPhrase = await seedVault.getSeed();
-    const currentAccounts = softwareAccountsList || [];
+    const currentAccounts = accounts || [];
 
     if (currentAccounts.length === 0) {
       // This will happen on first load after the wallet is created. We create the accounts here to ensure
@@ -248,10 +244,7 @@ const useWalletReducer = () => {
 
     await ensureSelectedAccountValid();
 
-    if (
-      !savedNames[network.type]?.length &&
-      softwareAccountsList.some((account) => !!account.accountName)
-    ) {
+    if (!savedNames[network.type]?.length && accounts.some((account) => !!account.accountName)) {
       // there was no savedNames store object initially
       // this is a migration to add the savedNames if there are custom account names that are not saved
       // it should only fire once if ever
@@ -355,12 +348,7 @@ const useWalletReducer = () => {
 
   const createAccount = async () => {
     const seedPhrase = await seedVault.getSeed();
-    const newAccounts = await createWalletAccount(
-      seedPhrase,
-      network,
-      selectedNetwork,
-      softwareAccountsList,
-    );
+    const newAccounts = await createWalletAccount(seedPhrase, network, selectedNetwork, accounts);
     dispatch(updateSoftwareAccountsAction(newAccounts));
   };
 
@@ -399,7 +387,7 @@ const useWalletReducer = () => {
   const changeNetwork = async (changedNetwork: SettingsNetwork) => {
     // Save current custom account names
     const currentNetworkType = network.type;
-    const customAccountNames = softwareAccountsList.map((account) => ({
+    const customAccountNames = accounts.map((account) => ({
       id: account.id,
       name: account.accountName,
     }));
@@ -432,7 +420,7 @@ const useWalletReducer = () => {
     const nextAccounts: Account[] = [];
 
     // we recreate the same number of accounts on the new network
-    for (let i = 0; i < softwareAccountsList.length; i++) {
+    for (let i = 0; i < accounts.length; i++) {
       const account = await createSingleAccount(
         seedPhrase,
         i,
@@ -475,7 +463,7 @@ const useWalletReducer = () => {
     if (updatedAccount.accountType !== 'software') {
       throw new Error('Expected software account. Renaming cancelled.');
     }
-    const newAccountsList = softwareAccountsList.map((account) =>
+    const newAccountsList = accounts.map((account) =>
       account.id === updatedAccount.id ? updatedAccount : account,
     );
 

From 8fe7bac885b44059b16a9f4cbb7cecfb6fd334b2 Mon Sep 17 00:00:00 2001
From: Den <36603049+dhriaznov@users.noreply.github.com>
Date: Thu, 3 Oct 2024 11:17:58 +0200
Subject: [PATCH 154/227] [ENG-5196] [ENG-5199] Remove Transactions title when
 there are tabs, remove right arrow for Reset wallet (#609)

* [ENG-5196] [ENG-5199] Remove Transactions title when there are tabs, remove right arrow for Reset wallet

* Update the transactionHistory e2e test

* Remove the unnecessary prop type from the Button component
---
 src/app/components/resetWallet/index.tsx      |  1 +
 src/app/screens/backupWallet/index.tsx        | 10 ++--
 src/app/screens/coinDashboard/index.tsx       |  3 +-
 .../coinDashboard/transactionsHistoryList.tsx | 55 +++++++++++--------
 src/app/screens/ordinalDetail/index.tsx       |  4 +-
 src/app/screens/settings/index.tsx            |  4 +-
 .../settings/security/backupWallet/index.tsx  | 28 ++++------
 src/app/screens/settings/security/index.tsx   |  1 +
 .../settings/settingComponent/index.tsx       | 15 +++--
 src/app/ui-library/button.tsx                 | 19 ++-----
 src/locales/en.json                           |  2 +-
 tests/specs/transactionHistory.spec.ts        |  2 +-
 12 files changed, 73 insertions(+), 71 deletions(-)

diff --git a/src/app/components/resetWallet/index.tsx b/src/app/components/resetWallet/index.tsx
index d90dda642..eef9a344d 100644
--- a/src/app/components/resetWallet/index.tsx
+++ b/src/app/components/resetWallet/index.tsx
@@ -31,6 +31,7 @@ function ResetWalletPrompt({
   openResetWalletScreen,
 }: Props) {
   const { t } = useTranslation('translation', { keyPrefix: 'SETTING_SCREEN' });
+
   return (
     <Sheet
       visible={showResetWalletPrompt}
diff --git a/src/app/screens/backupWallet/index.tsx b/src/app/screens/backupWallet/index.tsx
index 58483a5b1..7751a10ec 100644
--- a/src/app/screens/backupWallet/index.tsx
+++ b/src/app/screens/backupWallet/index.tsx
@@ -10,8 +10,8 @@ import styled from 'styled-components';
 
 const Container = styled.div((props) => ({
   flex: 1,
-  paddingLeft: props.theme.spacing(8),
-  paddingRight: props.theme.spacing(8),
+  paddingLeft: props.theme.space.m,
+  paddingRight: props.theme.space.m,
   display: 'flex',
   flexDirection: 'column',
 }));
@@ -27,7 +27,7 @@ const ContentContainer = styled.div((props) => ({
   display: 'flex',
   flexDirection: 'column',
   justifyContent: 'center',
-  marginBottom: props.theme.spacing(32),
+  marginBottom: props.theme.space.xxxl,
 }));
 
 const Title = styled.h1((props) => ({
@@ -46,7 +46,7 @@ const BackupActionsContainer = styled.div((props) => ({
   display: 'flex',
   flexDirection: 'row',
   justifyContent: 'space-between',
-  marginTop: props.theme.spacing(20),
+  marginTop: props.theme.space.xxl,
   width: '100%',
   columnGap: props.theme.space.xs,
 }));
@@ -55,7 +55,7 @@ const LoadingContainer = styled.div((props) => ({
   display: 'flex',
   justifyContent: 'center',
   alignItems: 'center',
-  marginTop: props.theme.spacing(20),
+  marginTop: props.theme.space.xxl,
   width: '100%',
 }));
 
diff --git a/src/app/screens/coinDashboard/index.tsx b/src/app/screens/coinDashboard/index.tsx
index 56e89c919..13df8e350 100644
--- a/src/app/screens/coinDashboard/index.tsx
+++ b/src/app/screens/coinDashboard/index.tsx
@@ -50,7 +50,7 @@ const SecondaryContainer = styled.div((props) => ({
   flexDirection: 'column',
   paddingLeft: props.theme.space.m,
   paddingRight: props.theme.space.m,
-  marginTop: props.theme.space.xl,
+  marginTop: props.theme.space.l,
   marginBottom: props.theme.space.xl,
   h1: {
     ...props.theme.typography.body_medium_m,
@@ -295,6 +295,7 @@ export default function CoinDashboard() {
             brc20Token={protocol === 'brc-20' ? selectedFt?.principal || null : null}
             runeToken={protocol === 'runes' ? selectedFt?.name || null : null}
             runeSymbol={protocol === 'runes' ? selectedFt?.runeSymbol || null : null}
+            withTitle={!displayTabs}
           />
         )}
         {showStxContract && (
diff --git a/src/app/screens/coinDashboard/transactionsHistoryList.tsx b/src/app/screens/coinDashboard/transactionsHistoryList.tsx
index f78c73e08..a2bf69848 100644
--- a/src/app/screens/coinDashboard/transactionsHistoryList.tsx
+++ b/src/app/screens/coinDashboard/transactionsHistoryList.tsx
@@ -34,18 +34,18 @@ import { useMemo } from 'react';
 import { useTranslation } from 'react-i18next';
 import styled from 'styled-components';
 
-const ListItemsContainer = styled.div({
+const ListItemsContainer = styled.div((props) => ({
   display: 'flex',
   flexDirection: 'column',
   flex: 1,
-});
+  marginTop: props.theme.space.l,
+}));
 
 const ListHeader = styled.h1((props) => ({
-  marginTop: props.theme.spacing(20),
-  marginBottom: props.theme.spacing(12),
-  marginLeft: props.theme.spacing(8),
-  marginRight: props.theme.spacing(8),
-  ...props.theme.headline_s,
+  ...props.theme.typography.headline_xs,
+  margin: props.theme.space.m,
+  marginTop: 0,
+  marginBottom: props.theme.space.l,
 }));
 
 const LoadingContainer = styled.div({
@@ -65,7 +65,7 @@ const NoTransactionsContainer = styled.div((props) => ({
 }));
 
 const GroupContainer = styled(animated.div)((props) => ({
-  marginBottom: props.theme.spacing(8),
+  marginBottom: props.theme.space.m,
 }));
 
 const SectionHeader = styled.div((props) => ({
@@ -73,8 +73,8 @@ const SectionHeader = styled.div((props) => ({
   flexDirection: 'row',
   alignItems: 'center',
   marginBottom: props.theme.spacing(7),
-  paddingLeft: props.theme.spacing(8),
-  paddingRight: props.theme.spacing(8),
+  paddingLeft: props.theme.space.m,
+  paddingRight: props.theme.space.m,
 }));
 
 const SectionSeparator = styled.div((props) => ({
@@ -86,17 +86,9 @@ const SectionSeparator = styled.div((props) => ({
 const SectionTitle = styled.p((props) => ({
   ...props.theme.body_xs,
   color: props.theme.colors.white_200,
-  marginRight: props.theme.spacing(4),
+  marginRight: props.theme.space.xs,
 }));
 
-interface TransactionsHistoryListProps {
-  coin: CurrencyTypes;
-  stxTxFilter: string | null;
-  brc20Token: string | null;
-  runeToken: string | null;
-  runeSymbol: string | null;
-}
-
 const sortTransactionsByBlockHeight = (transactions: BtcTransactionData[]) =>
   transactions.sort((txA, txB) => {
     if (txB.blockHeight > txA.blockHeight) {
@@ -189,8 +181,24 @@ const filterStxTxs = (
     );
   });
 
-export default function TransactionsHistoryList(props: TransactionsHistoryListProps) {
-  const { coin, stxTxFilter, brc20Token, runeToken, runeSymbol } = props;
+type Props = {
+  coin: CurrencyTypes;
+  stxTxFilter: string | null;
+  brc20Token: string | null;
+  runeToken: string | null;
+  runeSymbol: string | null;
+  withTitle?: boolean;
+};
+
+function TransactionsHistoryList({
+  coin,
+  stxTxFilter,
+  brc20Token,
+  runeToken,
+  runeSymbol,
+  withTitle = true,
+}: Props) {
+  const { t } = useTranslation('translation', { keyPrefix: 'COIN_DASHBOARD_SCREEN' });
   const selectedAccount = useSelectedAccount();
   const { network, selectedAccountType } = useWalletSelector();
   const btcClient = useBtcClient();
@@ -209,7 +217,6 @@ export default function TransactionsHistoryList(props: TransactionsHistoryListPr
     },
   });
 
-  const { t } = useTranslation('translation', { keyPrefix: 'COIN_DASHBOARD_SCREEN' });
   const wallet = selectedAccount
     ? {
         ...selectedAccount,
@@ -249,7 +256,7 @@ export default function TransactionsHistoryList(props: TransactionsHistoryListPr
 
   return (
     <ListItemsContainer>
-      <ListHeader>{t('TRANSACTION_HISTORY_TITLE')}</ListHeader>
+      {withTitle && <ListHeader>{t('TRANSACTION_HISTORY_TITLE')}</ListHeader>}
       {groupedTxs &&
         !isLoading &&
         Object.keys(groupedTxs).map((group) => (
@@ -317,3 +324,5 @@ export default function TransactionsHistoryList(props: TransactionsHistoryListPr
     </ListItemsContainer>
   );
 }
+
+export default TransactionsHistoryList;
diff --git a/src/app/screens/ordinalDetail/index.tsx b/src/app/screens/ordinalDetail/index.tsx
index 52dc44216..22bd4c6bb 100644
--- a/src/app/screens/ordinalDetail/index.tsx
+++ b/src/app/screens/ordinalDetail/index.tsx
@@ -526,7 +526,7 @@ function OrdinalDetailScreen() {
           <Button
             variant="tertiary"
             icon={<img src={ArrowLeft} alt="go back" />}
-            dataTestId="back-to-gallery"
+            data-testid="back-to-gallery"
             onClick={handleBackButtonClick}
             title={backButtonText}
           />
@@ -561,7 +561,7 @@ function OrdinalDetailScreen() {
           <Button
             variant="tertiary"
             icon={<img src={ArrowLeft} alt="go back" />}
-            dataTestId="back-button"
+            data-testid="back-button"
             onClick={handleBackButtonClick}
             title={backButtonText}
           />
diff --git a/src/app/screens/settings/index.tsx b/src/app/screens/settings/index.tsx
index b0b4209ec..685c720e4 100644
--- a/src/app/screens/settings/index.tsx
+++ b/src/app/screens/settings/index.tsx
@@ -17,8 +17,8 @@ const Container = styled.div`
 
 const Title = styled.h1((props) => ({
   ...props.theme.typography.headline_l,
-  paddingTop: props.theme.space.xxl,
-  paddingBottom: props.theme.space.m,
+  marginTop: props.theme.space.xxl,
+  marginBottom: props.theme.space.s,
 }));
 
 function Setting() {
diff --git a/src/app/screens/settings/security/backupWallet/index.tsx b/src/app/screens/settings/security/backupWallet/index.tsx
index 16ec8a7bd..4ca405edc 100644
--- a/src/app/screens/settings/security/backupWallet/index.tsx
+++ b/src/app/screens/settings/security/backupWallet/index.tsx
@@ -3,7 +3,7 @@ import BottomBar from '@components/tabBar';
 import TopRow from '@components/topRow';
 import useSeedVault from '@hooks/useSeedVault';
 import SeedCheck from '@screens/backupWalletSteps/seedCheck';
-import { Container, Title } from '@screens/settings/index.styles';
+import { Container } from '@screens/settings/index.styles';
 import { useEffect, useState } from 'react';
 import { useTranslation } from 'react-i18next';
 import { useNavigate } from 'react-router-dom';
@@ -12,16 +12,10 @@ import styled from 'styled-components';
 const EnterPasswordContainer = styled.div((props) => ({
   width: '100%',
   height: '100%',
-  top: 0,
-  left: 0,
-  bottom: 0,
-  right: 0,
-  position: 'fixed',
   zIndex: 10,
   background: props.theme.colors.elevation0,
   backdropFilter: 'blur(16px)',
-  padding: 16,
-  paddingTop: props.theme.spacing(40),
+  paddingTop: props.theme.space.l,
 }));
 
 const SeedphraseContainer = styled.div((props) => ({
@@ -30,10 +24,10 @@ const SeedphraseContainer = styled.div((props) => ({
 
 function BackupWalletScreen() {
   const { t } = useTranslation('translation');
-  const [password, setPassword] = useState<string>('');
-  const [error, setError] = useState<string>('');
-  const [loading, setLoading] = useState<boolean>(false);
-  const [showSeed, setShowSeed] = useState<boolean>(false);
+  const [password, setPassword] = useState('');
+  const [error, setError] = useState('');
+  const [loading, setLoading] = useState(false);
+  const [showSeed, setShowSeed] = useState(false);
   const [seed, setSeed] = useState('');
   const navigate = useNavigate();
   const { getSeed, unlockVault } = useSeedVault();
@@ -49,7 +43,7 @@ function BackupWalletScreen() {
     };
   }, []);
 
-  const goBack = () => {
+  const handleBackButtonClick = () => {
     navigate(-1);
   };
 
@@ -69,9 +63,8 @@ function BackupWalletScreen() {
 
   return (
     <>
-      <TopRow onClick={goBack} />
+      <TopRow onClick={handleBackButtonClick} />
       <Container>
-        <Title>{t('SETTING_SCREEN.BACKUP_WALLET')}</Title>
         {!showSeed && (
           <EnterPasswordContainer>
             <PasswordInput
@@ -80,15 +73,16 @@ function BackupWalletScreen() {
               enteredPassword={password}
               setEnteredPassword={setPassword}
               handleContinue={handlePasswordNextClick}
-              handleBack={goBack}
+              handleBack={handleBackButtonClick}
               passwordError={error}
               stackButtonAlignment
               loading={loading}
+              autoFocus
             />
           </EnterPasswordContainer>
         )}
         <SeedphraseContainer>
-          {showSeed && <SeedCheck seedPhrase={seed} onContinue={goBack} />}
+          {showSeed && <SeedCheck seedPhrase={seed} onContinue={handleBackButtonClick} />}
         </SeedphraseContainer>
       </Container>
       <BottomBar tab="settings" />
diff --git a/src/app/screens/settings/security/index.tsx b/src/app/screens/settings/security/index.tsx
index 05198bac1..6b13959cc 100644
--- a/src/app/screens/settings/security/index.tsx
+++ b/src/app/screens/settings/security/index.tsx
@@ -109,6 +109,7 @@ function Security() {
           text={t('RESET_WALLET')}
           onClick={openResetWalletPrompt}
           showWarningTitle
+          showArrow={false}
         />
         <ResetWalletPrompt
           showResetWalletPrompt={showResetWalletPrompt}
diff --git a/src/app/screens/settings/settingComponent/index.tsx b/src/app/screens/settings/settingComponent/index.tsx
index e4c715b7d..b7fddbbf2 100644
--- a/src/app/screens/settings/settingComponent/index.tsx
+++ b/src/app/screens/settings/settingComponent/index.tsx
@@ -26,11 +26,11 @@ const TitleText = styled.h1((props) => ({
   paddingTop: props.theme.space.xl,
 }));
 
-const ComponentText = styled.h1<{
-  textColor: string;
+const ComponentText = styled.p<{
+  $textColor: string;
 }>((props) => ({
   ...props.theme.typography.body_medium_l,
-  color: props.textColor,
+  color: props.$textColor,
   flex: 1,
   textAlign: 'left',
 }));
@@ -79,6 +79,7 @@ type Props = {
   onClick?: () => void;
   showDivider?: boolean;
   showWarningTitle?: boolean;
+  showArrow?: boolean;
   toggle?: boolean;
   toggleValue?: boolean;
   description?: string;
@@ -95,6 +96,7 @@ function SettingComponent({
   link,
   showDivider,
   showWarningTitle,
+  showArrow = true,
   toggle,
   toggleValue,
   description,
@@ -103,6 +105,7 @@ function SettingComponent({
   isLoading,
 }: Props) {
   const theme = useTheme();
+
   return (
     <Wrapper>
       <ColumnContainer>
@@ -113,7 +116,7 @@ function SettingComponent({
         >
           <Column>
             <ComponentText
-              textColor={showWarningTitle ? theme.colors.feedback.error : theme.colors.white['200']}
+              $textColor={showWarningTitle ? theme.colors.feedback.error : theme.colors.white_200}
             >
               {text}
             </ComponentText>
@@ -121,7 +124,9 @@ function SettingComponent({
           </Column>
           {textDetail && <ComponentDescriptionText>{textDetail}</ComponentDescriptionText>}
           {!toggle && link && <ArrowUpRight color={theme.colors.white_0} size={16} weight="bold" />}
-          {!toggle && !link && <CaretRight color={theme.colors.white_0} size={16} weight="bold" />}
+          {!toggle && !link && showArrow && (
+            <CaretRight color={theme.colors.white_0} size={16} weight="bold" />
+          )}
           {isLoading && <Spinner color="white" size={16} />}
           {toggle && toggleFunction && !isLoading && (
             <Toggle onChange={toggleFunction} checked={toggleValue ?? false} disabled={disabled} />
diff --git a/src/app/ui-library/button.tsx b/src/app/ui-library/button.tsx
index 47f130f79..d117e6338 100644
--- a/src/app/ui-library/button.tsx
+++ b/src/app/ui-library/button.tsx
@@ -1,4 +1,5 @@
 import classNames from 'classnames';
+import type React from 'react';
 import styled from 'styled-components';
 import Spinner from './spinner';
 
@@ -105,42 +106,32 @@ const CenterDiv = styled.div`
   align-content: center;
 `;
 
-type Props = {
+type Props = React.ButtonHTMLAttributes<HTMLButtonElement> & {
   title: string;
-  onClick: (e: React.MouseEvent<HTMLButtonElement>) => void;
   icon?: React.ReactNode;
   iconPosition?: 'left' | 'right';
-  disabled?: boolean;
   loading?: boolean;
+  disabled?: boolean;
   className?: string;
   variant?: ButtonVariant;
-  type?: 'button' | 'submit' | 'reset';
-  id?: string;
-  dataTestId?: string;
 };
 
 function Button({
   title,
-  onClick,
   icon,
   iconPosition = 'left',
   className,
   loading = false,
   disabled = false,
   variant = 'primary',
-  type,
-  id,
-  dataTestId,
+  ...props
 }: Props) {
   return (
     <StyledButton
+      {...props}
       className={classNames(className, variant)}
-      onClick={onClick}
       tabIndex={0}
       disabled={disabled || loading}
-      type={type}
-      id={id}
-      data-testid={dataTestId}
     >
       {loading ? (
         <Spinner />
diff --git a/src/locales/en.json b/src/locales/en.json
index 8ead71045..ac0a420d5 100644
--- a/src/locales/en.json
+++ b/src/locales/en.json
@@ -1007,7 +1007,7 @@
     "SWAP": "Swap",
     "BUY": "Buy",
     "LIST": "List",
-    "TRANSACTION_HISTORY_TITLE": "Transaction history",
+    "TRANSACTION_HISTORY_TITLE": "Transactions",
     "TRANSACTIONS_LIST_EMPTY": "No transactions found.",
     "TRANSACTIONS_LIST_ERROR": "Error fetching transaction history for this token",
     "TRANSACTION_SENT": "Sent",
diff --git a/tests/specs/transactionHistory.spec.ts b/tests/specs/transactionHistory.spec.ts
index 3d1b6e16d..51b4918c2 100644
--- a/tests/specs/transactionHistory.spec.ts
+++ b/tests/specs/transactionHistory.spec.ts
@@ -80,7 +80,7 @@ test.describe('Transaction', () => {
     await wallet.checkAndClickOnSpecificRune('SKIBIDI•OHIO•RIZZ');
     const originalBalanceAmount = await wallet.checkVisualsRunesDashboard('SKIBIDI•OHIO•RIZZ');
     await expect(originalBalanceAmount).toBeGreaterThan(0);
-    await expect(wallet.containerTransactionHistory.first()).toBeVisible();
+    await expect(wallet.containerTransactionHistory.first()).toBeHidden();
     // There should be at least one transaction visible
     await expect(await wallet.containerTransactionHistory.count()).toBeGreaterThanOrEqual(1);
     // check able to see rune bundles

From 980172b77b8b4a3ca885be6d71fb842e71612421 Mon Sep 17 00:00:00 2001
From: Terence Ng <ngtere@live.com.sg>
Date: Thu, 3 Oct 2024 17:19:15 +0800
Subject: [PATCH 155/227] add new fiat currencies (#603)

* add new currencies

* add new flags and standardize to iso flag code

* use latest core

* use hook

* rename useCoinRates

* use latest core

* use correct core
---
 .../confirmBtcTransaction/itemRow/amount.tsx  |   4 +-
 .../sections/feeSection.tsx                   |   4 +-
 .../confirmStxTransactionComponent/index.tsx  |   4 +-
 .../components/recipientComponent/index.tsx   |   4 +-
 src/app/components/speedUpTransaction/btc.tsx |   4 +-
 src/app/components/speedUpTransaction/stx.tsx |   4 +-
 src/app/components/tokenTile/index.tsx        |   4 +-
 .../transactionSetting/editBtcFee.tsx         |   4 +-
 .../transactionSetting/editStxFee.tsx         |   4 +-
 src/app/components/transferFeeView/index.tsx  |   4 +-
 src/app/hooks/queries/useAccountBalance.ts    |   4 +-
 ...eCoinRates.ts => useSupportedCoinRates.ts} |  31 +-
 src/app/screens/coinDashboard/coinHeader.tsx  |   4 +-
 .../screens/confirmBrc20Transaction/index.tsx |   4 +-
 src/app/screens/createInscription/index.tsx   |   4 +-
 src/app/screens/home/balanceCard/index.tsx    |   4 +-
 src/app/screens/home/index.tsx                |   4 +-
 src/app/screens/listRune/index.tsx            |   4 +-
 src/app/screens/listRune/setRunePriceItem.tsx |   4 +-
 src/app/screens/sendBtc/amountSelector.tsx    |   4 +-
 src/app/screens/sendRune/amountSelector.tsx   |   4 +-
 .../sendStx/steps/Step2SelectAmount.tsx       |   4 +-
 src/app/screens/sendStx/stxAmountSelector.tsx |   4 +-
 .../preferences/fiatCurrency/currencyRow.tsx  |   2 +-
 .../speedUpTransaction/customFee/index.tsx    |   4 +-
 .../tokenFromBottomSheet/useFromTokens.ts     |   4 +-
 src/app/screens/swap/index.tsx                |   4 +-
 src/app/screens/swap/quoteSummary/index.tsx   |   4 +-
 src/app/screens/swap/quotesModal/index.tsx    |   4 +-
 src/app/screens/swap/utxoSelection/index.tsx  |   4 +-
 src/app/ui-components/btcAmountSelector.tsx   |   4 +-
 src/app/utils/currency.ts                     |  83 +++-
 .../settings/currencies/{aud.svg => aus.svg}  |   0
 .../settings/currencies/{brl.svg => bra.svg}  |   0
 .../settings/currencies/{cad.svg => can.svg}  |   0
 src/assets/img/settings/currencies/che.svg    |  12 +
 .../settings/currencies/{cny.svg => chn.svg}  |   0
 .../settings/currencies/{eur.svg => eu.svg}   |   0
 .../settings/currencies/{gbp.svg => gbr.svg}  |   0
 .../settings/currencies/{hkd.svg => hkg.svg}  |   0
 src/assets/img/settings/currencies/hun.svg    |  12 +
 src/assets/img/settings/currencies/idn.svg    |  11 +
 src/assets/img/settings/currencies/ind.svg    |  17 +
 .../settings/currencies/{jpy.svg => jpn.svg}  |   0
 .../settings/currencies/{krw.svg => kor.svg}  |   0
 src/assets/img/settings/currencies/mex.svg    | 467 ++++++++++++++++++
 src/assets/img/settings/currencies/mys.svg    |  14 +
 src/assets/img/settings/currencies/nga.svg    |  11 +
 src/assets/img/settings/currencies/pak.svg    |  13 +
 src/assets/img/settings/currencies/phl.svg    |  13 +
 src/assets/img/settings/currencies/pol.svg    |  11 +
 .../settings/currencies/{rub.svg => rus.svg}  |   0
 .../settings/currencies/{sgd.svg => sgp.svg}  |   0
 src/assets/img/settings/currencies/tha.svg    |  12 +
 src/assets/img/settings/currencies/tur.svg    |  13 +
 src/assets/img/settings/currencies/twn.svg    |  34 ++
 .../settings/currencies/{usd.svg => usa.svg}  |   0
 src/assets/img/settings/currencies/vnm.svg    |  11 +
 src/assets/img/settings/currencies/zaf.svg    |  15 +
 59 files changed, 794 insertions(+), 104 deletions(-)
 rename src/app/hooks/queries/{useCoinRates.ts => useSupportedCoinRates.ts} (54%)
 rename src/assets/img/settings/currencies/{aud.svg => aus.svg} (100%)
 rename src/assets/img/settings/currencies/{brl.svg => bra.svg} (100%)
 rename src/assets/img/settings/currencies/{cad.svg => can.svg} (100%)
 create mode 100644 src/assets/img/settings/currencies/che.svg
 rename src/assets/img/settings/currencies/{cny.svg => chn.svg} (100%)
 rename src/assets/img/settings/currencies/{eur.svg => eu.svg} (100%)
 rename src/assets/img/settings/currencies/{gbp.svg => gbr.svg} (100%)
 rename src/assets/img/settings/currencies/{hkd.svg => hkg.svg} (100%)
 create mode 100644 src/assets/img/settings/currencies/hun.svg
 create mode 100644 src/assets/img/settings/currencies/idn.svg
 create mode 100644 src/assets/img/settings/currencies/ind.svg
 rename src/assets/img/settings/currencies/{jpy.svg => jpn.svg} (100%)
 rename src/assets/img/settings/currencies/{krw.svg => kor.svg} (100%)
 create mode 100644 src/assets/img/settings/currencies/mex.svg
 create mode 100644 src/assets/img/settings/currencies/mys.svg
 create mode 100644 src/assets/img/settings/currencies/nga.svg
 create mode 100644 src/assets/img/settings/currencies/pak.svg
 create mode 100644 src/assets/img/settings/currencies/phl.svg
 create mode 100644 src/assets/img/settings/currencies/pol.svg
 rename src/assets/img/settings/currencies/{rub.svg => rus.svg} (100%)
 rename src/assets/img/settings/currencies/{sgd.svg => sgp.svg} (100%)
 create mode 100644 src/assets/img/settings/currencies/tha.svg
 create mode 100644 src/assets/img/settings/currencies/tur.svg
 create mode 100644 src/assets/img/settings/currencies/twn.svg
 rename src/assets/img/settings/currencies/{usd.svg => usa.svg} (100%)
 create mode 100644 src/assets/img/settings/currencies/vnm.svg
 create mode 100644 src/assets/img/settings/currencies/zaf.svg

diff --git a/src/app/components/confirmBtcTransaction/itemRow/amount.tsx b/src/app/components/confirmBtcTransaction/itemRow/amount.tsx
index 932ab340c..6a50349d8 100644
--- a/src/app/components/confirmBtcTransaction/itemRow/amount.tsx
+++ b/src/app/components/confirmBtcTransaction/itemRow/amount.tsx
@@ -1,6 +1,6 @@
 import FiatAmountText from '@components/fiatAmountText';
 import TokenImage from '@components/tokenImage';
-import useCoinRates from '@hooks/queries/useCoinRates';
+import useSupportedCoinRates from '@hooks/queries/useSupportedCoinRates';
 import useWalletSelector from '@hooks/useWalletSelector';
 import { getBtcFiatEquivalent, satsToBtc } from '@secretkeylabs/xverse-core';
 import { StyledP } from '@ui-library/common.styled';
@@ -50,7 +50,7 @@ type Props = {
 
 export default function Amount({ amount }: Props) {
   const { fiatCurrency } = useWalletSelector();
-  const { btcFiatRate } = useCoinRates();
+  const { btcFiatRate } = useSupportedCoinRates();
   const { t } = useTranslation('translation');
 
   if (!amount) return null;
diff --git a/src/app/components/confirmBtcTransaction/sections/feeSection.tsx b/src/app/components/confirmBtcTransaction/sections/feeSection.tsx
index a23b65251..d3f42110e 100644
--- a/src/app/components/confirmBtcTransaction/sections/feeSection.tsx
+++ b/src/app/components/confirmBtcTransaction/sections/feeSection.tsx
@@ -1,5 +1,5 @@
 import TransferFeeView from '@components/transferFeeView';
-import useCoinRates from '@hooks/queries/useCoinRates';
+import useSupportedCoinRates from '@hooks/queries/useSupportedCoinRates';
 import useBtcFeeRate from '@hooks/useBtcFeeRate';
 import useWalletSelector from '@hooks/useWalletSelector';
 import {
@@ -55,7 +55,7 @@ function FeeSection({
   const { t } = useTranslation('translation', { keyPrefix: 'CONFIRM_TRANSACTION' });
   const { t: tUnits } = useTranslation('translation', { keyPrefix: 'UNITS' });
   const { data: recommendedFees } = useBtcFeeRate();
-  const { btcFiatRate } = useCoinRates();
+  const { btcFiatRate } = useSupportedCoinRates();
 
   const { extractedTxSummary } = useTxSummaryContext();
 
diff --git a/src/app/components/confirmStxTransactionComponent/index.tsx b/src/app/components/confirmStxTransactionComponent/index.tsx
index 644484171..f69a1c299 100644
--- a/src/app/components/confirmStxTransactionComponent/index.tsx
+++ b/src/app/components/confirmStxTransactionComponent/index.tsx
@@ -5,8 +5,8 @@ import BottomModal from '@components/bottomModal';
 import ActionButton from '@components/button';
 import LedgerConnectionView from '@components/ledger/connectLedgerView';
 import TransactionSettingAlert from '@components/transactionSetting';
-import useCoinRates from '@hooks/queries/useCoinRates';
 import useStxWalletData from '@hooks/queries/useStxWalletData';
+import useSupportedCoinRates from '@hooks/queries/useSupportedCoinRates';
 import useNetworkSelector from '@hooks/useNetwork';
 import useSeedVault from '@hooks/useSeedVault';
 import useSelectedAccount from '@hooks/useSelectedAccount';
@@ -96,7 +96,7 @@ function ConfirmStxTransactionComponent({
     keyPrefix: 'TRANSACTION_SETTING',
   });
   const selectedNetwork = useNetworkSelector();
-  const { stxBtcRate, btcFiatRate } = useCoinRates();
+  const { stxBtcRate, btcFiatRate } = useSupportedCoinRates();
   const { data: stxData } = useStxWalletData();
   const { getSeed } = useSeedVault();
   const [showFeeSettings, setShowFeeSettings] = useState(false);
diff --git a/src/app/components/recipientComponent/index.tsx b/src/app/components/recipientComponent/index.tsx
index 65c101640..5a14ef5ed 100644
--- a/src/app/components/recipientComponent/index.tsx
+++ b/src/app/components/recipientComponent/index.tsx
@@ -3,7 +3,7 @@ import WalletIcon from '@assets/img/transactions/wallet.svg';
 import { StyledFiatAmountText } from '@components/fiatAmountText';
 import TokenImage from '@components/tokenImage';
 import TransferDetailView from '@components/transferDetailView';
-import useCoinRates from '@hooks/queries/useCoinRates';
+import useSupportedCoinRates from '@hooks/queries/useSupportedCoinRates';
 import useSelectedAccount from '@hooks/useSelectedAccount';
 import useWalletSelector from '@hooks/useWalletSelector';
 import { CubeTransparent } from '@phosphor-icons/react';
@@ -155,7 +155,7 @@ function RecipientComponent({
   const [fiatAmount, setFiatAmount] = useState<string | undefined>('0');
   const { ordinalsAddress } = useSelectedAccount();
   const { fiatCurrency } = useWalletSelector();
-  const { btcFiatRate, stxBtcRate } = useCoinRates();
+  const { btcFiatRate, stxBtcRate } = useSupportedCoinRates();
 
   useEffect(() => {
     setFiatAmount(
diff --git a/src/app/components/speedUpTransaction/btc.tsx b/src/app/components/speedUpTransaction/btc.tsx
index f6d69a7ac..59d266a5b 100644
--- a/src/app/components/speedUpTransaction/btc.tsx
+++ b/src/app/components/speedUpTransaction/btc.tsx
@@ -1,5 +1,5 @@
 import FiatAmountText from '@components/fiatAmountText';
-import useCoinRates from '@hooks/queries/useCoinRates';
+import useSupportedCoinRates from '@hooks/queries/useSupportedCoinRates';
 import useWalletSelector from '@hooks/useWalletSelector';
 import { getBtcFiatEquivalent } from '@secretkeylabs/xverse-core';
 import { EMPTY_LABEL } from '@utils/constants';
@@ -74,7 +74,7 @@ function SpeedUpBtcTransaction({
   const { t } = useTranslation('translation', { keyPrefix: 'SPEED_UP_TRANSACTION' });
   const { t: tUnits } = useTranslation('translation', { keyPrefix: 'UNITS' });
   const { fiatCurrency } = useWalletSelector();
-  const { btcFiatRate } = useCoinRates();
+  const { btcFiatRate } = useSupportedCoinRates();
 
   const theme = useTheme();
 
diff --git a/src/app/components/speedUpTransaction/stx.tsx b/src/app/components/speedUpTransaction/stx.tsx
index 69a6d44a8..23d070dff 100644
--- a/src/app/components/speedUpTransaction/stx.tsx
+++ b/src/app/components/speedUpTransaction/stx.tsx
@@ -1,5 +1,5 @@
 import FiatAmountText from '@components/fiatAmountText';
-import useCoinRates from '@hooks/queries/useCoinRates';
+import useSupportedCoinRates from '@hooks/queries/useSupportedCoinRates';
 import useWalletSelector from '@hooks/useWalletSelector';
 import { getStxFiatEquivalent, stxToMicrostacks } from '@secretkeylabs/xverse-core';
 import { EMPTY_LABEL } from '@utils/constants';
@@ -73,7 +73,7 @@ function SpeedUpStxTransaction({
 }: Props) {
   const { t } = useTranslation('translation', { keyPrefix: 'SPEED_UP_TRANSACTION' });
   const { fiatCurrency } = useWalletSelector();
-  const { btcFiatRate, stxBtcRate } = useCoinRates();
+  const { btcFiatRate, stxBtcRate } = useSupportedCoinRates();
   const theme = useTheme();
 
   return (
diff --git a/src/app/components/tokenTile/index.tsx b/src/app/components/tokenTile/index.tsx
index 284152719..3e4b452e6 100644
--- a/src/app/components/tokenTile/index.tsx
+++ b/src/app/components/tokenTile/index.tsx
@@ -2,8 +2,8 @@ import { BetterBarLoader } from '@components/barLoader';
 import { StyledFiatAmountText } from '@components/fiatAmountText';
 import TokenImage from '@components/tokenImage';
 import useBtcWalletData from '@hooks/queries/useBtcWalletData';
-import useCoinRates from '@hooks/queries/useCoinRates';
 import useStxWalletData from '@hooks/queries/useStxWalletData';
+import useSupportedCoinRates from '@hooks/queries/useSupportedCoinRates';
 import useWalletSelector from '@hooks/useWalletSelector';
 import { getFiatEquivalent, type FungibleToken } from '@secretkeylabs/xverse-core';
 import type { CurrencyTypes } from '@utils/constants';
@@ -119,7 +119,7 @@ function TokenTile({
   hideBalance = false,
 }: Props) {
   const { fiatCurrency } = useWalletSelector();
-  const { btcFiatRate, stxBtcRate } = useCoinRates();
+  const { btcFiatRate, stxBtcRate } = useSupportedCoinRates();
   const { data: stxData } = useStxWalletData();
   const { data: btcBalance } = useBtcWalletData();
 
diff --git a/src/app/components/transactionSetting/editBtcFee.tsx b/src/app/components/transactionSetting/editBtcFee.tsx
index eb012a6e1..f2e04dae2 100644
--- a/src/app/components/transactionSetting/editBtcFee.tsx
+++ b/src/app/components/transactionSetting/editBtcFee.tsx
@@ -1,6 +1,6 @@
 import FiatAmountText from '@components/fiatAmountText';
 import useBtcClient from '@hooks/apiClients/useBtcClient';
-import useCoinRates from '@hooks/queries/useCoinRates';
+import useSupportedCoinRates from '@hooks/queries/useSupportedCoinRates';
 import useBtcFees from '@hooks/useBtcFees';
 import useDebounce from '@hooks/useDebounce';
 import useOrdinalsByAddress from '@hooks/useOrdinalsByAddress';
@@ -189,7 +189,7 @@ function EditBtcFee({
   const selectedAccount = useSelectedAccount();
   const { btcAddress, ordinalsAddress } = selectedAccount;
   const { network, fiatCurrency } = useWalletSelector();
-  const { btcFiatRate } = useCoinRates();
+  const { btcFiatRate } = useSupportedCoinRates();
   const [totalFee, setTotalFee] = useState(fee);
   const [feeRateInput, setFeeRateInput] = useState(feeRate?.toString() ?? '');
   const inputRef = useRef<HTMLInputElement>(null);
diff --git a/src/app/components/transactionSetting/editStxFee.tsx b/src/app/components/transactionSetting/editStxFee.tsx
index 117c68e9e..4cd551c8c 100644
--- a/src/app/components/transactionSetting/editStxFee.tsx
+++ b/src/app/components/transactionSetting/editStxFee.tsx
@@ -1,5 +1,5 @@
 import FiatAmountText from '@components/fiatAmountText';
-import useCoinRates from '@hooks/queries/useCoinRates';
+import useSupportedCoinRates from '@hooks/queries/useSupportedCoinRates';
 import useWalletSelector from '@hooks/useWalletSelector';
 import { getStxFiatEquivalent, stxToMicrostacks } from '@secretkeylabs/xverse-core';
 import BigNumber from 'bignumber.js';
@@ -129,7 +129,7 @@ function EditStxFee({
 }: Props) {
   const { t } = useTranslation('translation');
   const { fiatCurrency } = useWalletSelector();
-  const { btcFiatRate, stxBtcRate } = useCoinRates();
+  const { btcFiatRate, stxBtcRate } = useSupportedCoinRates();
   const [totalFee, setTotalFee] = useState(fee);
   const [feeRateInput, setFeeRateInput] = useState(feeRate?.toString() ?? '');
   const inputRef = useRef<HTMLInputElement>(null);
diff --git a/src/app/components/transferFeeView/index.tsx b/src/app/components/transferFeeView/index.tsx
index 2dffa4b04..0f0c04a00 100644
--- a/src/app/components/transferFeeView/index.tsx
+++ b/src/app/components/transferFeeView/index.tsx
@@ -1,6 +1,6 @@
 import AmountWithInscriptionSatribute from '@components/confirmBtcTransaction/itemRow/amountWithInscriptionSatribute';
 import FiatAmountText from '@components/fiatAmountText';
-import useCoinRates from '@hooks/queries/useCoinRates';
+import useSupportedCoinRates from '@hooks/queries/useSupportedCoinRates';
 import useWalletSelector from '@hooks/useWalletSelector';
 import {
   btcTransaction,
@@ -71,7 +71,7 @@ function TransferFeeView({
   const { t: tUnits } = useTranslation('translation', { keyPrefix: 'UNITS' });
 
   const { fiatCurrency } = useWalletSelector();
-  const { btcFiatRate, stxBtcRate } = useCoinRates();
+  const { btcFiatRate, stxBtcRate } = useSupportedCoinRates();
 
   return (
     <Container>
diff --git a/src/app/hooks/queries/useAccountBalance.ts b/src/app/hooks/queries/useAccountBalance.ts
index 93231e953..9baa4b6ee 100644
--- a/src/app/hooks/queries/useAccountBalance.ts
+++ b/src/app/hooks/queries/useAccountBalance.ts
@@ -1,6 +1,6 @@
 import useBtcClient from '@hooks/apiClients/useBtcClient';
 import useRunesApi from '@hooks/apiClients/useRunesApi';
-import useCoinRates from '@hooks/queries/useCoinRates';
+import useSupportedCoinRates from '@hooks/queries/useSupportedCoinRates';
 import useNetworkSelector from '@hooks/useNetwork';
 import useWalletSelector from '@hooks/useWalletSelector';
 import {
@@ -31,7 +31,7 @@ const useAccountBalance = () => {
     sip10ManageTokens,
     runesManageTokens,
   } = useWalletSelector();
-  const { btcFiatRate, stxBtcRate } = useCoinRates();
+  const { btcFiatRate, stxBtcRate } = useSupportedCoinRates();
   const runesApi = useRunesApi();
   const dispatch = useDispatch();
   const queue = useRef<Account[]>([]);
diff --git a/src/app/hooks/queries/useCoinRates.ts b/src/app/hooks/queries/useSupportedCoinRates.ts
similarity index 54%
rename from src/app/hooks/queries/useCoinRates.ts
rename to src/app/hooks/queries/useSupportedCoinRates.ts
index c837035f6..20b43ba8a 100644
--- a/src/app/hooks/queries/useCoinRates.ts
+++ b/src/app/hooks/queries/useSupportedCoinRates.ts
@@ -1,27 +1,22 @@
+import useXverseApi from '@hooks/apiClients/useXverseApi';
 import useWalletSelector from '@hooks/useWalletSelector';
-import {
-  fetchBtcToCurrencyRate,
-  fetchStxToBtcRate,
-  type NetworkType,
-  type SupportedCurrency,
-} from '@secretkeylabs/xverse-core';
+import { type SupportedCurrency } from '@secretkeylabs/xverse-core';
 import { useQuery } from '@tanstack/react-query';
 
-const useGetRates = (fiatCurrency: SupportedCurrency, networkType: NetworkType) => {
+const useGetSupportedRates = (fiatCurrency: SupportedCurrency) => {
+  const xverseApi = useXverseApi();
   const fetchCoinRates = async () => {
     try {
-      const btcFiatRate = await fetchBtcToCurrencyRate(networkType, {
+      const btcFiatRate = await xverseApi.fetchBtcToCurrencyRate({
         fiatCurrency,
       });
-
       const btcUsdRate =
         fiatCurrency === 'USD'
           ? btcFiatRate
-          : await fetchBtcToCurrencyRate(networkType, {
+          : await xverseApi.fetchBtcToCurrencyRate({
               fiatCurrency: 'USD' as SupportedCurrency,
             });
-
-      const stxBtcRate = await fetchStxToBtcRate(networkType);
+      const stxBtcRate = await xverseApi.fetchStxToBtcRate();
       return { stxBtcRate, btcFiatRate, btcUsdRate };
     } catch (e: any) {
       return Promise.reject(e);
@@ -29,17 +24,15 @@ const useGetRates = (fiatCurrency: SupportedCurrency, networkType: NetworkType)
   };
 
   return useQuery({
-    queryKey: ['coin_rates', fiatCurrency, networkType],
+    queryKey: ['coin_rates', fiatCurrency],
     queryFn: fetchCoinRates,
     staleTime: 5 * 60 * 1000, // 5 min
   });
 };
 
-const useCoinRates = () => {
-  const { fiatCurrency, network } = useWalletSelector();
-
-  const { data } = useGetRates(fiatCurrency, network.type);
-
+const useSupportedCoinRates = () => {
+  const { fiatCurrency } = useWalletSelector();
+  const { data } = useGetSupportedRates(fiatCurrency);
   const stxBtcRate = data?.stxBtcRate.toString() || '0';
   const btcFiatRate = data?.btcFiatRate.toString() || '0';
   const btcUsdRate = data?.btcUsdRate?.toString() || '0';
@@ -47,4 +40,4 @@ const useCoinRates = () => {
   return { stxBtcRate, btcFiatRate, btcUsdRate };
 };
 
-export default useCoinRates;
+export default useSupportedCoinRates;
diff --git a/src/app/screens/coinDashboard/coinHeader.tsx b/src/app/screens/coinDashboard/coinHeader.tsx
index e74337d8b..416f46845 100644
--- a/src/app/screens/coinDashboard/coinHeader.tsx
+++ b/src/app/screens/coinDashboard/coinHeader.tsx
@@ -9,8 +9,8 @@ import ActionButton from '@components/button';
 import SmallActionButton from '@components/smallActionButton';
 import TokenImage from '@components/tokenImage';
 import useBtcWalletData from '@hooks/queries/useBtcWalletData';
-import useCoinRates from '@hooks/queries/useCoinRates';
 import useStxWalletData from '@hooks/queries/useStxWalletData';
+import useSupportedCoinRates from '@hooks/queries/useSupportedCoinRates';
 import useHasFeature from '@hooks/useHasFeature';
 import useSelectedAccount from '@hooks/useSelectedAccount';
 import useWalletSelector from '@hooks/useWalletSelector';
@@ -61,7 +61,7 @@ export default function CoinHeader({ currency, fungibleToken }: Props) {
   const { fiatCurrency, network, selectedAccountType } = useWalletSelector();
   const { data: btcBalance } = useBtcWalletData();
   const { data: stxData } = useStxWalletData();
-  const { btcFiatRate, stxBtcRate } = useCoinRates();
+  const { btcFiatRate, stxBtcRate } = useSupportedCoinRates();
   const navigate = useNavigate();
   const { t } = useTranslation('translation', { keyPrefix: 'COIN_DASHBOARD_SCREEN' });
   const [openReceiveModal, setOpenReceiveModal] = useState(false);
diff --git a/src/app/screens/confirmBrc20Transaction/index.tsx b/src/app/screens/confirmBrc20Transaction/index.tsx
index 1439d3ba5..3fe59c373 100644
--- a/src/app/screens/confirmBrc20Transaction/index.tsx
+++ b/src/app/screens/confirmBrc20Transaction/index.tsx
@@ -2,7 +2,7 @@ import InfoContainer from '@components/infoContainer';
 import BottomBar from '@components/tabBar';
 import TopRow from '@components/topRow';
 import TransactionDetailComponent from '@components/transactionDetailComponent';
-import useCoinRates from '@hooks/queries/useCoinRates';
+import useSupportedCoinRates from '@hooks/queries/useSupportedCoinRates';
 import useBtcFeeRate from '@hooks/useBtcFeeRate';
 import useDebounce from '@hooks/useDebounce';
 import { useResetUserFlow } from '@hooks/useResetUserFlow';
@@ -53,7 +53,7 @@ function ConfirmBrc20Transaction() {
   const { network, fiatCurrency, feeMultipliers } = useWalletSelector();
   const selectedAccount = useSelectedAccount();
   const { btcAddress, ordinalsAddress } = selectedAccount;
-  const { btcFiatRate } = useCoinRates();
+  const { btcFiatRate } = useSupportedCoinRates();
   const navigate = useNavigate();
   const {
     recipientAddress,
diff --git a/src/app/screens/createInscription/index.tsx b/src/app/screens/createInscription/index.tsx
index f35fd0809..c6c3337cd 100644
--- a/src/app/screens/createInscription/index.tsx
+++ b/src/app/screens/createInscription/index.tsx
@@ -28,8 +28,8 @@ import useWalletSelector from '@hooks/useWalletSelector';
 import { isLedgerAccount } from '@utils/helper';
 
 import useBtcClient from '@hooks/apiClients/useBtcClient';
-import useCoinRates from '@hooks/queries/useCoinRates';
 import useConfirmedBtcBalance from '@hooks/queries/useConfirmedBtcBalance';
+import useSupportedCoinRates from '@hooks/queries/useSupportedCoinRates';
 import useSelectedAccount from '@hooks/useSelectedAccount';
 import useTransactionContext from '@hooks/useTransactionContext';
 import Button from '@ui-library/button';
@@ -108,7 +108,7 @@ function CreateInscription() {
   const selectedAccount = useSelectedAccount();
   const { ordinalsAddress, btcAddress } = selectedAccount;
   const { network, fiatCurrency } = useWalletSelector();
-  const { btcFiatRate } = useCoinRates();
+  const { btcFiatRate } = useSupportedCoinRates();
 
   const transactionContext = useTransactionContext();
 
diff --git a/src/app/screens/home/balanceCard/index.tsx b/src/app/screens/home/balanceCard/index.tsx
index cf240a745..65f86d119 100644
--- a/src/app/screens/home/balanceCard/index.tsx
+++ b/src/app/screens/home/balanceCard/index.tsx
@@ -4,8 +4,8 @@ import { useVisibleRuneFungibleTokens } from '@hooks/queries/runes/useRuneFungib
 import { useVisibleSip10FungibleTokens } from '@hooks/queries/stx/useGetSip10FungibleTokens';
 import useAccountBalance from '@hooks/queries/useAccountBalance';
 import useBtcWalletData from '@hooks/queries/useBtcWalletData';
-import useCoinRates from '@hooks/queries/useCoinRates';
 import useStxWalletData from '@hooks/queries/useStxWalletData';
+import useSupportedCoinRates from '@hooks/queries/useSupportedCoinRates';
 import useSelectedAccount from '@hooks/useSelectedAccount';
 import useWalletSelector from '@hooks/useWalletSelector';
 import { currencySymbolMap } from '@secretkeylabs/xverse-core';
@@ -76,7 +76,7 @@ function BalanceCard(props: BalanceCardProps) {
   const { fiatCurrency, hideStx, accountBalances } = useWalletSelector();
   const { data: btcBalance } = useBtcWalletData();
   const { data: stxData } = useStxWalletData();
-  const { btcFiatRate, stxBtcRate } = useCoinRates();
+  const { btcFiatRate, stxBtcRate } = useSupportedCoinRates();
   const { setAccountBalance } = useAccountBalance();
   const { isLoading, isRefetching } = props;
   const oldTotalBalance = accountBalances[selectedAccount.btcAddress];
diff --git a/src/app/screens/home/index.tsx b/src/app/screens/home/index.tsx
index 13048de76..788b12f33 100644
--- a/src/app/screens/home/index.tsx
+++ b/src/app/screens/home/index.tsx
@@ -15,10 +15,10 @@ import { useVisibleRuneFungibleTokens } from '@hooks/queries/runes/useRuneFungib
 import { useVisibleSip10FungibleTokens } from '@hooks/queries/stx/useGetSip10FungibleTokens';
 import useAppConfig from '@hooks/queries/useAppConfig';
 import useBtcWalletData from '@hooks/queries/useBtcWalletData';
-import useCoinRates from '@hooks/queries/useCoinRates';
 import useFeeMultipliers from '@hooks/queries/useFeeMultipliers';
 import useSpamTokens from '@hooks/queries/useSpamTokens';
 import useStxWalletData from '@hooks/queries/useStxWalletData';
+import useSupportedCoinRates from '@hooks/queries/useSupportedCoinRates';
 import useAvatarCleanup from '@hooks/useAvatarCleanup';
 import useHasFeature from '@hooks/useHasFeature';
 import useNotificationBanners from '@hooks/useNotificationBanners';
@@ -110,7 +110,7 @@ function Home() {
     useBtcWalletData();
   const { isInitialLoading: loadingStxWalletData, isRefetching: refetchingStxWalletData } =
     useStxWalletData();
-  const { btcFiatRate, stxBtcRate } = useCoinRates();
+  const { btcFiatRate, stxBtcRate } = useSupportedCoinRates();
   const { data: notificationBannersArr, isFetching: isFetchingNotificationBannersArr } =
     useNotificationBanners();
   const {
diff --git a/src/app/screens/listRune/index.tsx b/src/app/screens/listRune/index.tsx
index 100c38e15..c5208e7d6 100644
--- a/src/app/screens/listRune/index.tsx
+++ b/src/app/screens/listRune/index.tsx
@@ -5,7 +5,7 @@ import useRuneFloorPricePerMarketplaceQuery from '@hooks/queries/runes/useRuneFl
 import { useVisibleRuneFungibleTokens } from '@hooks/queries/runes/useRuneFungibleTokensQuery';
 import useRuneSellPsbtPerMarketplace from '@hooks/queries/runes/useRuneSellPsbtPerMarketplace';
 import useRuneUtxosQueryPerMarketplace from '@hooks/queries/runes/useRuneUtxosQueryPerMarketplace';
-import useCoinRates from '@hooks/queries/useCoinRates';
+import useSupportedCoinRates from '@hooks/queries/useSupportedCoinRates';
 import useHasFeature from '@hooks/useHasFeature';
 import { useResetUserFlow } from '@hooks/useResetUserFlow';
 import useTrackMixPanelPageViewed from '@hooks/useTrackMixPanelPageViewed';
@@ -74,7 +74,7 @@ export default function ListRuneScreen() {
   const { visible: runesCoinsList } = useVisibleRuneFungibleTokens(false);
   const selectedRune = runesCoinsList.find((ft) => ft.principal === runeId);
   const { fiatCurrency } = useWalletSelector();
-  const { btcFiatRate } = useCoinRates();
+  const { btcFiatRate } = useSupportedCoinRates();
   const location = useLocation();
   const params = new URLSearchParams(location.search);
   const locationFrom = params.get('from');
diff --git a/src/app/screens/listRune/setRunePriceItem.tsx b/src/app/screens/listRune/setRunePriceItem.tsx
index ac47aaaca..67c301c1b 100644
--- a/src/app/screens/listRune/setRunePriceItem.tsx
+++ b/src/app/screens/listRune/setRunePriceItem.tsx
@@ -1,4 +1,4 @@
-import useCoinRates from '@hooks/queries/useCoinRates';
+import useSupportedCoinRates from '@hooks/queries/useSupportedCoinRates';
 import useWalletSelector from '@hooks/useWalletSelector';
 import { PencilSimple } from '@phosphor-icons/react';
 import FloorComparisonLabel from '@screens/listRune/floorComparisonLabel';
@@ -84,7 +84,7 @@ function SetRunePriceItem({
   handleShowCustomPriceModal,
 }: Props) {
   const { t } = useTranslation('translation');
-  const { btcFiatRate } = useCoinRates();
+  const { btcFiatRate } = useSupportedCoinRates();
   const { fiatCurrency } = useWalletSelector();
 
   return (
diff --git a/src/app/screens/sendBtc/amountSelector.tsx b/src/app/screens/sendBtc/amountSelector.tsx
index bfaf5ef10..35474742b 100644
--- a/src/app/screens/sendBtc/amountSelector.tsx
+++ b/src/app/screens/sendBtc/amountSelector.tsx
@@ -1,5 +1,5 @@
 import useBtcWalletData from '@hooks/queries/useBtcWalletData';
-import useCoinRates from '@hooks/queries/useCoinRates';
+import useSupportedCoinRates from '@hooks/queries/useSupportedCoinRates';
 import useBtcFeeRate from '@hooks/useBtcFeeRate';
 import useWalletSelector from '@hooks/useWalletSelector';
 import { getBtcFiatEquivalent } from '@secretkeylabs/xverse-core';
@@ -66,7 +66,7 @@ function AmountSelector({
 
   const { fiatCurrency } = useWalletSelector();
   const { data: btcBalance, isLoading: btcBalanceLoading } = useBtcWalletData();
-  const { btcFiatRate } = useCoinRates();
+  const { btcFiatRate } = useSupportedCoinRates();
 
   const { data: recommendedFees } = useBtcFeeRate();
 
diff --git a/src/app/screens/sendRune/amountSelector.tsx b/src/app/screens/sendRune/amountSelector.tsx
index 877d2a9bf..854f7a57a 100644
--- a/src/app/screens/sendRune/amountSelector.tsx
+++ b/src/app/screens/sendRune/amountSelector.tsx
@@ -1,4 +1,4 @@
-import useCoinRates from '@hooks/queries/useCoinRates';
+import useSupportedCoinRates from '@hooks/queries/useSupportedCoinRates';
 import useBtcFeeRate from '@hooks/useBtcFeeRate';
 import useWalletSelector from '@hooks/useWalletSelector';
 import RuneAmountSelector from '@screens/sendRune/runeAmountSelector';
@@ -69,7 +69,7 @@ function AmountSelector({
   const { t } = useTranslation('translation', { keyPrefix: 'SEND' });
   const { t: tUnits } = useTranslation('translation', { keyPrefix: 'UNITS' });
   const { fiatCurrency } = useWalletSelector();
-  const { btcFiatRate } = useCoinRates();
+  const { btcFiatRate } = useSupportedCoinRates();
   const { data: recommendedFees } = useBtcFeeRate();
 
   const balance = getFtBalance(token);
diff --git a/src/app/screens/sendStx/steps/Step2SelectAmount.tsx b/src/app/screens/sendStx/steps/Step2SelectAmount.tsx
index 5660c05d9..eb8ad6e7e 100644
--- a/src/app/screens/sendStx/steps/Step2SelectAmount.tsx
+++ b/src/app/screens/sendStx/steps/Step2SelectAmount.tsx
@@ -1,6 +1,6 @@
-import useCoinRates from '@hooks/queries/useCoinRates';
 import useStxPendingTxData from '@hooks/queries/useStxPendingTxData';
 import useStxWalletData from '@hooks/queries/useStxWalletData';
+import useSupportedCoinRates from '@hooks/queries/useSupportedCoinRates';
 import useNetworkSelector from '@hooks/useNetwork';
 import useSelectedAccount from '@hooks/useSelectedAccount';
 import useWalletSelector from '@hooks/useWalletSelector';
@@ -91,7 +91,7 @@ function Step2SelectAmount({
   const { stxAddress, stxPublicKey } = useSelectedAccount();
   const { fiatCurrency, feeMultipliers } = useWalletSelector();
   const { data: stxData } = useStxWalletData();
-  const { btcFiatRate, stxBtcRate } = useCoinRates();
+  const { btcFiatRate, stxBtcRate } = useSupportedCoinRates();
   const stxBalance = stxData?.availableBalance.toString() ?? '0';
   const ftBalance = fungibleToken ? getFtBalance(fungibleToken) : '0';
 
diff --git a/src/app/screens/sendStx/stxAmountSelector.tsx b/src/app/screens/sendStx/stxAmountSelector.tsx
index 830cd5288..21df7e4b2 100644
--- a/src/app/screens/sendStx/stxAmountSelector.tsx
+++ b/src/app/screens/sendStx/stxAmountSelector.tsx
@@ -1,7 +1,7 @@
 import FiatAmountText from '@components/fiatAmountText';
 import { microStxToStx } from '@components/postCondition/postConditionView/helper';
-import useCoinRates from '@hooks/queries/useCoinRates';
 import useStxWalletData from '@hooks/queries/useStxWalletData';
+import useSupportedCoinRates from '@hooks/queries/useSupportedCoinRates';
 import useWalletSelector from '@hooks/useWalletSelector';
 import { ArrowsDownUp } from '@phosphor-icons/react';
 import {
@@ -70,7 +70,7 @@ function StxAmountSelector({ amount, setAmount, sendMax, setSendMax, disabled =
   const { t } = useTranslation('translation', { keyPrefix: 'SEND' });
   const { fiatCurrency } = useWalletSelector();
   const { data: stxData } = useStxWalletData();
-  const { btcFiatRate, stxBtcRate } = useCoinRates();
+  const { btcFiatRate, stxBtcRate } = useSupportedCoinRates();
   const stxBalanceStr = stxData?.availableBalance.toString() ?? '0';
 
   const [amountDisplay, setAmountDisplay] = useState(
diff --git a/src/app/screens/settings/preferences/fiatCurrency/currencyRow.tsx b/src/app/screens/settings/preferences/fiatCurrency/currencyRow.tsx
index 41b3cc968..8e7dcb5bb 100644
--- a/src/app/screens/settings/preferences/fiatCurrency/currencyRow.tsx
+++ b/src/app/screens/settings/preferences/fiatCurrency/currencyRow.tsx
@@ -54,7 +54,7 @@ function CurrencyRow({ currency, isSelected, onCurrencySelected, showDivider }:
       $variant={isSelected ? theme.typography.body_bold_l : theme.typography.body_medium_l}
     >
       <CurrencyWrapper>
-        <StyledImg src={currency.flag} alt="flag" />
+        <StyledImg src={currency.isoFlag} alt="flag" />
         {currency.name}
       </CurrencyWrapper>
       {isSelected && <img src={TickIcon} alt="tick" />}
diff --git a/src/app/screens/speedUpTransaction/customFee/index.tsx b/src/app/screens/speedUpTransaction/customFee/index.tsx
index 94d2b435b..4977ecbbd 100644
--- a/src/app/screens/speedUpTransaction/customFee/index.tsx
+++ b/src/app/screens/speedUpTransaction/customFee/index.tsx
@@ -1,5 +1,5 @@
 import BottomModal from '@components/bottomModal';
-import useCoinRates from '@hooks/queries/useCoinRates';
+import useSupportedCoinRates from '@hooks/queries/useSupportedCoinRates';
 import useWalletSelector from '@hooks/useWalletSelector';
 import {
   getBtcFiatEquivalent,
@@ -57,7 +57,7 @@ export default function CustomFee({
   const { t: tUnits } = useTranslation('translation', { keyPrefix: 'UNITS' });
 
   const { fiatCurrency } = useWalletSelector();
-  const { btcFiatRate, stxBtcRate } = useCoinRates();
+  const { btcFiatRate, stxBtcRate } = useSupportedCoinRates();
 
   const [feeRateInput, setFeeRateInput] = useState(feeRate || minimumFeeRate);
   const [totalFee, setTotalFee] = useState(fee || initialTotalFee);
diff --git a/src/app/screens/swap/components/tokenFromBottomSheet/useFromTokens.ts b/src/app/screens/swap/components/tokenFromBottomSheet/useFromTokens.ts
index e5aca1f1e..e886fc431 100644
--- a/src/app/screens/swap/components/tokenFromBottomSheet/useFromTokens.ts
+++ b/src/app/screens/swap/components/tokenFromBottomSheet/useFromTokens.ts
@@ -1,4 +1,4 @@
-import useCoinRates from '@hooks/queries/useCoinRates';
+import useSupportedCoinRates from '@hooks/queries/useSupportedCoinRates';
 import useMasterCoinsList from '@screens/swap/useMasterCoinsList';
 import { mapSwapProtocolToFTProtocol } from '@screens/swap/utils';
 import { type Token } from '@secretkeylabs/xverse-core';
@@ -6,7 +6,7 @@ import { sortFtByFiatBalance } from '@utils/tokens';
 
 const useFromTokens = (toToken?: Token) => {
   const tokens = useMasterCoinsList();
-  const { stxBtcRate, btcFiatRate } = useCoinRates();
+  const { stxBtcRate, btcFiatRate } = useSupportedCoinRates();
 
   // Sort tokens, keeping BTC as the first element, and STX (if enabled) as the second
   const sortedTokens = tokens.sort((a, b) => {
diff --git a/src/app/screens/swap/index.tsx b/src/app/screens/swap/index.tsx
index b255b0a25..120a01708 100644
--- a/src/app/screens/swap/index.tsx
+++ b/src/app/screens/swap/index.tsx
@@ -6,8 +6,8 @@ import useRuneFloorPriceQuery from '@hooks/queries/runes/useRuneFloorPriceQuery'
 import useGetSip10TokenInfo from '@hooks/queries/stx/useGetSip10TokenInfo';
 import useGetQuotes from '@hooks/queries/swaps/useGetQuotes';
 import useBtcWalletData from '@hooks/queries/useBtcWalletData';
-import useCoinRates from '@hooks/queries/useCoinRates';
 import useStxWalletData from '@hooks/queries/useStxWalletData';
+import useSupportedCoinRates from '@hooks/queries/useSupportedCoinRates';
 import useSelectedAccount from '@hooks/useSelectedAccount';
 import useWalletSelector from '@hooks/useWalletSelector';
 import type { DataStxSignTransaction } from '@screens/transactionRequest/useStxTransactionRequest';
@@ -130,7 +130,7 @@ export default function SwapScreen() {
   const { data: btcBalance } = useBtcWalletData();
   const { data: stxData } = useStxWalletData();
 
-  const { btcFiatRate, btcUsdRate, stxBtcRate } = useCoinRates();
+  const { btcFiatRate, btcUsdRate, stxBtcRate } = useSupportedCoinRates();
   const navigate = useNavigate();
   const { t } = useTranslation('translation');
   const location = useLocation();
diff --git a/src/app/screens/swap/quoteSummary/index.tsx b/src/app/screens/swap/quoteSummary/index.tsx
index bf7087b3c..dfc457e52 100644
--- a/src/app/screens/swap/quoteSummary/index.tsx
+++ b/src/app/screens/swap/quoteSummary/index.tsx
@@ -2,7 +2,7 @@ import SlippageEditIcon from '@assets/img/swap/slippageEdit.svg';
 import TopRow from '@components/topRow';
 import useRuneFloorPriceQuery from '@hooks/queries/runes/useRuneFloorPriceQuery';
 import useGetSip10TokenInfo from '@hooks/queries/stx/useGetSip10TokenInfo';
-import useCoinRates from '@hooks/queries/useCoinRates';
+import useSupportedCoinRates from '@hooks/queries/useSupportedCoinRates';
 import useBtcFeeRate from '@hooks/useBtcFeeRate';
 import useSearchParamsState from '@hooks/useSearchParamsState';
 import useSelectedAccount from '@hooks/useSelectedAccount';
@@ -186,7 +186,7 @@ export default function QuoteSummary({
   });
 
   const theme = useTheme();
-  const { btcFiatRate, btcUsdRate, stxBtcRate } = useCoinRates();
+  const { btcFiatRate, btcUsdRate, stxBtcRate } = useSupportedCoinRates();
   const { btcAddress, ordinalsAddress, btcPublicKey, ordinalsPublicKey, stxAddress, stxPublicKey } =
     useSelectedAccount();
 
diff --git a/src/app/screens/swap/quotesModal/index.tsx b/src/app/screens/swap/quotesModal/index.tsx
index 313df379c..44bc51244 100644
--- a/src/app/screens/swap/quotesModal/index.tsx
+++ b/src/app/screens/swap/quotesModal/index.tsx
@@ -1,5 +1,5 @@
 import useGetSip10TokenInfo from '@hooks/queries/stx/useGetSip10TokenInfo';
-import useCoinRates from '@hooks/queries/useCoinRates';
+import useSupportedCoinRates from '@hooks/queries/useSupportedCoinRates';
 import {
   getBtcFiatEquivalent,
   getStxFiatEquivalent,
@@ -65,7 +65,7 @@ function QuotesModal({
 }: Props) {
   const { t } = useTranslation('translation', { keyPrefix: 'SWAP_SCREEN' });
 
-  const { btcFiatRate, stxBtcRate } = useCoinRates();
+  const { btcFiatRate, stxBtcRate } = useSupportedCoinRates();
   const { tokenInfo: toTokenInfo } = useGetSip10TokenInfo({ principal: toToken?.ticker });
 
   const sortQuotesByReceiveAmount = <T extends StxQuote | Quote>(quotes: T[]): T[] =>
diff --git a/src/app/screens/swap/utxoSelection/index.tsx b/src/app/screens/swap/utxoSelection/index.tsx
index 351739215..b4f2a7de5 100644
--- a/src/app/screens/swap/utxoSelection/index.tsx
+++ b/src/app/screens/swap/utxoSelection/index.tsx
@@ -13,7 +13,7 @@ import { StyledP } from '@ui-library/common.styled';
 
 import useGetUtxos from '@hooks/queries/swaps/useGetUtxos';
 import useBtcWalletData from '@hooks/queries/useBtcWalletData';
-import useCoinRates from '@hooks/queries/useCoinRates';
+import useSupportedCoinRates from '@hooks/queries/useSupportedCoinRates';
 import useWalletSelector from '@hooks/useWalletSelector';
 import Button from '@ui-library/button';
 import SnackBar from '@ui-library/snackBar';
@@ -136,7 +136,7 @@ export default function UtxoSelection({
   const { t: commonT } = useTranslation('translation', { keyPrefix: 'COMMON' });
 
   const { fiatCurrency } = useWalletSelector();
-  const { btcFiatRate } = useCoinRates();
+  const { btcFiatRate } = useSupportedCoinRates();
   const { data: btcBalance } = useBtcWalletData();
 
   const totalRunesPerBtc = new BigNumber(100000000).dividedBy(
diff --git a/src/app/ui-components/btcAmountSelector.tsx b/src/app/ui-components/btcAmountSelector.tsx
index 8165876d5..9c2438801 100644
--- a/src/app/ui-components/btcAmountSelector.tsx
+++ b/src/app/ui-components/btcAmountSelector.tsx
@@ -1,5 +1,5 @@
 import useBtcWalletData from '@hooks/queries/useBtcWalletData';
-import useCoinRates from '@hooks/queries/useCoinRates';
+import useSupportedCoinRates from '@hooks/queries/useSupportedCoinRates';
 import useWalletSelector from '@hooks/useWalletSelector';
 import { ArrowsDownUp } from '@phosphor-icons/react';
 import {
@@ -57,7 +57,7 @@ function AmountSelector({
   const { t } = useTranslation('translation', { keyPrefix: 'SEND' });
   const { fiatCurrency } = useWalletSelector();
   const { data: btcBalanceSats } = useBtcWalletData();
-  const { btcFiatRate } = useCoinRates();
+  const { btcFiatRate } = useSupportedCoinRates();
 
   const [amountDisplay, setAmountDisplay] = useState(
     amountSats && satsToBtcString(new BigNumber(amountSats)),
diff --git a/src/app/utils/currency.ts b/src/app/utils/currency.ts
index 5d8e80e5b..5c898f6b8 100644
--- a/src/app/utils/currency.ts
+++ b/src/app/utils/currency.ts
@@ -1,35 +1,66 @@
+import CAN from '@assets/img/settings/currencies/can.svg';
+import CHN from '@assets/img/settings/currencies/chn.svg';
+import EU from '@assets/img/settings/currencies/eu.svg';
+import USA from '@assets/img/settings/currencies/usa.svg';
 import ARG from '@assets/img/settings/currencies/ars.svg';
-import AUD from '@assets/img/settings/currencies/aud.svg';
-import BRL from '@assets/img/settings/currencies/brl.svg';
-import CAD from '@assets/img/settings/currencies/cad.svg';
-import CNY from '@assets/img/settings/currencies/cny.svg';
-import EUR from '@assets/img/settings/currencies/eur.svg';
-import GBP from '@assets/img/settings/currencies/gbp.svg';
-import HKD from '@assets/img/settings/currencies/hkd.svg';
-import JPY from '@assets/img/settings/currencies/jpy.svg';
-import KRW from '@assets/img/settings/currencies/krw.svg';
-import RUB from '@assets/img/settings/currencies/rub.svg';
-import SGD from '@assets/img/settings/currencies/sgd.svg';
-import USD from '@assets/img/settings/currencies/usd.svg';
+import KOR from '@assets/img/settings/currencies/kor.svg';
+import HKG from '@assets/img/settings/currencies/hkg.svg';
+import JPN from '@assets/img/settings/currencies/jpn.svg';
+import SGP from '@assets/img/settings/currencies/sgp.svg';
+import GBR from '@assets/img/settings/currencies/gbr.svg';
+import BRA from '@assets/img/settings/currencies/bra.svg';
+import RUS from '@assets/img/settings/currencies/rus.svg';
+import AUS from '@assets/img/settings/currencies/aus.svg';
+import NGA from '@assets/img/settings/currencies/nga.svg';
+import TUR from '@assets/img/settings/currencies/tur.svg';
+import IND from '@assets/img/settings/currencies/ind.svg';
+import CHE from '@assets/img/settings/currencies/che.svg';
+import VNM from '@assets/img/settings/currencies/vnm.svg';
+import POL from '@assets/img/settings/currencies/pol.svg';
+import MYS from '@assets/img/settings/currencies/mys.svg';
+import TWN from '@assets/img/settings/currencies/twn.svg';
+import IDN from '@assets/img/settings/currencies/idn.svg';
+import HUN from '@assets/img/settings/currencies/hun.svg';
+import THA from '@assets/img/settings/currencies/tha.svg';
+import PHL from '@assets/img/settings/currencies/phl.svg';
+import PAK from '@assets/img/settings/currencies/pak.svg';
+import ZAF from '@assets/img/settings/currencies/zaf.svg';
+import MEX from '@assets/img/settings/currencies/mex.svg';
+
 import type { SupportedCurrency } from '@secretkeylabs/xverse-core';
 
 export interface Currency {
   name: SupportedCurrency;
-  flag: string;
+  isoFlag: string;
 }
 
 export const currencyList: Currency[] = [
-  { name: 'CAD', flag: CAD },
-  { name: 'CNY', flag: CNY },
-  { name: 'EUR', flag: EUR },
-  { name: 'USD', flag: USD },
-  { name: 'ARS', flag: ARG },
-  { name: 'KRW', flag: KRW },
-  { name: 'HKD', flag: HKD },
-  { name: 'JPY', flag: JPY },
-  { name: 'SGD', flag: SGD },
-  { name: 'GBP', flag: GBP },
-  { name: 'BRL', flag: BRL },
-  { name: 'RUB', flag: RUB },
-  { name: 'AUD', flag: AUD },
+  { name: 'CAD', isoFlag: CAN },    // Canada
+  { name: 'CNY', isoFlag: CHN },    // China
+  { name: 'EUR', isoFlag: EU },     // Eurozone
+  { name: 'USD', isoFlag: USA },    // United States
+  { name: 'ARS', isoFlag: ARG },    // Argentina
+  { name: 'KRW', isoFlag: KOR },    // South Korea
+  { name: 'HKD', isoFlag: HKG },    // Hong Kong
+  { name: 'JPY', isoFlag: JPN },    // Japan
+  { name: 'SGD', isoFlag: SGP },    // Singapore
+  { name: 'GBP', isoFlag: GBR },    // United Kingdom
+  { name: 'BRL', isoFlag: BRA },    // Brazil
+  { name: 'RUB', isoFlag: RUS },    // Russia
+  { name: 'AUD', isoFlag: AUS },    // Australia
+  { name: 'NGN', isoFlag: NGA },    // Nigeria
+  { name: 'TRY', isoFlag: TUR },    // Turkey
+  { name: 'INR', isoFlag: IND },    // India
+  { name: 'CHF', isoFlag: CHE },    // Switzerland
+  { name: 'VND', isoFlag: VNM },    // Vietnam
+  { name: 'PLN', isoFlag: POL },    // Poland
+  { name: 'MYR', isoFlag: MYS },    // Malaysia
+  { name: 'TWD', isoFlag: TWN },    // Taiwan
+  { name: 'IDR', isoFlag: IDN },    // Indonesia
+  { name: 'HUF', isoFlag: HUN },    // Hungary
+  { name: 'THB', isoFlag: THA },    // Thailand
+  { name: 'PHP', isoFlag: PHL },    // Philippines
+  { name: 'PKR', isoFlag: PAK },    // Pakistan
+  { name: 'ZAR', isoFlag: ZAF },    // South Africa
+  { name: 'MXN', isoFlag: MEX },    // Mexico
 ];
diff --git a/src/assets/img/settings/currencies/aud.svg b/src/assets/img/settings/currencies/aus.svg
similarity index 100%
rename from src/assets/img/settings/currencies/aud.svg
rename to src/assets/img/settings/currencies/aus.svg
diff --git a/src/assets/img/settings/currencies/brl.svg b/src/assets/img/settings/currencies/bra.svg
similarity index 100%
rename from src/assets/img/settings/currencies/brl.svg
rename to src/assets/img/settings/currencies/bra.svg
diff --git a/src/assets/img/settings/currencies/cad.svg b/src/assets/img/settings/currencies/can.svg
similarity index 100%
rename from src/assets/img/settings/currencies/cad.svg
rename to src/assets/img/settings/currencies/can.svg
diff --git a/src/assets/img/settings/currencies/che.svg b/src/assets/img/settings/currencies/che.svg
new file mode 100644
index 000000000..c0b86ae11
--- /dev/null
+++ b/src/assets/img/settings/currencies/che.svg
@@ -0,0 +1,12 @@
+<svg width="60" height="45" viewBox="0 0 60 45" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g clip-path="url(#clip0_1_26819)">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M0 0H60V45H0V0Z" fill="#FF0000"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M15.9375 18.2812H44.0625V26.7188H15.9375V18.2812Z" fill="white"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M25.7812 8.4375H34.2188V36.5625H25.7812V8.4375Z" fill="white"/>
+</g>
+<defs>
+<clipPath id="clip0_1_26819">
+<rect width="60" height="45" fill="white"/>
+</clipPath>
+</defs>
+</svg>
diff --git a/src/assets/img/settings/currencies/cny.svg b/src/assets/img/settings/currencies/chn.svg
similarity index 100%
rename from src/assets/img/settings/currencies/cny.svg
rename to src/assets/img/settings/currencies/chn.svg
diff --git a/src/assets/img/settings/currencies/eur.svg b/src/assets/img/settings/currencies/eu.svg
similarity index 100%
rename from src/assets/img/settings/currencies/eur.svg
rename to src/assets/img/settings/currencies/eu.svg
diff --git a/src/assets/img/settings/currencies/gbp.svg b/src/assets/img/settings/currencies/gbr.svg
similarity index 100%
rename from src/assets/img/settings/currencies/gbp.svg
rename to src/assets/img/settings/currencies/gbr.svg
diff --git a/src/assets/img/settings/currencies/hkd.svg b/src/assets/img/settings/currencies/hkg.svg
similarity index 100%
rename from src/assets/img/settings/currencies/hkd.svg
rename to src/assets/img/settings/currencies/hkg.svg
diff --git a/src/assets/img/settings/currencies/hun.svg b/src/assets/img/settings/currencies/hun.svg
new file mode 100644
index 000000000..f51c943e2
--- /dev/null
+++ b/src/assets/img/settings/currencies/hun.svg
@@ -0,0 +1,12 @@
+<svg width="60" height="45" viewBox="0 0 60 45" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g clip-path="url(#clip0_1_37034)">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M60 45H0V0H60V45Z" fill="white"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M60 45H0V30H60V45Z" fill="#388D00"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M60 15.0094H0V0.00939941H60V15.0094Z" fill="#D43516"/>
+</g>
+<defs>
+<clipPath id="clip0_1_37034">
+<rect width="60" height="45" fill="white"/>
+</clipPath>
+</defs>
+</svg>
diff --git a/src/assets/img/settings/currencies/idn.svg b/src/assets/img/settings/currencies/idn.svg
new file mode 100644
index 000000000..bf9df2a92
--- /dev/null
+++ b/src/assets/img/settings/currencies/idn.svg
@@ -0,0 +1,11 @@
+<svg width="60" height="45" viewBox="0 0 60 45" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g clip-path="url(#clip0_1_37044)">
+<path d="M0 0H60V22.5H0V0Z" fill="#E70011"/>
+<path d="M0 22.5H60V45H0V22.5Z" fill="white"/>
+</g>
+<defs>
+<clipPath id="clip0_1_37044">
+<rect width="60" height="45" fill="white"/>
+</clipPath>
+</defs>
+</svg>
diff --git a/src/assets/img/settings/currencies/ind.svg b/src/assets/img/settings/currencies/ind.svg
new file mode 100644
index 000000000..676e78817
--- /dev/null
+++ b/src/assets/img/settings/currencies/ind.svg
@@ -0,0 +1,17 @@
+<svg width="60" height="45" viewBox="0 0 60 45" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g clip-path="url(#clip0_1_37098)">
+<path d="M0 0H60V15H0V0Z" fill="#FF9933"/>
+<path d="M0 15H60V30H0V15Z" fill="white"/>
+<path d="M0 30H60V45H0V30Z" fill="#128807"/>
+<path d="M30 28.5C33.3137 28.5 36 25.8137 36 22.5C36 19.1863 33.3137 16.5 30 16.5C26.6863 16.5 24 19.1863 24 22.5C24 25.8137 26.6863 28.5 30 28.5Z" fill="#000088"/>
+<path d="M30 27.75C32.8995 27.75 35.25 25.3995 35.25 22.5C35.25 19.6005 32.8995 17.25 30 17.25C27.1005 17.25 24.75 19.6005 24.75 22.5C24.75 25.3995 27.1005 27.75 30 27.75Z" fill="white"/>
+<path d="M30 23.55C30.5799 23.55 31.05 23.0799 31.05 22.5C31.05 21.9201 30.5799 21.45 30 21.45C29.4201 21.45 28.95 21.9201 28.95 22.5C28.95 23.0799 29.4201 23.55 30 23.55Z" fill="#000088"/>
+<path d="M35.1697 23.4549C35.3176 23.4744 35.4532 23.3703 35.4727 23.2225C35.4921 23.0746 35.3881 22.939 35.2402 22.9195C35.0924 22.9001 34.9568 23.0041 34.9373 23.152C34.9178 23.2998 35.0219 23.4354 35.1697 23.4549Z" fill="#000088"/>
+<path d="M30 27.75L30.18 24.6L30 23.1L29.82 24.6L30 27.75Z" fill="#000088"/>
+</g>
+<defs>
+<clipPath id="clip0_1_37098">
+<rect width="60" height="45" fill="white"/>
+</clipPath>
+</defs>
+</svg>
diff --git a/src/assets/img/settings/currencies/jpy.svg b/src/assets/img/settings/currencies/jpn.svg
similarity index 100%
rename from src/assets/img/settings/currencies/jpy.svg
rename to src/assets/img/settings/currencies/jpn.svg
diff --git a/src/assets/img/settings/currencies/krw.svg b/src/assets/img/settings/currencies/kor.svg
similarity index 100%
rename from src/assets/img/settings/currencies/krw.svg
rename to src/assets/img/settings/currencies/kor.svg
diff --git a/src/assets/img/settings/currencies/mex.svg b/src/assets/img/settings/currencies/mex.svg
new file mode 100644
index 000000000..e68c31bc0
--- /dev/null
+++ b/src/assets/img/settings/currencies/mex.svg
@@ -0,0 +1,467 @@
+<svg width="60" height="45" viewBox="0 0 60 45" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g clip-path="url(#clip0_1_38536)">
+<path d="M40.0032 0H60V45H40.0032V0Z" fill="#CE1126"/>
+<path d="M19.9968 0H40.0031V45H19.9968V0Z" fill="white"/>
+<path d="M0 0H19.9969V45H0V0Z" fill="#006847"/>
+<path d="M33.3562 27.1313L33.375 27.5531L33.5343 27.45L33.4125 27.1031L33.3562 27.1313Z" fill="#FCCA3E"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M33.4205 27.0834L33.5513 27.4557L33.362 27.5782L33.3418 27.1227L33.4205 27.0834ZM33.3707 27.1397L33.388 27.5279L33.5174 27.4442L33.4045 27.1228L33.3707 27.1397Z" fill="#AA8C30"/>
+<path d="M33.3375 27.15C33.41 27.15 33.4688 27.0912 33.4688 27.0187C33.4688 26.9462 33.41 26.8875 33.3375 26.8875C33.2651 26.8875 33.2063 26.9462 33.2063 27.0187C33.2063 27.0912 33.2651 27.15 33.3375 27.15Z" fill="#FCCA3E"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M33.3375 26.8969C33.2702 26.8969 33.2156 26.9515 33.2156 27.0188C33.2156 27.0861 33.2702 27.1407 33.3375 27.1407C33.4048 27.1407 33.4594 27.0861 33.4594 27.0188C33.4594 26.9515 33.4048 26.8969 33.3375 26.8969ZM33.1969 27.0188C33.1969 26.9411 33.2599 26.8782 33.3375 26.8782C33.4152 26.8782 33.4781 26.9411 33.4781 27.0188C33.4781 27.0965 33.4152 27.1594 33.3375 27.1594C33.2599 27.1594 33.1969 27.0965 33.1969 27.0188Z" fill="#AA8C30"/>
+<path d="M33.8531 27.7875L33.5531 27.4968L33.4125 27.6093L33.8344 27.8531L33.8531 27.7875Z" fill="#FCCA3E"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M33.5541 27.4781L33.869 27.7833L33.843 27.8743L33.3877 27.6112L33.5541 27.4781ZM33.4374 27.6075L33.8259 27.8319L33.8373 27.7917L33.5523 27.5156L33.4374 27.6075Z" fill="#AA8C30"/>
+<path d="M33.8344 27.9563C33.7876 27.9 33.8063 27.8157 33.8626 27.7688C33.9282 27.7219 34.0126 27.7313 34.0501 27.7875C34.0969 27.8438 34.0782 27.9282 34.0219 27.975C33.9563 28.0219 33.8719 28.0125 33.8344 27.9563Z" fill="#FCCA3E"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M33.8682 27.7762C33.815 27.8207 33.7989 27.8991 33.8415 27.9502L33.8422 27.951L33.8421 27.951C33.8759 28.0017 33.9536 28.012 34.0161 27.9676C34.0693 27.923 34.0854 27.8446 34.0427 27.7935L34.0421 27.7927L34.0421 27.7927C34.0084 27.742 33.9306 27.7318 33.8682 27.7762ZM34.0575 27.7819C34.0161 27.7205 33.9256 27.7121 33.857 27.7611L33.857 27.7611L33.8564 27.7615C33.7975 27.8107 33.7761 27.9006 33.8268 27.9619C33.8681 28.0233 33.9587 28.0316 34.0273 27.9826L34.0273 27.9826L34.0278 27.9822C34.0868 27.933 34.1081 27.8431 34.0575 27.7819Z" fill="#AA8C30"/>
+<path d="M36.2156 23.4L36.5343 23.7094L36.5718 23.55L36.2812 23.3625L36.2156 23.4Z" fill="#FCCA3E"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M36.2817 23.3461L36.5878 23.5436L36.5424 23.7368L36.1924 23.3971L36.2817 23.3461ZM36.2388 23.403L36.5263 23.682L36.5559 23.5565L36.2808 23.379L36.2388 23.403Z" fill="#AA8C30"/>
+<path d="M36.1781 23.4468C36.2506 23.4468 36.3094 23.3881 36.3094 23.3156C36.3094 23.2431 36.2506 23.1843 36.1781 23.1843C36.1056 23.1843 36.0469 23.2431 36.0469 23.3156C36.0469 23.3881 36.1056 23.4468 36.1781 23.4468Z" fill="#FCCA3E"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M36.1781 23.1938C36.1108 23.1938 36.0562 23.2484 36.0562 23.3157C36.0562 23.383 36.1108 23.4375 36.1781 23.4375C36.2454 23.4375 36.3 23.383 36.3 23.3157C36.3 23.2484 36.2454 23.1938 36.1781 23.1938ZM36.0375 23.3157C36.0375 23.238 36.1004 23.175 36.1781 23.175C36.2558 23.175 36.3187 23.238 36.3187 23.3157C36.3187 23.3933 36.2558 23.4563 36.1781 23.4563C36.1004 23.4563 36.0375 23.3933 36.0375 23.3157Z" fill="#AA8C30"/>
+<path d="M37.05 23.5875L36.5625 23.7187L36.6094 23.5594L37.0219 23.5219L37.05 23.5875Z" fill="#FCCA3E"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M37.0308 23.507L37.0694 23.5969L36.542 23.7389L36.5986 23.5462L37.0308 23.507ZM36.6202 23.5725L36.5831 23.6987L37.0308 23.5782L37.013 23.5368L36.6202 23.5725Z" fill="#AA8C30"/>
+<path d="M37.125 23.6437C37.1975 23.6437 37.2563 23.585 37.2563 23.5125C37.2563 23.44 37.1975 23.3812 37.125 23.3812C37.0525 23.3812 36.9938 23.44 36.9938 23.5125C36.9938 23.585 37.0525 23.6437 37.125 23.6437Z" fill="#FCCA3E"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M37.125 23.3906C37.0577 23.3906 37.0031 23.4451 37.0031 23.5125C37.0031 23.5798 37.0577 23.6343 37.125 23.6343C37.1923 23.6343 37.2469 23.5798 37.2469 23.5125C37.2469 23.4451 37.1923 23.3906 37.125 23.3906ZM36.9844 23.5125C36.9844 23.4348 37.0473 23.3718 37.125 23.3718C37.2027 23.3718 37.2656 23.4348 37.2656 23.5125C37.2656 23.5901 37.2027 23.6531 37.125 23.6531C37.0473 23.6531 36.9844 23.5901 36.9844 23.5125Z" fill="#AA8C30"/>
+<path d="M35.4375 25.95L35.1375 25.5L35.1843 25.4719L35.5125 25.8657L35.4375 25.95Z" fill="#FCCA3E"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M35.1875 25.4536L35.5311 25.8659L35.436 25.973L35.1177 25.4955L35.1875 25.4536ZM35.1574 25.5045L35.4392 25.927L35.494 25.8653L35.1813 25.4901L35.1574 25.5045Z" fill="#AA8C30"/>
+<path d="M35.1094 25.5187C35.1819 25.5187 35.2406 25.46 35.2406 25.3875C35.2406 25.315 35.1819 25.2562 35.1094 25.2562C35.0369 25.2562 34.9781 25.315 34.9781 25.3875C34.9781 25.46 35.0369 25.5187 35.1094 25.5187Z" fill="#FCCA3E"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M35.1094 25.2656C35.0421 25.2656 34.9875 25.3201 34.9875 25.3875C34.9875 25.4548 35.0421 25.5093 35.1094 25.5093C35.1767 25.5093 35.2312 25.4548 35.2312 25.3875C35.2312 25.3201 35.1767 25.2656 35.1094 25.2656ZM34.9688 25.3875C34.9688 25.3098 35.0317 25.2468 35.1094 25.2468C35.187 25.2468 35.25 25.3098 35.25 25.3875C35.25 25.4651 35.187 25.5281 35.1094 25.5281C35.0317 25.5281 34.9688 25.4651 34.9688 25.3875Z" fill="#AA8C30"/>
+<path d="M35.4469 25.9687L35.8219 26.0343L35.8313 25.9875L35.5219 25.8562L35.4469 25.9687Z" fill="#FCCA3E"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M35.5166 25.8387L35.8473 25.979L35.833 26.0506L35.4232 25.9789L35.5166 25.8387ZM35.5271 25.8737L35.4705 25.9586L35.8108 26.0182L35.8152 25.996L35.5271 25.8737Z" fill="#AA8C30"/>
+<path d="M35.9344 26.1656C36.0068 26.1656 36.0656 26.1068 36.0656 26.0343C36.0656 25.9618 36.0068 25.9031 35.9344 25.9031C35.8619 25.9031 35.8031 25.9618 35.8031 26.0343C35.8031 26.1068 35.8619 26.1656 35.9344 26.1656Z" fill="#FCCA3E"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M35.9343 25.9125C35.867 25.9125 35.8125 25.9671 35.8125 26.0344C35.8125 26.1017 35.867 26.1563 35.9343 26.1563C36.0016 26.1563 36.0562 26.1017 36.0562 26.0344C36.0562 25.9671 36.0016 25.9125 35.9343 25.9125ZM35.7937 26.0344C35.7937 25.9568 35.8567 25.8938 35.9343 25.8938C36.012 25.8938 36.075 25.9568 36.075 26.0344C36.075 26.1121 36.012 26.1751 35.9343 26.1751C35.8567 26.1751 35.7937 26.1121 35.7937 26.0344Z" fill="#AA8C30"/>
+<path d="M26.6813 27C26.6813 27.075 26.6344 27.1125 26.5875 27.1125C26.5406 27.1125 26.4938 27.0657 26.4938 27C26.4938 26.9344 26.5406 26.8782 26.5875 26.8782C26.6344 26.8782 26.6813 26.9438 26.6813 27.0094V27Z" fill="#FCCA3E"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M26.5304 26.9203C26.5141 26.941 26.5031 26.9694 26.5031 27C26.5031 27.0616 26.5469 27.1031 26.5875 27.1031C26.6084 27.1031 26.6294 27.0948 26.6451 27.078C26.6601 27.062 26.6708 27.0379 26.6718 27.005C26.6708 26.9758 26.6601 26.9467 26.6443 26.9246C26.6276 26.9012 26.6066 26.8875 26.5875 26.8875C26.5678 26.8875 26.5468 26.8995 26.5304 26.9203ZM26.6903 27C26.6883 26.9683 26.6765 26.9375 26.6596 26.9137C26.6412 26.8879 26.6153 26.8688 26.5875 26.8688C26.5603 26.8688 26.5344 26.885 26.5157 26.9087C26.4969 26.9325 26.4844 26.965 26.4844 27C26.4844 27.0697 26.5344 27.1219 26.5875 27.1219C26.6135 27.1219 26.6394 27.1115 26.6588 27.0908C26.6767 27.0717 26.6886 27.0444 26.6904 27.0094H26.6906V27H26.6903Z" fill="#AA8C30"/>
+<path d="M26.6812 27.2156L26.775 27.6843L26.6531 27.6375L26.6156 27.2343L26.6812 27.2156Z" fill="#FCCA3E"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M26.6921 27.1979L26.7938 27.7066L26.64 27.6475L26.6006 27.224L26.6921 27.1979ZM26.6308 27.2447L26.6664 27.6275L26.7562 27.662L26.6705 27.2333L26.6308 27.2447Z" fill="#AA8C30"/>
+<path d="M26.7844 27.0562C26.8406 27.1219 26.7469 27.2344 26.6531 27.2625C26.5594 27.2906 26.4281 27.2437 26.4281 27.15C26.4281 27.0562 26.5781 27.1031 26.6156 27.0937C26.6719 27.075 26.7281 26.9812 26.7844 27.0562Z" fill="#FCCA3E"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M26.6633 27.077C26.6492 27.0872 26.6341 27.0974 26.6185 27.1026L26.6179 27.1028L26.6178 27.1028C26.6119 27.1043 26.6043 27.1046 26.5965 27.1044C26.5885 27.1042 26.5793 27.1034 26.5697 27.1026C26.5683 27.1025 26.567 27.1024 26.5656 27.1023C26.5472 27.1007 26.5271 27.0991 26.508 27.0996C26.4874 27.1002 26.4695 27.1033 26.457 27.111C26.4453 27.1181 26.4375 27.1296 26.4375 27.15C26.4375 27.1918 26.4666 27.2243 26.5092 27.2434C26.5518 27.2624 26.6058 27.2669 26.6504 27.2535C26.6951 27.2401 26.7403 27.2063 26.7673 27.168C26.7946 27.1294 26.801 27.0901 26.7772 27.0623L26.7843 27.0562L26.7768 27.0619C26.7638 27.0445 26.7519 27.0382 26.7412 27.0371C26.7301 27.036 26.7181 27.0401 26.7047 27.0479C26.6944 27.0539 26.6841 27.0615 26.6734 27.0695C26.6701 27.072 26.6667 27.0745 26.6633 27.077ZM26.7916 27.0504C26.7766 27.0304 26.7605 27.0203 26.7431 27.0185C26.7261 27.0167 26.7099 27.0232 26.6952 27.0317C26.6839 27.0383 26.6725 27.0468 26.6616 27.0549C26.6584 27.0573 26.6553 27.0596 26.6522 27.0618C26.6383 27.072 26.6254 27.0805 26.613 27.0847C26.6096 27.0855 26.6043 27.0858 26.597 27.0856C26.5896 27.0854 26.5809 27.0848 26.5712 27.0839C26.5698 27.0838 26.5684 27.0837 26.567 27.0836C26.5488 27.0821 26.5277 27.0803 26.5075 27.0808C26.486 27.0814 26.464 27.0847 26.4472 27.095C26.4296 27.1057 26.4187 27.1235 26.4187 27.15C26.4187 27.2019 26.4552 27.2397 26.5016 27.2605C26.5481 27.2813 26.6066 27.2862 26.6558 27.2715C26.7048 27.2567 26.7534 27.2203 26.7826 27.1788C26.8115 27.1379 26.8238 27.0881 26.7916 27.0504Z" fill="#AA8C30"/>
+<path d="M25.9687 27.8813C26.0516 27.8813 26.1187 27.8351 26.1187 27.7782C26.1187 27.7212 26.0516 27.675 25.9687 27.675C25.8859 27.675 25.8187 27.7212 25.8187 27.7782C25.8187 27.8351 25.8859 27.8813 25.9687 27.8813Z" fill="#FCCA3E"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M25.8679 27.713C25.8425 27.7304 25.8281 27.7536 25.8281 27.7781C25.8281 27.8026 25.8425 27.8259 25.8679 27.8433C25.8933 27.8608 25.9289 27.8719 25.9687 27.8719C26.0085 27.8719 26.0441 27.8608 26.0695 27.8433C26.0949 27.8259 26.1093 27.8026 26.1093 27.7781C26.1093 27.7536 26.0949 27.7304 26.0695 27.713C26.0441 27.6955 26.0085 27.6844 25.9687 27.6844C25.9289 27.6844 25.8933 27.6955 25.8679 27.713ZM25.8573 27.6975C25.8862 27.6776 25.9256 27.6656 25.9687 27.6656C26.0118 27.6656 26.0512 27.6776 26.0801 27.6975C26.1089 27.7173 26.1281 27.7457 26.1281 27.7781C26.1281 27.8106 26.1089 27.839 26.0801 27.8588C26.0512 27.8787 26.0118 27.8906 25.9687 27.8906C25.9256 27.8906 25.8862 27.8787 25.8573 27.8588C25.8285 27.839 25.8093 27.8106 25.8093 27.7781C25.8093 27.7457 25.8285 27.7173 25.8573 27.6975Z" fill="#AA8C30"/>
+<path d="M26.2125 27.75L26.6625 27.7312L26.5875 27.6375L26.2125 27.675V27.75Z" fill="#FCCA3E"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M26.5938 27.6228L26.6909 27.7442L26.1985 27.7647V27.6623L26.5938 27.6228ZM26.2266 27.6878V27.7354L26.6342 27.7184L26.5813 27.6523L26.2266 27.6878Z" fill="#AA8C30"/>
+<path d="M26.25 27.6937C26.2969 27.8156 26.2969 27.9749 26.1656 27.9468C26.0344 27.9374 26.0719 27.8156 26.0531 27.7781C26.0344 27.6937 25.9594 27.6187 26.0344 27.5437C26.1094 27.4687 26.2219 27.5812 26.25 27.6937Z" fill="#FCCA3E"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M26.095 27.5291C26.0763 27.5276 26.0579 27.5335 26.041 27.5504C26.0234 27.568 26.0151 27.585 26.0123 27.6018C26.0094 27.6187 26.0119 27.6361 26.0176 27.6547C26.0224 27.6707 26.0293 27.6869 26.0366 27.704C26.0378 27.7069 26.0391 27.7099 26.0404 27.7128C26.0487 27.7326 26.0571 27.7534 26.062 27.7751C26.0647 27.7808 26.0662 27.7876 26.0672 27.7944C26.0683 27.8018 26.0689 27.81 26.0695 27.8184C26.0695 27.819 26.0696 27.8196 26.0696 27.8202C26.0708 27.8367 26.072 27.8542 26.0763 27.8707C26.0806 27.8878 26.0881 27.9031 26.1015 27.9148C26.1148 27.9265 26.135 27.9353 26.1663 27.9376L26.1676 27.9377L26.1676 27.9378C26.1986 27.9444 26.2203 27.9397 26.2352 27.9288C26.2504 27.9178 26.2604 27.8992 26.2654 27.8747C26.2755 27.8256 26.2643 27.7572 26.2412 27.6972L26.25 27.6938L26.2409 27.6961C26.2273 27.6416 26.1932 27.5872 26.1539 27.5558C26.1343 27.5401 26.114 27.5307 26.095 27.5291ZM26.2589 27.691C26.2443 27.6331 26.2082 27.5753 26.1656 27.5412C26.1442 27.524 26.1205 27.5124 26.0965 27.5104C26.0721 27.5084 26.0484 27.5165 26.0277 27.5372C26.0078 27.5571 25.9974 27.5776 25.9938 27.5986C25.9902 27.6195 25.9935 27.6401 25.9996 27.6602C26.0048 27.6772 26.0121 27.6945 26.0194 27.7115C26.0206 27.7144 26.0219 27.7173 26.0231 27.7202C26.0316 27.7402 26.0395 27.76 26.044 27.7802L26.0442 27.7813L26.0447 27.7824C26.0464 27.7857 26.0477 27.7906 26.0487 27.7972C26.0496 27.8037 26.0502 27.8112 26.0508 27.8197C26.0508 27.8204 26.0509 27.8212 26.0509 27.822C26.0521 27.8381 26.0534 27.8571 26.0581 27.8754C26.0631 27.8947 26.072 27.914 26.0891 27.9289C26.1062 27.9438 26.1303 27.9537 26.1643 27.9562C26.1986 27.9634 26.2259 27.9587 26.2463 27.944C26.2666 27.9292 26.2782 27.9056 26.2838 27.8785C26.2948 27.8246 26.2826 27.7526 26.2589 27.691Z" fill="#AA8C30"/>
+<path d="M24.7875 25.3687C24.8341 25.3687 24.8719 25.3099 24.8719 25.2375C24.8719 25.165 24.8341 25.1062 24.7875 25.1062C24.7409 25.1062 24.7031 25.165 24.7031 25.2375C24.7031 25.3099 24.7409 25.3687 24.7875 25.3687Z" fill="#FCCA3E"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M24.7357 25.1498C24.7215 25.1718 24.7125 25.2028 24.7125 25.2376C24.7125 25.2723 24.7215 25.3033 24.7357 25.3253C24.7499 25.3474 24.7684 25.3594 24.7875 25.3594C24.8065 25.3594 24.825 25.3474 24.8393 25.3253C24.8534 25.3033 24.8625 25.2723 24.8625 25.2376C24.8625 25.2028 24.8534 25.1718 24.8393 25.1498C24.825 25.1277 24.8065 25.1157 24.7875 25.1157C24.7684 25.1157 24.7499 25.1277 24.7357 25.1498ZM24.7199 25.1397C24.7362 25.1143 24.7599 25.0969 24.7875 25.0969C24.815 25.0969 24.8387 25.1143 24.855 25.1397C24.8714 25.1652 24.8812 25.1998 24.8812 25.2376C24.8812 25.2753 24.8714 25.31 24.855 25.3354C24.8387 25.3608 24.815 25.3782 24.7875 25.3782C24.7599 25.3782 24.7362 25.3608 24.7199 25.3354C24.7035 25.31 24.6937 25.2753 24.6937 25.2376C24.6937 25.1998 24.7035 25.1652 24.7199 25.1397Z" fill="#AA8C30"/>
+<path d="M24.7875 25.5375L24.7968 25.9688L24.6843 25.875V25.5188L24.7875 25.5375Z" fill="#FCCA3E"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M24.6703 25.502L24.8013 25.5258L24.8116 25.9994L24.6703 25.8816V25.502ZM24.6984 25.5357V25.8685L24.7821 25.9382L24.7737 25.5493L24.6984 25.5357Z" fill="#AA8C30"/>
+<path d="M24.9562 25.4062C24.9843 25.5 24.8343 25.5562 24.7312 25.5375C24.6375 25.5187 24.5531 25.4719 24.5718 25.3781C24.5812 25.2844 24.7125 25.3031 24.7593 25.3312C24.7968 25.3594 24.9281 25.2562 24.9562 25.3969V25.4062Z" fill="#FCCA3E"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M24.6042 25.3347C24.592 25.344 24.5833 25.358 24.5812 25.379L24.5811 25.3799C24.5724 25.4231 24.5872 25.4549 24.6154 25.4787C24.6441 25.503 24.6868 25.519 24.733 25.5283C24.7825 25.5372 24.8437 25.5282 24.8887 25.5056C24.9112 25.4944 24.929 25.4801 24.9395 25.4638C24.9499 25.4478 24.9534 25.4296 24.9472 25.4089L24.9468 25.4076V25.3978C24.9401 25.3648 24.9277 25.3478 24.9139 25.3392C24.8997 25.3303 24.882 25.3289 24.8623 25.3312C24.8491 25.3327 24.8362 25.3356 24.8235 25.3385C24.8169 25.34 24.8103 25.3415 24.8037 25.3428C24.7946 25.3446 24.7855 25.3459 24.7772 25.3457C24.7691 25.3456 24.7609 25.344 24.7541 25.339C24.7324 25.3261 24.6901 25.315 24.6523 25.3183C24.6335 25.32 24.6167 25.3252 24.6042 25.3347ZM24.6507 25.2996C24.6924 25.2959 24.7389 25.3081 24.7641 25.3232L24.765 25.3237C24.7675 25.3255 24.7714 25.3268 24.7776 25.327C24.7838 25.3271 24.7913 25.3261 24.8002 25.3244C24.8056 25.3233 24.8116 25.3219 24.8179 25.3205C24.8312 25.3175 24.846 25.3142 24.8602 25.3125C24.8815 25.3101 24.9043 25.3111 24.9238 25.3233C24.9436 25.3356 24.9581 25.3583 24.9654 25.395L24.9656 25.3959V25.4049C24.9729 25.4306 24.9682 25.454 24.9553 25.474C24.9424 25.494 24.9215 25.5102 24.8971 25.5224C24.8485 25.5467 24.7831 25.5564 24.7295 25.5467L24.7294 25.5467C24.6818 25.5372 24.6355 25.5203 24.6033 25.4931C24.5706 25.4654 24.5526 25.4271 24.5625 25.3767C24.5652 25.3511 24.5764 25.3324 24.5928 25.3198C24.609 25.3074 24.6297 25.3015 24.6507 25.2996Z" fill="#AA8C30"/>
+<path d="M24.0188 25.9875C24.1016 25.9875 24.1688 25.9581 24.1688 25.9218C24.1688 25.8856 24.1016 25.8562 24.0188 25.8562C23.9359 25.8562 23.8688 25.8856 23.8688 25.9218C23.8688 25.9581 23.9359 25.9875 24.0188 25.9875Z" fill="#FCCA3E"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M23.8873 25.9029C23.8808 25.9095 23.8781 25.916 23.8781 25.9219C23.8781 25.9279 23.8808 25.9343 23.8873 25.941C23.8938 25.9477 23.9036 25.9541 23.9164 25.9597C23.9421 25.971 23.9783 25.9782 24.0188 25.9782C24.0592 25.9782 24.0954 25.971 24.1211 25.9597C24.1339 25.9541 24.1437 25.9477 24.1502 25.941C24.1567 25.9343 24.1594 25.9279 24.1594 25.9219C24.1594 25.916 24.1567 25.9095 24.1502 25.9029C24.1437 25.8962 24.1339 25.8897 24.1211 25.8841C24.0954 25.8729 24.0592 25.8657 24.0188 25.8657C23.9783 25.8657 23.9421 25.8729 23.9164 25.8841C23.9036 25.8897 23.8938 25.8962 23.8873 25.9029ZM23.9089 25.8669C23.9375 25.8544 23.9763 25.8469 24.0188 25.8469C24.0612 25.8469 24.1 25.8544 24.1286 25.8669C24.1429 25.8732 24.155 25.8809 24.1637 25.8899C24.1724 25.8989 24.1781 25.9098 24.1781 25.9219C24.1781 25.9341 24.1724 25.9449 24.1637 25.954C24.155 25.963 24.1429 25.9707 24.1286 25.9769C24.1 25.9894 24.0612 25.9969 24.0188 25.9969C23.9763 25.9969 23.9375 25.9894 23.9089 25.9769C23.8946 25.9707 23.8825 25.963 23.8738 25.954C23.865 25.9449 23.8594 25.9341 23.8594 25.9219C23.8594 25.9098 23.865 25.8989 23.8738 25.8899C23.8825 25.8809 23.8946 25.8732 23.9089 25.8669Z" fill="#AA8C30"/>
+<path d="M24.2906 25.9219L24.6281 25.8938L24.7781 26.0063L24.2812 25.9875L24.2906 25.9219Z" fill="#FCCA3E"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M24.6323 25.8793L24.8226 26.022L24.2651 26.0009L24.2783 25.9088L24.6323 25.8793ZM24.303 25.9349L24.2974 25.974L24.7337 25.9905L24.624 25.9082L24.303 25.9349Z" fill="#AA8C30"/>
+<path d="M24.1687 25.7343C24.2625 25.7343 24.3187 25.8375 24.3094 25.95C24.2906 26.0531 24.2156 26.1375 24.1219 26.1375C24.0375 26.1187 24.0469 26.0437 24.0469 26.025C24.0469 25.9968 24.0937 25.9593 24.1031 25.9312C24.1031 25.8937 24.075 25.8093 24.0937 25.7812C24.0937 25.7437 24.1219 25.7343 24.1687 25.7343ZM23.8875 23.0812C23.85 23.1375 23.775 23.1843 23.7375 23.1656C23.7 23.1375 23.7187 23.0531 23.7562 22.9968C23.7937 22.9312 23.85 22.9031 23.8875 22.9218C23.925 22.95 23.925 23.0156 23.8875 23.0812Z" fill="#FCCA3E"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M23.8263 22.9359C23.8047 22.9478 23.7824 22.9698 23.7643 23.0015L23.764 23.002L23.764 23.002C23.7459 23.0291 23.7324 23.063 23.728 23.0931C23.7235 23.1235 23.7285 23.1466 23.7424 23.1575C23.7492 23.1607 23.7583 23.1613 23.7696 23.159C23.7812 23.1566 23.7943 23.1513 23.8077 23.1434C23.8346 23.1277 23.8615 23.103 23.8795 23.0763C23.8975 23.0446 23.9062 23.0135 23.9062 22.9874C23.9062 22.9617 23.8978 22.9417 23.8825 22.9298C23.8674 22.9227 23.8477 22.9242 23.8263 22.9359ZM23.8874 23.0812L23.8956 23.0858C23.915 23.052 23.9249 23.0176 23.9249 22.9874C23.9249 22.9573 23.9149 22.9307 23.8931 22.9143L23.8924 22.9138L23.8916 22.9134C23.8693 22.9023 23.8425 22.9056 23.8173 22.9195C23.7921 22.9333 23.7676 22.958 23.7482 22.9919C23.7289 23.021 23.7143 23.0573 23.7094 23.0904C23.7046 23.1227 23.7087 23.1557 23.7318 23.1731L23.7325 23.1736L23.7333 23.174C23.7452 23.1799 23.7592 23.1803 23.7733 23.1774C23.7875 23.1745 23.8025 23.1682 23.8172 23.1596C23.8465 23.1425 23.8757 23.1158 23.8952 23.0864L23.8874 23.0812ZM24.107 25.7626C24.1046 25.767 24.1031 25.773 24.1031 25.7812V25.784L24.1015 25.7864C24.0984 25.791 24.0966 25.7992 24.0966 25.8112C24.0966 25.8229 24.0983 25.8367 24.1006 25.8512C24.102 25.86 24.1036 25.8688 24.1052 25.8774C24.1062 25.8831 24.1073 25.8887 24.1082 25.8943C24.1105 25.9079 24.1124 25.9209 24.1124 25.9312V25.9327L24.112 25.9342C24.1092 25.9426 24.1038 25.9512 24.0979 25.9592C24.0936 25.9652 24.0887 25.9714 24.0839 25.9774C24.0822 25.9796 24.0805 25.9818 24.0788 25.9839C24.0724 25.992 24.0666 25.9998 24.0624 26.0071C24.0582 26.0145 24.0562 26.0204 24.0562 26.0249C24.0562 26.0266 24.0561 26.0286 24.0561 26.0308C24.0557 26.0423 24.0552 26.0601 24.0615 26.0781C24.0686 26.0984 24.0847 26.1193 24.1229 26.1281C24.2098 26.1274 24.2817 26.0486 24.3 25.9487C24.3045 25.8943 24.293 25.8426 24.2697 25.8049C24.2464 25.7672 24.2116 25.7437 24.1687 25.7437C24.1454 25.7437 24.1288 25.7461 24.1181 25.7519C24.113 25.7547 24.1094 25.7582 24.107 25.7626ZM24.1091 25.7355C24.1243 25.7272 24.1451 25.7249 24.1687 25.7249C24.2195 25.7249 24.2597 25.753 24.2857 25.795C24.3115 25.8368 24.3235 25.8928 24.3187 25.9507L24.3186 25.9516L24.3185 25.9516C24.2993 26.0574 24.2217 26.1468 24.1218 26.1468H24.1208L24.1198 26.1466C24.0743 26.1365 24.0531 26.1107 24.0438 26.0843C24.0362 26.0626 24.037 26.0406 24.0373 26.0296C24.0374 26.0277 24.0374 26.0261 24.0374 26.0249C24.0374 26.0155 24.0413 26.0061 24.0462 25.9977C24.0511 25.9892 24.0576 25.9805 24.0641 25.9723C24.0659 25.97 24.0677 25.9677 24.0695 25.9654C24.0742 25.9595 24.0787 25.9539 24.0827 25.9483C24.0879 25.9412 24.0916 25.9349 24.0937 25.9296C24.0935 25.9213 24.0919 25.9103 24.0897 25.8975C24.0888 25.8923 24.0878 25.8868 24.0868 25.8812C24.0852 25.8723 24.0835 25.8631 24.0821 25.8542C24.0797 25.8394 24.0779 25.8244 24.0779 25.8112C24.0779 25.7995 24.0793 25.7877 24.0844 25.7785C24.0847 25.7691 24.0867 25.7607 24.0906 25.7535C24.0949 25.7456 24.1013 25.7397 24.1091 25.7355Z" fill="#AA8C30"/>
+<path d="M23.5031 23.7656L23.6906 23.3156L23.6719 23.2875L23.4469 23.6062L23.5031 23.7656Z" fill="#FCCA3E"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M23.6722 23.2627L23.7065 23.3141L23.502 23.8048L23.4312 23.6041L23.6722 23.2627ZM23.4625 23.6085L23.5042 23.7265L23.6747 23.3172L23.6715 23.3124L23.4625 23.6085Z" fill="#AA8C30"/>
+<path d="M23.6625 23.3157C23.5688 23.25 23.55 23.175 23.5688 23.1C23.6063 23.0344 23.6813 23.0813 23.6813 23.0813L23.7563 23.1469C23.7938 23.1657 23.85 23.1469 23.8875 23.2032C23.9344 23.2594 23.9063 23.3157 23.8781 23.3344C23.8406 23.3438 23.7375 23.3719 23.6625 23.3157ZM22.8656 23.2594C22.9313 23.2969 22.9688 23.3532 22.95 23.4C22.9219 23.4469 22.8563 23.4469 22.7813 23.4C22.7156 23.3719 22.6875 23.3063 22.7063 23.2594C22.725 23.2219 22.8 23.2125 22.8656 23.2594Z" fill="#FCCA3E"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M23.5776 23.1036C23.5689 23.1392 23.5691 23.1742 23.5822 23.208C23.5954 23.2422 23.6222 23.2759 23.6679 23.308L23.6682 23.3081C23.7033 23.3345 23.7455 23.3414 23.7841 23.3402C23.8207 23.3392 23.8532 23.331 23.8726 23.3261C23.8732 23.326 23.8737 23.3258 23.8742 23.3257C23.8858 23.3174 23.8977 23.3013 23.9018 23.281C23.9059 23.2604 23.902 23.2352 23.8803 23.2091L23.8797 23.2084C23.8628 23.183 23.842 23.1745 23.8201 23.1701C23.8128 23.1687 23.8059 23.1678 23.7988 23.1668C23.7946 23.1662 23.7903 23.1656 23.7859 23.1649C23.7745 23.1631 23.7628 23.1606 23.7521 23.1553L23.751 23.1547L23.6757 23.0889C23.6753 23.0886 23.6745 23.0881 23.6735 23.0876C23.6716 23.0866 23.6687 23.0851 23.6652 23.0835C23.658 23.0804 23.6483 23.0769 23.6377 23.0753C23.6271 23.0737 23.6159 23.0741 23.6056 23.0781C23.5957 23.082 23.5858 23.0896 23.5776 23.1036ZM23.6863 23.0733L23.6869 23.0737L23.7615 23.139C23.7693 23.1427 23.7784 23.1448 23.7888 23.1464C23.7924 23.147 23.7963 23.1475 23.8004 23.1481C23.808 23.1491 23.816 23.1502 23.8237 23.1518C23.8486 23.1567 23.8745 23.167 23.8951 23.1975C23.92 23.2276 23.9254 23.2585 23.9202 23.2847C23.915 23.3105 23.8995 23.3314 23.8834 23.3422L23.882 23.3431L23.8804 23.3435C23.8794 23.3437 23.8782 23.344 23.8771 23.3443C23.8576 23.3492 23.8233 23.3579 23.7847 23.359C23.7437 23.3602 23.6968 23.353 23.657 23.3232C23.6091 23.2896 23.5796 23.2531 23.5647 23.2147C23.5498 23.1762 23.5499 23.1367 23.5597 23.0977L23.56 23.0965L23.5606 23.0954C23.571 23.0772 23.5843 23.0663 23.5988 23.0607C23.613 23.0551 23.6277 23.0548 23.6405 23.0568C23.6533 23.0587 23.6647 23.0628 23.6728 23.0664C23.6768 23.0682 23.6801 23.0699 23.6825 23.0711C23.6836 23.0718 23.6845 23.0723 23.6852 23.0727L23.6859 23.0731L23.6861 23.0732L23.6863 23.0733ZM22.7148 23.2632C22.6987 23.3043 22.723 23.3648 22.785 23.3914L22.7856 23.3917L22.7862 23.3921C22.8229 23.4149 22.8563 23.4258 22.8832 23.4258C22.9095 23.4258 22.9295 23.4156 22.9416 23.3958C22.9492 23.3761 22.9455 23.3537 22.9315 23.3311C22.9173 23.3082 22.8928 23.2857 22.861 23.2675L22.8657 23.2594L22.8602 23.267C22.829 23.2447 22.7958 23.236 22.7688 23.2371C22.7414 23.2382 22.7222 23.2489 22.7148 23.2632ZM22.8707 23.2515C22.8364 23.2271 22.7994 23.2171 22.768 23.2184C22.737 23.2196 22.7094 23.2322 22.6979 23.2552L22.6976 23.2559C22.6766 23.3084 22.7083 23.3785 22.7769 23.4083C22.8151 23.4321 22.8518 23.4445 22.8832 23.4445C22.9153 23.4445 22.9421 23.4315 22.9581 23.4048L22.9585 23.4042L22.9587 23.4035C22.9695 23.3765 22.9637 23.3476 22.9475 23.3212C22.9313 23.2951 22.9043 23.2708 22.8707 23.2515Z" fill="#AA8C30"/>
+<path d="M23.0625 23.4563L23.4188 23.6625L23.4094 23.8313L23.025 23.5032L23.0625 23.4563Z" fill="#FCCA3E"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M23.0591 23.438L23.4333 23.6546L23.4218 23.8604L23.0055 23.5049L23.0591 23.438ZM23.0659 23.4745L23.0445 23.5012L23.3969 23.8021L23.4042 23.6703L23.0659 23.4745Z" fill="#AA8C30"/>
+<path d="M23.0625 23.4938C22.9875 23.5875 22.9125 23.5875 22.8469 23.5594C22.7813 23.5125 22.8375 23.4469 22.8375 23.4469L22.9125 23.3813C22.9313 23.3438 22.9125 23.2875 22.9781 23.25C23.0438 23.2125 23.0906 23.25 23.1 23.2782C23.1094 23.3157 23.1281 23.4188 23.0625 23.4938Z" fill="#FCCA3E"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M23.0567 23.2482C23.0385 23.2411 23.0134 23.2407 22.9828 23.2581C22.9526 23.2754 22.9422 23.2964 22.9368 23.3179C22.9348 23.3261 22.9335 23.3341 22.9322 23.3423C22.9317 23.3454 22.9312 23.3486 22.9307 23.3518C22.9287 23.3631 22.9262 23.3748 22.9209 23.3855L22.92 23.3871L22.8442 23.4534L22.8442 23.4535C22.8438 23.4539 22.8433 23.4546 22.8427 23.4554C22.8414 23.4571 22.8396 23.4596 22.8377 23.4628C22.8337 23.4692 22.8292 23.478 22.8266 23.4879C22.824 23.4979 22.8234 23.5086 22.8267 23.5193C22.8299 23.5296 22.8371 23.5406 22.8515 23.5512C22.8829 23.5645 22.9156 23.5707 22.9491 23.5631C22.9828 23.5555 23.0186 23.5336 23.0552 23.4879L23.0625 23.4938L23.0554 23.4876C23.1175 23.4167 23.1003 23.3184 23.091 23.2808C23.0871 23.2696 23.0752 23.2554 23.0567 23.2482ZM23.0697 23.4998C23.1385 23.4209 23.1185 23.3135 23.1091 23.2759L23.1089 23.2752C23.1032 23.2583 23.087 23.2399 23.0635 23.2307C23.0395 23.2214 23.0085 23.2219 22.9735 23.2419C22.938 23.2621 22.925 23.288 22.9186 23.3134C22.9164 23.3224 22.9149 23.3316 22.9136 23.3401C22.9131 23.343 22.9126 23.3459 22.9122 23.3486C22.9104 23.3589 22.9084 23.3678 22.9049 23.3755L22.8308 23.4403L22.8304 23.4408L22.8375 23.4469C22.8304 23.4408 22.8304 23.4408 22.8304 23.4408L22.8303 23.4409L22.8301 23.4411L22.8296 23.4418C22.8291 23.4423 22.8285 23.4431 22.8277 23.4442C22.8261 23.4463 22.824 23.4492 22.8217 23.4529C22.8172 23.4603 22.8117 23.4709 22.8085 23.4832C22.8052 23.4955 22.8041 23.51 22.8087 23.5248C22.8134 23.5398 22.8236 23.5543 22.8414 23.567L22.8422 23.5676L22.8432 23.568C22.8771 23.5826 22.9144 23.5902 22.9532 23.5814C22.9921 23.5726 23.0312 23.5478 23.0697 23.4998Z" fill="#AA8C30"/>
+<path d="M33.4313 27.1687L33.3938 27.2063L33.3657 27.3V27.1594L33.4125 27.1312L33.4313 27.1687ZM33.45 27.0844C33.45 27.0844 33.4219 27.1312 33.3469 27.1312C33.2719 27.1312 33.2344 27.0938 33.225 27.0563C33.2157 27.0188 33.2157 26.9906 33.2438 26.9437C33.2625 26.8969 33.2063 26.9812 33.2063 26.9812V27.075L33.2625 27.1312L33.3094 27.15H33.3469L33.4125 27.1312L33.45 27.1031V27.0844ZM33.8438 27.7688C33.8438 27.7688 33.8063 27.7875 33.7782 27.7781C33.6 27.7219 33.45 27.6094 33.45 27.6094L33.8063 27.8344L33.8438 27.7688ZM34.0688 27.8719C34.0688 27.8719 34.0688 27.9375 33.9938 27.9656C33.9282 27.9937 33.8813 27.9844 33.8532 27.9563C33.825 27.9281 33.8157 27.9 33.8157 27.8438L33.8063 27.9L33.8438 27.975L33.9188 28.0125L33.9657 28.0031L34.0125 27.9844L34.05 27.9375L34.0782 27.8906L34.0688 27.8719ZM36.3469 23.4094L36.3375 23.4469V23.5125L36.2532 23.4188L36.2907 23.3719L36.3469 23.4094ZM36.3 23.2969C36.3 23.3625 36.2157 23.4469 36.15 23.4188C36.0844 23.3906 36.0375 23.325 36.0657 23.25L36.0469 23.2781L36.0563 23.3812L36.1219 23.4375H36.2063L36.2625 23.4094L36.3 23.3438V23.2969ZM37.2375 23.4656C37.2282 23.4281 37.2375 23.4656 37.2375 23.4656C37.2469 23.5031 37.1813 23.625 37.1063 23.6156C37.0407 23.6062 37.0125 23.5406 37.0125 23.4844C37.0125 23.4281 37.0032 23.5031 37.0032 23.5031V23.5781L37.05 23.6156L37.1063 23.6531L37.1625 23.6344L37.2282 23.6063L37.2469 23.55V23.4656H37.2375Z" fill="#AA8C30"/>
+<path d="M36.9187 23.5312C36.9187 23.5312 36.9187 23.5687 36.8812 23.5969L36.7594 23.6625L37.0219 23.5875L37.0031 23.5219L36.9187 23.5406V23.5312ZM35.3156 25.6406L35.3063 25.6875V25.7625L35.1562 25.5281L35.2031 25.5L35.3156 25.6406ZM35.2312 25.4156C35.2125 25.4812 35.1 25.5094 35.0437 25.4906C34.9969 25.4531 34.95 25.3406 35.0156 25.3031L34.9781 25.3219L34.9688 25.3875L34.9875 25.4531L35.0437 25.5187L35.0906 25.5281L35.1656 25.5094L35.2219 25.4719C35.2219 25.4719 35.2594 25.35 35.2312 25.4156ZM35.7562 25.95C35.7562 25.95 35.7562 25.9781 35.7094 25.9781H35.5594L35.8031 26.0344L35.8219 25.9781L35.7562 25.95Z" fill="#AA8C30"/>
+<path d="M36.0562 26.0156C36.0844 26.0906 36.0094 26.175 35.9156 26.1469C35.8219 26.1188 35.7937 26.025 35.8219 25.9781L35.8031 26.0344L35.8219 26.1094L35.8781 26.1656H36L36.0562 26.1L36.075 26.0344L36.0656 26.0156H36.0562ZM26.775 27.0563C26.8031 27.0844 26.7656 27.1969 26.6625 27.2438C26.55 27.2813 26.5031 27.2438 26.475 27.2063C26.4469 27.1688 26.4469 27.1313 26.4469 27.1313L26.4281 27.15L26.4469 27.2063L26.4937 27.2531L26.5875 27.2719L26.6625 27.2625L26.7281 27.2156L26.7656 27.1875L26.7937 27.1406V27.0844L26.7844 27.0563H26.775Z" fill="#AA8C30"/>
+<path d="M26.6812 27.2906L26.6531 27.3281L26.625 27.4031V27.2719L26.6719 27.2437L26.6812 27.2906ZM26.325 27.6656C26.325 27.6656 26.325 27.6937 26.3437 27.7125L26.4375 27.7406H26.2687L26.25 27.675H26.325V27.6656ZM26.2687 27.7781V27.7969C26.2685 27.8129 26.2653 27.8288 26.2594 27.8437C26.2406 27.8906 26.2312 27.9375 26.1656 27.9281C26.1407 27.9239 26.1178 27.9115 26.1008 27.8928C26.0838 27.8741 26.0736 27.8502 26.0719 27.825C26.0719 27.7875 26.0531 27.7687 26.0531 27.7687V27.825L26.0906 27.9187L26.1562 27.9469H26.2031L26.25 27.9281L26.2687 27.8719L26.2781 27.825V27.7781H26.2687ZM25.8281 27.7687C25.8281 27.7687 25.8469 27.8437 25.9406 27.8437C26.0344 27.8437 26.0531 27.825 26.0531 27.825V27.8531L26.0344 27.8719H25.875L25.8469 27.8437L25.8187 27.7969V27.7687H25.8281ZM24.9469 25.3875V25.425C24.9375 25.4531 24.8812 25.5187 24.7781 25.5187C24.6844 25.5187 24.6375 25.4906 24.6094 25.4531C24.5812 25.425 24.5719 25.3781 24.5719 25.3781V25.425L24.6094 25.4906L24.7125 25.5375H24.8062L24.9 25.5094L24.9469 25.4625L24.9562 25.4062L24.9469 25.3875ZM24.7875 25.6031C24.7875 25.6031 24.75 25.6031 24.7312 25.6219C24.7179 25.6334 24.7053 25.646 24.6937 25.6594V25.5375H24.7875V25.6031ZM24.3469 25.9219L24.3937 25.95C24.4406 25.9781 24.6844 25.9969 24.6844 25.9969H24.3L24.3094 25.9219H24.3469ZM24.3 25.9219L24.2812 25.9781C24.2625 26.025 24.2156 26.1281 24.1312 26.1094C24.0469 26.1 24.0656 26.0344 24.0656 26.0344V25.9969L24.0469 26.0625L24.0656 26.1L24.1031 26.1187L24.1687 26.1281L24.2062 26.1094L24.2625 26.0625L24.2812 26.0156L24.3 25.9594V25.9312V25.9219ZM24.0937 25.9406C24.0937 25.9406 24.0937 25.9594 24.0281 25.9594C23.9625 25.9594 23.8687 25.9312 23.8687 25.9312L23.9062 25.9687L23.9531 25.9875H24.075L24.0937 25.9406ZM23.9062 23.2219C23.9062 23.2219 23.9062 23.2687 23.8781 23.2969C23.8406 23.325 23.7562 23.3437 23.7094 23.3156C23.6625 23.2875 23.5687 23.1937 23.5687 23.1937L23.6062 23.2687L23.6719 23.325L23.7656 23.3531L23.8594 23.3344L23.8969 23.2969L23.9156 23.2687L23.8969 23.2312L23.9062 23.2219Z" fill="#AA8C30"/>
+<path d="M23.625 23.3531V23.4094L23.6063 23.5125L23.6907 23.325L23.6532 23.3063L23.625 23.3531ZM23.1188 23.4938L23.1375 23.5406C23.1563 23.5875 23.3532 23.7844 23.3532 23.7844L23.0438 23.5125L23.0813 23.4656L23.1188 23.4938ZM23.025 23.5219C23.025 23.5219 22.9782 23.55 22.9313 23.55C22.9032 23.55 22.8375 23.55 22.8375 23.5125C22.8282 23.4656 22.8469 23.4469 22.8469 23.4469L22.8188 23.5031L22.8282 23.5406L22.875 23.5688H22.9407L22.9969 23.5406L23.0157 23.5219H23.025ZM22.8844 23.3906H22.8375C22.7719 23.3906 22.7063 23.3156 22.7063 23.3156L22.7532 23.3906L22.8469 23.4375L22.8844 23.3906Z" fill="#AA8C30"/>
+<path d="M37.4907 22.5187C37.4625 22.875 37.1063 23.0625 36.9188 23.1937C36.7313 23.325 36.6375 23.4937 36.6375 23.4937L36.5813 23.7L36.5532 23.8406L36.5438 23.8875C36.5532 23.925 36.5719 23.9812 36.5719 24.075L36.5625 24.4781L36.8157 24.3L36.9938 24.2344L37.05 24.225C37.05 24.225 36.8438 24.4218 36.7688 24.6375C36.6938 24.8531 36.5438 25.3125 36.2719 25.4625C35.9907 25.6125 35.8219 25.5562 35.7375 25.6312C35.6438 25.7062 35.6438 25.725 35.6438 25.725L35.5219 25.8937L35.4282 26.0062L35.3438 26.0719L35.2875 26.1094C35.2874 26.163 35.2811 26.2165 35.2688 26.2687L35.2032 26.4937C35.2032 26.4937 35.2594 26.4562 35.325 26.4469H35.4469C35.4469 26.4469 35.4 26.5031 35.3813 26.5687C35.3625 26.625 35.3907 27 35.0438 27.225C34.6875 27.4406 33.7875 27.4125 33.7875 27.4125L33.6188 27.4781L33.4594 27.6L33.3094 27.7594V27.7969C33.3094 27.7969 33.1875 27.9375 33.1125 27.9844L32.85 28.1625L33.0563 28.1719L33.3844 28.3125C33.3844 28.3125 33.1782 28.3125 33.0469 28.3594C32.9063 28.4156 32.2782 28.7719 31.9782 28.7625C31.6688 28.7531 31.2282 28.3031 31.2282 28.3031L31.0407 28.1719L30.7125 28.1062L30.3094 28.0875V28.0312L30.3188 27.9656C30.3188 27.9656 30.4594 27.9469 30.675 27.975C30.8625 27.9937 30.9282 28.0687 31.0875 28.0781C31.2469 28.0969 31.3688 28.0781 31.4157 28.05C31.4813 28.0219 31.9688 27.6094 31.9688 27.6094L32.5125 27.4219L32.7282 27.45L32.8219 27.4687L32.9063 27.4969L32.8125 27.5906C32.7732 27.6302 32.7291 27.6648 32.6813 27.6937L32.7469 27.75L33.0938 27.6937L33.2063 27.7219L33.2344 27.7406C33.2344 27.7125 33.2532 27.6656 33.2907 27.6187C33.3282 27.5625 33.525 27.4031 33.6094 27.3469L33.7407 27.2531C33.7688 27.225 33.8813 26.9437 33.8813 26.9437L33.8907 26.7937L34.275 26.4187L34.5375 26.1469L34.65 25.8375L34.6313 25.7719C34.6313 25.7719 34.725 25.8656 34.7157 26.0531C34.6969 26.2594 34.65 26.325 34.65 26.325C34.65 26.325 34.9125 26.1375 35.0532 26.0812C35.1657 26.0344 35.2407 26.0344 35.2782 26.0344C35.3157 26.0156 35.4188 25.95 35.475 25.8656C35.55 25.7531 35.5688 25.725 35.5688 25.6781L35.5875 25.4156L35.5594 24.7594L35.7844 24.2531L36.1125 23.9625L36.1782 23.925L36.1407 24.0375V24.1781C36.1407 24.1781 36.3094 23.9437 36.3938 23.9062L36.4407 23.8781C36.4752 23.8198 36.5005 23.7566 36.5157 23.6906L36.5438 23.4094V23.1281L36.4969 22.9125L36.3375 22.5094V21.9656L36.225 21.8156C36.225 21.8156 36.3282 21.8156 36.4594 22.0031C36.5495 22.1459 36.61 22.3053 36.6375 22.4719L36.9469 21.5062C36.9469 21.5062 37.0313 21.6187 37.0875 21.8156L37.1625 22.125L37.2938 21.8625L37.3032 21.9562C37.3219 22.05 37.5188 22.1531 37.4907 22.5187ZM31.1813 28.6125C31.1813 28.6125 31.1157 28.4625 30.8157 28.3125C30.525 28.1719 30.3 28.1437 30.3 28.1437V28.2469L30.7688 28.4531L30.9938 28.6406L31.1813 28.6125Z" fill="#9CA168"/>
+<path d="M33.3187 27.7125C33.3468 27.675 33.6 27.45 33.7312 27.3844C33.8625 27.3188 34.0312 27.3094 34.0312 27.3094C34.2094 27.2719 34.2375 27.3 34.65 27.075C35.0531 26.85 35.1468 26.5875 35.2312 26.5219C35.3062 26.4562 35.4469 26.4469 35.4469 26.4469L35.1281 26.8125C34.9658 26.976 34.783 27.1178 34.5843 27.2344C34.3623 27.3427 34.1189 27.4003 33.8718 27.4031C33.7311 27.4271 33.6005 27.4924 33.4968 27.5906C33.375 27.6844 33.3093 27.7969 33.3093 27.7969C33.3093 27.7969 33.2906 27.75 33.3093 27.7125H33.3187ZM34.4437 26.5219C34.0687 26.8687 33.9469 27.1969 33.9469 27.1969L34.4531 26.7375C34.6312 26.5688 34.875 26.4938 34.9781 26.3906C35.0906 26.2875 35.1 26.2031 35.1656 26.1375L35.2875 26.0437C35.2875 26.0437 35.1187 25.9125 34.4437 26.5219ZM33.6468 27.3281C33.6468 27.3281 33.8062 27.2531 33.8718 27.1125C33.9187 27 33.8906 26.9719 33.9656 26.85C33.9656 26.85 34.3594 26.475 34.5 26.3063C34.7437 26.0156 34.6312 25.7719 34.6312 25.7719C34.6312 25.7719 34.6594 25.8938 34.5562 26.025C34.4625 26.1563 33.9468 26.4937 33.8812 26.7C33.825 26.9062 33.8531 26.9156 33.825 27.0188C33.7687 27.2625 33.6468 27.3281 33.6468 27.3281ZM33.3844 28.3125C33.3844 28.3125 33.1875 28.1813 32.9625 28.1906C32.5031 28.2281 32.1187 28.5094 31.8187 28.5094C31.5281 28.5188 31.4062 28.3687 31.1719 28.2094C30.9281 28.0406 30.3093 28.0687 30.3093 28.0687V28.0969C30.3093 28.0969 30.7219 28.0969 30.9094 28.1531C31.2469 28.2469 31.4344 28.6031 31.8187 28.5844C32.3344 28.5562 32.7469 28.2469 32.9437 28.2469C33.3 28.2469 33.3844 28.3125 33.3844 28.3125ZM31.1344 28.0875C31.1344 28.0875 31.4812 28.1438 31.7531 27.9469C32.0344 27.75 32.3531 27.4781 32.5312 27.4594C32.7187 27.4594 32.9062 27.4969 32.9062 27.4969C32.9062 27.4969 32.6719 27.4031 32.4937 27.4031C32.3062 27.4031 32.1187 27.4219 31.95 27.525C31.7812 27.6281 31.6969 27.8062 31.5187 27.9281C31.4009 28.0032 31.2708 28.0572 31.1344 28.0875ZM31.0687 28.5563C31.0219 28.5563 30.9656 28.5844 30.9469 28.5844C30.9281 28.5844 30.825 28.4719 30.6656 28.3969C30.5156 28.3031 30.2906 28.2656 30.2906 28.2656C30.2906 28.2656 30.2625 28.2656 30.3187 28.2844L30.675 28.425C30.7683 28.4741 30.8511 28.5409 30.9187 28.6219C30.9281 28.65 30.975 28.7063 31.0593 28.6969C31.1531 28.6969 31.1812 28.65 31.1719 28.6031C31.1719 28.575 31.1156 28.5563 31.0687 28.5563ZM31.3125 28.2188C31.3125 28.2188 31.4531 28.2937 31.6875 28.2937C32.175 28.275 32.4937 27.9375 32.8125 27.825C33.1312 27.6937 33.3 27.7969 33.3 27.7969C33.3 27.7969 33.3094 27.7781 33.3 27.7781C33.192 27.7051 33.0647 27.666 32.9343 27.6656C32.4 27.6656 31.8843 28.0125 31.6687 28.1062C31.4531 28.2 31.3125 28.2188 31.3125 28.2188ZM36.5625 24.4781C36.3937 24.6563 36.1406 25.2 36.0375 25.35C35.925 25.5 35.7844 25.5375 35.7281 25.6031C35.6719 25.6594 35.475 25.9313 35.4281 25.9875C35.3812 26.0531 35.3719 26.0344 35.3343 26.0625C35.3062 26.0906 35.2875 26.0906 35.3437 26.0813C35.4 26.0719 35.4187 26.0344 35.4937 25.9406C35.5875 25.8469 35.5781 25.8094 35.7093 25.6875C35.8406 25.575 36.075 25.4437 36.1875 25.2937C36.3094 25.1531 36.5437 24.5906 36.675 24.45C36.8062 24.3094 37.05 24.225 37.05 24.225C37.05 24.225 36.8625 24.1688 36.5531 24.4781H36.5625ZM35.7187 25.5188C35.7187 25.5188 35.7094 25.425 35.8312 25.275C35.9531 25.125 35.9906 25.1531 36.0937 24.9375C36.1875 24.7219 36.2343 24.5156 36.3093 24.2906C36.3937 24.0656 36.525 23.8406 36.525 23.8406C36.525 23.8406 36.4031 23.8594 36.2718 24.0281C36.0833 24.2769 35.9317 24.5516 35.8219 24.8438C35.7187 25.1625 35.7187 25.5188 35.7187 25.5188ZM35.5593 25.725C35.5593 25.725 35.6062 25.7063 35.6062 25.425C35.6156 25.1531 35.5969 24.7688 35.6719 24.5813C35.7562 24.3938 36.1781 23.925 36.1781 23.925C36.1781 23.925 36 23.9719 35.7562 24.1594C35.5125 24.3469 35.4093 24.6 35.4187 24.7875C35.4375 24.975 35.5406 25.1813 35.55 25.3594L35.5593 25.7344V25.725ZM36.5437 23.8406C36.5437 23.8406 36.6468 23.4656 36.6937 23.3719C36.7406 23.2781 36.7406 23.2313 36.9469 22.9969C37.0687 22.8563 37.1906 22.7719 37.2375 22.5844C37.2937 22.3969 37.2937 21.8625 37.2937 21.8625C37.2937 21.8625 37.2375 21.9094 37.1906 22.0031C37.1437 22.0969 37.1812 22.4438 37.0969 22.6031C37.0219 22.7625 36.8437 23.1281 36.75 23.2125C36.75 23.2125 36.7312 22.9406 36.7687 22.6781C36.7969 22.3969 36.8906 22.3219 36.9281 22.1437C36.9656 21.9656 36.9469 21.5156 36.9469 21.5156C36.9469 21.5156 36.8062 21.6562 36.7312 21.8344C36.6562 22.0031 36.6187 22.3031 36.6187 22.5375C36.6187 22.7719 36.6656 22.9594 36.675 23.0906C36.6844 23.2219 36.6937 23.2781 36.6375 23.4281L36.5812 23.6156C36.5625 23.6977 36.5406 23.779 36.5156 23.8594L36.5437 23.8406ZM36.2156 21.8156C36.2156 21.8156 36.3469 21.975 36.3281 22.1531C36.3 22.3406 36.2343 22.575 36.3093 22.7625C36.375 22.95 36.4875 22.9687 36.5156 23.0812C36.5437 23.1937 36.5437 23.4 36.5437 23.4C36.5437 23.4 36.6 22.9969 36.5625 22.8844C36.5156 22.7813 36.4969 22.8281 36.4406 22.7156C36.3844 22.6031 36.4406 22.275 36.4031 22.0875C36.3562 21.9 36.2156 21.8156 36.2156 21.8156Z" fill="#717732"/>
+<path d="M28.7532 28.575C28.7532 28.575 28.7907 28.4812 29.0438 28.35C29.2602 28.23 29.4899 28.1356 29.7282 28.0687C29.7563 28.0969 29.7 28.2375 29.7 28.2375L29.4563 28.3125L29.2594 28.425L29.025 28.575H28.7532Z" fill="#9CA168"/>
+<path d="M29.4 27.9093C29.0813 27.9187 28.9031 28.0031 28.8375 28.0031C28.8188 28.0125 28.7719 28.05 28.725 28.0312C28.6684 27.9952 28.6204 27.9472 28.5844 27.8906L28.5188 27.825L28.5 28.0593L28.0312 27.6468L27.975 27.9281L27.9094 28.05L27.4406 27.6L27.4594 27.9468L27.3281 27.9562L26.9906 27.7218L26.8969 27.7593L27.0094 27.9656L26.5781 27.9937L26.4844 28.0687C26.4497 28.0964 26.4183 28.1278 26.3906 28.1625V28.2H26.5687C26.6062 28.1812 26.625 28.1343 26.6344 28.1531C26.6531 28.1718 26.6625 28.2656 26.7188 28.2562C26.775 28.2562 26.9719 28.0968 27.1125 28.1625C27.2719 28.2375 26.9062 28.35 26.9437 28.4531C26.9812 28.5656 27.2437 28.5187 27.3187 28.4812C27.375 28.4531 27.5719 28.2 27.6562 28.2937C27.7688 28.425 27.4219 28.5281 27.4875 28.6593C27.5438 28.7812 27.7406 28.7531 27.8344 28.6968C27.9281 28.65 28.1531 28.3125 28.2 28.3781C28.2844 28.5093 28.0125 28.6312 28.0781 28.725C28.1531 28.8187 28.2937 28.725 28.3969 28.65C28.5 28.575 28.5375 28.4156 28.6781 28.3406C28.8094 28.2656 28.8 28.2937 28.8375 28.2937C28.875 28.2937 28.9781 28.1906 28.9781 28.1906L29.3063 28.05L29.4563 28.0687L29.5406 28.1062L29.7 28.125L29.7188 27.9937C29.7188 27.9937 29.5313 27.9 29.4094 27.9L29.4 27.9093ZM26.8313 27.9093L26.8969 27.7875L26.8594 27.7312C26.8594 27.7312 26.7469 27.6656 26.6438 27.5625C26.5912 27.5012 26.5276 27.4503 26.4563 27.4125L26.25 27.2812L26.175 27.0187L26.1281 26.9343L26.0062 26.9906L25.8469 26.4187L25.8187 26.3156H25.7531L25.6125 26.6531L25.4719 26.4375L25.4344 25.9687L25.3406 26.0625L25.2188 26.1937L25.0031 25.7625C25.0031 25.7625 24.9937 25.7531 24.975 25.7906C24.975 25.8187 24.9469 25.9593 24.9656 26.0343C24.7544 25.9014 24.5648 25.737 24.4031 25.5468L24.3094 25.3125L24.4031 25.125L24.45 24.8812L24.2438 24.9656L24.2063 24.4312L24.1781 24.2625L23.925 24.6187L23.8312 24.4593V24.1218L23.7656 24.1031L23.6719 24.2906C23.6719 24.2906 23.5687 24.1031 23.5219 24.0562C23.5312 23.9812 23.5406 23.7843 23.4938 23.6343C23.4375 23.4468 23.3719 23.3437 23.4 23.1843C23.4188 23.0343 23.4844 23.0156 23.475 22.95C23.475 22.875 23.3625 22.9968 23.4 22.9031C23.4375 22.8093 23.7562 22.6031 23.6906 22.4906C23.625 22.3875 23.3156 22.6687 23.3812 22.4812C23.4562 22.2937 23.7563 22.2937 23.775 22.0218C23.7844 21.8625 23.4938 22.125 23.4656 22.0406C23.4375 21.9656 23.6531 21.7968 23.6437 21.6843C23.6437 21.5906 23.6812 21.5718 23.625 21.5156C23.5688 21.4593 23.3812 21.7312 23.3812 21.7312L23.1937 21.6656L23.1188 21.9468L23.0625 22.1812L22.8187 22.0406L22.8844 22.3312L22.9406 22.6125L22.6875 22.5468L22.8187 22.7906L22.9969 22.9781L23.1 23.1187L23.1844 23.1562L23.2781 23.2593L23.325 23.4187L23.3812 23.5968L23.3906 23.7656V23.9906L23.3812 24.0281V24.1312C23.3344 24.1312 23.25 24.0562 23.2219 24.1031C23.1937 24.1593 23.3719 24.2906 23.3344 24.3281C23.3062 24.3656 23.0531 24.2812 23.0344 24.3562C23.0156 24.45 23.0531 24.5625 23.2031 24.6C23.3531 24.6375 23.7 24.7125 23.6437 24.7875C23.5875 24.8531 23.2031 24.5718 23.2219 24.7781C23.2258 24.8496 23.2511 24.9182 23.2946 24.9751C23.3381 25.0319 23.3977 25.0744 23.4656 25.0968C23.5594 25.1343 23.9437 25.0968 23.925 25.1906C23.8969 25.275 23.6156 25.1531 23.5875 25.2843C23.5594 25.4156 23.7844 25.4343 23.8312 25.4343C23.8781 25.4343 24.0375 25.425 24.1031 25.4718L24.5062 25.8562C24.6459 25.9679 24.7898 26.0742 24.9375 26.175C24.8625 26.175 24.7125 26.1468 24.6937 26.2031C24.6656 26.2687 25.2563 26.4843 25.0875 26.5593C24.9188 26.625 24.7312 26.3718 24.6844 26.5218C24.6281 26.6812 24.7969 26.8031 24.8906 26.8593C24.9844 26.9156 25.5188 26.8687 25.4156 26.9906C25.3125 27.1125 24.9187 26.9156 24.9187 27.0562C24.9187 27.1968 25.1719 27.4312 25.3125 27.4218C25.4437 27.4218 25.5938 27.1968 25.65 27.3187C25.7156 27.4312 25.5562 27.4781 25.6781 27.5062C25.8094 27.5437 25.8937 27.375 26.0531 27.4125C26.1937 27.4406 26.4281 27.5343 26.5594 27.6468C26.6522 27.732 26.7429 27.8196 26.8313 27.9093Z" fill="#9CA168"/>
+<path d="M28.9126 28.5094C29.0063 28.5094 29.0063 28.5657 29.0251 28.5657C29.0344 28.5657 29.1938 28.425 29.3344 28.35C29.4537 28.2913 29.5796 28.2472 29.7094 28.2188L29.7188 28.2375C29.7188 28.2375 29.4563 28.3032 29.3251 28.3969L29.0438 28.5938C29.0251 28.6125 28.9688 28.6594 28.8844 28.6594C28.7907 28.6594 28.7532 28.6032 28.7532 28.575C28.7532 28.5563 28.8188 28.5094 28.9126 28.5094ZM29.7094 28.1063C29.7094 28.1063 29.6251 28.1157 29.5876 28.0782C29.5166 28.0275 29.431 28.0011 29.3438 28.0032C29.204 28.0178 29.0725 28.0769 28.9688 28.1719C28.9688 28.1813 28.9407 28.2282 28.8376 28.2938C28.8751 28.3032 28.9407 28.2563 29.0251 28.2C29.124 28.1272 29.2404 28.0819 29.3626 28.0688C29.4563 28.05 29.5219 28.1063 29.5688 28.1344C29.6157 28.1719 29.7001 28.1625 29.7001 28.1625V28.1063H29.7094ZM24.9751 26.175V26.1094C24.9038 26.0804 24.8348 26.0459 24.7688 26.0063C24.6188 25.9125 24.3001 25.65 24.3001 25.65L24.5626 25.9032C24.6938 26.025 24.9376 26.175 24.9376 26.175H24.9751ZM28.3126 28.5375L28.4532 28.3407C28.5376 28.2 28.6126 28.1532 28.6313 28.1344C28.6407 28.1157 28.5938 28.05 28.5657 28.0032L28.5469 27.8907C28.5469 27.8907 28.5844 27.9657 28.6407 28.0125C28.6775 28.0411 28.7119 28.0724 28.7438 28.1063C28.7438 28.1063 28.8751 28.0875 28.8751 28.0594C28.8751 28.0407 28.8751 28.0219 28.8563 28.0125C28.8282 28.0032 28.8094 28.0313 28.7532 28.0125C28.6313 27.9563 28.5844 27.7688 28.5094 27.7688C28.4344 27.7594 28.4907 27.9563 28.4532 27.9563C28.3501 27.975 28.2657 27.5532 27.9844 27.5344C27.7969 27.5344 27.7688 27.5625 27.7594 27.6C27.7594 27.6469 27.9938 27.8907 27.9094 27.9282C27.8344 27.9657 27.5813 27.5344 27.3938 27.5344C27.2157 27.5344 27.2063 27.6 27.2063 27.6375C27.2251 27.675 27.4126 27.7125 27.3751 27.8438C27.3282 27.975 27.1407 27.6563 26.9719 27.6657C26.8032 27.6844 26.7844 27.6938 26.7844 27.75C26.7751 27.7969 26.8407 27.8625 26.8126 27.8813C26.7938 27.9 26.6813 27.8907 26.5969 27.9469C26.5126 28.0125 26.4001 28.1719 26.4001 28.1719C26.4001 28.1719 26.5126 28.0125 26.6532 27.9938C26.828 27.984 27.0033 27.984 27.1782 27.9938L27.0751 27.9188C27.0188 27.8719 26.9719 27.7688 26.9719 27.7688L27.1313 27.9094C27.2063 27.975 27.3094 28.0219 27.3094 28.0219C27.3094 28.0219 27.4688 28.0407 27.4782 28.0594C27.4876 28.0782 27.4782 28.1157 27.4032 28.1813L27.2438 28.3407L27.4313 28.1907L27.5719 28.0782L27.7032 28.0969C27.7126 28.0969 27.7032 28.05 27.6282 27.9375L27.4782 27.7032C27.4782 27.7032 27.5719 27.7875 27.6657 27.9188C27.7688 28.0407 27.7594 28.1063 27.7969 28.1063C27.8344 28.1063 27.8907 28.125 27.9282 28.1157C27.9657 28.1157 27.9563 28.1719 27.8907 28.275C27.8251 28.3782 27.7782 28.5094 27.7782 28.5094C27.7782 28.5094 27.8532 28.3969 27.9282 28.3219C27.9938 28.2469 28.0313 28.1625 28.0688 28.1532H28.2094L28.1344 28.0032C28.0782 27.9094 28.0594 27.7594 28.0594 27.7594C28.0594 27.7594 28.1157 27.8907 28.1907 27.9938L28.3126 28.1719L28.4438 28.1625L28.4719 28.1719C28.4719 28.2188 28.4532 28.2375 28.4063 28.3407C28.3708 28.4042 28.3395 28.4699 28.3126 28.5375ZM26.2969 27.375C26.4094 27.4219 26.4563 27.4219 26.4563 27.4219C26.4563 27.4219 26.2969 27.3282 26.2594 27.1969C26.2126 27.0657 26.2594 26.7844 26.1844 26.7938C26.1188 26.7938 26.0813 26.9907 26.0157 26.9532C25.9407 26.9157 26.0344 26.5407 25.9594 26.3907C25.8844 26.2313 25.7157 26.1188 25.6782 26.175C25.6407 26.2313 25.6501 26.5688 25.5376 26.5032C25.4344 26.4282 25.5469 26.1282 25.5188 26.0063C25.4813 25.8657 25.4063 25.7719 25.3407 25.8094C25.2844 25.8375 25.3688 26.0907 25.2751 26.0907C25.1813 26.0907 25.1907 25.9125 25.1532 25.9032C25.1063 25.8844 25.0969 25.9313 25.0688 25.9032C25.0501 25.8657 25.0688 25.7438 25.0126 25.7532C24.9563 25.7625 24.9657 25.8657 24.9844 25.9125C24.9938 25.9688 25.0313 26.0438 25.0501 26.0813C25.0688 26.1188 25.1438 26.1657 25.1438 26.1938C25.1344 26.2219 25.0969 26.25 25.0501 26.25H24.8719C24.8719 26.25 25.0032 26.2875 25.0501 26.2875C25.0969 26.2875 25.1813 26.2688 25.2094 26.3063C25.2282 26.3532 25.3407 26.4938 25.3407 26.4938C25.3407 26.4938 25.3688 26.4188 25.3782 26.2875C25.3969 26.1469 25.3782 26.0344 25.3782 26.0344C25.3782 26.0344 25.4251 26.1844 25.4157 26.2875C25.4157 26.3813 25.3782 26.5688 25.3782 26.5688C25.3782 26.5688 25.4813 26.6438 25.4532 26.6625C25.4251 26.6907 25.3126 26.6907 25.1907 26.6907C25.0594 26.6907 24.8813 26.6438 24.8813 26.6438C25.077 26.7368 25.2931 26.7787 25.5094 26.7657L25.6782 26.9532C25.6782 26.9532 25.7626 26.8125 25.7719 26.6719V26.3907L25.8094 26.6532C25.8094 26.775 25.7719 26.9907 25.7532 27.0094C25.7013 27.0532 25.6405 27.0852 25.5751 27.1032L25.2469 27.15C25.2469 27.15 25.4532 27.1782 25.6032 27.15C25.7438 27.1125 25.7626 27.0657 25.8094 27.0938L25.8844 27.1594L26.0063 27.2532C26.0157 27.2625 25.9407 27.2907 25.9126 27.3188L25.7719 27.3844L25.9782 27.3188C26.0129 27.3072 26.0473 27.2947 26.0813 27.2813L26.1282 27.3L26.1188 27.1875L26.0907 27.0188C26.0907 27.0188 26.1376 27.0938 26.1563 27.1688L26.1657 27.3188C26.1657 27.3188 26.1844 27.3375 26.2969 27.375ZM23.3813 24.0375C23.3813 24.0375 23.4094 23.8782 23.4094 23.7C23.3899 23.5081 23.3291 23.3226 23.2313 23.1563L23.3251 23.025L23.2126 23.1188L23.1001 23.0719C23.0652 23.0475 23.0363 23.0154 23.0157 22.9782L23.1282 23.0532C23.1844 23.0719 23.1938 23.0625 23.1938 23.0625L23.1469 22.875L22.9688 22.7813C22.8469 22.725 22.7344 22.6125 22.7344 22.6125L22.9969 22.7532C23.0907 22.7907 23.1469 22.7907 23.1469 22.7907L23.2969 22.7344L23.4563 22.6313C23.4563 22.6313 23.3626 22.6875 23.2876 22.6969L23.1376 22.725L23.1094 22.5L23.0063 22.3969C22.9219 22.2844 22.8563 22.125 22.8563 22.125C22.8563 22.125 22.9501 22.2375 23.0157 22.2844C23.0813 22.3407 23.1469 22.425 23.1469 22.425L23.2969 22.3313L23.5594 22.1438L23.3063 22.2657L23.1563 22.3313C23.1563 22.3313 23.1376 22.2375 23.1563 22.1907C23.1844 22.1532 23.2313 22.0782 23.2219 22.0407C23.2219 21.9938 23.1844 22.0125 23.1751 21.975C23.1563 21.9469 23.2126 21.7313 23.2126 21.7313L23.2219 21.8438C23.2219 21.8907 23.2032 21.9375 23.2594 21.9375C23.3157 21.9375 23.5594 21.6844 23.5969 21.6375C23.6251 21.5907 23.6719 21.4688 23.5407 21.5157C23.4094 21.5719 23.4469 21.6844 23.3344 21.675C23.2969 21.675 23.2594 21.5344 23.2219 21.5625C23.1844 21.6 23.0907 21.6844 23.0719 21.7875C23.0532 21.8813 23.0907 22.0313 23.0344 22.0782C22.9782 22.125 22.9407 21.9094 22.8282 21.9375C22.7157 21.9657 22.6876 22.125 22.7063 22.1813C22.7251 22.2375 22.9594 22.5094 22.8938 22.5563C22.8094 22.5844 22.6219 22.3125 22.5188 22.5C22.4251 22.6782 22.8376 22.875 22.8938 22.9125C22.9407 22.9594 22.8938 22.9688 22.9688 23.0625C23.0438 23.1563 23.1376 23.175 23.1938 23.2313C23.3035 23.3969 23.3711 23.5868 23.3907 23.7844L23.3813 24.0375ZM24.4782 25.6407C24.4782 25.6407 24.3844 25.5282 24.4126 25.3313C24.4407 25.1438 24.5813 24.7969 24.5344 24.75C24.4876 24.7032 24.3469 24.9563 24.3094 24.9C24.2719 24.8438 24.3938 24.4969 24.3282 24.3563C24.2719 24.2157 24.2626 24.1219 24.1407 24.1407C24.0188 24.15 23.9719 24.5532 23.9063 24.4782C23.8501 24.4125 23.9438 24.2344 23.9063 24.1313C23.8594 24.0375 23.8407 24.0094 23.7844 24.0188C23.7188 24.0375 23.6907 24.225 23.6532 24.2157C23.6063 24.2157 23.5407 24 23.4469 24.0282C23.3626 24.0563 23.6626 24.45 23.6626 24.45C23.6626 24.45 23.7094 24.4032 23.7376 24.3375L23.7938 24.1969C23.7938 24.1969 23.8219 24.3188 23.7938 24.375C23.7751 24.4219 23.7657 24.5344 23.7657 24.5344C23.7657 24.5344 23.6907 24.5625 23.5688 24.5344C23.4943 24.5225 23.4217 24.5004 23.3532 24.4688C23.3532 24.4688 23.4282 24.525 23.5501 24.5625L23.8032 24.6282C23.8625 24.7149 23.925 24.7993 23.9907 24.8813L24.0657 24.6844L24.1876 24.3563L24.1313 24.7219L24.0657 25.0032C24.0657 25.0032 23.9719 25.0032 23.8219 24.975L23.4844 24.9L23.8219 25.0125L24.0844 25.0782L24.2157 25.2563L24.3094 25.1157L24.4032 24.9469C24.4032 24.9469 24.3751 25.0782 24.3376 25.1625C24.3169 25.2069 24.2951 25.2507 24.2719 25.2938L24.1032 25.3125H23.8688C24.0056 25.3571 24.1472 25.3854 24.2907 25.3969C24.2907 25.3969 24.2907 25.4438 24.3563 25.5188C24.3883 25.5672 24.4298 25.6087 24.4782 25.6407Z" fill="#717732"/>
+<path d="M29.475 29.1375C29.475 29.1375 29.4187 29.0813 29.3437 29.0438C29.2594 28.9969 29.2312 29.0063 29.2312 29.0063L29.1937 28.9969L29.2687 28.8094L29.7844 28.3125L29.8687 27.8157H30.1875V28.4907L30.2812 28.5375L30.8625 28.8844V29.0344L30.7687 29.0719L30.7031 29.1094L30.4875 29.1282L30.1125 28.8469L29.9437 28.6875L29.6625 29.0625L29.475 29.1375Z" fill="white"/>
+<path d="M29.8875 27.8157L29.8782 27.9094C29.8782 27.9938 29.8782 28.3969 29.8594 28.4532C29.8407 28.5094 29.5594 28.6219 29.4 28.7625C29.2407 28.9032 29.2313 29.0063 29.2313 29.0063C29.2313 29.0063 29.1844 29.0063 29.0813 29.0438C28.9875 29.0813 28.9407 29.1375 28.9407 29.1375C28.9407 29.1375 28.9969 28.8938 29.2594 28.6688C29.5125 28.425 29.6344 28.4063 29.6719 28.3688C29.7 28.3313 29.6719 27.9 29.6719 27.8532C29.6813 27.8157 29.7188 27.8157 29.7375 27.8157H29.8875ZM30.5438 29.2875L30.6188 29.1844L30.7125 29.1094L30.5719 29.0344C30.4313 28.9782 30.3563 28.9969 30.2625 28.9219C30.1872 28.8671 30.118 28.8043 30.0563 28.7344L29.9157 28.8469L30.075 29.0344C30.1594 29.1094 30.3282 29.1375 30.4032 29.1844C30.4568 29.2132 30.5071 29.2477 30.5532 29.2875H30.5438Z" fill="#016848"/>
+<path d="M30.1407 27.8063C30.1407 27.8063 30.3001 27.8063 30.3188 27.825L30.3376 27.8813C30.3376 27.8906 30.3376 28.2563 30.3188 28.3781C30.2951 28.48 30.2504 28.5758 30.1876 28.6594L29.8126 29.0063C29.7001 29.1188 29.5876 29.2688 29.5876 29.2688L29.5126 29.175C29.4844 29.1375 29.4469 29.1188 29.4563 29.0906C29.5324 28.9611 29.6385 28.8518 29.7657 28.7719C29.9532 28.65 30.1032 28.5094 30.1407 28.3125C30.1688 28.125 30.1407 27.8063 30.1407 27.8063Z" fill="#CD202A"/>
+<path d="M31.1719 29.0625C31.1719 29.0625 31.1344 29.025 31.0032 29.025L30.8625 29.0343C30.8625 29.0343 30.7875 28.9406 30.675 28.875C30.5625 28.8 30.4782 28.8093 30.3469 28.725C30.225 28.65 30.1594 28.5281 30.1594 28.5281L30.2532 28.3406C30.2532 28.3406 30.3657 28.4812 30.4782 28.5656C30.5813 28.65 30.825 28.725 30.9094 28.7906L31.1719 29.0625Z" fill="#CD202A"/>
+<path d="M32.3438 26.85C32.3438 26.85 32.0063 26.7188 32.025 26.5969C32.0531 26.4844 32.8031 26.2875 32.8031 26.2875L32.8125 26.0906C32.8125 26.0906 32.7 26.0813 32.5125 26.1375C32.325 26.2031 32.025 26.2875 31.7063 26.2875C30.632 26.2081 29.5569 26.1393 28.4813 26.0813C28.1344 26.0531 27.9188 25.5188 27.9188 25.5188L27.75 25.5563C27.75 25.5563 27.7969 25.8094 27.7125 25.8375C27.2577 25.7014 26.8204 25.5126 26.4094 25.275L26.3531 25.5188C26.3531 25.5188 27.0375 25.8938 27.0188 26.0344C27 26.1657 26.7938 26.1563 26.7938 26.1563L26.8875 26.325C26.9156 26.325 28.0125 26.3813 28.0406 26.7094C28.0406 26.85 27.7594 26.925 27.7594 26.925L27.8531 27.0375V27.0938C27.8531 27.0938 28.4813 27.0938 28.65 27.1875C28.8188 27.2813 28.9031 27.4313 29.1188 27.5438C29.325 27.6656 30.7407 27.6375 30.9563 27.5719C31.2094 27.5063 31.3594 27.225 31.7719 27.1031C32.175 26.9719 32.3063 26.9719 32.3063 26.9719L32.3438 26.85Z" fill="#30C2DC"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M26.3937 25.2389L26.4211 25.2548C26.8279 25.49 27.2607 25.6771 27.7107 25.8125C27.7183 25.8073 27.7258 25.7962 27.7313 25.7756C27.7379 25.7511 27.74 25.7194 27.7395 25.6868C27.7389 25.6545 27.7358 25.6229 27.7328 25.5992C27.7313 25.5874 27.7298 25.5777 27.7287 25.5709C27.7282 25.5676 27.7277 25.5649 27.7274 25.5632L27.7271 25.5612L27.727 25.5607L27.727 25.5606L27.7228 25.5383L27.933 25.4916L27.9405 25.51L27.9406 25.5103L27.941 25.5114L27.9428 25.5156C27.9444 25.5194 27.9469 25.525 27.9501 25.5322C27.9565 25.5466 27.9661 25.5672 27.9788 25.5921C28.004 25.642 28.0413 25.7086 28.089 25.7759C28.1856 25.9121 28.3207 26.0446 28.4828 26.0579C29.5582 26.116 30.6331 26.1847 31.7071 26.2641C32.0218 26.264 32.3186 26.1806 32.5048 26.1154L32.5058 26.1151C32.6011 26.0865 32.6777 26.0745 32.7307 26.0697C32.7572 26.0673 32.7778 26.0666 32.792 26.0666C32.7991 26.0666 32.8045 26.0668 32.8083 26.067C32.8102 26.067 32.8116 26.0671 32.8127 26.0672L32.8139 26.0673L32.8142 26.0673L32.8144 26.0673C32.8144 26.0673 32.8144 26.0673 32.8125 26.0907L32.8144 26.0673L32.837 26.0692L32.8257 26.3058L32.8091 26.3102L32.807 26.3108L32.8007 26.3124C32.7953 26.3139 32.7872 26.316 32.777 26.3188C32.7565 26.3244 32.7272 26.3325 32.6919 26.3426C32.6214 26.3628 32.5271 26.3908 32.432 26.4223C32.3367 26.4538 32.2413 26.4887 32.1683 26.5224C32.1317 26.5393 32.1015 26.5556 32.0799 26.5706C32.0691 26.5781 32.0611 26.5849 32.0556 26.5908C32.0507 26.5961 32.0487 26.5998 32.048 26.6018C32.0457 26.6206 32.0565 26.6439 32.0836 26.6714C32.1105 26.6987 32.1489 26.7253 32.1892 26.749C32.2293 26.7724 32.2701 26.7923 32.301 26.8063C32.3164 26.8133 32.3293 26.8188 32.3383 26.8225C32.3428 26.8244 32.3463 26.8258 32.3487 26.8268L32.3514 26.8279L32.3521 26.8281L32.3522 26.8282L32.3726 26.8361L32.3236 26.9954L32.3063 26.9954L32.3062 26.9954L32.3054 26.9954C32.3049 26.9954 32.3042 26.9954 32.3033 26.9955C32.3027 26.9955 32.302 26.9955 32.3012 26.9956C32.2972 26.9958 32.2909 26.9963 32.282 26.9973C32.2641 26.9992 32.2358 27.0032 32.1948 27.0113C32.1127 27.0275 31.98 27.0601 31.7791 27.1255L31.7785 27.1257C31.5765 27.1853 31.4387 27.2839 31.3187 27.3772C31.3062 27.3869 31.2938 27.3966 31.2815 27.4062C31.1775 27.4879 31.0808 27.5637 30.9626 27.5945C30.9334 27.6033 30.886 27.6111 30.8265 27.6178C30.7662 27.6247 30.692 27.6308 30.6086 27.6357C30.4418 27.6457 30.2377 27.6516 30.034 27.6516C29.8303 27.6516 29.6266 27.6457 29.4606 27.6322C29.3777 27.6254 29.3038 27.6167 29.2439 27.6057C29.1852 27.595 29.1371 27.5817 29.1074 27.5643C28.997 27.5066 28.9203 27.4394 28.851 27.3759C28.8453 27.3707 28.8396 27.3655 28.834 27.3604C28.771 27.3025 28.7134 27.2496 28.6386 27.208C28.6004 27.1868 28.5331 27.1697 28.4506 27.1565C28.369 27.1435 28.2755 27.1347 28.1867 27.1289C28.0981 27.1231 28.0147 27.1202 27.9533 27.1187C27.9227 27.118 27.8976 27.1176 27.8802 27.1174C27.8715 27.1173 27.8647 27.1173 27.8601 27.1173L27.8549 27.1172L27.8532 27.1172H27.8531H27.8297V27.046L27.7179 26.9119L27.7533 26.9024L27.7535 26.9024L27.754 26.9022L27.7561 26.9016C27.7581 26.9011 27.761 26.9002 27.7647 26.8991C27.7721 26.8969 27.7828 26.8935 27.7956 26.889C27.8213 26.88 27.8554 26.8667 27.8892 26.8491C27.9233 26.8315 27.956 26.8103 27.98 26.786C28.0036 26.762 28.0169 26.7368 28.0172 26.7104C28.0108 26.6424 27.9483 26.5828 27.8424 26.5321C27.7378 26.4819 27.5995 26.4446 27.4596 26.4172C27.3199 26.3898 27.1801 26.3726 27.0733 26.3623C27.02 26.3571 26.9749 26.3537 26.9424 26.3515C26.9261 26.3504 26.913 26.3496 26.9036 26.3492C26.8988 26.3489 26.8951 26.3487 26.8923 26.3486L26.8889 26.3485L26.8879 26.3485L26.8876 26.3485C26.8875 26.3485 26.8876 26.3485 26.8876 26.3485C26.8876 26.3485 26.8875 26.3485 26.8875 26.3485H26.8737L26.7529 26.131L26.7948 26.1329L26.7952 26.1329L26.7966 26.1329C26.798 26.133 26.8 26.133 26.8026 26.133C26.8079 26.133 26.8156 26.1329 26.8249 26.1323C26.8435 26.1312 26.8683 26.1284 26.8933 26.1219C26.9448 26.1085 26.9882 26.082 26.9955 26.0312C26.9966 26.0229 26.9925 26.0081 26.9765 25.9855C26.961 25.9638 26.9372 25.939 26.907 25.912C26.8468 25.8582 26.7641 25.7989 26.6801 25.7434C26.5962 25.6881 26.5116 25.637 26.4479 25.5998C26.4161 25.5812 26.3896 25.5661 26.371 25.5556C26.3617 25.5504 26.3544 25.5463 26.3494 25.5435L26.3438 25.5404L26.3423 25.5396L26.3419 25.5394L26.3263 25.5308L26.3937 25.2389ZM26.3799 25.5069C26.3839 25.5091 26.3886 25.5117 26.394 25.5148C26.4128 25.5253 26.4395 25.5406 26.4716 25.5594C26.5357 25.5968 26.621 25.6483 26.7059 25.7043C26.7906 25.7602 26.8755 25.821 26.9383 25.877C26.9696 25.905 26.9962 25.9325 27.0146 25.9583C27.0323 25.9831 27.0456 26.0107 27.042 26.0375L27.042 26.0377C27.0305 26.1181 26.9614 26.1526 26.9051 26.1673C26.8787 26.1742 26.853 26.1773 26.833 26.1788L26.9016 26.3021C26.9642 26.3052 27.2164 26.3218 27.4686 26.3712C27.6099 26.3989 27.7528 26.4371 27.8627 26.4898C27.9707 26.5416 28.0558 26.6118 28.064 26.7074L28.0641 26.7084V26.7094C28.0641 26.7529 28.0422 26.7896 28.0134 26.8189C27.9846 26.8482 27.947 26.8721 27.9108 26.8908C27.8743 26.9096 27.8381 26.9238 27.8111 26.9333C27.8071 26.9346 27.8034 26.9359 27.7999 26.9371L27.8766 27.0291V27.0705C27.8779 27.0705 27.8793 27.0705 27.8807 27.0705C27.8983 27.0707 27.9236 27.0711 27.9545 27.0718C28.0162 27.0733 28.1003 27.0762 28.1898 27.0821C28.2792 27.088 28.3744 27.0969 28.458 27.1102C28.5407 27.1234 28.6153 27.1414 28.6614 27.1671C28.7413 27.2114 28.8029 27.2681 28.8652 27.3254C28.871 27.3307 28.8768 27.336 28.8826 27.3414C28.9514 27.4043 29.0246 27.4682 29.1296 27.523L29.1307 27.5236C29.1526 27.5365 29.1936 27.5489 29.2523 27.5596C29.3101 27.5702 29.3823 27.5788 29.4645 27.5855C29.6287 27.5989 29.831 27.6047 30.034 27.6047C30.2369 27.6047 30.44 27.5989 30.6058 27.589C30.6887 27.584 30.762 27.578 30.8212 27.5713C30.8809 27.5645 30.9247 27.557 30.9494 27.5495L30.9504 27.5492C31.0587 27.5211 31.1474 27.4517 31.2531 27.3689C31.2652 27.3594 31.2774 27.3499 31.2899 27.3401C31.4113 27.2459 31.5546 27.143 31.7649 27.0808C31.967 27.015 32.1014 26.982 32.1857 26.9653C32.2279 26.957 32.2575 26.9528 32.2769 26.9507C32.2813 26.9502 32.2852 26.9498 32.2886 26.9495L32.315 26.8636C32.3062 26.8599 32.2948 26.855 32.2816 26.849C32.2498 26.8346 32.2074 26.814 32.1655 26.7894C32.1238 26.765 32.0813 26.7359 32.0502 26.7043C32.0199 26.6736 31.9954 26.6353 32.0018 26.5934L32.002 26.5923L32.0023 26.5912C32.0053 26.5789 32.0127 26.5681 32.0212 26.559C32.0297 26.5497 32.0407 26.5407 32.0531 26.5321C32.0779 26.5148 32.111 26.4972 32.1486 26.4798C32.2241 26.445 32.3215 26.4095 32.4172 26.3778C32.5132 26.346 32.6081 26.3178 32.6791 26.2975C32.7145 26.2874 32.744 26.2792 32.7647 26.2736C32.7708 26.272 32.7761 26.2705 32.7805 26.2693L32.7879 26.1135C32.7753 26.1137 32.7575 26.1143 32.7349 26.1164C32.6849 26.1209 32.6117 26.1323 32.5197 26.1598C32.3311 26.2258 32.0285 26.311 31.7062 26.311H31.7054L31.7045 26.3109C30.6304 26.2315 29.5555 26.1628 28.48 26.1047L28.4794 26.1047C28.2948 26.0897 28.1487 25.941 28.0508 25.8031C28.0013 25.7333 27.9629 25.6646 27.937 25.6133C27.9239 25.5877 27.914 25.5664 27.9073 25.5514C27.9064 25.5495 27.9056 25.5476 27.9049 25.5459L27.7767 25.5744C27.7775 25.5799 27.7784 25.5863 27.7793 25.5933C27.7824 25.618 27.7857 25.6514 27.7863 25.686C27.7869 25.7202 27.7849 25.757 27.7766 25.7878C27.7685 25.8177 27.7526 25.8489 27.7199 25.8598L27.7129 25.8621L27.7058 25.86C27.2593 25.7264 26.8297 25.5422 26.4251 25.3111L26.3799 25.5069Z" fill="#0872A7"/>
+<path d="M26.6719 26.5125C26.7806 26.5125 26.8687 26.4244 26.8687 26.3156C26.8687 26.2069 26.7806 26.1188 26.6719 26.1188C26.5631 26.1188 26.475 26.2069 26.475 26.3156C26.475 26.4244 26.5631 26.5125 26.6719 26.5125Z" fill="white"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M26.6719 26.1656C26.589 26.1656 26.5219 26.2328 26.5219 26.3156C26.5219 26.3985 26.589 26.4656 26.6719 26.4656C26.7547 26.4656 26.8219 26.3985 26.8219 26.3156C26.8219 26.2328 26.7547 26.1656 26.6719 26.1656ZM26.4281 26.3156C26.4281 26.181 26.5372 26.0719 26.6719 26.0719C26.8065 26.0719 26.9156 26.181 26.9156 26.3156C26.9156 26.4503 26.8065 26.5594 26.6719 26.5594C26.5372 26.5594 26.4281 26.4503 26.4281 26.3156Z" fill="#0872A7"/>
+<path d="M27.7875 25.5937C27.8962 25.5937 27.9843 25.5056 27.9843 25.3968C27.9843 25.2881 27.8962 25.2 27.7875 25.2C27.6787 25.2 27.5906 25.2881 27.5906 25.3968C27.5906 25.5056 27.6787 25.5937 27.7875 25.5937Z" fill="white"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M27.7875 25.2468C27.7046 25.2468 27.6375 25.314 27.6375 25.3968C27.6375 25.4797 27.7046 25.5468 27.7875 25.5468C27.8703 25.5468 27.9375 25.4797 27.9375 25.3968C27.9375 25.314 27.8703 25.2468 27.7875 25.2468ZM27.5437 25.3968C27.5437 25.2622 27.6528 25.1531 27.7875 25.1531C27.9221 25.1531 28.0312 25.2622 28.0312 25.3968C28.0312 25.5314 27.9221 25.6406 27.7875 25.6406C27.6528 25.6406 27.5437 25.5314 27.5437 25.3968Z" fill="#0872A7"/>
+<path d="M32.4844 27.0656C32.5931 27.0656 32.6812 26.9775 32.6812 26.8688C32.6812 26.76 32.5931 26.6719 32.4844 26.6719C32.3756 26.6719 32.2875 26.76 32.2875 26.8688C32.2875 26.9775 32.3756 27.0656 32.4844 27.0656Z" fill="white"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M32.4844 26.7188C32.4015 26.7188 32.3344 26.7859 32.3344 26.8688C32.3344 26.9516 32.4015 27.0188 32.4844 27.0188C32.5672 27.0188 32.6344 26.9516 32.6344 26.8688C32.6344 26.7859 32.5672 26.7188 32.4844 26.7188ZM32.2406 26.8688C32.2406 26.7341 32.3497 26.625 32.4844 26.625C32.619 26.625 32.7281 26.7341 32.7281 26.8688C32.7281 27.0034 32.619 27.1125 32.4844 27.1125C32.3497 27.1125 32.2406 27.0034 32.2406 26.8688Z" fill="#0872A7"/>
+<path d="M25.7906 25.1062C25.725 25.2562 25.9781 25.5375 26.1656 25.575C26.3344 25.5937 26.4281 25.5562 26.4656 25.4719C26.4782 25.4326 26.4814 25.3909 26.4749 25.3502C26.4684 25.3095 26.4523 25.2709 26.4281 25.2375C26.3156 25.0781 25.8656 24.9562 25.7906 25.1062Z" fill="#F8C83C"/>
+<path d="M26.3437 25.3312C26.3437 25.2375 26.1937 25.1531 26.1 25.1531C26.0062 25.1531 25.9125 25.1531 25.9312 25.2C25.9406 25.2562 26.1844 25.3218 26.1937 25.35C26.1937 25.3781 26.1187 25.4062 26.1562 25.4437C26.2031 25.4812 26.25 25.4531 26.2875 25.425C26.325 25.3968 26.3531 25.3875 26.3531 25.3312H26.3437Z" fill="white"/>
+<path d="M27.9094 27.0281C27.9469 27.1593 27.8437 27.2156 27.7219 27.2812C27.5812 27.3375 27.3187 27.3 27.2531 27.1968C27.1969 27.0937 27.3469 26.9156 27.5156 26.8781C27.675 26.8406 27.8719 26.9062 27.9094 27.0281Z" fill="#F8C83C"/>
+<path d="M27.6375 27.0937C27.6844 27.0937 27.6937 27.1875 27.7312 27.1687C27.7781 27.1687 27.825 27.0937 27.8062 27.0469C27.7969 26.9906 27.7125 26.925 27.6375 26.9344C27.5625 26.9344 27.3562 27.1219 27.375 27.1687C27.3937 27.2156 27.45 27.2156 27.4875 27.1969C27.525 27.1781 27.5812 27.1031 27.6375 27.1031V27.0937Z" fill="white"/>
+<path d="M32.7376 26.3438C32.8594 26.5032 33.0751 26.3625 33.1313 26.2969C33.1876 26.2407 33.3563 26.1375 33.2907 26.0344C33.2157 25.9313 33.1032 25.9407 33.0094 25.9407C32.9344 25.9407 32.7657 26.0719 32.7376 26.1282C32.7094 26.175 32.6813 26.2782 32.7376 26.3532V26.3438Z" fill="#F8C83C"/>
+<path d="M32.775 26.25C32.775 26.25 32.7844 26.0719 32.9438 26.0625C33.0375 26.0625 33.0375 26.0906 33.1125 26.1281C33.1781 26.1656 33.2063 26.0813 33.2063 26.0813C33.2063 26.0813 33.2063 26.2031 33.1031 26.2031C32.9906 26.2031 33.0281 26.1562 32.9156 26.1375C32.8219 26.1187 32.775 26.2406 32.775 26.2406V26.25Z" fill="white"/>
+<path d="M30.1781 25.9125L30.0937 25.8562H29.8312L29.5125 25.8656L29.8312 26.7937L30.2062 27.3375L30.3562 27.3937L30.6468 27.375L30.7031 27.225L30.5906 26.3343L30.1781 25.9125Z" fill="#F9AA51"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M29.8312 25.8328H30.0937C30.0983 25.8328 30.1029 25.8341 30.1067 25.8367L30.1911 25.893L30.1781 25.9125L30.1948 25.8961L30.6073 26.3179C30.6109 26.3216 30.6132 26.3263 30.6138 26.3314L30.7263 27.222C30.7268 27.2258 30.7264 27.2296 30.725 27.2332L30.6688 27.3832C30.6655 27.3918 30.6575 27.3977 30.6483 27.3983L30.3577 27.4171C30.3544 27.4173 30.3511 27.4168 30.348 27.4156L30.198 27.3594C30.1935 27.3577 30.1896 27.3547 30.1869 27.3508L29.8119 26.807C29.8107 26.8052 29.8097 26.8033 29.809 26.8013L29.4903 25.8732C29.4879 25.8661 29.4889 25.8584 29.4932 25.8522C29.4974 25.8461 29.5043 25.8424 29.5118 25.8421L29.8312 25.8328ZM30.163 25.9306L30.0866 25.8796H29.8315L29.545 25.8881L29.8523 26.783L30.2213 27.3181L30.3597 27.37L30.6302 27.3525L30.6791 27.2221L30.5683 26.3451L30.163 25.9306Z" fill="#953220"/>
+<path d="M29.1188 25.9687L29.1375 25.8656L29.3063 25.8562C29.3751 25.8488 29.4447 25.8519 29.5125 25.8656C29.5125 25.8656 29.7281 26.1375 29.8031 26.3062C29.8781 26.475 29.9625 26.7562 30.0563 26.925C30.15 27.1031 30.3563 27.3937 30.3563 27.3937H29.9813L29.7938 27.3375L29.2688 26.4937L29.1188 25.9687Z" fill="#F9AA51"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M29.4995 25.8869C29.4366 25.8751 29.3724 25.8726 29.3088 25.8795L29.3076 25.8797L29.1573 25.888L29.1428 25.9676L29.2904 26.4841L29.809 27.3176L29.9847 27.3703H30.3112C30.3087 27.3667 30.3061 27.3629 30.3033 27.3589C30.2824 27.3288 30.2537 27.2868 30.2219 27.2392C30.1587 27.1443 30.0831 27.0263 30.0356 26.9361C29.9879 26.8501 29.9428 26.7361 29.9007 26.6238C29.8911 26.5982 29.8817 26.5727 29.8724 26.5476C29.8405 26.4617 29.8104 26.3804 29.7817 26.3158C29.7453 26.2337 29.6739 26.1253 29.6106 26.0362C29.5791 25.9919 29.55 25.9529 29.5287 25.9249C29.5181 25.9109 29.5094 25.8997 29.5034 25.892C29.5019 25.8901 29.5006 25.8884 29.4995 25.8869ZM29.5309 25.8511C29.5276 25.8469 29.5228 25.8438 29.5171 25.8426C29.4471 25.8285 29.3754 25.8252 29.3044 25.8329L29.1362 25.8422C29.1254 25.8428 29.1164 25.8508 29.1145 25.8614L29.0957 25.9645L29.1188 25.9687L29.0962 25.9752L29.2462 26.5002C29.2468 26.5023 29.2477 26.5043 29.2489 26.5061L29.7739 27.3499C29.7769 27.3547 29.7816 27.3583 29.787 27.3599L29.9745 27.4162C29.9767 27.4168 29.979 27.4172 29.9813 27.4172H30.3563C30.365 27.4172 30.3731 27.4123 30.3771 27.4045C30.3811 27.3967 30.3804 27.3873 30.3754 27.3802L30.3748 27.3794L30.3731 27.3769L30.3664 27.3674C30.3606 27.3592 30.3522 27.3472 30.3418 27.3322C30.3211 27.3023 30.2925 27.2605 30.2609 27.2132C30.1977 27.1183 30.1233 27.002 30.077 26.9141L30.0768 26.9136C30.0308 26.831 29.9868 26.72 29.9446 26.6074C29.9352 26.5824 29.9259 26.5572 29.9167 26.5324C29.8848 26.4461 29.8539 26.3629 29.8246 26.2967C29.786 26.21 29.7121 26.0982 29.6488 26.0091C29.617 25.9643 29.5875 25.9248 29.566 25.8965C29.5553 25.8824 29.5465 25.8711 29.5404 25.8632C29.5374 25.8593 29.535 25.8563 29.5334 25.8542L29.5315 25.8519L29.5309 25.8511Z" fill="#953220"/>
+<path d="M28.8938 25.8563H29.1375C29.2984 25.9932 29.4238 26.1668 29.5031 26.3625C29.5969 26.625 29.55 26.6625 29.6719 26.9438C29.8031 27.2157 29.9719 27.4032 29.9719 27.4032C29.9719 27.4032 29.6063 27.4219 29.4094 27.3844C29.1938 27.3469 29.1281 27.3563 29.0719 27.2907C29.0237 27.244 28.9702 27.2031 28.9125 27.1688H28.7063L28.7531 26.8782L28.6969 26.2313L28.7063 25.9032L28.8938 25.8563ZM31.0875 26.025L30.7406 25.8844L30.0844 25.8469L30.1406 26.1844C30.189 26.4349 30.271 26.6778 30.3844 26.9063C30.4875 27.0938 30.5906 27.3188 30.6469 27.375C30.7031 27.4219 31.0781 27.2719 31.0781 27.2719L31.3219 27.2344L31.2938 26.9719L31.2563 26.8782L31.3125 26.1282L31.2563 26.0157L31.0875 26.025Z" fill="#F9AA51"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M30.067 25.8313C30.0717 25.826 30.0786 25.8231 30.0857 25.8235L30.742 25.861C30.7446 25.8612 30.7471 25.8617 30.7495 25.8627L31.0915 26.0014L31.255 25.9923C31.2643 25.9918 31.2731 25.9968 31.2772 26.0052L31.3335 26.1177C31.3354 26.1215 31.3362 26.1257 31.3359 26.1299L31.2801 26.8745L31.3155 26.9632C31.3163 26.9652 31.3168 26.9673 31.3171 26.9694L31.3452 27.2319C31.3465 27.2444 31.3378 27.2557 31.3255 27.2576L31.0843 27.2947L31.0825 27.2954C31.0797 27.2965 31.0756 27.2981 31.0704 27.3001C31.0599 27.3042 31.0449 27.3099 31.0268 27.3166C30.9906 27.33 30.9415 27.3474 30.8906 27.3634C30.8399 27.3793 30.7866 27.3941 30.742 27.4018C30.7198 27.4057 30.6988 27.4079 30.681 27.4075C30.6644 27.4071 30.6454 27.4043 30.6319 27.3931C30.6313 27.3926 30.6308 27.3921 30.6303 27.3916C30.614 27.3753 30.5958 27.3485 30.5766 27.3165C30.557 27.284 30.5354 27.2443 30.5125 27.2008C30.4963 27.1701 30.4795 27.1375 30.4622 27.1041C30.4304 27.0425 30.3972 26.9782 30.3639 26.9176L30.3634 26.9167C30.249 26.6863 30.1664 26.4414 30.1176 26.1889L30.1175 26.1883L30.0613 25.8508C30.0601 25.8438 30.0622 25.8366 30.067 25.8313ZM31.0694 27.2502C31.0711 27.2495 31.0728 27.249 31.0746 27.2488L31.2962 27.2147L31.2708 26.9776L31.2345 26.8869C31.2332 26.8836 31.2326 26.88 31.2329 26.8764L31.2887 26.1329L31.2422 26.0399L31.0888 26.0484L31.0875 26.025L31.0787 26.0468L30.7354 25.9076L30.1123 25.872L30.1637 26.1803C30.2116 26.4284 30.2929 26.669 30.4052 26.8954C30.4387 26.9564 30.4724 27.0217 30.5043 27.0834C30.5215 27.1167 30.5381 27.1489 30.554 27.179C30.5768 27.2222 30.5979 27.261 30.6167 27.2924C30.6353 27.3232 30.6506 27.3452 30.6623 27.3573C30.6629 27.3576 30.6643 27.3583 30.6668 27.3589C30.6704 27.3598 30.6755 27.3605 30.6822 27.3606C30.6956 27.361 30.7132 27.3592 30.734 27.3556C30.7755 27.3484 30.8265 27.3344 30.8766 27.3187C30.9265 27.303 30.9747 27.2859 31.0105 27.2726C31.0284 27.266 31.0432 27.2604 31.0535 27.2564C31.0561 27.2554 31.0585 27.2545 31.0606 27.2537C31.0624 27.2529 31.064 27.2523 31.0653 27.2518L31.0684 27.2506L31.0692 27.2503L31.0694 27.2502ZM28.8876 25.8337C28.8896 25.8331 28.8916 25.8329 28.8938 25.8329H29.1375C29.1431 25.8329 29.1485 25.8348 29.1527 25.8384C29.3164 25.9778 29.4441 26.1545 29.5249 26.3537L29.5252 26.3547C29.5675 26.4729 29.5817 26.5467 29.595 26.6158C29.5966 26.6244 29.5983 26.633 29.6 26.6416C29.6149 26.7175 29.6332 26.7955 29.6932 26.934C29.758 27.0682 29.8321 27.1817 29.8901 27.2617C29.9191 27.3017 29.944 27.3333 29.9616 27.3548C29.9704 27.3655 29.9774 27.3738 29.9822 27.3793C29.9845 27.3821 29.9863 27.3841 29.9876 27.3855L29.9889 27.387L29.9892 27.3874L29.9893 27.3875C29.9893 27.3875 29.9893 27.3875 29.9893 27.3875M28.8876 25.8337L28.7006 25.8804C28.6904 25.883 28.6831 25.892 28.6828 25.9025L28.6735 26.2306C28.6734 26.2315 28.6735 26.2324 28.6736 26.2333L28.7295 26.8773L28.6831 27.1651C28.682 27.1718 28.684 27.1788 28.6884 27.184C28.6929 27.1892 28.6994 27.1922 28.7063 27.1922H28.906C28.9598 27.2247 29.0097 27.2631 29.0548 27.3068C29.0873 27.3443 29.1232 27.36 29.1761 27.371C29.2021 27.3765 29.2331 27.381 29.2702 27.3864L29.2713 27.3865C29.3084 27.3919 29.3522 27.3983 29.4052 27.4075C29.506 27.4267 29.6485 27.4313 29.7645 27.4313C29.8228 27.4313 29.8749 27.4301 29.9124 27.4289C29.9312 27.4284 29.9463 27.4278 29.9568 27.4273C29.962 27.4271 29.9661 27.4269 29.9688 27.4268L29.972 27.4266L29.9728 27.4266L29.973 27.4266L29.9719 27.4032M28.8967 25.8797L28.7292 25.9216L28.7204 26.2306L28.7765 26.8761C28.7767 26.8781 28.7766 26.88 28.7763 26.8819L28.7338 27.1454H28.9125C28.9167 27.1454 28.9209 27.1465 28.9245 27.1486C28.9838 27.1839 29.0387 27.2259 29.0882 27.2738C29.0887 27.2743 29.0892 27.2749 29.0897 27.2754C29.1133 27.3029 29.1382 27.3152 29.1857 27.3252C29.21 27.3302 29.2394 27.3345 29.277 27.34L29.2782 27.3402C29.3153 27.3455 29.3597 27.352 29.4134 27.3613L29.4138 27.3614C29.5099 27.3797 29.6485 27.3844 29.7645 27.3844C29.8222 27.3844 29.8738 27.3833 29.911 27.3821C29.9152 27.382 29.9192 27.3818 29.9231 27.3817C29.9051 27.3597 29.8805 27.3284 29.8521 27.2892C29.793 27.2075 29.7172 27.0915 29.6508 26.954L29.6504 26.9531C29.5887 26.8107 29.5695 26.7294 29.554 26.6507C29.5523 26.642 29.5506 26.6333 29.5489 26.6246C29.5357 26.5561 29.5221 26.4855 29.4812 26.3709C29.4044 26.1815 29.2836 26.0132 29.1289 25.8797H28.8967Z" fill="#953220"/>
+<path d="M28.7906 26.0343C28.7906 26.1093 28.8844 26.1187 28.9031 26.1093C28.9219 26.1093 28.9969 26.0812 28.9969 25.9687C28.9969 25.8562 28.9313 25.7718 28.7906 25.7625C28.6594 25.7625 28.5563 25.9218 28.5563 26.0437C28.5563 26.1562 28.6688 26.2125 28.6688 26.2593C28.6688 26.2593 28.5563 26.3625 28.5656 26.55C28.5656 26.7375 28.7156 26.8875 28.7156 26.8875C28.7156 26.8875 28.5563 27.0093 28.5563 27.1406C28.5563 27.2718 28.6781 27.3562 28.8 27.3562C28.9125 27.3562 29.0625 27.2812 29.0625 27.1875C29.0625 27.0937 28.9688 27.0281 28.9031 27.0281C28.8281 27.0281 28.8 27.075 28.8 27.1031M31.2 26.0812C31.2 26.1656 31.1438 26.175 31.1063 26.175C31.0688 26.175 30.9938 26.1375 30.9938 26.0343C30.9938 25.9406 31.125 25.8843 31.2188 25.8843C31.3031 25.8843 31.4438 25.9968 31.4438 26.1375C31.4438 26.2781 31.35 26.3812 31.35 26.3812C31.35 26.3812 31.4063 26.4093 31.4063 26.5875C31.4063 26.775 31.2938 26.8968 31.2938 26.8968C31.2938 26.8968 31.4438 26.9531 31.4438 27.1406C31.4438 27.3281 31.3125 27.3843 31.2281 27.3843C31.1344 27.3843 30.9844 27.3375 30.9844 27.2062C30.9844 27.0843 31.0594 27.0375 31.125 27.0375C31.1813 27.0375 31.2469 27.1031 31.2469 27.1781" fill="#F9AA51"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M28.6056 25.8431C28.6504 25.7847 28.7151 25.739 28.7906 25.739C28.7912 25.739 28.7917 25.739 28.7922 25.7391C28.867 25.7441 28.9247 25.7693 28.9636 25.8109C29.0025 25.8525 29.0203 25.9079 29.0203 25.9687C29.0203 26.0307 28.9995 26.0719 28.9736 26.0978C28.9609 26.1105 28.9474 26.119 28.9354 26.1245C28.926 26.1288 28.9165 26.1316 28.9083 26.1325C28.904 26.1339 28.8995 26.1347 28.8956 26.1352C28.8896 26.1358 28.883 26.1359 28.8762 26.1355C28.8625 26.1346 28.8465 26.1315 28.831 26.1252C28.7996 26.1123 28.7672 26.0844 28.7672 26.0343C28.7672 26.0214 28.7777 26.0109 28.7906 26.0109C28.8036 26.0109 28.8141 26.0214 28.8141 26.0343C28.8141 26.0593 28.8286 26.0735 28.8487 26.0818C28.859 26.086 28.87 26.0881 28.8792 26.0887C28.8837 26.089 28.8875 26.0889 28.8903 26.0886C28.8922 26.0884 28.8931 26.0881 28.8933 26.0881C28.8964 26.0866 28.8997 26.0859 28.9031 26.0859C28.9031 26.0859 28.9031 26.0859 28.9031 26.0859C28.9034 26.0859 28.9046 26.0858 28.9067 26.0852C28.9092 26.0846 28.9123 26.0835 28.916 26.0818C28.9233 26.0785 28.9321 26.073 28.9405 26.0646C28.9568 26.0483 28.9735 26.0193 28.9735 25.9687C28.9735 25.917 28.9585 25.874 28.9294 25.8429C28.9005 25.812 28.8553 25.7904 28.7899 25.7859C28.7344 25.7862 28.6823 25.8201 28.6428 25.8716C28.6033 25.9232 28.5797 25.9887 28.5797 26.0437C28.5797 26.0915 28.6034 26.1283 28.6306 26.1612C28.6364 26.1682 28.6423 26.1749 28.6481 26.1816C28.649 26.1826 28.6499 26.1837 28.6508 26.1848C28.6574 26.1923 28.664 26.1999 28.6697 26.2073C28.6804 26.2211 28.6922 26.239 28.6922 26.2593C28.6922 26.2659 28.6895 26.2721 28.6847 26.2766L28.6845 26.2767L28.6839 26.2773C28.6832 26.2779 28.6822 26.279 28.6809 26.2804C28.6782 26.2832 28.6742 26.2875 28.6694 26.2933C28.6598 26.3049 28.6469 26.3225 28.6343 26.3456C28.609 26.3918 28.5846 26.4601 28.5891 26.5488L28.5891 26.55C28.5891 26.6377 28.6243 26.7177 28.6606 26.7767C28.6787 26.8061 28.6967 26.8298 28.7103 26.8461C28.717 26.8543 28.7226 26.8606 28.7265 26.8648C28.7284 26.8669 28.7299 26.8685 28.7309 26.8695L28.732 26.8706L28.7322 26.8709C28.7322 26.8708 28.7322 26.8709 28.7156 26.8875C28.6991 26.904 28.6991 26.904 28.6991 26.904L28.6989 26.9038L28.6985 26.9034L28.6971 26.902C28.6958 26.9007 28.6941 26.8989 28.6919 26.8965C28.6892 26.8935 28.6858 26.8897 28.6818 26.8851C28.6795 26.8824 28.6769 26.8793 28.6742 26.876C28.6595 26.8584 28.6401 26.8329 28.6207 26.8013C28.5821 26.7386 28.5424 26.6501 28.5422 26.5505C28.5374 26.452 28.5646 26.3752 28.5931 26.3231C28.6074 26.297 28.6221 26.277 28.6333 26.2634C28.637 26.259 28.6403 26.2552 28.6431 26.2521C28.6413 26.2483 28.6381 26.2431 28.6327 26.236C28.6279 26.2298 28.6221 26.2232 28.6155 26.2156C28.6146 26.2145 28.6137 26.2135 28.6128 26.2124C28.607 26.2058 28.6007 26.1986 28.5945 26.1911C28.5654 26.1559 28.5328 26.1084 28.5328 26.0437C28.5328 25.9769 28.5608 25.9017 28.6056 25.8431ZM28.7298 26.9061L28.7296 26.9063L28.7284 26.9072C28.7274 26.9081 28.7258 26.9093 28.7237 26.911C28.7196 26.9144 28.7136 26.9195 28.7064 26.9259C28.6921 26.9389 28.6729 26.9575 28.6538 26.98C28.6148 27.0259 28.5797 27.0837 28.5797 27.1406C28.5797 27.2548 28.6865 27.3328 28.8 27.3328C28.8518 27.3328 28.9133 27.3153 28.9615 27.2868C29.011 27.2576 29.0391 27.2215 29.0391 27.1875C29.0391 27.1488 29.0198 27.1149 28.9919 27.0901C28.9636 27.065 28.9291 27.0515 28.9031 27.0515C28.8394 27.0515 28.8235 27.0895 28.8235 27.1031C28.8235 27.116 28.813 27.1265 28.8 27.1265C28.7871 27.1265 28.7766 27.116 28.7766 27.1031C28.7766 27.0604 28.8169 27.0046 28.9031 27.0046C28.9429 27.0046 28.988 27.024 29.023 27.0551C29.0584 27.0865 29.086 27.1323 29.086 27.1875C29.086 27.2472 29.039 27.2955 28.9854 27.3272C28.9305 27.3596 28.8608 27.3796 28.8 27.3796C28.6698 27.3796 28.5328 27.2889 28.5328 27.1406C28.5328 27.0663 28.5774 26.9975 28.6181 26.9496C28.6389 26.9252 28.6596 26.9051 28.675 26.8911C28.6774 26.889 28.6797 26.887 28.6818 26.8851M28.7298 26.9061C28.7352 26.902 28.7386 26.8957 28.739 26.889C28.7395 26.8823 28.737 26.8756 28.7322 26.8709M31.0829 25.9445C31.0415 25.9684 31.0172 25.9996 31.0172 26.0343C31.0172 26.1234 31.0806 26.1515 31.1063 26.1515C31.1239 26.1515 31.1413 26.1491 31.1539 26.1404C31.1649 26.1329 31.1766 26.1176 31.1766 26.0812C31.1766 26.0683 31.1871 26.0578 31.2 26.0578C31.213 26.0578 31.2235 26.0683 31.2235 26.0812C31.2235 26.1291 31.2071 26.1608 31.1805 26.179C31.1557 26.1961 31.1262 26.1984 31.1063 26.1984C31.057 26.1984 30.9703 26.1515 30.9703 26.0343C30.9703 25.9753 31.0117 25.9315 31.0594 25.9039C31.1076 25.876 31.1679 25.8609 31.2188 25.8609C31.2696 25.8609 31.3314 25.8935 31.3795 25.9416C31.4282 25.9903 31.4672 26.0592 31.4672 26.1375C31.4672 26.2129 31.4421 26.2777 31.4175 26.3232C31.4052 26.346 31.3928 26.3643 31.3835 26.3768C31.3829 26.3776 31.3824 26.3784 31.3818 26.3791C31.3874 26.386 31.3935 26.3953 31.3993 26.4074C31.4153 26.4408 31.4297 26.4961 31.4297 26.5875C31.4297 26.6859 31.4002 26.767 31.3708 26.8233C31.3561 26.8515 31.3414 26.8736 31.3302 26.8887C31.3302 26.8888 31.3301 26.8889 31.3301 26.8889C31.3454 26.8979 31.3654 26.9118 31.3853 26.9318C31.4266 26.9731 31.4672 27.0398 31.4672 27.1406C31.4672 27.2403 31.432 27.3081 31.3829 27.3505C31.3346 27.3923 31.275 27.4078 31.2281 27.4078C31.1781 27.4078 31.113 27.3954 31.0595 27.3648C31.0053 27.3339 30.961 27.2826 30.961 27.2062C30.961 27.1403 30.9814 27.0917 31.0135 27.0596C31.0454 27.0277 31.0868 27.014 31.125 27.014C31.1618 27.014 31.1981 27.0349 31.2244 27.0639C31.2511 27.0932 31.2703 27.1338 31.2703 27.1781C31.2703 27.191 31.2598 27.2015 31.2469 27.2015C31.234 27.2015 31.2235 27.191 31.2235 27.1781C31.2235 27.1474 31.2099 27.1176 31.1897 27.0954C31.1691 27.0728 31.1445 27.0609 31.125 27.0609C31.0976 27.0609 31.0687 27.0707 31.0467 27.0927C31.0249 27.1145 31.0078 27.1503 31.0078 27.2062C31.0078 27.261 31.0385 27.2988 31.0827 27.3241C31.1277 27.3498 31.1844 27.3609 31.2281 27.3609C31.2657 27.3609 31.3139 27.3482 31.3523 27.315C31.3899 27.2825 31.4203 27.2283 31.4203 27.1406C31.4203 27.0539 31.3859 26.9987 31.3522 26.965C31.3352 26.9479 31.3181 26.9362 31.3054 26.9288C31.2991 26.9251 31.2939 26.9225 31.2903 26.9209C31.2886 26.9201 31.2873 26.9195 31.2864 26.9191L31.2856 26.9188C31.2856 26.9188 31.2856 26.9188 31.2856 26.9188C31.2856 26.9188 31.2855 26.9188 31.2938 26.8968C31.2766 26.8809 31.2765 26.8809 31.2765 26.8809M31.2765 26.8809L31.2767 26.8808L31.2774 26.8799C31.2781 26.8792 31.2792 26.8779 31.2806 26.8762C31.2834 26.8729 31.2875 26.8677 31.2925 26.861C31.3024 26.8474 31.3158 26.8273 31.3292 26.8016C31.3561 26.7501 31.3828 26.6765 31.3828 26.5875C31.3828 26.5007 31.3691 26.4529 31.357 26.4277C31.351 26.4151 31.3454 26.4082 31.342 26.4047C31.3403 26.403 31.3391 26.4021 31.3387 26.4017C31.3386 26.4017 31.3386 26.4017 31.3386 26.4016C31.3325 26.3983 31.3283 26.3924 31.327 26.3855C31.3256 26.3783 31.3277 26.3709 31.3327 26.3654L31.3328 26.3653L31.3334 26.3646C31.334 26.364 31.3348 26.3629 31.336 26.3615C31.3383 26.3587 31.3417 26.3545 31.3458 26.3489C31.3541 26.3378 31.3652 26.3215 31.3763 26.3009C31.3986 26.2597 31.4203 26.2026 31.4203 26.1375C31.4203 26.075 31.389 26.0174 31.3463 25.9747C31.303 25.9314 31.2524 25.9078 31.2188 25.9078C31.1759 25.9078 31.1237 25.9208 31.0829 25.9445M31.2765 26.8809C31.2713 26.8867 31.2692 26.8947 31.271 26.9022C31.2728 26.9098 31.2783 26.916 31.2856 26.9188" fill="#953220"/>
+<path d="M29.0156 27.0562L29.0531 27.1125C29.0719 27.15 29.0813 27.2062 29.1281 27.2437C29.2031 27.3093 29.8031 27.3375 29.9906 27.3375C30.1781 27.3375 30.7219 27.3562 30.825 27.3C30.9187 27.2343 30.9375 27.1312 31.0031 27.0843L31.0875 27.0468L31.0031 27.1125V27.2437L31.05 27.3187C31.05 27.3187 31.0406 27.3562 30.975 27.3937C30.9094 27.4312 30.8531 27.4406 30.7594 27.45C30.6656 27.4593 29.5219 27.4593 29.3344 27.4312C29.1469 27.3937 29.1656 27.4031 29.1094 27.3656C29.0732 27.3397 29.0415 27.308 29.0156 27.2718L29.0437 27.1968L29.0156 27.0656V27.0562ZM30.8906 25.95L30.9844 25.9968C30.9844 25.9968 30.9 26.025 30.8344 26.2125C30.7687 26.4 30.825 26.4468 30.7781 26.4656C30.7312 26.4843 30.2344 26.4656 30.2344 26.4656L30.1406 26.2687L30.8906 25.9593V25.95Z" fill="#953220"/>
+<path d="M32.475 25.8751C32.475 25.8751 32.3906 25.8469 32.3531 25.7813C32.3156 25.7063 32.2781 25.6219 32.3062 25.5938C32.3437 25.5844 32.4 25.6407 32.4 25.6969C32.4 25.7532 32.475 25.8844 32.475 25.8844V25.8751ZM33.45 25.6126C33.45 25.6126 33.5156 25.7251 33.5437 25.7344L33.6562 25.7907C33.6562 25.7907 33.5156 25.7907 33.4687 25.7532C33.4324 25.7098 33.401 25.6627 33.375 25.6126H33.45Z" fill="#231F20"/>
+<path d="M33.75 25.7063C33.75 25.7063 33.6563 25.7532 33.6 25.725C33.525 25.6969 33.4688 25.6594 33.5063 25.6313C33.525 25.5938 33.5438 25.6032 33.5813 25.65C33.6188 25.6875 33.75 25.7063 33.75 25.7063ZM34.2469 25.2844C34.2469 25.2844 34.1719 25.3407 34.125 25.3407C34.0781 25.3407 33.9844 25.3219 33.9844 25.3032C33.9844 25.2844 34.1063 25.2657 34.1344 25.275H34.2469V25.2844ZM33.4969 24.3C33.4969 24.3 33.3938 24.3375 33.3563 24.3938C33.3188 24.4407 33.3281 24.5063 33.375 24.5063C33.4219 24.5063 33.4313 24.4407 33.4313 24.4125L33.4969 24.3ZM33.0094 24.5719C33.0094 24.5719 32.925 24.6188 32.9156 24.6657C32.8875 24.7125 32.8688 24.8157 32.9156 24.8157C32.9625 24.8157 32.9813 24.7407 32.9813 24.7032C32.9813 24.6563 33.0094 24.5719 33.0094 24.5719Z" fill="#231F20"/>
+<path d="M32.1375 25.1625L31.8656 25.4437C31.8656 25.4437 32.4844 25.7906 32.9625 25.7718C33.4312 25.7625 33.975 25.3968 34.0125 25.3031C34.05 25.2375 34.0125 24.9 33.9562 24.7968C33.8906 24.6937 33.5625 24.4406 33.4406 24.45C33.3187 24.4593 33.0937 24.6281 32.8969 24.825C32.6906 25.0218 32.7094 25.1906 32.4281 25.1718L32.1375 25.1625Z" fill="#8CBEBF"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M33.8809 24.6805C33.9231 24.7188 33.9579 24.7557 33.976 24.7843L33.9764 24.7849L33.9768 24.7856C33.9925 24.8143 34.0059 24.8573 34.0169 24.905C34.028 24.9531 34.0369 25.008 34.0428 25.0614C34.0488 25.1149 34.0518 25.1675 34.0509 25.2113C34.0504 25.2332 34.049 25.2532 34.0463 25.2703C34.0438 25.2863 34.04 25.3015 34.0336 25.3133C34.0267 25.3296 34.0112 25.3479 33.9922 25.3665C33.9719 25.3864 33.9449 25.4091 33.9126 25.4333C33.8479 25.4818 33.7607 25.5372 33.6601 25.5899C33.4594 25.6949 33.2027 25.7904 32.9632 25.7953C32.7192 25.8048 32.4413 25.7213 32.2262 25.6366C32.1182 25.5941 32.0253 25.5511 31.9594 25.5186C31.9265 25.5024 31.9002 25.4888 31.8822 25.4793C31.8732 25.4745 31.8662 25.4708 31.8615 25.4682L31.8561 25.4652L31.8547 25.4644L31.8542 25.4642C31.8542 25.4642 31.8542 25.4642 31.8656 25.4437L31.8542 25.4642L31.8276 25.4493L32.1206 25.1462L32.1375 25.1625L32.1383 25.139L32.4297 25.1484C32.4978 25.153 32.5456 25.146 32.5824 25.1314C32.6189 25.117 32.6464 25.0942 32.673 25.0638C32.6923 25.0417 32.7103 25.0165 32.7307 24.9879C32.7391 24.9762 32.7478 24.9639 32.7573 24.951C32.7893 24.9073 32.8276 24.8587 32.8805 24.8082C32.9796 24.7091 33.086 24.6169 33.1833 24.548C33.232 24.5136 33.2789 24.4847 33.3216 24.4638C33.3641 24.443 33.4041 24.4293 33.4388 24.4266C33.4761 24.4237 33.5245 24.4405 33.5737 24.4647C33.6241 24.4894 33.6797 24.5241 33.7331 24.5621C33.7866 24.6001 33.8383 24.6417 33.8809 24.6805ZM32.1471 25.1862L31.904 25.4378C31.904 25.4378 31.9041 25.4378 31.9041 25.4379C31.9218 25.4472 31.9476 25.4606 31.9801 25.4766C32.0452 25.5086 32.1369 25.5511 32.2433 25.593C32.4571 25.6771 32.7275 25.7576 32.9616 25.7484L32.962 25.7484C33.1912 25.7438 33.4406 25.6519 33.6383 25.5483C33.737 25.4967 33.822 25.4426 33.8845 25.3958C33.9157 25.3724 33.941 25.3511 33.9594 25.333C33.9786 25.3142 33.988 25.3012 33.9907 25.2944L33.9913 25.2929L33.9921 25.2915C33.9947 25.287 33.9977 25.278 34 25.2631C34.0022 25.2488 34.0036 25.2309 34.004 25.2103C34.0049 25.1691 34.002 25.1186 33.9962 25.0666C33.9905 25.0146 33.9818 24.9616 33.9712 24.9155C33.9606 24.8693 33.9484 24.8317 33.936 24.8087C33.9212 24.7858 33.8906 24.7526 33.8494 24.7152C33.8082 24.6777 33.758 24.6373 33.7059 24.6003C33.6539 24.5633 33.6005 24.53 33.553 24.5067C33.5044 24.4828 33.466 24.4715 33.4424 24.4733C33.4162 24.4753 33.3824 24.4862 33.3422 24.5059C33.3024 24.5254 33.2578 24.5528 33.2104 24.5863C33.1156 24.6533 33.0112 24.7438 32.9134 24.8415L32.9131 24.8419C32.8629 24.8898 32.8263 24.9361 32.7951 24.9787C32.7866 24.9903 32.7783 25.0019 32.7703 25.0132C32.7492 25.0427 32.7292 25.0706 32.7083 25.0947C32.6786 25.1287 32.6452 25.157 32.5997 25.175C32.5545 25.1929 32.4993 25.2 32.427 25.1952L32.1471 25.1862Z" fill="#04534E"/>
+<path d="M32.0625 25.275C32.0625 25.275 32.7188 25.3687 32.9156 25.2C33.1031 25.0312 33.3188 24.7031 33.45 24.6375C33.5813 24.5531 33.6375 24.5531 33.6375 24.5531L33.7875 24.6562L33.9563 24.7969L34.0125 25.1156V25.2844L33.8063 25.4531L33.4313 25.6312L33.0563 25.7437L32.7563 25.7344L32.1281 25.5469L31.9688 25.4437L31.9313 25.4062L32.0625 25.275Z" fill="#0C8489"/>
+<path d="M33.075 24.8906C33.075 24.8344 33.1125 24.8344 33.1687 24.8344C33.225 24.8344 33.2625 24.8531 33.2625 24.9094C33.2625 24.9656 33.2156 25.0406 33.1687 25.0406C33.1125 25.0406 33.075 24.9469 33.075 24.8906ZM33.3375 25.0594C33.3375 25.0031 33.375 24.9844 33.4313 24.9844C33.4969 24.9844 33.5531 25.05 33.5531 25.0969C33.5531 25.1437 33.5062 25.1906 33.45 25.1906C33.3844 25.1906 33.3375 25.1062 33.3375 25.0594ZM33.2438 25.4531C33.2438 25.3875 33.2906 25.3781 33.3469 25.3781C33.4031 25.3781 33.4406 25.4062 33.4406 25.4719C33.4407 25.5001 33.4302 25.5274 33.4111 25.5483C33.3919 25.5691 33.3657 25.582 33.3375 25.5844C33.2719 25.5844 33.2438 25.5187 33.2438 25.4531ZM32.8969 25.3312C32.8969 25.2656 32.9625 25.2375 33.0188 25.2375C33.075 25.2375 33.1125 25.3031 33.1125 25.3687C33.1125 25.4344 33.075 25.4906 33.0188 25.4906C32.9625 25.4906 32.8969 25.3969 32.8969 25.3312ZM32.3438 25.3969C32.3438 25.3596 32.3586 25.3238 32.3849 25.2974C32.4113 25.271 32.4471 25.2562 32.4844 25.2562C32.5217 25.2562 32.5574 25.271 32.5838 25.2974C32.6102 25.3238 32.625 25.3596 32.625 25.3969C32.625 25.4341 32.6102 25.4699 32.5838 25.4963C32.5574 25.5227 32.5217 25.5375 32.4844 25.5375C32.4471 25.5375 32.4113 25.5227 32.3849 25.4963C32.3586 25.4699 32.3438 25.4341 32.3438 25.3969Z" fill="#04534E"/>
+<path d="M33.3375 25.0594C33.3375 25.0125 33.4031 24.9844 33.4313 24.9844C33.4781 24.9844 33.5062 25.0219 33.5062 25.0594C33.5062 25.0969 33.4781 25.1531 33.4406 25.1531C33.4031 25.1531 33.3469 25.1062 33.3469 25.0594H33.3375ZM33.2438 25.4344C33.2438 25.3875 33.3 25.3594 33.3562 25.3594C33.4125 25.3594 33.45 25.3875 33.45 25.4344C33.45 25.4812 33.4031 25.5281 33.3562 25.5281C33.3 25.5281 33.2531 25.4906 33.2531 25.4344H33.2438ZM32.8969 25.3219C32.8969 25.2656 32.9906 25.2375 33.0375 25.2375C33.075 25.2375 33.0656 25.275 33.0656 25.3312C33.0656 25.3969 33.0375 25.4437 33 25.4437C32.9625 25.4437 32.9062 25.3781 32.9062 25.3219H32.8969ZM33.0656 24.8812C33.0656 24.8344 33.1031 24.8344 33.1406 24.8344C33.1781 24.8344 33.1969 24.8437 33.1969 24.9C33.1969 24.9562 33.1687 24.9937 33.1406 24.9937C33.1031 24.9937 33.0656 24.9375 33.0656 24.8812ZM32.3438 25.3594C32.3438 25.3031 32.4 25.2375 32.475 25.2375C32.55 25.2375 32.6344 25.2656 32.6344 25.3312C32.6344 25.3875 32.5406 25.5 32.4656 25.5C32.3812 25.5 32.3438 25.425 32.3438 25.3594Z" fill="#8CBEBF"/>
+<path d="M32.5968 25.2562C32.5968 25.2562 32.5031 25.2656 32.4562 25.3125C32.4093 25.3593 32.4093 25.4062 32.4281 25.425C32.4562 25.4437 32.4937 25.3968 32.5031 25.3687C32.5031 25.35 32.5968 25.2562 32.5968 25.2562ZM33.0375 25.1625C33.0375 25.1625 32.9437 25.2187 32.9437 25.2843C32.9343 25.3406 32.9437 25.3781 32.9625 25.3781C32.9906 25.3781 33.0093 25.2937 33 25.2656C32.9906 25.2375 33.0375 25.1531 33.0375 25.1531V25.1625Z" fill="#231F20"/>
+<path d="M33.1124 25.2468C33.1124 25.2468 33.0562 25.2469 33.0187 25.2844C32.9718 25.3312 32.9343 25.3781 32.9624 25.3781C32.9906 25.3781 33.0374 25.3594 33.0374 25.3312C33.0374 25.3125 33.1124 25.2468 33.1124 25.2468ZM33.2062 24.7406L33.1312 24.7969C33.1124 24.8156 33.0843 24.8906 33.1124 24.8906C33.1406 24.9094 33.1593 24.8906 33.1874 24.8437C33.2062 24.7969 33.2062 24.7406 33.2062 24.7406ZM33.5343 24.9562C33.5343 24.9562 33.4499 24.9562 33.4218 25.0031C33.3937 25.0406 33.3749 25.0781 33.4218 25.0781C33.4499 25.0781 33.4593 25.0594 33.4781 25.0312C33.4874 24.9937 33.5343 24.9562 33.5343 24.9562ZM33.4874 25.3406C33.4874 25.3406 33.4687 25.4062 33.4124 25.4343C33.3656 25.4625 33.3468 25.4812 33.3187 25.4437C33.3093 25.4062 33.3374 25.3875 33.3562 25.3781L33.4874 25.3406Z" fill="#231F20"/>
+<path d="M34.0125 25.0781C34.0125 25.0781 34.05 25.2656 33.8906 25.3594C33.7312 25.4437 33.2906 25.7531 32.8687 25.7156C32.4468 25.6781 31.9687 25.4344 31.9687 25.4344L31.9031 25.4719L32.0156 25.5188L32.3343 25.65L32.7093 25.7625L32.9437 25.7719L33.1406 25.7531L33.5156 25.6312L33.825 25.4719L33.9937 25.3406L34.0312 25.2844V25.1062L34.0125 25.0781Z" fill="#04534E"/>
+<path d="M25.7718 22.7063C25.7718 22.7063 25.8656 22.7907 25.8656 22.8563C25.8468 22.9313 25.8281 22.9594 25.8 22.95C25.7718 22.9313 25.7718 22.8563 25.7718 22.8282V22.7063ZM26.4937 23.3719C26.4937 23.3719 26.4656 23.5032 26.4093 23.5125C26.3625 23.5219 26.325 23.475 26.3343 23.4469C26.3437 23.4282 26.3906 23.4469 26.4093 23.4282L26.4937 23.3719ZM24.9187 23.4657C24.9187 23.4657 24.9562 23.5407 25.0125 23.5594C25.0875 23.5594 25.1062 23.5219 25.1062 23.5032C25.0968 23.4844 25.0687 23.4844 25.0312 23.4844L24.9187 23.475V23.4657ZM25.2 24.0282C25.2 24.0282 25.2656 24.0844 25.3406 24.0938C25.3651 24.0965 25.39 24.0917 25.4117 24.08C25.4335 24.0682 25.4512 24.0502 25.4625 24.0282C25.4625 24.0094 25.3687 24.0094 25.3406 24.0282C25.3125 24.0563 25.2 24.0282 25.2 24.0282ZM25.6968 24.4407C25.6968 24.4407 25.8281 24.4219 25.8468 24.3844C25.8656 24.3469 25.9031 24.2907 25.875 24.2625C25.8468 24.225 25.8281 24.3094 25.8093 24.3469C25.8 24.3751 25.6968 24.4407 25.6968 24.4407Z" fill="#231F20"/>
+<path d="M26.4938 24.1031C26.4938 24.1031 26.5876 23.5406 26.1188 23.1281C25.6501 22.725 25.3594 22.8281 25.2001 22.9781C25.0407 23.1281 24.9001 23.6063 25.3876 24.0375C25.8844 24.4594 26.4844 24.3188 26.4844 24.3188L26.4938 24.1031Z" fill="#8CBEBF"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M25.5442 22.8223C25.7025 22.8284 25.8973 22.9068 26.134 23.1104L26.1342 23.1105C26.3734 23.3211 26.4692 23.5701 26.505 23.7661C26.5229 23.8641 26.5259 23.9489 26.5244 24.0094C26.5237 24.0396 26.5218 24.0638 26.5201 24.0805C26.5193 24.0889 26.5185 24.0954 26.5179 24.0999C26.5175 24.1021 26.5173 24.1038 26.5171 24.105L26.517 24.1055L26.507 24.3375L26.4897 24.3416L26.4843 24.3188C26.4897 24.3416 26.4897 24.3416 26.4897 24.3416L26.4895 24.3416L26.4891 24.3417L26.4876 24.342C26.4864 24.3423 26.4845 24.3427 26.4822 24.3432C26.4774 24.3442 26.4705 24.3455 26.4616 24.3471C26.4437 24.3502 26.4178 24.3541 26.3852 24.3575C26.32 24.3642 26.228 24.3686 26.1203 24.3597C25.9048 24.3418 25.6254 24.2703 25.3723 24.0554L25.3719 24.0551C24.8746 23.6151 25.014 23.121 25.1839 22.9611C25.2669 22.8829 25.3852 22.8161 25.5442 22.8223ZM26.4617 24.2994L26.4703 24.1007L26.4706 24.0993L26.4706 24.099L26.4708 24.098C26.4709 24.097 26.4711 24.0956 26.4714 24.0936C26.4719 24.0896 26.4727 24.0836 26.4735 24.0758C26.4751 24.0601 26.4769 24.0372 26.4776 24.0082C26.479 23.9503 26.4762 23.8688 26.4589 23.7745C26.4245 23.5862 26.3327 23.3478 26.1033 23.1458C25.8713 22.9463 25.6864 22.8747 25.5424 22.8691C25.399 22.8636 25.2923 22.9234 25.216 22.9952C25.0672 23.1353 24.9253 23.5973 25.4028 24.0198C25.6465 24.2266 25.9155 24.2957 26.1241 24.313C26.2285 24.3216 26.3175 24.3173 26.3804 24.3108C26.4118 24.3076 26.4367 24.3038 26.4535 24.3009C26.4565 24.3004 26.4592 24.2999 26.4617 24.2994Z" fill="#04534E"/>
+<path d="M25.0875 23.5031C25.0875 23.5031 25.0781 23.1843 25.2281 23.0906C25.3688 22.9968 25.8656 22.9218 26.1 23.3812C26.3438 23.8499 26.3531 24.0749 26.2875 24.3187H26.0344L25.6313 24.1499L25.3031 23.9062L25.0875 23.5031Z" fill="#0C8489"/>
+<path d="M26.4375 24.1875C26.4375 24.1875 26.3531 24.2813 26.1843 24.2813C26.025 24.2625 25.2468 24.0657 25.0593 23.3625V23.5219L25.0687 23.5688L25.125 23.7094L25.2843 23.9438L25.4906 24.1219L25.7531 24.2532L25.9406 24.3094L26.175 24.3469H26.3156L26.4375 24.1875Z" fill="#04534E"/>
+<path d="M26.0344 23.9906C26.0344 23.925 26.0625 23.925 26.1094 23.925C26.1562 23.925 26.2031 23.9062 26.2031 23.9625C26.2031 24.0281 26.1656 24.1125 26.1094 24.1125C26.0719 24.1125 26.0344 24.0468 26.0344 23.9906ZM26.0625 23.6156C26.0625 23.5781 26.1 23.5406 26.1562 23.5406C26.2031 23.5406 26.2406 23.5781 26.2406 23.625C26.2406 23.6625 26.2031 23.7 26.1469 23.7C26.1 23.7 26.0625 23.6625 26.0625 23.625V23.6156ZM25.7156 24.0281C25.7156 23.9906 25.7531 23.9625 25.8094 23.9625C25.8656 23.9625 25.9031 23.9906 25.9031 24.0281C25.9031 24.0562 25.8094 24.1031 25.7625 24.1031C25.7062 24.1031 25.7156 24.0562 25.7156 24.0281ZM25.6781 23.5968C25.6781 23.5406 25.7063 23.5593 25.7531 23.5593C25.8 23.5593 25.8656 23.5687 25.8656 23.625C25.8656 23.6812 25.8 23.7562 25.7531 23.7562C25.7063 23.7562 25.6781 23.6437 25.6781 23.5968ZM25.3594 23.6625C25.3594 23.6156 25.3875 23.5593 25.4437 23.5593C25.5 23.5593 25.5656 23.6156 25.5656 23.6625C25.5656 23.7093 25.5188 23.7562 25.4625 23.7562C25.4063 23.7562 25.3594 23.7093 25.3594 23.6625ZM25.4156 23.2875C25.4156 23.2312 25.4438 23.2406 25.5094 23.2406C25.5656 23.2406 25.6125 23.2593 25.6125 23.3062C25.6125 23.3531 25.5469 23.4187 25.4812 23.4187C25.425 23.4187 25.4156 23.325 25.4156 23.2781V23.2875ZM25.7625 23.2406C25.7625 23.2031 25.8094 23.2125 25.8562 23.2125C25.9219 23.2125 25.9594 23.25 25.9594 23.3062C25.9594 23.3625 25.8938 23.4 25.8375 23.4C25.7813 23.4 25.7625 23.2875 25.7625 23.25V23.2406Z" fill="#04534E"/>
+<path d="M25.4062 23.2781C25.425 23.2406 25.4437 23.2125 25.4812 23.2125C25.5281 23.2125 25.5656 23.2219 25.5656 23.2781C25.5656 23.3156 25.5281 23.3625 25.4906 23.3625C25.4437 23.3625 25.3969 23.3156 25.4156 23.2688L25.4062 23.2781ZM25.35 23.6531C25.35 23.6063 25.3687 23.5594 25.4156 23.5594C25.4625 23.5594 25.5094 23.5594 25.5094 23.6063C25.5094 23.6531 25.4625 23.7094 25.4156 23.7094C25.3687 23.7094 25.35 23.7 25.35 23.6531ZM25.7625 23.25C25.7625 23.2125 25.7906 23.2125 25.8375 23.2125C25.8844 23.2125 25.9125 23.2125 25.9125 23.2594C25.9125 23.2969 25.875 23.325 25.8375 23.325C25.8 23.325 25.7625 23.2875 25.7625 23.25ZM25.6781 23.6156C25.6781 23.6625 25.725 23.7094 25.7719 23.7094C25.8187 23.7094 25.8656 23.6625 25.8656 23.6156C25.8656 23.5594 25.8094 23.5219 25.7719 23.5219C25.7344 23.5219 25.6781 23.5594 25.6781 23.6156ZM26.0812 23.5594C26.0812 23.6063 26.1187 23.6438 26.175 23.6438C26.2219 23.6438 26.2594 23.6063 26.2594 23.5594C26.2594 23.5125 26.2125 23.475 26.1656 23.475C26.1187 23.475 26.0719 23.5125 26.0719 23.5688L26.0812 23.5594ZM25.6969 24.0281C25.6969 23.9813 25.7437 23.9438 25.7812 23.9438C25.8187 23.9438 25.8656 23.9719 25.8656 24.0094C25.8656 24.0469 25.7906 24.1031 25.7531 24.1031C25.7062 24.1031 25.6969 24.0656 25.6969 24.0188V24.0281ZM26.0344 23.9625C26.0344 23.9156 26.0719 23.9063 26.1281 23.9063C26.175 23.9063 26.2031 23.9156 26.2031 23.9625C26.2031 24.0188 26.1562 24.0563 26.1094 24.0563C26.0625 24.0563 26.0344 24.0094 26.0344 23.9625Z" fill="#8CBEBF"/>
+<path d="M26.1281 23.3813C26.1281 23.3813 26.175 23.4469 26.1844 23.5031V23.6156C26.1563 23.6156 26.1281 23.5781 26.1188 23.5313C26.1094 23.4844 26.1188 23.3813 26.1188 23.3813H26.1281ZM25.8281 23.0719C25.8281 23.0719 25.8656 23.1188 25.8656 23.1656C25.8656 23.2125 25.8656 23.2594 25.8375 23.2594C25.8094 23.2594 25.8094 23.2219 25.8094 23.1844L25.8281 23.0719ZM25.4813 23.1188C25.4813 23.1188 25.5188 23.1656 25.5188 23.2125C25.5188 23.2594 25.5188 23.3063 25.4906 23.3063C25.4625 23.3063 25.4625 23.2688 25.4625 23.2313L25.4813 23.1188Z" fill="#231F20"/>
+<path d="M25.3594 23.1843L25.4531 23.2218C25.4812 23.2593 25.5 23.2968 25.4812 23.3156C25.4719 23.3343 25.4344 23.3062 25.425 23.2781L25.3594 23.1843ZM25.6219 23.5406C25.6219 23.5406 25.6875 23.5406 25.725 23.5875C25.7625 23.6156 25.8 23.6437 25.7719 23.6718C25.7531 23.6906 25.7062 23.6531 25.6781 23.625L25.6219 23.5406ZM25.3031 23.5406L25.3969 23.5687C25.425 23.5875 25.4344 23.6343 25.4156 23.6437C25.4062 23.6531 25.3781 23.6437 25.3594 23.6062L25.3031 23.5312V23.5406ZM26.0812 23.775L26.1 23.9062C26.1 23.9531 26.1094 24 26.0812 24C26.0531 24 26.0531 23.9343 26.0531 23.9062C26.0531 23.8593 26.0812 23.775 26.0812 23.775Z" fill="#231F20"/>
+<path d="M25.9969 23.8969L26.0719 23.9437C26.1 23.9625 26.1 24 26.0813 24L26.0438 23.9531C26.0274 23.935 26.0117 23.9163 25.9969 23.8969ZM25.65 23.9156L25.7344 23.9437C25.7531 23.9625 25.7625 24.0375 25.7531 24.0469C25.7531 24.0562 25.7156 24.0469 25.6969 24.0187L25.65 23.925V23.9156Z" fill="#231F20"/>
+<path d="M25.5094 22.8563C25.5094 22.8563 25.2094 22.9219 25.1532 23.1282C25.0969 23.3157 25.0875 23.5407 25.0875 23.5407L25.05 23.2875L25.1063 23.1282L25.2 22.9782L25.3313 22.8844L25.4532 22.8469L25.5094 22.8563ZM26.4657 24.0282C26.4657 24.0282 26.5032 23.9532 26.4094 23.7094C26.3157 23.475 26.1282 23.1469 26.1282 23.1469L26.2782 23.3157L26.3907 23.5032L26.4469 23.6719L26.4938 23.8313V23.9813L26.4657 24.0375V24.0282Z" fill="#04534E"/>
+<path d="M26.775 23.6438C26.775 23.6438 26.8875 23.7094 26.8968 23.7469C26.9062 23.7844 26.9156 23.8032 26.8875 23.8125C26.8593 23.8219 26.8125 23.775 26.7937 23.7469C26.7845 23.7132 26.7782 23.6786 26.775 23.6438ZM26.325 24.8438C26.325 24.8438 26.3812 24.7501 26.4468 24.7219C26.5125 24.6844 26.5593 24.6844 26.5781 24.7125C26.5968 24.7313 26.5406 24.7782 26.4843 24.7969L26.325 24.8532V24.8438ZM27.0843 25.1344C27.0843 25.1344 27.1593 25.0969 27.2062 25.0407C27.2531 24.9938 27.2625 24.9563 27.2437 24.9469C27.225 24.9188 27.1687 24.9469 27.1406 24.9938C27.1125 25.0313 27.0843 25.1344 27.0843 25.1344ZM27 25.0688C27 25.0688 27.0281 24.975 27.0562 24.9375C27.0843 24.9094 27.1125 24.8907 27.15 24.9094C27.1687 24.9282 27.15 24.9657 27.1312 24.9938C27.0902 25.0233 27.0462 25.0484 27 25.0688Z" fill="#231F20"/>
+<path d="M28.2657 24.4876C28.2657 24.4876 27.7969 23.8126 27.0657 23.7751C26.973 23.7674 26.8798 23.7784 26.7915 23.8075C26.7032 23.8366 26.6217 23.8831 26.5517 23.9444C26.4817 24.0056 26.4248 24.0802 26.3842 24.1639C26.3437 24.2475 26.3204 24.3385 26.3157 24.4313C26.3344 24.5813 26.5594 24.9188 27.3375 24.9751C28.1157 25.0313 28.2375 24.6094 28.275 24.5907C28.3032 24.5719 28.2657 24.4969 28.2657 24.4969V24.4876Z" fill="#8CBEBF"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M27.0672 23.7517C27.4396 23.7709 27.7442 23.9522 27.9548 24.1274C28.0603 24.2151 28.1427 24.3015 28.1987 24.3662C28.2267 24.3985 28.2481 24.4253 28.2626 24.4442C28.2699 24.4536 28.2754 24.4611 28.2791 24.4662C28.281 24.4687 28.2824 24.4707 28.2834 24.472L28.2845 24.4736L28.2848 24.474L28.2848 24.4741C28.2848 24.4741 28.2849 24.4742 28.2656 24.4876L28.2848 24.4741L28.2891 24.4802V24.4917C28.2901 24.4938 28.2913 24.4966 28.2927 24.4999C28.296 24.5077 28.3002 24.5187 28.3034 24.5305C28.3066 24.542 28.3094 24.5559 28.3088 24.5692C28.3082 24.5823 28.304 24.5995 28.288 24.6102L28.2874 24.6106C28.287 24.611 28.2864 24.6117 28.2855 24.613C28.283 24.6162 28.2798 24.6209 28.2756 24.6275C28.274 24.6301 28.2722 24.6329 28.2703 24.636C28.2627 24.6479 28.2531 24.6631 28.2413 24.68C28.2115 24.7227 28.1668 24.7774 28.0982 24.8296C27.9604 24.9345 27.7295 25.0269 27.3358 24.9984C26.5528 24.9418 26.3132 24.6006 26.2924 24.4342L26.2921 24.4322L26.2922 24.4301C26.2971 24.3341 26.3212 24.2401 26.3631 24.1537C26.405 24.0672 26.4639 23.99 26.5362 23.9267C26.6085 23.8634 26.6928 23.8153 26.7841 23.7853C26.8753 23.7552 26.9715 23.7438 27.0672 23.7517ZM28.2447 24.5074L28.2422 24.5025V24.4951C28.2419 24.4947 28.2416 24.4942 28.2412 24.4938C28.2377 24.489 28.2325 24.4819 28.2255 24.4728C28.2115 24.4546 28.1906 24.4284 28.1632 24.3969C28.1085 24.3337 28.028 24.2491 27.9249 24.1634C27.7184 23.9917 27.4231 23.8169 27.0644 23.7985L27.0637 23.7984C26.9742 23.791 26.8841 23.8017 26.7988 23.8298C26.7135 23.8579 26.6347 23.9028 26.5671 23.962C26.4995 24.0211 26.4445 24.0933 26.4053 24.1741C26.3664 24.2543 26.3439 24.3414 26.3391 24.4304C26.3577 24.5653 26.5697 24.8961 27.3392 24.9517C27.7237 24.9795 27.9427 24.8891 28.0698 24.7923C28.1336 24.7438 28.175 24.6931 28.2029 24.6531C28.214 24.6372 28.2229 24.6232 28.2304 24.6113C28.2324 24.6082 28.2343 24.6051 28.2361 24.6023C28.2403 24.5957 28.2444 24.5894 28.2482 24.5845C28.2509 24.5809 28.2553 24.5755 28.2613 24.5716C28.2616 24.5709 28.2619 24.5695 28.262 24.5671C28.2623 24.561 28.2609 24.5526 28.2583 24.5431C28.2557 24.5338 28.2523 24.5248 28.2494 24.518C28.248 24.5147 28.2468 24.5119 28.2459 24.5101L28.2449 24.508L28.2447 24.5075L28.2447 24.5074Z" fill="#04534E"/>
+<path d="M27.7126 24.0281C27.7126 24.0281 27.9001 24.1687 27.9938 24.2906C28.0688 24.4031 28.0876 24.4968 28.0407 24.5062C27.9938 24.525 27.5719 24.1312 27.2157 24.0468C26.8688 23.9625 26.5688 24.0468 26.5032 24.2062C26.4376 24.3656 26.4657 24.6281 26.6157 24.7312C26.7844 24.825 27.5251 24.9468 27.5251 24.9468L27.8719 24.9L28.0876 24.7781L28.1344 24.6562L28.1907 24.5062L28.2094 24.4406L28.0313 24.2531L27.7126 24.0187V24.0281Z" fill="#0C8489"/>
+<path d="M27.1125 24.1219C27.1125 24.1594 27.0656 24.1875 27.0188 24.1875C26.9719 24.1875 26.9344 24.1594 26.9344 24.1219C26.9344 24.075 26.9719 24.0375 27.0281 24.0375C27.0844 24.0375 27.1219 24.075 27.1219 24.1219H27.1125ZM26.6813 24.2719C26.6813 24.225 26.7375 24.2344 26.775 24.2344C26.8313 24.2344 26.8688 24.2625 26.8688 24.3094C26.8688 24.3562 26.7938 24.4125 26.7469 24.3937C26.6906 24.3656 26.6813 24.3187 26.6813 24.2719ZM27.15 24.525C27.15 24.4687 27.1875 24.4312 27.2438 24.4312C27.3094 24.4312 27.3563 24.4687 27.3563 24.525C27.3563 24.5812 27.2813 24.6375 27.2156 24.6375C27.15 24.6375 27.15 24.5812 27.15 24.525Z" fill="#04534E"/>
+<path d="M26.7937 24.6281C26.7937 24.5813 26.85 24.5719 26.8875 24.5719C26.9343 24.5719 26.9812 24.6188 26.9812 24.6656C26.9812 24.7125 26.9343 24.75 26.8875 24.75C26.85 24.75 26.7937 24.675 26.7937 24.6281Z" fill="#8CBEBF"/>
+<path d="M27.4219 24.7969C27.4219 24.7594 27.4406 24.7219 27.4875 24.7219C27.525 24.7219 27.5813 24.75 27.5813 24.7875C27.5813 24.825 27.5344 24.8719 27.4875 24.8719C27.4693 24.8696 27.4525 24.8607 27.4404 24.8468C27.4283 24.833 27.4217 24.8152 27.4219 24.7969ZM27.7031 24.5812C27.7031 24.5344 27.7313 24.5437 27.7781 24.5437C27.825 24.5437 27.8719 24.5625 27.8719 24.6187C27.8719 24.675 27.8156 24.6937 27.7688 24.6937C27.7219 24.6937 27.7031 24.6375 27.7031 24.5812Z" fill="#04534E"/>
+<path d="M27.0938 24.0843C27.0938 24.1218 27.075 24.1406 27.0282 24.1406C26.9813 24.1406 26.9438 24.1218 26.9438 24.0843C26.9438 24.0375 26.9625 24.0281 27 24.0281C27.0375 24.0281 27.0938 24.0375 27.0938 24.0843ZM26.8594 24.2625C26.8594 24.3093 26.7938 24.3281 26.7657 24.3281C26.7188 24.3281 26.6907 24.3093 26.6907 24.2625C26.6907 24.2156 26.7188 24.2062 26.7657 24.2062C26.8125 24.2062 26.8594 24.2156 26.8594 24.2625ZM26.9532 24.6187C26.9532 24.6562 26.9532 24.6843 26.9063 24.6843C26.8594 24.6843 26.8125 24.6562 26.8125 24.6187C26.8125 24.5812 26.8125 24.5531 26.8594 24.5531C26.9063 24.5531 26.9625 24.5812 26.9625 24.6187H26.9532ZM27.3282 24.4968C27.3282 24.5343 27.2625 24.5906 27.2157 24.5906C27.1782 24.5906 27.1594 24.5062 27.1594 24.4687C27.1594 24.4312 27.1969 24.4031 27.2344 24.4031C27.2719 24.4031 27.3282 24.4593 27.3282 24.4968ZM27.8719 24.6187C27.8719 24.6562 27.8063 24.6562 27.7782 24.6562C27.7313 24.6562 27.7032 24.6093 27.7032 24.5625C27.7032 24.525 27.7125 24.4875 27.7969 24.4968C27.8438 24.4968 27.8719 24.5718 27.8719 24.6187ZM27.5532 24.7781C27.5532 24.825 27.525 24.8531 27.4875 24.8531C27.4677 24.8531 27.4486 24.8452 27.4345 24.8311C27.4204 24.817 27.4125 24.798 27.4125 24.7781C27.4125 24.7406 27.45 24.7218 27.4875 24.7218C27.525 24.7218 27.5532 24.7406 27.5532 24.7781Z" fill="#8CBEBF"/>
+<path d="M27.6 24.5625C27.6 24.5625 27.675 24.5343 27.7406 24.5343C27.7969 24.5343 27.7969 24.5625 27.7969 24.5718C27.7969 24.5812 27.75 24.6 27.7312 24.5906C27.6874 24.5784 27.6436 24.5659 27.6 24.5531V24.5625ZM27.2906 24.825C27.2906 24.825 27.3469 24.7875 27.3937 24.7781C27.4406 24.7687 27.4781 24.7781 27.4687 24.8156C27.4687 24.8437 27.45 24.8437 27.4125 24.8437L27.2906 24.825ZM27.0844 24.3562C27.0844 24.3562 27.2156 24.4125 27.2437 24.4593C27.2719 24.5156 27.2812 24.525 27.2531 24.5437C27.225 24.5625 27.1969 24.525 27.1781 24.4968L27.0844 24.3562Z" fill="#231F20"/>
+<path d="M27.0469 24.525L27.1969 24.4968C27.2438 24.4968 27.2531 24.4968 27.2625 24.5156C27.2625 24.5343 27.2531 24.5437 27.2156 24.5437L27.0469 24.525ZM26.7281 24.525C26.7281 24.525 26.8406 24.5437 26.8688 24.5718C26.8969 24.6 26.8969 24.6281 26.8781 24.6375C26.8781 24.6562 26.8219 24.6468 26.8031 24.6375L26.7281 24.525Z" fill="#231F20"/>
+<path d="M26.7188 24.6844C26.7188 24.6844 26.7562 24.6188 26.7937 24.6094C26.8312 24.6 26.8875 24.6 26.8875 24.6188C26.8969 24.6375 26.85 24.6657 26.8219 24.6751L26.7094 24.6844H26.7188ZM26.625 24.2063L26.7375 24.2344C26.775 24.2625 26.7844 24.2907 26.775 24.3001C26.775 24.3094 26.7281 24.3188 26.7 24.3001C26.6531 24.2626 26.6344 24.2063 26.6344 24.2063H26.625ZM26.8688 23.925C26.8688 23.925 26.9813 23.9626 27.0188 24.0188C27.0563 24.0657 27.0469 24.0938 27.0281 24.1032L26.9437 24.0657C26.9156 24.0376 26.8688 23.9344 26.8688 23.9344V23.925Z" fill="#231F20"/>
+<path d="M28.125 24.7219C28.125 24.7219 27.9094 24.9094 27.4032 24.9C26.8875 24.8813 26.4282 24.6656 26.3157 24.4313L26.3625 24.5437L26.475 24.6937L26.8313 24.8812L27.2344 24.9656L27.5438 24.9844L27.8438 24.9281L28.0782 24.825L28.1157 24.7594L28.1344 24.7219H28.125ZM28.2 24.4875C28.2 24.4875 28.1157 24.375 27.9938 24.2719C27.8813 24.1594 27.4125 23.8594 27.4125 23.8594L27.7875 24.0281L28.0407 24.2344L28.2094 24.4219L28.2 24.4875Z" fill="#04534E"/>
+<path d="M28.2188 24.0375C28.2188 24.0375 28.35 24.0844 28.3688 24.1126L28.4156 24.1688C28.4156 24.1688 28.3875 24.2625 28.3594 24.225L28.2844 24.1407L28.2188 24.0375ZM28.5938 23.8313C28.5938 23.8313 28.7156 23.8782 28.7625 23.9344C28.8094 24 28.8 24.0469 28.7813 24.0563C28.7625 24.0563 28.6875 23.9907 28.6687 23.9625C28.6476 23.9184 28.6257 23.8747 28.6031 23.8313H28.5938Z" fill="#231F20"/>
+<path d="M28.725 23.8125C28.725 23.8125 28.8375 23.8875 28.8563 23.925C28.8657 23.9625 28.9032 24.0187 28.8657 24.0187C28.8375 24.0375 28.7813 23.9812 28.7719 23.9437L28.7157 23.8031L28.725 23.8125ZM29.3625 23.9531C29.3625 23.9531 29.4563 23.9906 29.4563 24.0656V24.1875L29.3907 24.1219V24.0562L29.3625 23.9625V23.9531ZM29.5313 24.0187C29.5313 24.0187 29.6063 24.0844 29.6157 24.1312C29.6157 24.1781 29.6344 24.2062 29.5875 24.225C29.55 24.225 29.5313 24.1781 29.5313 24.1312V24.0187ZM28.3782 25.425C28.3782 25.425 28.4344 25.4437 28.4907 25.425C28.5375 25.4062 28.5844 25.3594 28.575 25.3312C28.5657 25.2937 28.5375 25.2656 28.5 25.3125C28.4625 25.35 28.4813 25.3687 28.4532 25.3875L28.3875 25.4156L28.3782 25.425ZM29.0157 25.5937C29.0157 25.5937 29.1 25.575 29.1563 25.5094C29.2125 25.4531 29.2407 25.4156 29.2032 25.3969C29.1657 25.3781 29.1094 25.3969 29.1094 25.4437L29.0157 25.5937ZM29.5313 25.6031L29.6532 25.5187C29.7 25.4812 29.7188 25.4531 29.6907 25.425C29.6625 25.3781 29.6344 25.4062 29.6157 25.425L29.5969 25.4906L29.5407 25.6031H29.5313Z" fill="#231F20"/>
+<path d="M29.6907 25.6032C29.6907 25.6032 29.7657 25.5188 29.7844 25.4719C29.7938 25.425 29.8032 25.3782 29.775 25.3782C29.7375 25.3782 29.7 25.425 29.7 25.4625V25.6032H29.6907Z" fill="#231F20"/>
+<path d="M28.1157 24.7594C28.1157 24.5344 28.4438 24.0094 28.8188 24.0094C28.9688 24.0094 29.2782 24.1031 29.5219 24.2063C29.7282 24.3 29.8032 24.3938 29.9344 24.4313C30.0751 24.4688 30.2813 24.4406 30.2813 24.4406L30.7501 24.3938L30.3751 24.9281L30.2438 25.0406C30.2438 25.0406 30.1313 25.2656 29.8032 25.3969C29.4657 25.5281 28.9126 25.4344 28.6594 25.3688C28.4063 25.3031 28.0969 25.0688 28.1157 24.7594Z" fill="#8CBEBF"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M28.1942 24.557C28.1582 24.6365 28.1391 24.7079 28.1391 24.7594V24.7601L28.1391 24.7608C28.1302 24.9068 28.1986 25.0365 28.3021 25.1388C28.4057 25.2413 28.5426 25.3143 28.6653 25.3461C28.7908 25.3786 28.9909 25.4182 29.2013 25.4333C29.4124 25.4484 29.6308 25.4388 29.7946 25.3751C29.9551 25.3109 30.0624 25.2239 30.1296 25.1534C30.1631 25.1181 30.1867 25.0869 30.2017 25.0647C30.2092 25.0536 30.2146 25.0448 30.2181 25.0388C30.2198 25.0358 30.221 25.0336 30.2218 25.0321L30.2227 25.0305L30.2228 25.0302L30.225 25.0259L30.3576 24.9123L30.7015 24.4222L30.284 24.4639L30.2838 24.464L30.2819 24.4642C30.2803 24.4644 30.2779 24.4647 30.2749 24.4651C30.2688 24.4658 30.2601 24.4667 30.2491 24.4678C30.2272 24.4699 30.1965 24.4723 30.1614 24.4734C30.0916 24.4758 30.0021 24.4736 29.9284 24.4539L29.928 24.4538C29.8585 24.434 29.8042 24.3992 29.7435 24.3595C29.7411 24.3579 29.7387 24.3563 29.7363 24.3548C29.6771 24.3161 29.6097 24.2719 29.5125 24.2277C29.3915 24.1766 29.2543 24.1277 29.1287 24.0917C29.0025 24.0554 28.8903 24.0328 28.8188 24.0328C28.642 24.0328 28.4722 24.1573 28.3448 24.3148C28.2816 24.3929 28.2299 24.4779 28.1942 24.557ZM30.2781 24.4174L30.279 24.4173L30.7986 24.3654L30.3925 24.944L30.2624 25.0556C30.2615 25.0573 30.2602 25.0596 30.2586 25.0623C30.2546 25.0692 30.2487 25.0789 30.2405 25.091C30.2242 25.1151 30.1991 25.1483 30.1635 25.1857C30.0924 25.2605 29.9795 25.3516 29.8119 25.4187L29.8117 25.4187C29.638 25.4863 29.4111 25.4954 29.198 25.48C28.9842 25.4647 28.7812 25.4246 28.6536 25.3915C28.5232 25.3577 28.3788 25.2807 28.2691 25.1722C28.1595 25.0637 28.0826 24.9218 28.0922 24.7587C28.0924 24.6977 28.1144 24.6195 28.1515 24.5376C28.1889 24.4549 28.2427 24.3665 28.3084 24.2853C28.4389 24.124 28.6207 23.986 28.8188 23.986C28.8973 23.986 29.0148 24.0102 29.1417 24.0466C29.2692 24.0832 29.4084 24.1328 29.5311 24.1847L29.5316 24.1849C29.6323 24.2307 29.7023 24.2765 29.7616 24.3153C29.7641 24.317 29.7666 24.3186 29.7691 24.3203C29.8302 24.3602 29.879 24.391 29.9407 24.4087C30.0075 24.4265 30.0914 24.4289 30.1598 24.4266C30.1938 24.4254 30.2235 24.4231 30.2447 24.4211C30.2552 24.4201 30.2637 24.4192 30.2694 24.4185C30.2723 24.4182 30.2745 24.4179 30.276 24.4177L30.2776 24.4175L30.278 24.4174L30.2781 24.4174Z" fill="#04534E"/>
+<path d="M28.1156 24.7594H28.1344C28.1344 24.7125 28.1531 24.6375 28.1906 24.5625C28.2513 24.4286 28.3373 24.3076 28.4438 24.2062C28.5469 24.1125 28.6781 24.0375 28.8094 24.0375C28.8844 24.0375 28.9969 24.0562 29.1281 24.0937C29.2593 24.128 29.3878 24.1718 29.5125 24.225C29.6063 24.2719 29.6813 24.3187 29.7375 24.3656C29.8031 24.4031 29.8594 24.4406 29.925 24.4594C29.9866 24.4726 30.0495 24.4789 30.1125 24.4781L30.2813 24.4687L30.6938 24.4219L30.3563 24.9094L30.225 25.0219V25.0312C30.1244 25.192 29.9724 25.3143 29.7938 25.3781C29.6719 25.4156 29.5313 25.4344 29.3719 25.4344C29.1094 25.4344 28.8188 25.3875 28.6594 25.3406C28.5254 25.3073 28.4026 25.2394 28.3031 25.1437C28.2516 25.0955 28.2102 25.0375 28.1813 24.9731C28.1523 24.9087 28.1364 24.8393 28.1344 24.7687H28.0875C28.0875 24.9281 28.1625 25.0687 28.275 25.1812C28.3792 25.2845 28.5084 25.3588 28.65 25.3969C28.8094 25.4344 29.1 25.4906 29.3719 25.4906C29.5214 25.494 29.6705 25.4718 29.8125 25.425C30.0044 25.3568 30.1667 25.2243 30.2719 25.05H30.2438L30.2625 25.0594L30.3938 24.9375L30.7969 24.3562L30.2719 24.4219H30.2625C30.1563 24.431 30.0493 24.4278 29.9438 24.4125C29.8788 24.3932 29.8183 24.3614 29.7656 24.3187C29.7094 24.2812 29.6344 24.225 29.5313 24.1875C29.4038 24.1306 29.2722 24.0835 29.1375 24.0469C29.0156 24.0094 28.8938 23.9906 28.8188 23.9906H28.8094C28.7156 23.9906 28.6219 24.0187 28.5281 24.0844C28.4025 24.17 28.2969 24.282 28.2188 24.4125C28.1477 24.5158 28.1027 24.6348 28.0875 24.7594H28.1156Z" fill="#04534E"/>
+<path d="M30.375 24.8344C30.3375 24.8625 30.2813 24.8625 30.2438 24.8625C30.1969 24.8625 29.1563 24.2344 28.8375 24.2625C28.5094 24.2906 28.2 24.4219 28.1907 24.7594C28.1907 25.0875 28.2657 25.0875 28.3313 25.1813C28.3969 25.275 29.0344 25.4156 29.0344 25.4156H29.4188L29.7282 25.3781L30.0094 25.2281L30.15 25.1063L30.2532 24.9844L30.375 24.8344Z" fill="#0C8489"/>
+<path d="M28.7344 24.6563C28.7344 24.7313 28.7062 24.7782 28.6406 24.7782C28.5844 24.7782 28.5375 24.75 28.5375 24.6844C28.5375 24.6188 28.575 24.5907 28.6312 24.5907C28.6969 24.5907 28.725 24.6 28.725 24.6657L28.7344 24.6563ZM28.8375 24.375C28.8375 24.3188 28.8937 24.3 28.95 24.3C29.0156 24.3 29.0625 24.3188 29.0625 24.375C29.0625 24.4313 29.0156 24.4688 28.95 24.4688C28.8937 24.4688 28.8375 24.4313 28.8375 24.375ZM29.4656 24.5438C29.4656 24.4969 29.5031 24.4594 29.5594 24.4594C29.6062 24.4594 29.6437 24.4969 29.6437 24.5532C29.6437 24.6094 29.6062 24.6282 29.55 24.6282C29.5267 24.6283 29.5041 24.6197 29.4868 24.6041C29.4695 24.5885 29.4586 24.567 29.4562 24.5438H29.4656ZM29.5875 24.9188C29.5875 24.8625 29.6344 24.825 29.6812 24.825C29.7375 24.825 29.7937 24.8438 29.7937 24.9C29.7937 24.9563 29.775 25.0219 29.7187 25.0219C29.6625 25.0219 29.5875 24.9844 29.5875 24.9282V24.9188ZM29.2875 25.1719C29.2875 25.1157 29.3344 25.0782 29.3812 25.0782C29.4469 25.0782 29.4937 25.1157 29.4937 25.1719C29.4937 25.2188 29.4469 25.2563 29.4 25.2563C29.3344 25.2563 29.2875 25.2188 29.2875 25.1625V25.1719ZM28.725 25.0782C28.725 25.0219 28.7531 24.9844 28.8094 24.9844C28.8234 24.9798 28.8384 24.9786 28.8531 24.9809C28.8677 24.9831 28.8816 24.9889 28.8936 24.9975C28.9056 25.0062 28.9154 25.0177 28.9221 25.0309C28.9289 25.0441 28.9324 25.0587 28.9324 25.0735C28.9324 25.0883 28.9289 25.1029 28.9221 25.1161C28.9154 25.1293 28.9056 25.1407 28.8936 25.1494C28.8816 25.1581 28.8677 25.1638 28.8531 25.1661C28.8384 25.1684 28.8234 25.1672 28.8094 25.1625C28.7845 25.1625 28.7606 25.1527 28.7431 25.1351C28.7255 25.1175 28.7156 25.0937 28.7156 25.0688L28.725 25.0782Z" fill="#04534E"/>
+<path d="M28.725 24.6562C28.725 24.7031 28.6875 24.75 28.6312 24.75C28.6064 24.75 28.5825 24.7401 28.5649 24.7225C28.5474 24.7049 28.5375 24.6811 28.5375 24.6562C28.5375 24.6 28.575 24.5812 28.6312 24.5812C28.6875 24.5812 28.725 24.6 28.725 24.6468V24.6562ZM29.0344 24.3562C29.0344 24.4031 29.0156 24.4406 28.9594 24.4406C28.9125 24.4406 28.8375 24.4031 28.8375 24.3562C28.8375 24.3093 28.8844 24.2625 28.9312 24.2625C28.9875 24.2625 29.025 24.3093 29.025 24.3562H29.0344ZM29.6344 24.5156C29.6344 24.5625 29.5969 24.6 29.5406 24.6C29.4844 24.6 29.4562 24.5625 29.4562 24.5156C29.4562 24.4781 29.4937 24.4406 29.55 24.4406C29.6062 24.4406 29.6344 24.4781 29.6344 24.5156Z" fill="#8CBEBF"/>
+<path d="M29.3156 24.7687C29.3156 24.8344 29.2875 24.8812 29.2219 24.8812C29.1656 24.8812 29.1188 24.8531 29.1188 24.7875C29.1188 24.7219 29.1469 24.6937 29.2125 24.6937C29.2781 24.6937 29.3063 24.7125 29.3063 24.7687H29.3156Z" fill="#04534E"/>
+<path d="M28.875 25.05C28.875 25.0969 28.8375 25.1438 28.7812 25.1438C28.725 25.1438 28.6875 25.0969 28.6875 25.05C28.6875 25.0032 28.7438 24.975 28.8 24.975C28.8563 24.975 28.875 25.0032 28.875 25.05ZM29.2969 24.7688C29.2969 24.7937 29.287 24.8175 29.2694 24.8351C29.2518 24.8527 29.228 24.8625 29.2031 24.8625C29.1783 24.8625 29.1544 24.8527 29.1368 24.8351C29.1193 24.8175 29.1094 24.7937 29.1094 24.7688C29.1094 24.7439 29.1193 24.7201 29.1368 24.7025C29.1544 24.6849 29.1783 24.675 29.2031 24.675C29.228 24.675 29.2518 24.6849 29.2694 24.7025C29.287 24.7201 29.2969 24.7439 29.2969 24.7688ZM29.7844 24.8907C29.7844 24.9469 29.7563 24.9844 29.6906 24.9844C29.6344 24.9844 29.5875 24.9469 29.5875 24.8907C29.5875 24.8344 29.6062 24.8157 29.6625 24.8157C29.7187 24.8157 29.7844 24.8344 29.7844 24.8907ZM29.475 25.1438C29.475 25.2 29.4375 25.2375 29.3812 25.2375C29.325 25.2375 29.2781 25.2 29.2781 25.1438C29.2781 25.0969 29.325 25.0688 29.3719 25.0688C29.4281 25.0688 29.4656 25.0969 29.4656 25.1438H29.475Z" fill="#8CBEBF"/>
+<path d="M29.5125 24.8438C29.5125 24.8438 29.6625 24.825 29.6906 24.8438C29.7187 24.8813 29.7187 24.9188 29.7 24.9375C29.6906 24.9375 29.625 24.9469 29.6062 24.9281C29.6062 24.9 29.5125 24.8344 29.5125 24.8344V24.8438ZM29.3531 24.3375C29.3531 24.3375 29.475 24.3656 29.5219 24.4219C29.5687 24.4688 29.5594 24.5156 29.5594 24.525C29.5406 24.5344 29.5031 24.5438 29.4656 24.5063L29.3531 24.3375ZM29.0062 24.5813C29.0062 24.5813 29.1469 24.6563 29.175 24.7031C29.2031 24.7406 29.2125 24.7781 29.1937 24.7969C29.1844 24.8156 29.1187 24.7969 29.1 24.7688C29.1 24.7406 29.0062 24.5813 29.0062 24.5813Z" fill="#231F20"/>
+<path d="M28.9407 24.6844C28.9407 24.6844 29.1 24.7031 29.1282 24.7312C29.175 24.7687 29.2032 24.7687 29.2032 24.7875C29.2032 24.8156 29.175 24.825 29.1563 24.825C29.1163 24.8163 29.0781 24.8004 29.0438 24.7781L28.95 24.6844H28.9407ZM28.7625 24.2344C28.7625 24.2344 28.9219 24.2531 28.95 24.2812C28.9875 24.3094 28.9969 24.375 28.9594 24.3938C28.9219 24.4125 28.8844 24.375 28.8657 24.3469C28.8381 24.3065 28.8067 24.2688 28.7719 24.2344H28.7625ZM28.425 24.4688C28.425 24.4688 28.5657 24.5437 28.6125 24.6C28.6407 24.6375 28.6594 24.6656 28.6125 24.6937C28.575 24.6937 28.5282 24.6281 28.5282 24.6C28.4982 24.5529 28.4637 24.509 28.425 24.4688Z" fill="#231F20"/>
+<path d="M28.3875 24.6562L28.5281 24.6375C28.575 24.6375 28.6406 24.6281 28.6406 24.6562C28.6406 24.6937 28.5843 24.7031 28.5468 24.6937L28.3875 24.6562ZM29.1937 25.1812C29.1937 25.1812 29.2968 25.1156 29.3531 25.125C29.4 25.1344 29.4187 25.1344 29.4187 25.1625C29.4187 25.2 29.3531 25.1906 29.3343 25.1906L29.1937 25.1812ZM28.6312 25.0969C28.6312 25.0969 28.6687 25.0406 28.7156 25.0312C28.7531 25.0312 28.7718 25.0312 28.7812 25.05C28.7812 25.0687 28.7437 25.1062 28.725 25.1062H28.6312V25.0969Z" fill="#231F20"/>
+<path d="M30.2438 24.9938C30.2438 24.9938 30.0938 25.1813 29.8688 25.275C29.6568 25.3684 29.424 25.404 29.1938 25.3782C28.9944 25.3749 28.7979 25.3298 28.6171 25.2459C28.4362 25.1619 28.275 25.0409 28.1438 24.8907L28.1813 24.9938L28.3688 25.2375L28.5844 25.3313L28.9125 25.425L29.2219 25.4532H29.4563L29.7375 25.4063L29.9157 25.3407L30.0375 25.2657L30.1313 25.1907L30.2438 25.0032V24.9938ZM29.9625 24.4407C29.9625 24.4407 29.8688 24.4688 29.6813 24.3563C29.4938 24.2438 29.2782 24.0938 28.8563 24.0938C28.4344 24.0938 28.3032 24.375 28.275 24.3938L28.4625 24.15L28.65 24.0469L28.8094 24.0188H28.95L29.1375 24.075L29.2969 24.1313L29.4938 24.1969L29.6625 24.2907L29.8688 24.3938L29.9625 24.4407ZM30.525 24.5719H30.2063C30.1313 24.5719 30.1313 24.5907 30.1125 24.6094C30.107 24.6223 30.1007 24.6348 30.0938 24.6469L30.0188 24.4875L30.3469 24.4407L30.5344 24.5063L30.5157 24.5625L30.525 24.5719Z" fill="#04534E"/>
+<path d="M30.0656 26.2875C30.0843 26.3344 30.1218 26.3813 30.1687 26.3813H30.3187L30.6562 26.3531L30.7687 26.2219L30.8437 25.9219L30.9375 25.8094L31.2468 25.6313L31.5093 25.5563L31.6875 25.5375L31.9218 25.4625L32.1 25.3688L32.175 25.2563L32.25 25.0875L32.175 24.8531L31.9875 24.6L31.6687 24.4781H31.4062L31.125 24.5813L30.6093 24.7031C30.6093 24.7031 30.3281 24.825 30.2062 25.05C30.0843 25.2656 30.0937 25.3313 30.0656 25.6125C30.0468 25.9125 30.0656 26.2875 30.0656 26.2875Z" fill="#0C8489"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M31.402 24.4547H31.673L32.0022 24.5806L32.1961 24.8423L32.275 25.0889L32.1956 25.2676L32.1162 25.3867L31.9309 25.4842L31.6923 25.5606L31.5138 25.5794L31.256 25.653L30.9528 25.8276L30.8651 25.9328L30.7901 26.233L30.6677 26.3757L30.3197 26.4047H30.1687C30.137 26.4047 30.1103 26.3888 30.09 26.3685C30.0697 26.3482 30.0541 26.3219 30.0438 26.2962L30.0656 26.2875L30.0422 26.2887L30.0421 26.2876L30.042 26.2843L30.0414 26.2719C30.0409 26.261 30.0403 26.2451 30.0395 26.2251C30.0381 26.1851 30.0363 26.1287 30.0351 26.0629C30.0328 25.9315 30.0328 25.762 30.0422 25.6111L30.0422 25.6102C30.0459 25.5741 30.0489 25.5414 30.0516 25.5114C30.0595 25.4255 30.0654 25.3612 30.0778 25.3019C30.0949 25.2203 30.1241 25.1477 30.1857 25.0387C30.2492 24.9216 30.3534 24.8324 30.4402 24.7729C30.4839 24.743 30.5236 24.7203 30.5525 24.705C30.567 24.6973 30.5787 24.6916 30.5869 24.6877C30.591 24.6857 30.5943 24.6842 30.5965 24.6832L30.599 24.6821L30.5997 24.6818L30.5999 24.6817C30.5999 24.6817 30.6 24.6816 30.6093 24.7031L30.6 24.6816L30.6019 24.6808L31.1182 24.5588L31.402 24.4547ZM30.6169 24.7255L30.6158 24.7259C30.6139 24.7268 30.6109 24.7282 30.6071 24.73C30.5994 24.7336 30.5883 24.7391 30.5744 24.7464C30.5468 24.761 30.5086 24.7829 30.4667 24.8115C30.3825 24.8692 30.2852 24.9534 30.2268 25.0612L30.2266 25.0616C30.1664 25.1681 30.1394 25.2361 30.1237 25.3115C30.1119 25.368 30.1063 25.4285 30.0986 25.5131C30.0958 25.5435 30.0927 25.5769 30.0889 25.6144C30.0797 25.7634 30.0796 25.9312 30.082 26.0621C30.0832 26.1276 30.0849 26.1837 30.0864 26.2234C30.0871 26.2432 30.0878 26.259 30.0882 26.2698L30.0888 26.2821L30.0888 26.2824C30.0972 26.3023 30.1092 26.3214 30.1232 26.3354C30.138 26.3503 30.1535 26.3578 30.1687 26.3578H30.3177L30.6447 26.3306L30.7473 26.2108L30.8223 25.911L30.9221 25.7912L31.2376 25.6095L31.5049 25.5332L31.6826 25.5145L31.9127 25.4408L32.0838 25.3508L32.1544 25.2449L32.2249 25.0862L32.1538 24.864L31.9727 24.6195L31.6644 24.5016H31.4104L31.1317 24.6038L30.6169 24.7255Z" fill="#04534E"/>
+<path d="M30.2062 26.175C30.3 26.175 30.225 26.0156 30.3375 25.8188C30.45 25.6313 30.5812 25.3875 30.6187 25.3875C30.6562 25.3875 30.6562 25.425 30.7031 25.4156C30.7406 25.3969 30.8156 25.3406 30.8156 25.3219C30.8156 25.3031 30.8156 25.2 30.9094 25.1344C30.9844 25.0594 31.1062 24.9563 31.1625 24.9469C31.2187 24.9375 31.2562 24.9188 31.2562 24.9469C31.2656 24.975 31.2281 25.0125 31.2656 25.0219C31.3031 25.0406 31.3969 25.0313 31.4156 24.975L31.4344 24.8813C31.4344 24.8813 31.4906 24.8344 31.6031 24.8531C31.7156 24.8813 31.725 24.8719 31.7344 24.9188C31.7437 24.9563 31.6875 24.9656 31.6969 24.9938V25.05C31.7156 25.0688 31.7344 25.1438 31.8094 25.1438C31.8844 25.1344 31.9125 25.0875 31.9125 25.0875L31.9406 25.05C31.9406 25.05 31.9594 25.0031 31.9312 24.9844C31.9031 24.9656 31.9125 24.9469 31.9312 24.9563C31.9687 24.9656 32.0812 25.125 32.1187 25.0594C32.1562 24.9938 32.1656 24.9 32.1375 24.8719C32.0766 24.7886 32.0172 24.7042 31.9594 24.6188L31.6781 24.525L31.3031 24.5531L30.9281 24.7594L30.5906 24.9469C30.5906 24.9469 30.5719 25.2188 30.5156 25.1625C30.45 25.1156 30.3656 24.975 30.3375 25.0219C30.3094 25.0688 30.2531 25.275 30.2156 25.3781C30.1875 25.4719 30.0844 25.7906 30.0937 25.9031C30.1031 26.0156 30.1687 26.175 30.2062 26.175Z" fill="#8CBEBF"/>
+<path d="M30.5438 25.725C30.5156 25.725 30.4781 25.7531 30.4688 25.7718C30.45 25.7906 30.4406 25.8187 30.45 25.8656C30.45 25.8937 30.5156 25.9312 30.5156 25.9312H30.5625L30.6563 25.9031L30.6844 25.8281C30.6844 25.7812 30.6563 25.7718 30.6469 25.7718C30.6122 25.7569 30.5778 25.7413 30.5438 25.725ZM31.125 25.2562C31.0688 25.2281 31.05 25.2656 31.0313 25.2843V25.3312C31.0313 25.3312 31.05 25.4062 31.0688 25.425C31.0969 25.425 31.1719 25.4531 31.1906 25.425C31.2188 25.4062 31.2375 25.3875 31.2375 25.3406C31.2375 25.2937 31.1719 25.275 31.1719 25.275L31.125 25.2468V25.2562ZM31.5938 25.3593C31.5938 25.3406 31.5469 25.3312 31.5094 25.3406C31.4813 25.3406 31.4438 25.3781 31.4531 25.4343C31.4719 25.5 31.5281 25.5 31.5656 25.4906C31.6125 25.4812 31.6031 25.4156 31.6031 25.4062L31.5938 25.3593ZM30.2438 25.4531C30.2438 25.4812 30.2906 25.5468 30.3563 25.5375C30.3827 25.5361 30.4079 25.5263 30.4282 25.5094C30.4485 25.4925 30.4627 25.4694 30.4688 25.4437C30.4688 25.4062 30.4313 25.4718 30.375 25.4906C30.3188 25.5093 30.3094 25.5093 30.2813 25.4906C30.2625 25.4531 30.2438 25.4531 30.2438 25.4531Z" fill="#8CBEBF"/>
+<path d="M30.6843 25.8281C30.6843 25.8281 30.6843 25.8844 30.6468 25.9219C30.6 25.95 30.5718 25.95 30.5531 25.95C30.525 25.95 30.4968 25.95 30.4781 25.9219L30.45 25.8562C30.45 25.8562 30.4968 25.9312 30.5718 25.9125C30.6189 25.9 30.6592 25.8698 30.6843 25.8281ZM31.9312 25.05C31.9312 25.05 31.9312 25.1063 31.8843 25.1344C31.8375 25.1625 31.8187 25.1625 31.7906 25.1625C31.7718 25.1625 31.7343 25.1531 31.725 25.125C31.6687 25.0312 31.6968 24.9844 31.6968 24.9844C31.6968 24.9844 31.7343 25.1344 31.8187 25.125C31.8642 25.1149 31.9043 25.0881 31.9312 25.05ZM30.8156 25.3219C30.8156 25.3219 30.7781 25.4344 30.7031 25.4344C30.6187 25.4344 30.6281 25.4156 30.6375 25.3969C30.6375 25.3875 30.6656 25.4156 30.7031 25.3969C30.7406 25.3969 30.8156 25.3219 30.8156 25.3219ZM31.0312 25.2937C31.0312 25.2937 31.0312 25.3875 31.05 25.4062C31.0781 25.4438 31.1156 25.4531 31.1437 25.4531C31.1718 25.4531 31.2 25.4531 31.2281 25.4156C31.2562 25.3781 31.2375 25.3406 31.2375 25.3406L31.2187 25.3875C31.1906 25.4156 31.1718 25.4156 31.1437 25.4156C31.1156 25.4156 31.0781 25.4156 31.0687 25.3875L31.0312 25.2937ZM31.4343 24.8906C31.4343 24.8906 31.4531 24.9563 31.4062 25.0031C31.3593 25.0594 31.2656 25.0219 31.2656 25.0219C31.2656 25.0219 31.3406 25.05 31.3781 25.0031C31.4156 24.9656 31.4343 24.8906 31.4343 24.8906Z" fill="#04534E"/>
+<path d="M30.1594 26.3531C30.1594 26.3531 30.6563 26.3531 30.6938 26.2781C30.7313 26.2125 30.6563 25.9406 30.9469 25.7344C31.2469 25.5281 31.4813 25.5281 31.6407 25.5188C31.8 25.5 32.1375 25.3969 32.2032 25.0969C32.2313 24.9094 31.9875 24.8906 31.8938 24.7219C31.8 24.5344 31.5563 24.6094 31.5375 24.6094C31.5282 24.6094 31.2563 24.6094 31.1344 24.7313C31.05 24.8063 31.0594 24.9 31.0313 24.9375C30.9938 24.9844 30.6563 24.9375 30.6282 24.9938C30.5907 25.05 30.6375 25.1531 30.6094 25.1813C30.5907 25.2094 30.5157 25.1063 30.5157 25.1063L30.5344 24.8438L30.9563 24.6L31.425 24.3375L31.7532 24.3469L32.0813 24.5156L32.2407 24.7031C32.2407 24.7031 32.2688 24.7781 32.2875 24.9188C32.2933 24.9819 32.287 25.0455 32.2688 25.1063C32.1938 25.3688 31.9219 25.5563 31.6407 25.575C31.4048 25.5926 31.1781 25.6736 30.9844 25.8094C30.8532 25.9031 30.7875 26.3063 30.7875 26.3625C30.7875 26.4094 30.1688 26.3719 30.1688 26.3719V26.3531H30.1594Z" fill="#04534E"/>
+<path d="M30.375 25.3875C30.3468 25.4156 30.3093 25.4062 30.3 25.3875C30.2812 25.2937 30.3281 25.1813 30.3281 25.1813V25.3313C30.3375 25.35 30.3656 25.3406 30.375 25.3594V25.3875ZM30.675 25.3313C30.6562 25.3219 30.6656 25.2375 30.675 25.2094C30.6937 25.1812 30.8343 25.0781 30.8343 25.0781L30.7781 25.2188C30.7593 25.2562 30.7125 25.3406 30.6843 25.3313H30.675ZM30.5625 25.8281C30.5343 25.8281 30.5343 25.7906 30.5343 25.7344C30.5343 25.6781 30.6281 25.5844 30.6281 25.5844L30.5906 25.6969L30.6093 25.7906C30.6093 25.8188 30.5812 25.8281 30.5625 25.8281Z" fill="#231F20"/>
+<path d="M30.7875 25.6875C30.7875 25.6875 30.7406 25.7438 30.6937 25.7719C30.6469 25.8 30.5906 25.8375 30.5625 25.8281C30.525 25.8281 30.5719 25.7531 30.5906 25.7438L30.7875 25.6875ZM31.2094 25.0875C31.2094 25.0875 31.1531 25.1344 31.125 25.2C31.0969 25.2656 31.0875 25.3219 31.1156 25.3313C31.1437 25.35 31.1812 25.2563 31.1906 25.2281L31.2094 25.0875Z" fill="#231F20"/>
+<path d="M31.3688 25.3031C31.3688 25.3031 31.3219 25.2656 31.2563 25.2469C31.1813 25.2281 31.1625 25.2469 31.1438 25.2656C31.1438 25.2844 31.0875 25.3125 31.1157 25.3313C31.1344 25.35 31.1719 25.3031 31.1907 25.3031C31.2094 25.2938 31.2375 25.275 31.275 25.2844L31.3688 25.3031ZM31.275 24.8813C31.3032 24.9094 31.3407 24.8625 31.3688 24.825C31.4063 24.7875 31.4344 24.7125 31.4344 24.7125L31.3407 24.7781C31.3032 24.8063 31.2563 24.8719 31.275 24.8813ZM31.9219 24.8719C31.9219 24.8719 31.8282 24.9094 31.8094 24.9469C31.7813 24.9844 31.7438 25.0219 31.7719 25.0406C31.8 25.0688 31.8282 25.0219 31.8469 24.9938L31.9219 24.8719ZM31.7344 25.3031C31.7344 25.3031 31.7063 25.3594 31.65 25.3969C31.6032 25.4344 31.5375 25.4438 31.5282 25.425C31.5188 25.4063 31.5375 25.3688 31.5563 25.3594L31.6313 25.3406C31.6666 25.3309 31.7011 25.3184 31.7344 25.3031Z" fill="#231F20"/>
+<path d="M27.4683 24.2811C27.6168 24.3038 27.7644 24.1438 27.7981 23.9237C27.8317 23.7036 27.7387 23.5068 27.5903 23.4841C27.4419 23.4614 27.2942 23.6214 27.2606 23.8415C27.2269 24.0616 27.3199 24.2584 27.4683 24.2811Z" fill="url(#paint0_radial_1_38536)"/>
+<path d="M27.6938 23.1562L27.5344 23.55L27.6657 23.5312L27.7313 23.175L27.6938 23.1562Z" fill="#FCCA3E"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M27.6865 23.1368L27.747 23.1671L27.6777 23.5437L27.5122 23.5674L27.6865 23.1368ZM27.7011 23.1756L27.5566 23.5326L27.6537 23.5187L27.7155 23.1828L27.7011 23.1756Z" fill="#AA8C30"/>
+<path d="M27.7594 22.9781C27.7031 22.9781 27.6562 23.0156 27.6469 23.0719C27.6469 23.1375 27.6844 23.1938 27.7406 23.2031C27.7969 23.2031 27.8437 23.1656 27.8531 23.1094C27.8531 23.0438 27.825 22.9875 27.7594 22.9781Z" fill="#FCCA3E"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M27.6376 23.0703C27.6477 23.0093 27.6987 22.9688 27.7593 22.9688H27.76L27.7607 22.9688C27.7962 22.9739 27.822 22.9919 27.8387 23.0175C27.8552 23.0429 27.8625 23.0754 27.8625 23.1094V23.1102L27.8623 23.1109C27.8522 23.1719 27.8012 23.2125 27.7406 23.2125H27.7398L27.739 23.2124C27.6769 23.202 27.6375 23.1405 27.6375 23.0719V23.0711L27.6376 23.0703ZM27.6562 23.0727C27.6565 23.1346 27.6916 23.185 27.7414 23.1937C27.7926 23.1934 27.8349 23.1594 27.8437 23.1086C27.8436 23.0773 27.8368 23.0491 27.823 23.0278C27.8093 23.0067 27.7884 22.9919 27.7587 22.9875C27.7073 22.9878 27.665 23.0218 27.6562 23.0727Z" fill="#AA8C30"/>
+<path d="M34.6594 23.9812L34.2656 24.3562L34.425 24.3937L34.6969 24.0375L34.6594 23.9812Z" fill="#FCCA3E"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M34.6617 23.9595L34.7141 24.038L34.4306 24.4095L34.2371 24.3639L34.6617 23.9595ZM34.2941 24.3485L34.4193 24.3779L34.6796 24.0369L34.6569 24.0029L34.2941 24.3485Z" fill="#AA8C30"/>
+<path d="M34.8376 23.8218C34.8051 23.805 34.7674 23.8015 34.7324 23.812C34.6974 23.8225 34.6679 23.8462 34.6501 23.8781C34.6032 23.9437 34.6219 24.0187 34.6876 24.0656C34.7532 24.0937 34.8376 24.0656 34.8751 23.9999C34.9126 23.9437 34.8938 23.8593 34.8376 23.8218Z" fill="#FCCA3E"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M34.7297 23.8031C34.767 23.7919 34.8073 23.7957 34.8419 23.8136L34.8428 23.8141L34.8427 23.8141C34.903 23.8543 34.9233 23.9442 34.883 24.005C34.8431 24.0744 34.7539 24.1043 34.6838 24.0743L34.6829 24.0739L34.6821 24.0733C34.6477 24.0487 34.625 24.0164 34.6174 23.9809C34.6098 23.9455 34.6175 23.9078 34.6421 23.8731C34.6611 23.8393 34.6925 23.8142 34.7297 23.8031ZM34.8328 23.83C34.8026 23.8145 34.7676 23.8113 34.7351 23.821C34.7024 23.8308 34.6749 23.853 34.6582 23.8827L34.6577 23.8836L34.6577 23.8836C34.6356 23.9145 34.6293 23.947 34.6358 23.977C34.6422 24.0069 34.6614 24.0352 34.6922 24.0574C34.7531 24.083 34.8319 24.0567 34.8669 23.9954L34.8672 23.9948L34.8672 23.9948C34.9016 23.9432 34.8846 23.8649 34.8328 23.83Z" fill="#AA8C30"/>
+<path d="M24.6375 21.8437L24.8437 22.3031L24.9375 22.1718L24.6937 21.825L24.6375 21.8437Z" fill="#FCCA3E"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M24.6992 21.8083L24.9547 22.1719L24.8409 22.3312L24.6183 21.8353L24.6992 21.8083ZM24.6567 21.8522L24.8465 22.275L24.9203 22.1718L24.6882 21.8417L24.6567 21.8522Z" fill="#AA8C30"/>
+<path d="M24.5531 21.6469C24.4968 21.6844 24.4968 21.7688 24.5437 21.8251C24.5812 21.8813 24.6656 21.8907 24.7125 21.8438C24.7687 21.7969 24.7687 21.7219 24.7218 21.6563C24.7004 21.6332 24.6708 21.6194 24.6393 21.6176C24.6079 21.6159 24.577 21.6264 24.5531 21.6469Z" fill="#FCCA3E"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M24.5475 21.6394C24.5732 21.6175 24.6063 21.6064 24.64 21.6082C24.6738 21.6101 24.7057 21.625 24.7288 21.6499L24.7296 21.6508L24.7296 21.6508C24.7539 21.685 24.7665 21.7221 24.7653 21.7574C24.764 21.7927 24.7488 21.8256 24.7189 21.8507C24.6677 21.9015 24.577 21.8911 24.5363 21.8307C24.5116 21.8009 24.4992 21.7636 24.5005 21.7286C24.5017 21.6935 24.5168 21.6602 24.5475 21.6394ZM24.5532 21.6469L24.5584 21.6547C24.5332 21.6715 24.5203 21.6989 24.5192 21.7293C24.5181 21.7597 24.529 21.7926 24.551 21.819L24.5517 21.8198L24.5516 21.8198C24.586 21.8714 24.6634 21.8797 24.7059 21.8372L24.7065 21.8366L24.7066 21.8366C24.7326 21.8149 24.7455 21.7869 24.7465 21.7567C24.7476 21.7265 24.7369 21.6936 24.7147 21.6622C24.6949 21.6412 24.6678 21.6286 24.6389 21.627C24.6099 21.6253 24.5813 21.635 24.5593 21.654L24.5532 21.6469Z" fill="#AA8C30"/>
+<path d="M27.8062 22.9969C27.8062 22.9969 27.8344 23.0063 27.8062 22.9969C27.7594 22.9969 27.675 23.0344 27.675 23.0906C27.675 23.1155 27.6849 23.1394 27.7024 23.1569C27.72 23.1745 27.7439 23.1844 27.7687 23.1844C27.8156 23.1844 27.75 23.2031 27.75 23.2031L27.6844 23.1844L27.6656 23.1469L27.6469 23.1L27.6562 23.0438L27.6937 22.9969L27.7406 22.9781H27.7687L27.8062 22.9969Z" fill="#AA8C30"/>
+<path d="M27.7125 23.2594C27.7125 23.2594 27.6844 23.2594 27.6656 23.2875C27.6442 23.3222 27.6223 23.3566 27.6 23.3907L27.6937 23.175L27.7312 23.1938L27.7125 23.2594ZM34.875 23.8594C34.875 23.8594 34.9031 23.8969 34.8656 23.8594C34.8281 23.8313 34.6968 23.8407 34.6687 23.9063C34.6312 23.9813 34.6687 24.0376 34.725 24.0657C34.7812 24.0844 34.7062 24.0657 34.7062 24.0657L34.6406 24.0188L34.6312 23.9625V23.8969L34.6781 23.8407L34.7437 23.8125H34.8094L34.8375 23.8313L34.875 23.8594Z" fill="#AA8C30"/>
+<path d="M34.6312 24.1219C34.6312 24.1219 34.6031 24.1032 34.5563 24.1219L34.425 24.2063L34.6406 24L34.6875 24.0563L34.6312 24.1219ZM24.6 21.6188C24.6 21.6188 24.6375 21.6094 24.6 21.6282C24.5531 21.6563 24.525 21.7594 24.5719 21.8157C24.6281 21.8625 24.6937 21.8532 24.7312 21.8157C24.7687 21.7688 24.7312 21.8344 24.7312 21.8344L24.6656 21.8719H24.6094L24.5531 21.8438L24.5156 21.7875V21.7125L24.5344 21.6657L24.5625 21.6375L24.5906 21.6188H24.6Z" fill="#AA8C30"/>
+<path d="M24.75 21.9188C24.75 21.9188 24.7219 21.9281 24.7312 21.975L24.7594 22.1156L24.6469 21.8625L24.7125 21.8438L24.75 21.9188Z" fill="#AA8C30"/>
+<path d="M24.8502 22.8368C24.9587 23.0488 25.1624 23.1614 25.3053 23.0883C25.4482 23.0152 25.4761 22.784 25.3676 22.572C25.2591 22.36 25.0553 22.2474 24.9124 22.3205C24.7695 22.3936 24.7417 22.6248 24.8502 22.8368Z" fill="url(#paint1_radial_1_38536)"/>
+<path d="M24.6187 22.6125C24.6187 22.6125 24.7124 22.6312 24.7593 22.6125C24.8062 22.5937 24.8156 22.5469 24.8249 22.5375C24.8343 22.5281 24.8531 22.4812 24.8437 22.4437C24.8229 22.3934 24.7908 22.3485 24.7499 22.3125L24.6562 22.3031C24.6468 22.2937 24.6562 22.2656 24.6374 22.2562C24.6093 22.2562 24.4781 22.4062 24.4968 22.425C24.5249 22.4531 24.5343 22.425 24.5437 22.4344V22.5375C24.5437 22.5656 24.6187 22.6125 24.6187 22.6125Z" fill="#E92736"/>
+<path d="M24.7501 22.3218C24.7594 22.35 24.8157 22.4156 24.8344 22.4156C24.8532 22.4343 24.9094 22.4343 24.9282 22.4156C24.9563 22.4156 25.0219 22.35 25.0219 22.3218C25.0241 22.2995 25.0209 22.277 25.0126 22.2562C24.9938 22.2281 25.0032 22.1625 24.9751 22.1531C24.9563 22.1531 24.9469 22.1437 24.9282 22.125V22.0593C24.9001 22.0312 24.6844 22.1625 24.7032 22.1906C24.7219 22.2093 24.7407 22.1906 24.7501 22.2V22.3218Z" fill="#E92736"/>
+<path d="M25.2375 22.275C25.2563 22.2375 25.2469 22.1344 25.2281 22.1063C25.2094 22.0782 25.1719 22.0782 25.1625 22.0688C25.1625 22.0594 25.1906 22.05 25.1906 22.0219C25.1906 21.9938 24.9469 22.0313 24.9656 22.0594C24.9844 22.0875 25.0219 22.0688 25.0219 22.0875C25.0219 22.1063 24.9844 22.125 24.975 22.1438L25.0031 22.2469C25.0031 22.2657 25.0031 22.2844 25.0219 22.2938L25.0781 22.3125H25.2094C25.2188 22.3032 25.2281 22.3032 25.2375 22.2657V22.275ZM27.3 23.475C27.3 23.475 27.3281 23.5407 27.375 23.5688H27.4688L27.525 23.5219C27.5438 23.5032 27.5625 23.4094 27.5531 23.3907C27.5531 23.3719 27.5063 23.3344 27.5063 23.3157C27.5063 23.2969 27.5344 23.2969 27.525 23.2782C27.5156 23.2594 27.3375 23.2594 27.3375 23.2969C27.3375 23.325 27.3656 23.3157 27.3563 23.325C27.3563 23.3438 27.3094 23.3719 27.3 23.3907C27.2813 23.4 27.3 23.4844 27.3 23.4844V23.475Z" fill="#E92736"/>
+<path d="M27.5437 23.3906C27.5437 23.4094 27.525 23.4844 27.5437 23.4937C27.5437 23.5125 27.5719 23.5593 27.5906 23.5687H27.7031C27.7211 23.5543 27.7342 23.5346 27.7406 23.5125C27.75 23.4844 27.7969 23.4468 27.7875 23.4281C27.7781 23.4093 27.7687 23.4094 27.7781 23.3906C27.7781 23.3719 27.8062 23.3719 27.8062 23.3437C27.8062 23.3156 27.6094 23.25 27.6 23.2781C27.6 23.3062 27.6281 23.2969 27.6187 23.3156C27.6187 23.3344 27.5531 23.3719 27.5437 23.3906Z" fill="#E92736"/>
+<path d="M27.8719 23.6719C27.9 23.6531 27.9656 23.5875 27.9656 23.5687C27.9656 23.5312 27.9375 23.5125 27.9469 23.5031L27.9938 23.4937C28.0031 23.475 27.8438 23.3437 27.8344 23.3719C27.8344 23.4 27.8625 23.4094 27.8531 23.4187L27.7875 23.4281C27.7781 23.4375 27.7406 23.4844 27.7406 23.5031C27.7406 23.5219 27.7125 23.5219 27.7219 23.55L27.7406 23.5875C27.75 23.6062 27.8156 23.6719 27.8344 23.6719H27.8719ZM34.0594 24.1875C34.0594 24.1875 34.0594 24.2625 34.0969 24.3C34.125 24.3281 34.1531 24.3281 34.1719 24.3375H34.2375C34.2758 24.3141 34.3079 24.282 34.3313 24.2437C34.3313 24.2156 34.3031 24.1687 34.3125 24.15C34.3219 24.1312 34.3406 24.15 34.3406 24.1312C34.3406 24.1031 34.1906 24.0281 34.1813 24.0562C34.1719 24.075 34.2 24.0844 34.1813 24.0937L34.1063 24.1125C34.0875 24.1125 34.0594 24.1875 34.0594 24.1875Z" fill="#E92736"/>
+<path d="M34.3125 24.2344L34.2375 24.3094C34.2375 24.3281 34.2375 24.375 34.2563 24.3844C34.2563 24.4031 34.3219 24.4406 34.35 24.4312C34.3594 24.4312 34.3782 24.4312 34.3969 24.4125C34.4157 24.4031 34.4719 24.3937 34.4719 24.375L34.4813 24.3375C34.4907 24.3281 34.5188 24.3375 34.5375 24.3187C34.5563 24.3 34.425 24.1594 34.4063 24.1781C34.3875 24.1969 34.4063 24.2062 34.4063 24.2156C34.3875 24.2156 34.3219 24.2156 34.3125 24.2344Z" fill="#E92736"/>
+<path d="M34.35 24.5813H34.4813L34.5188 24.5344C34.5281 24.5344 34.5281 24.5531 34.5563 24.5531C34.575 24.5531 34.5563 24.3656 34.5281 24.3844C34.5094 24.3937 34.5188 24.4312 34.5094 24.4219C34.4906 24.4219 34.4813 24.3938 34.4625 24.3938C34.431 24.3902 34.399 24.3934 34.3688 24.4031C34.3688 24.4031 34.35 24.4031 34.3406 24.4219L34.3219 24.4594V24.5531C34.3313 24.5719 34.3219 24.5719 34.35 24.5813Z" fill="#E92736"/>
+<path d="M24.7688 22.4063C24.7875 22.4438 24.7594 22.5188 24.7407 22.5375C24.7313 22.5563 24.6188 22.5281 24.6188 22.5094C24.6188 22.4906 24.6094 22.4531 24.6188 22.4344C24.6375 22.4156 24.675 22.3688 24.7032 22.3781C24.7313 22.3781 24.7594 22.4063 24.7688 22.4156V22.4063ZM24.7969 22.2844C24.7782 22.3125 24.7969 22.3406 24.8157 22.35C24.825 22.3688 24.9094 22.3875 24.9282 22.3781C24.9469 22.3594 24.9844 22.2375 24.9657 22.2188C24.9469 22.2 24.9094 22.2 24.9 22.2C24.8813 22.2 24.8063 22.2563 24.7969 22.2844ZM25.05 22.1625V22.2281C25.0688 22.2375 25.1157 22.275 25.1438 22.275C25.1719 22.275 25.1907 22.1813 25.1907 22.1719C25.1907 22.1531 25.1813 22.1438 25.1625 22.1344L25.05 22.1531V22.1625ZM27.4969 23.4469C27.4969 23.4844 27.4313 23.5125 27.4125 23.5125C27.3938 23.5125 27.3469 23.4188 27.3563 23.4188C27.3657 23.4 27.3844 23.3719 27.4032 23.3719C27.4219 23.3719 27.4688 23.3719 27.4875 23.3906L27.5063 23.4563L27.4969 23.4469ZM27.6 23.3906C27.5813 23.4 27.5719 23.4281 27.5719 23.4469C27.5719 23.4656 27.6 23.5219 27.6188 23.5313C27.6375 23.5313 27.7313 23.4844 27.7407 23.4656C27.7407 23.4469 27.7219 23.4188 27.7032 23.4094L27.6094 23.3906H27.6ZM27.825 23.4844C27.8063 23.4844 27.7875 23.5125 27.7875 23.5313C27.7875 23.5313 27.7875 23.5875 27.8157 23.6063C27.8344 23.625 27.8907 23.5875 27.9 23.5781V23.5406C27.9 23.5219 27.825 23.4844 27.825 23.4844ZM34.2563 24.2531C34.2375 24.2719 34.1719 24.2719 34.1625 24.2531C34.1344 24.2531 34.1344 24.1594 34.1532 24.1594C34.1625 24.15 34.1907 24.1313 34.2094 24.1406C34.2282 24.1406 34.2657 24.1688 34.2657 24.1969L34.2563 24.2531ZM34.35 24.2625C34.3219 24.2625 34.3032 24.2719 34.2938 24.2906C34.2844 24.3 34.275 24.3563 34.2938 24.375C34.3032 24.3844 34.4063 24.3938 34.4157 24.375V24.3281L34.35 24.2625ZM34.4438 24.45H34.3969C34.3875 24.45 34.3594 24.4875 34.3594 24.5156C34.3594 24.5344 34.425 24.5438 34.4344 24.5438L34.4625 24.525L34.4532 24.45H34.4438Z" fill="#F7E204"/>
+<path d="M33.7232 24.9467C33.7995 25.0313 34.0016 24.9731 34.1745 24.8169C34.3473 24.6607 34.4256 24.4656 34.3492 24.3811C34.2728 24.2965 34.0708 24.3547 33.8979 24.5109C33.725 24.6671 33.6468 24.8622 33.7232 24.9467Z" fill="url(#paint2_radial_1_38536)"/>
+<path d="M26.7938 18.6844C26.7938 18.6844 26.4375 18.7125 26.1844 18.675C25.9313 18.6375 25.9969 17.9907 25.9875 17.9719C25.9875 17.9532 25.8375 17.8032 25.8563 17.6625C25.8844 17.5219 26.3438 17.1469 26.4 17.1188C26.4469 17.1094 26.5407 17.1469 26.5407 17.1469C26.5407 17.1469 26.6532 17.0344 26.6907 17.0344C26.7282 17.0344 26.775 17.1 26.7657 17.1282C26.7469 17.1563 26.5875 17.25 26.5782 17.3157C26.5594 17.3907 26.5782 17.4563 26.5313 17.5313C26.4844 17.5969 26.4 17.6907 26.3907 17.7563C26.3813 17.8125 26.3532 17.8594 26.3907 17.8875C26.4375 17.9063 26.5875 17.8875 26.7188 17.8313C26.85 17.7657 26.9063 17.6907 26.9157 17.7C26.9344 17.7 26.8407 17.8594 26.7 17.925C26.5594 17.9813 26.4657 18.0469 26.3907 18.0375C26.3907 18.0375 26.3157 18.225 26.5594 18.2438C26.8032 18.2438 26.9344 18.1875 26.9344 18.1875L26.7938 18.6844ZM25.3875 20.1844C25.3875 20.1844 25.575 20.2594 25.575 20.4657C25.575 20.6719 25.3782 20.85 25.3875 21.2157C25.3875 21.5907 25.4438 21.5907 25.9313 21.9938C26.0011 22.0573 26.0529 22.1382 26.0813 22.2282C26.1094 22.35 26.1938 23.0625 26.6625 23.0625C27.1313 23.0625 27.2063 22.7532 27.2063 22.7532L27 22.4625C27 22.4625 26.8407 22.5094 26.7469 22.4907C26.6979 22.4774 26.6527 22.4526 26.6152 22.4184C26.5777 22.3841 26.549 22.3414 26.5313 22.2938C26.475 22.1813 26.4657 21.9094 26.3813 21.7875C26.1938 21.4875 25.8375 21.4407 25.8282 21.1313C25.8282 20.8125 26.0438 20.7844 25.9875 20.4094C25.9219 20.0344 25.4813 19.8657 25.4813 19.8657L25.3032 19.7907L25.2375 20.1657L25.3875 20.1844Z" fill="#A8AC71"/>
+<path d="M26.6907 17.5875C26.85 17.55 26.7563 17.1375 26.7563 17.1375L26.6438 17.2312C26.6438 17.2312 26.7188 17.325 26.7188 17.4187C26.7188 17.5125 26.6907 17.5875 26.6907 17.5875Z" fill="#F1A720"/>
+<path d="M26.9813 21.7031L26.8969 21.6375C26.8407 21.6 26.5969 21.3938 26.6344 20.8031C26.6813 20.1281 27.6657 19.7719 27.7219 19.5094C27.7969 19.2094 28.0125 19.0875 27.2344 18.4781L27.0469 18.6844L27.375 18.9281C27.375 18.9281 27.4407 18.8906 27.45 18.9844C27.45 19.0781 27.3563 19.1438 27.3375 19.2188C27.3188 19.2844 26.8313 19.6219 26.7938 19.65L26.5125 19.875C26.5125 19.875 26.3907 19.9969 26.2782 20.2594C26.1563 20.5219 26.2125 20.8594 26.2125 20.8594C26.2125 20.8594 26.2125 21.5719 26.9813 21.7031Z" fill="#A8AC71"/>
+<path d="M26.5031 22.0781L26.5594 22.3312L26.4 22.3875H26.3344L26.2875 22.4062L26.1656 22.5187H26.1375C26.1375 22.5187 26.1188 22.5187 26.1094 22.4437C26.1094 22.3687 26.0906 22.3031 26.0906 22.3031L26.2406 22.3687H26.2969L26.325 22.3593L26.3906 22.2187L26.5031 22.0781ZM26.0531 22.125L25.9781 22.0312L25.8844 21.9468L25.9969 21.8906H26.1094L26.0906 22.0312L26.0531 22.125ZM26.3063 21.7218C26.3063 21.7218 26.3813 21.75 26.4 21.8156L26.4563 21.9281L26.2688 21.9093L26.1375 21.8718L26.2313 21.7406L26.3063 21.7218ZM26.2406 22.8375C26.2406 22.8375 26.2031 22.8093 26.175 22.7531L26.1375 22.6031L26.2594 22.575L26.4 22.6406H26.4375L26.4094 22.7156L26.2688 22.8375H26.2406ZM26.7094 22.4531C26.7094 22.4531 26.6156 22.4156 26.5969 22.3593C26.5781 22.3125 26.5594 22.3218 26.5594 22.3218L26.5313 22.4625L26.4844 22.6031L26.5031 22.6218L26.6063 22.5937L26.6906 22.5093L26.7188 22.4531H26.7094ZM26.2688 22.9031L26.4 22.9687C26.475 23.0156 26.5125 23.0156 26.5125 23.0156L26.5688 22.9593L26.6344 22.8375V22.8281L26.3531 22.8562L26.2688 22.9031ZM26.6813 22.7906L26.9344 22.6406L26.9438 22.5093L26.8969 22.4718H26.7563L26.7094 22.6406L26.6813 22.7906ZM26.5125 23.025C26.5125 23.025 26.6813 23.1 26.9813 22.9875C27.1125 22.9406 27.1406 22.875 27.1406 22.875L27.0188 22.8281L26.9063 22.9218L26.5125 23.0156V23.025ZM26.2781 21.1218L26.2406 20.9906C26.2219 20.9156 26.2313 20.8875 26.2313 20.8875L26.3156 20.9343L26.4375 21.0281L26.3438 21.0937L26.2781 21.1218ZM26.4844 21.4687L26.4 21.375C26.3793 21.3385 26.3605 21.3009 26.3438 21.2625L26.4375 21.2812L26.5406 21.3375L26.4938 21.4687H26.4844Z" fill="#78732E"/>
+<path d="M25.9313 17.5312C25.9125 17.5968 25.8938 17.7093 25.9781 17.7187C26.0156 17.7375 26.1938 17.7187 26.4 17.4937C26.4938 17.3812 26.4938 17.2687 26.4938 17.2687L26.5406 17.1468C26.5406 17.1468 26.4563 17.0906 26.3344 17.1656C26.2125 17.2406 25.9313 17.5406 25.9313 17.5406V17.5312Z" fill="#C6C7A6"/>
+<path d="M26.4844 17.25C26.5051 17.25 26.5219 17.2333 26.5219 17.2125C26.5219 17.1918 26.5051 17.175 26.4844 17.175C26.4637 17.175 26.4469 17.1918 26.4469 17.2125C26.4469 17.2333 26.4637 17.25 26.4844 17.25Z" fill="#1C242F"/>
+<path d="M26.2219 17.25C26.1652 17.2995 26.112 17.3527 26.0625 17.4094C26.0625 17.4094 26.1938 17.3719 26.3063 17.2688C26.3625 17.2125 26.4938 17.1938 26.55 17.2031C26.5875 17.2125 26.5688 17.1656 26.55 17.1563C26.5219 17.1281 26.4188 17.1188 26.4 17.1281L26.2219 17.25Z" fill="#A8AC71"/>
+<path d="M26.6344 21.0469V20.8406L26.55 20.9156L26.475 21.0188L26.5969 21.0656L26.6344 21.0469ZM26.2125 20.8031V20.5875C26.2125 20.4938 26.2594 20.2969 26.2594 20.2969L26.3156 20.4281L26.4563 20.6531L26.5031 20.6906L26.3813 20.7844L26.25 20.8219L26.2125 20.8031ZM26.6344 20.7469L26.6625 20.6531C26.6719 20.5969 26.7094 20.5219 26.7094 20.5219V20.5313C26.6442 20.5811 26.5816 20.6343 26.5219 20.6906L26.5969 20.7563H26.6438M26.2969 20.1938C26.2969 20.1938 26.3156 20.1375 26.3906 20.0531L26.5125 19.8844L26.5688 20.1094L26.6063 20.2969V20.3344L26.5406 20.3531C26.5219 20.3531 26.3906 20.3531 26.3719 20.325L26.2969 20.2031V20.1938ZM27.0844 21.0188L27.1594 20.9344L27.2531 20.8406L26.9531 20.8969L27 20.9906L27.075 21.0188H27.0844ZM26.8969 20.3906C26.8969 20.3906 26.925 20.3906 27.0094 20.2969C27.0844 20.2219 27.1313 20.2313 27.1313 20.2313L27.1594 20.55L27.0094 20.5031L26.8969 20.3906Z" fill="#78732E"/>
+<path d="M26.9344 20.2687L27.1219 20.0812L26.8125 19.9875L26.8687 20.2031L26.9344 20.2687ZM27.0656 19.7812L27.0844 19.4719C27.0844 19.4719 27.0187 19.5 26.9437 19.5656L26.8312 19.65L26.8687 19.7062L26.9625 19.7719H27.0562L27.0656 19.7812ZM27.3281 19.4813V19.2188C27.3281 19.2188 27.2812 19.2937 27.2344 19.3312L27.15 19.4062L27.2344 19.4625H27.3281V19.4813ZM27.4406 19.8094L27.5906 19.6875C27.6464 19.643 27.694 19.5891 27.7312 19.5281L27.3375 19.5L27.3562 19.6594L27.45 19.8094H27.4406ZM26.5406 18.5156L26.5219 18.6844H26.85L26.7656 18.5719L26.6719 18.5156L26.5781 18.4219L26.5406 18.5156ZM27.1594 20.0344C27.1781 20.0344 27.2625 19.9594 27.3094 19.9219C27.3469 19.875 27.4219 19.8281 27.4219 19.8281L27.1125 19.8V20.0062L27.1594 20.0344ZM27.75 19.4813C27.75 19.4813 27.7875 19.3594 27.7781 19.2375C27.7781 19.125 27.7594 19.0687 27.7594 19.0687L27.525 19.2281L27.5625 19.3406L27.6562 19.4344L27.75 19.4813Z" fill="#78732E"/>
+<path d="M27.3562 19.2C27.3562 19.2 27.4218 19.1062 27.4312 19.0687V19.0312H27.6187L27.7218 19.05H27.7406L27.6562 19.1531L27.5437 19.2187L27.4031 19.2375L27.3562 19.2ZM27.7312 19.0125L27.6093 18.825C27.5718 18.7593 27.5343 18.7312 27.5343 18.7312L27.4406 18.9843V19.0125H27.7218H27.7312Z" fill="#78732E"/>
+<path d="M25.4625 20.8312L25.4344 20.9062C25.4344 20.9062 25.5562 20.8406 25.65 20.8406C25.7437 20.8406 25.8469 20.9625 25.8469 20.9625L25.8656 20.8781C25.8656 20.8781 25.7437 20.7562 25.6594 20.7562C25.5844 20.7468 25.4719 20.8312 25.4719 20.8312H25.4625ZM25.5281 20.2875L25.5562 20.325C25.5562 20.3343 25.5656 20.2312 25.6875 20.1843C25.8187 20.1281 25.875 20.175 25.875 20.175C25.875 20.175 25.8562 20.1 25.8 20.0812C25.7437 20.0718 25.6969 20.0812 25.6312 20.1281C25.5827 20.1706 25.547 20.2258 25.5281 20.2875ZM25.9406 20.7C25.9406 20.7 25.8844 20.5687 25.7906 20.55C25.6875 20.5218 25.5562 20.5968 25.5562 20.5968L25.5375 20.6625C25.5375 20.6625 25.6781 20.5875 25.7719 20.625C25.875 20.6718 25.9125 20.7843 25.9125 20.7843L25.9406 20.6906V20.7ZM25.4719 20.2218L25.5094 20.2687C25.5094 20.2687 25.4906 20.1375 25.5562 20.0718C25.5856 20.0355 25.6204 20.0039 25.6594 19.9781L25.6031 19.95C25.6031 19.95 25.5187 19.9968 25.4906 20.0531C25.4682 20.1063 25.4617 20.1649 25.4719 20.2218ZM25.425 20.0062C25.4531 19.9312 25.5375 19.9125 25.5375 19.9125L25.5094 19.8843H25.4625C25.4625 19.8843 25.4156 19.9125 25.3781 19.9781C25.35 20.0625 25.35 20.1656 25.35 20.1656L25.4062 20.1937C25.4062 20.1937 25.3969 20.0625 25.425 20.0062ZM26.1562 18.2062C26.2406 18.1687 26.2969 18.1781 26.2969 18.1781C26.2969 18.1781 26.175 18.3 26.2312 18.45C26.1656 18.5718 26.1469 18.6656 26.1469 18.6656H26.2125L26.25 18.4968C26.325 18.6187 26.4375 18.6843 26.4375 18.6843H26.5312C26.5312 18.6843 26.5312 18.5625 26.5687 18.4593H26.5781C26.6277 18.5213 26.6922 18.5697 26.7656 18.6V18.5625C26.7656 18.5625 26.6625 18.5062 26.6062 18.4218L26.5969 18.4125C26.6358 18.3436 26.6946 18.288 26.7656 18.2531L26.8312 18.3093L26.85 18.2906L26.8031 18.225H26.7469L26.5781 18.3843C26.5488 18.3399 26.5237 18.2928 26.5031 18.2437L26.4656 18.225C26.4656 18.225 26.3625 18.2343 26.2781 18.3843C26.2594 18.2718 26.3812 18.1593 26.3812 18.1593V18.1125L26.1562 18.1687C26.0625 18.1968 25.9969 18.2812 25.9969 18.2812V18.3562C25.9969 18.3562 26.0906 18.2531 26.1562 18.2062ZM26.2969 18.4125C26.3531 18.3187 26.4844 18.2718 26.4844 18.2718C26.4844 18.2718 26.4844 18.3375 26.55 18.4312C26.5031 18.5156 26.475 18.6375 26.475 18.6375C26.475 18.6375 26.3812 18.5812 26.2969 18.45C26.2896 18.4413 26.2833 18.4319 26.2781 18.4218L26.2969 18.4125ZM25.5844 20.3906V20.4656C25.5844 20.4656 25.6594 20.3812 25.7719 20.3718C25.8844 20.3718 25.9875 20.4656 25.9875 20.4656C25.9875 20.4656 25.9875 20.3718 25.9687 20.3531C25.9594 20.3531 25.8656 20.2968 25.7812 20.2968C25.6969 20.2968 25.5844 20.3906 25.5844 20.3906ZM27.5906 19.3406L27.5437 19.2468L27.6 19.2187C27.6577 19.1738 27.711 19.1236 27.7594 19.0687L27.7219 19.0125H27.5719L27.4406 19.0031L27.4875 18.8437L27.5437 18.7125L27.4875 18.6656C27.4875 18.6656 27.5062 18.7125 27.4125 18.7218C27.3187 18.7312 27.15 18.6468 27.15 18.6468V18.6843L27.3844 18.75C27.4406 18.75 27.4781 18.7406 27.4969 18.7218L27.45 18.8437L27.4219 18.9375L27.4406 18.9562V19.0312L27.5719 19.0406L27.7219 19.05C27.7219 19.05 27.6469 19.1437 27.5625 19.1906C27.5531 19.1912 27.5437 19.1912 27.5344 19.1906L27.4406 19.05L27.4312 19.0968L27.4969 19.2093C27.4498 19.2133 27.4024 19.2101 27.3562 19.2L27.3187 19.2375V19.4718L27.15 19.4156L27.1219 19.4437V19.4343L27.0844 19.4718C27.0844 19.4718 27.0469 19.6031 27.0562 19.7625V19.7718C26.9712 19.7533 26.8932 19.7111 26.8312 19.65L26.7937 19.6781C26.7937 19.6781 26.7656 19.8093 26.7937 19.9781C26.6718 19.95 26.5594 19.8375 26.5594 19.8375L26.5125 19.8843C26.5285 20.032 26.5504 20.179 26.5781 20.325C26.5563 20.3265 26.5343 20.3265 26.5125 20.325C26.3812 20.325 26.2969 20.2031 26.2969 20.2031L26.2594 20.2968C26.2594 20.2968 26.3156 20.55 26.4469 20.6718L26.4844 20.6906C26.3625 20.7843 26.2219 20.8031 26.2219 20.8031V20.8875C26.2892 20.9364 26.358 20.9833 26.4281 21.0281C26.3848 21.0689 26.3338 21.1008 26.2781 21.1218L26.2969 21.1687L26.4656 21.0468L26.6344 21.0937V21.0468L26.4937 21.0187L26.5031 21.0093C26.55 20.9718 26.6344 20.8406 26.6344 20.8406V20.7468C26.6344 20.7468 26.5875 20.7468 26.5312 20.6906C26.7 20.5781 26.7094 20.5218 26.7094 20.5218L26.7469 20.4656C26.7469 20.4656 26.6812 20.4375 26.6437 20.3531L26.9156 20.2875L26.9344 20.2687C26.9344 20.2687 26.8687 20.1562 26.8406 20.025L27.1219 20.0812L27.1594 20.0437L27.1125 19.8187C27.2812 19.8187 27.4125 19.8375 27.4125 19.8375L27.4406 19.8093C27.4406 19.8093 27.3469 19.6312 27.3469 19.5281C27.378 19.5313 27.4094 19.5313 27.4406 19.5281H27.7219L27.75 19.4812C27.75 19.4812 27.6187 19.3875 27.5906 19.3406ZM26.6062 20.7937C26.6062 20.7937 26.5594 20.8875 26.475 20.9812L26.4562 21C26.4402 20.9946 26.4246 20.9884 26.4094 20.9812C26.3062 20.925 26.2781 20.8593 26.2781 20.8593L26.5125 20.7093L26.6062 20.7937ZM26.6906 20.4937L26.5031 20.6812C26.4894 20.6666 26.4769 20.6509 26.4656 20.6343C26.3906 20.5218 26.2781 20.4375 26.2969 20.2781C26.2969 20.2781 26.3625 20.3906 26.5031 20.3718C26.5345 20.3698 26.5657 20.3667 26.5969 20.3625C26.6344 20.4562 26.6906 20.4937 26.6906 20.4937ZM26.8781 20.2593L26.625 20.325C26.6211 20.3095 26.618 20.2938 26.6156 20.2781C26.5687 20.1281 26.5687 19.9031 26.5687 19.9031C26.5687 19.9031 26.6625 19.9781 26.8125 20.0156L26.8781 20.2593ZM26.8312 19.9781C26.8125 19.8468 26.8406 19.7062 26.8406 19.7062C26.8406 19.7062 26.9156 19.7812 27.0562 19.8C27.0656 19.9406 27.0844 19.9968 27.0844 19.9968L26.8312 19.9875V19.9781ZM27.375 19.7718C27.375 19.7718 27.2812 19.8093 27.1125 19.7812C27.1122 19.7656 27.1122 19.7499 27.1125 19.7343C27.1064 19.6407 27.1064 19.5467 27.1125 19.4531L27.3281 19.5187C27.332 19.6048 27.3478 19.69 27.375 19.7718ZM27.375 19.4812H27.3562V19.2187C27.3562 19.2187 27.45 19.2468 27.5156 19.2375C27.5344 19.275 27.5156 19.2843 27.5625 19.35C27.6 19.4156 27.6656 19.4718 27.6656 19.4718C27.6656 19.4718 27.45 19.4906 27.3656 19.4718L27.375 19.4812ZM26.6625 21.225L26.6531 21.1781C26.6531 21.1781 26.5594 21.2437 26.5406 21.3093C26.5309 21.3071 26.5215 21.304 26.5125 21.3L26.325 21.225L26.3437 21.2625L26.5125 21.3375H26.5312L26.4844 21.4687L26.5031 21.4968L26.55 21.3375L26.6625 21.3468L26.6437 21.4218L26.6062 21.5625L26.6531 21.5906H26.8406L26.8125 21.5531L26.7469 21.5437H26.6437L26.6719 21.4312L26.7 21.3562L26.6719 21.2906L26.5781 21.3093C26.5999 21.2755 26.6286 21.2467 26.6625 21.225ZM25.6031 21.1031C25.725 21.1031 25.8187 21.1875 25.8187 21.1875V21.1312C25.8187 21.1312 25.725 21 25.6219 21C25.5094 21 25.3875 21.1125 25.3875 21.1125V21.225C25.3875 21.225 25.4812 21.1031 25.6031 21.1031ZM26.85 22.9218C26.7281 22.9781 26.5969 22.9781 26.5969 22.9781L26.6719 22.8375C26.9062 22.7625 26.9531 22.6125 26.9531 22.6125L26.9344 22.5468C26.9344 22.5468 26.8781 22.6968 26.6906 22.7718C26.7281 22.6593 26.7562 22.4718 26.7562 22.4718L26.6906 22.4531C26.6906 22.4531 26.5969 22.575 26.5031 22.6031C26.5434 22.524 26.5689 22.4382 26.5781 22.35L26.55 22.3031C26.55 22.3031 26.4844 22.3593 26.3906 22.3781C26.372 22.3812 26.353 22.3812 26.3344 22.3781C26.3906 22.3031 26.4937 22.0781 26.4937 22.0781L26.475 22.0312C26.475 22.0312 26.4 22.2281 26.3156 22.3312C26.3065 22.3439 26.2971 22.3564 26.2875 22.3687C26.1937 22.3406 26.0812 22.275 26.0812 22.275L26.0906 22.3031C26.0906 22.3031 26.1656 22.3593 26.2594 22.3968C26.22 22.4356 26.1793 22.4732 26.1375 22.5093V22.6031L26.4187 22.6406C26.325 22.7906 26.2312 22.8375 26.2312 22.8375L26.2781 22.9031C26.2781 22.9031 26.4 22.9031 26.625 22.8468C26.5687 22.9593 26.5125 23.0156 26.5125 23.0156C26.5125 23.0156 26.7187 23.0343 26.8594 22.9593C27 22.8843 27.0469 22.8093 27.0469 22.8093L27.0094 22.7718C27.0094 22.7718 26.9719 22.8656 26.85 22.9218ZM26.2031 22.5468L26.3156 22.4062C26.4656 22.4343 26.5031 22.3968 26.5031 22.3968C26.5031 22.3968 26.5312 22.4718 26.4469 22.6125C26.3437 22.6125 26.2031 22.5375 26.2031 22.5375V22.5468ZM26.3344 22.8281L26.4562 22.6781L26.4844 22.65C26.625 22.65 26.7 22.5281 26.7 22.5281C26.7 22.5281 26.7187 22.6406 26.6531 22.7812C26.475 22.8468 26.3344 22.8281 26.3344 22.8281ZM26.1562 21.9093C26.2969 21.9093 26.4656 21.975 26.4656 21.975L26.4469 21.9093L26.175 21.8531C26.2076 21.7883 26.2602 21.7357 26.325 21.7031L26.2781 21.675C26.2781 21.675 26.2219 21.6843 26.1469 21.8156C26.1399 21.8277 26.1337 21.8402 26.1281 21.8531C26.1187 21.8527 26.1093 21.8527 26.1 21.8531C26.0206 21.8555 25.9432 21.8781 25.875 21.9187L25.8937 21.9562C25.8937 21.9562 25.9969 21.9093 26.1094 21.9093C26.0838 21.9832 26.0619 22.0583 26.0437 22.1343L26.0719 22.1906L26.1656 21.9093H26.1562ZM25.875 21.3281L25.8469 21.2625C25.8469 21.2625 25.7062 21.2062 25.5937 21.2625C25.4906 21.3093 25.4062 21.4406 25.4062 21.4406L25.4531 21.525C25.4531 21.525 25.5281 21.3843 25.6312 21.3468C25.725 21.3187 25.875 21.3281 25.875 21.3281ZM26.1562 21.5531L26.0625 21.4968C26.0625 21.4968 25.9031 21.5437 25.8562 21.6C25.8 21.6562 25.7531 21.7968 25.7625 21.8343C25.7812 21.8812 25.8281 21.9 25.8281 21.9C25.8281 21.9 25.8562 21.7593 25.9312 21.6843C26.0062 21.6093 26.1562 21.5531 26.1562 21.5531ZM25.7906 21.5062C25.8442 21.4597 25.9087 21.4274 25.9781 21.4125L25.9125 21.3656C25.9125 21.3656 25.7719 21.3843 25.7062 21.45C25.6312 21.5156 25.5375 21.6468 25.5375 21.6468L25.6219 21.7312C25.6219 21.7312 25.7344 21.5625 25.7906 21.5062ZM26.2781 17.3156V17.3062C26.3531 17.2125 26.4281 17.2125 26.4562 17.2125H26.5125C26.4765 17.2866 26.4513 17.3655 26.4375 17.4468C26.4187 17.5406 26.3719 17.5593 26.3437 17.625C26.3062 17.6906 26.2406 17.7937 26.2312 17.8875C26.2312 17.9812 26.2594 18.0375 26.2781 18.0468C26.3062 18.0562 26.3531 18.0093 26.3437 17.9812C26.3437 17.9531 26.3156 17.9812 26.3062 17.9812C26.2875 17.9812 26.2875 17.9531 26.2781 17.8968C26.2687 17.8406 26.3437 17.6906 26.3719 17.6343C26.4 17.5875 26.4656 17.5312 26.4656 17.4468L26.5312 17.2125C26.5312 17.2031 26.4937 17.1937 26.4094 17.1843C26.3531 17.1843 26.2687 17.2312 26.2312 17.2968C26.1937 17.3531 26.0719 17.4 26.0719 17.4C26.0719 17.4 26.2031 17.4 26.2781 17.3062V17.3156Z" fill="white"/>
+<path d="M26.7375 18.2344H26.5031L26.5687 18.4219L26.7375 18.2344ZM26.4562 18.225L26.4093 18.1875C26.4013 18.1769 26.3919 18.1674 26.3812 18.1594L26.2968 18.2063L26.25 18.3844L26.2781 18.4125L26.4656 18.225H26.4562ZM26.4281 18.6938L26.2593 18.4407L26.1656 18.6469L26.2125 18.6657L26.325 18.6844H26.4281V18.6938ZM27.1218 22.8844C26.9882 22.9731 26.8321 23.0219 26.6718 23.025C26.5591 23.023 26.449 22.9906 26.3531 22.9313C26.2918 22.8928 26.243 22.8375 26.2125 22.7719C26.1562 22.6688 26.1375 22.5375 26.1187 22.3969C26.0906 22.275 26.0718 22.1532 26.0156 22.0594C25.9406 21.9375 25.7906 21.8625 25.6593 21.75C25.584 21.6916 25.5218 21.618 25.4766 21.534C25.4314 21.4501 25.4042 21.3576 25.3968 21.2625C25.3956 21.2376 25.3956 21.2125 25.3968 21.1875C25.3968 21.0282 25.4437 20.8875 25.4906 20.7657C25.5375 20.6438 25.6031 20.5313 25.6031 20.4375V20.3907C25.575 20.325 25.5093 20.2594 25.4625 20.2125C25.4156 20.1657 25.35 20.1375 25.35 20.1375L25.2562 20.1188L25.2468 20.1469L25.3406 20.1657V20.1563V20.1657L25.4625 20.2594C25.5093 20.2969 25.5562 20.3532 25.5656 20.4C25.5669 20.4125 25.5669 20.4251 25.5656 20.4375C25.5656 20.5313 25.5187 20.625 25.4718 20.7469C25.404 20.8843 25.3656 21.0344 25.3593 21.1875V21.2625C25.3675 21.3634 25.3967 21.4614 25.4451 21.5503C25.4936 21.6391 25.5602 21.7167 25.6406 21.7782C25.7812 21.8813 25.9218 21.9657 25.9875 22.0782C26.0625 22.1907 26.0812 22.3594 26.1093 22.5469C26.1281 22.6219 26.1468 22.7063 26.1843 22.7813C26.2218 22.8563 26.2687 22.9219 26.3343 22.9688C26.439 23.0317 26.5591 23.0642 26.6812 23.0625C26.9343 23.0625 27.1406 22.9125 27.1406 22.9125L27.1218 22.8844Z" fill="#78732E"/>
+<path d="M26.925 22.425C26.8885 22.4481 26.8464 22.4611 26.8032 22.4625C26.7563 22.4625 26.7 22.4438 26.6438 22.3875C26.5834 22.3301 26.5438 22.2543 26.5313 22.1719C26.5125 22.0875 26.5032 21.9844 26.4375 21.8625C26.3907 21.7219 26.25 21.6188 26.1094 21.5156C25.9875 21.4125 25.8657 21.3094 25.8375 21.1969C25.8352 21.1751 25.8352 21.1531 25.8375 21.1313C25.8375 21.0375 25.875 20.9438 25.9125 20.8406C25.9747 20.6991 26.0035 20.5451 25.9969 20.3906C25.9782 20.2031 25.8375 20.0625 25.6969 19.9688C25.6146 19.9154 25.5265 19.8714 25.4344 19.8375L25.425 19.8656H25.4438C25.4907 19.8938 25.6125 19.95 25.725 20.0344C25.8469 20.1281 25.95 20.2406 25.9688 20.3906V20.4656C25.9688 20.6063 25.9313 20.7188 25.8844 20.8313C25.8375 20.9438 25.8 21.0375 25.8 21.1313L25.8094 21.2063C25.8375 21.3281 25.9594 21.4313 26.0907 21.5438C26.2313 21.6375 26.3719 21.75 26.4188 21.8719C26.475 21.9938 26.4844 22.0969 26.5032 22.1719C26.5219 22.2656 26.5407 22.3313 26.6157 22.4063C26.6813 22.4719 26.7469 22.4906 26.8032 22.4906C26.8495 22.4899 26.8947 22.477 26.9344 22.4531L26.925 22.425Z" fill="#78732E"/>
+<path d="M27.7875 21.7125C27.7875 21.7125 27.9468 21.75 27.9375 21.8813C27.9266 21.9904 27.9014 22.0975 27.8625 22.2L27.6375 21.9938L27.7593 21.8813L27.8062 21.8156L27.7875 21.7125Z" fill="#A8AC71"/>
+<path d="M24.975 20.1094C24.975 20.1094 24.8156 20.1657 24.7781 20.1C24.7406 20.025 24.7594 19.9688 24.7594 19.9594C24.7594 19.9407 24.6656 19.9313 24.6656 19.8375C24.675 19.7438 24.7969 19.7532 24.8156 19.7532C24.8438 19.7532 24.8531 19.6125 24.9375 19.6219C25.0125 19.6219 25.05 19.7157 25.05 19.7157L24.975 20.1094Z" fill="#F8C83C"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M24.8364 19.756C24.8324 19.761 24.8256 19.7672 24.8157 19.7672C24.8143 19.7672 24.8124 19.7672 24.8102 19.7672C24.7963 19.7668 24.7683 19.7662 24.7409 19.7738C24.7253 19.7781 24.7109 19.7848 24.7001 19.7951C24.6897 19.8049 24.6819 19.8185 24.6797 19.8383C24.68 19.8787 24.6998 19.9005 24.7206 19.9151C24.7289 19.9209 24.7369 19.9253 24.7444 19.9294C24.7469 19.9307 24.7493 19.9321 24.7517 19.9334C24.7561 19.9359 24.7609 19.9388 24.7646 19.9421C24.7681 19.9451 24.7735 19.9508 24.7735 19.9594C24.7735 19.962 24.773 19.9651 24.7726 19.9673L24.7726 19.9675C24.7725 19.9681 24.7723 19.9687 24.7722 19.9693C24.7718 19.9716 24.7714 19.974 24.771 19.9769C24.7699 19.9842 24.7688 19.9937 24.7688 20.0051C24.7688 20.0278 24.7731 20.0583 24.7906 20.0934C24.7972 20.1047 24.8096 20.1119 24.8275 20.1154C24.8455 20.1189 24.8673 20.1183 24.8888 20.1154C24.9103 20.1126 24.9307 20.1078 24.9458 20.1036C24.9528 20.1017 24.9586 20.1 24.9628 20.0987L25.0354 19.7173C25.0344 19.715 25.0327 19.7117 25.0306 19.7077C25.0262 19.6994 25.0196 19.6885 25.0109 19.6776C24.9933 19.6555 24.9687 19.636 24.9375 19.636H24.9368L24.936 19.6359C24.9194 19.6341 24.9069 19.6394 24.8963 19.6489C24.8851 19.659 24.8761 19.6737 24.8682 19.6902C24.8642 19.6983 24.8607 19.7066 24.8573 19.7146C24.8569 19.7156 24.8565 19.7165 24.8562 19.7174C24.8532 19.7244 24.8503 19.7313 24.8474 19.7374C24.8443 19.7441 24.8407 19.7508 24.8364 19.756ZM25.05 19.7157L25.0631 19.7105L25.0646 19.7143L24.9889 20.1121L24.975 20.1094L24.9797 20.1227L24.9796 20.1228L24.9792 20.1229L24.9777 20.1234C24.9765 20.1238 24.9747 20.1244 24.9724 20.1251C24.9678 20.1266 24.9612 20.1286 24.9533 20.1308C24.9374 20.1351 24.9156 20.1403 24.8925 20.1433C24.8696 20.1463 24.8444 20.1474 24.8221 20.143C24.7997 20.1386 24.7781 20.1284 24.766 20.107L24.7656 20.1064C24.7457 20.0667 24.7407 20.0316 24.7407 20.0051C24.7407 19.9919 24.7419 19.9809 24.7432 19.9727C24.7437 19.9695 24.7442 19.9667 24.7445 19.9644C24.7446 19.9638 24.7447 19.9632 24.7448 19.9627C24.7449 19.9626 24.7449 19.9624 24.7449 19.9623C24.7434 19.9612 24.7411 19.9598 24.7378 19.9579C24.736 19.9569 24.734 19.9558 24.7318 19.9546C24.7241 19.9503 24.7141 19.9449 24.7045 19.9381C24.6786 19.92 24.6516 19.8904 24.6516 19.8376V19.8369L24.6517 19.8362C24.6544 19.8094 24.6653 19.7893 24.6808 19.7746C24.696 19.7602 24.7151 19.7517 24.7334 19.7467C24.7653 19.7379 24.7982 19.7387 24.8114 19.739C24.8123 19.7391 24.8132 19.7391 24.8139 19.7391C24.8141 19.7389 24.8143 19.7386 24.8146 19.7383C24.8166 19.7358 24.819 19.7317 24.822 19.7254C24.8246 19.7199 24.8272 19.7136 24.8302 19.7065C24.8306 19.7056 24.831 19.7046 24.8314 19.7037C24.8348 19.6956 24.8386 19.6868 24.8429 19.6779C24.8513 19.6604 24.8622 19.6418 24.8775 19.628C24.893 19.614 24.9131 19.6053 24.9383 19.6079C24.9817 19.6082 25.0132 19.6354 25.0329 19.66C25.043 19.6726 25.0505 19.6851 25.0554 19.6944C25.0579 19.6991 25.0598 19.703 25.0611 19.7058C25.0617 19.7072 25.0622 19.7083 25.0625 19.7091L25.0629 19.71L25.063 19.7103L25.0631 19.7105C25.0631 19.7105 25.0631 19.7105 25.05 19.7157ZM24.8132 19.7397C24.8132 19.7397 24.8133 19.7397 24.8133 19.7397L24.8132 19.7397Z" fill="#977C2E"/>
+<path d="M25.1532 20.1562C25.1532 20.1562 25.0125 20.2312 24.9657 20.1562C24.9282 20.0906 24.9657 20.0062 24.9563 19.9875C24.9375 19.9781 24.8625 19.95 24.8719 19.8656C24.8907 19.7812 24.975 19.8094 25.0032 19.7906C25.0313 19.7812 25.0594 19.6594 25.1438 19.6781C25.2282 19.7062 25.2375 19.7719 25.2375 19.7719L25.1438 20.1562H25.1532Z" fill="#F8C83C"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M25.0095 19.8033C24.9994 19.8094 24.9861 19.8112 24.975 19.8124C24.9719 19.8127 24.9689 19.813 24.966 19.8133C24.9562 19.8143 24.9466 19.8152 24.937 19.8173C24.9248 19.8199 24.9142 19.8242 24.9056 19.8316C24.8973 19.8388 24.89 19.8498 24.8858 19.868C24.8788 19.935 24.9323 19.9605 24.9572 19.9723C24.9592 19.9733 24.961 19.9742 24.9626 19.975L24.9668 19.9771L24.9689 19.9812C24.9716 19.9867 24.972 19.9929 24.9719 19.9977C24.9719 20.0028 24.9712 20.0086 24.9704 20.0145C24.9698 20.019 24.969 20.0236 24.9683 20.0283C24.967 20.0368 24.9655 20.0458 24.9644 20.0559C24.961 20.0866 24.9614 20.1203 24.9778 20.1491C24.9869 20.1636 25.0005 20.1711 25.0172 20.1741C25.0344 20.1771 25.0543 20.1752 25.0739 20.1707C25.0933 20.1663 25.1116 20.1595 25.125 20.1539C25.127 20.1531 25.1288 20.1523 25.1305 20.1515L25.2232 19.7716C25.2228 19.7702 25.2223 19.7682 25.2214 19.7657C25.2196 19.76 25.2162 19.752 25.2105 19.7432C25.1993 19.7259 25.1786 19.7047 25.1401 19.6917C25.1071 19.6847 25.0841 19.7039 25.0638 19.7321C25.0568 19.7418 25.0508 19.7517 25.045 19.7612C25.0423 19.7656 25.0397 19.7698 25.037 19.774C25.033 19.7804 25.0288 19.7866 25.0245 19.7916C25.0207 19.7959 25.0158 19.8007 25.0095 19.8033ZM25.2376 19.7719C25.2515 19.7699 25.2515 19.7699 25.2515 19.7699L25.2515 19.7697L25.2514 19.7695L25.2513 19.7686C25.2511 19.768 25.251 19.767 25.2507 19.7659C25.2502 19.7637 25.2494 19.7605 25.2481 19.7568C25.2456 19.7492 25.2413 19.739 25.2341 19.7279C25.2196 19.7055 25.1937 19.68 25.1483 19.6648L25.1476 19.6646L25.1469 19.6644C25.0959 19.6531 25.0628 19.6854 25.041 19.7156C25.0333 19.7263 25.0263 19.7377 25.0203 19.7476C25.0178 19.7517 25.0154 19.7556 25.0133 19.7589C25.0094 19.7651 25.0061 19.7698 25.0032 19.7732C25.0004 19.7764 24.999 19.7772 24.9988 19.7773C24.9987 19.7773 24.9987 19.7773 24.9988 19.7773L24.997 19.7779L24.9954 19.779C24.9917 19.7814 24.9846 19.7831 24.9719 19.7844C24.9695 19.7847 24.9669 19.785 24.9642 19.7852C24.9542 19.7862 24.9424 19.7873 24.9311 19.7898C24.9163 19.793 24.9006 19.7987 24.8872 19.8104C24.8736 19.8221 24.8634 19.839 24.8582 19.8626L24.858 19.8633L24.858 19.8641C24.8483 19.9509 24.9186 19.9855 24.9438 19.9972C24.9438 19.9972 24.9438 19.9973 24.9438 19.9973C24.9438 20.0006 24.9433 20.005 24.9425 20.0106C24.942 20.0142 24.9414 20.0183 24.9407 20.0228C24.9393 20.0318 24.9377 20.0422 24.9365 20.0528C24.9329 20.0852 24.9325 20.1265 24.9535 20.1633L24.9538 20.1637C24.968 20.1866 24.9895 20.1977 25.0123 20.2018C25.0347 20.2057 25.0587 20.203 25.0801 20.1981C25.1017 20.1932 25.1216 20.1858 25.1359 20.1798C25.1432 20.1768 25.1491 20.174 25.1532 20.172C25.1552 20.171 25.1569 20.1702 25.158 20.1696L25.1593 20.169L25.1596 20.1688L25.1597 20.1687C25.1598 20.1687 25.1598 20.1687 25.1546 20.1589L25.1597 20.1687L25.1575 20.1595L25.2519 19.7726L25.2515 19.7699L25.2376 19.7719Z" fill="#977C2E"/>
+<path d="M25.3875 20.1843C25.3875 20.1843 25.3406 20.2781 25.2469 20.2593C25.1531 20.2406 25.1812 20.1 25.1625 20.0718C25.1531 20.0437 25.0781 20.025 25.0875 19.9406C25.1062 19.8468 25.1906 19.8562 25.2281 19.8468C25.2562 19.8375 25.2937 19.6968 25.3594 19.7156C25.425 19.7437 25.4812 19.8187 25.4719 19.8562C25.4719 19.8562 25.3312 19.9031 25.3125 19.9968C25.2937 20.0906 25.3875 20.1843 25.3875 20.1843Z" fill="#F8C83C"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M25.25 19.8467C25.2459 19.8518 25.2401 19.8577 25.2326 19.8602L25.2316 19.8606C25.2239 19.8625 25.2142 19.8637 25.2047 19.8649C25.2014 19.8653 25.1981 19.8658 25.1949 19.8662C25.1817 19.8681 25.1683 19.8705 25.1557 19.8753C25.1432 19.88 25.1319 19.8867 25.1226 19.8971C25.1134 19.9074 25.1057 19.9218 25.1014 19.9428C25.0975 19.9792 25.1114 20.0009 25.1279 20.0174C25.1342 20.0237 25.1404 20.0288 25.1467 20.0341C25.1494 20.0362 25.152 20.0384 25.1547 20.0407C25.1622 20.0471 25.1711 20.0553 25.1752 20.0657C25.1786 20.0714 25.1803 20.0783 25.1815 20.0847C25.1828 20.092 25.1837 20.1005 25.1844 20.1092C25.1847 20.1127 25.185 20.1162 25.1853 20.1199C25.1865 20.1349 25.1877 20.1509 25.1904 20.1668C25.1973 20.2067 25.212 20.2381 25.2496 20.2456C25.2908 20.2538 25.3217 20.2376 25.3429 20.2185C25.3536 20.2088 25.3617 20.1986 25.3671 20.1907C25.3682 20.1891 25.3692 20.1877 25.3701 20.1863C25.3679 20.1838 25.3652 20.1808 25.3623 20.1772C25.3535 20.1666 25.3419 20.1513 25.3309 20.133C25.3092 20.0968 25.2883 20.0462 25.2987 19.9941C25.3093 19.9413 25.3535 19.9034 25.3918 19.8795C25.4113 19.8673 25.4301 19.8582 25.444 19.8521C25.4499 19.8496 25.4549 19.8476 25.4588 19.8461C25.4586 19.8412 25.4573 19.835 25.4544 19.8275C25.45 19.8164 25.4426 19.8038 25.4327 19.7911C25.413 19.7659 25.3846 19.742 25.3547 19.7289C25.3444 19.7263 25.3346 19.7292 25.324 19.7378C25.3127 19.747 25.302 19.7614 25.2916 19.7781C25.2865 19.7863 25.2817 19.7948 25.277 19.8032C25.2762 19.8046 25.2754 19.806 25.2746 19.8074C25.2708 19.8142 25.267 19.8209 25.2633 19.827C25.259 19.8342 25.2546 19.8411 25.25 19.8467ZM25.4763 19.8696L25.476 19.8697L25.475 19.8701C25.474 19.8704 25.4726 19.8709 25.4708 19.8716C25.4671 19.873 25.4617 19.8751 25.4552 19.8779C25.4422 19.8836 25.4247 19.8921 25.4067 19.9033C25.3699 19.9263 25.3345 19.9587 25.3263 19.9996C25.318 20.0413 25.3346 20.0844 25.355 20.1185C25.3651 20.1354 25.3758 20.1494 25.384 20.1593C25.3881 20.1642 25.3915 20.1681 25.3939 20.1706C25.3951 20.1719 25.396 20.1729 25.3966 20.1736L25.3973 20.1743L25.3974 20.1744L25.4046 20.1816L25.4001 20.1907L25.3875 20.1844C25.4001 20.1907 25.4001 20.1907 25.4001 20.1907L25.4 20.1908L25.3999 20.1911L25.3993 20.1921C25.3989 20.1929 25.3983 20.194 25.3975 20.1954C25.3958 20.1982 25.3935 20.2021 25.3903 20.2067C25.384 20.2159 25.3745 20.2279 25.3618 20.2394C25.3362 20.2624 25.2967 20.2837 25.2441 20.2732C25.188 20.2619 25.1699 20.2136 25.1627 20.1715C25.1597 20.1542 25.1584 20.1366 25.1572 20.1215C25.1569 20.1181 25.1567 20.1147 25.1564 20.1116C25.1557 20.1029 25.1549 20.0956 25.1538 20.0898C25.1527 20.0836 25.1515 20.0807 25.1508 20.0797L25.1498 20.0781L25.1492 20.0763C25.1482 20.0735 25.1449 20.0693 25.1364 20.062C25.1344 20.0604 25.1322 20.0585 25.1298 20.0566C25.1232 20.0511 25.1153 20.0445 25.108 20.0373C25.0872 20.0164 25.0682 19.9866 25.0735 19.9391L25.0737 19.9379C25.0788 19.9123 25.0886 19.8929 25.1016 19.8784C25.1146 19.8638 25.1302 19.8548 25.1458 19.8489C25.1614 19.8431 25.1772 19.8403 25.191 19.8384C25.1952 19.8378 25.1991 19.8373 25.2028 19.8368C25.2111 19.8357 25.2179 19.8348 25.2237 19.8335C25.2241 19.8332 25.2256 19.8321 25.2283 19.8289C25.2314 19.825 25.235 19.8195 25.2392 19.8126C25.2426 19.8068 25.2462 19.8005 25.2501 19.7936C25.2508 19.7922 25.2517 19.7908 25.2525 19.7894C25.2572 19.781 25.2623 19.772 25.2677 19.7633C25.2785 19.746 25.2912 19.7282 25.3063 19.716C25.3218 19.7034 25.3411 19.6958 25.3632 19.7021L25.3641 19.7023L25.3649 19.7027C25.4003 19.7179 25.4326 19.7453 25.4548 19.7738C25.466 19.788 25.475 19.803 25.4806 19.8173C25.4861 19.8313 25.4889 19.8463 25.4855 19.8597L25.4837 19.8671L25.4763 19.8696Z" fill="#977C2E"/>
+<path d="M27.5343 21.675L27.3281 21.4312C27.2437 21.3093 27.1125 21.1781 27.1125 21.1781L26.9062 21.075L26.775 20.85L26.7562 20.5875L26.8125 20.4375L26.8875 20.325C26.8875 20.325 26.4562 20.4843 26.6812 21.3093C26.775 21.6656 27.0093 21.7125 27.0093 21.7125L27.4125 21.6843H27.5343V21.675Z" fill="#AF7029"/>
+<path d="M27.3375 18.9094C27.375 18.9094 27.3937 18.9281 27.4125 18.9469L27.4312 19.0031V19.0406C27.2812 19.3594 26.9812 19.5094 26.7 19.6969C26.5572 19.7966 26.436 19.9241 26.3437 20.0719C26.2316 20.2648 26.1794 20.4867 26.1937 20.7094C26.2031 21.1781 26.3812 21.4406 26.5875 21.5812C26.7333 21.6734 26.9024 21.7222 27.075 21.7219H27.1125L27.2437 21.7125C27.3372 21.7023 27.431 21.696 27.525 21.6937L27.6937 21.7031L27.7781 21.7406C27.7896 21.7536 27.7962 21.7702 27.7969 21.7875C27.7969 21.825 27.7687 21.8625 27.7406 21.9L27.6469 21.9656L27.6656 21.9937C27.7007 21.9739 27.7323 21.9486 27.7594 21.9187C27.7969 21.8812 27.825 21.8344 27.825 21.7875C27.825 21.7687 27.825 21.7406 27.7969 21.7219C27.7781 21.6937 27.7406 21.6844 27.6937 21.675L27.525 21.6656C27.3375 21.6656 27.1031 21.6937 27.1031 21.6937V21.7125V21.6937C27.0937 21.6939 27.0844 21.6939 27.075 21.6937C26.9086 21.692 26.7461 21.6433 26.6062 21.5531C26.4094 21.4219 26.2312 21.1781 26.2312 20.7094V20.6719C26.2312 20.4187 26.2781 20.2312 26.3719 20.0812C26.5031 19.8562 26.7187 19.725 26.9344 19.5844C27.1541 19.4596 27.3331 19.274 27.45 19.05V19.0031C27.45 18.9844 27.45 18.9469 27.4312 18.9281C27.4125 18.9 27.3844 18.8812 27.3375 18.8812V18.9094Z" fill="#816C2A"/>
+<path d="M27.9187 21.8156C27.9187 21.8156 27.825 22.0031 27.7875 22.0031C27.7687 22.0031 27.8812 22.0312 27.9094 22.0781L27.8812 22.125C27.8812 22.125 27.7687 22.0406 27.6937 22.0312V21.975L27.7969 21.9094C27.8375 21.8639 27.8665 21.8092 27.8812 21.75L27.9187 21.8156Z" fill="white"/>
+<path d="M28.3125 21.9375L28.0594 22.0125L27.9375 21.9187C27.9375 21.9187 27.9375 21.825 27.8906 21.7781L27.7406 21.6844C27.6844 21.6656 27.5062 21.6656 27.5062 21.6656L27.0375 21.1687L27.225 21.1875L27.4875 21.15L27.7406 21.1312L27.8719 21.15L28.0219 21.1875L28.0969 21.2531L28.1719 21.3281L28.2469 21.45L28.3031 21.6L28.3219 21.7594V21.9375H28.3125Z" fill="#FCCA3D"/>
+<path d="M28.3312 21.9187C28.3312 21.9187 28.2375 21.9468 28.125 21.9468C28.0031 21.9468 27.9375 21.9281 27.9375 21.9281L27.9187 22.0125C27.9 22.0968 27.8718 22.1343 27.8718 22.1343V22.4343L28.1156 22.4812L28.2468 22.4343L28.3125 22.1062L28.3312 21.9187Z" fill="#AF7029"/>
+<path d="M28.2656 21.7969V21.9094L28.3219 21.9281V21.8156L28.2656 21.7969ZM28.0312 18.9844L28.0031 18.7875L27.9281 18.6469L27.825 18.5063L27.7125 18.3844L27.6562 18.3375L27.6281 18.2906L27.3562 18.3094L27.225 18.4688C27.225 18.4688 27.5812 18.7313 27.7219 19.0125C27.8207 19.0441 27.9107 19.0988 27.9844 19.1719L27.9937 19.1531L28.0312 18.9844Z" fill="#FCCA3D"/>
+<path d="M27.7781 19.2187C27.7781 19.425 27.7313 19.5187 27.7031 19.5656L27.8719 19.3781L27.9844 19.1718C27.9107 19.0987 27.8207 19.0441 27.7219 19.0125C27.7594 19.0781 27.7781 19.1437 27.7781 19.2093V19.2187Z" fill="#AF7029"/>
+<path d="M28.1531 22.3031L28.0219 22.1531C27.9656 22.0968 27.9 22.0593 27.9 22.0593L27.8812 22.0968H27.8906L28.0031 22.1718C28.0466 22.2194 28.0873 22.2695 28.125 22.3218L28.1531 22.3031Z" fill="#816C2A"/>
+<path d="M28.3125 22.0781C28.3125 22.0781 28.2844 22.1719 28.1906 22.2469C28.0969 22.3406 27.9844 22.3875 27.9844 22.3875L28.2469 22.4813L28.425 22.3219L28.3125 22.0781Z" fill="#6F5B24"/>
+<path d="M28.35 22.2938L28.3312 22.3219L28.2843 22.3688L28.2468 22.4156L28.3031 22.1344L28.3593 22.2281V22.2656L28.35 22.2938Z" fill="#404118"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M26.5472 17.1535L26.5428 17.1579L26.5371 17.1556L26.5369 17.1555L26.5361 17.1552L26.5331 17.1541C26.5305 17.1531 26.5268 17.1517 26.5221 17.15C26.5127 17.1467 26.4997 17.1424 26.4853 17.1383C26.4709 17.1343 26.4552 17.1306 26.4404 17.1285C26.426 17.1264 26.4131 17.126 26.403 17.1277C26.3965 17.1312 26.3842 17.1395 26.3672 17.152C26.3493 17.1651 26.3267 17.1825 26.3011 17.2031C26.2498 17.2443 26.1864 17.2981 26.1239 17.3554C26.0613 17.4127 25.9998 17.4733 25.9522 17.5283C25.9284 17.5558 25.9083 17.5818 25.8932 17.605C25.8782 17.6283 25.8687 17.6483 25.8655 17.6641C25.8567 17.7309 25.8879 17.801 25.9228 17.858C25.9401 17.8863 25.958 17.9108 25.9717 17.9297L25.9719 17.9299C25.9787 17.9393 25.9847 17.9474 25.9889 17.9538C25.991 17.957 25.9928 17.96 25.9941 17.9626C25.9951 17.9644 25.9963 17.967 25.9967 17.9699C25.9969 17.9705 25.997 17.9711 25.9971 17.9715C25.9973 17.9725 25.9974 17.9736 25.9975 17.9746C25.9977 17.9767 25.9978 17.9793 25.9978 17.9823C25.9979 17.9883 25.9978 17.9964 25.9976 18.0062C25.9975 18.0124 25.9973 18.0193 25.9971 18.0269C25.9967 18.0433 25.9963 18.0627 25.996 18.0845C25.9951 18.1483 25.9957 18.2317 26.0038 18.3155C26.012 18.3995 26.0277 18.4833 26.0567 18.5482C26.0857 18.613 26.127 18.6571 26.1857 18.6658C26.3115 18.6844 26.4632 18.6867 26.5838 18.6844C26.644 18.6832 26.6963 18.6809 26.7336 18.6788C26.7522 18.6778 26.7671 18.6769 26.7773 18.6762C26.781 18.6759 26.784 18.6757 26.7865 18.6755L26.9203 18.2028C26.918 18.2035 26.9156 18.2044 26.9129 18.2052C26.8965 18.2106 26.8722 18.2177 26.8403 18.2248C26.7764 18.239 26.6819 18.2532 26.5593 18.2532H26.5586C26.4965 18.2484 26.4536 18.2327 26.4246 18.2112C26.3953 18.1895 26.3807 18.1623 26.3744 18.1358C26.3682 18.1095 26.3701 18.0841 26.3735 18.0655C26.3751 18.0561 26.3772 18.0483 26.3789 18.0429C26.3797 18.0402 26.3804 18.038 26.381 18.0365L26.3816 18.0347L26.3818 18.0343L26.3819 18.0341C26.3819 18.0341 26.3819 18.034 26.3906 18.0375L26.3819 18.0341L26.3846 18.0273L26.3918 18.0282C26.4264 18.0326 26.4664 18.0196 26.5169 17.9973C26.5343 17.9896 26.553 17.9808 26.573 17.9713C26.6097 17.954 26.6508 17.9346 26.6962 17.9164C26.7647 17.8844 26.8221 17.8294 26.8602 17.782C26.8793 17.7584 26.8933 17.7369 26.9013 17.7216C26.9025 17.7193 26.9035 17.7172 26.9044 17.7153C26.9 17.7187 26.8949 17.723 26.8888 17.7282C26.8831 17.733 26.8765 17.7385 26.8688 17.7448C26.8368 17.7708 26.7894 17.8064 26.7229 17.8397L26.7224 17.8399C26.656 17.8684 26.5849 17.8873 26.5245 17.8968C26.4942 17.9015 26.4665 17.9039 26.4432 17.9039C26.4201 17.9039 26.4005 17.9016 26.3871 17.8962L26.386 17.8958L26.385 17.895C26.374 17.8868 26.3675 17.8768 26.3644 17.8655C26.3614 17.8545 26.3619 17.8427 26.3637 17.831C26.3655 17.8198 26.3687 17.8078 26.3719 17.7958L26.3723 17.7942C26.3757 17.7814 26.3791 17.7684 26.3813 17.7548C26.3864 17.7195 26.4112 17.6781 26.4392 17.6384C26.4534 17.6183 26.4687 17.5982 26.4834 17.5792C26.4846 17.5776 26.4858 17.576 26.487 17.5744C26.5003 17.5572 26.5128 17.5409 26.5234 17.5261C26.5457 17.4904 26.5524 17.4569 26.5559 17.4225C26.5568 17.4133 26.5575 17.4039 26.5582 17.3943C26.56 17.3686 26.562 17.3417 26.5689 17.3138C26.5718 17.2947 26.5851 17.2749 26.6017 17.2564C26.6188 17.2374 26.6406 17.2182 26.6624 17.2006C26.6775 17.1883 26.6929 17.1765 26.7067 17.1659C26.7128 17.1613 26.7186 17.1568 26.7239 17.1527C26.7328 17.1458 26.7404 17.1397 26.7464 17.1345C26.7517 17.1299 26.7552 17.1264 26.757 17.124C26.758 17.1198 26.7574 17.1133 26.7543 17.1048C26.751 17.0958 26.7454 17.0858 26.7382 17.0764C26.7311 17.0671 26.7227 17.0587 26.7141 17.0528C26.7054 17.0468 26.6973 17.0438 26.6906 17.0438C26.6879 17.0438 26.6836 17.0449 26.6773 17.0477C26.6712 17.0505 26.6642 17.0547 26.6565 17.0598C26.6412 17.07 26.6239 17.0838 26.6076 17.0978C26.5914 17.1117 26.5763 17.1256 26.5652 17.1361C26.5597 17.1414 26.5552 17.1457 26.552 17.1488L26.5485 17.1523L26.5475 17.1532L26.5472 17.1535ZM26.3971 18.0475C26.397 18.0478 26.3969 18.0481 26.3968 18.0484C26.3953 18.0532 26.3934 18.0603 26.3919 18.0688C26.3888 18.0859 26.3872 18.1085 26.3927 18.1314C26.3981 18.1542 26.4105 18.1774 26.4357 18.1961C26.4611 18.2149 26.5001 18.2298 26.5597 18.2344C26.6807 18.2344 26.7736 18.2204 26.8362 18.2065C26.8675 18.1995 26.8913 18.1926 26.9071 18.1874C26.915 18.1848 26.921 18.1827 26.9249 18.1812C26.9269 18.1804 26.9283 18.1798 26.9293 18.1795L26.9304 18.179L26.9306 18.1789L26.9487 18.1712L26.8027 18.687L26.7937 18.6844L26.7944 18.6937L26.7942 18.6938L26.7934 18.6938L26.7903 18.6941C26.7877 18.6943 26.7837 18.6945 26.7785 18.6949C26.7683 18.6956 26.7533 18.6965 26.7346 18.6976C26.6972 18.6996 26.6446 18.702 26.5841 18.7031C26.4633 18.7055 26.3103 18.7032 26.183 18.6843C26.1151 18.6742 26.0697 18.6234 26.0395 18.5558C26.0093 18.4882 25.9934 18.4021 25.9852 18.3173C25.9769 18.2325 25.9763 18.1483 25.9772 18.0843C25.9775 18.0623 25.978 18.0427 25.9784 18.0263C25.9786 18.0187 25.9787 18.0119 25.9789 18.0058C25.9791 17.996 25.9792 17.9882 25.9791 17.9826C25.979 17.9798 25.9789 17.9777 25.9788 17.9763C25.9788 17.9759 25.9787 17.9755 25.9787 17.9753L25.9781 17.9741V17.9726C25.978 17.9724 25.9778 17.9719 25.9774 17.9711C25.9766 17.9694 25.9752 17.9671 25.9732 17.9641C25.9693 17.9582 25.9637 17.9505 25.9567 17.9409L25.9565 17.9406C25.9427 17.9217 25.9245 17.8967 25.9068 17.8678C25.8715 17.8101 25.8371 17.735 25.8469 17.6613L25.847 17.6607C25.8509 17.6414 25.8619 17.619 25.8775 17.5948C25.8932 17.5706 25.9139 17.5439 25.938 17.5161C25.9863 17.4603 26.0484 17.3991 26.1112 17.3415C26.1741 17.284 26.2378 17.2299 26.2894 17.1885C26.3151 17.1678 26.3379 17.1502 26.3561 17.1369C26.374 17.1237 26.3879 17.1143 26.3958 17.1104L26.3969 17.1098L26.3981 17.1096C26.4114 17.1069 26.4273 17.1077 26.443 17.1099C26.459 17.1122 26.4755 17.1161 26.4904 17.1203C26.5053 17.1245 26.5187 17.1289 26.5283 17.1323C26.5323 17.1338 26.5357 17.135 26.5383 17.136L26.5389 17.1354C26.5421 17.1323 26.5467 17.1278 26.5523 17.1225C26.5635 17.1119 26.5789 17.0977 26.5954 17.0835C26.6119 17.0694 26.6299 17.055 26.6461 17.0442C26.6543 17.0388 26.6622 17.0341 26.6694 17.0307C26.6765 17.0275 26.6839 17.025 26.6906 17.025C26.7026 17.025 26.7144 17.0302 26.7248 17.0374C26.7353 17.0446 26.745 17.0545 26.7531 17.065C26.7612 17.0756 26.7679 17.0873 26.7719 17.0984C26.7758 17.1093 26.7778 17.1211 26.7745 17.1311L26.7741 17.1323L26.7734 17.1333C26.7703 17.138 26.7649 17.1433 26.7587 17.1487C26.7523 17.1542 26.7443 17.1606 26.7355 17.1675C26.7299 17.1718 26.724 17.1763 26.7179 17.181C26.7041 17.1915 26.6892 17.203 26.6742 17.2151C26.6527 17.2326 26.6317 17.251 26.6157 17.2689C26.5994 17.2871 26.5893 17.3035 26.5874 17.317L26.5872 17.3179C26.5807 17.3442 26.5788 17.3689 26.577 17.3942C26.5763 17.4041 26.5755 17.4142 26.5745 17.4244C26.5709 17.4603 26.5637 17.497 26.5392 17.5362L26.5389 17.5367C26.528 17.5519 26.5152 17.5685 26.5019 17.5858C26.5007 17.5874 26.4994 17.589 26.4982 17.5906C26.4836 17.6097 26.4684 17.6294 26.4545 17.6492C26.4263 17.6891 26.4042 17.7273 26.3999 17.7576L26.3998 17.7578C26.3974 17.7724 26.3938 17.7862 26.3904 17.799L26.3901 17.8001C26.3868 17.8125 26.3839 17.8237 26.3823 17.8339C26.3806 17.8444 26.3805 17.8532 26.3825 17.8606C26.3843 17.8674 26.3881 17.8736 26.3952 17.8793C26.4054 17.883 26.4216 17.8852 26.4432 17.8852C26.4653 17.8852 26.492 17.8829 26.5216 17.8783C26.5805 17.869 26.65 17.8505 26.7148 17.8228C26.7794 17.7904 26.8257 17.7557 26.8569 17.7303C26.864 17.7245 26.8705 17.719 26.8763 17.7142C26.8831 17.7085 26.8889 17.7036 26.8936 17.7C26.8979 17.6966 26.9021 17.6936 26.9058 17.6918C26.9076 17.6909 26.9101 17.69 26.9128 17.6899C26.9148 17.6898 26.9171 17.6901 26.9192 17.6912C26.9205 17.6916 26.9218 17.6923 26.923 17.6933C26.9253 17.6951 26.9264 17.6975 26.9269 17.6995C26.9278 17.7029 26.9272 17.7065 26.9266 17.7091C26.9253 17.7148 26.9222 17.7221 26.9179 17.7303C26.9092 17.7469 26.8945 17.7694 26.8748 17.7938C26.8356 17.8425 26.776 17.8999 26.7039 17.9335L26.7034 17.9337C26.6583 17.9518 26.6184 17.9707 26.582 17.9878C26.5618 17.9974 26.5427 18.0064 26.5245 18.0145C26.4773 18.0353 26.4354 18.0499 26.3971 18.0475Z" fill="#78732E"/>
+<path d="M29.8782 15.9937C29.8782 15.9937 29.2219 15.8719 29.2219 16.4156C29.2313 16.5937 29.2688 16.65 29.4094 16.6969C29.55 16.725 29.8219 16.7437 30.0657 16.95C30.3 17.1656 30.3188 17.325 30.3188 17.4469C30.3188 17.5781 30.2532 17.6906 30.2532 17.6906L30.4032 18.4125L30.5532 18.9469L31.0032 18.6937L31.2657 17.8969L30.9282 16.4719L29.8782 15.9937Z" fill="#AB6D29"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M29.8816 15.9754C29.8816 15.9754 29.8816 15.9754 29.8782 15.9938L29.8859 15.9767L30.9443 16.4587L31.2851 17.8978L31.0187 18.7066L30.5415 18.975L30.3847 18.4164L30.2333 17.6874L30.2369 17.6812L30.2371 17.681L30.2375 17.6802C30.238 17.6794 30.2386 17.6783 30.2395 17.6767C30.2411 17.6736 30.2436 17.6689 30.2466 17.6628C30.2525 17.6507 30.2604 17.6331 30.2684 17.6115C30.2843 17.5682 30.3 17.5096 30.3 17.4469C30.3 17.3872 30.2954 17.3196 30.2628 17.2408C30.2301 17.1619 30.1687 17.0704 30.0532 16.9641C29.8481 16.7907 29.6236 16.7528 29.4736 16.7274C29.4488 16.7232 29.426 16.7194 29.4057 16.7153L29.4046 16.7151L29.4035 16.7147C29.3319 16.6909 29.2825 16.6634 29.2508 16.6159C29.2197 16.5692 29.2079 16.5061 29.2032 16.4167L29.2031 16.4157C29.2031 16.2757 29.2455 16.1765 29.3108 16.1075C29.3757 16.0389 29.4616 16.0018 29.5458 15.9826C29.6301 15.9633 29.714 15.9616 29.7765 15.9645C29.8078 15.966 29.834 15.9687 29.8523 15.971C29.8615 15.9722 29.8687 15.9733 29.8737 15.974C29.8762 15.9744 29.8781 15.9748 29.8795 15.975L29.881 15.9753L29.8814 15.9753L29.8816 15.9754ZM30.2729 17.6937L30.4214 18.4081L30.5648 18.9189L30.9876 18.681L31.2462 17.8961L30.912 16.4852L29.8726 16.0119C29.8714 16.0117 29.8698 16.0114 29.8679 16.0111C29.8632 16.0104 29.8564 16.0093 29.8476 16.0082C29.8301 16.006 29.8049 16.0034 29.7747 16.002C29.7142 15.9991 29.634 16.0009 29.5542 16.0191C29.4744 16.0374 29.3962 16.0718 29.3381 16.1333C29.2804 16.1942 29.2407 16.2836 29.2407 16.4152C29.2453 16.5036 29.257 16.5575 29.282 16.5951C29.3065 16.6319 29.3459 16.6559 29.4142 16.6788C29.4332 16.6825 29.4549 16.6862 29.4787 16.6902C29.6284 16.7153 29.864 16.7549 30.0778 16.9357L30.0784 16.9362C30.1971 17.0455 30.2622 17.1414 30.2974 17.2265C30.3327 17.3117 30.3375 17.3848 30.3375 17.4469C30.3375 17.5155 30.3204 17.5787 30.3036 17.6245C30.2951 17.6475 30.2866 17.6662 30.2803 17.6793C30.2773 17.6853 30.2748 17.6902 30.2729 17.6937Z" fill="#4D2A15"/>
+<path d="M30.525 18.75C30.525 18.75 30.7594 18.6563 30.8063 18.4688C30.8344 18.4219 30.5813 18.1969 30.5813 18.1969C30.5719 18.1969 30.7031 18.2625 30.7688 18.3188C30.825 18.375 30.8719 18.4031 30.8906 18.3938C30.9094 18.3844 31.0125 18.1406 30.975 18.0844C30.9375 18.0281 30.8719 17.8969 30.7781 17.8406C30.6844 17.775 30.5531 17.7844 30.5531 17.7844C30.5531 17.7844 30.7313 17.7281 30.8156 17.7844C30.9094 17.8313 30.9094 17.8781 30.9187 17.8688C30.9281 17.8406 30.9 17.5969 30.8625 17.5219C30.825 17.4281 30.7875 17.4 30.675 17.3719C30.5719 17.3531 30.4594 17.3625 30.4594 17.3625C30.4594 17.3625 30.6094 17.2781 30.7219 17.3063C30.8438 17.3344 30.8438 17.4 30.8531 17.3813C30.8531 17.3719 30.7969 17.1563 30.7594 17.1C30.7062 17.0307 30.6391 16.9732 30.5625 16.9313L30.3938 16.9125H30.3375C30.3375 16.9125 30.4313 16.8563 30.5344 16.8656C30.6469 16.875 30.6563 16.9125 30.6656 16.9031C30.6844 16.9031 30.6562 16.8844 30.5906 16.8375C30.525 16.7906 30.1969 16.65 30.1969 16.65H29.8875C29.8875 16.65 29.8875 16.575 29.9812 16.5563C30.0656 16.5469 30.0844 16.5656 30.075 16.5469C30.075 16.5188 29.8313 16.4719 29.8313 16.4719H29.625L29.3438 16.5C29.3438 16.5 29.3625 16.4531 29.4094 16.4156C29.4375 16.3875 29.4938 16.3688 29.5312 16.3594C29.625 16.3313 29.475 16.2563 29.475 16.2563L29.5594 16.1344L29.925 16.1625L30.6937 16.6125L31.0594 16.9219L31.2844 17.5031L31.2188 18.5156L30.7031 18.9375L30.4781 18.9656L30.525 18.75Z" fill="#4D2A15"/>
+<path d="M29.85 16.2469C29.85 16.2469 29.8313 16.1813 29.8313 16.0875C29.8313 15.9938 29.85 16.0032 29.85 16.0032C29.85 16.0032 29.5969 15.975 29.4188 16.1157C29.2407 16.2563 29.3438 16.5 29.3438 16.5C29.3438 16.5 29.4188 16.425 29.5219 16.3875C29.6157 16.35 29.8032 16.3594 29.8032 16.3594C29.8219 16.3407 29.7657 16.2657 29.7 16.2563C29.625 16.2375 29.5032 16.2375 29.5032 16.2375C29.5032 16.2375 29.5782 16.1907 29.7094 16.2C29.8407 16.2094 29.8594 16.2469 29.8594 16.2469H29.85Z" fill="#D2A567"/>
+<path d="M30.6282 18.8344L30.4594 18.8906L30.5532 19.5937L31.2282 20.7281L31.575 20.6719L31.6969 20.4562L31.7907 20.5031C31.8282 20.5406 31.9594 20.7656 32.0719 20.8125C32.175 20.85 32.2313 20.8312 32.325 20.9062C32.4188 21 32.7844 21.525 32.7938 21.5437C32.8219 21.5625 32.7844 21.3187 32.7844 21.3187L32.6719 21L32.5407 20.775L32.5125 20.7187H32.7L32.8125 20.7937L33 20.9344L33.0844 21.0469L33.1313 21.1594L33.15 21.2531L33.1969 21.4031L33.2907 21.6187L33.4125 21.8156L33.45 21.7312L33.3938 21.4969L33.2063 20.9344L33.1125 20.7469L33.2907 20.8594C33.3282 20.8687 33.4594 21.0656 33.4594 21.0656L33.5438 21.2719L33.6 21.4594L33.6375 21.6187L33.7032 21.7969L33.7969 21.7312L33.7875 21.6094L33.6938 21.2156L33.6563 20.7937C33.6563 20.7937 33.7125 20.7937 33.7688 20.8594C33.8165 20.9254 33.8544 20.998 33.8813 21.075L33.9282 21.4594L33.9938 21.8156L34.1063 22.1719L34.2188 22.3969L34.3032 22.5187V22.3312L34.1532 20.8312L34.1719 20.775C34.1719 20.775 34.1907 20.7656 34.2469 20.8406C34.2938 20.9062 34.3407 21.0187 34.3407 21.0187L34.3875 21.2531L34.4063 21.4125L34.4344 21.7219L34.4813 22.05L34.6313 22.4062L34.7157 22.5937L34.7625 22.3687L34.6875 20.7656L34.725 20.7187C34.725 20.7187 34.8094 20.7844 34.8375 20.8406L34.9125 20.9344L34.9688 21.2906L35.0063 22.2937L35.0438 22.5562L35.3438 19.9125L35.5313 19.875L35.55 19.8187L35.4094 19.725L35.1094 19.2562L34.9125 18.7969L34.5563 18.1406L33.9375 17.3906L33.45 16.9875C33.3931 16.9435 33.3336 16.9028 33.2719 16.8656L33.3094 16.7719L33.4032 16.6125L33.3938 16.6031H33.3094L33.1032 16.6406L32.8969 16.575L32.4844 16.2937L32.0532 16.0781L31.7907 15.9844L31.1719 15.8344L30.5532 15.7406H30.2719L30.0282 15.7875C30.0282 15.7875 29.8969 15.8437 29.8594 15.9281C29.8125 16.0031 29.8125 16.0594 29.8219 16.1719C29.8407 16.2937 29.9157 16.35 30.0844 16.425C30.2532 16.4906 30.6657 16.7625 30.6657 16.7625L30.8532 16.9594L30.9282 17.0531L30.9469 17.1281L31.0782 18.1687L30.8157 18.7312L30.6282 18.825V18.8344Z" fill="#8F4620"/>
+<path d="M31.2937 20.4563C31.2937 20.4563 31.4062 20.6438 31.5656 20.5031C31.725 20.3531 31.4906 19.9406 31.5 19.9125C31.5 19.8844 31.5656 19.8844 31.5656 19.8844L31.6875 20.0906C31.6875 20.0906 31.7531 20.2125 31.725 20.3906C31.7062 20.5781 31.5281 20.7375 31.5281 20.7375L31.3218 20.6906L31.2937 20.4563Z" fill="#AB6D29"/>
+<path d="M35.1844 22.8938L35.0344 22.4719L34.9969 22.1438C34.9969 22.0875 34.9687 21.4031 34.95 21.2719C34.95 21.1406 34.95 20.9906 34.9313 20.9813L34.7812 20.775L34.7156 20.7094L34.7625 20.6813C34.7625 20.6813 34.8187 20.7375 34.8281 20.7094C34.8469 20.6719 34.8281 20.5219 34.7719 20.2875C34.7062 20.0531 34.4062 19.5094 34.4062 19.5094L34.4437 19.5281L34.5281 19.6219L34.6969 19.7625L35.0813 19.9031L35.2875 19.9313L35.4187 20.2031C35.4187 20.2031 35.5125 20.6625 35.5125 20.8969C35.5125 21.1219 35.4938 21.3188 35.4 21.5531C35.3063 21.7781 35.2875 22.5188 35.2781 22.6313C35.2687 22.7531 35.2219 22.8656 35.2219 22.8656L35.175 22.8938H35.1844Z" fill="#4D2A15"/>
+<path d="M35.1843 21.675C35.1843 21.675 35.2593 21.5812 35.2968 21.45C35.3343 21.3187 35.3437 20.2875 35.2218 20.1656C35.1154 20.0655 34.9869 19.9916 34.8468 19.95C34.8281 19.95 34.9406 20.2781 34.9406 20.2781L35.0156 20.4093L35.0718 20.5781C35.0812 20.6718 35.1562 20.8687 35.1656 21.1406L35.1843 21.675Z" fill="#8F4620"/>
+<path d="M34.6219 22.3125C34.6219 22.3125 34.6687 21.8343 34.65 21.4687C34.6219 21.1218 34.5937 21.075 34.5562 21.0093C34.4576 20.8212 34.379 20.6233 34.3219 20.4187C34.2375 20.1187 34.1812 19.8937 34.1344 19.8375C34.0781 19.7812 33.975 19.65 33.9469 19.6875C33.9187 19.7156 33.9187 19.7906 33.9187 19.7906L33.7781 19.7531L33.7406 19.6593L33.7875 19.5093V19.4437L33.7594 19.3406L33.9469 19.4906L34.3406 19.7531L34.5281 20.5593L34.7156 21.0562L34.7344 21.9L34.7156 22.65L34.6219 22.3218V22.3125ZM34.8469 19.9968C34.8469 19.9968 34.9406 20.0906 35.0062 20.1281C35.0719 20.1656 35.175 20.2312 35.1562 20.2406C35.0906 20.2241 35.0276 20.1989 34.9687 20.1656L34.8562 20.0906V19.9968H34.8469Z" fill="#4D2A15"/>
+<path d="M34.0969 22.125C34.0969 22.125 34.1719 21.9562 34.1625 21.7406C34.1367 21.4679 34.0865 21.1981 34.0125 20.9344C33.975 20.8688 33.825 20.775 33.6844 20.4844C33.5438 20.1937 33.5625 20.1281 33.4688 20.0156C33.375 19.9219 33.2813 19.7906 33.2813 19.7906L33.3094 19.4813L33.6469 19.65L33.7969 19.725L33.9656 20.5406L34.1156 20.775L34.1813 21.1031L34.2656 21.8531L34.3031 22.4719L34.2844 22.5187L34.0969 22.125ZM33.7031 21.7781C33.7031 21.7781 33.7125 21.5437 33.6563 21.3281C33.5906 21.1125 33.5531 20.9531 33.4781 20.8781C33.4125 20.8125 33.2438 20.6344 33.0938 20.4094C32.9438 20.175 32.7281 19.9406 32.7281 19.9406V19.6312L32.9156 19.7719C32.9915 19.8076 33.0665 19.8451 33.1406 19.8844L33.2344 20.2313L33.3469 20.4844L33.5156 20.7094L33.6281 20.8125L33.6938 21.1875L33.7313 21.4031L33.825 21.7031L33.7875 21.8625L33.7031 21.7781ZM33.4219 21.7781L33.3281 21.6937C33.3281 21.6937 33.3844 21.6375 33.3563 21.5062C33.3281 21.3937 33.3 21.2812 33.2438 21.1594C33.1875 21.0469 33.1781 20.9719 33.15 20.9437C33.0125 20.8153 32.8719 20.6902 32.7281 20.5687C32.6344 20.475 32.475 20.325 32.3813 20.2594C32.2875 20.2031 32.2125 20.1844 32.2125 20.1844L32.1656 19.8094C32.1656 19.8094 32.2875 19.9781 32.3625 19.9969C32.4276 20.0232 32.4933 20.0482 32.5594 20.0719L32.8219 20.5406L32.9156 20.6625L33.1594 20.85L33.2531 21.0563L33.3375 21.2906L33.4313 21.6094L33.4406 21.7969L33.4219 21.7875V21.7781ZM32.9063 21.6844C32.9063 21.6844 32.7469 21.4969 32.7188 21.3844C32.7 21.2719 32.7375 21.2719 32.6906 21.1406C32.6438 21.0094 32.475 20.8125 32.3438 20.7094C32.2125 20.5969 32.025 20.4469 32.0344 20.3531C32.0438 20.2688 32.0719 20.2594 32.0719 20.2594L32.1469 20.3344L32.5688 20.775L32.7 21.0094L32.7938 21.3L32.8594 21.4406L32.925 21.6094L32.9063 21.675V21.6844ZM34.4063 19.5C34.4063 19.5 34.6969 19.8563 34.7813 19.5281C34.8094 19.3781 34.6688 19.0969 34.6688 19.0969C34.6688 19.0969 34.4063 18.6281 34.3125 18.5156L33.7781 17.8312L33.45 17.6813L33.5625 17.8688C33.5625 17.8688 33.8063 18.1125 34.1156 18.6562C34.425 19.1906 34.3688 19.4906 34.3688 19.4906H34.4156L34.4063 19.5ZM32.7375 17.3438C32.7375 17.3438 33.3094 17.8313 33.675 18.3563C34.05 18.8906 34.1906 19.2375 34.1156 19.3125C34.0219 19.3781 33.7969 19.275 33.7031 19.125C33.6094 18.975 33.5344 18.7125 33.1875 18.3187C32.8406 17.925 32.6719 17.8688 32.6719 17.8688L32.4188 17.4656L32.7375 17.3438ZM32.4375 18.5156C32.4375 18.5156 32.775 18.7969 33 19.0219C33.1156 19.1453 33.2222 19.2769 33.3188 19.4156L33.45 19.5469C33.45 19.5469 33.3656 19.4062 33.4125 19.3594C33.4594 19.3031 33.5156 19.3312 33.5156 19.3312L32.4375 18.2062V18.5156ZM32.3719 18.5438C32.3719 18.5438 32.4844 18.7594 32.6531 18.9281C32.7805 19.0539 32.9086 19.1789 33.0375 19.3031L33.1125 19.575C33.1125 19.575 32.625 19.2 32.625 19.2938C32.625 19.3875 32.7375 19.575 32.7375 19.575L32.5875 19.4813L32.3813 19.1906L32.2594 18.9281L32.1188 18.5719L32.3719 18.5438Z" fill="#4D2A15"/>
+<path d="M30.8906 19.7063C30.8906 19.7063 31.1437 19.9313 31.2844 19.7063C31.425 19.4906 31.3125 19.2375 31.3125 19.2375C31.3125 19.2375 31.6781 19.7625 31.7812 19.2656C31.8 19.1719 31.5562 18.8344 31.5562 18.8344L31.65 18.75L31.8281 19.0594C31.8281 19.0594 31.9969 18.9844 31.9969 18.7781C31.9969 18.5719 31.8187 18.2813 31.8187 18.2813L31.9875 18.4688C31.9875 18.4688 32.325 18.4688 32.3344 18.2813C32.3344 18.075 32.0531 17.8594 32.0531 17.8594C32.0531 17.8594 32.2781 17.8688 32.2781 17.7375C32.2781 17.6063 31.9594 17.5125 31.9594 17.4281C31.9594 17.3438 32.0531 17.2031 32.1937 17.2875C32.3344 17.3625 32.5218 17.4188 32.6062 17.2688C32.6812 17.1188 32.5969 17.0813 32.5969 17.0813L32.4 17.0438L32.0812 16.875L31.8281 16.7813L31.5656 16.7438L31.6594 16.9313L31.7344 17.475V17.7188L31.7812 18.2625L31.65 18.7031L31.5844 18.7875L31.5375 18.8438L31.425 19.0875L31.275 19.2563L31.0687 19.5094L30.8812 19.7063H30.8906Z" fill="#4D2A15"/>
+<path d="M32.7 20.7094C32.7 20.7094 32.6343 20.55 32.4937 20.4375C32.3867 20.3698 32.2639 20.331 32.1375 20.325L32.5125 20.7188L32.7 20.7094ZM33.225 20.8031C33.225 20.8031 33.1031 20.5594 32.9625 20.4094C32.8218 20.2594 32.7281 20.0719 32.6812 20.0719H32.625L32.6625 20.3813L32.9156 20.6344C32.9156 20.6344 33.1593 20.8219 33.225 20.8031ZM33.6562 20.7844C33.6562 20.7844 33.6 20.5031 33.45 20.2219C33.3093 19.9594 33.1593 19.8469 33.1593 19.8469L33.1968 20.1281L33.3093 20.4094L33.4968 20.6906L33.6562 20.7844ZM34.0125 20.625C34.0125 20.625 34.1062 20.0438 34.0125 19.875C33.9281 19.725 33.7593 19.6875 33.7593 19.6875L33.7031 19.7813L33.7593 20.1844L33.9 20.5031L34.0125 20.625ZM34.3593 19.6594C34.3593 19.6594 34.4437 19.6969 34.5468 19.8938C34.6581 20.1525 34.7399 20.423 34.7906 20.7C34.7906 20.7281 34.7437 20.7188 34.725 20.7188C34.7062 20.7094 34.3593 20.1563 34.3593 20.1563L34.3031 19.65H34.3593V19.6594Z" fill="#AB6D29"/>
+<path d="M31.9126 20.325C31.9126 20.325 32.1001 20.2875 32.1001 20.2313C32.1001 20.1563 31.8751 20.025 31.8938 19.9219C31.8938 19.875 32.0813 19.9313 32.0907 19.8938C32.1001 19.8563 31.9032 19.5563 31.9688 19.4813C32.0251 19.4063 32.1938 19.8094 32.1938 19.8094C32.1938 19.8094 32.2876 19.9969 32.2594 20.1094C32.1469 20.4469 31.9126 20.325 31.9126 20.325ZM32.3438 19.9125C32.3532 19.8844 32.6344 19.95 32.6344 19.9313C32.6532 19.8657 32.3813 19.65 32.3813 19.65C32.3813 19.65 32.3251 19.5375 32.3438 19.5188C32.3626 19.5 32.5313 19.5375 32.5313 19.5188C32.5501 19.4907 32.3438 19.2188 32.3438 19.1719C32.3438 19.125 32.4001 19.1719 32.4001 19.1719C32.4001 19.1719 32.5594 19.3313 32.6438 19.4719C32.7376 19.6032 32.8126 19.7157 32.7844 19.9313C32.7469 20.1657 32.3157 19.9875 32.3438 19.9125ZM33.6188 19.4813C33.6188 19.4813 33.5719 19.2938 33.6001 19.2657L33.7032 19.2188C33.7032 19.2188 33.5532 19.125 33.4782 19.125C33.4126 19.125 33.4032 19.1063 33.3844 19.125C33.3657 19.1625 33.5063 19.35 33.5063 19.35L33.6188 19.4813Z" fill="#D2A567"/>
+<path d="M32.7562 19.6312C32.7562 19.6312 33.1969 19.7437 33.2156 19.7062C33.2344 19.6781 32.8687 19.3312 32.8687 19.3312C32.8687 19.3312 32.8406 19.275 32.85 19.2562C32.85 19.2375 33.0094 19.2281 33.0562 19.2656C33.1031 19.3031 33.0562 19.3781 33.0656 19.4062C33.0844 19.4343 33.225 19.6406 33.2531 19.6031C33.2719 19.575 33.2156 19.3218 33.225 19.2937C33.2437 19.275 33.3937 19.4437 33.4406 19.4718C33.4781 19.5 33.7219 19.6875 33.75 19.6031C33.7781 19.5093 33.7875 19.5 33.7781 19.4437C33.7781 19.3875 33.8625 19.6875 33.75 19.725C33.6375 19.7625 33.5062 19.6875 33.5062 19.6875L33.4031 19.6125L33.3469 19.5468C33.3469 19.5468 33.4125 19.7812 33.3281 19.8C33.2531 19.8281 33.1687 19.8187 33.1687 19.8187L32.9812 19.8L32.7562 19.6312ZM33.7594 19.3312C33.7594 19.3312 34.2281 19.6125 34.2656 19.5656C34.3125 19.5187 34.1531 18.8625 34.1719 18.7968C34.2 18.7406 34.5469 19.5375 34.3781 19.6406C34.2469 19.7343 34.1906 19.6687 34.1906 19.6687L33.9562 19.5468L33.7687 19.3312H33.7594ZM35.0531 20.5125L35.1469 20.5593L35.2125 20.5781L35.0812 20.5968L35.0531 20.5031V20.5125ZM34.6031 18.975L34.6687 19.0031L34.7344 19.0312C34.7344 19.0312 34.6969 19.0593 34.6781 19.05H34.6406L34.6031 18.975ZM34.4719 18.7406C34.4719 18.7406 34.5187 18.7687 34.575 18.7218C34.6406 18.6843 34.6406 18.6468 34.6312 18.6281C34.6312 18.6093 34.5375 18.6093 34.5 18.5812C34.4719 18.5625 34.4719 18.525 34.4719 18.525H34.3687L34.3312 18.5343L34.4719 18.7406ZM34.875 20.0906C34.875 20.0906 35.0156 20.1843 35.0625 20.1843C35.1 20.1843 35.1656 20.2312 35.1562 20.2406C35.1562 20.25 35.0437 20.2593 34.9875 20.2312C34.9312 20.2031 34.9219 20.2218 34.9219 20.2218L34.875 20.0906ZM34.1156 17.9812H34.1719C34.2 17.9812 34.2187 17.9625 34.2281 17.9812C34.2469 18 34.2281 18.0937 34.2 18.1218L34.1062 18.1687C34.0543 18.1014 34.0043 18.0326 33.9562 17.9625L34.1156 17.9812ZM33.45 17.3812H33.5906C33.6375 17.3812 33.6844 17.4093 33.7312 17.4375C33.7687 17.4656 33.8156 17.7468 33.7875 17.7937C33.7687 17.85 33.45 17.6062 33.4406 17.5968C33.4406 17.5687 33.3 17.3625 33.3 17.3625L33.45 17.3812ZM33.15 17.25C33.15 17.25 33.3844 17.2687 33.3562 17.1281C33.3524 17.0855 33.3396 17.0443 33.3186 17.0071C33.2976 16.9699 33.2688 16.9377 33.2344 16.9125L32.9625 17.1093L33.15 17.25ZM32.5406 16.9875C32.5406 16.9875 32.6062 17.025 32.6719 16.9875C32.7375 16.9687 32.9156 16.7343 33.0469 16.7062C33.1781 16.6781 33.2062 16.6781 33.2344 16.7062C33.2531 16.7437 33.2344 16.875 33.2156 16.9125C33.1875 16.95 32.8031 17.1 32.8031 17.1L32.6625 17.0906C32.6208 17.0779 32.58 17.0623 32.5406 17.0437V16.9875ZM32.475 16.5656C32.4094 16.4343 32.3156 16.3781 32.2687 16.3875C32.2312 16.3968 32.4 16.5281 32.4281 16.7156C32.4562 16.9031 32.4469 17.025 32.4469 17.0343L32.5219 17.0437L32.5406 16.9781L32.55 16.9312V16.8843L32.5406 16.7906L32.5219 16.7062L32.5031 16.65L32.475 16.5656ZM31.9312 16.3781C31.7866 16.2264 31.6106 16.108 31.4156 16.0312C31.3969 16.0312 31.7906 16.2656 31.8844 16.4062C31.9687 16.5656 31.9687 16.7718 32.0062 16.8C32.0437 16.8281 32.0812 16.7812 32.0906 16.7812C32.0906 16.7812 32.1187 16.7343 32.1094 16.7156L32.0906 16.6218L32.025 16.5281L31.9875 16.4531L31.9312 16.3781ZM31.4156 16.1625C31.1906 15.975 30.7969 15.8812 30.4781 15.8812C30.15 15.8625 29.9812 15.9 30.0281 16.0687C30.075 16.2375 30.2156 16.3312 30.4969 16.3312C30.7687 16.3312 30.8344 16.3031 30.9844 16.35C31.109 16.3876 31.2241 16.4515 31.3219 16.5375C31.3687 16.5843 31.2187 16.3968 31.0781 16.2937C30.9375 16.1812 30.8437 16.1343 30.8437 16.1343C30.8437 16.1343 30.8156 16.0687 31.0031 16.0968C31.1906 16.125 31.4437 16.2468 31.5187 16.4062C31.5844 16.5656 31.575 16.65 31.575 16.6875C31.575 16.7156 31.6406 16.6687 31.6406 16.6687L31.6687 16.5843C31.6687 16.5843 31.6687 16.5281 31.6406 16.4531C31.6031 16.3875 31.5937 16.3593 31.5094 16.2656C31.425 16.1625 31.4156 16.1718 31.4156 16.1718V16.1625ZM30.5156 18.8343C30.6562 18.8343 30.9656 18.5718 31.0031 18.2062C31.05 17.8312 30.825 17.0906 30.7687 17.0156C30.7219 16.9312 30.8625 16.9781 30.9281 17.0531C31.0783 17.3631 31.1583 17.7024 31.1625 18.0468C31.1625 18.4406 31.0875 18.5437 30.8812 18.75C30.675 18.9375 30.5062 18.9187 30.5062 18.9187L30.5156 18.8343ZM30.9937 19.9218C30.9937 19.9218 31.0594 20.0156 31.1437 19.9781C31.2844 19.9312 31.5 19.8187 31.5 19.6218C31.5 19.4906 31.3312 19.3687 31.3219 19.3218V19.2281L31.4719 19.2656L31.5187 19.4718C31.5187 19.4718 31.575 19.5375 31.6406 19.5093C31.6969 19.4906 31.875 19.3593 31.8469 19.2281C31.8187 19.1156 31.6594 18.9562 31.6406 18.9C31.6219 18.8343 31.6406 18.7875 31.6406 18.7875L31.7906 18.8062L31.8281 18.9937C31.8281 18.9937 31.8656 19.05 31.95 19.0312C32.025 19.0218 32.175 18.8718 32.1375 18.7968L31.9969 18.5531V18.4687L32.0437 18.5062C32.0437 18.5062 32.1 18.525 32.2125 18.4968C32.3156 18.4593 32.4281 18.3843 32.4281 18.3093C32.4281 18.2343 32.3344 18.1593 32.3344 18.1218V18.0656H32.4094L32.5031 18.1781L32.5125 18.3093L32.4844 18.4218L32.3531 18.5718L32.2219 18.6281H32.1844L32.2594 18.7593L32.2406 18.9468L32.1187 19.0593L31.9594 19.1531L31.95 19.3312L31.8562 19.5187L31.6687 19.6312H31.6031L31.5844 19.7437L31.4531 19.9312L31.2375 20.0718L31.0781 20.1L30.9844 19.9687L30.9937 19.9218Z" fill="#D2A567"/>
+<path d="M32.1938 17.9438C32.1938 17.9438 32.5688 18.0469 32.55 17.8125C32.55 17.6907 32.1938 17.3907 32.175 17.3438C32.1469 17.2875 32.1563 17.2219 32.1563 17.2219L32.3344 17.3907C32.3344 17.3907 32.5688 17.4469 32.6344 17.3063C32.7 17.175 32.6438 17.0907 32.6344 17.0907L32.6907 17.0813L32.7938 17.1L32.7844 17.3063L32.6625 17.8219C32.6625 17.8219 32.6907 18.0282 32.5313 18.0375C32.3719 18.0563 32.1938 17.9438 32.1938 17.9438ZM32.5407 20.7094C32.5407 20.7094 32.5407 20.6063 32.4657 20.5219C32.3813 20.4563 32.2313 20.3907 32.2032 20.3719C32.2867 20.4844 32.3743 20.5938 32.4657 20.7H32.5407V20.7094ZM33.0657 20.7282C33.0657 20.7282 32.8782 20.5032 32.85 20.4188C32.8032 20.3438 32.7094 20.175 32.6344 20.1657C32.5594 20.1657 32.7094 20.4469 32.7094 20.4469L33.0094 20.7188H33.0657V20.7282ZM33.5719 20.7282L33.375 20.3344C33.3375 20.25 33.2532 20.0157 33.1594 19.95C33.0657 19.8844 33.1688 20.0532 33.1688 20.0532L33.2719 20.3625L33.45 20.6344L33.5719 20.7282ZM33.9375 20.5032C33.9375 20.5032 33.9282 20.25 33.8907 20.0719C33.8625 19.9032 33.7313 19.7532 33.7219 19.7625V20.0719L33.9375 20.5032ZM34.6969 20.6907L34.5094 20.25C34.4625 20.1 34.3407 19.8657 34.3219 19.8563L34.3594 20.1375L34.5188 20.5782L34.7063 20.6907H34.6969ZM35.3532 19.8938C35.3532 19.8938 35.2407 19.7813 34.9875 19.6782C34.7344 19.5844 34.4813 19.5657 34.4813 19.5657L34.5094 19.6032L34.6313 19.6969L34.8938 19.8375L35.2407 19.9219L35.3625 19.8938H35.3532Z" fill="#D2A567"/>
+<path d="M32.6437 20.0437C32.6437 20.0437 32.6437 20.2687 32.7656 20.4C32.8781 20.5406 33.1406 20.775 33.1969 20.8312C33.2531 20.8781 33.2906 21.15 33.375 21.375C33.45 21.6 33.4687 21.7875 33.5062 21.8531C33.5437 21.9187 33.6094 22.0218 33.5531 22.0125C33.5062 22.0031 33.4594 21.9375 33.4219 21.8531C33.3937 21.7687 33.4031 21.7687 33.4031 21.6656C33.4031 21.5437 33.2344 20.9625 33.15 20.9062C33.0656 20.8406 32.7 20.5312 32.55 20.3156C32.4094 20.1 32.4375 20.0531 32.4375 20.0531H32.6437V20.0437Z" fill="#202020"/>
+<path d="M33.2438 21.4969C33.1688 21.3375 33.1501 21.1875 33.1313 21.0937C33.0202 20.9373 32.8802 20.8036 32.7188 20.7C32.6626 20.6719 32.5407 20.7 32.4938 20.6719L32.1469 20.2969C32.1469 20.2969 32.1001 20.3437 32.1188 20.3531C32.1282 20.3625 32.4376 20.7 32.5501 20.8031C32.6626 20.9156 32.7282 21.15 32.8032 21.3375C32.8876 21.525 32.8501 21.4875 32.8594 21.5719C32.8688 21.6656 32.9251 21.7125 32.9813 21.7125C33.0376 21.7125 33.0563 21.6937 33.0376 21.675C32.9473 21.5807 32.8772 21.469 32.8313 21.3469C32.7657 21.1875 32.6907 20.8875 32.5969 20.7844L32.5688 20.7562L32.6907 20.7375C32.7657 20.7375 33.0751 21.0187 33.1032 21.1125C33.1313 21.1875 33.1032 21.225 33.2344 21.5062C33.3657 21.7875 33.4219 21.8531 33.4219 21.8531H33.4407C33.4407 21.8531 33.3282 21.6656 33.2532 21.4969H33.2438ZM32.7563 19.6312C32.7563 19.6312 32.9907 19.7719 33.0563 19.7906C33.0932 19.8023 33.1308 19.8117 33.1688 19.8187C33.1688 19.8187 33.2063 20.2312 33.3657 20.4562C33.5344 20.6906 33.6657 20.775 33.6657 20.775C33.6657 20.775 33.6657 21.225 33.7969 21.525C33.9188 21.8344 33.9376 22.2094 33.9094 22.275C33.8813 22.3312 33.7782 22.0875 33.7219 21.8719L33.5344 21.2906C33.4841 21.1391 33.4044 20.9989 33.3001 20.8781C33.2251 20.8125 33.2813 20.8219 33.3282 20.8594C33.3657 20.8969 33.4876 21.0469 33.5626 21.2812C33.6376 21.5156 33.6657 21.75 33.7032 21.75C33.7501 21.75 33.7782 21.7219 33.7782 21.6656C33.7782 21.6281 33.7219 21.4969 33.6844 21.2812C33.6682 21.1297 33.6303 20.9813 33.5719 20.8406C33.5344 20.7844 33.4782 20.775 33.3469 20.5219C33.2452 20.3684 33.1662 20.2011 33.1126 20.025C33.0938 19.9125 33.1126 19.9312 33.0938 19.9031C33.0751 19.8937 33.0563 19.9031 32.9438 19.8469C32.8407 19.7906 32.7563 19.6312 32.7563 19.6312Z" fill="#202020"/>
+<path d="M33.3469 19.5469C33.3469 19.5469 33.4782 19.6594 33.5625 19.6875C33.6375 19.725 33.75 19.725 33.75 19.725C33.75 19.725 33.7219 20.1188 33.8719 20.3719C34.0219 20.625 34.1813 20.7656 34.1813 20.7656C34.1813 20.7656 34.2094 20.8594 34.2563 21.4031L34.3219 22.1813C34.3313 22.3969 34.3407 23.175 34.3125 23.1469C34.1907 23.0531 34.2938 22.6406 34.2282 22.4625C34.1719 22.2938 34.0782 22.2656 33.9657 21.7687C33.8532 21.2812 33.9282 21.1687 33.8438 20.9906C33.7594 20.8031 33.6563 20.7844 33.6563 20.7844C33.6563 20.7844 33.8063 20.8219 33.8719 20.9719C33.9282 21.1219 33.9375 21.5344 33.9938 21.7406C34.1063 22.2 34.2657 22.4344 34.2657 22.4344C34.2657 22.4344 34.2282 21.8531 34.1907 21.525C34.1438 21.1969 34.1438 20.925 34.0875 20.8031C34.0219 20.6719 33.8907 20.5781 33.8063 20.4094C33.7313 20.2406 33.7032 19.9125 33.6657 19.8281C33.6282 19.7438 33.6094 19.7719 33.5532 19.7531C33.3657 19.6781 33.3469 19.5469 33.3469 19.5469Z" fill="#202020"/>
+<path d="M33.7594 19.3313C33.7594 19.3313 33.8813 19.4719 34.05 19.575C34.2188 19.6688 34.3125 19.6407 34.3313 19.6688C34.3594 19.6875 34.3031 20.025 34.4813 20.3438C34.6594 20.6625 34.725 20.6719 34.725 20.7188L34.7813 22.0219C34.8094 22.3407 34.8281 23.4094 34.6969 23.4094C34.5656 23.4094 34.6875 22.6125 34.6219 22.4344C34.5563 22.2469 34.5563 22.3032 34.5 22.1532C34.4344 22.0032 34.4344 21.4219 34.3313 21.075C34.2563 20.8125 34.1813 20.775 34.1813 20.775C34.1813 20.775 34.3125 20.8407 34.3688 21.0563C34.425 21.2625 34.4438 21.9938 34.5094 22.0969C34.5844 22.2188 34.6781 22.3594 34.6969 22.4719C34.7086 21.9841 34.6961 21.496 34.6594 21.0094C34.6313 20.9157 34.3313 20.3907 34.3125 20.1C34.2844 19.8 34.275 19.7719 34.2469 19.7532C34.2281 19.725 34.1438 19.7532 34.0031 19.6125C33.8625 19.4813 33.7594 19.3313 33.7594 19.3313Z" fill="#202020"/>
+<path d="M34.4344 19.5C34.4344 19.4719 34.5281 19.6594 34.7812 19.7625C35.0531 19.875 35.3063 19.8563 35.3438 19.8844C35.3719 19.9125 35.5313 20.3063 35.5406 20.8407C35.55 21.3657 35.4469 21.3188 35.3719 21.7782C35.2875 22.2375 35.2781 23.1657 35.2312 23.3063C35.2125 23.3532 35.1844 23.3813 35.1562 23.4657C35.1281 23.5594 35.175 23.7282 35.0906 23.7282C35.0156 23.7282 34.9969 23.5969 34.9969 23.5313C34.9969 23.4563 35.0906 23.2032 35.0906 22.95C35.0906 22.6969 35.0344 22.6688 34.9969 22.3688C34.9594 22.0594 34.9594 21.1032 34.9219 21.0094C34.8937 20.9157 34.725 20.7188 34.725 20.7188C34.725 20.7188 34.9031 20.8313 34.95 20.9625C34.9875 21.0844 34.9969 22.1532 35.0437 22.3688C35.0906 22.5938 35.0719 22.3219 35.0906 22.2C35.1094 22.0782 35.175 21.5438 35.1656 21.2625C35.1563 20.9813 35.0344 20.3813 34.9406 20.2782C34.9406 20.2782 34.9875 20.3344 35.0437 20.4657C35.0437 20.475 35.0813 20.5125 35.1188 20.5313L35.2125 20.5782C35.2125 20.5782 35.1563 20.5782 35.1188 20.55C35.0813 20.5407 35.0625 20.5125 35.0625 20.5125C35.1455 20.7538 35.1867 21.0074 35.1844 21.2625C35.1937 21.75 35.1187 22.8 35.1937 22.8094C35.2687 22.8282 35.2594 22.2469 35.3344 21.7594C35.4094 21.2907 35.5219 21.2157 35.4844 20.8313C35.4563 20.4469 35.3531 20.025 35.2688 19.9688C35.1844 19.9219 34.95 19.9407 34.7438 19.8C34.5375 19.6688 34.425 19.5282 34.4344 19.5ZM31.0781 20.0344C31.0781 20.0344 31.1531 20.0719 31.2375 20.0344C31.3313 19.9875 31.5656 19.8 31.5656 19.725V19.575C31.5656 19.575 31.5656 19.6032 31.6312 19.6125C31.7062 19.6219 31.8937 19.4813 31.9125 19.3875C31.9284 19.291 31.9252 19.1922 31.9031 19.0969C31.8844 19.0594 31.9594 19.125 31.9969 19.0969C32.0344 19.0594 32.2219 18.9375 32.2219 18.8157C32.2219 18.6844 32.1188 18.5719 32.1188 18.5719C32.1188 18.5719 32.2125 18.5907 32.2688 18.5719C32.3156 18.5625 32.5031 18.45 32.4938 18.3469C32.4938 18.2344 32.4281 18.0657 32.2781 18.0469C32.2781 18.0469 32.3906 18.075 32.4938 18.0375C32.5875 18 32.6344 17.9438 32.6344 17.8219C32.6344 17.7094 32.4188 17.4469 32.3906 17.4282C32.3531 17.4094 32.6156 17.5032 32.6719 17.4C32.7469 17.2969 32.7563 17.2219 32.7375 17.1657C32.7188 17.1 32.6625 17.0907 32.6625 17.0907C32.6625 17.0907 32.775 17.1188 32.925 17.0438C33.075 16.9688 33.2062 16.8563 33.2812 16.8657C33.3563 16.8657 33.0656 17.025 33.0469 17.1094C33.0469 17.1469 33.1312 17.2032 33.2625 17.2969C33.2625 17.3063 33.2625 17.3157 33.2812 17.325C33.3469 17.3532 33.5625 17.3625 33.5906 17.3719C33.6094 17.3907 33.3656 17.3813 33.3844 17.4C33.5814 17.5477 33.7607 17.7175 33.9187 17.9063C33.9281 17.9063 33.9656 17.9438 34.0125 17.9532L34.1344 17.9813H33.9844C34.0939 18.1236 34.1971 18.2706 34.2937 18.4219C34.2937 18.4313 34.3313 18.4782 34.3781 18.4969C34.425 18.5157 34.4719 18.5063 34.4812 18.5157C34.4906 18.5344 34.35 18.5157 34.3594 18.5344C34.4703 18.7175 34.5735 18.9052 34.6687 19.0969C34.6687 19.0969 34.3875 18.6 34.0406 18.2063C33.6844 17.8125 33.6 17.7657 33.5906 17.7938C33.5719 17.8313 33.8438 18.1782 33.9938 18.4219C34.1438 18.6657 34.275 18.975 34.275 18.975C34.275 18.975 33.9281 18.2438 33.4313 17.7938C32.9438 17.3438 32.8875 17.2782 32.8406 17.2875C32.7844 17.3063 32.7469 17.6438 32.775 17.7094C32.8031 17.775 33.1688 18.0469 33.4688 18.4125C33.7781 18.7688 34.1719 19.3875 34.1719 19.3875C34.1719 19.3875 33.8906 18.9469 33.4219 18.45C32.9531 17.9532 32.775 17.8313 32.7375 17.8407C32.7 17.8407 32.7 17.9344 32.6438 18.0094C32.5875 18.075 32.475 18.0657 32.475 18.1032C32.475 18.1407 32.8687 18.5063 32.9437 18.5438C33.0281 18.5907 33.075 18.5719 33.1312 18.6L33.2625 18.6938L33.1125 18.6469C33.0563 18.6282 32.9906 18.6188 32.9906 18.6469C32.9906 18.675 33.3187 19.05 33.3656 19.0782C33.4219 19.1063 33.4594 19.0875 33.525 19.1157C33.6 19.1438 33.7125 19.2188 33.7125 19.2188C33.7125 19.2188 33.5906 19.1532 33.5156 19.1438C33.4313 19.125 33.4031 19.1438 33.4031 19.1625C33.4031 19.1813 33.6469 19.5 33.6375 19.5C33.6281 19.5 33.2625 19.0688 32.9531 18.7969C32.6437 18.5157 32.5031 18.4594 32.4844 18.4688C32.4656 18.4782 32.4844 18.5625 32.4 18.5907C32.325 18.6188 32.2594 18.6282 32.2594 18.6563C32.2594 18.6844 32.5406 18.9375 32.7281 19.1625C32.8559 19.3006 32.981 19.4413 33.1031 19.5844L32.6813 19.1813C32.4656 18.975 32.3531 18.9 32.325 18.9C32.3062 18.9188 32.3062 19.0219 32.325 19.05C32.3437 19.0782 32.7563 19.5563 32.7375 19.5657C32.7281 19.5844 32.2687 19.0032 32.2312 19.0032C32.2031 19.0032 32.1844 19.0688 32.1562 19.0969C32.1187 19.1344 31.9875 19.1344 31.9875 19.1907C31.9875 19.2282 32.6438 19.875 32.6344 19.8938C32.6344 19.8938 32.0906 19.425 32.0719 19.4532C32.0531 19.4813 32.2969 19.9219 32.2781 19.9407C32.2687 19.9407 31.9594 19.4719 31.9313 19.4719C31.9031 19.4719 31.9125 19.5282 31.8375 19.5938C31.7438 19.6688 31.65 19.6313 31.65 19.6688C31.65 19.6969 32.1 20.2032 32.0906 20.2125C32.0719 20.2219 31.6219 19.7344 31.6219 19.7625C31.6125 19.7625 31.5844 19.7907 31.6031 19.8282C31.6313 19.95 31.7344 20.1657 31.725 20.1844C31.725 20.1844 31.575 19.8844 31.5375 19.9032C31.5 19.9032 31.5 19.9688 31.425 20.0063C31.3594 20.0532 31.3031 20.0438 31.3031 20.0719C31.3031 20.1 31.3781 20.1657 31.4156 20.2313C31.4531 20.2969 31.4812 20.4563 31.4812 20.4563C31.4812 20.4563 31.4344 20.325 31.3781 20.2407C31.3125 20.1563 31.2562 20.1 31.2 20.1C31.1437 20.1 31.125 20.1469 31.125 20.1469L31.0781 20.0344Z" fill="#202020"/>
+<path d="M35.3437 19.875C35.3437 19.875 35.4844 19.875 35.5031 19.8375C35.5219 19.8094 35.4469 19.8375 35.3156 19.6875C35.1844 19.5375 34.8469 18.5531 34.4719 18.0563C33.8531 17.2406 33.2812 16.8656 33.2812 16.8656C33.2812 16.8656 33.9656 17.2594 34.5 18.0281C35.025 18.8156 35.1562 19.425 35.3063 19.5844C35.4563 19.7438 35.6063 19.7719 35.5875 19.8188C35.5875 19.8656 35.5594 19.8938 35.5031 19.9125L35.3156 19.9219L35.3344 19.8844L35.3437 19.875ZM30.8438 19.6688L30.8719 19.6781C30.9 19.6781 31.0875 19.5 31.0781 19.4438C31.0781 19.4438 30.9844 19.4156 30.9281 19.35C30.8625 19.275 30.8438 19.1719 30.8438 19.1719C30.8438 19.1719 30.9094 19.2938 30.9563 19.3219C31.0125 19.3594 31.0875 19.3781 31.125 19.35C31.1531 19.3313 31.425 19.125 31.4062 19.05C31.4062 19.05 31.3219 19.05 31.2375 18.9938C31.1625 18.9375 31.1438 18.8063 31.1438 18.8063C31.1438 18.8063 31.2 18.9094 31.2844 18.9469C31.3594 18.9844 31.4438 18.975 31.4719 18.9469C31.4906 18.9188 31.6594 18.6656 31.6406 18.6C31.6406 18.6 31.5469 18.6 31.4719 18.5531C31.3875 18.4969 31.35 18.3469 31.35 18.3469C31.35 18.3469 31.4063 18.4688 31.5094 18.4875C31.6125 18.5156 31.6969 18.45 31.7156 18.375C31.7344 18.3 31.7906 18.0281 31.6969 17.9531C31.6969 17.9531 31.5656 18 31.4719 17.9531C31.3781 17.8969 31.3406 17.775 31.3406 17.775C31.3406 17.775 31.425 17.8875 31.5281 17.9063C31.6406 17.9156 31.6875 17.8594 31.7063 17.8125C31.7274 17.7195 31.7242 17.6226 31.6969 17.5313C31.6594 17.4375 31.5937 17.4563 31.575 17.325C31.575 17.325 31.5469 17.3719 31.4062 17.3719C31.2656 17.3719 31.1906 17.2219 31.1906 17.2219C31.1906 17.2219 31.3031 17.3156 31.4156 17.3156C31.4578 17.3089 31.4962 17.2872 31.5238 17.2545C31.5513 17.2218 31.5662 17.1803 31.5656 17.1375C31.5656 17.0719 31.5094 17.0063 31.4719 16.9406C31.4531 16.8656 31.4438 16.7813 31.425 16.7906C31.4063 16.7906 31.3781 16.8656 31.2375 16.8469C31.0969 16.8188 31.0687 16.725 31.0687 16.725C31.0687 16.725 31.1625 16.7906 31.2562 16.7906C31.3312 16.7906 31.3781 16.7438 31.3781 16.6969C31.3781 16.6406 31.35 16.5375 31.1719 16.3875C31.0658 16.299 30.9563 16.2146 30.8438 16.1344C31.0156 16.3389 31.2258 16.5077 31.4625 16.6313C31.4625 16.6313 31.6219 16.6875 31.65 16.6313C31.6594 16.575 31.6594 16.5 31.6031 16.4063C31.5563 16.3125 31.4156 16.1625 31.4156 16.1625C31.4156 16.1625 31.5656 16.2844 31.6312 16.4156C31.7062 16.5375 31.6687 16.6219 31.6781 16.6594C31.6781 16.6875 31.9875 16.8094 32.0531 16.7625C32.1281 16.725 32.1 16.6313 32.0344 16.5469L31.9406 16.3781C31.9406 16.3781 32.0062 16.4531 32.0531 16.5469C32.1094 16.6406 32.1469 16.7063 32.1281 16.7438C32.1094 16.7906 32.0719 16.8094 32.0719 16.8281L32.2875 16.95C32.3812 17.0063 32.5031 17.0438 32.5219 17.025C32.5406 16.9875 32.55 16.9219 32.5406 16.8188C32.5313 16.725 32.475 16.5656 32.475 16.5656C32.475 16.5656 32.5406 16.7156 32.55 16.8188C32.5594 16.9219 32.5406 17.0063 32.5594 17.0438C32.5875 17.0813 32.6625 17.0906 32.6625 17.0906C32.6625 17.0906 32.6062 17.1281 32.475 17.0906C32.3344 17.0531 31.7531 16.7531 31.725 16.7813C31.6969 16.8188 31.9969 16.9969 32.1281 17.1281C32.2688 17.25 32.3344 17.3906 32.3344 17.3906C32.3344 17.3906 32.2313 17.2969 32.1281 17.2406C32.025 17.1844 31.7156 17.025 31.6875 17.0531C31.6687 17.0719 31.8094 17.1 31.8187 17.1188C31.8281 17.1469 31.725 17.2406 31.725 17.2875C31.725 17.325 32.1656 17.6344 32.1469 17.6625C32.1375 17.7 32.0344 17.7844 32.0156 17.775C32.0062 17.775 31.7812 17.6063 31.7812 17.625C31.7812 17.6438 31.9125 17.7656 31.9125 17.7844C31.9125 17.8125 31.8188 17.8594 31.8375 17.9156C31.8563 17.9719 32.0813 18.1594 32.0813 18.225C32.0813 18.2906 31.95 18.3469 31.9781 18.3844L32.1188 18.5719C32.1188 18.5719 31.9875 18.4875 31.95 18.4406C31.9125 18.4031 31.8281 18.3 31.8094 18.3188C31.8 18.3281 31.7156 18.5063 31.7156 18.5531C31.7344 18.5906 31.8375 18.6469 31.8562 18.7688C31.875 18.8719 31.8375 18.9938 31.8281 18.9938C31.8281 18.9938 31.6781 18.8063 31.6406 18.7969C31.6219 18.7969 31.5844 18.8063 31.5563 18.8531C31.5281 18.9 31.4438 19.05 31.4625 19.0781C31.4625 19.1063 31.6125 19.1438 31.6125 19.2563C31.6099 19.3375 31.5763 19.4146 31.5188 19.4719L31.3219 19.2469C31.3031 19.2469 31.1156 19.4625 31.1062 19.4906C31.1062 19.5094 31.2375 19.6125 31.2187 19.65C31.1906 19.6875 31.0969 19.6313 31.05 19.6594L30.8906 19.725C30.8719 19.725 30.8438 19.6688 30.8438 19.6688Z" fill="#202020"/>
+<path d="M33.2812 16.875L33.3281 16.7813C33.3563 16.7532 33.4688 16.6219 33.4219 16.5938C33.3844 16.575 33.2344 16.6219 33.1406 16.6125C33.0469 16.6125 32.9812 16.6313 32.7094 16.3969C32.7094 16.3969 31.8375 15.7969 30.4969 15.7125C30.0656 15.6938 29.8781 15.8438 29.8594 15.9188C29.8594 15.9375 29.9719 15.75 30.3938 15.7594C30.5813 15.7594 31.9406 15.8625 32.6438 16.4157C32.6813 16.4438 32.9156 16.6688 33.1312 16.6407C33.3469 16.6219 33.3938 16.5938 33.3844 16.6219C33.3844 16.6594 33.3188 16.7344 33.3 16.7719C33.2885 16.8057 33.2791 16.8401 33.2719 16.875H33.2812ZM30.9375 17.0625V17.0438C30.9188 17.0063 30.8344 16.8844 30.6844 16.7532C30.4517 16.5888 30.1998 16.4535 29.9344 16.35C29.9062 16.3407 30.4969 16.6219 30.6562 16.7719L30.9375 17.0532V17.0625Z" fill="#202020"/>
+<path d="M30.9375 18.0187C30.9375 18.0187 30.9 17.9625 30.7781 17.8875C30.7051 17.8424 30.6263 17.8077 30.5437 17.7843L30.825 17.85C30.8715 17.8979 30.9067 17.9555 30.9281 18.0187H30.9375ZM30.8625 17.5218C30.8625 17.5218 30.825 17.4656 30.6656 17.4093C30.5063 17.3531 30.4594 17.3625 30.4594 17.3625C30.4594 17.3625 30.6094 17.2968 30.7219 17.3625C30.7545 17.3762 30.7839 17.3967 30.8081 17.4225C30.8323 17.4484 30.8509 17.479 30.8625 17.5125V17.5218ZM30.7688 17.1C30.7688 17.1 30.7313 17.025 30.5813 16.9781C30.4406 16.9218 30.3375 16.9125 30.3375 16.9125C30.3375 16.9125 30.4875 16.875 30.6375 16.9312C30.7781 16.9875 30.7688 17.1 30.7688 17.1ZM30.5813 16.8375C30.5813 16.8375 30.5437 16.7812 30.2719 16.7156C29.9906 16.65 29.8969 16.65 29.8969 16.65C29.8969 16.65 30.2813 16.6125 30.3844 16.6593C30.4875 16.7062 30.5906 16.8375 30.5906 16.8375H30.5813ZM30.0844 16.5562C30.0844 16.5562 29.9156 16.5 29.7562 16.4906C29.5969 16.4812 29.3438 16.5 29.3438 16.5C29.3438 16.5 29.8125 16.425 29.9344 16.4531C30.0656 16.4812 30.0844 16.5468 30.0844 16.5468V16.5562Z" fill="#D2A567"/>
+<path d="M28.5468 22.35C28.5468 22.35 28.6312 22.5 28.7906 22.5C28.9593 22.5094 29.0812 22.7438 29.0812 22.7438L28.9031 22.9219L28.4718 22.9406L28.3312 22.7156L28.5468 22.35ZM28.5468 22.2C28.5656 22.1719 28.425 21.8906 28.3218 21.8438C28.2281 21.7969 28.3593 21.9375 28.3406 21.9938C28.3125 22.05 28.3031 22.125 28.3125 22.1344C28.3125 22.1344 28.3968 22.2656 28.35 22.3219C28.3125 22.3688 28.5562 22.2 28.5562 22.2H28.5468Z" fill="#F8C83C"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M28.3279 21.8311C28.3567 21.8442 28.3864 21.8727 28.414 21.9063C28.442 21.9405 28.4691 21.9816 28.4923 22.0219C28.5154 22.0622 28.5347 22.1021 28.5472 22.134C28.5534 22.1498 28.5581 22.1641 28.5605 22.1756C28.5613 22.1792 28.5619 22.1827 28.5623 22.186H28.6012L28.5642 22.2116L28.5599 22.2054C28.5599 22.2054 28.5599 22.2054 28.5599 22.2054L28.5642 22.2116L28.5615 22.2135L28.5538 22.2188C28.5472 22.2233 28.5378 22.2297 28.5266 22.2373C28.5043 22.2524 28.4749 22.2721 28.4467 22.2904C28.4186 22.3085 28.3911 22.3255 28.3729 22.3351C28.3683 22.3375 28.3641 22.3396 28.3605 22.3411C28.3573 22.3424 28.3529 22.344 28.3487 22.3442C28.3468 22.3443 28.3414 22.3443 28.3369 22.34C28.3314 22.335 28.3317 22.3285 28.3323 22.3254C28.333 22.3224 28.3343 22.32 28.3352 22.3184C28.3363 22.3166 28.3376 22.3149 28.339 22.3131L28.3392 22.3129C28.3477 22.3027 28.3511 22.2881 28.3499 22.2698C28.3487 22.2516 28.343 22.2314 28.3357 22.2121C28.3283 22.1929 28.3196 22.1754 28.3126 22.1625C28.3091 22.1561 28.3061 22.1509 28.304 22.1474C28.3029 22.1456 28.302 22.1442 28.3015 22.1433L28.3011 22.1428C28.2979 22.1387 28.2966 22.1338 28.296 22.1306C28.2952 22.1264 28.2949 22.1215 28.2949 22.1164C28.2949 22.1061 28.2962 22.0933 28.2986 22.0793C28.3034 22.0516 28.313 22.0179 28.3275 21.9885C28.3286 21.9846 28.3288 21.9791 28.3275 21.9717C28.3261 21.9639 28.3233 21.955 28.3194 21.9453C28.3129 21.9293 28.3043 21.9127 28.2961 21.897C28.2942 21.8935 28.2924 21.89 28.2906 21.8866C28.2859 21.8775 28.2815 21.8687 28.2785 21.861C28.2769 21.8572 28.2756 21.8534 28.2747 21.8497C28.2739 21.8462 28.2733 21.8418 28.274 21.8374C28.2747 21.8325 28.2773 21.8269 28.283 21.8234C28.2881 21.8203 28.2937 21.8201 28.2979 21.8205C28.306 21.8213 28.3162 21.8252 28.3279 21.8311ZM28.3243 22.1268L28.3244 22.1269L28.3246 22.1273L28.3254 22.1285C28.326 22.1295 28.3269 22.131 28.3281 22.1329C28.3304 22.1368 28.3336 22.1423 28.3373 22.1491C28.3446 22.1626 28.354 22.1814 28.3619 22.202C28.3698 22.2226 28.3765 22.2458 28.3779 22.268C28.3787 22.2792 28.3781 22.2907 28.3754 22.3015C28.3911 22.2924 28.4108 22.28 28.4314 22.2667C28.4594 22.2487 28.4886 22.2291 28.5108 22.214C28.5175 22.2095 28.5236 22.2054 28.5287 22.2018L28.5344 22.1933C28.5345 22.193 28.5345 22.1926 28.5345 22.192C28.5345 22.1897 28.5341 22.1863 28.5331 22.1815C28.531 22.1721 28.527 22.1594 28.521 22.1442C28.5092 22.1139 28.4904 22.0753 28.4679 22.0359C28.4453 21.9966 28.419 21.9568 28.3923 21.9242C28.3652 21.8912 28.3388 21.8669 28.316 21.8566L28.3156 21.8564C28.3113 21.8543 28.3078 21.8527 28.305 21.8515C28.3075 21.8576 28.3111 21.865 28.3156 21.8737C28.3172 21.8768 28.319 21.8801 28.3207 21.8835C28.329 21.8992 28.3384 21.9174 28.3454 21.9348C28.3497 21.9454 28.3533 21.9564 28.3552 21.9668C28.357 21.9772 28.3573 21.9881 28.3539 21.9982L28.3536 21.9992L28.3532 22.0001C28.3399 22.0267 28.3308 22.0581 28.3263 22.0841C28.3241 22.097 28.323 22.1082 28.323 22.1164C28.323 22.1205 28.3233 22.1235 28.3237 22.1253C28.3237 22.1256 28.3238 22.1258 28.3238 22.126L28.3243 22.1268ZM28.324 22.1267C28.324 22.1267 28.324 22.1267 28.324 22.1266L28.324 22.1267ZM28.3477 22.7154L28.4794 22.9263L28.897 22.9081L29.0638 22.7413C29.0637 22.7411 29.0636 22.7409 29.0634 22.7407C29.0599 22.7344 29.0546 22.7254 29.0477 22.7146C29.0339 22.6928 29.0138 22.6638 28.9886 22.6346C28.9376 22.5756 28.8684 22.5186 28.7902 22.5141C28.706 22.514 28.642 22.4743 28.5995 22.4354C28.5782 22.4159 28.562 22.3964 28.5512 22.3818C28.5499 22.38 28.5486 22.3783 28.5475 22.3767L28.3477 22.7154ZM28.5469 22.35L28.5347 22.3429L28.3148 22.7159L28.4643 22.9551L28.9092 22.9357L29.0985 22.7464L29.0937 22.7373L29.0812 22.7438C29.0937 22.7373 29.0937 22.7373 29.0937 22.7373L29.0936 22.7371L29.0933 22.7365L29.0922 22.7344C29.0912 22.7326 29.0898 22.73 29.0879 22.7267C29.0841 22.7201 29.0786 22.7107 29.0714 22.6995C29.0571 22.677 29.0362 22.6468 29.0098 22.6162C28.9577 22.5558 28.8818 22.491 28.7914 22.486L28.7906 22.486C28.7156 22.486 28.6579 22.4507 28.6185 22.4147C28.5988 22.3966 28.5838 22.3786 28.5738 22.3651C28.5688 22.3584 28.5651 22.3528 28.5626 22.3489C28.5614 22.347 28.5605 22.3455 28.5599 22.3445L28.5593 22.3434L28.5591 22.3432L28.5469 22.35Z" fill="#977C2E"/>
+<path d="M28.4813 22.6313C28.4813 22.6313 28.5563 22.6688 28.6125 22.65C28.6781 22.6313 28.7344 22.5657 28.7344 22.5657M28.3969 22.5188C28.3969 22.5188 28.6406 22.3407 28.6219 22.2469C28.6031 22.1532 28.5563 22.1532 28.5281 22.1625C28.4528 22.2024 28.3859 22.2565 28.3313 22.3219C28.3219 22.35 28.3969 22.5188 28.3969 22.5188Z" fill="#F8C83C"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M28.5858 22.154C28.6082 22.1675 28.626 22.1955 28.6357 22.2442C28.6416 22.2736 28.6268 22.3066 28.6063 22.3368C28.5853 22.3679 28.5558 22.3998 28.5262 22.4282C28.4965 22.4567 28.4663 22.4821 28.4435 22.5005C28.4321 22.5096 28.4226 22.517 28.4159 22.5222C28.4125 22.5247 28.4099 22.5267 28.408 22.5281L28.406 22.5296L28.4054 22.53L28.4053 22.5301L28.3969 22.5188L28.3841 22.5245L28.3838 22.524L28.3832 22.5226L28.3808 22.5171C28.3788 22.5124 28.3758 22.5057 28.3724 22.4975C28.3655 22.4811 28.3563 22.459 28.3474 22.436C28.3386 22.413 28.3299 22.3888 28.3241 22.3685C28.3211 22.3583 28.3188 22.3488 28.3175 22.3407C28.3164 22.3333 28.3156 22.3245 28.3179 22.3175L28.3188 22.315L28.3205 22.3129C28.3763 22.2461 28.4446 22.1908 28.5216 22.1501L28.5226 22.1496L28.5237 22.1492C28.5397 22.1439 28.5632 22.1405 28.5858 22.154ZM28.4027 22.4968C28.4088 22.4921 28.4167 22.4859 28.4259 22.4786C28.4482 22.4606 28.4778 22.4356 28.5067 22.4079C28.5357 22.38 28.5636 22.3498 28.583 22.3211C28.603 22.2916 28.6116 22.2671 28.6081 22.2497C28.5991 22.2046 28.584 22.1858 28.5713 22.1781C28.5591 22.1708 28.5456 22.1718 28.5337 22.1756C28.4615 22.2139 28.3973 22.2656 28.3445 22.328C28.3445 22.3295 28.3446 22.3322 28.3453 22.3363C28.3463 22.3428 28.3483 22.351 28.3511 22.3607C28.3566 22.3799 28.365 22.4032 28.3737 22.4259C28.3824 22.4485 28.3914 22.4703 28.3983 22.4865C28.3999 22.4903 28.4014 22.4937 28.4027 22.4968ZM28.6167 22.6635C28.6522 22.6533 28.6843 22.6308 28.7071 22.6116C28.7187 22.6019 28.7281 22.5928 28.7346 22.5861C28.7379 22.5827 28.7405 22.5799 28.7423 22.578L28.7443 22.5757L28.7449 22.5751L28.745 22.5749L28.7451 22.5748L28.7237 22.5565L28.7236 22.5566L28.7232 22.5571L28.7215 22.5591C28.7199 22.5608 28.7176 22.5633 28.7145 22.5664C28.7085 22.5726 28.6997 22.5811 28.689 22.5901C28.6673 22.6083 28.6387 22.628 28.6087 22.6365L28.6081 22.6367C28.584 22.6448 28.5545 22.641 28.5295 22.6341C28.5173 22.6308 28.5067 22.6269 28.4992 22.6238C28.4954 22.6223 28.4925 22.621 28.4905 22.6201L28.4882 22.619L28.4877 22.6188L28.4876 22.6187L28.475 22.6439L28.4751 22.6439L28.4753 22.644L28.4761 22.6444C28.4767 22.6447 28.4776 22.6451 28.4788 22.6457C28.4811 22.6467 28.4844 22.6482 28.4886 22.6499C28.4969 22.6533 28.5085 22.6576 28.5221 22.6613C28.5486 22.6685 28.5846 22.6741 28.6167 22.6635Z" fill="#977C2E"/>
+<path d="M28.2188 22.6407C28.2188 22.6407 28.275 22.7625 28.35 22.7625C28.425 22.7625 28.5375 22.6969 28.5375 22.65C28.5469 22.6032 28.4625 22.5094 28.4156 22.4906C28.3594 22.4625 28.2375 22.5282 28.2375 22.5282L28.2281 22.6407H28.2188Z" fill="#F8C83C"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M28.4214 22.4778C28.435 22.4834 28.4502 22.4937 28.4649 22.5062C28.4799 22.5189 28.4952 22.5345 28.5086 22.5509C28.5219 22.5673 28.5338 22.585 28.5417 22.6021C28.5493 22.6182 28.5542 22.6357 28.5515 22.6515C28.551 22.668 28.5413 22.6837 28.5291 22.6969C28.5162 22.711 28.4986 22.7244 28.4791 22.736C28.4403 22.759 28.3909 22.7766 28.35 22.7766C28.3273 22.7766 28.3069 22.7674 28.2896 22.7549C28.2723 22.7424 28.2573 22.726 28.2451 22.7102C28.2329 22.6943 28.2231 22.6784 28.2165 22.6666C28.2131 22.6607 28.2105 22.6558 28.2088 22.6523C28.2079 22.6505 28.2072 22.6491 28.2067 22.6481L28.2062 22.647L28.2061 22.6467L28.206 22.6466L28.1968 22.6266H28.2152L28.2241 22.5194L28.2308 22.5158L28.231 22.5157L28.2313 22.5156L28.2324 22.515C28.2333 22.5145 28.2347 22.5138 28.2365 22.5129C28.2401 22.5111 28.2452 22.5085 28.2515 22.5056C28.2641 22.4998 28.2816 22.4922 28.3009 22.4856C28.3202 22.479 28.3417 22.4731 28.3625 22.4707C28.3827 22.4684 28.4039 22.4693 28.4214 22.4778ZM28.2509 22.5371L28.2412 22.6532C28.2474 22.6642 28.2563 22.6787 28.2674 22.693C28.2786 22.7077 28.2918 22.7218 28.3061 22.7321C28.3204 22.7425 28.3352 22.7485 28.35 22.7485C28.3841 22.7485 28.4285 22.7333 28.4647 22.7118C28.4827 22.7011 28.4979 22.6893 28.5084 22.6779C28.5193 22.666 28.5234 22.6565 28.5234 22.6501V22.6487L28.5237 22.6473C28.5252 22.64 28.5232 22.6287 28.5163 22.614C28.5096 22.5996 28.4992 22.5839 28.4868 22.5687C28.4744 22.5535 28.4603 22.5392 28.4467 22.5276C28.4328 22.5159 28.4201 22.5076 28.4104 22.5037L28.4093 22.5033C28.3988 22.498 28.3839 22.4966 28.3657 22.4986C28.3477 22.5007 28.3283 22.5059 28.31 22.5122C28.2919 22.5184 28.2754 22.5255 28.2634 22.5311C28.2583 22.5335 28.2541 22.5355 28.2509 22.5371Z" fill="#977C2E"/>
+<path d="M28.4437 22.4812C28.4437 22.5187 28.2843 22.5937 28.2281 22.5937C28.1812 22.5937 28.0781 22.4718 28.1156 22.4531L28.2562 22.4156C28.2937 22.3968 28.3031 22.3406 28.3218 22.3406C28.35 22.3406 28.4156 22.35 28.425 22.3875C28.4437 22.4343 28.4625 22.4437 28.4437 22.4812Z" fill="#F8C83C"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M28.3083 22.378C28.2991 22.3942 28.2855 22.4167 28.2625 22.4282L28.2612 22.4288L28.1218 22.466C28.1217 22.4661 28.1217 22.4662 28.1217 22.4664C28.1214 22.4683 28.1218 22.4721 28.124 22.4782C28.1283 22.4901 28.1381 22.5057 28.1511 22.5215C28.164 22.5372 28.1793 22.5522 28.1939 22.5631C28.2012 22.5686 28.2081 22.5729 28.2142 22.5757C28.2205 22.5786 28.2251 22.5797 28.2281 22.5797C28.2398 22.5797 28.2585 22.5756 28.2811 22.5681C28.3033 22.5607 28.3278 22.5504 28.3507 22.539C28.3737 22.5275 28.3945 22.5151 28.4093 22.5035C28.4168 22.4977 28.4223 22.4925 28.4258 22.4881C28.4294 22.4835 28.4297 22.4814 28.4297 22.4812C28.4297 22.4812 28.4297 22.4812 28.4297 22.4812L28.4437 22.4812L28.4312 22.4749C28.4354 22.4666 28.437 22.4607 28.4373 22.4562C28.4377 22.4518 28.437 22.4477 28.4352 22.4427C28.4334 22.4376 28.4306 22.4322 28.4267 22.4246C28.4265 22.4241 28.4262 22.4235 28.4259 22.423C28.4218 22.4149 28.4169 22.405 28.4119 22.3927L28.4116 22.3918L28.4113 22.3909C28.4085 22.3797 28.3963 22.3701 28.376 22.3633C28.3573 22.3571 28.3363 22.3548 28.3232 22.3547C28.3227 22.3551 28.3217 22.3561 28.3203 22.358C28.3175 22.3618 28.3146 22.3669 28.311 22.3733C28.3101 22.3748 28.3092 22.3764 28.3083 22.378ZM28.4575 22.485C28.4565 22.4929 28.4523 22.4999 28.4478 22.5056C28.4424 22.5124 28.435 22.5192 28.4266 22.5257C28.4098 22.5388 28.3872 22.5522 28.3633 22.5641C28.3393 22.5761 28.3135 22.5869 28.29 22.5948C28.2668 22.6025 28.2445 22.6078 28.2281 22.6078C28.2194 22.6078 28.2106 22.605 28.2023 22.6012C28.194 22.5973 28.1854 22.5919 28.1771 22.5857C28.1604 22.5732 28.1434 22.5565 28.1294 22.5394C28.1154 22.5224 28.1035 22.504 28.0976 22.4878C28.0947 22.4798 28.0927 22.471 28.0938 22.4627C28.095 22.4535 28.1 22.4452 28.1093 22.4405L28.1106 22.4399L28.2511 22.4024C28.265 22.395 28.2746 22.3803 28.2839 22.3641C28.2846 22.3628 28.2854 22.3614 28.2862 22.3601C28.2898 22.3536 28.2937 22.3467 28.2977 22.3413C28.3019 22.3355 28.3098 22.3265 28.3219 22.3265C28.3371 22.3265 28.3621 22.329 28.3849 22.3366C28.4065 22.3438 28.4314 22.3574 28.4384 22.3831C28.4427 22.3938 28.447 22.4025 28.451 22.4102C28.4513 22.4109 28.4517 22.4116 28.452 22.4123C28.4556 22.4193 28.4592 22.4263 28.4616 22.4331C28.4645 22.4409 28.4662 22.4491 28.4654 22.4585C28.4646 22.467 28.462 22.4756 28.4575 22.485Z" fill="#977C2E"/>
+<path d="M28.2938 22.5844C28.2938 22.5844 28.05 22.9032 27.9469 22.8938C27.8531 22.875 27.9938 22.425 27.9938 22.425L28.1063 22.4813C28.1906 22.5 28.2656 22.5375 28.2938 22.575V22.5844Z" fill="#F8C83C"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M27.9853 22.405L28.111 22.4679C28.1536 22.4775 28.1939 22.4918 28.2274 22.5085C28.261 22.5253 28.2891 22.5453 28.305 22.5666L28.3079 22.5703V22.5891L28.305 22.5929L28.3048 22.5932L28.3042 22.5939L28.3021 22.5966C28.3003 22.5989 28.2976 22.6024 28.2942 22.6068C28.2872 22.6155 28.2773 22.628 28.265 22.643C28.2404 22.6728 28.2065 22.7127 28.1693 22.7522C28.1322 22.7917 28.0914 22.8313 28.0532 22.8605C28.0341 22.8752 28.0152 22.8875 27.9974 22.8959C27.9799 22.9042 27.9621 22.9093 27.9457 22.9078L27.9449 22.9077L27.9442 22.9075C27.9257 22.9038 27.9148 22.8895 27.9088 22.873C27.9029 22.8567 27.9006 22.8356 27.9006 22.8126C27.9006 22.7663 27.9097 22.7072 27.9214 22.6495C27.9332 22.5917 27.948 22.5345 27.9597 22.4919C27.9656 22.4705 27.9708 22.4528 27.9745 22.4404C27.9763 22.4342 27.9778 22.4293 27.9788 22.426L27.98 22.4221L27.9803 22.4212L27.9803 22.4209L27.9938 22.425L27.9804 22.4208L27.9853 22.405ZM28.0024 22.445C28.0021 22.4461 28.0018 22.4472 28.0014 22.4484C27.9978 22.4606 27.9927 22.4782 27.9868 22.4993C27.9752 22.5417 27.9606 22.5982 27.949 22.6552C27.9373 22.7124 27.9288 22.7692 27.9288 22.8126C27.9288 22.8344 27.9309 22.8516 27.9352 22.8634C27.9393 22.8746 27.9442 22.8786 27.949 22.8798C27.9582 22.8804 27.9704 22.8776 27.9854 22.8704C28.0007 22.8632 28.0178 22.8521 28.0361 22.8382C28.0726 22.8103 28.1121 22.772 28.1488 22.7329C28.1854 22.694 28.2189 22.6547 28.2432 22.6251C28.2554 22.6103 28.2653 22.598 28.2721 22.5893C28.2753 22.5853 28.2778 22.582 28.2796 22.5797C28.2668 22.5646 28.2445 22.5485 28.2149 22.5337C28.1832 22.5178 28.1444 22.5041 28.1032 22.495L28.1016 22.4946L28.0024 22.445Z" fill="#977C2E"/>
+<path d="M27.8625 22.35C27.8625 22.35 28.1719 22.4062 28.1813 22.4531C28.2 22.5094 28.0407 22.575 27.9469 22.575C27.8625 22.575 27.8625 22.35 27.8625 22.35Z" fill="#F8C83C"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M27.865 22.3361L27.8625 22.35H27.8484L27.8484 22.3331L27.865 22.3361ZM28.1948 22.4494C28.2015 22.4707 28.1906 22.4905 28.1757 22.5057C28.1603 22.5214 28.1376 22.5358 28.1122 22.5478C28.0616 22.5719 27.9963 22.589 27.9468 22.589C27.9183 22.589 27.8987 22.5697 27.8858 22.5467C27.8728 22.5236 27.8645 22.4937 27.8592 22.4651C27.8538 22.4362 27.8511 22.4074 27.8497 22.386C27.8491 22.3753 27.8487 22.3663 27.8486 22.36C27.8485 22.3569 27.8484 22.3544 27.8484 22.3527L27.8484 22.3507L27.8484 22.3502L27.8484 22.35H27.8625L27.865 22.3361L27.8659 22.3363L27.8685 22.3368C27.8708 22.3372 27.8742 22.3379 27.8784 22.3387C27.8869 22.3403 27.8991 22.3427 27.9138 22.3457C27.943 22.3518 27.9822 22.3603 28.0218 22.3703C28.0612 22.3803 28.1014 22.3919 28.1326 22.4041C28.1481 22.4102 28.1619 22.4166 28.1724 22.4234C28.1777 22.4268 28.1825 22.4305 28.1864 22.4346C28.19 22.4385 28.1934 22.4434 28.1948 22.4494ZM27.8769 22.367C27.8771 22.372 27.8774 22.3778 27.8778 22.3843C27.8791 22.405 27.8817 22.4325 27.8868 22.4599C27.892 22.4875 27.8996 22.5138 27.9103 22.5329C27.9211 22.5521 27.9332 22.5609 27.9468 22.5609C27.9912 22.5609 28.0524 22.5452 28.1002 22.5224C28.1241 22.5111 28.1435 22.4984 28.1556 22.486C28.1681 22.4733 28.17 22.4641 28.1679 22.4576L28.1676 22.4567L28.1674 22.456C28.1674 22.4559 28.167 22.4551 28.1658 22.4538C28.1641 22.452 28.1613 22.4497 28.1572 22.447C28.149 22.4418 28.1371 22.4361 28.1223 22.4303C28.0928 22.4188 28.0539 22.4075 28.0149 22.3976C27.9759 22.3877 27.9371 22.3793 27.9081 22.3733C27.8957 22.3707 27.885 22.3686 27.8769 22.367Z" fill="#977C2E"/>
+<path d="M27.0938 22.8187C27.0938 22.8187 27.1406 22.9687 27.2719 22.9781C27.4031 22.9781 27.5344 22.8375 27.5344 22.8375L27.2156 22.7156L27.0938 22.8187Z" fill="#202220"/>
+<path d="M27.0937 22.8188L27.1312 22.9032C27.1594 22.9407 27.1969 22.9782 27.2719 22.9875H27.2812C27.4125 22.9875 27.5344 22.8375 27.5344 22.8375L27.2156 22.7063L27.0844 22.8188H27.0937L27.2156 22.725L27.525 22.8469V22.8375L27.5062 22.8563C27.4687 22.8938 27.375 22.9688 27.2812 22.9688H27.2719C27.2456 22.9674 27.2201 22.9598 27.1974 22.9468C27.1746 22.9338 27.1551 22.9156 27.1406 22.8938C27.129 22.8762 27.1196 22.8574 27.1125 22.8375V22.8282L27.1031 22.8188H27.0937Z" fill="#4B4139"/>
+<path d="M27.1875 22.7812C27.1875 22.7812 27.2344 22.8937 27.4125 22.8937C27.5906 22.8937 27.7219 22.7531 27.7219 22.7531L27.4406 22.5375L27.1875 22.7812Z" fill="#202220"/>
+<path d="M27.1875 22.7812C27.1875 22.7812 27.2343 22.8937 27.4125 22.9031C27.6 22.9031 27.7312 22.7625 27.7312 22.7625L27.45 22.5281L27.1687 22.7812H27.1875L27.45 22.5468L27.7218 22.7625V22.7531C27.6409 22.8315 27.5344 22.8781 27.4218 22.8843C27.3546 22.8886 27.2881 22.8687 27.2343 22.8281C27.2236 22.8167 27.2141 22.8041 27.2062 22.7906C27.2029 22.7877 27.1997 22.7845 27.1968 22.7812H27.1875Z" fill="#4B4139"/>
+<path d="M27.2063 22.8094C27.2063 22.8094 27.2907 22.8657 27.375 22.875C27.4688 22.875 27.5813 22.8469 27.5813 22.8469L27.4782 22.8844L27.4032 22.8938L27.3282 22.8844L27.2719 22.8563L27.2157 22.8188V22.8L27.2063 22.8094Z" fill="#4B4139"/>
+<path d="M27.4125 22.65C27.4125 22.65 27.4875 22.8375 27.6562 22.8187C27.8156 22.8 27.8156 22.7062 27.8156 22.7062L27.6281 22.4437L27.4125 22.65Z" fill="#202220"/>
+<path d="M27.4125 22.65L27.4593 22.7438C27.4968 22.7813 27.5531 22.8375 27.6281 22.8375L27.6562 22.8282C27.7312 22.8188 27.7781 22.7907 27.7968 22.7625C27.825 22.7344 27.825 22.7063 27.825 22.7063L27.6375 22.425L27.4031 22.65H27.4125L27.6375 22.4532L27.8156 22.7063C27.8156 22.725 27.7875 22.8 27.6468 22.8094H27.6281C27.5976 22.8095 27.5675 22.8028 27.54 22.7898C27.5124 22.7768 27.4881 22.7579 27.4687 22.7344C27.4545 22.7168 27.442 22.698 27.4312 22.6782V22.6594C27.4279 22.6564 27.4248 22.6533 27.4218 22.65H27.4125Z" fill="#4B4139"/>
+<path d="M27.4312 22.6875C27.4312 22.6875 27.525 22.8094 27.6187 22.8094C27.6681 22.8094 27.7166 22.7965 27.7594 22.7719V22.7812L27.7125 22.8094L27.6375 22.8187H27.5625L27.4969 22.7719L27.4406 22.6875H27.4312ZM27.1312 22.875C27.1312 22.875 27.2062 22.9594 27.2719 22.9594C27.3346 22.9536 27.3953 22.9344 27.45 22.9031H27.4594L27.4406 22.9125L27.3656 22.95L27.2812 22.9781L27.2156 22.9688L27.1594 22.9313L27.1312 22.8937V22.875Z" fill="#4B4139"/>
+<path d="M27.8438 22.3406C27.9188 22.3218 28.0688 22.5281 28.0688 22.6406C28.0688 22.7531 28.0219 22.8937 27.9469 22.8937C27.8719 22.8937 27.7031 22.7343 27.6656 22.6593C27.6281 22.5749 27.5906 22.5281 27.6188 22.4812C27.6469 22.4437 27.8438 22.3406 27.8438 22.3406ZM27.0938 22.3593C27.0938 22.3593 26.9625 22.2656 26.9156 22.3124C26.8688 22.3593 26.8875 22.5281 26.9156 22.5562C26.9531 22.5937 27.1031 22.4812 27.1031 22.4812L27.0844 22.3593H27.0938Z" fill="#F8C83C"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M27.0704 22.3607C27.0687 22.3596 27.067 22.3585 27.0652 22.3574C27.0524 22.3495 27.0351 22.3396 27.0165 22.3311C26.9977 22.3226 26.9784 22.3159 26.9616 22.314C26.9447 22.312 26.933 22.3151 26.9256 22.3224C26.9169 22.3311 26.91 22.3471 26.9057 22.369C26.9016 22.3905 26.9004 22.4157 26.9016 22.4407C26.9027 22.4657 26.9061 22.49 26.9109 22.5095C26.9132 22.5193 26.9159 22.5276 26.9186 22.5341C26.9215 22.5409 26.924 22.5447 26.9256 22.5463C26.9272 22.5478 26.93 22.5494 26.9354 22.5497C26.941 22.5501 26.9482 22.5492 26.9571 22.5467C26.9748 22.5419 26.9959 22.532 27.0166 22.5205C27.0372 22.509 27.0568 22.4964 27.0712 22.4866C27.0782 22.4819 27.0839 22.4778 27.088 22.4749L27.0704 22.3607ZM27.1116 22.4925L27.1115 22.4926L27.1111 22.4928L27.1098 22.4938C27.1087 22.4946 27.107 22.4959 27.1049 22.4974C27.1006 22.5005 27.0945 22.5048 27.087 22.5098C27.0722 22.5199 27.0519 22.5331 27.0303 22.5451C27.0089 22.557 26.9854 22.5682 26.9645 22.5739C26.954 22.5767 26.9434 22.5784 26.9335 22.5778C26.9236 22.5771 26.9135 22.5739 26.9057 22.5662C26.9003 22.5607 26.8961 22.5531 26.8927 22.545C26.8892 22.5368 26.8861 22.5269 26.8835 22.5162C26.8783 22.4947 26.8747 22.4686 26.8735 22.442C26.8723 22.4155 26.8735 22.3879 26.8781 22.3637C26.8827 22.3399 26.891 22.3172 26.9057 22.3025C26.9218 22.2864 26.944 22.2836 26.9649 22.286C26.9859 22.2885 27.0082 22.2965 27.0281 22.3055C27.0482 22.3146 27.0666 22.3252 27.0799 22.3335C27.0866 22.3376 27.0921 22.3412 27.0959 22.3437C27.0978 22.345 27.0993 22.346 27.1003 22.3467L27.1015 22.3476L27.1018 22.3478L27.1019 22.3479L27.1377 22.3734H27.1008L27.1183 22.4874L27.1116 22.4925ZM27.8438 22.3406L27.8373 22.3281L27.8367 22.3284L27.835 22.3293L27.8287 22.3327C27.8232 22.3356 27.8154 22.3398 27.8059 22.3449C27.7869 22.3552 27.7613 22.3693 27.7348 22.3847C27.7083 22.4 27.6808 22.4165 27.658 22.4317C27.6466 22.4393 27.6363 22.4466 27.6278 22.4534C27.6195 22.4599 27.6122 22.4666 27.6075 22.4728L27.6071 22.4734L27.6067 22.474C27.5895 22.5027 27.5932 22.5312 27.6044 22.5611C27.61 22.5759 27.6176 22.5918 27.6259 22.6087C27.627 22.6108 27.628 22.6129 27.629 22.615C27.6366 22.6303 27.6447 22.6468 27.6528 22.665L27.6531 22.6656C27.6731 22.7056 27.7263 22.7657 27.783 22.8152C27.8115 22.8402 27.8415 22.863 27.8694 22.8797C27.8967 22.896 27.9241 22.9078 27.9469 22.9078C27.9704 22.9078 27.9908 22.8967 28.0075 22.8799C28.0242 22.8633 28.0379 22.8405 28.0489 22.8149C28.0708 22.7637 28.0828 22.6985 28.0828 22.6406C28.0828 22.6097 28.0727 22.5737 28.0571 22.538C28.0414 22.5021 28.0197 22.4654 27.9957 22.433C27.9718 22.4007 27.9451 22.372 27.919 22.3525C27.8938 22.3336 27.8657 22.3206 27.8404 22.3269L27.8438 22.3406ZM27.9021 22.375C27.8791 22.3577 27.8608 22.3517 27.8487 22.3539L27.8481 22.3542L27.8419 22.3575C27.8365 22.3604 27.8287 22.3645 27.8193 22.3696C27.8005 22.3799 27.7751 22.3939 27.7489 22.409C27.7226 22.4242 27.6957 22.4404 27.6736 22.4551C27.6626 22.4625 27.6529 22.4693 27.6453 22.4754C27.6378 22.4813 27.633 22.4859 27.6304 22.4891C27.62 22.507 27.621 22.5253 27.6308 22.5513C27.6358 22.5646 27.6428 22.5792 27.6512 22.5963C27.6522 22.5983 27.6532 22.6004 27.6543 22.6025C27.6618 22.6178 27.6701 22.6346 27.6784 22.6533C27.696 22.6883 27.7458 22.7453 27.8015 22.7941C27.8292 22.8183 27.8578 22.84 27.8838 22.8556C27.9104 22.8715 27.9322 22.8796 27.9469 22.8796C27.9609 22.8796 27.9745 22.8732 27.9877 22.86C28.0009 22.8468 28.0129 22.8274 28.023 22.8038C28.0433 22.7565 28.0547 22.6952 28.0547 22.6406C28.0547 22.6152 28.0462 22.5833 28.0313 22.5492C28.0165 22.5154 27.996 22.4806 27.9731 22.4497C27.9502 22.4188 27.9253 22.3924 27.9021 22.375Z" fill="#977C2E"/>
+<path d="M27.075 22.4719C27.075 22.4719 26.9062 22.4907 26.9062 22.5657C26.9062 22.6407 26.9906 22.7157 27 22.7344C27.0187 22.7438 27.1687 22.6688 27.1687 22.6688L27.075 22.4719Z" fill="#F8C83C"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M27.0735 22.4579L27.075 22.4719L27.0877 22.4658L27.1874 22.6751L27.1751 22.6813L27.1746 22.6815L27.1733 22.6822L27.1685 22.6846C27.1643 22.6866 27.1583 22.6895 27.1511 22.693C27.1367 22.6999 27.1172 22.7091 27.0971 22.7179C27.0771 22.7268 27.0561 22.7355 27.0389 22.7414C27.0303 22.7443 27.0222 22.7467 27.0154 22.748C27.012 22.7487 27.0085 22.7492 27.0052 22.7492C27.0023 22.7493 26.9979 22.749 26.9937 22.7469L26.9895 22.7448L26.9874 22.7407C26.987 22.7398 26.9856 22.7377 26.9823 22.7336C26.9794 22.73 26.9758 22.7257 26.9714 22.7206L26.9707 22.7197C26.9615 22.7089 26.9498 22.6951 26.9383 22.6794C26.9157 22.6485 26.8922 22.6079 26.8922 22.5656C26.8922 22.5409 26.9063 22.522 26.924 22.5082C26.9416 22.4945 26.9645 22.4845 26.9862 22.4773C27.0081 22.47 27.0299 22.4651 27.0461 22.4621C27.0542 22.4606 27.061 22.4596 27.0658 22.4589C27.0682 22.4586 27.0701 22.4583 27.0714 22.4581L27.0729 22.458L27.0733 22.4579L27.0735 22.4579ZM27.1501 22.6622L27.0667 22.4872C27.0626 22.4878 27.0573 22.4887 27.0512 22.4898C27.0358 22.4926 27.0154 22.4972 26.9951 22.504C26.9746 22.5108 26.9553 22.5195 26.9413 22.5304C26.9273 22.5413 26.9203 22.5528 26.9203 22.5656C26.9203 22.5984 26.939 22.6327 26.961 22.6628C26.9718 22.6776 26.9829 22.6907 26.9921 22.7015L26.9929 22.7025C26.9972 22.7075 27.0011 22.7121 27.0043 22.716C27.0055 22.7176 27.0068 22.7192 27.008 22.7208C27.0086 22.7207 27.0092 22.7206 27.01 22.7204C27.0149 22.7195 27.0216 22.7175 27.0297 22.7148C27.0459 22.7092 27.0659 22.7009 27.0858 22.6922C27.1055 22.6835 27.1247 22.6745 27.139 22.6676C27.1431 22.6656 27.1469 22.6638 27.1501 22.6622Z" fill="#977C2E"/>
+<path d="M27.1407 22.6032C27.1407 22.6032 26.9719 22.6594 26.9719 22.7157C26.9719 22.7719 27.0469 22.875 27.0938 22.875C27.1407 22.875 27.1875 22.7813 27.2063 22.7532C27.2344 22.7344 27.1407 22.6032 27.1407 22.6032ZM27.2157 22.125C27.2157 22.125 27.1875 22.0782 27.1219 22.1063C27.0469 22.1344 26.9719 22.2 26.9813 22.3219C26.9907 22.425 27.0375 22.5094 27.0375 22.5094L27.2907 22.4157L27.2157 22.125Z" fill="#F8C83C"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M27.2276 22.1178C27.2276 22.1178 27.2276 22.1178 27.2156 22.1251L27.2292 22.1215L27.3074 22.4245L27.031 22.5268L27.0252 22.5163L27.0251 22.5162L27.025 22.5159L27.0245 22.5151C27.0242 22.5144 27.0236 22.5134 27.0229 22.5121C27.0216 22.5094 27.0196 22.5056 27.0173 22.5007C27.0126 22.4909 27.0063 22.4767 26.9997 22.4593C26.9865 22.4246 26.972 22.3764 26.9672 22.3232L26.9672 22.323C26.9622 22.2587 26.9796 22.2084 27.0087 22.1704C27.0376 22.1328 27.0774 22.108 27.1166 22.0932C27.153 22.0777 27.1809 22.0825 27.2 22.0927C27.2092 22.0977 27.216 22.1038 27.2205 22.1086C27.2227 22.111 27.2244 22.1132 27.2256 22.1148C27.2262 22.1156 27.2266 22.1163 27.227 22.1168L27.2274 22.1174L27.2275 22.1177L27.2276 22.1178ZM27.0443 22.4919L27.2738 22.4069L27.2026 22.131C27.202 22.1302 27.201 22.129 27.1998 22.1277C27.197 22.1246 27.1926 22.1207 27.1866 22.1175C27.1753 22.1114 27.1564 22.1068 27.1274 22.1192L27.1268 22.1195C27.0911 22.1329 27.056 22.1549 27.031 22.1875C27.0063 22.2198 26.9908 22.2632 26.9952 22.3208C26.9998 22.3706 27.0134 22.4162 27.026 22.4494C27.0323 22.4659 27.0383 22.4794 27.0427 22.4886C27.0432 22.4898 27.0438 22.4909 27.0443 22.4919ZM27.1361 22.5898L27.1406 22.6032L27.152 22.595L27.1521 22.5951L27.1523 22.5954L27.1531 22.5966L27.1561 22.6009C27.1587 22.6045 27.1623 22.6098 27.1665 22.6162C27.175 22.629 27.186 22.6462 27.1962 22.6642C27.2063 22.682 27.2159 22.7012 27.2212 22.7175C27.2238 22.7256 27.2257 22.734 27.2255 22.7417C27.2254 22.7486 27.2234 22.7569 27.2167 22.7628C27.214 22.767 27.2108 22.7724 27.2069 22.7788C27.2046 22.7826 27.2021 22.7869 27.1993 22.7914C27.1915 22.8043 27.1821 22.819 27.1718 22.833C27.1615 22.8469 27.1499 22.8606 27.1373 22.8708C27.1249 22.881 27.1101 22.8891 27.0937 22.8891C27.0773 22.8891 27.0607 22.8804 27.0463 22.8692C27.0314 22.8577 27.0168 22.842 27.0039 22.8249C26.9911 22.8077 26.9797 22.7886 26.9714 22.77C26.9633 22.7515 26.9578 22.7325 26.9578 22.7157C26.9578 22.6948 26.9729 22.6771 26.9892 22.6636C27.0062 22.6494 27.0284 22.6365 27.0499 22.6258C27.0715 22.6149 27.093 22.606 27.1091 22.5997C27.1172 22.5966 27.1239 22.5941 27.1286 22.5925C27.131 22.5916 27.1328 22.591 27.1341 22.5905L27.1356 22.59L27.136 22.5899L27.1361 22.5898ZM27.1351 22.62C27.1309 22.6215 27.1255 22.6235 27.1193 22.626C27.1037 22.632 27.0831 22.6406 27.0625 22.6509C27.0418 22.6613 27.0218 22.673 27.0072 22.6852C26.9918 22.698 26.9859 22.7084 26.9859 22.7157C26.9859 22.727 26.9898 22.7419 26.9971 22.7586C27.0044 22.7751 27.0147 22.7924 27.0264 22.808C27.0382 22.8237 27.0511 22.8374 27.0635 22.8469C27.0763 22.8568 27.0867 22.861 27.0937 22.861C27.1007 22.861 27.1094 22.8574 27.1195 22.8491C27.1295 22.8409 27.1395 22.8294 27.1492 22.8163C27.1588 22.8033 27.1676 22.7894 27.1753 22.7768C27.1777 22.7728 27.1801 22.7689 27.1823 22.7652C27.187 22.7573 27.1912 22.7503 27.1945 22.7454L27.1961 22.743L27.1973 22.7422C27.1974 22.7419 27.1974 22.7415 27.1974 22.741C27.1975 22.7379 27.1967 22.733 27.1944 22.7262C27.19 22.7126 27.1815 22.6954 27.1717 22.6781C27.162 22.6609 27.1513 22.6442 27.1431 22.6317C27.14 22.6272 27.1373 22.6232 27.1351 22.62Z" fill="#977C2E"/>
+<path d="M27.2344 22.3125C27.2344 22.3125 27.0281 22.3875 27.0187 22.4719C27.0094 22.5562 27.0656 22.6312 27.1125 22.6594C27.1781 22.6594 27.3562 22.4906 27.3562 22.4906L27.2344 22.3219V22.3125Z" fill="#F8C83C"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M27.2484 22.2925V22.3174L27.3749 22.4924L27.3659 22.5009L27.3658 22.501L27.3654 22.5014L27.3638 22.5028C27.3625 22.5041 27.3605 22.5059 27.358 22.5083C27.353 22.5129 27.3457 22.5196 27.3368 22.5275C27.3189 22.5435 27.2944 22.5647 27.2678 22.586C27.2412 22.6073 27.2123 22.6288 27.1856 22.6451C27.1723 22.6532 27.1593 22.6602 27.1472 22.6652C27.1353 22.6701 27.1234 22.6735 27.1125 22.6735H27.1086L27.1053 22.6715C27.0795 22.6561 27.0521 22.6284 27.0323 22.5938C27.0124 22.559 26.9997 22.5161 27.0048 22.4704C27.0077 22.4441 27.0255 22.4207 27.0469 22.4011C27.0687 22.3811 27.0964 22.3632 27.1233 22.3483C27.1502 22.3334 27.1767 22.3211 27.1965 22.3127C27.2064 22.3084 27.2146 22.3051 27.2204 22.3029C27.2233 22.3017 27.2255 22.3009 27.2271 22.3003L27.2289 22.2996L27.2294 22.2994L27.2295 22.2994L27.2484 22.2925ZM27.2241 22.3317C27.2194 22.3335 27.2138 22.3358 27.2075 22.3385C27.1883 22.3467 27.1627 22.3586 27.1369 22.3729C27.111 22.3873 27.0854 22.404 27.0659 22.4218C27.046 22.44 27.0345 22.4575 27.0327 22.4735C27.0284 22.5121 27.0391 22.549 27.0568 22.5798C27.0734 22.609 27.0959 22.632 27.1162 22.6451C27.1214 22.6445 27.1281 22.6426 27.1364 22.6392C27.1467 22.6349 27.1584 22.6287 27.171 22.6211C27.1962 22.6057 27.224 22.585 27.2502 22.5641C27.2763 22.5432 27.3004 22.5223 27.318 22.5066C27.3261 22.4994 27.3327 22.4933 27.3376 22.4888L27.2241 22.3317Z" fill="#977C2E"/>
+<path d="M27.4219 22.6593C27.4219 22.6593 27.2156 22.8 27.1875 22.8C27.1594 22.8 27.075 22.6875 27.0938 22.6125C27.1125 22.5375 27.2531 22.4906 27.3094 22.4625C27.3656 22.4437 27.4219 22.6593 27.4219 22.6593ZM27.6094 21.8906C27.6094 21.8906 27.5438 21.8343 27.4219 21.8437C27.2906 21.8531 27.1969 22.0312 27.1781 22.1062C27.1594 22.1906 27.1781 22.35 27.225 22.3687C27.2719 22.3968 27.5344 22.1812 27.5344 22.1812L27.6094 21.9V21.8906Z" fill="#F8C83C"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M27.6185 21.8799C27.6186 21.8799 27.6186 21.8799 27.6094 21.8906L27.6185 21.8799L27.6235 21.8841V21.9018L27.5468 22.1892L27.5433 22.1921L27.5431 22.1923L27.5426 22.1927L27.5403 22.1946C27.5384 22.1961 27.5355 22.1985 27.5318 22.2014C27.5245 22.2073 27.514 22.2156 27.5013 22.2256C27.4759 22.2454 27.4414 22.2716 27.4054 22.297C27.3695 22.3223 27.3317 22.3471 27.2996 22.3638C27.2837 22.3721 27.2686 22.3787 27.2555 22.3823C27.2438 22.3855 27.2299 22.3874 27.2188 22.3814C27.2021 22.3742 27.1905 22.3563 27.1824 22.3372C27.1737 22.3168 27.1673 22.2913 27.1631 22.2643C27.1547 22.2103 27.1546 22.1475 27.1644 22.1032L27.1645 22.1028C27.1744 22.0633 27.2034 21.9983 27.2467 21.9418C27.2897 21.8857 27.3492 21.8348 27.4209 21.8297C27.4842 21.8248 27.5333 21.837 27.5667 21.8506C27.5834 21.8574 27.5961 21.8646 27.6048 21.8701C27.6091 21.8729 27.6125 21.8752 27.6148 21.8769C27.6159 21.8778 27.6168 21.8785 27.6174 21.879L27.6182 21.8796L27.6184 21.8798L27.6185 21.8799ZM27.522 22.1732L27.5953 21.8981V21.8976C27.5938 21.8965 27.5919 21.8952 27.5897 21.8938C27.5823 21.8891 27.571 21.8828 27.5561 21.8767C27.5262 21.8645 27.4815 21.8532 27.423 21.8578C27.3634 21.862 27.3104 21.9049 27.269 21.9589C27.228 22.0125 27.2008 22.0739 27.1918 22.1095C27.183 22.1495 27.1829 22.2085 27.1909 22.2599C27.1949 22.2856 27.2008 22.3087 27.2082 22.3262C27.216 22.3444 27.2241 22.3532 27.2303 22.3557L27.2313 22.3561L27.2323 22.3567C27.2323 22.3567 27.2333 22.3572 27.2361 22.3572C27.239 22.3572 27.2429 22.3566 27.2481 22.3552C27.2583 22.3524 27.2714 22.3468 27.2866 22.3388C27.317 22.323 27.3536 22.2991 27.3892 22.274C27.4247 22.249 27.4588 22.2231 27.484 22.2034C27.4966 22.1936 27.507 22.1853 27.5142 22.1795C27.5175 22.1769 27.5201 22.1747 27.522 22.1732ZM27.3146 22.4756C27.3041 22.4808 27.2909 22.4866 27.2765 22.4929C27.2713 22.4953 27.2658 22.4976 27.2603 22.5001C27.239 22.5096 27.2161 22.5202 27.1943 22.5322C27.1726 22.5442 27.1525 22.5574 27.137 22.5717C27.1214 22.5861 27.1112 22.6008 27.1074 22.6159C27.0994 22.6478 27.1134 22.6905 27.1352 22.7272C27.1458 22.7451 27.1577 22.7606 27.1684 22.7713C27.1737 22.7768 27.1785 22.7807 27.1823 22.7832C27.1854 22.7852 27.1871 22.7857 27.1875 22.7859C27.1879 22.7858 27.1888 22.7856 27.1903 22.7851C27.1927 22.7843 27.1959 22.783 27.1998 22.7812C27.2076 22.7776 27.2176 22.7723 27.2291 22.7658C27.2521 22.7528 27.2802 22.7353 27.3077 22.7178C27.3351 22.7003 27.3617 22.6828 27.3814 22.6696C27.3913 22.6631 27.3994 22.6576 27.4051 22.6537L27.4057 22.6534C27.4041 22.6476 27.4017 22.6396 27.3988 22.6301C27.3927 22.6104 27.3841 22.5845 27.3737 22.5592C27.3633 22.5337 27.3515 22.5099 27.3395 22.4938C27.3334 22.4857 27.3279 22.4804 27.3232 22.4777C27.3193 22.4754 27.3167 22.4751 27.3146 22.4756ZM27.4219 22.6594L27.4355 22.6558L27.4355 22.6556L27.4353 22.6551L27.4348 22.6533C27.4344 22.6517 27.4338 22.6493 27.4329 22.6463C27.4312 22.6404 27.4288 22.6319 27.4257 22.6218C27.4195 22.6017 27.4105 22.5749 27.3998 22.5486C27.3891 22.5225 27.3762 22.4959 27.362 22.4769C27.3548 22.4674 27.3467 22.4589 27.3376 22.4535C27.328 22.4478 27.3168 22.4452 27.305 22.4491L27.304 22.4495L27.3031 22.4499C27.2931 22.4549 27.2804 22.4605 27.2658 22.4669C27.2604 22.4693 27.2548 22.4718 27.2489 22.4744C27.2274 22.484 27.2035 22.495 27.1807 22.5076C27.158 22.5202 27.1358 22.5346 27.1179 22.551C27.1001 22.5674 27.0857 22.5867 27.0801 22.6091C27.0694 22.6522 27.0882 22.7032 27.111 22.7415C27.1226 22.7611 27.1359 22.7785 27.1484 22.7911C27.1546 22.7974 27.1609 22.8028 27.167 22.8068C27.1727 22.8105 27.1799 22.814 27.1875 22.814C27.1917 22.814 27.1959 22.8129 27.1993 22.8117C27.203 22.8105 27.2072 22.8087 27.2116 22.8067C27.2204 22.8026 27.2312 22.7969 27.2429 22.7902C27.2666 22.7769 27.2952 22.7591 27.3228 22.7415C27.3505 22.7239 27.3772 22.7062 27.397 22.693C27.407 22.6864 27.4151 22.6809 27.4209 22.6771L27.4275 22.6726L27.4298 22.671L27.4219 22.6594ZM27.4219 22.6594L27.4298 22.671L27.438 22.6654L27.4355 22.6558L27.4219 22.6594Z" fill="#977C2E"/>
+<path d="M27.3562 22.5281C27.2625 22.5187 27.1875 22.3875 27.1968 22.3125C27.2156 22.2375 27.3843 22.1062 27.4781 22.125C27.5718 22.1344 27.5531 22.3594 27.5531 22.3594C27.5531 22.3594 27.4406 22.5375 27.3562 22.5281Z" fill="#F8C83C"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M27.2107 22.3151C27.207 22.348 27.2216 22.3957 27.2495 22.4371C27.2777 22.4788 27.3167 22.51 27.3576 22.5141L27.3578 22.5142C27.3739 22.5159 27.3932 22.5088 27.4146 22.4941C27.4357 22.4796 27.4568 22.4592 27.4758 22.4379C27.4947 22.4167 27.5111 22.3952 27.5228 22.3789C27.5286 22.3707 27.5333 22.3639 27.5364 22.3592C27.5376 22.3574 27.5386 22.3559 27.5393 22.3548C27.5394 22.3533 27.5396 22.3513 27.5397 22.3489C27.54 22.3429 27.5404 22.3343 27.5405 22.3239C27.5408 22.303 27.5402 22.2753 27.5368 22.2474C27.5334 22.2193 27.5272 22.1922 27.5169 22.172C27.5066 22.1519 27.4935 22.1407 27.4767 22.139L27.476 22.1389L27.4754 22.1388C27.4555 22.1348 27.4303 22.1386 27.4021 22.149C27.3742 22.1594 27.3449 22.1757 27.3175 22.1951C27.2901 22.2145 27.2652 22.2366 27.2461 22.2582C27.227 22.2798 27.2148 22.2997 27.2107 22.3151ZM27.5531 22.3594L27.565 22.3669L27.5649 22.3671L27.5646 22.3675L27.5636 22.369C27.5627 22.3704 27.5615 22.3723 27.5598 22.3748C27.5565 22.3798 27.5517 22.3868 27.5456 22.3953C27.5336 22.4121 27.5166 22.4345 27.4968 22.4566C27.4771 22.4787 27.4543 22.501 27.4306 22.5173C27.4072 22.5333 27.3809 22.545 27.3548 22.5421C27.302 22.5368 27.2566 22.4978 27.2262 22.4528C27.1958 22.4078 27.1776 22.3529 27.1829 22.3108L27.183 22.3099L27.1832 22.3091C27.1887 22.2871 27.2045 22.2628 27.225 22.2396C27.2457 22.2162 27.2723 22.1926 27.3012 22.1721C27.3301 22.1517 27.3617 22.134 27.3924 22.1227C27.4226 22.1115 27.4533 22.1059 27.4802 22.1111C27.5099 22.1143 27.5294 22.1347 27.5419 22.1592C27.5544 22.1838 27.5611 22.2147 27.5647 22.244C27.5683 22.2736 27.5689 22.3027 27.5686 22.3243C27.5685 22.3351 27.5681 22.3441 27.5678 22.3504C27.5676 22.3536 27.5674 22.3561 27.5673 22.3578L27.5672 22.3598L27.5671 22.3603L27.5671 22.3605L27.5531 22.3594ZM27.5531 22.3594L27.5671 22.3605L27.5668 22.364L27.565 22.3669L27.5531 22.3594Z" fill="#977C2E"/>
+<path d="M27.6282 22.5C27.6282 22.5 27.5907 22.6125 27.4969 22.6594C27.4032 22.6969 27.3563 22.6594 27.3094 22.5938C27.2532 22.5188 27.3282 22.4813 27.3657 22.4438C27.4125 22.4063 27.525 22.3782 27.525 22.3782L27.6282 22.5094V22.5Z" fill="#F8C83C"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M27.5305 22.3623L27.6382 22.4994L27.6423 22.5V22.5501L27.6293 22.5336C27.6244 22.5439 27.6179 22.5563 27.6097 22.5696C27.5879 22.6047 27.5533 22.6469 27.5032 22.672L27.5022 22.6725C27.4529 22.6922 27.4137 22.693 27.3799 22.6781C27.347 22.6637 27.3218 22.6352 27.2981 22.6021C27.2829 22.5818 27.2755 22.5626 27.2752 22.5443C27.2748 22.5258 27.2815 22.51 27.2909 22.4967C27.3001 22.4835 27.3124 22.472 27.3239 22.4619C27.3276 22.4587 27.3312 22.4556 27.3347 22.4527C27.3425 22.446 27.3496 22.44 27.3557 22.4338L27.3563 22.4333L27.3569 22.4328C27.3824 22.4124 27.4244 22.3953 27.4584 22.3836C27.4757 22.3777 27.4914 22.3729 27.5029 22.3696C27.5086 22.368 27.5133 22.3667 27.5165 22.3658L27.5203 22.3649L27.5213 22.3646L27.5215 22.3645L27.5216 22.3645L27.5305 22.3623ZM27.5197 22.3941C27.5172 22.3948 27.5141 22.3957 27.5106 22.3967C27.4995 22.3998 27.4842 22.4044 27.4675 22.4102C27.4338 22.4218 27.3965 22.4374 27.375 22.4543C27.3681 22.4612 27.3599 22.4682 27.3519 22.4749C27.3487 22.4777 27.3455 22.4804 27.3424 22.4831C27.3311 22.4929 27.3211 22.5025 27.3139 22.5128C27.3069 22.5228 27.3031 22.5329 27.3033 22.5437C27.3035 22.5546 27.3078 22.5682 27.3207 22.5853L27.3209 22.5856C27.344 22.618 27.3656 22.6411 27.3913 22.6524C27.416 22.6633 27.4469 22.6642 27.4912 22.6466C27.5345 22.6247 27.5655 22.5874 27.5858 22.5547C27.5959 22.5384 27.6032 22.5235 27.608 22.5127C27.6086 22.5113 27.6092 22.5099 27.6097 22.5087L27.5197 22.3941Z" fill="#977C2E"/>
+<path d="M27.4875 22.2375C27.4875 22.2375 27.3937 22.3125 27.45 22.4062C27.5062 22.5 27.5437 22.5375 27.6187 22.5468C27.6937 22.5562 27.7406 22.5281 27.7969 22.4625C27.8531 22.3968 27.9375 22.3687 27.9281 22.275C27.9187 22.1906 27.8906 22.125 27.8344 22.1062C27.7875 22.0781 27.6281 22.1062 27.4875 22.2375Z" fill="#F8C83C"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M27.8402 22.0934C27.872 22.1044 27.8951 22.1284 27.9113 22.1595C27.9276 22.1909 27.9373 22.2303 27.9421 22.2734L27.9421 22.2736L27.9421 22.2736C27.9474 22.3261 27.9258 22.3605 27.8971 22.3892C27.8857 22.4006 27.8728 22.4115 27.8602 22.4221C27.8573 22.4246 27.8544 22.427 27.8516 22.4294C27.836 22.4427 27.8209 22.4561 27.8076 22.4716C27.779 22.505 27.7517 22.5301 27.7211 22.5454C27.6902 22.5609 27.6568 22.5658 27.617 22.5608C27.5771 22.5558 27.5463 22.5432 27.5182 22.5188C27.4906 22.495 27.4662 22.4605 27.4379 22.4135C27.4066 22.3612 27.4172 22.3135 27.4353 22.28C27.4442 22.2635 27.455 22.2502 27.4634 22.2411C27.4677 22.2365 27.4714 22.233 27.4741 22.2305C27.4755 22.2293 27.4766 22.2283 27.4774 22.2276L27.4782 22.2269C27.55 22.16 27.6267 22.1192 27.6919 22.0987C27.7245 22.0884 27.7545 22.0832 27.7798 22.0824C27.8038 22.0816 27.8252 22.0849 27.8402 22.0934ZM27.4963 22.2485L27.4962 22.2486L27.4956 22.2491C27.495 22.2496 27.4942 22.2503 27.4931 22.2513C27.4909 22.2533 27.4877 22.2563 27.484 22.2603C27.4767 22.2682 27.4675 22.2795 27.46 22.2934C27.4453 22.3208 27.4372 22.3576 27.4621 22.399C27.4901 22.4457 27.5126 22.4769 27.5365 22.4976C27.5599 22.5178 27.5854 22.5285 27.6205 22.5329C27.6557 22.5373 27.6833 22.5329 27.7086 22.5202C27.7342 22.5074 27.7586 22.4856 27.7862 22.4533C27.801 22.4361 27.8176 22.4214 27.8333 22.408C27.8364 22.4054 27.8395 22.4028 27.8424 22.4003C27.855 22.3897 27.8667 22.3798 27.8772 22.3694C27.9023 22.3442 27.9182 22.3177 27.9141 22.2765C27.9096 22.2353 27.9005 22.1997 27.8864 22.1725C27.8723 22.1455 27.8537 22.1275 27.8299 22.1196L27.8285 22.1191L27.8271 22.1183C27.8188 22.1133 27.8033 22.1098 27.7806 22.1105C27.7584 22.1112 27.731 22.1159 27.7003 22.1255C27.639 22.1448 27.5659 22.1836 27.4971 22.2478L27.4963 22.2485L27.4963 22.2485Z" fill="#977C2E"/>
+<path d="M27.7687 21.8437C27.7687 21.8437 27.675 21.7968 27.5906 21.8437C27.5156 21.8906 27.4593 21.9843 27.45 22.0687L27.4687 22.2843C27.4687 22.2843 27.5812 22.2468 27.6562 22.1906C27.7218 22.1343 27.75 22.1156 27.7312 22.0875C27.7312 22.0687 27.6937 22.05 27.6937 21.975C27.6937 21.8437 27.7687 21.8343 27.7687 21.8343V21.8437Z" fill="#202220"/>
+<path d="M27.7687 21.8438C27.7687 21.8438 27.6562 21.8157 27.5906 21.8532C27.5293 21.8954 27.4859 21.9588 27.4687 22.0313C27.4406 22.1063 27.4594 22.125 27.4594 22.125V21.9938C27.4969 21.9188 27.5531 21.8531 27.6094 21.8344C27.6844 21.8063 27.7687 21.8344 27.7687 21.8344V21.8438Z" fill="#4B4139"/>
+<path d="M30.825 24.0938L30.975 24.0188L31.1625 23.9062L31.2 24.1125L31.0313 24.2438H30.8906L30.8063 24.1781L30.825 24.0844V24.0938Z" fill="#F8C83C"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M31.1727 23.8838L31.2154 24.1184L31.0361 24.2579H30.8858L30.7908 24.1839L30.8112 24.0817L30.8193 24.0825L30.8187 24.0812L30.9682 24.0065L31.1727 23.8838ZM30.8354 24.1044L30.8218 24.1724L30.8955 24.2297H31.0264L31.1847 24.1067L31.1523 23.9288L30.9813 24.0314L30.8354 24.1044Z" fill="#977C2E"/>
+<path d="M30.6 24.1125H30.6937C30.7969 24.1125 30.8062 24.0844 30.825 24.0844C30.8437 24.0937 30.8719 24.2063 30.8719 24.2063L30.8344 24.2719L30.6937 24.3562L30.5719 24.2812L30.5625 24.1125H30.6ZM31.7344 24.0375C31.7344 24.0375 31.7063 23.9906 31.65 23.9437L31.4437 23.7656V24.2344L31.6594 24.225L31.7625 24.0844L31.7344 24.0375Z" fill="#F8C83C"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M31.4297 23.7349L31.6591 23.933C31.688 23.9571 31.7097 23.9812 31.7242 23.9994C31.7315 24.0085 31.737 24.0161 31.7407 24.0215C31.7425 24.0241 31.7439 24.0263 31.7449 24.0278L31.746 24.0295L31.7463 24.03L31.7464 24.0302L31.7793 24.0851L31.6667 24.2387L31.4297 24.249V23.7349ZM31.7223 24.0446L31.7221 24.0443L31.7212 24.0429C31.7204 24.0417 31.7191 24.0398 31.7175 24.0374C31.7141 24.0325 31.7091 24.0254 31.7023 24.017C31.6887 23.9999 31.6682 23.9772 31.641 23.9545L31.6408 23.9544L31.4578 23.7963V24.2197L31.652 24.2112L31.7456 24.0836L31.7223 24.0446ZM30.7962 24.1115C30.7766 24.1193 30.7466 24.1265 30.6937 24.1265H30.5773L30.5855 24.2731L30.6938 24.3398L30.824 24.2617L30.8568 24.2042C30.856 24.2012 30.8549 24.1971 30.8536 24.1922C30.8507 24.1816 30.8467 24.1675 30.842 24.1531C30.8374 24.1386 30.8323 24.1242 30.8274 24.113C30.8249 24.1074 30.8226 24.103 30.8206 24.0999C30.8205 24.0999 30.8205 24.0998 30.8205 24.0998C30.8197 24.1002 30.8187 24.1006 30.8175 24.1012C30.8166 24.1017 30.8157 24.1022 30.8147 24.1027C30.8102 24.1051 30.804 24.1083 30.7962 24.1115ZM30.8855 24.2028L30.8855 24.2027L30.8854 24.2025L30.8852 24.2015L30.8842 24.1978C30.8834 24.1947 30.8822 24.1902 30.8807 24.1848C30.8778 24.174 30.8736 24.1594 30.8688 24.1445C30.8641 24.1297 30.8586 24.1142 30.8531 24.1016C30.8503 24.0954 30.8473 24.0895 30.8442 24.0846C30.8414 24.0804 30.8372 24.0747 30.8313 24.0718L30.8283 24.0703H30.825C30.8166 24.0703 30.8099 24.0735 30.8046 24.0762C30.8035 24.0768 30.8023 24.0774 30.8011 24.078C30.7967 24.0804 30.7921 24.0828 30.7858 24.0853C30.7702 24.0916 30.744 24.0984 30.6937 24.0984H30.5476L30.5582 24.2893L30.6936 24.3727L30.8447 24.282L30.8869 24.2083L30.8855 24.2028Z" fill="#977C2E"/>
+<path d="M30.6 24.1125C30.6 24.1125 30.5625 24.0656 30.4781 24.075C30.3843 24.075 30.2906 24.1593 30.2812 24.2156C30.2718 24.2812 30.2812 24.4593 30.3281 24.4968C30.375 24.5343 30.4406 24.5437 30.5343 24.525C30.6281 24.4968 31.1343 24.1875 31.1343 24.1875L31.0031 24.2156C30.9375 24.2343 30.8718 24.2062 30.8718 24.2062C30.8718 24.2062 30.8062 24.2812 30.7218 24.3C30.6468 24.3 30.6281 24.2531 30.6093 24.2156L30.6 24.1125Z" fill="#F8C83C"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M30.611 24.1037C30.611 24.1037 30.611 24.1037 30.6 24.1125L30.614 24.1112L30.6231 24.2117C30.6238 24.213 30.6244 24.2143 30.6251 24.2156C30.6336 24.2329 30.6416 24.2491 30.6545 24.2619C30.6678 24.2753 30.6872 24.2856 30.7203 24.2859C30.759 24.277 30.794 24.2552 30.8198 24.235C30.8328 24.2249 30.8433 24.2153 30.8505 24.2082C30.854 24.2047 30.8568 24.2018 30.8586 24.1999C30.8595 24.1989 30.8602 24.1982 30.8607 24.1977L30.8612 24.1971L30.8613 24.197L30.868 24.1893L30.8774 24.1933L30.8779 24.1935L30.8798 24.1943C30.8816 24.1949 30.8842 24.1959 30.8875 24.197C30.8942 24.1992 30.9039 24.2019 30.9155 24.2042C30.9389 24.2086 30.9693 24.2107 30.9993 24.2021L31.0002 24.2018L31.1314 24.1737L31.1417 24.1995L31.136 24.203L31.1197 24.2129C31.1057 24.2214 31.0855 24.2336 31.0611 24.2483C31.0121 24.2778 30.9458 24.3174 30.8766 24.3578C30.8074 24.3983 30.7352 24.4397 30.6744 24.4728C30.6142 24.5055 30.5635 24.5309 30.5384 24.5385L30.5371 24.5388C30.4416 24.558 30.3709 24.5491 30.3193 24.5079C30.3042 24.4957 30.2938 24.4741 30.2863 24.4506C30.2786 24.4265 30.2732 24.3977 30.2696 24.3685C30.2625 24.3103 30.2624 24.248 30.2673 24.2136L30.2674 24.2133C30.2702 24.1963 30.2791 24.1785 30.2914 24.1616C30.3039 24.1446 30.3203 24.1279 30.3394 24.1131C30.3772 24.0838 30.4267 24.0612 30.4773 24.0609C30.5221 24.0561 30.5552 24.0661 30.5773 24.0778C30.5883 24.0837 30.5966 24.0899 30.6021 24.0948C30.6049 24.0972 30.607 24.0993 30.6085 24.1009C30.6092 24.1016 30.6098 24.1023 30.6102 24.1028L30.6107 24.1034L30.6109 24.1036L30.611 24.1037ZM31.0557 24.2187L31.0065 24.2293C30.971 24.2393 30.936 24.2367 30.9103 24.2318C30.8973 24.2293 30.8864 24.2262 30.8788 24.2237C30.8777 24.2234 30.8767 24.223 30.8757 24.2227C30.8741 24.2243 30.8723 24.2262 30.8701 24.2283C30.8624 24.2359 30.8511 24.2462 30.8372 24.2572C30.8094 24.2789 30.77 24.3037 30.7249 24.3137L30.7234 24.3141H30.7219C30.681 24.3141 30.6539 24.3011 30.6346 24.2818C30.6182 24.2655 30.6081 24.2449 30.5998 24.2281C30.5988 24.226 30.5978 24.2239 30.5968 24.2219L30.5956 24.2195L30.5864 24.1186C30.5856 24.1178 30.5847 24.1169 30.5835 24.1159C30.5794 24.1123 30.573 24.1074 30.5641 24.1027C30.5465 24.0933 30.5189 24.0846 30.4797 24.089L30.4789 24.0891H30.4781C30.4353 24.0891 30.3913 24.1085 30.3567 24.1353C30.3394 24.1487 30.3248 24.1636 30.3141 24.1782C30.3034 24.1929 30.297 24.2067 30.2951 24.2178C30.2907 24.249 30.2906 24.3086 30.2975 24.3651C30.301 24.3933 30.3061 24.4202 30.3131 24.4421C30.3203 24.4646 30.3286 24.4793 30.3369 24.4859C30.379 24.5195 30.4394 24.5296 30.5309 24.5113C30.553 24.5046 30.6005 24.4809 30.661 24.448C30.7214 24.4152 30.7933 24.374 30.8624 24.3336C30.9315 24.2932 30.9977 24.2537 31.0466 24.2242C31.0497 24.2224 31.0527 24.2205 31.0557 24.2187ZM30.5891 24.1214C30.5891 24.1214 30.5891 24.1214 30.5891 24.1214V24.1214Z" fill="#977C2E"/>
+<path d="M30.9375 24.2719L30.825 24.3187L30.7031 24.375L30.7406 24.525L30.9563 24.5719L31.0875 24.4687V24.3187L30.9281 24.2719H30.9375ZM31.9125 24.1594L31.8375 24.0844C31.8 24.0469 31.7438 24.0375 31.7438 24.0375L31.6219 24.1781V24.2719L31.7344 24.3375L31.8187 24.3562L31.9219 24.2812L31.9125 24.1594Z" fill="#F8C83C"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M31.7461 24.0236L31.7462 24.0237L31.7463 24.0237L31.7469 24.0238L31.749 24.0242C31.7508 24.0246 31.7534 24.0251 31.7565 24.0259C31.7628 24.0275 31.7715 24.03 31.7815 24.0337C31.8012 24.0411 31.8267 24.0537 31.8474 24.0744L31.9224 24.1494L31.9125 24.1594L31.9265 24.1583L31.9365 24.288L31.8219 24.3714L31.7292 24.3508L31.6078 24.28V24.1729L31.7383 24.0223L31.7461 24.0236ZM31.8989 24.1656L31.8275 24.0943C31.8108 24.0775 31.7894 24.0667 31.7716 24.06C31.7628 24.0568 31.7551 24.0546 31.7497 24.0532C31.7494 24.0531 31.7492 24.0531 31.7489 24.053L31.6359 24.1834V24.2638L31.7396 24.3243L31.8156 24.3412L31.9072 24.2745L31.8989 24.1656ZM30.9277 24.2607L30.9281 24.2578H30.9375L30.9379 24.2601L31.1016 24.3082V24.4756L30.9597 24.587L30.7291 24.5369L30.6866 24.3671L30.8196 24.3058L30.9277 24.2607ZM30.9344 24.2884L30.8306 24.3316L30.7196 24.3829L30.7521 24.5131L30.9528 24.5567L31.0734 24.4619V24.3293L30.9344 24.2884Z" fill="#977C2E"/>
+<path d="M31.1812 24.0938C31.1812 24.0938 31.0875 24.1312 31.0406 24.1687L30.9281 24.2625C30.9281 24.2812 31.0312 24.3938 31.0312 24.3938L31.1437 24.4031L31.3781 24.2438L31.3594 24.0938H31.1812ZM32.0719 24.2812L32.025 24.2156C31.9875 24.1781 31.9312 24.1594 31.9125 24.1594C31.8844 24.1594 31.7906 24.3 31.7906 24.3V24.3375L31.8656 24.4313L32.0156 24.4781L32.1187 24.3656L32.0719 24.2812Z" fill="#F8C83C"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M31.1813 24.0797H31.3718L31.3931 24.2506L31.1475 24.4176L31.0246 24.4073L31.0209 24.4033L31.0206 24.4029L31.0197 24.402L31.0164 24.3983C31.0136 24.3952 31.0095 24.3907 31.0046 24.3853C30.9949 24.3744 30.9819 24.3596 30.969 24.3443C30.956 24.3289 30.9429 24.3128 30.9329 24.2993C30.9279 24.2925 30.9236 24.2861 30.9204 24.2806C30.9188 24.2778 30.9173 24.2751 30.9163 24.2724C30.9153 24.27 30.9141 24.2664 30.9141 24.2625V24.2559L31.0318 24.1578C31.0566 24.138 31.093 24.1187 31.1224 24.1045C31.1373 24.0974 31.1507 24.0915 31.1603 24.0873C31.1651 24.0852 31.169 24.0836 31.1718 24.0825L31.1749 24.0812L31.1757 24.0808L31.1759 24.0808L31.1813 24.0938V24.0797ZM31.184 24.1078L31.1825 24.1085C31.1799 24.1095 31.1761 24.1111 31.1714 24.1131C31.162 24.1172 31.149 24.123 31.1346 24.1299C31.1055 24.1439 31.0716 24.162 31.0495 24.1797L30.9449 24.2668C30.9474 24.271 30.951 24.2764 30.9556 24.2826C30.965 24.2954 30.9776 24.3109 30.9904 24.3261C31.0032 24.3412 31.016 24.3558 31.0256 24.3665C31.0304 24.3719 31.0344 24.3764 31.0372 24.3795L31.0379 24.3802L31.14 24.3887L31.3631 24.237L31.347 24.1078H31.184ZM31.8909 24.1541C31.8964 24.1501 31.9041 24.1453 31.9125 24.1453C31.9248 24.1453 31.9457 24.151 31.9674 24.1606C31.9896 24.1705 32.0146 24.1854 32.0349 24.2057L32.0358 24.2065L32.0833 24.2731L32.0719 24.2813L32.0842 24.2744L32.136 24.3677L32.02 24.4942L31.8573 24.4434L31.7766 24.3425V24.2958L31.7789 24.2922L31.779 24.2921L31.7792 24.2918L31.78 24.2906L31.7831 24.2861C31.7857 24.2822 31.7895 24.2766 31.7942 24.27C31.8035 24.2567 31.8162 24.239 31.8299 24.2212C31.8434 24.2034 31.8582 24.1854 31.8715 24.1716C31.8781 24.1647 31.8847 24.1586 31.8909 24.1541ZM31.8047 24.3043V24.3326L31.8739 24.4191L32.0113 24.4621L32.1015 24.3636L32.06 24.2888L32.0143 24.2248C31.9972 24.208 31.9757 24.1951 31.956 24.1863C31.936 24.1774 31.9197 24.1737 31.913 24.1735C31.9129 24.1736 31.9112 24.1741 31.9075 24.1768C31.9032 24.18 31.8978 24.1848 31.8917 24.1911C31.8795 24.2038 31.8655 24.2208 31.8522 24.2383C31.8389 24.2556 31.8264 24.273 31.8172 24.2861C31.8127 24.2927 31.8089 24.2981 31.8063 24.3019L31.8047 24.3043Z" fill="#977C2E"/>
+<path d="M31.6875 24.45L31.8 24.4688C31.8 24.4688 31.8 24.4969 31.8282 24.5157C31.8563 24.5438 31.8563 24.5157 31.8563 24.5157C31.8563 24.5157 31.875 24.6282 31.9875 24.7032C31.9875 24.7032 32.1188 24.7594 32.175 24.7219C32.25 24.6844 32.2407 24.7219 32.2407 24.7219L32.4282 24.4969C32.4282 24.4969 32.4282 24.45 32.3813 24.45C32.3813 24.45 32.4188 24.3 32.2875 24.2625C32.175 24.2438 32.0813 24.2813 32.0813 24.2813C32.0813 24.2813 31.9875 24.45 31.9313 24.4313C31.9034 24.4208 31.8779 24.4049 31.8563 24.3844L31.7907 24.3C31.7907 24.3 31.7532 24.3094 31.7063 24.2813C31.6594 24.2532 31.6219 24.1782 31.6219 24.1782C31.6219 24.1782 31.5563 24.1688 31.5282 24.1407L31.4813 24.0657L31.3032 24.1969C31.3032 24.1969 31.3032 24.2438 31.2 24.3188C31.0969 24.3938 31.0407 24.3938 31.0407 24.3938C31.0407 24.3938 31.0032 24.5532 30.8907 24.525C30.7782 24.4969 30.7032 24.375 30.7032 24.375C30.7032 24.375 30.6188 24.3563 30.5719 24.4313C30.5157 24.4969 30.4875 24.525 30.4875 24.5907C30.4875 24.6657 30.5344 24.7594 30.5813 24.7969C30.6094 24.825 30.7219 24.9188 30.8625 24.8532C30.9938 24.7782 30.9469 24.6657 30.9469 24.6657L31.0219 24.6188C31.1063 24.5625 31.1907 24.4782 31.2563 24.4594" fill="#F8C83C"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M31.4838 24.0518C31.4877 24.0525 31.491 24.0548 31.4931 24.0581L31.5391 24.1317C31.5507 24.1425 31.5704 24.1508 31.5895 24.1564C31.5989 24.1592 31.6076 24.1611 31.6139 24.1624C31.617 24.163 31.6196 24.1635 31.6213 24.1637L31.6232 24.1641L31.6237 24.1641L31.6238 24.1642C31.6238 24.1642 31.6238 24.1642 31.6238 24.1642L31.6198 24.192L31.6196 24.192L31.6189 24.1919L31.6166 24.1915C31.6155 24.1913 31.6142 24.1911 31.6126 24.1908C31.6114 24.1905 31.6099 24.1903 31.6084 24.19C31.6015 24.1886 31.592 24.1864 31.5815 24.1834C31.5613 24.1774 31.5349 24.1673 31.5181 24.1505C31.5174 24.1498 31.5167 24.1489 31.5161 24.148L31.4773 24.0859L31.3161 24.2047C31.3158 24.206 31.3155 24.2076 31.315 24.2092C31.313 24.2161 31.3092 24.2254 31.3022 24.237C31.2881 24.26 31.2609 24.2918 31.2082 24.3301C31.1557 24.3683 31.1146 24.3877 31.0862 24.3976C31.072 24.4025 31.061 24.4051 31.0533 24.4064C31.0527 24.4065 31.0521 24.4066 31.0516 24.4067C31.0503 24.411 31.0485 24.4166 31.0462 24.423C31.0407 24.4381 31.0321 24.4582 31.0196 24.4775C31.0072 24.4968 30.9904 24.516 30.9684 24.5285C30.946 24.5413 30.9189 24.5465 30.8872 24.5386C30.8272 24.5236 30.7781 24.484 30.7445 24.4492C30.7276 24.4316 30.7143 24.415 30.7053 24.4028C30.7007 24.3967 30.6972 24.3916 30.6948 24.3881C30.6948 24.388 30.6947 24.3879 30.6947 24.3878C30.6929 24.3876 30.6907 24.3874 30.6882 24.3872C30.6804 24.3867 30.6696 24.3867 30.6574 24.3888C30.6334 24.393 30.6046 24.4053 30.5838 24.4387C30.5834 24.4393 30.583 24.4398 30.5825 24.4404C30.5788 24.4446 30.5753 24.4487 30.5719 24.4527C30.5489 24.4794 30.5322 24.4988 30.5206 24.5181C30.5079 24.5393 30.5015 24.5602 30.5015 24.5906C30.5015 24.6254 30.5125 24.6656 30.5295 24.7018C30.5465 24.7381 30.5688 24.7689 30.59 24.7858C30.5904 24.7862 30.5908 24.7865 30.5911 24.7869C30.6185 24.8143 30.7243 24.9016 30.856 24.8406C30.9174 24.8053 30.9358 24.7625 30.9399 24.7295C30.942 24.7125 30.9404 24.6977 30.9383 24.6871C30.9373 24.6818 30.9361 24.6776 30.9352 24.6748C30.9347 24.6734 30.9344 24.6724 30.9341 24.6717L30.9339 24.6711C30.9339 24.671 30.9339 24.6711 30.9339 24.6711C30.9339 24.6711 30.9338 24.671 30.9468 24.6656C30.9598 24.6602 30.9598 24.6602 30.9598 24.6602L30.9599 24.6604L30.96 24.6608L30.9605 24.662C30.9609 24.663 30.9614 24.6645 30.962 24.6663C30.9625 24.6678 30.963 24.6696 30.9636 24.6717C30.9643 24.6745 30.9651 24.6778 30.9659 24.6816C30.9685 24.6944 30.9704 24.7124 30.9678 24.7329C30.9626 24.7748 30.9389 24.8256 30.8694 24.8653L30.8684 24.8659C30.72 24.9351 30.6016 24.8368 30.5718 24.8073C30.5463 24.7867 30.522 24.7521 30.504 24.7137C30.4858 24.675 30.4734 24.6307 30.4734 24.5906C30.4734 24.5553 30.4811 24.5293 30.4965 24.5037C30.5094 24.4821 30.5279 24.4607 30.5506 24.4343C30.5538 24.4306 30.5571 24.4267 30.5605 24.4228C30.5865 24.3818 30.623 24.3663 30.6526 24.3611C30.6675 24.3585 30.6806 24.3585 30.6901 24.3592C30.6949 24.3595 30.6987 24.36 30.7015 24.3604C30.7029 24.3606 30.7039 24.3608 30.7047 24.3609L30.7057 24.3611L30.706 24.3612L30.7061 24.3612C30.7061 24.3612 30.7061 24.3612 30.7031 24.375L30.7061 24.3612C30.7098 24.362 30.7131 24.3643 30.715 24.3676M30.715 24.3676L30.7152 24.3678L30.7158 24.3687C30.7163 24.3696 30.7171 24.3708 30.7182 24.3724C30.7204 24.3756 30.7236 24.3803 30.7279 24.3861C30.7364 24.3976 30.7489 24.4132 30.7648 24.4296C30.7968 24.4628 30.8414 24.4982 30.894 24.5113C30.9185 24.5174 30.9383 24.5133 30.9545 24.5041C30.9712 24.4946 30.9849 24.4793 30.9959 24.4622C31.0069 24.4453 31.0147 24.4273 31.0197 24.4134C31.0223 24.4064 31.0241 24.4006 31.0252 24.3966C31.0258 24.3946 31.0262 24.393 31.0265 24.3919L31.0268 24.3908L31.0269 24.3905L31.0406 24.3937L31.0406 24.3796C31.0405 24.3796 31.0405 24.3796 31.0405 24.3796C31.034 24.3797 31.0284 24.3842 31.0269 24.3905M31.289 24.1964C31.2891 24.1921 31.2912 24.1881 31.2947 24.1855L31.4729 24.0543C31.476 24.0519 31.48 24.051 31.4838 24.0518M31.289 24.1964L31.289 24.1966L31.289 24.1967C31.289 24.1967 31.289 24.1968 31.3031 24.1968L31.289 24.1968C31.289 24.1967 31.289 24.1966 31.289 24.1964ZM31.0142 24.6069L30.9394 24.6537C30.9335 24.6573 30.9312 24.6647 30.9339 24.6711M31.0142 24.6069C31.0437 24.5872 31.073 24.5642 31.1019 24.5415C31.1138 24.5321 31.1257 24.5228 31.1375 24.5138C31.1771 24.4835 31.2166 24.456 31.2523 24.4458C31.2598 24.4437 31.2676 24.448 31.2697 24.4555C31.2719 24.4629 31.2675 24.4707 31.2601 24.4728C31.2302 24.4814 31.1947 24.5055 31.1546 24.5361C31.1434 24.5447 31.1319 24.5537 31.1202 24.5629C31.0909 24.5859 31.0601 24.6101 31.0296 24.6304L31.0293 24.6306L30.9636 24.6717M31.7845 24.3151C31.7796 24.3155 31.7729 24.3158 31.7649 24.3151C31.7477 24.3138 31.7245 24.3086 31.699 24.2933C31.6728 24.2776 31.6503 24.2497 31.6348 24.227C31.6269 24.2155 31.6206 24.2049 31.6162 24.1972C31.6148 24.1947 31.6136 24.1926 31.6126 24.1908M31.7845 24.3151L31.8451 24.393C31.8455 24.3935 31.846 24.3941 31.8465 24.3946C31.8696 24.4163 31.8966 24.4332 31.9262 24.4444L31.9268 24.4445C31.9482 24.4517 31.9699 24.4403 31.9871 24.4267C32.0051 24.4124 32.023 24.392 32.0385 24.3718C32.0541 24.3514 32.0678 24.3305 32.0776 24.3147C32.0825 24.3068 32.0865 24.3002 32.0892 24.2955C32.0898 24.2944 32.0904 24.2935 32.0909 24.2926C32.0935 24.2917 32.0971 24.2905 32.1017 24.2891C32.1118 24.286 32.1266 24.282 32.1447 24.2786C32.1809 24.2718 32.2305 24.2673 32.2843 24.2762C32.314 24.2848 32.3334 24.2995 32.3463 24.3162C32.3595 24.3332 32.3664 24.3531 32.3697 24.3726C32.3729 24.3921 32.3724 24.4107 32.371 24.4245C32.3703 24.4314 32.3694 24.437 32.3687 24.4409C32.3684 24.4428 32.3681 24.4443 32.3679 24.4452L32.3676 24.4463L32.3676 24.4465C32.3676 24.4465 32.3676 24.4465 32.3676 24.4465C32.3665 24.4507 32.3675 24.4552 32.3701 24.4586C32.3728 24.462 32.3769 24.464 32.3812 24.464C32.3905 24.464 32.3965 24.4663 32.4005 24.469C32.4046 24.4717 32.4075 24.4755 32.4096 24.4797C32.4118 24.4839 32.4129 24.4883 32.4135 24.4918C32.4135 24.492 32.4135 24.4921 32.4135 24.4923L32.2437 24.6961C32.2437 24.6961 32.2437 24.6961 32.2437 24.6961C32.2359 24.6908 32.2257 24.6901 32.2143 24.6922C32.2028 24.6943 32.188 24.6996 32.1687 24.7092C32.1681 24.7095 32.1676 24.7098 32.1672 24.7101C32.1564 24.7173 32.1409 24.7207 32.1219 24.7207C32.1032 24.7207 32.0827 24.7174 32.0633 24.7128C32.0441 24.7083 32.0264 24.7026 32.0135 24.698C32.0071 24.6957 32.0019 24.6938 31.9984 24.6923C31.9966 24.6916 31.9952 24.6911 31.9943 24.6907L31.9941 24.6906C31.941 24.6549 31.91 24.6105 31.8922 24.5749C31.8833 24.557 31.8777 24.5414 31.8744 24.5303C31.8727 24.5248 31.8716 24.5204 31.8709 24.5174C31.8706 24.516 31.8704 24.5149 31.8702 24.5142L31.8701 24.5134L31.8701 24.5133C31.8701 24.5133 31.8701 24.5133 31.8701 24.5133C31.8689 24.5061 31.8623 24.501 31.855 24.5016C31.8496 24.502 31.8451 24.5055 31.8431 24.5103C31.8417 24.5092 31.84 24.5076 31.838 24.5056C31.8374 24.505 31.8366 24.5044 31.8359 24.5039C31.8247 24.4964 31.8193 24.4873 31.8166 24.4802C31.8153 24.4766 31.8146 24.4734 31.8143 24.4713C31.8141 24.4702 31.8141 24.4695 31.814 24.469L31.814 24.4686C31.814 24.4685 31.814 24.4685 31.814 24.4686M31.8486 24.5421C31.8455 24.5422 31.8426 24.5417 31.8399 24.5408C31.8331 24.5385 31.8263 24.5335 31.8191 24.5265C31.8029 24.5153 31.7946 24.5014 31.7903 24.49C31.7891 24.4867 31.7882 24.4836 31.7875 24.4809L31.6851 24.4638C31.6775 24.4625 31.6723 24.4553 31.6736 24.4476C31.6749 24.44 31.6821 24.4348 31.6898 24.4361L31.8023 24.4548C31.809 24.456 31.814 24.4617 31.814 24.4686M31.8486 24.5421C31.8524 24.5541 31.8582 24.5698 31.8671 24.5875C31.8866 24.6267 31.9209 24.6756 31.9797 24.7148C31.9804 24.7153 31.9811 24.7157 31.9819 24.716L31.982 24.7161L31.9824 24.7162L31.9836 24.7167C31.9846 24.7171 31.9861 24.7177 31.988 24.7185C31.9919 24.72 31.9974 24.7221 32.0041 24.7245C32.0176 24.7293 32.0363 24.7354 32.0569 24.7402C32.0774 24.745 32.1002 24.7488 32.1219 24.7488C32.1431 24.7488 32.1647 24.7452 32.182 24.734C32.1997 24.7252 32.2117 24.7212 32.2194 24.7198C32.2231 24.7192 32.2254 24.7192 32.2267 24.7193C32.2256 24.7254 32.2286 24.7315 32.2342 24.7344C32.2401 24.7373 32.2472 24.7359 32.2514 24.7308L32.4389 24.5058C32.441 24.5033 32.4421 24.5001 32.4421 24.4968H32.4281C32.4421 24.4968 32.4421 24.4968 32.4421 24.4968L32.4421 24.4967L32.4421 24.4965L32.4421 24.4958C32.4421 24.4953 32.4421 24.4946 32.442 24.4938C32.4419 24.4922 32.4417 24.4899 32.4412 24.4872C32.4403 24.4819 32.4385 24.4746 32.4348 24.4671C32.431 24.4596 32.4252 24.4516 32.4161 24.4456C32.4108 24.442 32.4047 24.4394 32.3977 24.4377C32.3982 24.4346 32.3986 24.4311 32.399 24.4273C32.4005 24.4119 32.4012 24.3906 32.3974 24.3679C32.3936 24.3453 32.3853 24.3206 32.3686 24.299C32.3517 24.2771 32.3269 24.2591 32.2913 24.2489C32.2908 24.2488 32.2903 24.2487 32.2898 24.2486C32.2314 24.2389 32.1782 24.2437 32.1395 24.251C32.1202 24.2546 32.1045 24.2588 32.0935 24.2622C32.088 24.2639 32.0837 24.2653 32.0807 24.2664C32.0793 24.2669 32.0781 24.2673 32.0773 24.2676L32.0764 24.268L32.0761 24.2681L32.076 24.2681C32.073 24.2693 32.0705 24.2715 32.0689 24.2744C32.0689 24.2744 32.0689 24.2744 32.0689 24.2744L32.0689 24.2745L32.0687 24.2748L32.0679 24.2761C32.0672 24.2773 32.0662 24.2791 32.0649 24.2813C32.0623 24.2858 32.0585 24.2922 32.0537 24.2998C32.0442 24.3151 32.031 24.3352 32.0161 24.3547C32.0011 24.3743 31.985 24.3925 31.9697 24.4046C31.9536 24.4173 31.9426 24.42 31.9359 24.4179C31.9102 24.4082 31.8867 24.3936 31.8666 24.3748L31.8017 24.2913C31.7983 24.2869 31.7926 24.285 31.7872 24.2863L31.7864 24.2865C31.7856 24.2866 31.7843 24.2868 31.7825 24.287C31.779 24.2874 31.7737 24.2876 31.767 24.2871C31.7537 24.2861 31.7348 24.282 31.7134 24.2691C31.6927 24.2567 31.673 24.2331 31.658 24.2111C31.6507 24.2004 31.6447 24.1905 31.6406 24.1833C31.6386 24.1797 31.637 24.1768 31.6359 24.1748L31.6348 24.1725L31.6345 24.1719L31.6344 24.1718" fill="#977C2E"/>
+<path d="M31.4812 23.5125V23.8125C31.4812 23.8125 31.5187 24.0843 31.4625 24.1593C31.4062 24.2531 31.1906 24.225 31.1625 24.1593C31.1343 24.0843 31.1437 23.8593 31.1437 23.8593L31.4812 23.5125Z" fill="#F8C83C"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M31.1297 23.8588L31.1297 23.8595L31.1296 23.8614L31.1293 23.8687C31.1291 23.8751 31.1289 23.8842 31.1287 23.8954C31.1282 23.9178 31.1279 23.9485 31.1285 23.9815C31.1291 24.0145 31.1306 24.0501 31.1337 24.0822C31.1368 24.114 31.1416 24.1437 31.1493 24.1643L31.1496 24.1649C31.1588 24.1865 31.1819 24.2024 31.2079 24.2132C31.2347 24.2243 31.2676 24.2313 31.3012 24.2332C31.3347 24.235 31.3697 24.2317 31.4003 24.2215C31.4306 24.2114 31.4578 24.1941 31.4742 24.1672C31.4903 24.1453 31.4987 24.1113 31.5031 24.0752C31.5076 24.0382 31.5082 23.9964 31.507 23.9574C31.5058 23.9183 31.5029 23.8816 31.5002 23.8548C31.4989 23.8413 31.4976 23.8303 31.4967 23.8226C31.4962 23.8188 31.4959 23.8158 31.4956 23.8138L31.4953 23.8115V23.5125H31.4812L31.4712 23.5027L31.1299 23.8534L31.1297 23.8588ZM31.1576 23.8653L31.1574 23.8696C31.1572 23.8759 31.157 23.8849 31.1568 23.896C31.1563 23.9181 31.156 23.9484 31.1566 23.981C31.1572 24.0136 31.1587 24.0484 31.1617 24.0795C31.1647 24.1108 31.1693 24.1372 31.1755 24.1541C31.1805 24.1653 31.1949 24.1774 31.2187 24.1872C31.2421 24.1969 31.2718 24.2034 31.3027 24.2051C31.3336 24.2068 31.3649 24.2036 31.3914 24.1948C31.4179 24.186 31.4386 24.1718 31.4504 24.1521L31.4508 24.1515L31.4512 24.1509C31.4629 24.1353 31.4708 24.1075 31.4752 24.0718C31.4795 24.0368 31.4801 23.9966 31.4789 23.9582C31.4777 23.92 31.4748 23.884 31.4722 23.8575C31.4709 23.8443 31.4697 23.8335 31.4688 23.826C31.4683 23.8223 31.468 23.8193 31.4677 23.8174L31.4674 23.8151L31.4673 23.8146L31.4673 23.8144L31.4672 23.8135V23.5471L31.1576 23.8653Z" fill="#977C2E"/>
+<path d="M31.2469 24.4219C31.2469 24.4219 31.2 24.4969 31.3406 24.5157C31.3781 24.5157 31.4063 24.4969 31.425 24.4782C31.4625 24.4407 31.4531 24.4032 31.4531 24.4032C31.4531 24.4032 31.4344 24.5157 31.5656 24.5157C31.6969 24.525 31.6875 24.3938 31.6875 24.3938" fill="#F8C83C"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M31.6865 24.3797C31.6943 24.3791 31.701 24.385 31.7016 24.3927L31.6875 24.3937C31.7016 24.3927 31.7016 24.3927 31.7016 24.3927L31.7016 24.3927L31.7016 24.3928L31.7016 24.3929L31.7016 24.3933L31.7017 24.3946C31.7017 24.3958 31.7017 24.3973 31.7017 24.3993C31.7017 24.4033 31.7016 24.4088 31.7009 24.4154C31.6997 24.4285 31.6965 24.4462 31.6887 24.4639C31.6808 24.4816 31.668 24.4996 31.6475 24.5124C31.6271 24.5252 31.6001 24.5321 31.5652 24.5296C31.5306 24.5296 31.5045 24.5221 31.4852 24.5099C31.4679 24.499 31.4568 24.4848 31.4498 24.4704C31.4457 24.4762 31.4408 24.4821 31.435 24.488C31.4147 24.5083 31.3832 24.5296 31.3407 24.5296C31.34 24.5296 31.3394 24.5296 31.3388 24.5295C31.2667 24.5199 31.2357 24.4949 31.2275 24.4654C31.2236 24.4515 31.2256 24.4387 31.2283 24.4298C31.2297 24.4253 31.2312 24.4216 31.2325 24.419C31.2331 24.4177 31.2337 24.4166 31.2341 24.4158L31.2347 24.4149L31.2349 24.4146L31.2349 24.4145L31.235 24.4144L31.235 24.4144C31.235 24.4144 31.235 24.4144 31.2469 24.4218M31.6865 24.3797C31.6788 24.3802 31.673 24.387 31.6735 24.3947L31.6865 24.3797Z" fill="#977C2E"/>
+<path d="M30.1125 24.6656C30.1125 24.6656 30.0375 24.5344 30.1219 24.4875C30.2156 24.4406 30.2625 24.4875 30.3187 24.4875C30.375 24.4875 30.3562 24.3562 30.3469 24.3281C30.3323 24.2868 30.31 24.2486 30.2812 24.2156C30.2625 24.1968 29.9531 24.2343 29.9625 24.4312C29.9625 24.6281 30.1125 24.6656 30.1125 24.6656ZM30.5812 25.1531C30.5812 25.1531 30.4875 25.0125 30.5437 24.9281C30.5906 24.8437 30.6375 24.9 30.6562 24.8906C30.6844 24.8906 30.6937 24.8343 30.6562 24.7406C30.6094 24.6468 30.5531 24.6093 30.525 24.6C30.4875 24.6 30.3094 24.7312 30.3375 24.9C30.3499 24.9609 30.3795 25.0171 30.4226 25.0619C30.4658 25.1067 30.5208 25.1384 30.5812 25.1531ZM32.2875 24.9843C32.2875 24.9843 32.6156 25.125 32.6344 24.7968C32.6531 24.6093 32.4937 24.4875 32.4469 24.4875C32.4094 24.4875 32.3812 24.5156 32.325 24.5812C32.2594 24.6562 32.2219 24.7031 32.2406 24.7312C32.2687 24.7593 32.3625 24.7031 32.4094 24.8062C32.475 24.9937 32.2875 24.9843 32.2875 24.9843Z" fill="#202220"/>
+<path d="M30.5813 25.1531C30.5813 25.1531 30.3281 25.0969 30.3281 24.8438C30.3281 24.675 30.5156 24.6 30.5156 24.6C30.5156 24.6 30.3469 24.6938 30.3469 24.8438C30.3375 25.0969 30.5813 25.1531 30.5813 25.1531ZM30.1125 24.6656C30.1125 24.6656 29.9625 24.6375 29.9531 24.4219C29.9344 24.2063 30.2813 24.2156 30.2813 24.2156C30.2813 24.2156 29.9531 24.2344 29.9625 24.4406C29.9813 24.6469 30.1125 24.6656 30.1125 24.6656ZM32.2875 24.9844C32.2875 24.9844 32.3531 25.0125 32.4281 25.0125C32.5031 25.0125 32.5969 24.9844 32.6156 24.8625C32.6531 24.7406 32.6438 24.675 32.5594 24.5719C32.5031 24.4875 32.4469 24.4969 32.4469 24.4969C32.4469 24.4969 32.5031 24.4969 32.5406 24.5719C32.5969 24.6469 32.6625 24.7219 32.6156 24.8625C32.5688 25.0031 32.4281 25.0031 32.3813 25.0031C32.3495 24.9998 32.3181 24.9935 32.2875 24.9844Z" fill="#4B4139"/>
+<path d="M28.3688 18.0375L28.3125 18.0187L28.35 17.925L28.5281 17.8593L28.6969 17.85L28.8844 17.8406L28.9594 17.8968L29.0531 18.1125L28.7156 18.3187L28.6594 18.3375L28.6406 18.2437L28.5844 18.1125L28.3688 18.0375Z" fill="#904720"/>
+<path d="M31.5937 23.0156L31.5656 22.5L30.1781 22.9313L30.7219 23.4469L31.5937 23.0156Z" fill="#202020"/>
+<path d="M29.0062 22.1156L28.8938 22.0219L28.7625 21.9469H28.6594L28.6406 21.975L28.6594 22.0219L28.7812 22.1719L28.9969 22.2844L29.0719 22.35L29.1188 22.3688L29.0156 22.1156H29.0062ZM28.9781 22.3313L29.0531 22.35L29.1375 22.4438L29.1844 22.5375L29.25 22.6594L29.2688 22.7344L29.1188 22.7063L28.6687 22.5656L28.7063 22.4531L28.7812 22.3875L28.8469 22.3594L28.9406 22.3406L28.9781 22.3313Z" fill="#D2A567"/>
+<path d="M29.2687 22.7062H29.3437L29.4 22.6594L29.3719 22.4906L29.4 21.9469L29.0344 21.5156L28.9594 21.7594L29.0625 22.2L29.1469 22.4625L29.2687 22.7062Z" fill="#D2A567"/>
+<path d="M29.0063 21.7219C29.0063 21.7219 28.9875 21.7594 29.0156 21.9094C29.0438 22.0501 29.1 22.3688 29.2219 22.5844L29.1 22.4063C29.1 22.4063 28.9125 21.9751 28.9406 21.6376C28.9688 21.3094 29.0063 21.7126 29.0063 21.7126V21.7219ZM29.2781 21.9938C29.2781 21.9938 29.1938 22.0876 29.1844 22.1719V22.3782C29.1844 22.3782 29.1844 22.2844 29.2594 22.2563C29.3438 22.2282 29.325 22.4719 29.3344 22.5001L29.3813 22.0594L29.2781 21.9938ZM29.3156 22.8938L28.9031 22.8001C28.6875 22.7063 28.575 22.6313 28.5844 22.5844C28.5844 22.5282 28.9594 22.5938 29.0156 22.6032L29.2406 22.6969H29.3344L29.5125 22.6219L29.5313 22.8094L29.3156 22.9032V22.8938ZM28.6313 22.8188C28.6313 22.8188 28.725 22.8938 28.6781 22.9126C28.6101 22.941 28.5356 22.9508 28.4625 22.9407L28.8563 23.0344L28.9406 22.9688L28.6313 22.8188Z" fill="#AB6D29"/>
+<path d="M28.5188 22.7062C28.5375 22.6875 28.5469 22.7718 28.6875 22.7812C28.8282 22.8 28.8938 22.7625 28.8938 22.7625L28.9594 22.8L29.0344 22.8187L28.9688 22.9218L28.7063 22.8468L28.5657 22.7718L28.5188 22.7062Z" fill="#D2A567"/>
+<path d="M29.4375 22.5281L29.5125 22.6219L29.5594 22.3969V22.1625L29.4094 22.0687L29.4375 22.5281Z" fill="#AB6D29"/>
+<path d="M29.0344 22.1344L28.9125 21.9375L28.7532 21.6469L28.8469 21.4781L28.9688 21.6469C28.9688 21.6469 28.9313 21.7688 28.9594 21.8813C28.9782 21.9938 29.0344 22.1344 29.0344 22.1344Z" fill="#4D2A15"/>
+<path d="M28.2 22.875C28.2 22.875 28.2562 22.7906 28.3781 22.7812C28.4536 22.7755 28.5296 22.7818 28.6031 22.8L28.8468 22.9312L28.9031 23.0156L28.4343 22.95L28.2 22.875Z" fill="#D2A567"/>
+<path d="M29.4375 22.0312L29.4563 22.4062C29.4563 22.5 29.5219 22.5937 29.5125 22.6218C29.4938 22.6593 29.475 22.6781 29.4188 22.7062C29.3625 22.725 29.2313 22.7062 29.2313 22.7062C29.2313 22.7062 29.3531 22.6875 29.3625 22.6593C29.3625 22.6406 29.325 22.5281 29.3156 22.4343C29.3156 22.3406 29.325 22.2281 29.2875 22.2281C29.2594 22.2281 29.2219 22.2656 29.2125 22.2843C29.2125 22.2843 29.25 21.9281 29.2875 21.8906C29.325 21.8531 29.4375 22.0406 29.4375 22.0406V22.0312Z" fill="#8F4620"/>
+<path d="M28.5657 22.7813C28.5657 22.7813 28.5188 22.7438 28.5188 22.7063C28.5188 22.6781 28.575 22.8563 28.8375 22.8469C29.1 22.8469 29.0813 22.8281 29.0813 22.8281H29.2032C29.2032 22.8281 29.175 22.95 29.1563 22.9594C29.0866 23.0017 29.0179 23.0454 28.95 23.0906L28.8844 23.1281V23.1094L28.8563 22.9125L28.6313 22.8188L28.5657 22.7813Z" fill="#AB6D29"/>
+<path d="M29.0344 22.1344C29.0344 22.1344 28.7344 21.825 28.6313 21.6187C28.5375 21.4125 28.5938 21.1312 28.5938 21.1312L28.875 21.5062C28.875 21.5062 28.8375 21.5719 28.8469 21.6937C28.8656 21.8062 29.0344 22.1344 29.0344 22.1344Z" fill="#8F4620"/>
+<path d="M28.8375 23.2781C28.8375 23.25 28.8187 23.1844 28.875 23.1094C29.0625 22.8844 29.5125 22.7344 29.5125 22.7344V22.9969L28.9312 23.2781H28.8375Z" fill="#AB6D29"/>
+<path d="M28.875 23.0625C28.9032 23.0531 29.0063 22.9687 29.0063 22.9406C29.0063 22.9031 28.9407 22.9031 28.8094 22.875C28.6688 22.8469 28.5657 22.7812 28.5657 22.7812C28.5657 22.7812 28.725 22.9125 28.7907 22.9406C28.8563 22.9594 28.8469 22.9875 28.8375 23.0062L28.875 23.0625ZM29.6532 23.1281C29.6532 23.1281 29.5688 23.0062 29.5407 22.9312C29.5125 22.8562 29.5125 22.7344 29.5125 22.725L29.4188 22.7906L29.2313 22.8562C29.2313 22.8562 29.4188 22.8562 29.4188 22.9125C29.4188 22.9781 29.1375 23.0062 29.1375 23.0062C29.1375 23.0156 29.3625 22.9687 29.3532 23.0156C29.3344 23.0719 29.2407 23.0812 29.1188 23.1281L28.9032 23.2219L28.8375 23.2687C28.8375 23.2687 28.8938 23.3062 28.9782 23.2969C29.0625 23.2969 29.25 23.25 29.25 23.25L29.6063 23.1094L29.6532 23.1281Z" fill="#8F4620"/>
+<path d="M29.6531 23.1282C29.6531 23.1282 29.5594 23.1 29.4844 22.6782C29.4094 22.2563 29.4281 22.1438 29.4281 22.1438L29.5969 22.2657L29.7562 22.5469L29.6531 23.1282Z" fill="#AB6D29"/>
+<path d="M29.7093 22.4343C29.7093 22.4343 29.6249 22.6687 29.6249 22.8093C29.6249 22.9406 29.6156 23.0343 29.6531 23.1281C29.6906 23.2218 29.8218 23.3437 29.8218 23.3437L29.8874 23.2875L29.9156 23.1L29.9249 22.7812L29.7093 22.4343Z" fill="#8F4620"/>
+<path d="M29.9438 22.7532C29.9438 22.7532 29.9813 23.3438 29.8313 23.3625C29.7656 23.3625 29.6531 23.1375 29.6531 23.1282C29.6531 23.1282 29.7844 23.3438 29.8406 23.325C29.9344 23.2875 29.8969 22.7063 29.8969 22.7063L29.9438 22.7532ZM29.6531 23.1282C29.6531 23.1282 29.625 23.1282 29.5875 23.0532C29.55 22.9875 29.5875 23.1094 29.2688 23.2219C28.95 23.3344 28.8375 23.2688 28.8375 23.2688C28.8375 23.2688 28.9406 23.3625 29.2594 23.2688C29.5781 23.175 29.55 23.1469 29.5969 23.1375H29.6531V23.1282Z" fill="#202020"/>
+<path d="M29.0625 22.3781C29.0625 22.3781 29.1188 22.425 29.175 22.5375C29.2061 22.6001 29.2374 22.6626 29.2688 22.725H29.2875C29.2875 22.725 29.25 22.6031 29.1938 22.5188L28.9875 22.2281L29.0625 22.3781Z" fill="#AB6D29"/>
+<path d="M28.875 23.1094C28.875 23.1094 28.9031 23.0063 28.875 22.9781C28.8468 22.9594 28.8093 22.9781 28.5937 22.9594C28.4608 22.9396 28.3293 22.9114 28.2 22.875C28.2 22.875 28.35 22.9687 28.4812 23.0062L28.8093 23.0812L28.8562 23.0906L28.875 23.1094Z" fill="#8F4620"/>
+<path d="M28.875 23.1094L28.8562 23.0625C28.8281 23.0344 28.7906 23.0719 28.5281 22.9969C28.2656 22.9313 28.2 22.875 28.2 22.875C28.2 22.875 28.2937 22.9688 28.5187 23.0156L28.875 23.1094Z" fill="#202020"/>
+<path d="M28.9969 22.3313C28.9969 22.3313 28.8 22.3407 28.7344 22.3969C28.6687 22.4438 28.5844 22.5844 28.5844 22.5844L28.7062 22.5938C28.7062 22.5938 28.6969 22.4813 28.7531 22.4157C28.8187 22.3594 28.9125 22.35 28.9969 22.3313Z" fill="#AB6D29"/>
+<path d="M28.6218 21.9563C28.6218 21.9563 28.6968 22.0688 28.7812 22.0969C28.8656 22.1344 28.95 22.1719 28.9875 22.2094C29.025 22.2469 29.0718 22.3782 29.0718 22.3782C29.0718 22.3782 28.7906 22.2563 28.725 22.1907C28.6796 22.1179 28.6449 22.0389 28.6218 21.9563Z" fill="#8F4620"/>
+<path d="M28.8937 22.0313C28.8937 22.0313 28.8656 21.9844 28.7906 21.9469C28.7156 21.9094 28.6593 21.9188 28.6312 21.9375C28.6031 21.9563 28.6218 21.9563 28.6218 21.9563L28.7156 22.1157L28.7812 22.0969C28.7812 22.0969 28.6312 22.0032 28.6593 21.975C28.7343 21.9094 28.8937 22.0219 28.8937 22.0219V22.0313Z" fill="#8F4620"/>
+<path d="M29.6531 21.6656L31.2469 20.85L31.9969 21.8906L30.6188 22.2656L29.8969 22.3219L29.5406 22.0687L29.6531 21.6656Z" fill="#202020"/>
+<path d="M31.7813 22.1156L33.75 23.8219L33.5344 23.9719L33.0657 23.8406L32.1094 22.8937L31.7532 22.5375L31.7813 22.1156Z" fill="#4D2A15"/>
+<path d="M34.3125 23.4844L33.1875 22.6312L31.7532 21.5531L31.7907 22.0687L33.4219 23.5687L33.9563 23.8219L34.2375 23.7469L34.3688 23.5969L34.3125 23.4844Z" fill="#4D2A15"/>
+<path d="M31.7812 22.275C31.7812 22.275 32.3437 22.9219 32.775 23.25C33.2062 23.5782 33.6187 23.9344 33.7125 23.8782C33.7875 23.8313 33.7593 23.7844 33.7593 23.7844L31.7625 22.1438L31.7718 22.275H31.7812Z" fill="#803F1D"/>
+<path d="M33.1688 23.9156L32.9719 24.075L32.7375 23.9813L31.5188 22.7438L31.5844 22.5094L31.7532 22.5375L33.1688 23.9156Z" fill="#4D2A15"/>
+<path d="M34.3125 23.4844C34.3125 23.4844 34.1625 23.8406 33.8437 23.7562C33.525 23.6719 31.7812 22.0219 31.7812 22.0219V22.1906C31.7812 22.1906 33.5437 23.8125 33.8906 23.8781C34.2281 23.9437 34.5094 23.6437 34.4719 23.6156C34.4199 23.5705 34.3667 23.5268 34.3125 23.4844Z" fill="#202020"/>
+<path d="M31.5844 22.5375C31.5844 22.5375 32.1469 23.2593 32.4375 23.5218C32.7375 23.7937 33 23.9906 33.1125 23.9718C33.2344 23.9531 33.0469 23.8125 33.0469 23.8125L32.1937 22.9687L31.7531 22.5375C31.7531 22.5375 31.5844 22.4718 31.5844 22.5375Z" fill="#803F1D"/>
+<path d="M31.725 22.5375C31.725 22.5375 33.15 23.9906 33.2625 24.0281C33.4969 24.0937 33.8437 23.8406 33.8437 23.8406L33.7219 23.775L33.7031 23.8219C33.7031 23.8219 33.6375 23.9719 33.3281 23.9062C33.0281 23.8406 31.7719 22.4906 31.7719 22.4906L31.725 22.5375Z" fill="#202020"/>
+<path d="M32.25 23.9344L31.7344 23.3344L31.6219 23.1375L31.5938 22.8844L32.625 23.925L32.4844 24.0188L32.3531 23.9813L32.25 23.9344Z" fill="#4D2A15"/>
+<path d="M33.1969 23.9531C33.1969 23.9531 33.075 24.1406 32.8969 24.1031C32.795 24.0784 32.7033 24.0227 32.6344 23.9437L31.6407 22.9687L31.6125 22.8187C31.6125 22.8187 32.7094 23.9719 32.8969 24.0187C33.0469 24.0562 33.15 23.8875 33.15 23.8875L33.1969 23.9531Z" fill="#202020"/>
+<path d="M32.6438 23.9156C32.6438 23.9156 32.5969 24.0656 32.4563 24.0469C32.3063 24.0187 32.2688 23.9625 32.2688 23.9625L31.65 23.2406L31.6406 23.0531C31.6406 23.0531 32.2781 23.925 32.4187 23.9719C32.5687 24.0187 32.6062 23.8781 32.6062 23.8781L32.6438 23.9156Z" fill="#202020"/>
+<path d="M31.9969 22.0218C31.9969 22.0218 32.5875 22.5281 32.6344 22.5468C32.6813 22.575 32.8875 22.5843 32.8969 22.6125C32.9157 22.6406 32.7657 22.6125 32.7563 22.6406C32.7469 22.6781 33.0563 22.9218 33.1032 22.9312C33.15 22.9312 33.4032 22.9312 33.3938 22.9687C33.3938 22.9968 33.225 22.9687 33.2157 23.0062C33.2157 23.0437 33.4875 23.2593 33.5344 23.2687C33.5813 23.2687 33.9 23.2687 33.9 23.3062C33.9 23.3343 33.6469 23.3062 33.6469 23.3531C33.6563 23.4093 34.0782 23.6718 34.0594 23.7093C34.0407 23.7468 33.5532 23.3812 33.5438 23.4C33.525 23.4187 33.5063 23.5312 33.4782 23.55C33.45 23.5687 33.4782 23.4 33.4594 23.325C33.4313 23.25 33.1407 23.0343 33.1125 23.0531C33.0844 23.0812 33.1125 23.2125 33.075 23.2125C33.0375 23.2125 33.0844 23.0531 33.0563 22.9968C32.9582 22.887 32.8445 22.7923 32.7188 22.7156C32.6813 22.7156 32.7094 22.8375 32.6813 22.8562C32.6532 22.875 32.6625 22.7156 32.625 22.6687C32.5875 22.6218 31.9688 22.0593 31.9969 22.0125V22.0218Z" fill="#B07229"/>
+<path d="M30.9844 23.6531C30.9844 23.6531 30.9844 23.8781 30.8906 23.9156C30.7875 23.9437 30.6 23.5031 30.6 23.5031L30.5531 23.0906L30.8437 23.3719L30.9844 23.6531ZM31.7719 23.5406V23.4375C31.7719 23.3812 31.7437 23.2969 31.7437 23.2969L31.725 23.0719L31.6687 22.9125L31.6312 22.8187H31.5656L31.4062 22.9312L31.3594 23.0812L31.4344 23.3625L31.5094 23.6156L31.6312 23.6531L31.7719 23.5594V23.5406Z" fill="#4D2A15"/>
+<path d="M31.575 23.9343C31.6031 23.925 31.5375 23.6156 31.5375 23.6156L31.35 23.1656L31.3031 23.0062L31.1625 22.95L31.0687 23.0625L31.0875 23.2406C31.0875 23.2406 31.2281 23.5406 31.2937 23.6437C31.3687 23.7468 31.5094 23.9531 31.575 23.9343Z" fill="#4D2A15"/>
+<path d="M31.4062 22.9688C31.4696 23.0378 31.5147 23.1216 31.5375 23.2125C31.5375 23.2125 31.6594 23.55 31.6406 23.5875C31.6219 23.6156 31.5469 23.6156 31.5469 23.6156C31.5469 23.6156 31.7156 23.7844 31.7625 23.7656C31.8094 23.7469 31.7906 23.5781 31.7719 23.5406C31.7625 23.5031 31.7062 23.5406 31.6781 23.4938C31.6687 23.4563 31.6031 23.2406 31.6031 23.1V22.8469C31.6219 22.8188 31.7438 23.1281 31.7438 23.2875L31.8 23.3531L31.7438 23.0531L31.6781 22.8375C31.6781 22.8188 31.7063 22.7625 31.7063 22.6969V22.6031C31.7063 22.6031 31.7625 22.65 31.7906 22.65C31.8188 22.65 31.8562 22.6125 31.8656 22.4625C31.8844 22.3219 31.8562 21.9 31.8562 21.9L31.2188 22.7438L31.4062 22.9781V22.9688Z" fill="#202020"/>
+<path d="M31.4063 22.9031C31.4063 22.9031 31.3781 23.1281 31.4625 23.3531L31.5844 23.6343C31.6031 23.6625 31.6031 23.9062 31.575 23.9343C31.575 23.9343 31.4063 23.5218 31.35 23.3156C31.3031 23.1187 31.2844 23.0343 31.2563 23.0156L31.1813 22.9968L31.4063 22.9031Z" fill="#202020"/>
+<path d="M31.35 24.0938C31.3688 24.0938 31.35 24 31.35 24L31.3313 23.7844L31.1063 23.325L30.8625 23.1094L30.7313 22.9219L30.7125 23.2969C30.7125 23.2969 30.9 23.6719 31.0031 23.7656C31.125 23.8781 31.3125 24.1031 31.35 24.0938Z" fill="#4D2A15"/>
+<path d="M30.4407 23.0625C30.4407 23.0625 30.4782 23.1657 30.4782 23.2313V23.3625L30.6469 23.6907C30.7313 23.8313 30.8063 23.9813 30.8719 23.9532C30.9375 23.9157 30.9657 23.8125 30.9657 23.7938C30.975 23.7844 30.8907 23.9157 30.8532 23.8969C30.7634 23.6974 30.6912 23.4903 30.6375 23.2782L30.5438 23.2032C30.5073 23.1611 30.4729 23.1173 30.4407 23.0719V23.0625ZM31.0969 23.5782L30.9375 23.2875C30.8907 23.1938 30.825 23.1282 30.8063 23.1282C30.7875 23.1282 30.7594 22.9407 30.7594 22.9407C30.7594 22.9407 30.825 23.0625 30.9094 23.1C31.0032 23.1469 31.05 23.175 31.0969 23.1657L31.1157 23.3532L31.0969 23.5782Z" fill="#202020"/>
+<path d="M30.6938 23.2781C30.6938 23.2781 30.7407 23.4093 30.825 23.5312C30.9 23.6531 31.0407 23.8031 31.0407 23.8031C31.0407 23.8031 30.8907 23.6531 30.8063 23.5406C30.7529 23.4583 30.7088 23.3702 30.675 23.2781H30.6938Z" fill="#5C3A1D"/>
+<path d="M31.1251 23.1281C31.1251 23.1281 31.1719 23.0156 31.2001 23.0062L31.3126 22.9781C31.3126 22.9781 31.2469 22.9688 31.2001 22.9031L31.0782 22.7812L31.1157 22.9688L31.1251 23.1281ZM31.0876 23.1656C31.0876 23.1656 31.2751 23.5406 31.3126 23.6813C31.3594 23.8031 31.3501 24 31.3501 24C31.3501 24 31.3313 23.8594 31.2938 23.7469L31.0688 23.2781C31.0594 23.25 31.0876 23.1656 31.0876 23.1656Z" fill="#202020"/>
+<path d="M31.3313 22.9125L31.3781 22.35L31.3313 22.1438L31.0781 21.5813C31.0781 21.5813 31.0688 21.6563 31.0031 21.6563C30.8917 21.6299 30.7906 21.5712 30.7125 21.4875C30.6665 21.6332 30.66 21.7885 30.6937 21.9375L31.1906 22.8657L31.3313 22.9125Z" fill="#4D2A15"/>
+<path d="M30.3563 23.2781C30.3563 23.2781 30.4313 23.3719 30.4781 23.3719C30.5156 23.3531 30.5063 23.175 30.45 23.0719C30.3938 22.9781 29.7938 22.1719 29.7 22.125C29.6063 22.0781 30.3563 23.2781 30.3563 23.2781Z" fill="#8B441F"/>
+<path d="M30.7594 22.95C30.7781 22.9875 30.8156 23.2406 30.7125 23.2687C30.5719 23.2969 29.9156 22.3875 29.8125 22.2656C29.8125 22.2656 29.4 22.0031 29.3906 21.9375C29.3813 21.8719 29.8313 22.0312 29.8313 22.0312L30.7219 22.875L30.7688 22.95H30.7594Z" fill="#8B441F"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M29.3971 21.9313C29.3955 21.9326 29.3948 21.9342 29.3952 21.9369C29.3957 21.94 29.3974 21.9442 29.4008 21.9495C29.4042 21.9547 29.4089 21.9607 29.4149 21.9673C29.4268 21.9806 29.4435 21.996 29.4635 22.0129C29.5033 22.0466 29.5556 22.0855 29.6077 22.1224C29.6598 22.1592 29.7116 22.1941 29.7504 22.2197C29.7698 22.2325 29.786 22.243 29.7973 22.2503C29.8029 22.254 29.8073 22.2568 29.8103 22.2587L29.8138 22.2609L29.8149 22.2617L29.8156 22.2621L29.816 22.2626C29.8365 22.2868 29.8785 22.3417 29.9339 22.414C29.9485 22.4332 29.9641 22.4536 29.9805 22.4749C30.0587 22.5769 30.1548 22.701 30.252 22.8205C30.3493 22.94 30.4476 23.0547 30.5303 23.1377C30.5717 23.1793 30.6091 23.2127 30.6403 23.2349C30.656 23.246 30.67 23.2542 30.6821 23.2591C30.6942 23.2641 30.7039 23.2657 30.7114 23.2642C30.735 23.2577 30.7511 23.2382 30.7615 23.2107C30.772 23.1832 30.7763 23.1483 30.7769 23.1128C30.7775 23.0774 30.7743 23.0416 30.7698 23.0124C30.7675 22.9978 30.765 22.9849 30.7624 22.9745C30.7598 22.964 30.7572 22.9563 30.7551 22.9521L30.7517 22.9453H30.7602L30.7182 22.878L29.8287 22.0354L29.8284 22.0352L29.8246 22.0339C29.8213 22.0328 29.8165 22.0311 29.8104 22.029C29.7981 22.0248 29.7806 22.0188 29.7596 22.0119C29.7176 21.9979 29.6617 21.9801 29.6061 21.9643C29.5505 21.9485 29.4953 21.9348 29.4548 21.9291C29.4345 21.9263 29.4183 21.9255 29.4076 21.9273C29.4022 21.9282 29.3989 21.9297 29.3971 21.9313ZM29.8328 22.0269L29.8337 22.0272L30.7259 22.8725L30.7258 22.8725L30.7772 22.9547H30.7663C30.7681 22.9595 30.7698 22.9654 30.7715 22.9722C30.7741 22.9829 30.7768 22.9962 30.779 23.011C30.7836 23.0406 30.7869 23.0769 30.7863 23.113C30.7857 23.149 30.7813 23.185 30.7703 23.214C30.7593 23.243 30.7415 23.2657 30.7137 23.2733L30.7134 23.2734C30.7033 23.2754 30.6915 23.2731 30.6785 23.2678C30.6655 23.2625 30.6509 23.2539 30.6349 23.2426C30.603 23.2199 30.5652 23.186 30.5237 23.1444C30.4406 23.061 30.342 22.946 30.2448 22.8264C30.1474 22.7068 30.0513 22.5826 29.9731 22.4806C29.9566 22.4592 29.941 22.4387 29.9263 22.4195C29.8714 22.3479 29.8298 22.2935 29.8093 22.2692L29.8087 22.2688L29.8053 22.2666C29.8023 22.2647 29.7978 22.2618 29.7922 22.2582C29.7809 22.2509 29.7647 22.2404 29.7453 22.2275C29.7064 22.2019 29.6545 22.167 29.6023 22.13C29.5501 22.0931 29.4976 22.054 29.4574 22.0201C29.4374 22.0031 29.4203 21.9873 29.4079 21.9736C29.4017 21.9668 29.3966 21.9604 29.3929 21.9546C29.3892 21.9488 29.3867 21.9433 29.3859 21.9382C29.3851 21.9326 29.3868 21.9278 29.3909 21.9242C29.3946 21.921 29.4 21.9191 29.406 21.9181C29.4182 21.916 29.4356 21.917 29.4561 21.9198C29.4973 21.9256 29.553 21.9395 29.6087 21.9553C29.6644 21.9711 29.7204 21.989 29.7625 22.003C29.7835 22.0099 29.8011 22.0159 29.8134 22.0201C29.8196 22.0222 29.8244 22.0239 29.8277 22.0251L29.8315 22.0264L29.8328 22.0269Z" fill="#5C3A1D"/>
+<path d="M30.3562 23.2781C30.3562 23.2781 30.2812 23.1562 30.2719 23.0625C30.2719 22.9688 30.2344 22.9219 30.2344 22.8844C30.2344 22.8563 29.7469 22.1625 29.7 22.1156C29.6437 22.0687 29.4844 21.9844 29.4844 21.9844C29.4879 22.06 29.4973 22.1352 29.5125 22.2094C29.5125 22.2094 29.6625 22.4906 29.8875 22.7438C30.0422 22.9263 30.1985 23.1076 30.3562 23.2875V23.2781Z" fill="#202020"/>
+<path d="M31.0875 23.1563C31.1531 23.1281 31.125 22.9031 31.0968 22.8281C30.9627 22.5329 30.8251 22.2391 30.6843 21.9469L30.5625 21.9844L30.3468 21.8156L30.2156 21.675C30.2156 21.675 30.2625 21.8719 30.2531 21.9656V22.1156L30.5625 22.6688L31.0875 23.1656V23.1563ZM31.5281 22.6688L31.6218 22.5469L31.575 22.1344L31.3125 21.2531C31.3125 21.2531 31.2468 21.2625 31.1812 21.225C31.125 21.1875 31.05 21.1031 31.05 21.1031L31.1156 21.6375L31.3875 22.3875L31.4062 22.6031L31.5281 22.6688Z" fill="#4D2A15"/>
+<path d="M30.7218 22.875C30.7218 22.875 30.4593 22.5938 30.375 22.4532L30.2156 22.1719C30.2156 22.1719 30.1406 22.2 30.0468 22.1719C29.9531 22.125 29.8406 22.0032 29.8406 22.0032C29.8406 22.0032 29.7656 22.1438 30.1406 22.5282C30.5718 22.9594 30.7218 22.875 30.7218 22.875Z" fill="#202020"/>
+<path d="M31.35 22.9688C31.4625 22.9313 31.4531 22.4625 31.35 22.1531C31.2562 21.8438 31.0781 21.5719 31.0781 21.5719C31.0781 21.5719 31.2937 22.0781 31.3406 22.275C31.3781 22.4813 31.3406 22.6219 31.3031 22.6125C31.2656 22.6031 31.2656 22.4906 31.1812 22.2938C31.0875 22.1063 31.0312 22.05 31.0312 22.05C31.0312 22.05 31.3406 22.875 31.2469 22.8563C31.1625 22.8375 30.75 21.9281 30.7312 21.9C30.7125 21.8813 30.6937 21.9375 30.6937 21.9375C30.6937 21.9375 31.0687 23.0813 31.35 22.9688Z" fill="#8B441F"/>
+<path d="M31.5938 20.7468L31.7813 21.1406L31.8375 21.5531L31.8563 21.9C31.8563 21.9 31.8563 22.5937 31.7813 22.6125C31.6875 22.6218 31.65 22.5468 31.65 22.5281C31.5965 22.2688 31.5434 22.0094 31.4907 21.75L31.3313 20.9531L31.3875 20.8968L31.4063 20.7843L31.5282 20.775L31.5938 20.7468Z" fill="#4D2A15"/>
+<path d="M31.0875 23.1562C31.1625 23.1562 31.0875 22.9687 31.0875 22.9687C31.0875 22.9687 31.0312 23.0625 30.975 22.9969C30.9281 22.9312 30.8531 22.7062 30.8531 22.7062L30.8062 22.5656C30.8062 22.5656 30.75 22.7156 30.6843 22.7156C30.6187 22.7156 30.2531 22.1156 30.2531 22.1156L30.2156 22.1719C30.2156 22.1719 30.7218 23.2125 31.0875 23.1656V23.1562Z" fill="#8B441F"/>
+<path d="M30.8532 22.7063C30.8532 22.7063 30.9188 22.5563 30.8907 22.425C30.8625 22.2844 30.6844 21.9469 30.6844 21.9469C30.6844 21.9469 30.6282 21.9563 30.5532 21.9282C30.4798 21.8998 30.4105 21.862 30.3469 21.8157C30.4722 22.1352 30.6427 22.4351 30.8532 22.7063ZM31.1438 22.4907C31.1438 22.4907 31.0969 22.1719 30.9563 21.8719C30.8063 21.5813 30.7125 21.4875 30.7125 21.4875V21.8157C30.7125 21.8157 30.8532 21.8625 30.9563 22.0407C31.05 22.2282 31.1438 22.4907 31.1438 22.4907ZM31.5469 21.9469C31.5469 21.9469 31.5188 21.6 31.4719 21.4032L31.3594 20.9344C31.3594 20.9344 31.3594 20.9157 31.3875 20.8969H31.4438C31.5188 20.925 31.5469 21.1032 31.5469 21.1032L31.5375 20.8125L31.5094 20.7657H31.3782C31.3782 20.7657 31.4063 20.8594 31.3688 20.8875C31.3407 20.9157 31.3125 20.8688 31.3032 20.8594L31.2844 20.8969L31.3219 21.0844L31.3125 21.2438C31.3125 21.2438 31.3594 21.45 31.425 21.5719C31.4813 21.7032 31.5469 21.9469 31.5469 21.9469ZM31.8563 21.9C31.8563 21.9 31.9125 21.4032 31.8 21.0844C31.6875 20.7657 31.5938 20.6907 31.5938 20.6907L31.5375 20.7469C31.5375 20.7469 31.7063 21.0282 31.7625 21.2719L31.8563 21.9ZM31.35 22.1532C31.35 22.1532 31.2938 21.7688 31.2282 21.5157C31.1944 21.4039 31.1631 21.2914 31.1344 21.1782L31.0313 21.0844C31.0313 21.0844 31.0969 21.3375 31.0875 21.4219L31.0782 21.5532C31.0782 21.5532 31.125 21.6844 31.2 21.7969C31.2596 21.9114 31.3097 22.0306 31.35 22.1532Z" fill="#202020"/>
+<path d="M31.6125 22.7719C31.7062 22.7719 31.6219 22.2094 31.5844 22.0688C31.5469 21.9188 31.3031 21.2438 31.3031 21.2438C31.3031 21.2438 31.5844 22.2094 31.5656 22.2563C31.5375 22.3313 31.425 21.9656 31.4062 21.975C31.3875 21.975 31.6125 22.6219 31.5281 22.6313C31.4531 22.6313 31.4062 22.4906 31.4062 22.4906L31.4156 22.6313C31.4156 22.6313 31.4719 22.7625 31.6125 22.7719Z" fill="#904720"/>
+<path d="M31.7343 22.4907C31.8 22.4907 31.7156 21.9563 31.6687 21.7219L31.4812 21.0188C31.4812 21.0188 31.6218 21.3469 31.6968 21.7219C31.7718 22.0969 31.8281 22.5657 31.7531 22.5844C31.6781 22.5844 31.6406 22.5094 31.6406 22.5094V22.425C31.6406 22.425 31.6687 22.4907 31.7343 22.4907Z" fill="#904720"/>
+<path d="M30.825 23.1094C30.825 23.1469 30.825 23.3344 30.7312 23.3157C30.6375 23.3063 30.4594 23.1376 30.4219 23.0344C30.4219 23.0344 30.6281 23.2688 30.7031 23.2594C30.7781 23.2594 30.7781 23.0251 30.7594 22.9594C30.7594 22.9032 30.8156 23.1094 30.8156 23.1094H30.825Z" fill="#312317"/>
+<path d="M31.3219 20.5782C31.3219 20.5782 31.4531 20.6626 31.5469 20.6063C31.5945 20.5753 31.6344 20.5338 31.6637 20.4851C31.6929 20.4364 31.7107 20.3817 31.7156 20.3251C31.7156 20.2501 31.7156 20.1844 31.65 20.1001C31.5844 20.0157 31.7438 20.1657 31.7438 20.3157C31.7438 20.4657 31.7438 20.7188 31.5094 20.7844C31.275 20.8313 31.3781 20.7657 31.3781 20.7657L31.3219 20.5782Z" fill="#D2A567"/>
+<path d="M31.1344 20.1282C31.1344 20.1282 31.2844 20.3719 31.3406 20.5969C31.4063 20.8125 31.3875 20.8969 31.3594 20.9063C31.3219 20.9063 31.3031 20.8782 31.2938 20.8219C31.2938 20.7657 31.1344 20.1282 31.1344 20.1282Z" fill="#8F4620"/>
+<path d="M28.5094 20.4375L29.5031 21.8719L30.7406 20.4657L29.9625 19.6594L28.5094 20.4375Z" fill="#1E2121"/>
+<path d="M29.7656 19.5469L29.7094 19.7719L29.8312 20.1562L30.0375 20.3719L30.2719 20.5312L30.3281 20.3437L30.3844 20.1375L30.45 20.1187L30.6 20.175L30.6937 20.0344L30.8625 19.7437L30.825 19.6312L30.7875 19.5469L30.5344 19.1156L30.45 19.275L30.375 19.3219L30.225 19.2469L30.0562 19.4719L29.8406 19.3781L29.7656 19.5469Z" fill="#4D2A15"/>
+<path d="M30.2812 20.5313C30.2812 20.5313 30.3187 20.5031 30.3375 20.3813C30.3562 20.2688 30.3562 19.9219 30.3281 19.7813C30.2999 19.6406 30.2062 19.3688 30.1874 19.3875C30.1687 19.4156 30.3281 19.6969 30.3093 20.0438C30.2812 20.3813 30.2906 20.475 30.2156 20.5125C30.1499 20.5406 30.2718 20.5313 30.2718 20.5313H30.2812Z" fill="#5C3818"/>
+<path d="M30.3375 19.95C30.3375 19.95 30.4969 20.1844 30.5719 20.1C30.6563 20.0156 30.6188 19.725 30.5719 19.6031L30.4594 19.3219L30.5063 19.2656L30.5906 19.5844C30.6188 19.7156 30.7125 20.0719 30.6 20.1469C30.4969 20.2031 30.3375 20.0062 30.3375 20.0062V19.95Z" fill="#5C3818"/>
+<path d="M29.8031 20.1188C29.8031 20.1188 29.8594 20.025 29.9344 20.025C30.0094 20.025 30.0281 20.0531 30.0281 20.0531L30.0844 20.2406L30.1969 20.4469L30.2906 20.5406L30.2437 20.5969L30.1594 20.6156L29.925 20.4844L29.8594 20.3906L29.8031 20.1094V20.1188Z" fill="#8F4620"/>
+<path d="M30.1875 22.1531C30.1125 22.2 29.9344 22.1062 29.8407 22.0219L29.2032 21.3937L29.1282 21.0938L29.3344 21.15L29.7 20.9906L29.7657 20.8688L30.1969 20.6437L30.4407 20.5125L30.9563 20.5031L31.0875 20.25C31.0875 20.25 31.2563 20.55 31.2844 20.6719C31.3219 20.8031 31.3125 21.1781 31.2657 21.2062C31.2188 21.2344 31.05 21.0937 31.0219 21.0844C31.0032 21.075 31.1532 21.6187 31.0219 21.6469C30.9 21.6656 30.6844 21.4406 30.6844 21.4406C30.6844 21.4406 30.7782 21.9281 30.6657 21.9281C30.4893 21.8935 30.3266 21.8089 30.1969 21.6844C30.1969 21.6844 30.3188 22.0875 30.1969 22.1531H30.1875Z" fill="#D2A567"/>
+<path d="M30.0937 21.525L30.1969 21.6844C30.225 21.7219 30.1969 21.9562 30.1781 22.0031C30.15 22.0875 30.0281 21.8906 29.9625 21.7219L29.7562 21.3656C29.7562 21.3281 30.0844 21.525 30.0844 21.525H30.0937ZM31.1062 20.3156C31.1062 20.3156 31.2937 21.075 31.2 21.1031C31.1062 21.1313 30.8625 20.8594 30.825 20.8219L30.45 20.2219L30.375 20.1469L30.3937 20.1094L30.5531 20.1656L31.1156 20.3156H31.1062Z" fill="#8F4620"/>
+<path d="M29.8032 21.7781C29.7657 21.8063 29.6813 21.6844 29.6438 21.6469L29.3625 21.3375C29.2828 21.2698 29.2133 21.1909 29.1563 21.1031C29.1563 21.075 29.0813 21 29.0813 21L29.1469 20.9063H29.2313C29.2313 20.9063 29.7375 21.3 29.7657 21.375C29.8032 21.4313 29.8219 21.7594 29.8032 21.7781ZM30.5532 21.7781C30.5344 21.8063 30.2063 21.5625 30.0657 21.3656C29.925 21.1594 29.7844 20.9906 29.7375 20.8969L29.6813 20.7188L29.775 20.7375C29.775 20.7375 30.6 21.75 30.5625 21.7875L30.5532 21.7781ZM30.675 21.4313C30.6563 21.4594 30.5157 21.3469 30.4219 21.2344C30.3282 21.1125 30.3844 20.9625 30.3844 20.9625C30.3844 20.9625 30.6938 21.4125 30.675 21.4313ZM30.8625 21.3844C30.8157 21.4125 30.6282 21.1781 30.4688 20.9156C30.3469 20.7281 30.3188 20.7 30.3 20.6813C30.2532 20.6531 30.1688 20.6438 30.1688 20.6438L30.15 20.6156L30.2438 20.5969L30.3 20.5219L30.3938 20.4L30.7969 21.1969C30.7969 21.1969 30.8907 21.375 30.8625 21.3844Z" fill="#8F4620"/>
+<path d="M29.8407 22.0219C29.8407 22.05 29.8407 22.0782 29.7282 22.0688C29.3512 21.9258 29.0273 21.6706 28.8 21.3375L28.5188 20.8688L28.6219 20.7375L29.5219 21.7688L29.8407 22.0219Z" fill="#AB6D29"/>
+<path d="M29.8406 22.0219C29.8406 22.0687 29.7937 22.0781 29.7375 22.0687C29.6812 22.05 29.4562 21.975 29.0906 21.5719C28.894 21.3644 28.7268 21.131 28.5937 20.8781L28.575 20.7094L28.6875 20.6625L29.2968 21.6L29.8406 22.0219Z" fill="#8F4620"/>
+<path d="M30.4312 21.6188C30.4312 21.6188 30.2437 21.4781 30.1312 21.3375C29.9875 21.1773 29.8675 20.9974 29.775 20.8031C29.7843 20.7375 29.8875 20.7375 29.8875 20.7375V20.5687L29.9062 20.5125L30.0843 20.5875L30.3 20.8594L30.3843 20.9625C30.3843 20.9625 30.525 21.3094 30.4968 21.3375C30.4687 21.3656 30.2718 21.15 30.2437 21.1781C30.2156 21.2062 30.4687 21.5906 30.4312 21.6188ZM30.0843 21.525C30.0843 21.525 30.15 21.6188 30.1218 21.6844C30.0937 21.75 30.075 21.7781 29.9812 21.6469C29.9207 21.5449 29.8483 21.4505 29.7656 21.3656C29.7656 21.375 29.775 21.5812 29.7375 21.5812C29.6906 21.5812 29.55 21.4031 29.4562 21.2719L29.2218 20.9062V20.7188L29.2125 20.4844L29.2406 20.5687L29.2781 20.6344L29.6156 21.0281L29.7093 20.9625L29.9062 21.3375L30.0937 21.525H30.0843ZM28.8187 20.9531C28.8187 20.9531 29.0812 21.4031 29.3156 21.6562C29.4647 21.8116 29.6432 21.9358 29.8406 22.0219L29.0531 21.0938L28.8187 20.9531ZM30.8062 21.2156C30.693 21.1282 30.5976 21.02 30.525 20.8969C30.4312 20.7469 30.3468 20.5219 30.3562 20.4281C30.3562 20.3344 30.3937 20.1094 30.3937 20.1094C30.3937 20.1094 30.6562 20.3906 30.7125 20.5125C30.7593 20.6438 30.8718 20.8219 30.8437 20.8406C30.825 20.8594 30.6468 20.7188 30.6187 20.7469C30.6 20.7844 30.8343 21.1969 30.8062 21.2156ZM31.1062 20.9344C31.0781 20.9438 30.9375 20.7844 30.9093 20.6906C30.8796 20.593 30.8607 20.4924 30.8531 20.3906L30.7406 20.1094V19.8L30.8718 19.7812L31.05 20.0344C31.05 20.0344 31.1156 20.175 31.1156 20.3812C31.1156 20.5969 31.1437 20.9062 31.1156 20.925L31.1062 20.9344ZM28.9968 21.6844C28.8559 21.508 28.7304 21.3198 28.6218 21.1219L28.5281 20.85L28.575 20.8875C28.575 20.8875 28.65 21.1875 29.0156 21.5531C29.3906 21.9281 29.475 21.9469 29.475 21.9469C29.475 21.9469 29.5406 22.1531 29.5125 22.2281C29.5125 22.2281 29.2406 21.9844 28.9968 21.6937V21.6844Z" fill="#4D2A15"/>
+<path d="M29.4 22.1156C29.4 22.1156 29.0813 21.8343 28.8375 21.5156C28.6827 21.3214 28.5447 21.1144 28.425 20.8968L28.5375 20.8031C28.7428 21.2894 29.0351 21.7342 29.4 22.1156ZM29.8407 22.0218L29.2782 21.45C29.0907 21.2437 28.9969 21.0375 28.9969 21.0375L29.1469 21.0937C29.1469 21.0937 29.2125 21.2531 29.3344 21.4218L29.8407 22.0218ZM29.7657 21.3656C29.7657 21.3656 29.5688 21.1218 29.475 20.9718L29.2875 20.6156C29.2875 20.6156 29.55 20.925 29.625 20.9437C29.7094 20.9625 29.7094 20.9437 29.7094 20.9437C29.7094 20.9437 29.6719 21.0562 29.7 21.15L29.7657 21.3656ZM29.85 20.3718C29.85 20.3718 29.8782 20.55 29.8594 20.6531C29.8407 20.7468 29.7844 20.7468 29.7844 20.7468C29.8857 20.8935 30.0127 21.0206 30.1594 21.1218L29.9907 20.8687C29.9438 20.775 29.8688 20.6812 29.8969 20.6062C29.9344 20.5125 30.0938 20.6625 30.1407 20.7L30.3844 20.9625C30.3844 20.9625 30.3094 20.7281 30.2157 20.6437C30.0949 20.5474 29.9698 20.4566 29.8407 20.3718H29.85Z" fill="#202020"/>
+<path d="M30.6562 20.8875L30.4969 20.4937L30.3469 20.0062V20.2687C30.3375 20.3812 30.3 20.55 30.2531 20.5781C30.1969 20.5969 30.1875 20.6062 30.0937 20.5781C30 20.5594 30.1594 20.625 30.1594 20.625C30.1594 20.625 30.2531 20.625 30.2906 20.5781C30.3281 20.5312 30.3375 20.4375 30.3844 20.4469C30.4219 20.4656 30.4781 20.6062 30.5062 20.6719L30.6562 20.8875Z" fill="#202020"/>
+<path d="M30.3469 20.0062C30.3469 20.0062 30.5344 20.2219 30.6282 20.1281C30.7032 20.0344 30.6563 19.7531 30.6563 19.7531C30.6563 19.7531 30.7688 19.8 30.8063 19.7719C30.8438 19.7344 30.825 19.6312 30.825 19.6312C30.825 19.6312 31.0407 19.9312 31.1344 20.1281C31.2375 20.3156 31.2844 20.6719 31.2844 20.6719C31.2844 20.6719 31.1157 20.3906 31.0313 20.1281C30.9469 19.8844 30.8344 19.7719 30.8157 19.8C30.7793 19.889 30.7695 19.9867 30.7875 20.0812C30.8063 20.175 30.8813 20.2781 30.9282 20.4094L31.0313 20.7281L30.8813 20.4937C30.8157 20.4187 30.7594 20.3812 30.7219 20.3437C30.6844 20.3062 30.6282 20.2312 30.5625 20.2125C30.5063 20.1844 30.3938 20.1281 30.3938 20.175C30.3938 20.2219 30.3657 20.0812 30.3657 20.0812L30.3469 20.0062Z" fill="#202020"/>
+<path d="M29.7 20.9343C29.8028 21.1487 29.9354 21.3475 30.0937 21.525C30.0937 21.525 29.9062 21.3562 29.8312 21.2437C29.7756 21.146 29.7316 21.0422 29.7 20.9343Z" fill="#171717"/>
+<path d="M30.9562 20.9906C30.9281 20.9906 30.8343 20.9625 30.825 20.9906C30.825 21.0281 30.8812 21.1594 30.9468 21.225C31.0125 21.2906 31.0406 21.2907 31.05 21.2813C31.0687 21.2813 31.05 21.2157 31.0312 21.15V20.9906C31.0218 20.9625 30.9562 20.9906 30.9562 20.9906Z" fill="#8F4620"/>
+<path d="M28.6875 19.6312L28.5656 19.6968L28.4343 19.9781L28.4718 20.475L28.6687 20.7562C28.7437 20.8687 28.9968 21.15 29.0625 21.1312C29.1281 21.1125 29.1937 20.9156 29.2031 20.8125L29.2218 20.5125L29.3906 20.7281C29.4937 20.85 29.5781 20.9531 29.6343 20.9437C29.6812 20.9437 29.8218 20.6437 29.8218 20.6062C29.8312 20.5687 29.4656 19.6687 29.4656 19.6687L29.2968 19.575L28.6781 19.6312H28.6875Z" fill="#D2A567"/>
+<path d="M29.5125 20.3813L29.6062 20.7281C29.6531 20.8406 29.6062 20.9438 29.6343 20.9438C29.6531 20.9438 29.85 20.6906 29.85 20.5688C29.85 20.4563 29.85 20.3344 29.8031 19.9781C29.7562 19.6219 29.8218 19.5094 29.8218 19.5094L29.7093 19.4156L29.5218 19.8094L29.5125 20.3813ZM28.8562 20.175L28.9218 20.6438C28.95 20.7563 29.0156 20.9531 29.0531 20.9438C29.0906 20.9438 29.2031 20.6344 29.2125 20.5313C29.2125 20.5313 29.1281 20.3813 29.1375 20.0156C29.1375 19.6406 29.1 19.6031 29.1 19.6031L28.8562 20.175Z" fill="#AB6D29"/>
+<path d="M28.3594 19.4531C28.3594 19.4531 28.0687 19.8844 28.0781 20.1094C28.0781 20.3438 28.1156 20.2969 28.1812 20.5031C28.2469 20.7187 28.2844 21.0281 28.2937 21.0563C28.2937 21.075 28.3406 21.0375 28.3406 21.0094L28.3594 19.4531Z" fill="#45392D"/>
+<path d="M28.3594 19.5C28.3594 19.5 28.1063 19.9031 28.125 20.1188C28.1438 20.3344 28.1719 20.3344 28.2469 20.5312C28.3219 20.7188 28.3219 21.0375 28.3219 21.0375C28.3219 21.0375 28.4156 21.0187 28.5 20.9531C28.5938 20.8875 28.6688 20.7562 28.6688 20.7562L28.575 20.5594C28.5482 20.4996 28.5292 20.4366 28.5188 20.3719L28.4438 20.2781L28.4625 19.8937L28.5281 19.6125V19.5187L28.3594 19.5094V19.5Z" fill="#AB6D29"/>
+<path d="M29.7375 20.1843C29.7375 20.1843 29.6156 20.1562 29.5594 20.1281C29.5031 20.1 29.4844 20.025 29.4844 20.025L29.5219 19.95L29.7375 20.1843Z" fill="#DBAD6C"/>
+<path d="M28.4063 19.5469C28.4063 19.5469 28.2188 19.95 28.2469 20.2219C28.275 20.4937 28.425 20.8406 28.4344 20.85C28.4531 20.85 28.4344 20.8219 28.4438 20.7562V19.9406L28.5281 19.6781V19.5375L28.4063 19.5469Z" fill="#D2A567"/>
+<path d="M28.8562 19.6406C28.8562 19.6406 28.8843 19.7531 28.8656 19.8094C28.8468 19.8563 28.7531 19.9219 28.7156 19.9969C28.6687 20.0719 28.6218 20.2594 28.6218 20.2594C28.6218 20.2594 28.6593 20.1563 28.7156 20.0906C28.7812 20.025 28.8093 19.9781 28.8093 20.0156C28.8281 20.0531 28.8468 20.2031 28.8375 20.2313C28.8281 20.2594 28.7718 20.3063 28.7437 20.4188C28.7062 20.5406 28.7437 20.6438 28.7437 20.6438L28.7906 20.4375C28.8093 20.3813 28.8562 20.3438 28.8562 20.3438L28.95 20.5688C28.95 20.5688 28.95 20.4656 28.9781 20.3813C28.9875 20.3063 29.0718 20.1938 29.1 20.1938C29.1281 20.1938 29.175 20.1844 29.0718 20.1281C29.0343 20.1094 29.0625 19.7344 29.0812 19.7156C29.1093 19.6969 29.2593 19.6969 29.2406 19.6406C29.1993 19.5659 29.1489 19.4967 29.0906 19.4344C29.0812 19.425 28.8562 19.6406 28.8562 19.6406Z" fill="#8F4620"/>
+<path d="M29.7187 20.4469L29.5781 20.4188C29.5312 20.4188 29.5219 20.3625 29.5219 20.3625L29.5406 20.3063L29.6531 20.3719L29.7187 20.4469Z" fill="#DBAD6C"/>
+<path d="M28.5375 20.4938C28.5375 20.5313 28.5094 20.5782 28.4906 20.6344C28.4625 20.7001 28.4531 20.7844 28.4531 20.7844L28.4156 20.4751L28.3875 20.2501C28.3687 20.2501 28.3219 20.3157 28.3219 20.3157C28.3219 20.3157 28.3219 20.1657 28.35 20.1001C28.3781 20.0344 28.3969 19.9313 28.3781 19.9126C28.35 19.9032 28.3031 19.9407 28.2844 19.9782C28.2583 20.0182 28.2333 20.0588 28.2094 20.1001C28.2094 20.1001 28.2375 19.9782 28.2656 19.9219C28.2937 19.8751 28.4344 19.7157 28.4531 19.6594C28.4906 19.5938 28.4906 19.5282 28.4906 19.5282H28.5844C28.5844 19.5282 28.6781 19.6032 28.6781 19.6688C28.6781 19.7063 28.5844 19.7532 28.5844 19.7626C28.5844 19.7626 28.5094 19.7532 28.4906 20.0626C28.4719 20.3813 28.5469 20.3626 28.5375 20.4938ZM29.4187 19.6782C29.4187 19.6782 29.4375 19.8469 29.4187 19.9032C29.4 19.9594 29.3531 19.9969 29.3156 20.0719C29.2781 20.1376 29.2781 20.2969 29.2781 20.2969L29.325 20.1657L29.3906 20.0719C29.4 20.0719 29.4469 20.1376 29.4656 20.2313L29.5406 20.4657C29.5406 20.4657 29.5219 20.3532 29.55 20.3532C29.5781 20.3532 29.5969 20.3438 29.6344 20.3719L29.7187 20.4469C29.7187 20.4469 29.7187 20.4001 29.6531 20.3438C29.5969 20.2782 29.5594 20.2876 29.55 20.2032C29.5312 20.1094 29.5219 20.0344 29.5312 19.9969C29.5312 19.9688 29.5781 20.0251 29.6156 20.0626L29.7562 20.1938L29.6906 20.1001V19.8188C29.6906 19.7251 29.6906 19.6407 29.7281 19.6219C29.7562 19.5938 29.7656 19.4719 29.7469 19.4532C29.7375 19.4344 29.4187 19.6782 29.4187 19.6782Z" fill="#8F4620"/>
+<path d="M30.4312 19.3219C30.4437 19.5496 30.4911 19.7741 30.5719 19.9875C30.5719 19.9875 30.4781 19.8 30.4219 19.65C30.3656 19.5 30.3375 19.3219 30.3 19.3125C30.2625 19.2937 30.2062 19.3875 30.2062 19.4531C30.2062 19.5187 30.2531 19.7625 30.3094 19.8469C30.3656 19.9406 30.2156 19.7344 30.1875 19.6312L30.1219 19.425C30.1219 19.425 30.0844 19.5187 30.0937 19.6125C30.1125 19.7156 30.1969 19.8656 30.1969 19.8656L30.1031 19.7719L30.0469 19.7062C30.0469 19.7062 30.0469 19.8469 30.0844 19.9031L30.1969 20.0625L30.075 19.9687L30.0375 19.8937C30.0375 19.8937 30.0562 20.0906 30.0937 20.2031L30.2344 20.4844C30.2344 20.4844 30.1219 20.3906 30.0469 20.2125C29.9719 20.0437 29.9344 19.5281 29.9531 19.4531L30.0562 19.275C30.1125 19.2 30.1781 18.8344 30.1781 18.8344C30.1781 18.8344 30.2625 19.1719 30.3187 19.2375C30.375 19.3031 30.4312 19.3312 30.4312 19.3312V19.3219ZM29.625 19.2281L29.7 19.35L29.7562 19.4437C29.7562 19.4437 29.6625 19.5469 29.5406 19.6312C29.4281 19.725 29.2781 19.8187 29.25 19.7719C29.2125 19.725 29.2125 19.6781 29.2125 19.6781C29.2125 19.6781 29.3437 19.6031 29.4375 19.5094C29.5013 19.4518 29.5524 19.3815 29.5875 19.3031C29.6062 19.2469 29.6344 19.2187 29.6344 19.2187L29.625 19.2281ZM28.6031 19.5562C28.6031 19.5562 28.6219 19.7625 28.7156 19.7625C28.8 19.7625 29.0625 19.4906 29.0812 19.4812C29.1 19.4719 29.1187 19.4062 29.1187 19.3875L29.1 19.3125C29.1 19.3125 28.8187 19.5937 28.725 19.6125C28.6406 19.6125 28.6031 19.5562 28.6031 19.5562ZM28.6125 19.275L28.5844 19.4625C28.5844 19.5094 28.6031 19.5469 28.6031 19.5469C28.6031 19.5469 28.3969 19.6125 28.3687 19.5469C28.3312 19.4906 28.3594 19.3969 28.3594 19.3969H28.5C28.5562 19.3781 28.6125 19.275 28.6125 19.275ZM30.5156 18.9844L30.6562 19.2844L30.7875 19.5469C30.7875 19.5469 30.6562 19.3875 30.6094 19.3594L30.4969 19.2656L30.5156 19.1625V18.975V18.9844Z" fill="#1E2121"/>
+<path d="M28.3219 19.4063H28.4437C28.4906 19.4063 28.5187 19.3875 28.5187 19.3875L28.6031 19.275C28.6031 19.275 28.5562 19.4063 28.5844 19.5094C28.6125 19.6032 28.6781 19.6125 28.6969 19.6125C28.7747 19.6007 28.8469 19.5646 28.9031 19.5094C28.9875 19.4157 29.1 19.3313 29.1 19.3313C29.1 19.3313 29.0719 19.4532 29.1187 19.5844C29.1656 19.7063 29.2312 19.7063 29.325 19.6219C29.4187 19.5469 29.5125 19.4157 29.5687 19.3594L29.6344 19.2657L29.7375 19.1719L29.8312 18.6657L29.7844 18.6L29.6531 18.6657L29.4937 18.6L29.4469 18.5344L29.3531 18.6938L29.2594 18.75L29.2125 18.7594L29.1 18.7875L29.0531 18.6844L29.025 18.6094L28.9687 18.5813L28.7437 18.8157L28.6125 18.8063L28.4906 19.0125L28.3969 19.1344L28.3031 19.3594L28.3219 19.4063Z" fill="#DBAD6C"/>
+<path d="M29.4281 18.8906C29.4281 18.8906 29.4468 19.0125 29.3812 19.2281C29.3156 19.4437 29.2312 19.5937 29.2312 19.5937C29.2312 19.5937 29.4562 19.4531 29.5687 19.2C29.6718 18.9562 29.6531 18.6656 29.6531 18.6656L29.4281 18.8906ZM29.7093 18.6562C29.7093 18.6562 29.7281 18.6937 29.7093 18.8812L29.6343 19.2562L29.6906 19.3687C29.7281 19.4343 29.8031 19.5375 29.85 19.5187C29.9062 19.5 30 19.4343 30.0562 19.3125C30.1125 19.1812 30.1593 19.0593 30.1875 19.0406C30.2062 19.0218 30.2156 19.05 30.225 19.0593C30.225 19.0687 30.2531 19.1812 30.3093 19.2281C30.3562 19.275 30.4312 19.35 30.4593 19.3218C30.4968 19.3031 30.5343 19.2375 30.525 19.2093L30.4031 18.8343L30.2531 18.4593L30.1593 18.3093L29.8968 18.3375L29.7093 18.6562Z" fill="#8F4620"/>
+<path d="M30.1594 18.3093C30.1594 18.3093 30.2344 18.4687 30.2438 18.6468C30.2438 18.8156 30.2063 19.0031 30.2063 19.0031C30.2063 19.0031 30.225 18.7875 30.2063 18.6562C30.1781 18.525 30.1406 18.4406 30.1406 18.4031L30.1594 18.3093Z" fill="#AB6D29"/>
+<path d="M30.525 18.9938V19.2094C30.5063 19.2844 30.4031 19.1625 30.3375 18.9281C30.2813 18.6938 30.2906 18.6469 30.2438 18.525L30.1594 18.3188L30.3 18.2906L30.525 18.9938ZM29.8688 19.425C29.8688 19.425 30.1313 19.2844 30.1594 18.8438C30.1781 18.6469 30.0469 18.3094 30.0469 18.3094C30.0469 18.3094 30.0469 18.6656 29.9531 18.8906C29.8983 19.0178 29.8389 19.1428 29.775 19.2656C29.775 19.2656 29.8406 19.2469 29.8688 19.2094L29.9438 19.1063C29.9438 19.1063 29.9531 19.1719 29.9344 19.2563L29.8781 19.425H29.8688ZM29.6531 18.6656C29.6531 18.6656 29.6438 18.7594 29.5313 18.8531C29.4375 18.9375 29.2406 19.0313 29.2406 19.0313C29.2406 19.0313 29.3813 18.9 29.4281 18.7875C29.4844 18.675 29.4375 18.6 29.4375 18.6C29.4375 18.6 29.4188 18.6563 29.3625 18.7031C29.3063 18.75 29.2125 18.7594 29.2125 18.7594C29.2125 18.7594 29.2125 18.7031 29.2781 18.6375C29.2781 18.6281 29.2781 18.6 29.2969 18.5719C29.325 18.4781 29.4 18.3563 29.4 18.3563C29.4 18.3563 29.4656 18.4875 29.5219 18.5438L29.6531 18.6656Z" fill="#4D2A15"/>
+<path d="M30.4406 18.15C30.3947 18.4338 30.4238 18.7247 30.525 18.9938C30.525 18.9938 30.3937 18.7875 30.3656 18.7125C30.3281 18.6188 30.3281 18.4969 30.3 18.4313C30.2761 18.3934 30.2441 18.3614 30.2062 18.3375C30.1781 18.3188 30.1125 18.3281 30.1125 18.3281C30.1125 18.3281 30.1875 18.2906 30.1875 18.225V18.1312L30.3187 18.1594H30.4406V18.15ZM29.8781 19.0687C29.8781 19.0687 30.0093 18.8813 30.0468 18.6375C30.0843 18.3938 30.0468 18.3094 30.0468 18.3094C30.0468 18.3094 29.9906 18.3094 29.9437 18.2625C29.8968 18.2156 29.8218 18.0938 29.8218 18.0938C29.8218 18.0938 29.8406 18.225 29.8218 18.375C29.7843 18.525 29.6531 18.6562 29.6531 18.6562C29.6531 18.6562 29.7281 18.6938 29.7843 18.6562C29.925 18.5719 29.9156 18.4219 29.9156 18.4219C29.9156 18.4219 29.9437 18.4406 29.9437 18.6281C29.9437 18.8156 29.8781 19.0687 29.8781 19.0687Z" fill="#1E2121"/>
+<path d="M28.2375 19.3968C28.2094 19.3968 28.3313 19.2093 28.4063 19.0781L28.6031 18.7593C28.6031 18.7593 28.6313 18.7875 28.6781 18.7875C28.7248 18.7782 28.7689 18.7593 28.8077 18.7318C28.8464 18.7043 28.879 18.669 28.9031 18.6281C28.9493 18.5568 28.9811 18.4772 28.9969 18.3937C28.9969 18.3656 28.9875 18.5625 29.0906 18.675C29.1844 18.7781 29.175 18.7687 29.2125 18.7687C29.2125 18.7687 29.2125 18.9 29.175 19.0218L29.1 19.3312C29.1 19.3312 29.1188 19.0968 29.0719 19.0312C29.0344 18.9562 29.0156 19.0312 28.9781 19.125C28.95 19.2093 28.875 19.2656 28.875 19.2656C28.875 19.2656 28.9313 19.1625 28.9688 19.05C29.0063 18.9375 28.9875 18.9375 28.9688 18.9375C28.9688 18.9375 28.95 18.9281 28.9125 18.975C28.8656 19.0218 28.8281 19.0312 28.8281 19.0312C28.8281 19.0312 28.875 18.9937 28.8938 18.9375C28.9151 18.8762 28.9468 18.8191 28.9875 18.7687C29.0063 18.7406 29.025 18.7031 29.025 18.675C29.025 18.6562 29.025 18.6093 29.0063 18.6093C28.9875 18.6093 28.9594 18.6375 28.875 18.7218L28.7531 18.8437L28.6688 19.0875C28.6452 19.1775 28.6139 19.2654 28.575 19.35L28.5188 19.3875L28.6031 19.1625L28.6969 18.8437C28.6781 18.8156 28.6313 18.8156 28.6219 18.8437L28.4344 19.1062C28.3406 19.2375 28.3406 19.3968 28.3219 19.4062L28.2281 19.3968H28.2375Z" fill="#8F4620"/>
+<path d="M30.5344 18.0094C30.5344 18.0281 30.5344 18.1219 30.4407 18.15C30.3687 18.1683 30.2927 18.1617 30.225 18.1312C30.2063 18.1312 30.2063 18 30.2063 18L30.5344 18.0094Z" fill="#874F20"/>
+<path d="M28.6875 18.3187C28.6875 18.3187 28.6687 18.4031 28.6125 18.5062C28.5656 18.6187 28.4812 18.7125 28.4906 18.7312C28.4906 18.7406 28.5468 18.7969 28.6218 18.7875C28.6968 18.7875 28.725 18.3375 28.725 18.3375L28.7156 18.3187H28.6875Z" fill="#B27129"/>
+<path d="M29.85 18.0657C29.85 18.0657 29.8219 18.6657 29.6532 18.6657C29.4844 18.6657 29.4 18.3657 29.4 18.3657C29.4 18.3657 29.3907 18.7688 29.175 18.7688C29.0813 18.7688 28.9782 18.45 28.9969 18.3938C28.9969 18.3938 28.9594 18.6094 28.8563 18.6938C28.65 18.8532 28.5282 18.7782 28.5188 18.75C28.5188 18.7219 28.6875 18.5625 28.7063 18.3188C28.7063 18.3188 28.7438 18.3282 28.8 18.2625C28.8563 18.1969 28.8657 18.1125 28.9219 18.1219C28.9688 18.1407 29.2032 18.0282 29.2032 18.0282L29.3344 17.8688C29.3344 17.8688 29.3532 17.9157 29.4469 17.85C29.5028 17.8105 29.5453 17.7549 29.5688 17.6907L29.8219 17.9063L29.85 18.0657Z" fill="#DBAD6C"/>
+<path d="M29.1937 17.4938L29.4469 17.85L29.5031 17.8032C29.5406 17.85 29.5594 17.8875 29.5406 17.9157C29.5031 18.0094 29.4187 18.1313 29.4937 18.2625C29.4937 18.2625 29.4656 18.1875 29.5031 18.0938C29.5406 18 29.5687 17.9625 29.5969 17.9719C29.6156 17.9719 29.6531 18.5157 29.6906 18.5157C29.7187 18.5157 29.775 18.2625 29.775 18.0938C29.775 17.925 29.8031 18.0657 29.8219 18.0938C29.8406 18.1313 29.9906 18.375 30.1125 18.3375C30.2437 18.3 30.225 18.075 30.225 18.0282C30.225 17.9719 30.1312 17.6813 30.1312 17.6813L29.5594 17.3157L29.5125 17.4657C29.4844 17.5594 29.1937 17.4938 29.1937 17.4938Z" fill="#B27129"/>
+<path d="M30 17.4375C30 17.4375 30.0375 17.475 30.0938 17.6157C30.15 17.7563 30.1594 18.2157 30.0844 18.2157C30.0094 18.2157 29.8688 18.1219 29.8407 18.0657C29.8125 18 29.8407 17.775 29.8032 17.7094C29.7505 17.6327 29.7123 17.5469 29.6907 17.4563L29.7 17.2688L29.8313 17.2219L30.0094 17.4375H30Z" fill="#8F4620"/>
+<path d="M29.9625 17.2968L30.2062 17.6625L30.4218 17.9718L30.5343 18.0093C30.498 18.0515 30.4479 18.0793 30.3929 18.0879C30.338 18.0965 30.2818 18.0853 30.2343 18.0562C30.15 18.0093 30.1968 17.8687 30.0937 17.6343C29.9812 17.4 29.7937 17.2968 29.7937 17.2968L29.8593 17.2312L29.9625 17.2968Z" fill="#4D2A15"/>
+<path d="M29.8313 17.1C29.8313 17.1 30.0469 17.2406 30.1219 17.4C30.2062 17.5594 30.2438 17.6531 30.3375 17.8031C30.4313 17.9531 30.5344 18 30.525 18.0094C30.525 18.0187 30.4594 18.0375 30.4125 18.0094C30.3579 17.97 30.313 17.9187 30.2812 17.8594C30.2154 17.7231 30.1402 17.5915 30.0563 17.4656C30.0094 17.4 29.8406 17.2781 29.8406 17.2875C29.8406 17.2969 29.8875 17.3344 29.9812 17.4844C30.0415 17.5708 30.0801 17.6705 30.0938 17.775L29.9906 17.5875C29.8969 17.4469 29.7281 17.2781 29.7188 17.3062C29.7094 17.325 29.8125 17.4844 29.8594 17.5781L29.9812 17.8875L29.8125 17.6062C29.7188 17.4656 29.7 17.4844 29.6625 17.4375L29.5312 17.2687C29.5312 17.2687 29.625 17.2969 29.7 17.2406C29.7937 17.1844 29.8313 17.1 29.8313 17.1Z" fill="#1E2121"/>
+<path d="M29.2781 17.5032C29.2781 17.5032 29.4187 17.5313 29.4937 17.5219H29.5968C29.5968 17.5219 29.6437 17.5782 29.6437 17.6532C29.6437 17.7188 29.5968 17.85 29.5687 17.8594C29.55 17.8594 29.55 17.7375 29.5218 17.6907L29.2781 17.5032Z" fill="#8F4620"/>
+<path d="M29.3531 17.8688C29.3531 17.8688 29.4 18.0188 29.3625 18.2344C29.325 18.4406 29.2031 18.6656 29.175 18.6656C29.1468 18.6656 29.1562 18.4219 29.1375 18.2906C29.1375 18.2781 29.1375 18.2656 29.1375 18.2531L29.0906 18.4031L29.1281 18.1594L29.1187 18.0844L29.2687 17.8969L29.3531 17.8688Z" fill="#B27129"/>
+<path d="M29.0906 18.0281C29.0437 18.075 28.9781 18.0656 28.9219 18.0844C28.8656 18.1031 28.8375 18.1781 28.8375 18.1781C28.8375 18.1781 28.8844 18.15 28.9031 18.1594C28.9312 18.1688 28.95 18.1688 28.9125 18.2719C28.8656 18.375 28.7062 18.5531 28.7156 18.5531C28.7156 18.5531 28.9031 18.4125 28.95 18.3188C29.0156 18.2344 29.0062 18.1875 29.025 18.15C29.025 18.1219 29.1 18.0844 29.1187 18.0844C29.1281 18.0844 29.1656 18.0844 29.175 18.15L29.2312 18.3938L29.3062 18.15C29.325 18.0563 29.325 17.8781 29.325 17.8781L29.2687 17.8688C29.2219 17.8594 29.1281 17.775 29.1281 17.775C29.1281 17.775 29.1469 17.9625 29.0812 18.0281H29.0906Z" fill="#8F4620"/>
+<path d="M29.8406 16.95C29.8406 16.95 29.8969 17.0906 29.775 17.1937C29.7375 17.2218 29.7094 17.2406 29.6438 17.25C29.5874 17.2421 29.5332 17.223 29.4844 17.1937L29.1094 17.0437L28.9219 16.9875L28.8281 16.9593L28.8469 16.8562H29.1281L29.4094 16.9687L29.5312 17.0156L29.6344 17.0343H29.7188L29.7844 17.0156L29.8219 16.9875L29.8406 16.95Z" fill="#DBAD6C"/>
+<path d="M29.8406 16.95C29.8406 16.9781 29.8125 17.0531 29.7843 17.0718C29.7562 17.0718 29.7093 17.1 29.5968 17.0718C29.4937 17.0531 29.3812 16.9781 29.2593 16.95C29.1375 16.9125 29.0437 16.8843 28.95 16.8843C28.8562 16.8843 28.9031 16.8468 28.9031 16.8468C28.9031 16.8468 29.1187 16.8187 29.3062 16.8937C29.4937 16.9593 29.5781 17.0062 29.6812 17.0062C29.8125 17.0062 29.8406 16.95 29.8406 16.95Z" fill="#AB6D29"/>
+<path d="M28.8375 16.8375H28.9219C28.9594 16.8375 28.9875 16.8093 28.9875 16.8093C28.9875 16.8093 28.9875 16.8562 28.9688 16.875C28.9406 16.8937 28.875 16.8843 28.8563 16.8843L28.8375 16.8375Z" fill="#4D2A15"/>
+<path d="M29.5593 17.2875C29.5593 17.2875 29.6812 17.4094 29.6531 17.5125L29.4 17.4L29.0062 17.2407L28.7906 17.175L28.7625 17.1375L28.8187 17.0625L28.8375 16.9875L29.1 17.025L29.3812 17.1188L29.5593 17.2875Z" fill="#DBAD6C"/>
+<path d="M29.2875 17.4657C29.2875 17.4657 29.5125 17.7563 29.4562 17.85L28.9312 17.5219L28.7437 17.8313L28.3031 17.6157C28.3031 17.6157 28.6594 17.3344 28.6969 17.2875L28.7437 17.2219L28.9312 17.2594L29.25 17.3532L29.2875 17.4657Z" fill="#DBAD6C"/>
+<path d="M29.1563 17.025C29.1563 17.025 29.3438 17.0719 29.4657 17.1375C29.5875 17.1938 29.7469 17.2125 29.7469 17.2125C29.7469 17.2125 29.6907 17.2781 29.5594 17.2875C29.5219 17.2875 29.4282 17.2125 29.3719 17.1656C29.3063 17.1281 29.1282 17.0719 29.1282 17.0719L29.1563 17.025Z" fill="#AB6D29"/>
+<path d="M28.8375 16.9313C28.8375 16.9313 28.9687 16.9594 29.0437 16.9969C29.1375 17.025 29.1375 17.0156 29.1562 17.0062C29.1844 17.0062 29.1844 16.9875 29.1844 16.9875C29.1844 16.9875 29.2031 17.0812 29.1375 17.0812C29.0719 17.0812 29.0438 17.0531 28.9688 17.0156C28.875 16.9781 28.8281 17.0156 28.8281 17.0156V16.9219L28.8375 16.9313Z" fill="#4D2A15"/>
+<path d="M29.5688 17.4375C29.5688 17.4375 29.6625 17.5031 29.6531 17.5219C29.6344 17.5219 29.5875 17.55 29.5031 17.5594C29.4383 17.5663 29.3728 17.5532 29.3156 17.5219C29.2594 17.5031 29.2219 17.4 29.0813 17.3344C28.9962 17.2991 28.9084 17.2709 28.8188 17.25L28.6969 17.2312L28.7906 17.1937L29.0906 17.25L29.3531 17.3344L29.5125 17.4094L29.5688 17.4469V17.4375ZM29.0625 17.625L29.1188 17.8687L29.0813 18.0094L29.0063 18.0656L28.9313 18.0375L28.9031 17.9906C28.9031 17.9906 28.9406 17.9344 28.9031 17.8875C28.875 17.8312 28.7156 17.775 28.7156 17.775C28.7156 17.775 28.7813 17.6531 28.8469 17.625C28.9219 17.5969 28.8844 17.5125 28.8844 17.5125L29.0625 17.625Z" fill="#AB6D29"/>
+<path d="M28.7625 17.1375C28.7625 17.1375 28.8093 17.175 28.9031 17.1843C28.95 17.1843 29.025 17.2031 29.1093 17.2312L29.2031 17.2031L29.1562 17.2406C29.2406 17.2593 29.3437 17.3062 29.3906 17.325C29.4609 17.3521 29.5247 17.3936 29.5781 17.4468L29.3906 17.3531C29.2996 17.3166 29.2054 17.2883 29.1093 17.2687C28.9218 17.2406 28.7343 17.25 28.7062 17.2312C28.6687 17.2312 28.7156 17.2218 28.7437 17.2031C28.7625 17.1843 28.7625 17.1375 28.7625 17.1375Z" fill="#4D2A15"/>
+<path d="M29.4375 17.7938C29.4375 17.7938 29.5031 17.8594 29.4375 17.8781C29.3812 17.8969 29.2125 17.8969 29.1375 17.8125L29.0812 17.7C29.012 17.6391 28.9366 17.5857 28.8562 17.5406C28.7906 17.4938 28.8843 17.4938 28.8843 17.4938L29.2218 17.6344C29.2993 17.6794 29.3717 17.7329 29.4375 17.7938Z" fill="#AB6D29"/>
+<path d="M29.4375 17.8031C29.4375 17.8031 29.325 17.6344 28.9781 17.4938L29.0906 17.475H28.9031C28.8783 17.4652 28.8533 17.4558 28.8281 17.4469C28.6406 17.3906 28.6406 17.3906 28.6219 17.3719C28.6125 17.3438 28.5844 17.3719 28.5656 17.4L28.5 17.4938C28.5761 17.4708 28.6567 17.4676 28.7344 17.4844C28.8375 17.5125 28.8281 17.55 28.8281 17.5781C28.8187 17.625 28.6969 17.7656 28.7063 17.775C28.725 17.775 28.8 17.6344 28.8938 17.6531C28.9875 17.6813 29.0062 17.7281 29.0062 17.7281C29.0062 17.7281 29.0063 17.6719 28.9875 17.6531C28.9688 17.6344 28.8656 17.5313 28.8938 17.5313C28.9219 17.5313 29.0437 17.5594 29.2031 17.6438C29.3719 17.7281 29.3906 17.7469 29.4469 17.8031H29.4375Z" fill="#4D2A15"/>
+<path d="M28.8844 17.5312C28.8844 17.5312 29.1469 17.6063 29.1375 17.8875C29.1281 18.1688 28.9219 18.1125 28.9031 18.0094C28.8844 17.9156 28.9313 18.0562 28.9969 18.0469C29.0813 18.0281 29.0906 17.9531 29.0906 17.8406C29.0906 17.7469 29.0625 17.6906 28.9969 17.6344C28.9615 17.6007 28.9239 17.5694 28.8844 17.5406V17.5312Z" fill="#DBAD6C"/>
+<path d="M27.75 16.8656C27.75 16.8656 27.7875 16.8844 27.7125 17.0812C27.6375 17.2781 27.5907 17.3437 27.4782 17.475C27.2719 17.7 27.1782 17.7094 27.1969 17.8031C27.225 17.8969 27.3 17.8781 27.3188 17.8781C27.3375 17.8781 27.7219 17.3156 27.7219 17.3156L27.8063 16.9875L27.7875 16.8937L27.7594 16.8656H27.75Z" fill="#6C3F18"/>
+<path d="M28.6969 16.4625C28.6969 16.4625 28.8094 16.6312 28.7719 16.9312C28.7437 17.25 28.3312 17.5219 28.3312 17.5219L27.7312 17.9344L27.4781 17.9156H27.4031C27.3656 17.9062 27.3281 17.8687 27.3187 17.8687L27.2719 17.7562L27.3562 17.6625L27.5719 17.4469L27.7031 17.2594C27.7031 17.2594 27.7687 17.1375 27.7781 17.025C27.7781 16.9219 27.7594 16.8656 27.7594 16.8656L27.8062 16.9406L27.8344 17.1094L27.8156 17.2969L27.9656 17.1844L28.1719 17.0906C28.1719 17.0906 28.2375 17.0906 28.2656 16.9687C28.3125 16.8562 28.35 16.6875 28.35 16.6125L28.3406 16.4437H28.3687C28.3875 16.4437 28.4344 16.5562 28.4344 16.6031L28.4719 16.8656L28.5656 16.7719L28.6594 16.6312C28.6781 16.5844 28.6969 16.5094 28.6969 16.4625Z" fill="#DBAD6C"/>
+<path d="M28.7625 18.0187C28.7625 18.0187 28.8094 18.0562 28.7906 18.1687C28.7719 18.2812 28.6875 18.3375 28.6406 18.3375V18.1875L28.5094 18.075L28.3688 18.0375L28.3969 18.0093C28.4063 17.9906 28.5563 17.9343 28.5563 17.9343L28.7625 18.0187Z" fill="#904720"/>
+<path d="M28.6594 18.0188C28.6594 18.0188 28.7063 18.0563 28.7719 18.0469C28.8375 18.0281 28.8656 17.925 28.8281 17.8781C28.7906 17.8406 28.8094 17.9719 28.7625 18C28.725 18.0094 28.6688 17.8875 28.6219 17.8781C28.5563 17.8688 28.4719 17.9063 28.4438 17.9438C28.425 17.9813 28.5375 17.9438 28.5375 17.9438L28.6031 17.9719H28.65L28.6594 18.0188Z" fill="#AB6D29"/>
+<path d="M27.7969 17.5875C27.7969 17.5875 27.8719 17.6156 27.9563 17.5969L28.2469 17.5031L28.4157 17.3813C28.4813 17.3156 28.7063 17.175 28.7344 16.9031C28.7532 16.6219 28.6969 16.4625 28.6969 16.4625C28.6969 16.4625 29.025 16.8188 28.7438 17.2313C28.5563 17.4938 28.3875 17.5781 28.3875 17.5781C28.3875 17.5781 28.7063 17.4844 28.7344 17.5594C28.7625 17.6344 28.725 17.7469 28.7157 17.775C28.7157 17.775 28.8938 17.8125 28.9219 17.9063C28.9313 17.9625 28.7157 17.8406 28.5469 17.8875C28.3782 17.925 28.3125 18.0188 28.3125 18.0188C28.3125 18.0188 28.275 17.9719 28.125 17.9719C27.9844 17.9719 27.9188 18.0375 27.8344 18.0375C27.7407 18.0375 27.4875 17.9813 27.4407 17.9063L27.6094 17.7C27.6844 17.55 27.7969 17.5875 27.7969 17.5875Z" fill="#904720"/>
+<path d="M28.4812 16.8469C28.4812 16.8469 28.6031 16.725 28.65 16.6313C28.6875 16.5375 28.6968 16.4625 28.6968 16.4625C28.6968 16.4625 28.7156 16.5563 28.6406 16.6781C28.5656 16.8 28.4812 16.8656 28.4812 16.8656V16.8469Z" fill="#AB6D29"/>
+<path d="M28.4437 16.5657C28.4437 16.5657 28.5469 16.9782 28.4437 17.1375C28.3219 17.3063 27.8344 17.5219 27.8344 17.5219C27.8344 17.5219 28.2094 17.325 28.3219 17.0907C28.4344 16.8563 28.425 16.6688 28.425 16.6688L28.4437 16.575V16.5657Z" fill="#904720"/>
+<path d="M27.9563 17.5969C27.9563 17.5969 28.1157 17.5969 28.2 17.5406C28.2938 17.4937 28.4157 17.3812 28.4157 17.3812C28.4157 17.3812 28.3032 17.475 28.2657 17.475C28.2375 17.475 28.2094 17.4281 28.2188 17.3906C28.2188 17.3906 28.1907 17.4656 28.125 17.5219C28.05 17.5687 27.9563 17.5969 27.9563 17.5969ZM28.3219 17.0906C28.3219 17.0906 28.4532 16.9594 28.4532 16.6781C28.4532 16.3969 28.3407 16.4437 28.3407 16.4437C28.3407 16.4437 28.4344 16.5094 28.4063 16.725C28.3875 16.9406 28.3125 17.1 28.3125 17.1L28.3219 17.0906ZM28.4813 17.1187C28.4813 17.1187 28.6313 17.0906 28.6782 16.9969C28.725 16.9031 28.7344 16.7437 28.7344 16.7437C28.7344 16.7437 28.7157 16.9031 28.6688 16.9594C28.6313 17.0156 28.4813 17.1187 28.4813 17.1187ZM28.3875 18.0094C28.3875 18.0094 28.4625 17.8687 28.5657 17.9062C28.6594 17.9437 28.6594 18.0187 28.6594 18.0187C28.6594 18.0187 28.6219 17.9625 28.5469 17.9531C28.4813 17.9531 28.3969 18.0094 28.3969 18.0094H28.3875ZM28.1157 17.7562L28.4625 17.6625L28.7438 17.5687C28.7438 17.5687 28.6313 17.6906 28.4625 17.7844C28.3125 17.8781 28.1813 17.8781 28.1813 17.8781C28.1813 17.8781 28.4813 17.7469 28.5 17.6906C28.5 17.6906 28.2188 17.775 28.125 17.7562H28.1157Z" fill="#1E2121"/>
+<path d="M27.7688 17.4187C27.8194 17.4555 27.8532 17.51 27.8633 17.5712C27.8734 17.6324 27.8591 17.6957 27.8233 17.7482C27.7876 17.8007 27.7329 17.8385 27.6706 17.8539C27.6082 17.8693 27.5428 17.8612 27.4875 17.8312" fill="white"/>
+<path d="M27.7594 17.4469C27.796 17.482 27.8184 17.5289 27.8226 17.5793C27.8269 17.6297 27.8127 17.6805 27.7826 17.7229C27.7525 17.7652 27.7084 17.7964 27.6579 17.8111C27.6074 17.8258 27.5537 17.823 27.5062 17.8031" fill="#F16E16"/>
+<path d="M27.6563 17.5687C27.6735 17.5668 27.6909 17.5696 27.7066 17.5769C27.7223 17.5843 27.7357 17.5958 27.7452 17.6103C27.7548 17.6247 27.7601 17.6416 27.7607 17.6589C27.7612 17.6762 27.7569 17.6933 27.7484 17.7084C27.7398 17.7234 27.7272 17.7358 27.712 17.7441C27.6968 17.7524 27.6795 17.7564 27.6622 17.7555C27.6449 17.7546 27.6282 17.749 27.6139 17.7392C27.5996 17.7294 27.5883 17.7158 27.5813 17.7" fill="black"/>
+<path d="M27.675 17.6812C27.6738 17.6887 27.6696 17.6953 27.6635 17.6997C27.6573 17.7041 27.6497 17.7059 27.6422 17.7047C27.6348 17.7034 27.6281 17.6993 27.6237 17.6931C27.6193 17.687 27.6176 17.6793 27.6188 17.6718C27.6188 17.6644 27.6218 17.6572 27.627 17.652C27.6323 17.6467 27.6395 17.6437 27.6469 17.6437C27.6516 17.6435 27.6562 17.6443 27.6604 17.6463C27.6646 17.6482 27.6683 17.6512 27.671 17.6549C27.6738 17.6586 27.6757 17.663 27.6764 17.6676C27.677 17.6722 27.6766 17.6769 27.675 17.6812Z" fill="#D5D3CA"/>
+<path d="M27.825 17.2687C27.825 17.2687 27.975 17.1281 28.0031 16.9406C28.0312 16.7531 28.0125 16.6406 28.0125 16.6406L28.0968 16.7344L28.125 16.8656L28.0781 17.1094L28.2281 17.0344C28.2843 16.9594 28.3687 16.6406 28.3406 16.4437C28.3406 16.4437 28.3781 16.5375 28.3218 16.8C28.2656 17.0719 28.2281 17.1 28.0218 17.2125C27.8662 17.3049 27.742 17.4421 27.6656 17.6062C27.6032 17.7069 27.531 17.8011 27.45 17.8875L27.6 17.6437C27.675 17.475 27.7593 17.3812 27.7593 17.3812L27.825 17.2687Z" fill="#AB6D29"/>
+<path d="M27.7594 17.3813C27.7594 17.3813 27.825 17.1938 27.825 17.0907C27.825 16.9875 27.7594 16.8657 27.7594 16.8657C27.7594 16.8657 27.8531 16.8563 27.8531 17.0719C27.8625 17.2969 27.8156 17.3157 27.7594 17.3813Z" fill="#904720"/>
+<path d="M28.05 17.1375C28.05 17.1375 28.1156 16.9781 28.1156 16.8563C28.1156 16.7531 28.0219 16.6406 28.0219 16.6406C28.0219 16.6406 28.125 16.6687 28.1344 16.8656C28.1437 17.0719 28.1156 17.0719 28.0406 17.1469L28.05 17.1375Z" fill="#4D2A15"/>
+<path d="M27.3844 17.9062C27.3844 17.9062 27.3281 17.8312 27.3375 17.7844C27.3375 17.7281 27.3375 17.7187 27.4688 17.5781C27.5606 17.4967 27.6396 17.4019 27.7031 17.2969C27.7313 17.2125 27.8438 17.0156 27.7594 16.8656C27.7594 16.8656 27.8156 17.0906 27.6844 17.2687C27.6003 17.4 27.4959 17.5171 27.375 17.6156C27.2719 17.6906 27.2531 17.7281 27.2625 17.775C27.2625 17.8219 27.2719 17.8687 27.2906 17.8687C27.3281 17.8969 27.3844 17.8969 27.3844 17.8969V17.9062Z" fill="#AB6D29"/>
+<path d="M28.6406 18.3375C28.6406 18.3375 28.6687 18.3375 28.6875 18.3094C28.7063 18.2813 28.7063 18.2157 28.6594 18.1594C28.6184 18.1092 28.5626 18.0731 28.5 18.0563L28.3125 18.0188C28.3125 18.0188 28.35 18.0938 28.4344 18.1407C28.4719 18.1594 28.5469 18.1407 28.5844 18.1782C28.6312 18.2157 28.6406 18.3375 28.6406 18.3375Z" fill="#6C4119"/>
+<path d="M28.6406 18.3375C28.6406 18.3375 28.7812 18.2906 28.7906 18.15L28.7812 18.0375C28.7812 18.0375 28.8 18.0844 28.8562 18.1031L28.9125 18.0844C28.9125 18.0844 28.8187 18.3469 28.6312 18.3375H28.6406Z" fill="#6C4119"/>
+<path d="M27.6375 18.3093L27.7125 18.3843L27.7969 18.4781L28.1438 18.3843L28.2563 18.2718L28.1625 18.1218H27.9094L27.6282 18.3093H27.6375Z" fill="#BF802D"/>
+<path d="M28.4813 18.1875L28.4157 18.1031L28.35 18.0469C28.2938 18.0187 28.0875 18.0187 28.0875 18.0187L27.9375 18.0469C27.9375 18.0469 27.8907 18.0937 27.8157 18.075C27.7325 18.0489 27.6511 18.0176 27.5719 17.9812L27.3938 17.9156C27.3938 17.9156 27.2719 17.8594 27.2438 17.8687C27.2157 17.8781 27.1032 17.9906 27.1032 17.9906C27.1032 17.9906 27.0844 18.0562 27.1313 18.0562C27.1688 18.0562 27.0657 18.075 27.0657 18.075C27.0657 18.075 26.8032 18.225 26.7657 18.4875C26.7188 18.7406 27.1969 19.125 27.375 18.9281C27.375 18.9281 27.1125 18.7406 27.1688 18.5812C27.2157 18.4219 27.3375 18.3187 27.5438 18.3C27.7407 18.3 27.7594 18.2719 27.8438 18.2062C27.9375 18.15 28.0969 18.1125 28.2188 18.2344C28.3407 18.3656 27.75 18.4875 27.75 18.4875L27.8157 18.5812C27.8157 18.5812 28.5375 18.3281 28.4719 18.1969L28.4813 18.1875Z" fill="#F9C83A"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M27.4009 17.8983L27.4001 17.898L27.3961 17.8962C27.3927 17.8946 27.3877 17.8924 27.3817 17.8898C27.3697 17.8846 27.3533 17.8778 27.3359 17.8712C27.3187 17.8647 27.3001 17.8582 27.2837 17.854C27.2756 17.8519 27.2675 17.8503 27.2603 17.8495C27.2535 17.8488 27.2452 17.8485 27.2378 17.851C27.2316 17.8531 27.2249 17.8572 27.219 17.8613C27.2126 17.8657 27.2055 17.8712 27.198 17.8773C27.1831 17.8895 27.1661 17.9047 27.1502 17.9195C27.1342 17.9343 27.1191 17.9488 27.1081 17.9595C27.1025 17.9649 27.098 17.9694 27.0948 17.9725L27.0912 17.9761L27.0902 17.9771L27.0899 17.9774L27.0864 17.9809L27.0851 17.9855L27.1031 17.9907C27.0851 17.9855 27.0851 17.9855 27.0851 17.9855L27.0851 17.9857L27.085 17.9859L27.0848 17.9867C27.0846 17.9873 27.0844 17.9881 27.0842 17.9892C27.0837 17.9913 27.083 17.9943 27.0824 17.9978C27.0813 18.0048 27.0802 18.0146 27.0809 18.0248C27.0815 18.0329 27.0833 18.0427 27.0883 18.0516C27.0845 18.0524 27.0809 18.0531 27.0776 18.0537C27.0731 18.0546 27.0693 18.0553 27.0665 18.0558L27.0634 18.0564L27.0623 18.0566L27.0591 18.0572L27.0563 18.0588L27.0656 18.0751C27.0563 18.0588 27.0563 18.0588 27.0563 18.0588L27.0562 18.0588L27.056 18.0589L27.0554 18.0593L27.053 18.0607C27.0509 18.062 27.048 18.0638 27.0442 18.0662C27.0367 18.071 27.026 18.0781 27.0131 18.0874C26.9872 18.106 26.9524 18.1336 26.9164 18.1696C26.8447 18.2414 26.7668 18.3479 26.7471 18.4845C26.7344 18.554 26.7578 18.6301 26.7999 18.7005C26.8423 18.7714 26.905 18.8387 26.9746 18.8916C27.0441 18.9443 27.1218 18.9835 27.1948 18.9964C27.268 19.0095 27.3387 18.9962 27.3889 18.9408L27.403 18.9252L27.3859 18.9129L27.3858 18.9128L27.3853 18.9125L27.3832 18.911C27.3814 18.9096 27.3787 18.9076 27.3753 18.905C27.3684 18.8997 27.3586 18.8919 27.347 18.8821C27.3237 18.8624 27.2934 18.8346 27.2649 18.8021C27.2363 18.7695 27.2102 18.7329 27.1945 18.6955C27.179 18.6582 27.1744 18.6216 27.1864 18.5875L27.1867 18.5866C27.2092 18.5102 27.2493 18.4481 27.308 18.4028C27.3665 18.3575 27.4446 18.328 27.5446 18.3188C27.6429 18.3188 27.6995 18.3118 27.7426 18.2953C27.7791 18.2814 27.8052 18.2607 27.837 18.2355C27.8426 18.231 27.8483 18.2265 27.8544 18.2218C27.9449 18.1679 28.0927 18.1352 28.2052 18.2474C28.2168 18.26 28.2179 18.2696 28.2156 18.2779C28.2127 18.2881 28.2034 18.3005 28.1854 18.3146C28.1497 18.3424 28.0898 18.3692 28.0238 18.3925C27.9584 18.4157 27.889 18.4349 27.8358 18.4483C27.8092 18.455 27.7868 18.4602 27.771 18.4638C27.7631 18.4655 27.7569 18.4669 27.7527 18.4678L27.7478 18.4689L27.7466 18.4691L27.7463 18.4692L27.7183 18.475L27.8084 18.6037L27.8218 18.599L27.8156 18.5813C27.8218 18.599 27.8218 18.599 27.8218 18.599L27.8224 18.5988L27.824 18.5982L27.83 18.5961C27.8353 18.5942 27.8431 18.5914 27.853 18.5878C27.8727 18.5806 27.9007 18.5701 27.9342 18.5572C28.001 18.5313 28.0896 18.4954 28.1762 18.4554C28.2626 18.4154 28.348 18.3708 28.408 18.3276C28.4378 18.306 28.4627 18.2839 28.4779 18.2618C28.4906 18.2435 28.4982 18.2227 28.4934 18.2019L28.5062 18.1891L28.4293 18.0902L28.3604 18.0312L28.3584 18.0302C28.3414 18.0216 28.3152 18.0161 28.2879 18.0121C28.26 18.0081 28.2283 18.0054 28.1988 18.0036C28.1692 18.0018 28.1414 18.0009 28.121 18.0005C28.1108 18.0003 28.1025 18.0002 28.0967 18.0001L28.0899 18.0001L28.0881 18.0001L28.0875 18.0001L28.0858 18.0001L27.9283 18.0296L27.9243 18.0336L27.9241 18.0338C27.9239 18.034 27.9236 18.0343 27.923 18.0348C27.9219 18.0357 27.9202 18.0371 27.9179 18.0389C27.9132 18.0423 27.9062 18.0468 27.8971 18.0509C27.8791 18.0589 27.8531 18.065 27.8207 18.057C27.7385 18.0312 27.658 18.0002 27.5797 17.9643L27.579 17.964L27.4009 17.8983ZM27.9461 18.0644C27.9445 18.0657 27.9425 18.0673 27.9401 18.0691C27.9337 18.0738 27.9243 18.0798 27.9123 18.0852C27.8882 18.0959 27.8534 18.1038 27.8111 18.0932L27.81 18.093C27.7263 18.0667 27.6444 18.0352 27.5647 17.9986L27.3866 17.933L27.3859 17.9327L27.3856 17.9326L27.3846 17.9321L27.3808 17.9304C27.3775 17.9289 27.3727 17.9268 27.3668 17.9242C27.3551 17.9192 27.3393 17.9126 27.3226 17.9063C27.3059 17.8999 27.2888 17.894 27.2744 17.8903C27.2672 17.8885 27.2611 17.8873 27.2563 17.8868C27.2521 17.8863 27.2502 17.8866 27.2497 17.8866C27.2496 17.8866 27.2496 17.8866 27.2497 17.8866C27.2497 17.8866 27.2496 17.8866 27.2495 17.8867L27.2488 17.8869C27.2483 17.8872 27.2476 17.8876 27.2468 17.888C27.245 17.889 27.2429 17.8904 27.2403 17.8922C27.2351 17.8957 27.2288 17.9005 27.2218 17.9063C27.2077 17.9178 27.1913 17.9325 27.1756 17.947C27.16 17.9615 27.1451 17.9758 27.1342 17.9864C27.1288 17.9917 27.1243 17.9961 27.1212 17.9992L27.1201 18.0002C27.1199 18.0013 27.1197 18.0026 27.1194 18.004C27.1185 18.0094 27.1179 18.016 27.1183 18.0222C27.1188 18.0286 27.1203 18.0325 27.1218 18.0345C27.1226 18.0355 27.1245 18.0376 27.1312 18.0376C27.1339 18.0376 27.1364 18.0376 27.1387 18.0379C27.1398 18.038 27.1412 18.0382 27.1427 18.0385C27.1438 18.0388 27.1467 18.0396 27.1496 18.0415C27.1527 18.0436 27.1591 18.0495 27.1581 18.0594C27.1574 18.067 27.1524 18.0713 27.1513 18.0723C27.1484 18.0748 27.145 18.0762 27.1438 18.0766C27.1377 18.0791 27.1267 18.0817 27.1166 18.084C27.1058 18.0864 27.0939 18.0888 27.0847 18.0905C27.0801 18.0914 27.0762 18.0922 27.0734 18.0927L27.0723 18.0929C27.0705 18.094 27.0678 18.0956 27.0643 18.0978C27.0574 18.1023 27.0473 18.109 27.035 18.1178C27.0104 18.1355 26.9772 18.1618 26.9429 18.1961C26.8741 18.2649 26.8021 18.3645 26.7842 18.4902L26.7841 18.491C26.7735 18.548 26.7923 18.6147 26.8321 18.6812C26.8717 18.7475 26.931 18.8114 26.9973 18.8617C27.0637 18.9121 27.136 18.9479 27.2013 18.9595C27.2585 18.9697 27.3086 18.9612 27.3462 18.9299C27.3397 18.9248 27.3318 18.9183 27.3228 18.9107C27.2986 18.8903 27.2668 18.8612 27.2367 18.8269C27.2067 18.7927 27.1777 18.7526 27.1599 18.71C27.1422 18.6674 27.135 18.621 27.1509 18.5755C27.1753 18.4928 27.2195 18.4238 27.285 18.3731C27.3505 18.3224 27.4362 18.291 27.542 18.2814L27.5429 18.2813H27.5437C27.6418 18.2813 27.6928 18.2742 27.7292 18.2603C27.7599 18.2485 27.781 18.2319 27.8129 18.2067C27.8189 18.202 27.8253 18.1969 27.8322 18.1915L27.8331 18.1908L27.8341 18.1902C27.9311 18.132 28.1012 18.0904 28.232 18.2212L28.2325 18.2217C28.2512 18.2418 28.2583 18.2646 28.2516 18.2881C28.2455 18.3097 28.2287 18.3283 28.2085 18.3441C28.1677 18.376 28.1028 18.4044 28.0363 18.4279C27.9694 18.4516 27.8987 18.4711 27.845 18.4846C27.8193 18.4911 27.7974 18.4962 27.7815 18.4998L27.8228 18.5588C27.8274 18.5572 27.8333 18.5551 27.8401 18.5526C27.8596 18.5454 27.8874 18.5351 27.9206 18.5222C27.9871 18.4965 28.0749 18.4609 28.1605 18.4213C28.2464 18.3816 28.3291 18.3383 28.386 18.2972C28.4147 18.2765 28.4354 18.2573 28.4471 18.2405C28.4587 18.2237 28.4589 18.213 28.4551 18.2053L28.4491 18.1932L28.4563 18.186L28.402 18.1162L28.3397 18.0628C28.3282 18.0576 28.3083 18.053 28.2826 18.0492C28.256 18.0454 28.2256 18.0428 28.1965 18.041C28.1675 18.0393 28.1403 18.0384 28.1202 18.038C28.1102 18.0378 28.102 18.0377 28.0963 18.0376L28.0897 18.0376L28.0892 18.0376L27.9461 18.0644Z" fill="#8F4620"/>
+<path d="M27.1313 18.8156C27.1313 18.8156 26.8406 18.7406 26.8594 18.4687C26.8875 18.2062 27.1406 18.1031 27.1781 18.0937C27.2156 18.075 27.2063 17.9437 27.2531 17.925C27.2859 17.9184 27.3197 17.9191 27.3522 17.9273C27.3846 17.9354 27.4148 17.9506 27.4406 17.9718L27.5719 18.0468C27.5719 18.0468 27.0563 18.2718 27.0563 18.5718C27.0563 18.7687 27.1313 18.8062 27.1313 18.8062V18.8156Z" fill="#FCF3D8"/>
+<path d="M28.4813 18.1688C28.4813 18.1688 28.4438 18.1875 28.4344 18.1688C28.3781 18.075 28.2469 18.0375 28.1531 18.0469C28.0125 18.0469 27.9281 18.0938 27.8344 18.0938C27.7406 18.0938 27.7688 18.0844 27.6656 18.075C27.5625 18.075 27.3375 17.9063 27.2906 17.925C27.2344 17.9438 27.2156 18 27.2156 18.0282C27.225 18.0657 27.1219 18.0657 27.1219 18.0375C27.1031 18.0188 27.1875 17.8782 27.2813 17.8782C27.525 17.8782 27.7125 18.0375 27.825 18.0375C27.9469 18.0375 27.9844 17.9719 28.1438 17.9719C28.3031 17.9719 28.4719 18.0469 28.4813 18.1594V18.1688Z" fill="#FDEAAF"/>
+<path d="M27.675 18.3562C27.675 18.3562 27.7969 18.3375 27.8813 18.3L28.0875 18.225L27.9 18.3375L27.7125 18.3844L27.675 18.3562Z" fill="#513625"/>
+<path d="M27.2625 18.9657C27.2438 18.9657 27.1406 18.9657 26.9813 18.8625C26.8125 18.75 26.7656 18.5625 26.7656 18.5625C26.7656 18.5625 26.7281 18.3844 26.8969 18.2063C27.0656 18.0282 27.0938 18.0844 27.1031 18.0938C27.1125 18.0938 27.1031 18.1032 27.1031 18.1032L26.9438 18.225L26.8781 18.3469L26.8125 18.4594V18.5907L26.8875 18.7313L27.1219 18.8719L27.2625 18.9657Z" fill="#F9C83A"/>
+<path d="M27.1687 17.9438V17.925V17.9532V17.925V17.9532V17.925L27.1406 17.9438H27.1593V17.925L27.1406 17.9438L27.1593 17.925H27.1406C27.1384 17.9311 27.1384 17.9377 27.1406 17.9438L27.1593 17.925H27.1406H27.1593H27.1406H27.1593H27.1406H27.1593L27.1406 17.9157L27.1593 17.925L27.1406 17.9157L27.1312 17.925C27.1176 17.9398 27.1051 17.9554 27.0937 17.9719L27.075 18.0282V18.0375C27.075 18.0657 27.0937 18.0844 27.1125 18.0938H27.2437C27.2498 18.0899 27.2541 18.0839 27.2559 18.0769C27.2576 18.0699 27.2566 18.0626 27.2531 18.0563C27.2511 18.0505 27.2472 18.0456 27.2421 18.0422C27.2371 18.0388 27.231 18.0372 27.225 18.0375L27.1593 18.0469C27.15 18.0487 27.1405 18.0487 27.1312 18.0469V18.0282C27.1299 18.022 27.1299 18.0156 27.1312 18.0094C27.139 17.9929 27.1485 17.9772 27.1593 17.9625L27.1781 17.9532V17.9438L27.1875 17.925C27.1854 17.9193 27.1816 17.9144 27.1765 17.911C27.1714 17.9076 27.1654 17.9059 27.1593 17.9063C27.1536 17.9083 27.1486 17.9122 27.1453 17.9172C27.1419 17.9223 27.1402 17.9283 27.1406 17.9344C27.1426 17.9402 27.1464 17.9451 27.1515 17.9485C27.1566 17.9519 27.1626 17.9535 27.1687 17.9532V17.9438Z" fill="#8B5122"/>
+<path d="M27.6657 18.1968L27.3094 18.3C27.2813 18.3187 27.4219 18.3 27.5344 18.3L27.6563 18.3093L27.7407 18.2906C27.8719 18.2437 28.1532 18.1406 28.1813 18.2625C28.2001 18.3562 27.7969 18.45 27.7969 18.45V18.4968L28.1157 18.4125L28.2938 18.3187L28.3407 18.2343L28.1813 18.1218H27.9376L27.825 18.15L27.6657 18.1968Z" fill="#F9C83A"/>
+<path d="M27.1594 18.7031C27.1875 18.7781 27.2437 18.8906 27.3094 18.9187C27.3094 18.9187 27.3187 18.9187 27.3094 18.9187C27.3094 18.9281 27.2625 18.9656 27.15 18.9281C27.0375 18.9 26.8688 18.8625 26.7656 18.5531V18.6187L26.8313 18.7406L26.9344 18.8531L27.1125 18.9562L27.225 18.9844L27.3187 18.9656L27.375 18.9281L27.2719 18.8344L27.1406 18.6187L27.1594 18.7125V18.7031Z" fill="#8F4620"/>
+<path d="M28.3219 21.8062V21.9187H28.2562V21.7781L28.3219 21.8062ZM27.8812 18.5812L27.7687 18.45L27.6937 18.4593L27.8062 18.6281L27.8812 18.5812Z" fill="#FCCA3D"/>
+<path d="M28.3125 22.0781L28.1531 21.9843C28.0807 21.9563 28.0051 21.9374 27.9281 21.9281V21.9562H27.9469L28.1437 22.0125C28.1989 22.04 28.2522 22.0713 28.3031 22.1062L28.3125 22.0781ZM28.3125 21.7875H28.0312C27.9869 21.8016 27.9456 21.8238 27.9094 21.8531L27.9187 21.8718C27.9892 21.8209 28.0759 21.7976 28.1625 21.8062C28.2063 21.808 28.2501 21.8111 28.2937 21.8156V21.7875H28.3125ZM28.275 21.5343L28.0312 21.6656L27.8812 21.7781L27.9 21.7968L27.9469 21.7593C28.0233 21.7019 28.1049 21.6517 28.1906 21.6093L28.2844 21.5625L28.275 21.5343ZM28.1156 21.2812C28.1156 21.2812 28.1156 21.3468 28.0875 21.3937C28.0702 21.4198 28.0514 21.4448 28.0312 21.4687C27.9548 21.5516 27.8767 21.6328 27.7969 21.7125L27.8156 21.7406C27.8944 21.6569 27.9726 21.5725 28.05 21.4875L28.1156 21.4125C28.1437 21.3562 28.1437 21.2906 28.1437 21.2812H28.1156ZM27.9187 21.1687C27.931 21.2379 27.9245 21.3091 27.9 21.375L27.8062 21.5812L27.7687 21.6656L27.75 21.6937L27.7687 21.7125C27.7687 21.7125 27.8906 21.5062 27.9281 21.3843C27.9469 21.3375 27.9469 21.2906 27.9469 21.2437C27.95 21.2157 27.95 21.1874 27.9469 21.1593H27.9094L27.9187 21.1687ZM27.7219 21.1406C27.7193 21.178 27.7193 21.2156 27.7219 21.2531C27.7219 21.3093 27.7219 21.3656 27.7031 21.4125L27.6375 21.5812L27.6094 21.675L27.6375 21.6843L27.7312 21.4218C27.75 21.375 27.75 21.3093 27.75 21.2531V21.1406H27.7219ZM27.5719 21.1406V21.2531L27.5437 21.4406C27.5262 21.5183 27.5106 21.5965 27.4969 21.675H27.525L27.5437 21.6L27.5719 21.4406C27.6 21.3468 27.6 21.1406 27.6 21.1406H27.5719ZM27.4031 21.1687C27.393 21.259 27.393 21.3502 27.4031 21.4406C27.3835 21.5174 27.371 21.5959 27.3656 21.675H27.3937C27.4023 21.5993 27.4148 21.5242 27.4312 21.45L27.4406 21.3187V21.1687H27.4031ZM27.2812 21.1875V21.2062C27.2804 21.2758 27.271 21.3451 27.2531 21.4125L27.1969 21.5906L27.1781 21.6843H27.2062L27.2812 21.4125C27.2992 21.3451 27.3086 21.2759 27.3094 21.2062V21.1875H27.2812ZM27.1312 21.1875V21.2531C27.1312 21.3093 27.1312 21.3843 27.0937 21.4406C27.0629 21.4978 27.0216 21.5487 26.9719 21.5906C26.9505 21.604 26.9286 21.6165 26.9062 21.6281L26.8875 21.6468L26.8969 21.675C26.8969 21.675 27.0562 21.5812 27.1219 21.4593C27.1594 21.3937 27.1687 21.3093 27.1687 21.2531V21.1875H27.1312ZM27.0469 21.1593V21.1781C27.0254 21.2421 26.9937 21.3023 26.9531 21.3562C26.925 21.3937 26.8687 21.4312 26.8312 21.4593C26.8068 21.4759 26.7818 21.4916 26.7562 21.5062L26.775 21.5343C26.775 21.5343 26.9062 21.4593 26.9719 21.375C27.0167 21.3119 27.0514 21.2424 27.075 21.1687H27.0469V21.1593ZM26.9062 21.0937V21.1031C26.8805 21.1477 26.849 21.1887 26.8125 21.225C26.8031 21.2437 26.7656 21.2625 26.7281 21.2812L26.6719 21.3187L26.6812 21.3468L26.7469 21.3093L26.8406 21.2437L26.9062 21.1593L26.9344 21.1031L26.9062 21.0937ZM26.8406 21L26.8125 21.0281L26.7281 21.1218C26.7131 21.1351 26.6975 21.1476 26.6812 21.1593L26.6437 21.1875L26.6531 21.2156L26.7187 21.1781C26.7844 21.1218 26.8594 21.0187 26.8594 21.0187L26.8406 21ZM26.8031 20.9437L26.7844 20.9625L26.7 21.0187C26.6773 21.0334 26.6517 21.043 26.625 21.0468V21.0843L26.6812 21.0562C26.7469 21.0281 26.8219 20.9625 26.8219 20.9625L26.8031 20.9437ZM26.7844 20.8781L26.7094 20.9156L26.6531 20.9437C26.6414 20.9514 26.6288 20.9577 26.6156 20.9625V20.9906C26.6344 20.9906 26.6437 20.9906 26.6625 20.9718L26.7937 20.9062L26.7844 20.8781ZM26.7469 20.7562L26.7 20.8031L26.6156 20.8312V20.8593C26.6573 20.8567 26.6969 20.8402 26.7281 20.8125C26.7448 20.8013 26.7604 20.7887 26.775 20.775L26.7469 20.7562ZM26.7562 20.55L26.7 20.5968C26.6719 20.625 26.6437 20.6531 26.6344 20.6906C26.6312 20.6908 26.6281 20.6908 26.625 20.6906V20.7375L26.6437 20.7187C26.651 20.7136 26.6574 20.7073 26.6625 20.7C26.6625 20.6812 26.7 20.6437 26.7281 20.6156C26.743 20.5993 26.7587 20.5836 26.775 20.5687L26.7562 20.55ZM27.7594 19.35H27.9094L27.9187 19.3312V19.3218H27.9094V19.35V19.3406H27.8906H27.9H27.8906V19.3218L27.9 19.3312V19.3218V19.3312V19.3218H27.7594V19.35ZM27.7594 19.2562H27.7781C27.7968 19.2562 27.8156 19.2562 27.8344 19.2375C27.8719 19.2281 27.9 19.2 27.9281 19.1812L27.975 19.1531C27.9843 19.1513 27.9938 19.1513 28.0031 19.1531V19.1156L27.9469 19.1343L27.8531 19.2L27.7781 19.2281L27.7687 19.2562H27.7594ZM27.7594 19.1156L27.825 19.0968L27.9375 19.0218C27.975 18.9937 28.0031 18.9843 28.0312 18.9843V18.9562C28.0031 18.9562 27.9844 18.9562 27.9562 18.975L27.8437 19.0406C27.8157 19.0619 27.7839 19.0778 27.75 19.0875V19.1156H27.7594ZM27.7031 18.9843L27.8437 18.8906L27.9937 18.7781L27.9844 18.75L27.825 18.8625C27.7781 18.9093 27.7219 18.9468 27.6844 18.9562L27.7031 18.9937V18.9843ZM27.6094 18.8437L27.9094 18.6281L27.8906 18.6L27.5906 18.8156L27.6 18.8437H27.6094ZM27.4687 18.6937C27.5676 18.6114 27.6743 18.5392 27.7875 18.4781L27.7687 18.4593L27.6281 18.5531L27.45 18.675L27.4687 18.6937ZM27.375 18.6C27.4555 18.5427 27.5368 18.4864 27.6187 18.4312L27.6937 18.3843L27.6844 18.3562C27.6584 18.3703 27.6334 18.3859 27.6094 18.4031C27.5241 18.4643 27.4397 18.5268 27.3562 18.5906L27.3656 18.6093L27.375 18.6Z" fill="#816C2A"/>
+<path d="M27.6093 18.3188L27.6187 18.3281C27.7046 18.3981 27.7832 18.4766 27.8531 18.5625C27.9468 18.675 28.0218 18.8156 28.0218 18.9469V18.9938C27.9925 19.17 27.9108 19.3333 27.7875 19.4625C27.6 19.6781 27.3375 19.875 27.1312 20.0625C27.0261 20.1478 26.9317 20.2453 26.85 20.3531C26.7756 20.4534 26.7361 20.5752 26.7375 20.7C26.7409 20.8139 26.7766 20.9245 26.8406 21.0188C26.8798 21.0793 26.9342 21.1284 26.9984 21.1613C27.0625 21.1942 27.1342 21.2097 27.2062 21.2063C27.375 21.2063 27.5625 21.1406 27.7312 21.1406C27.8812 21.1406 28.0125 21.1781 28.1437 21.3188C28.2656 21.45 28.3031 21.6563 28.3031 21.8531C28.3031 22.0031 28.2843 22.1344 28.2656 22.2469C28.2551 22.3036 28.2426 22.3599 28.2281 22.4156H28.2562C28.2562 22.4156 28.3312 22.1531 28.3312 21.8531C28.3312 21.6563 28.2937 21.4313 28.1625 21.2906C28.1083 21.2308 28.0415 21.1838 27.9669 21.153C27.8923 21.1222 27.8118 21.1084 27.7312 21.1125C27.5531 21.1125 27.3656 21.1688 27.2062 21.1688C27.1401 21.173 27.074 21.1596 27.0147 21.1299C26.9554 21.1003 26.905 21.0555 26.8687 21C26.8079 20.9083 26.7753 20.8007 26.775 20.6906V20.6813C26.775 20.5313 26.8406 20.4 26.9531 20.2781C27.1218 20.0906 27.375 19.9031 27.6093 19.6969C27.825 19.4906 28.0218 19.275 28.05 18.9938V18.9469C28.05 18.7781 27.9468 18.6188 27.8343 18.4969C27.769 18.4216 27.6968 18.3526 27.6187 18.2906L27.6093 18.3188Z" fill="#78732E"/>
+<path d="M27.3844 18.6L27.3469 18.5719L27.3187 18.5813L27.375 18.6281L27.3844 18.6ZM27.4781 18.6938L27.45 18.6656H27.4406L27.4594 18.7031L27.4781 18.6938Z" fill="#A8AC71"/>
+<path d="M27.6093 18.8438L27.5906 18.8063L27.5718 18.825L27.6 18.8531L27.6093 18.8438ZM27.7031 18.9844L27.6937 18.9563H27.6656L27.7031 19.0031V18.9844ZM27.7687 19.125L27.75 19.0875V19.125H27.7687ZM27.7687 19.2656V19.2281L27.75 19.2188V19.2656H27.7687ZM27.7687 19.3594V19.3125L27.7593 19.3031V19.3594H27.7687ZM26.625 20.7281L26.6343 20.6625C26.6437 20.6344 26.6062 20.6719 26.6062 20.6719V20.7188L26.625 20.7281Z" fill="#78732E"/>
+<path d="M26.625 20.8219L26.5969 20.8313L26.6063 20.8781L26.6157 20.8594V20.8219H26.625Z" fill="white"/>
+<path d="M26.625 20.9906V20.9531H26.6062V21.0094L26.625 20.9906Z" fill="#78732E"/>
+<path d="M26.625 21.0844V21.0469H26.6156V21.0844H26.625ZM26.6531 21.2156V21.1781L26.6344 21.1875L26.6437 21.225L26.6531 21.2156ZM26.6906 21.3469L26.6812 21.3H26.6625L26.6812 21.3563L26.6906 21.3469Z" fill="white"/>
+<path d="M26.775 21.5344L26.7563 21.5062H26.7375L26.7657 21.5344H26.775ZM26.9157 21.6656L26.8688 21.6375C26.8407 21.6094 26.8594 21.6562 26.8594 21.6562L26.8969 21.675H26.9157V21.6656ZM27.8344 21.7406L27.7969 21.7125C27.7782 21.7125 27.7969 21.7125 27.8157 21.75C27.825 21.7781 27.8344 21.7406 27.8344 21.7406Z" fill="#A8AC71"/>
+<path d="M27.9094 21.7969L27.8812 21.7688V21.7969H27.9H27.9094Z" fill="white"/>
+<path d="M27.9282 21.8437C27.9188 21.825 27.9094 21.8531 27.9094 21.8531L27.9282 21.8812V21.8344V21.8437ZM27.9282 21.9656V21.9187C27.9282 21.9 27.9188 21.9187 27.9188 21.9187V21.9656H27.9282Z" fill="#A8AC71"/>
+<path d="M27.8812 22.0969L27.9 22.0594H27.8812V22.0969ZM26.4938 17.2219C26.4938 17.2219 26.5406 17.2031 26.5031 17.2594L26.5312 17.2125H26.4844L26.4938 17.2219Z" fill="white"/>
+<path d="M27.6188 18.2812L27.6562 18.3094H27.6094L27.6188 18.2812Z" fill="#F9C83A"/>
+<path d="M27.6562 18.3094L27.5906 18.3188C27.5718 18.3188 27.6093 18.3 27.6093 18.3L27.6468 18.3094H27.6562Z" fill="#8F4620"/>
+<path d="M28.2187 22.4156C28.2187 22.4156 28.2469 22.4156 28.2656 22.3875C28.2844 22.3594 28.2562 22.425 28.2562 22.425L28.2281 22.4344L28.2094 22.4156H28.2187Z" fill="#977C2E"/>
+</g>
+<defs>
+<radialGradient id="paint0_radial_1_38536" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(27.522 23.8819) rotate(22.9532) scale(0.354543 0.354775)">
+<stop stop-color="white"/>
+<stop offset="1" stop-color="#F15770"/>
+</radialGradient>
+<radialGradient id="paint1_radial_1_38536" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(25.1138 22.7081) rotate(-95.2707) scale(0.351574 0.326323)">
+<stop stop-color="white"/>
+<stop offset="1" stop-color="#F15770"/>
+</radialGradient>
+<radialGradient id="paint2_radial_1_38536" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(34.0278 24.6661) rotate(50.043) scale(0.183111 0.35952)">
+<stop stop-color="white"/>
+<stop offset="1" stop-color="#F15770"/>
+</radialGradient>
+<clipPath id="clip0_1_38536">
+<rect width="60" height="45" fill="white"/>
+</clipPath>
+</defs>
+</svg>
diff --git a/src/assets/img/settings/currencies/mys.svg b/src/assets/img/settings/currencies/mys.svg
new file mode 100644
index 000000000..b5a1d9d1d
--- /dev/null
+++ b/src/assets/img/settings/currencies/mys.svg
@@ -0,0 +1,14 @@
+<svg width="60" height="45" viewBox="0 0 60 45" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g clip-path="url(#clip0_1_38983)">
+<path d="M0 0H60V45H0V0Z" fill="#CC0000"/>
+<path d="M0.046875 3.7406H59.9531V7.3406H0.046875V3.7406ZM0.046875 11.1187H59.9531V14.7187H0.046875V11.1187ZM0.046875 18.5062H59.9531V22.1062H0.046875V18.5062Z" fill="white"/>
+<path d="M0 0.046875H30V26.2969H0V0.046875Z" fill="#000066"/>
+<path d="M19.4531 6.91875L20.0156 10.7344L22.1718 7.54688L21.0093 11.2219L24.3374 9.27188L21.7031 12.0844L25.5468 11.7844L21.9562 13.1719L25.5468 14.5594L21.7031 14.2594L24.3374 17.0719L21.0093 15.1219L22.1624 18.8063L20.0062 15.6094L19.4437 19.425L18.8906 15.6094L16.7343 18.7969L17.8968 15.1219L14.5687 17.0719L17.1937 14.2594L13.3499 14.5594L16.9499 13.1719L13.3593 11.7844L17.2031 12.0844L14.5687 9.27188L17.8968 11.2219L16.7343 7.5375L18.8906 10.7344L19.4531 6.91875ZM16.3312 7.07813C15.3164 6.62829 14.2053 6.439 13.0989 6.52744C11.9924 6.61588 10.9255 6.97925 9.99504 7.58457C9.06459 8.18988 8.30004 9.01798 7.77078 9.9937C7.24152 10.9694 6.96432 12.0619 6.96432 13.1719C6.96432 14.2819 7.24152 15.3743 7.77078 16.3501C8.30004 17.3258 9.06459 18.1539 9.99504 18.7592C10.9255 19.3645 11.9924 19.7279 13.0989 19.8163C14.2053 19.9048 15.3164 19.7155 16.3312 19.2656C15.2104 20.0698 13.8897 20.5492 12.5141 20.6513C11.1385 20.7534 9.76136 20.4741 8.53419 19.8443C7.30702 19.2144 6.27733 18.2583 5.55836 17.0811C4.83939 15.9039 4.45898 14.5513 4.45898 13.1719C4.45898 11.7925 4.83939 10.4398 5.55836 9.26266C6.27733 8.08547 7.30702 7.12937 8.53419 6.49949C9.76136 5.86961 11.1385 5.59036 12.5141 5.69245C13.8897 5.79453 15.2104 6.274 16.3312 7.07813Z" fill="#FFCC00"/>
+<path d="M0.046875 25.8938H59.9531V29.4938H0.046875V25.8938ZM0.046875 33.225H59.9531V36.825H0.046875V33.225ZM0 41.4H59.9062V45H0V41.4Z" fill="white"/>
+</g>
+<defs>
+<clipPath id="clip0_1_38983">
+<rect width="60" height="45" fill="white"/>
+</clipPath>
+</defs>
+</svg>
diff --git a/src/assets/img/settings/currencies/nga.svg b/src/assets/img/settings/currencies/nga.svg
new file mode 100644
index 000000000..0db8695d8
--- /dev/null
+++ b/src/assets/img/settings/currencies/nga.svg
@@ -0,0 +1,11 @@
+<svg width="60" height="45" viewBox="0 0 60 45" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g clip-path="url(#clip0_1_39043)">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M0 0H60V45H0V0Z" fill="white"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M39.9938 0H60V45H39.9938V0ZM0 0H19.9969V45H0V0Z" fill="#008753"/>
+</g>
+<defs>
+<clipPath id="clip0_1_39043">
+<rect width="60" height="45" fill="white"/>
+</clipPath>
+</defs>
+</svg>
diff --git a/src/assets/img/settings/currencies/pak.svg b/src/assets/img/settings/currencies/pak.svg
new file mode 100644
index 000000000..37d707196
--- /dev/null
+++ b/src/assets/img/settings/currencies/pak.svg
@@ -0,0 +1,13 @@
+<svg width="60" height="45" viewBox="0 0 60 45" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g clip-path="url(#clip0_1_39738)">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M-3.75586 0H63.7441V45H-3.75586V0Z" fill="#0C590B"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M-3.75586 0H13.1631V45H-3.75586V0Z" fill="white"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M40.0752 19.8105L37.333 19.2305L35.8916 21.6299L35.5928 18.8525L32.8682 18.2197L35.417 17.0771L35.1797 14.291L37.0605 16.3652L39.6357 15.2754L38.2383 17.7012L40.084 19.8105H40.0752Z" fill="white"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M41.1035 26.8945C40.5186 28.1709 39.6871 29.319 38.6569 30.2729C37.6268 31.2268 36.4182 31.9676 35.1007 32.4528C33.7832 32.938 32.3828 33.1579 30.98 33.1C29.5772 33.0421 28.1997 32.7074 26.9267 32.1152C24.344 30.9194 22.342 28.7466 21.3613 26.0748C20.3806 23.4029 20.5014 20.4509 21.6972 17.8682C22.2911 16.5405 23.1562 15.3518 24.237 14.3785C25.3177 13.4052 26.5902 12.6689 27.9726 12.2168C27.6107 12.5181 27.2646 12.8379 26.9355 13.1748C25.2208 15.0738 24.3105 17.5646 24.3966 20.1218C24.4827 22.679 25.5585 25.1028 27.3972 26.8821C29.2358 28.6615 31.6936 29.6573 34.2522 29.6596C36.8109 29.662 39.2704 28.6706 41.1123 26.8945H41.1035Z" fill="white"/>
+</g>
+<defs>
+<clipPath id="clip0_1_39738">
+<rect width="60" height="45" fill="white"/>
+</clipPath>
+</defs>
+</svg>
diff --git a/src/assets/img/settings/currencies/phl.svg b/src/assets/img/settings/currencies/phl.svg
new file mode 100644
index 000000000..bbca901e0
--- /dev/null
+++ b/src/assets/img/settings/currencies/phl.svg
@@ -0,0 +1,13 @@
+<svg width="60" height="45" viewBox="0 0 60 45" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g clip-path="url(#clip0_1_39733)">
+<path d="M0 0H60V22.5H0V0Z" fill="#0038A8"/>
+<path d="M0 22.5H60V45H0V22.5Z" fill="#CE1126"/>
+<path d="M38.9719 22.5L0 45V0" fill="white"/>
+<path d="M2.50313 3.97498L3.84375 5.15623L5.4 4.29373L4.70625 5.93435L6.01875 7.1531L4.2375 7.0031L3.47812 8.6156L3.075 6.88123L1.3125 6.65623L2.84062 5.71873L2.50313 3.97498ZM32.8594 20.1281L32.8969 21.9093L34.5844 22.5L32.8969 23.0812L32.8594 24.8625L31.7812 23.4469L30.075 23.9625L31.0875 22.5L30.075 21.0375L31.7812 21.5531L32.8594 20.1281ZM3.4875 36.3844L4.2375 37.9968L6.01875 37.8469L4.71562 39.0656L5.40938 40.7062L3.85312 39.8531L2.50313 41.0156L2.84062 39.2625L1.3125 38.3437L3.08438 38.1187L3.4875 36.3844ZM14.1937 13.0406L13.6125 13.6219L13.9031 18.0281L13.6219 18.0562L13.0875 14.0344L12.6094 14.5031L13.3219 18.1031C12.7457 18.2165 12.1977 18.4427 11.7094 18.7687L9.675 15.7312H9L11.475 18.9469C11.398 19.0069 11.3229 19.0694 11.25 19.1344L8.33438 15.8062H7.50937V16.6312L10.8281 19.5375L10.6406 19.7719L7.425 17.3062V17.9718L10.4719 20.0062C10.1531 20.4937 9.91875 21.0375 9.80625 21.6187L6.21563 20.9062L5.7375 21.375L9.75937 21.9093C9.74062 22.0031 9.73125 22.1062 9.73125 22.2L5.325 21.9187L4.74375 22.5L5.325 23.0812L9.73125 22.7906L9.75937 23.0812L5.7375 23.6156L6.20625 24.0844L9.80625 23.3718C9.91964 23.948 10.1459 24.496 10.4719 24.9844L7.425 27.0187V27.6937L10.6406 25.2281C10.7007 25.3051 10.7632 25.3802 10.8281 25.4531L7.50937 28.3594V29.1843H8.34375L11.25 25.8656L11.4844 26.0531L9 29.2687H9.675L11.7094 26.2219C12.1875 26.5406 12.7406 26.775 13.3219 26.8875L12.6094 30.4875L13.0781 30.9562L13.6125 26.9343C13.7062 26.9531 13.8 26.9625 13.9031 26.9625L13.6219 31.3687L14.1937 31.95L14.7844 31.3687L14.4938 26.9625L14.775 26.9343L15.3094 30.9656L15.7875 30.4875L15.075 26.8875C15.6511 26.7741 16.1991 26.5479 16.6875 26.2219L18.7219 29.2687H19.3969L16.9219 26.0531C16.9989 25.9931 17.0739 25.9305 17.1469 25.8656L20.0625 29.1843H20.8875V28.3594L17.5687 25.4531L17.7562 25.2281L20.9719 27.6937V27.0187L17.925 24.9844C18.2437 24.5062 18.4781 23.9531 18.5906 23.3718L22.1813 24.0844L22.6594 23.6156L18.6375 23.0812C18.6562 22.9875 18.6656 22.8937 18.6656 22.7906L23.0719 23.0719L23.6531 22.5L23.0719 21.9187L18.6656 22.2L18.6375 21.9187L22.6594 21.3844L22.1906 20.9156L18.5906 21.6187C18.4772 21.0426 18.251 20.4946 17.925 20.0062L20.9719 17.9718V17.3062L17.7562 19.7719C17.6962 19.6948 17.6337 19.6198 17.5687 19.5469L20.8875 16.6406V15.8062H20.0625L17.1562 19.1344C17.0802 19.0693 17.0021 19.0067 16.9219 18.9469L19.3969 15.7312H18.7219L16.6875 18.7687C16.2094 18.45 15.6562 18.2156 15.075 18.1031L15.7875 14.5125L15.3187 14.0437L14.7844 18.0562L14.4938 18.0281L14.775 13.6219L14.1937 13.0406Z" fill="#FCD116"/>
+</g>
+<defs>
+<clipPath id="clip0_1_39733">
+<rect width="60" height="45" fill="white"/>
+</clipPath>
+</defs>
+</svg>
diff --git a/src/assets/img/settings/currencies/pol.svg b/src/assets/img/settings/currencies/pol.svg
new file mode 100644
index 000000000..2e707c067
--- /dev/null
+++ b/src/assets/img/settings/currencies/pol.svg
@@ -0,0 +1,11 @@
+<svg width="60" height="45" viewBox="0 0 60 45" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g clip-path="url(#clip0_1_39745)">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M60 45H0V0H60V45Z" fill="white"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M60 45H0V22.5H60V45Z" fill="#DC143C"/>
+</g>
+<defs>
+<clipPath id="clip0_1_39745">
+<rect width="60" height="45" fill="white"/>
+</clipPath>
+</defs>
+</svg>
diff --git a/src/assets/img/settings/currencies/rub.svg b/src/assets/img/settings/currencies/rus.svg
similarity index 100%
rename from src/assets/img/settings/currencies/rub.svg
rename to src/assets/img/settings/currencies/rus.svg
diff --git a/src/assets/img/settings/currencies/sgd.svg b/src/assets/img/settings/currencies/sgp.svg
similarity index 100%
rename from src/assets/img/settings/currencies/sgd.svg
rename to src/assets/img/settings/currencies/sgp.svg
diff --git a/src/assets/img/settings/currencies/tha.svg b/src/assets/img/settings/currencies/tha.svg
new file mode 100644
index 000000000..fbd5ba069
--- /dev/null
+++ b/src/assets/img/settings/currencies/tha.svg
@@ -0,0 +1,12 @@
+<svg width="60" height="45" viewBox="0 0 60 45" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g clip-path="url(#clip0_1_41727)">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M0 0H60V45H0V0Z" fill="#F4F5F8"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M0 15.2344H60V30.2344H0V15.2344Z" fill="#2D2A4A"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M0 0H60V7.73438H0V0ZM0 37.5H60V45H0V37.5Z" fill="#A51931"/>
+</g>
+<defs>
+<clipPath id="clip0_1_41727">
+<rect width="60" height="45" fill="white"/>
+</clipPath>
+</defs>
+</svg>
diff --git a/src/assets/img/settings/currencies/tur.svg b/src/assets/img/settings/currencies/tur.svg
new file mode 100644
index 000000000..34fac9b7c
--- /dev/null
+++ b/src/assets/img/settings/currencies/tur.svg
@@ -0,0 +1,13 @@
+<svg width="60" height="45" viewBox="0 0 60 45" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g clip-path="url(#clip0_1_41996)">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M0 0H60V45H0V0Z" fill="#E30A17"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M38.1562 23.2031C38.1562 29.4094 33.0375 34.4438 26.7188 34.4438C20.4 34.4438 15.2812 29.4094 15.2812 23.1938C15.2812 16.9781 20.4 11.9625 26.7188 11.9625C33.0375 11.9625 38.1562 16.9969 38.1562 23.2031Z" fill="white"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M38.7188 23.2031C38.7188 28.1719 34.6313 32.1938 29.5782 32.1938C24.5251 32.1938 20.4282 28.1625 20.4282 23.1938C20.4282 18.225 24.5251 14.2125 29.5782 14.2125C34.6313 14.2125 38.7282 18.2344 38.7282 23.2031H38.7188Z" fill="#E30A17"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M40.3782 17.9531L40.2845 22.1062L36.4126 23.1562L40.2376 24.5156L40.1438 28.3312L42.6282 25.35L46.397 26.6625L44.222 23.4656L46.8751 20.2875L42.797 21.4125L40.3782 17.9437V17.9531Z" fill="white"/>
+</g>
+<defs>
+<clipPath id="clip0_1_41996">
+<rect width="60" height="45" fill="white"/>
+</clipPath>
+</defs>
+</svg>
diff --git a/src/assets/img/settings/currencies/twn.svg b/src/assets/img/settings/currencies/twn.svg
new file mode 100644
index 000000000..2d13f22cf
--- /dev/null
+++ b/src/assets/img/settings/currencies/twn.svg
@@ -0,0 +1,34 @@
+<svg width="60" height="45" viewBox="0 0 60 45" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g clip-path="url(#clip0_1_42014)">
+<path d="M0 0H67.5V45H0V0Z" fill="#FF0000"/>
+<path d="M0 0H33.75V22.5H0V0Z" fill="#000095"/>
+<path d="M14.4375 11.8969L14.2031 12.7969L15.0844 13.0406L14.9156 12.375L14.4375 11.8969ZM18.8344 12.375L18.6656 13.0406L19.5469 12.7969L19.3125 11.8969L18.8344 12.375ZM14.9156 10.125L14.4375 10.6031L14.6156 11.25L14.9156 10.125Z" fill="white"/>
+<path d="M14.6156 11.25L14.4375 11.8969L14.9156 12.375L14.6156 11.25Z" fill="white"/>
+<path d="M14.4375 10.6031L13.7906 11.25L14.4375 11.8969L14.6156 11.25L14.4375 10.6031ZM15.75 13.2094L16.2281 13.6875L16.875 13.5094L15.75 13.2094ZM17.5219 13.6875L18.4219 13.9219L18.6656 13.0407L18 13.2094L17.5219 13.6875Z" fill="white"/>
+<path d="M18 13.2094L18.6656 13.0406L18.8344 12.375L18 13.2094ZM15.0844 13.0406L15.3281 13.9219L16.2281 13.6875L15.75 13.2094L15.0844 13.0406ZM16.875 13.5094L17.5219 13.6875L18 13.2094L16.875 13.5094Z" fill="white"/>
+<path d="M16.2281 13.6875L16.875 14.3344L17.5219 13.6875L16.875 13.5094L16.2281 13.6875ZM15.0844 9.45935L14.2031 9.7031L14.4375 10.6031L14.9156 10.125L15.0844 9.45935ZM14.9156 12.375L15.0844 13.0406L15.75 13.2094L14.9156 12.375ZM19.1344 11.25L19.3125 10.6031L18.8344 10.125L19.1344 11.25Z" fill="white"/>
+<path d="M15.75 9.29065L15.0844 9.4594L14.9156 10.125L15.75 9.29065ZM18.8344 10.125L18.6656 9.4594L18 9.29065L18.8344 10.125ZM19.3125 11.8969L19.9594 11.25L19.3125 10.6031L19.1344 11.25L19.3125 11.8969Z" fill="white"/>
+<path d="M18.8344 10.125L18 9.2906L16.875 8.9906L15.75 9.2906L14.9156 10.125L14.6156 11.25L14.9156 12.375L15.75 13.2093L16.875 13.5094L18 13.2093L18.8344 12.375L19.1344 11.25L18.8344 10.125Z" fill="white"/>
+<path d="M18.8344 12.375L19.3125 11.8969L19.1344 11.25L18.8344 12.375ZM19.3125 10.6031L19.5469 9.70312L18.6656 9.45938L18.8344 10.125L19.3125 10.6031ZM18.6656 9.45938L18.4219 8.57812L17.5219 8.8125L18 9.29062L18.6656 9.45938ZM16.2281 8.8125L15.3281 8.57812L15.0844 9.45938L15.75 9.29062L16.2281 8.8125ZM16.875 8.99063L16.2281 8.8125L15.75 9.29062L16.875 8.99063Z" fill="white"/>
+<path d="M17.5219 8.81252L16.875 8.16565L16.2281 8.81252L16.875 8.99065L17.5219 8.81252Z" fill="white"/>
+<path d="M18 9.29062L17.5219 8.8125L16.875 8.99063L18 9.29062ZM16.2281 13.6875L15.3281 13.9219L15.75 15.4781L16.875 14.3344L16.2281 13.6875ZM15.75 15.4781L16.875 19.6875L18 15.4781L16.875 14.3344L15.75 15.4781ZM15.0844 13.0406L14.2031 12.7969L13.7906 14.3344L15.3281 13.9219L15.0844 13.0406Z" fill="white"/>
+<path d="M13.7906 14.3344L12.6656 18.5625L15.75 15.4781L15.3281 13.9219L13.7906 14.3344ZM12.6656 12.375L9.5625 15.4781L13.7906 14.3344L14.2031 12.7969L12.6656 12.375Z" fill="white"/>
+<path d="M14.4375 11.8969L13.7906 11.25L12.6656 12.375L14.2031 12.7969L14.4375 11.8969ZM14.4375 10.6031L14.2031 9.70312L12.6656 10.125L13.7906 11.25L14.4375 10.6031Z" fill="white"/>
+<path d="M12.6656 10.125L8.4375 11.25L12.6656 12.375L13.7906 11.25L12.6656 10.125ZM21.1031 12.375L19.5469 12.7969L19.9594 14.3344L24.1875 15.4781L21.1031 12.375Z" fill="white"/>
+<path d="M18.6656 13.0406L18.4219 13.9219L19.9594 14.3344L19.5469 12.7969L18.6656 13.0406ZM17.5219 13.6875L16.875 14.3344L18 15.4781L18.4219 13.9219L17.5219 13.6875ZM19.3125 11.8969L19.5469 12.7969L21.1031 12.375L19.9594 11.25L19.3125 11.8969Z" fill="white"/>
+<path d="M18 15.4782L21.1031 18.5625L19.9594 14.3344L18.4219 13.9219L18 15.4782ZM18.6656 9.4594L19.5469 9.70315L19.9594 8.16565L18.4219 8.57815L18.6656 9.4594Z" fill="white"/>
+<path d="M21.1031 10.125L24.1875 7.04062L19.9594 8.16562L19.5469 9.70312L21.1031 10.125ZM19.9594 8.16562L21.1031 3.9375L18 7.04062L18.4219 8.57812L19.9594 8.16562ZM21.1031 12.375L25.3125 11.25L21.1031 10.125L19.9594 11.25L21.1031 12.375Z" fill="white"/>
+<path d="M19.3125 10.6031L19.9594 11.25L21.1031 10.125L19.5469 9.70312L19.3125 10.6031ZM15.75 7.04062L12.6656 3.9375L13.7906 8.16562L15.3281 8.57812L15.75 7.04062Z" fill="white"/>
+<path d="M15.0844 9.4594L15.3281 8.57815L13.7906 8.16565L14.2031 9.70315L15.0844 9.4594Z" fill="white"/>
+<path d="M13.7906 8.16565L9.5625 7.04065L12.6656 10.125L14.2031 9.70315L13.7906 8.16565ZM17.5219 8.81252L18.4219 8.57815L18 7.04065L16.875 8.16565L17.5219 8.81252Z" fill="white"/>
+<path d="M18 7.04062L16.875 2.8125L15.75 7.04062L16.875 8.16562L18 7.04062Z" fill="white"/>
+<path d="M16.2281 8.81252L16.875 8.16565L15.75 7.04065L15.3281 8.57815L16.2281 8.81252Z" fill="white"/>
+<path d="M16.875 16.0406C19.5208 16.0406 21.6656 13.8958 21.6656 11.25C21.6656 8.60419 19.5208 6.45935 16.875 6.45935C14.2292 6.45935 12.0844 8.60419 12.0844 11.25C12.0844 13.8958 14.2292 16.0406 16.875 16.0406Z" fill="#000095"/>
+<path d="M16.875 15.4781C19.2101 15.4781 21.1031 13.5851 21.1031 11.25C21.1031 8.91485 19.2101 7.02185 16.875 7.02185C14.5399 7.02185 12.6469 8.91485 12.6469 11.25C12.6469 13.5851 14.5399 15.4781 16.875 15.4781Z" fill="white"/>
+</g>
+<defs>
+<clipPath id="clip0_1_42014">
+<rect width="60" height="45" fill="white"/>
+</clipPath>
+</defs>
+</svg>
diff --git a/src/assets/img/settings/currencies/usd.svg b/src/assets/img/settings/currencies/usa.svg
similarity index 100%
rename from src/assets/img/settings/currencies/usd.svg
rename to src/assets/img/settings/currencies/usa.svg
diff --git a/src/assets/img/settings/currencies/vnm.svg b/src/assets/img/settings/currencies/vnm.svg
new file mode 100644
index 000000000..4561861df
--- /dev/null
+++ b/src/assets/img/settings/currencies/vnm.svg
@@ -0,0 +1,11 @@
+<svg width="60" height="45" viewBox="0 0 60 45" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g clip-path="url(#clip0_1_43151)">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M-3.75 0H63.75V45H-3.75V0Z" fill="#DA251D"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M38.2266 33.4863L30.3516 27.624L22.5293 33.5391L25.4297 23.9062L17.6074 17.9561L27.2842 17.8682L30.29 8.25293L33.3398 17.8418L43.0166 17.8506L35.2383 23.8623L38.2178 33.4951L38.2266 33.4863Z" fill="#FFFF00"/>
+</g>
+<defs>
+<clipPath id="clip0_1_43151">
+<rect width="60" height="45" fill="white"/>
+</clipPath>
+</defs>
+</svg>
diff --git a/src/assets/img/settings/currencies/zaf.svg b/src/assets/img/settings/currencies/zaf.svg
new file mode 100644
index 000000000..49ee153be
--- /dev/null
+++ b/src/assets/img/settings/currencies/zaf.svg
@@ -0,0 +1,15 @@
+<svg width="60" height="45" viewBox="0 0 60 45" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g clip-path="url(#clip0_1_43198)">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M-0.000488603 35.841V9.17554L19.8536 22.5083L-0.00927734 35.841H-0.000488603Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M13.5432 45.0077L35.8318 30.0139H67.4893V44.9989H13.5432V45.0077Z" fill="#0000CC"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M12.1194 -1.50269e-06H67.4893V15.0114H35.823C35.823 15.0114 12.4094 -0.149412 12.1194 -1.50269e-06Z" fill="#FF0000"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M-0.000488603 5.62488V9.17558L19.8536 22.4995L-0.00927734 35.841V39.3829L24.9951 22.5083L-0.00927734 5.62488H-0.000488603Z" fill="#FFCC00"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M-0.000488281 5.62488V0H8.34894L34.821 17.9293H67.4981V27.0873H34.821L8.34015 44.999H-0.000488281V39.3829L24.9951 22.5083L0.00830046 5.62488H-0.000488281Z" fill="#009933"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M8.34021 0H13.5432L35.8318 15.0026H67.4893V17.9293H34.8211L8.34021 0.00878888V0ZM8.34021 45.0078H13.5432L35.8318 30.014H67.4893V27.0961H34.8211L8.34021 44.999V45.0078Z" fill="white"/>
+</g>
+<defs>
+<clipPath id="clip0_1_43198">
+<rect width="60" height="45" fill="white"/>
+</clipPath>
+</defs>
+</svg>

From c7d1906108ca4512a9717ecebfc8c8bdcb366945 Mon Sep 17 00:00:00 2001
From: Victor Kirov <victor.kirov@gmail.com>
Date: Thu, 3 Oct 2024 14:37:42 +0300
Subject: [PATCH 156/227] Prep for native segwit (#583)

* Prep for native segwit

* Update ledger confirmation screen to be stx specific

* bump core

* Remove unused type lib

* Update core

* Fix issue with xverse api call

* Update package.json

* Bump core
---
 package-lock.json                             |  14 +-
 package.json                                  |   2 +-
 .../confirmBtcTransaction/ledgerStepView.tsx  |   2 +-
 .../confirmStxTransactionComponent/index.tsx  |   1 -
 src/app/components/stepper/index.tsx          | 121 ----
 .../transactionSetting/editBtcFee.tsx         | 408 -------------
 .../transactionSetting/editStxFee.tsx         |  13 +-
 .../components/transactionSetting/feeItem.tsx | 186 ------
 .../components/transactionSetting/index.tsx   | 138 +----
 src/app/hooks/useBtcFeeRate.ts                |   7 +-
 src/app/hooks/useBtcFees.ts                   | 116 ----
 src/app/routes/index.tsx                      |   6 +-
 .../screens/confirmFtTransaction/index.tsx    |   6 +-
 .../screens/confirmNftTransaction/index.tsx   |   6 +-
 .../screens/confirmStxTransaction/index.tsx   |   6 +-
 .../index.styled.ts                           |  22 -
 .../confirmLedgerStxTransaction/index.tsx     | 314 ++++++++++
 .../ledger/confirmLedgerTransaction/index.tsx | 575 ------------------
 src/app/screens/signPsbtRequest/index.tsx     |   4 +-
 .../screens/signPsbtRequest/useSignPsbt.ts    |  28 +-
 src/app/screens/speedUpTransaction/index.tsx  |   4 +-
 src/app/utils/currency.ts                     |  94 +--
 src/common/types/ledger.ts                    |  10 +-
 src/locales/en.json                           |   3 +-
 24 files changed, 418 insertions(+), 1668 deletions(-)
 delete mode 100644 src/app/components/stepper/index.tsx
 delete mode 100644 src/app/components/transactionSetting/editBtcFee.tsx
 delete mode 100644 src/app/components/transactionSetting/feeItem.tsx
 delete mode 100644 src/app/hooks/useBtcFees.ts
 rename src/app/screens/ledger/{confirmLedgerTransaction => confirmLedgerStxTransaction}/index.styled.ts (77%)
 create mode 100644 src/app/screens/ledger/confirmLedgerStxTransaction/index.tsx
 delete mode 100644 src/app/screens/ledger/confirmLedgerTransaction/index.tsx

diff --git a/package-lock.json b/package-lock.json
index bc96e7796..415ee7480 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -14,7 +14,7 @@
         "@playwright/test": "1.46.1",
         "@react-spring/web": "^9.6.1",
         "@sats-connect/core": "0.3.0",
-        "@secretkeylabs/xverse-core": "23.0.0",
+        "@secretkeylabs/xverse-core": "24.0.0",
         "@stacks/connect": "7.4.1",
         "@stacks/stacks-blockchain-api-types": "6.1.1",
         "@stacks/transactions": "6.16.1",
@@ -1270,9 +1270,9 @@
       }
     },
     "node_modules/@secretkeylabs/xverse-core": {
-      "version": "23.0.0",
-      "resolved": "https://npm.pkg.github.com/download/@secretkeylabs/xverse-core/23.0.0/d5f2b2868344504e3933bca5efca5ff67331e192",
-      "integrity": "sha512-jXkrCtO7aRCBerbz0ktO+1oHiDy8Ef0eMoXQe+YExxba1kVgSh5XevDRXT8vtzf5SQKr7Kg4thxhnMbQ9UofSg==",
+      "version": "24.0.0",
+      "resolved": "https://npm.pkg.github.com/download/@secretkeylabs/xverse-core/24.0.0/9b8bace8b966fd87f149e88e7a27f6c05af0a448",
+      "integrity": "sha512-eRO7o4sjYrHgEy6da4Ip1+4iS1SRP5MEC38AWb1/AnEnJyuXEnPMS90NK+WhdwjSRUjcNBkFM6li0MIk1x+nkw==",
       "license": "ISC",
       "dependencies": {
         "@bitcoinerlab/secp256k1": "^1.0.2",
@@ -13635,9 +13635,9 @@
       }
     },
     "@secretkeylabs/xverse-core": {
-      "version": "23.0.0",
-      "resolved": "https://npm.pkg.github.com/download/@secretkeylabs/xverse-core/23.0.0/d5f2b2868344504e3933bca5efca5ff67331e192",
-      "integrity": "sha512-jXkrCtO7aRCBerbz0ktO+1oHiDy8Ef0eMoXQe+YExxba1kVgSh5XevDRXT8vtzf5SQKr7Kg4thxhnMbQ9UofSg==",
+      "version": "24.0.0",
+      "resolved": "https://npm.pkg.github.com/download/@secretkeylabs/xverse-core/24.0.0/9b8bace8b966fd87f149e88e7a27f6c05af0a448",
+      "integrity": "sha512-eRO7o4sjYrHgEy6da4Ip1+4iS1SRP5MEC38AWb1/AnEnJyuXEnPMS90NK+WhdwjSRUjcNBkFM6li0MIk1x+nkw==",
       "requires": {
         "@bitcoinerlab/secp256k1": "^1.0.2",
         "@noble/curves": "^1.2.0",
diff --git a/package.json b/package.json
index 26075e48a..b670a007a 100644
--- a/package.json
+++ b/package.json
@@ -42,7 +42,7 @@
     "@playwright/test": "1.46.1",
     "@react-spring/web": "^9.6.1",
     "@sats-connect/core": "0.3.0",
-    "@secretkeylabs/xverse-core": "23.0.0",
+    "@secretkeylabs/xverse-core": "24.0.0",
     "@stacks/connect": "7.4.1",
     "@stacks/stacks-blockchain-api-types": "6.1.1",
     "@stacks/transactions": "6.16.1",
diff --git a/src/app/components/confirmBtcTransaction/ledgerStepView.tsx b/src/app/components/confirmBtcTransaction/ledgerStepView.tsx
index 74c7520eb..5eccd8f9e 100644
--- a/src/app/components/confirmBtcTransaction/ledgerStepView.tsx
+++ b/src/app/components/confirmBtcTransaction/ledgerStepView.tsx
@@ -9,7 +9,7 @@ import LedgerFailView from '@components/ledger/failLedgerView';
 import {
   ConnectLedgerTitle,
   InfoImage,
-} from '@screens/ledger/confirmLedgerTransaction/index.styled';
+} from '@screens/ledger/confirmLedgerStxTransaction/index.styled';
 import type { TFunction } from 'react-i18next';
 
 export enum Steps {
diff --git a/src/app/components/confirmStxTransactionComponent/index.tsx b/src/app/components/confirmStxTransactionComponent/index.tsx
index f69a1c299..983440b28 100644
--- a/src/app/components/confirmStxTransactionComponent/index.tsx
+++ b/src/app/components/confirmStxTransactionComponent/index.tsx
@@ -397,7 +397,6 @@ function ConfirmStxTransactionComponent({
         <TransactionSettingAlert
           visible={openTransactionSettingModal}
           fee={microstacksToStx(getFee()).toString()}
-          type="STX"
           nonce={getTxNonce()}
           onApplyClick={applyTxSettings}
           onCrossClick={closeTransactionSettingAlert}
diff --git a/src/app/components/stepper/index.tsx b/src/app/components/stepper/index.tsx
deleted file mode 100644
index d73bdb191..000000000
--- a/src/app/components/stepper/index.tsx
+++ /dev/null
@@ -1,121 +0,0 @@
-import checkmarkIcon from '@assets/img/checkmarkIcon.svg';
-import styled from 'styled-components';
-
-interface StepperProps {
-  isActive?: boolean;
-  isCompleted?: boolean;
-}
-
-const Container = styled.div({
-  width: '100%',
-  display: 'flex',
-  justifyContent: 'space-between',
-  userSelect: 'none',
-});
-
-const Title = styled.div<StepperProps>((props) => ({
-  marginTop: props.theme.spacing(8),
-  fontSize: '0.875rem',
-  fontWeight: 500,
-  color: props.isActive ? props.theme.colors.white_0 : props.theme.colors.white_600,
-  transition: 'color 0.3s ease',
-}));
-
-const getBackgroundColor = (props) => {
-  if (props.isCompleted) {
-    return props.theme.colors.success_medium;
-  }
-  if (props.isActive) {
-    return '#4C525F';
-  }
-  return 'transparent';
-};
-
-const Dot = styled.div<StepperProps>((props) => ({
-  height: 30,
-  width: 30,
-  backgroundColor: getBackgroundColor(props),
-  border: '2px solid',
-  borderColor: props.isCompleted
-    ? props.theme.colors.success_medium
-    : props.theme.colors.elevation6,
-  borderRadius: '50%',
-  display: 'flex',
-  justifyContent: 'center',
-  alignItems: 'center',
-  color: props.theme.colors.white_0,
-  fontWeight: 'bold',
-  fontSize: '0.875rem',
-  flex: '1 0 auto',
-  transition: 'background-color 0.3s ease, border-color 0.3s ease',
-  '&::after': {
-    content: '""',
-    display: props.isActive ? 'block' : 'none',
-    position: 'absolute',
-    width: 8,
-    height: 8,
-    borderRadius: '50%',
-    backgroundColor: props.theme.colors.white_0,
-  },
-}));
-
-const calculateColorStops = (props) => {
-  const successColor = props.theme.colors.success_medium;
-
-  // Calculate the color stops
-  let startStop: string;
-  if (props.step === 0) startStop = '0%';
-  if (props.step > 1) startStop = '100%';
-  else startStop = '50%';
-  const endStop = props.step > 0 ? '50%' : '0%';
-
-  return `${successColor} ${startStop}, #4C525F ${endStop}`;
-};
-
-type LineProps = { step: number };
-const Line = styled.div<LineProps>((props) => ({
-  height: 2,
-  width: '100%',
-  background: `linear-gradient(90deg, ${calculateColorStops(props)})`,
-  marginTop: props.theme.spacing(8),
-}));
-
-interface Props {
-  steps: { title: string; isCompleted: boolean }[];
-}
-
-// TODO: Make this component more generic
-export default function Stepper({ steps }: Props): JSX.Element {
-  const currentStepIndex = steps.findIndex((step) => !step.isCompleted);
-  const currentStep = currentStepIndex > -1 ? currentStepIndex : steps.length;
-
-  function getContentForDot(stepIndex: number, isCompleted: boolean, currentPosition: number) {
-    if (isCompleted) {
-      return <img src={checkmarkIcon} alt="Check Icon" />;
-    }
-    if (currentPosition !== stepIndex) {
-      return String(stepIndex + 1);
-    }
-    return '';
-  }
-  return (
-    <>
-      <Container>
-        <Dot isCompleted={steps[0].isCompleted} isActive={currentStep === 0}>
-          {getContentForDot(0, steps[0].isCompleted, currentStep)}
-        </Dot>
-        <Line step={currentStep} />
-        <Dot isCompleted={steps[1].isCompleted} isActive={currentStep === 1}>
-          {getContentForDot(1, steps[1].isCompleted, currentStep)}
-        </Dot>
-      </Container>
-      <Container>
-        {steps.map((step, index) => (
-          <Title key={step.title} isActive={currentStep === index}>
-            {step.title}
-          </Title>
-        ))}
-      </Container>
-    </>
-  );
-}
diff --git a/src/app/components/transactionSetting/editBtcFee.tsx b/src/app/components/transactionSetting/editBtcFee.tsx
deleted file mode 100644
index f2e04dae2..000000000
--- a/src/app/components/transactionSetting/editBtcFee.tsx
+++ /dev/null
@@ -1,408 +0,0 @@
-import FiatAmountText from '@components/fiatAmountText';
-import useBtcClient from '@hooks/apiClients/useBtcClient';
-import useSupportedCoinRates from '@hooks/queries/useSupportedCoinRates';
-import useBtcFees from '@hooks/useBtcFees';
-import useDebounce from '@hooks/useDebounce';
-import useOrdinalsByAddress from '@hooks/useOrdinalsByAddress';
-import useSelectedAccount from '@hooks/useSelectedAccount';
-import useWalletSelector from '@hooks/useWalletSelector';
-import { Faders } from '@phosphor-icons/react';
-import {
-  ErrorCodes,
-  getBtcFees,
-  getBtcFeesForNonOrdinalBtcSend,
-  getBtcFeesForOrdinalSend,
-  getBtcFiatEquivalent,
-  type Recipient,
-  type UTXO,
-} from '@secretkeylabs/xverse-core';
-import { StyledP } from '@ui-library/common.styled';
-import BigNumber from 'bignumber.js';
-import { useEffect, useMemo, useRef, useState } from 'react';
-import { useTranslation } from 'react-i18next';
-import { NumericFormat } from 'react-number-format';
-import styled from 'styled-components';
-import Theme from 'theme';
-import FeeItem from './feeItem';
-
-const Container = styled.div((props) => ({
-  display: 'flex',
-  flexDirection: 'column',
-  paddingBottom: props.theme.space.m,
-}));
-
-const DetailText = styled.h1((props) => ({
-  ...props.theme.typography.body_m,
-  color: props.theme.colors.white_200,
-}));
-
-const InputContainer = styled.div<{
-  withError?: boolean;
-}>((props) => ({
-  display: 'flex',
-  flexDirection: 'row',
-  alignItems: 'center',
-  justifyContent: 'space-between',
-  marginTop: props.theme.space.xs,
-  marginBottom: props.theme.space.s,
-  border: `1px solid ${
-    props.withError ? props.theme.colors.danger_medium : props.theme.colors.elevation6
-  }`,
-  backgroundColor: props.theme.colors.elevation1,
-  borderRadius: props.theme.radius(1),
-  padding: props.theme.space.s,
-}));
-
-const InputField = styled.input((props) => ({
-  ...props.theme.typography.body_m,
-  backgroundColor: 'transparent',
-  color: props.theme.colors.white_0,
-  border: 'transparent',
-  width: '50%',
-  '&::-webkit-outer-spin-button': {
-    '-webkit-appearance': 'none',
-    margin: 0,
-  },
-  '&::-webkit-inner-spin-button': {
-    '-webkit-appearance': 'none',
-    margin: 0,
-  },
-  '&[type=number]': {
-    '-moz-appearance': 'textfield',
-  },
-}));
-
-const FeeText = styled.span((props) => ({
-  ...props.theme.typography.body_m,
-  color: props.theme.colors.white_0,
-}));
-
-const FeeContainer = styled.div({
-  display: 'flex',
-  flexDirection: 'column',
-});
-
-const ErrorText = styled.h1((props) => ({
-  ...props.theme.typography.body_s,
-  color: props.theme.colors.danger_light,
-  marginBottom: props.theme.space.xxs,
-}));
-
-const FeePrioritiesContainer = styled.div`
-  display: flex;
-  margin-top: ${(props) => props.theme.space.m};
-  flex-direction: column;
-`;
-
-const FeeItemContainer = styled.button<{
-  isSelected: boolean;
-}>`
-  display: flex;
-  padding: ${(props) => props.theme.space.s} ${(props) => props.theme.space.m};
-  align-items: center;
-  gap: ${(props) => props.theme.space.s};
-  align-self: stretch;
-  border-radius: ${(props) => props.theme.space.s};
-  border: 1px solid ${(props) => props.theme.colors.elevation6};
-  flex-direction: row;
-  background: ${(props) => (props.isSelected ? props.theme.colors.elevation6_600 : 'transparent')};
-  margin-top: ${(props) => props.theme.space.xs};
-  flex: 1;
-  transition: background-color 0.1s ease;
-
-  &:hover:enabled {
-    background-color: ${(props) => props.theme.colors.elevation6_400};
-  }
-
-  &:active:enabled {
-    background-color: ${(props) => props.theme.colors.elevation6_600};
-  }
-`;
-
-const TextRow = styled.div`
-  display: flex;
-  flex-direction: row;
-  justify-content: space-between;
-  flex: 1;
-`;
-
-const CustomTextsContainer = styled.div`
-  display: flex;
-  flex-direction: row;
-  justify-content: space-between;
-  flex: 1;
-`;
-
-const Row = styled.div`
-  display: flex;
-  flex-direction: row;
-  align-items: center;
-`;
-
-const TotalFeeText = styled(StyledP)`
-  margin-right: ${(props) => props.theme.space.xxs};
-`;
-
-type Props = {
-  type?: string;
-  fee: string;
-  feeRate?: BigNumber | string;
-  btcRecipients?: Recipient[];
-  ordinalTxUtxo?: UTXO;
-  isRestoreFlow?: boolean;
-  nonOrdinalUtxos?: UTXO[];
-  feeMode: string;
-  error: string;
-  customFeeSelected: boolean;
-  setIsLoading: () => void;
-  setIsNotLoading: () => void;
-  setFee: (fee: string) => void;
-  setFeeRate: (feeRate: string) => void;
-  setFeeMode: (feeMode: string) => void;
-  setError: (error: string) => void;
-  setCustomFeeSelected: (selected: boolean) => void;
-  feeOptionSelected: (feeRate: string, totalFee: string) => void;
-};
-
-function EditBtcFee({
-  type,
-  fee,
-  feeRate,
-  btcRecipients,
-  ordinalTxUtxo,
-  isRestoreFlow,
-  nonOrdinalUtxos,
-  feeMode,
-  error,
-  customFeeSelected,
-  setIsLoading,
-  setIsNotLoading,
-  setFee,
-  setFeeRate,
-  setError,
-  setFeeMode,
-  setCustomFeeSelected,
-  feeOptionSelected,
-}: Props) {
-  const { t } = useTranslation('translation');
-
-  const selectedAccount = useSelectedAccount();
-  const { btcAddress, ordinalsAddress } = selectedAccount;
-  const { network, fiatCurrency } = useWalletSelector();
-  const { btcFiatRate } = useSupportedCoinRates();
-  const [totalFee, setTotalFee] = useState(fee);
-  const [feeRateInput, setFeeRateInput] = useState(feeRate?.toString() ?? '');
-  const inputRef = useRef<HTMLInputElement>(null);
-  const debouncedFeeRateInput = useDebounce(feeRateInput, 500);
-  const { ordinals } = useOrdinalsByAddress(btcAddress);
-  const ordinalsUtxos = useMemo(() => ordinals?.map((ord) => ord.utxo), [ordinals]);
-  const btcClient = useBtcClient();
-  const { feeData, highFeeError, mediumFeeError } = useBtcFees({
-    isRestoreFlow: !!isRestoreFlow,
-    nonOrdinalUtxos,
-    btcRecipients,
-    type,
-    ordinalTxUtxo,
-  });
-
-  useEffect(() => {
-    setFee(totalFee);
-  }, [totalFee]);
-
-  const recalculateFees = async () => {
-    if (type === 'BTC') {
-      try {
-        setIsLoading();
-        setError('');
-
-        if (isRestoreFlow) {
-          const { fee: modifiedFee, selectedFeeRate } = await getBtcFeesForNonOrdinalBtcSend(
-            btcAddress,
-            nonOrdinalUtxos!,
-            ordinalsAddress,
-            network.type,
-            feeMode,
-            feeRateInput,
-          );
-          setFeeRateInput(selectedFeeRate!.toString());
-          setTotalFee(modifiedFee.toString());
-        } else if (btcRecipients && selectedAccount) {
-          const { fee: modifiedFee, selectedFeeRate } = await getBtcFees(
-            btcRecipients,
-            btcAddress,
-            btcClient,
-            network.type,
-            feeMode,
-            feeRateInput,
-          );
-          setFeeRateInput(selectedFeeRate!.toString());
-          setTotalFee(modifiedFee.toString());
-        }
-      } catch (err: any) {
-        if (Number(err) === ErrorCodes.InSufficientBalance) {
-          setError(t('TX_ERRORS.INSUFFICIENT_BALANCE'));
-        } else if (Number(err) === ErrorCodes.InSufficientBalanceWithTxFee) {
-          setError(t('TX_ERRORS.INSUFFICIENT_BALANCE_FEES'));
-        } else setError(err.toString());
-      } finally {
-        setIsNotLoading();
-      }
-    } else if (type === 'Ordinals' && btcRecipients && ordinalTxUtxo) {
-      try {
-        setIsLoading();
-        setError('');
-
-        const { fee: modifiedFee, selectedFeeRate } = await getBtcFeesForOrdinalSend(
-          btcRecipients[0].address,
-          ordinalTxUtxo,
-          btcAddress,
-          btcClient,
-          network.type,
-          ordinalsUtxos || [],
-          feeMode,
-          feeRateInput,
-        );
-        if (selectedFeeRate) setFeeRateInput(selectedFeeRate.toString());
-        setTotalFee(modifiedFee.toString());
-      } catch (err: any) {
-        if (Number(err) === ErrorCodes.InSufficientBalance) {
-          setError(t('TX_ERRORS.INSUFFICIENT_BALANCE'));
-        } else if (Number(err) === ErrorCodes.InSufficientBalanceWithTxFee) {
-          setError(t('TX_ERRORS.INSUFFICIENT_BALANCE_FEES'));
-        } else setError(err.toString());
-      } finally {
-        setIsNotLoading();
-      }
-    }
-  };
-
-  useEffect(() => {
-    if (feeRateInput) {
-      setFeeRate(feeRateInput);
-    }
-  }, [feeRateInput]);
-
-  useEffect(() => {
-    if (debouncedFeeRateInput) {
-      recalculateFees();
-    }
-  }, [debouncedFeeRateInput]);
-
-  const onInputEditFeesChange = ({ target: { value } }: React.ChangeEvent<HTMLInputElement>) => {
-    if (error) {
-      setError('');
-    }
-
-    if (feeMode !== 'custom') {
-      setFeeMode('custom');
-    }
-
-    setFeeRateInput(value);
-
-    if (type !== 'BTC' && type !== 'Ordinals') {
-      setFeeRateInput(value);
-      setTotalFee(value);
-    }
-  };
-
-  return (
-    <Container>
-      <DetailText>{t('TRANSACTION_SETTING.FEE_INFO')}</DetailText>
-
-      {!customFeeSelected && (
-        <FeePrioritiesContainer>
-          <FeeItem
-            priority="high"
-            time={`~10 ${t('SPEED_UP_TRANSACTION.TIME.MINUTES')}`}
-            feeRate={feeData?.highFeeRate}
-            totalFee={feeData?.highTotalFee}
-            fiatAmount={getBtcFiatEquivalent(
-              new BigNumber(feeData.highTotalFee),
-              BigNumber(btcFiatRate),
-            )}
-            onClick={() => {
-              feeOptionSelected(feeData?.highFeeRate?.toString() || '', feeData?.highTotalFee);
-              setFeeMode('high');
-            }}
-            selected={feeMode === 'high'}
-            error={highFeeError}
-          />
-          <FeeItem
-            priority="medium"
-            time={`~30 ${t('SPEED_UP_TRANSACTION.TIME.MINUTES')}`}
-            feeRate={feeData?.standardFeeRate}
-            totalFee={feeData?.standardTotalFee}
-            fiatAmount={getBtcFiatEquivalent(
-              new BigNumber(feeData.standardTotalFee),
-              BigNumber(btcFiatRate),
-            )}
-            onClick={() => {
-              feeOptionSelected(
-                feeData?.standardFeeRate?.toString() || '',
-                feeData?.standardTotalFee,
-              );
-              setFeeMode('medium');
-            }}
-            selected={feeMode === 'medium'}
-            error={mediumFeeError}
-          />
-          <FeeItemContainer
-            isSelected={feeMode === 'custom'}
-            onClick={() => {
-              setCustomFeeSelected(true);
-            }}
-          >
-            <Faders size={20} color={Theme.colors.tangerine} />
-            <TextRow>
-              <StyledP typography="body_medium_m" color="white_0">
-                {t('TRANSACTION_SETTING.CUSTOM')}
-              </StyledP>
-              <StyledP typography="body_medium_m" color="white_0">
-                {t('TRANSACTION_SETTING.MANUAL_SETTING')}
-              </StyledP>
-            </TextRow>
-          </FeeItemContainer>
-        </FeePrioritiesContainer>
-      )}
-
-      {customFeeSelected && (
-        <FeeContainer>
-          <InputContainer withError={!!error}>
-            <InputField
-              type="number"
-              ref={inputRef}
-              value={feeRateInput?.toString()}
-              onChange={onInputEditFeesChange}
-            />
-            <FeeText>{t('UNITS.SATS_PER_VB')}</FeeText>
-          </InputContainer>
-          <CustomTextsContainer>
-            <Row>
-              <TotalFeeText typography="body_medium_m" color="white_200">
-                {t('TRANSACTION_SETTING.TOTAL_FEE')}:
-              </TotalFeeText>
-              <NumericFormat
-                value={totalFee}
-                displayType="text"
-                thousandSeparator
-                suffix=" sats"
-                renderText={(value: string) => (
-                  <StyledP typography="body_medium_m" color="white_0">
-                    {value}
-                  </StyledP>
-                )}
-              />
-            </Row>
-            <FiatAmountText
-              fiatAmount={getBtcFiatEquivalent(BigNumber(totalFee), BigNumber(btcFiatRate))}
-              fiatCurrency={fiatCurrency}
-            />
-          </CustomTextsContainer>
-          {error && <ErrorText>{error}</ErrorText>}
-        </FeeContainer>
-      )}
-    </Container>
-  );
-}
-
-export default EditBtcFee;
diff --git a/src/app/components/transactionSetting/editStxFee.tsx b/src/app/components/transactionSetting/editStxFee.tsx
index 4cd551c8c..9f2925f4a 100644
--- a/src/app/components/transactionSetting/editStxFee.tsx
+++ b/src/app/components/transactionSetting/editStxFee.tsx
@@ -105,7 +105,6 @@ const ErrorText = styled.p((props) => ({
 
 // TODO tim: this component needs refactoring. separate business logic from presentation
 type Props = {
-  type?: string;
   fee: string;
   feeRate?: BigNumber | string;
   feeMode: string;
@@ -117,7 +116,6 @@ type Props = {
 };
 
 function EditStxFee({
-  type,
   fee,
   feeRate,
   feeMode,
@@ -133,7 +131,6 @@ function EditStxFee({
   const [totalFee, setTotalFee] = useState(fee);
   const [feeRateInput, setFeeRateInput] = useState(feeRate?.toString() ?? '');
   const inputRef = useRef<HTMLInputElement>(null);
-  const isStx = type === 'STX';
 
   const modifyStxFees = (mode: string) => {
     const currentFee = new BigNumber(fee);
@@ -161,7 +158,7 @@ function EditStxFee({
   };
 
   useEffect(() => {
-    if (isStx && feeMode !== 'custom') {
+    if (feeMode !== 'custom') {
       modifyStxFees(feeMode);
     }
   }, [feeMode]);
@@ -215,11 +212,9 @@ function EditStxFee({
         {error && <ErrorText>{error}</ErrorText>}
       </FeeContainer>
       <ButtonContainer>
-        {isStx && (
-          <FeeButton isSelected={feeMode === 'low'} onClick={() => modifyStxFees('low')}>
-            {t('TRANSACTION_SETTING.LOW')}
-          </FeeButton>
-        )}
+        <FeeButton isSelected={feeMode === 'low'} onClick={() => modifyStxFees('low')}>
+          {t('TRANSACTION_SETTING.LOW')}
+        </FeeButton>
         <FeeButton isSelected={feeMode === 'medium'} onClick={() => modifyStxFees('medium')}>
           {t('TRANSACTION_SETTING.STANDARD')}
         </FeeButton>
diff --git a/src/app/components/transactionSetting/feeItem.tsx b/src/app/components/transactionSetting/feeItem.tsx
deleted file mode 100644
index 4af201283..000000000
--- a/src/app/components/transactionSetting/feeItem.tsx
+++ /dev/null
@@ -1,186 +0,0 @@
-import FiatAmountText from '@components/fiatAmountText';
-import useWalletSelector from '@hooks/useWalletSelector';
-import { Bicycle, CarProfile, RocketLaunch } from '@phosphor-icons/react';
-import { ErrorCodes } from '@secretkeylabs/xverse-core';
-import { StyledP } from '@ui-library/common.styled';
-import Spinner from '@ui-library/spinner';
-import BigNumber from 'bignumber.js';
-import { useTranslation } from 'react-i18next';
-import styled from 'styled-components';
-import Theme from 'theme';
-
-const FeeItemContainer = styled.button<{
-  isSelected: boolean;
-}>`
-  display: flex;
-  padding: ${(props) => props.theme.space.s} ${(props) => props.theme.space.m};
-  align-items: center;
-  gap: ${(props) => props.theme.space.s};
-  align-self: stretch;
-  border-radius: ${(props) => props.theme.space.s};
-  border: 1px solid ${(props) => props.theme.colors.elevation6};
-  flex-direction: row;
-  background: ${(props) => (props.isSelected ? props.theme.colors.elevation6_600 : 'transparent')};
-  margin-top: ${(props) => props.theme.space.xs};
-  flex: 1;
-  transition: background-color 0.1s ease;
-
-  &:hover:enabled {
-    background-color: ${(props) => props.theme.colors.elevation6_400};
-  }
-
-  &:active:enabled {
-    background-color: ${(props) => props.theme.colors.elevation6_600};
-  }
-`;
-
-const IconContainer = styled.div`
-  display: flex;
-  align-items: center;
-  justify-content: center;
-`;
-
-const TextsContainer = styled.div`
-  display: flex;
-  flex-direction: row;
-  justify-content: space-between;
-
-  flex: 1;
-`;
-
-const ColumnsTexts = styled.div`
-  display: flex;
-  flex-direction: column;
-  align-items: flex-start;
-  flex: 1;
-`;
-const EndColumnTexts = styled.div`
-  display: flex;
-  flex-direction: column;
-  align-items: flex-end;
-`;
-
-const StyledHeading = styled(StyledP)`
-  margin-bottom: ${(props) => props.theme.space.xxs};
-`;
-
-const StyledSubText = styled(StyledP)`
-  margin-bottom: ${(props) => props.theme.space.xxs};
-`;
-
-const LoaderContainer = styled.div`
-  display: flex;
-  align-items: center;
-  justify-content: flex-end;
-  flex: 1;
-`;
-
-const StyledFiatAmountText = styled(FiatAmountText)`
-  ${(props) => props.theme.typography.body_medium_s}
-  color: ${(props) => props.theme.colors.white_200};
-`;
-
-type FeePriority = 'high' | 'medium' | 'low';
-
-type Props = {
-  priority: FeePriority;
-  time: string;
-  feeRate: string;
-  totalFee: string;
-  fiatAmount: BigNumber;
-  selected: boolean;
-  onClick?: () => void;
-  error?: string;
-};
-
-function FeeItem({
-  priority,
-  time,
-  feeRate,
-  totalFee,
-  fiatAmount,
-  selected,
-  error,
-  onClick,
-}: Props) {
-  const { t } = useTranslation('translation');
-  const { fiatCurrency } = useWalletSelector();
-
-  const getIcon = () => {
-    switch (priority) {
-      case 'high':
-        return <RocketLaunch size={20} color={Theme.colors.tangerine} />;
-      case 'medium':
-        return <CarProfile size={20} color={Theme.colors.tangerine} />;
-      case 'low':
-        return <Bicycle size={20} color={Theme.colors.tangerine} />;
-      default:
-        return <RocketLaunch size={20} color={Theme.colors.tangerine} />;
-    }
-  };
-
-  const getLabel = () => {
-    switch (priority) {
-      case 'high':
-        return t('SPEED_UP_TRANSACTION.HIGH_PRIORITY');
-      case 'medium':
-        return t('SPEED_UP_TRANSACTION.MED_PRIORITY');
-      case 'low':
-        return t('SPEED_UP_TRANSACTION.LOW_PRIORITY');
-      default:
-        return t('SPEED_UP_TRANSACTION.HIGH_PRIORITY');
-    }
-  };
-
-  const getErrorMessage = (btcError: string) => {
-    if (
-      Number(btcError) === ErrorCodes.InSufficientBalance ||
-      Number(btcError) === ErrorCodes.InSufficientBalanceWithTxFee
-    ) {
-      return t('SEND.ERRORS.INSUFFICIENT_BALANCE');
-    }
-    return btcError;
-  };
-
-  return (
-    <FeeItemContainer onClick={onClick} isSelected={selected} disabled={!totalFee || !!error}>
-      <IconContainer>{getIcon()}</IconContainer>
-      <TextsContainer>
-        <ColumnsTexts>
-          <StyledHeading typography="body_medium_m" color="white_0">
-            {getLabel()}
-          </StyledHeading>
-          <StyledSubText typography="body_medium_s" color="white_200">
-            {time}
-          </StyledSubText>
-          <StyledSubText
-            typography="body_medium_s"
-            color="white_200"
-          >{`${feeRate} sats/vB`}</StyledSubText>
-        </ColumnsTexts>
-
-        <EndColumnTexts>
-          {totalFee && (
-            <StyledHeading typography="body_medium_m" color="white_0">
-              {`${totalFee} sats`}
-            </StyledHeading>
-          )}
-          <StyledFiatAmountText fiatAmount={fiatAmount} fiatCurrency={fiatCurrency} />
-          {error && (
-            <StyledSubText typography="body_medium_s" color="danger_medium">
-              {getErrorMessage(error)}
-            </StyledSubText>
-          )}
-        </EndColumnTexts>
-
-        {!totalFee && !error && (
-          <LoaderContainer>
-            <Spinner color="white" size={20} />
-          </LoaderContainer>
-        )}
-      </TextsContainer>
-    </FeeItemContainer>
-  );
-}
-
-export default FeeItem;
diff --git a/src/app/components/transactionSetting/index.tsx b/src/app/components/transactionSetting/index.tsx
index 7ae8c456e..d3701050c 100644
--- a/src/app/components/transactionSetting/index.tsx
+++ b/src/app/components/transactionSetting/index.tsx
@@ -1,20 +1,12 @@
 import ArrowIcon from '@assets/img/settings/arrow.svg';
-import useBtcWalletData from '@hooks/queries/useBtcWalletData';
 import useStxWalletData from '@hooks/queries/useStxWalletData';
-import useWalletSelector from '@hooks/useWalletSelector';
-import {
-  isCustomFeesAllowed,
-  stxToMicrostacks,
-  type Recipient,
-  type UTXO,
-} from '@secretkeylabs/xverse-core';
+import { stxToMicrostacks } from '@secretkeylabs/xverse-core';
 import Button from '@ui-library/button';
 import Sheet from '@ui-library/sheet';
 import BigNumber from 'bignumber.js';
 import { useState } from 'react';
 import { useTranslation } from 'react-i18next';
 import styled from 'styled-components';
-import EditBtcFee from './editBtcFee';
 import EditNonce from './editNonce';
 import EditStxFee from './editStxFee';
 
@@ -49,21 +41,13 @@ const TransactionSettingNonceOptionButton = styled.button((props) => ({
   justifyContent: 'space-between',
 }));
 
-type TxType = 'STX' | 'BTC' | 'Ordinals';
-
 type Props = {
   visible: boolean;
   fee: string;
-  feePerVByte?: BigNumber;
   loading?: boolean;
   nonce?: string;
   onApplyClick: (params: { fee: string; feeRate?: string; nonce?: string }) => void;
   onCrossClick: () => void;
-  type?: TxType;
-  btcRecipients?: Recipient[];
-  ordinalTxUtxo?: UTXO;
-  isRestoreFlow?: boolean;
-  nonOrdinalUtxos?: UTXO[];
   showFeeSettings: boolean;
   nonceSettings?: boolean;
   setShowFeeSettings: (value: boolean) => void;
@@ -72,32 +56,22 @@ type Props = {
 function TransactionSettingAlert({
   visible,
   fee,
-  feePerVByte,
   loading,
   nonce,
   onApplyClick,
   onCrossClick,
-  type = 'STX',
-  btcRecipients,
-  ordinalTxUtxo,
-  isRestoreFlow,
-  nonOrdinalUtxos,
   showFeeSettings,
   nonceSettings = false,
   setShowFeeSettings,
 }: Props) {
   const { t } = useTranslation('translation');
   const [feeInput, setFeeInput] = useState(fee);
-  const [feeRate, setFeeRate] = useState<BigNumber | string | undefined>(feePerVByte);
+  const [feeRate, setFeeRate] = useState<BigNumber | string | undefined>();
   const [nonceInput, setNonceInput] = useState<string | undefined>(nonce);
   const [error, setError] = useState('');
   const [selectedOption, setSelectedOption] = useState<string>('medium');
   const [showNonceSettings, setShowNonceSettings] = useState(false);
-  const [isLoading, setIsLoading] = useState(loading);
-  const [customFeeSelected, setCustomFeeSelected] = useState(false);
-  const { network } = useWalletSelector();
   const { data: stxData } = useStxWalletData();
-  const { data: btcBalance } = useBtcWalletData();
 
   const applyClickForStx = () => {
     if (stxData?.availableBalance) {
@@ -130,40 +104,6 @@ function TransactionSettingAlert({
     onApplyClick({ fee: feeInput.toString(), nonce: nonceInput });
   };
 
-  const applyClickForBtc = async () => {
-    const currentFee = new BigNumber(feeInput);
-    if (currentFee.gt(btcBalance ?? 0)) {
-      // show fee exceeds total balance error
-      setError(t('TRANSACTION_SETTING.GREATER_FEE_ERROR'));
-      return;
-    }
-    if (selectedOption === 'custom' && feeRate) {
-      const response = await isCustomFeesAllowed(network.type, feeRate.toString());
-      if (!response) {
-        setError(t('TRANSACTION_SETTING.LOWER_THAN_MINIMUM'));
-        return;
-      }
-    }
-    setShowNonceSettings(false);
-    setShowFeeSettings(false);
-    setCustomFeeSelected(false);
-    setError('');
-    onApplyClick({ fee: feeInput.toString(), feeRate: feeRate?.toString() });
-  };
-
-  const btcFeeOptionSelected = async (selectedFeeRate: string, totalFee: string) => {
-    const currentFee = new BigNumber(feeInput);
-    if (currentFee.gt(btcBalance ?? 0)) {
-      // show fee exceeds total balance error
-      setError(t('TRANSACTION_SETTING.GREATER_FEE_ERROR'));
-      return;
-    }
-    setShowNonceSettings(false);
-    setShowFeeSettings(false);
-    setError('');
-    onApplyClick({ fee: totalFee, feeRate: selectedFeeRate });
-  };
-
   const onEditFeesPress = () => {
     setShowFeeSettings(true);
   };
@@ -172,14 +112,6 @@ function TransactionSettingAlert({
     setShowNonceSettings(true);
   };
 
-  const onLoading = () => {
-    setIsLoading(true);
-  };
-
-  const onComplete = () => {
-    setIsLoading(false);
-  };
-
   const onClosePress = () => {
     setShowNonceSettings(false);
     setShowFeeSettings(false);
@@ -192,43 +124,16 @@ function TransactionSettingAlert({
     }
 
     if (showFeeSettings) {
-      if (type === 'STX') {
-        return (
-          <EditStxFee
-            fee={fee}
-            feeRate={feeRate}
-            type={type}
-            error={error}
-            setFee={setFeeInput}
-            setFeeRate={setFeeRate}
-            setError={setError}
-            feeMode={selectedOption}
-            setFeeMode={setSelectedOption}
-          />
-        );
-      }
       return (
-        <EditBtcFee
+        <EditStxFee
           fee={fee}
           feeRate={feeRate}
-          type={type}
           error={error}
-          setIsLoading={onLoading}
-          setIsNotLoading={onComplete}
           setFee={setFeeInput}
           setFeeRate={setFeeRate}
           setError={setError}
           feeMode={selectedOption}
           setFeeMode={setSelectedOption}
-          btcRecipients={btcRecipients}
-          ordinalTxUtxo={ordinalTxUtxo}
-          isRestoreFlow={isRestoreFlow}
-          nonOrdinalUtxos={nonOrdinalUtxos}
-          setCustomFeeSelected={(selected: boolean) => {
-            setCustomFeeSelected(selected);
-          }}
-          customFeeSelected={customFeeSelected}
-          feeOptionSelected={btcFeeOptionSelected}
         />
       );
     }
@@ -241,14 +146,12 @@ function TransactionSettingAlert({
           </TransactionSettingOptionText>
           <img src={ArrowIcon} alt="Arrow" />
         </TransactionSettingOptionButton>
-        {type === 'STX' && (
-          <TransactionSettingNonceOptionButton onClick={onEditNoncePress}>
-            <TransactionSettingOptionText>
-              {t('TRANSACTION_SETTING.ADVANCED_SETTING_NONCE_OPTION')}
-            </TransactionSettingOptionText>
-            <img src={ArrowIcon} alt="Arrow" />
-          </TransactionSettingNonceOptionButton>
-        )}
+        <TransactionSettingNonceOptionButton onClick={onEditNoncePress}>
+          <TransactionSettingOptionText>
+            {t('TRANSACTION_SETTING.ADVANCED_SETTING_NONCE_OPTION')}
+          </TransactionSettingOptionText>
+          <img src={ArrowIcon} alt="Arrow" />
+        </TransactionSettingNonceOptionButton>
       </>
     );
   };
@@ -266,7 +169,7 @@ function TransactionSettingAlert({
       onClose={onClosePress}
     >
       {renderContent()}
-      {type === 'STX' && (showFeeSettings || showNonceSettings || nonceSettings) && (
+      {(showFeeSettings || showNonceSettings || nonceSettings) && (
         <ButtonsContainer>
           <Button
             title={t('TRANSACTION_SETTING.BACK')}
@@ -276,25 +179,8 @@ function TransactionSettingAlert({
           <Button
             title={t('TRANSACTION_SETTING.APPLY')}
             onClick={showNonceSettings || nonceSettings ? applyClickForNonceStx : applyClickForStx}
-            loading={isLoading}
-            disabled={isLoading || !!error}
-          />
-        </ButtonsContainer>
-      )}
-      {customFeeSelected && (
-        <ButtonsContainer>
-          <Button
-            title={t('TRANSACTION_SETTING.BACK')}
-            onClick={() => {
-              setCustomFeeSelected(false);
-            }}
-            variant="secondary"
-          />
-          <Button
-            title={t('TRANSACTION_SETTING.APPLY')}
-            onClick={applyClickForBtc}
-            loading={isLoading}
-            disabled={isLoading || !!error}
+            loading={loading}
+            disabled={loading || !!error}
           />
         </ButtonsContainer>
       )}
diff --git a/src/app/hooks/useBtcFeeRate.ts b/src/app/hooks/useBtcFeeRate.ts
index f45037564..c3d63c3ed 100644
--- a/src/app/hooks/useBtcFeeRate.ts
+++ b/src/app/hooks/useBtcFeeRate.ts
@@ -1,12 +1,15 @@
-import { getBtcFeeRate, type BtcFeeResponse } from '@secretkeylabs/xverse-core';
+import { type BtcFeeResponse } from '@secretkeylabs/xverse-core';
 import { useQuery } from '@tanstack/react-query';
+import useXverseApi from './apiClients/useXverseApi';
 import useWalletSelector from './useWalletSelector';
 
 function useBtcFeeRate() {
   const { network } = useWalletSelector();
+  const xverseApi = useXverseApi();
+
   return useQuery<BtcFeeResponse, Error>({
     queryKey: ['btcFeeRate', network.type],
-    queryFn: () => getBtcFeeRate(network.type),
+    queryFn: () => xverseApi.fetchBtcFeeRate(),
     staleTime: 5 * 60 * 1000, // 5 mins
   });
 }
diff --git a/src/app/hooks/useBtcFees.ts b/src/app/hooks/useBtcFees.ts
deleted file mode 100644
index 08b0cde13..000000000
--- a/src/app/hooks/useBtcFees.ts
+++ /dev/null
@@ -1,116 +0,0 @@
-import {
-  getBtcFees,
-  getBtcFeesForNonOrdinalBtcSend,
-  getBtcFeesForOrdinalSend,
-  type Recipient,
-  type UTXO,
-} from '@secretkeylabs/xverse-core';
-import { useEffect, useMemo, useState } from 'react';
-import useBtcClient from './apiClients/useBtcClient';
-import useOrdinalsByAddress from './useOrdinalsByAddress';
-import useSelectedAccount from './useSelectedAccount';
-import useWalletSelector from './useWalletSelector';
-
-interface Params {
-  isRestoreFlow: boolean;
-  nonOrdinalUtxos?: UTXO[];
-  btcRecipients?: Recipient[];
-  type?: string;
-  ordinalTxUtxo?: UTXO;
-}
-
-interface FeeData {
-  standardFeeRate: string;
-  standardTotalFee: string;
-  highFeeRate: string;
-  highTotalFee: string;
-}
-
-const useBtcFees = ({
-  isRestoreFlow,
-  nonOrdinalUtxos,
-  btcRecipients,
-  type,
-  ordinalTxUtxo,
-}: Params): { feeData: FeeData; highFeeError?: string; mediumFeeError?: string } => {
-  const [feeData, setFeeData] = useState<FeeData>({
-    standardFeeRate: '',
-    standardTotalFee: '',
-    highFeeRate: '',
-    highTotalFee: '',
-  });
-  const [highFeeError, setHighFeeError] = useState<string>('');
-  const [standardFeeError, setStandardFeeError] = useState<string>('');
-  const { btcAddress, ordinalsAddress } = useSelectedAccount();
-  const { network } = useWalletSelector();
-  const btcClient = useBtcClient();
-  const { ordinals } = useOrdinalsByAddress(btcAddress);
-  const ordinalsUtxos = useMemo(() => ordinals?.map((ord) => ord.utxo), [ordinals]);
-
-  useEffect(() => {
-    async function fetchFees(mode: 'standard' | 'high') {
-      try {
-        setStandardFeeError('');
-        setHighFeeError('');
-        let feeInfo;
-        if (isRestoreFlow) {
-          feeInfo = await getBtcFeesForNonOrdinalBtcSend(
-            btcAddress,
-            nonOrdinalUtxos || [],
-            ordinalsAddress,
-            network.type,
-            mode,
-          );
-        } else if (type === 'BTC' && btcRecipients) {
-          feeInfo = await getBtcFees(btcRecipients, btcAddress, btcClient, network.type, mode);
-        } else if (type === 'Ordinals' && btcRecipients && ordinalTxUtxo) {
-          feeInfo = await getBtcFeesForOrdinalSend(
-            btcRecipients[0].address,
-            ordinalTxUtxo,
-            btcAddress,
-            btcClient,
-            network.type,
-            ordinalsUtxos || [],
-            mode,
-          );
-        }
-        return {
-          fee: feeInfo?.fee.toString() || '',
-          feeRate: feeInfo?.selectedFeeRate.toString() || '',
-        };
-      } catch (error: any) {
-        if (mode === 'standard') setStandardFeeError(error.toString());
-        else if (mode === 'high') setHighFeeError(error.toString());
-        return { fee: '', feeRate: '' };
-      }
-    }
-
-    async function calculateFees() {
-      const standard = await fetchFees('standard');
-      const high = await fetchFees('high');
-
-      setFeeData({
-        standardFeeRate: standard.feeRate,
-        standardTotalFee: standard.fee,
-        highFeeRate: high.feeRate,
-        highTotalFee: high.fee,
-      });
-    }
-
-    calculateFees();
-  }, [
-    isRestoreFlow,
-    nonOrdinalUtxos,
-    btcRecipients,
-    type,
-    ordinalTxUtxo,
-    btcAddress,
-    btcClient,
-    network,
-    ordinalsUtxos,
-    ordinalsAddress,
-  ]);
-  return { feeData, highFeeError, mediumFeeError: standardFeeError };
-};
-
-export default useBtcFees;
diff --git a/src/app/routes/index.tsx b/src/app/routes/index.tsx
index 482cceaa4..5c4d20d74 100644
--- a/src/app/routes/index.tsx
+++ b/src/app/routes/index.tsx
@@ -29,7 +29,7 @@ import ForgotPassword from '@screens/forgotPassword';
 import Home from '@screens/home';
 import Landing from '@screens/landing';
 import LedgerAddStxAddress from '@screens/ledger/addStxAddress';
-import ConfirmLedgerTransaction from '@screens/ledger/confirmLedgerTransaction';
+import ConfirmLedgerStxTransaction from '@screens/ledger/confirmLedgerStxTransaction';
 import ImportLedger from '@screens/ledger/importLedgerAccount';
 import VerifyLedger from '@screens/ledger/verifyLedgerAccountAddress';
 import Legal from '@screens/legal';
@@ -181,8 +181,8 @@ const router = createHashRouter([
         ),
       },
       {
-        path: 'confirm-ledger-tx',
-        element: <ConfirmLedgerTransaction />,
+        path: 'confirm-ledger-stx-tx',
+        element: <ConfirmLedgerStxTransaction />,
       },
       {
         path: 'backup',
diff --git a/src/app/screens/confirmFtTransaction/index.tsx b/src/app/screens/confirmFtTransaction/index.tsx
index 9e9f010ba..0a7efc666 100644
--- a/src/app/screens/confirmFtTransaction/index.tsx
+++ b/src/app/screens/confirmFtTransaction/index.tsx
@@ -1,4 +1,4 @@
-import type { ConfirmStxTransactionState, LedgerTransactionType } from '@common/types/ledger';
+import type { ConfirmStxTransactionState } from '@common/types/ledger';
 import ConfirmStxTransactionComponent from '@components/confirmStxTransactionComponent';
 import TransferMemoView from '@components/confirmStxTransactionComponent/transferMemoView';
 import RecipientComponent from '@components/recipientComponent';
@@ -82,15 +82,13 @@ function ConfirmFtTransaction() {
 
   const handleOnConfirmClick = (txs: StacksTransaction[]) => {
     if (isLedgerAccount(selectedAccount)) {
-      const type: LedgerTransactionType = 'STX';
       const state: ConfirmStxTransactionState = {
         unsignedTx: Buffer.from(unsignedTx.serialize()),
-        type,
         recipients: [{ address: recipientAddress, amountMicrostacks: new BigNumber(amount) }],
         fee: new BigNumber(unsignedTx.auth.spendingCondition.fee.toString()),
       };
 
-      navigate('/confirm-ledger-tx', { state });
+      navigate('/confirm-ledger-stx-tx', { state });
       return;
     }
 
diff --git a/src/app/screens/confirmNftTransaction/index.tsx b/src/app/screens/confirmNftTransaction/index.tsx
index b88c00808..f6638aeb6 100644
--- a/src/app/screens/confirmNftTransaction/index.tsx
+++ b/src/app/screens/confirmNftTransaction/index.tsx
@@ -1,5 +1,5 @@
 import AssetIcon from '@assets/img/transactions/Assets.svg';
-import type { ConfirmStxTransactionState, LedgerTransactionType } from '@common/types/ledger';
+import type { ConfirmStxTransactionState } from '@common/types/ledger';
 import AccountHeaderComponent from '@components/accountHeader';
 import ConfirmStxTransactionComponent from '@components/confirmStxTransactionComponent';
 import RecipientComponent from '@components/recipientComponent';
@@ -146,10 +146,8 @@ function ConfirmNftTransaction() {
 
   const handleOnConfirmClick = (txs: StacksTransaction[]) => {
     if (isLedgerAccount(selectedAccount)) {
-      const type: LedgerTransactionType = 'STX';
       const state: ConfirmStxTransactionState = {
         unsignedTx: Buffer.from(unsignedTx.serialize()),
-        type,
         recipients: [
           {
             address: recipientAddress,
@@ -166,7 +164,7 @@ function ConfirmNftTransaction() {
         ),
       };
 
-      navigate('/confirm-ledger-tx', { state });
+      navigate('/confirm-ledger-stx-tx', { state });
       return;
     }
 
diff --git a/src/app/screens/confirmStxTransaction/index.tsx b/src/app/screens/confirmStxTransaction/index.tsx
index 0bbc4d6de..b85630963 100644
--- a/src/app/screens/confirmStxTransaction/index.tsx
+++ b/src/app/screens/confirmStxTransaction/index.tsx
@@ -1,5 +1,5 @@
 import IconStacks from '@assets/img/dashboard/stx_icon.svg';
-import type { ConfirmStxTransactionState, LedgerTransactionType } from '@common/types/ledger';
+import type { ConfirmStxTransactionState } from '@common/types/ledger';
 import {
   sendInternalErrorMessage,
   sendUserRejectionMessage,
@@ -218,16 +218,14 @@ function ConfirmStxTransaction() {
 
   const handleConfirmClick = (txs: StacksTransaction[]) => {
     if (isLedgerAccount(selectedAccount)) {
-      const type: LedgerTransactionType = 'STX';
       const fee = new BigNumber(txs[0].auth.spendingCondition.fee.toString());
       const state: ConfirmStxTransactionState = {
         unsignedTx: Buffer.from(unsignedTx.serialize()),
-        type,
         recipients: [{ address: recipient, amountMicrostacks: amount }],
         fee,
       };
 
-      navigate('/confirm-ledger-tx', { state });
+      navigate('/confirm-ledger-stx-tx', { state });
       return;
     }
     const rawTx = buf2hex(txs[0].serialize());
diff --git a/src/app/screens/ledger/confirmLedgerTransaction/index.styled.ts b/src/app/screens/ledger/confirmLedgerStxTransaction/index.styled.ts
similarity index 77%
rename from src/app/screens/ledger/confirmLedgerTransaction/index.styled.ts
rename to src/app/screens/ledger/confirmLedgerStxTransaction/index.styled.ts
index c2be25a13..ac60de4bd 100644
--- a/src/app/screens/ledger/confirmLedgerTransaction/index.styled.ts
+++ b/src/app/screens/ledger/confirmLedgerStxTransaction/index.styled.ts
@@ -61,22 +61,6 @@ export const ConnectLedgerTitle = styled.h1<{ textAlign?: 'left' | 'center' }>((
   marginBottom: props.theme.spacing(6),
 }));
 
-export const ConnectLedgerTextAdvanced = styled.p<{
-  isCompleted?: boolean;
-}>((props) => ({
-  ...props.theme.body_m,
-  display: 'flex',
-  alignItems: 'flex-start',
-  color: props.isCompleted ? props.theme.colors.white_400 : props.theme.colors.white_200,
-  textAlign: 'center',
-  marginBottom: props.theme.spacing(16),
-}));
-
-export const InfoContainerWrapper = styled.div((props) => ({
-  textAlign: 'left',
-  marginTop: props.theme.spacing(8),
-}));
-
 export const TxDetails = styled.div((props) => ({
   marginTop: props.theme.spacing(36),
   width: '100%',
@@ -98,9 +82,3 @@ export const RecipientsWrapper = styled.div({
   display: 'flex',
   flexDirection: 'column',
 });
-
-export const ConfirmTxIconBig = styled.img((props) => ({
-  width: 32,
-  height: 32,
-  marginBottom: props.theme.spacing(8),
-}));
diff --git a/src/app/screens/ledger/confirmLedgerStxTransaction/index.tsx b/src/app/screens/ledger/confirmLedgerStxTransaction/index.tsx
new file mode 100644
index 000000000..914d5b1ae
--- /dev/null
+++ b/src/app/screens/ledger/confirmLedgerStxTransaction/index.tsx
@@ -0,0 +1,314 @@
+import checkCircleIcon from '@assets/img/ledger/check_circle.svg';
+import ledgerConnectDefaultIcon from '@assets/img/ledger/ledger_connect_default.svg';
+import ledgerConnectStxIcon from '@assets/img/ledger/ledger_import_connect_stx.svg';
+import { delay } from '@common/utils/ledger';
+import ActionButton from '@components/button';
+import LedgerConnectionView from '@components/ledger/connectLedgerView';
+import FullScreenHeader from '@components/ledger/fullScreenHeader';
+import useNetworkSelector from '@hooks/useNetwork';
+import useWalletSelector from '@hooks/useWalletSelector';
+import Transport from '@ledgerhq/hw-transport-webusb';
+import { useTransition } from '@react-spring/web';
+import {
+  broadcastSignedTransaction,
+  microstacksToStx,
+  signLedgerStxTransaction,
+  type StacksRecipient,
+} from '@secretkeylabs/xverse-core';
+import { DEFAULT_TRANSITION_OPTIONS } from '@utils/constants';
+import { getStxTxStatusUrl, getTruncatedAddress } from '@utils/helper';
+import BigNumber from 'bignumber.js';
+import { useState } from 'react';
+import { useTranslation } from 'react-i18next';
+import { useLocation } from 'react-router-dom';
+
+import useSelectedAccount from '@hooks/useSelectedAccount';
+import {
+  Container,
+  OnBoardingContentContainer,
+  RecipientsWrapper,
+  SuccessActionsContainer,
+  TxConfirmedContainer,
+  TxConfirmedDescription,
+  TxConfirmedTitle,
+  TxDetails,
+  TxDetailsRow,
+  TxDetailsTitle,
+} from './index.styled';
+
+enum Steps {
+  ConnectLedger = 0,
+  ConfirmTransaction = 1,
+  TransactionConfirmed = 2,
+}
+
+function ConfirmLedgerStxTransaction(): JSX.Element {
+  const [currentStep, setCurrentStep] = useState(Steps.ConnectLedger);
+  const [txId, setTxId] = useState<string | undefined>(undefined);
+
+  const [isButtonDisabled, setIsButtonDisabled] = useState(false);
+  const [isConnectSuccess, setIsConnectSuccess] = useState(false);
+  const [isConnectFailed, setIsConnectFailed] = useState(false);
+  const [isWrongDevice, setIsWrongDevice] = useState(false);
+  const [isFinalTxApproved, setIsFinalTxApproved] = useState(false);
+  const [isTxRejected, setIsTxRejected] = useState(false);
+
+  const { t } = useTranslation('translation', { keyPrefix: 'LEDGER_CONFIRM_TRANSACTION_SCREEN' });
+  const location = useLocation();
+  const selectedNetwork = useNetworkSelector();
+
+  const selectedAccount = useSelectedAccount();
+  const { network } = useWalletSelector();
+
+  const {
+    recipients,
+    unsignedTx,
+    fee,
+    tabId,
+    tabMessageId: messageId,
+  }: {
+    amount: BigNumber;
+    recipients: StacksRecipient[];
+    unsignedTx: Buffer;
+    fee?: BigNumber;
+    messageId?: string;
+    tabId?: number;
+    tabMessageId?: string;
+  } = location.state;
+
+  const transition = useTransition(currentStep, DEFAULT_TRANSITION_OPTIONS);
+
+  const signAndBroadcastStxTx = async (transport: Transport, addressIndex: number) => {
+    try {
+      const result = await signLedgerStxTransaction({
+        transport,
+        transactionBuffer: unsignedTx,
+        addressIndex,
+      });
+      setIsFinalTxApproved(true);
+      await delay(1500);
+      const transactionHash = await broadcastSignedTransaction(result, selectedNetwork);
+      setTxId(transactionHash);
+      setCurrentStep(Steps.TransactionConfirmed);
+    } catch (err) {
+      console.error(err);
+      setIsTxRejected(true);
+      setIsButtonDisabled(false);
+    } finally {
+      transport.close();
+    }
+  };
+
+  const handleConnectAndConfirm = async () => {
+    if (!selectedAccount) {
+      console.error('No account selected');
+      return;
+    }
+
+    try {
+      setIsButtonDisabled(true);
+
+      const transport = await Transport.create();
+
+      if (!transport) {
+        setIsConnectSuccess(false);
+        setIsConnectFailed(true);
+        setIsButtonDisabled(false);
+        return;
+      }
+
+      const addressIndex = selectedAccount.deviceAccountIndex;
+
+      if (addressIndex === undefined) {
+        setIsConnectSuccess(false);
+        setIsConnectFailed(true);
+        setIsWrongDevice(true);
+        setIsButtonDisabled(false);
+        return;
+      }
+
+      setIsConnectSuccess(true);
+      await delay(1500);
+
+      if (currentStep !== Steps.ConfirmTransaction) {
+        setCurrentStep(Steps.ConfirmTransaction);
+      }
+
+      await signAndBroadcastStxTx(transport as Transport, addressIndex);
+      await transport.close();
+    } catch (err) {
+      setIsConnectSuccess(false);
+      setIsConnectFailed(true);
+    } finally {
+      setIsButtonDisabled(false);
+    }
+  };
+
+  const goToConfirmationStep = () => {
+    setCurrentStep(Steps.ConfirmTransaction);
+
+    handleConnectAndConfirm();
+  };
+
+  const handleRetry = async () => {
+    setIsTxRejected(false);
+    setIsConnectSuccess(false);
+    setIsConnectFailed(false);
+    setIsWrongDevice(false);
+    setCurrentStep(Steps.ConnectLedger);
+  };
+
+  const handleClose = () => {
+    if (typeof window !== 'undefined') {
+      window.close();
+    }
+  };
+
+  const handleSeeTransaction = () => {
+    if (!txId) {
+      console.error('No txId found');
+      return;
+    }
+
+    window.open(getStxTxStatusUrl(txId, network), '_blank', 'noopener,noreferrer');
+  };
+
+  const renderTxDetails = () => (
+    <TxDetails>
+      <TxDetailsRow>
+        <TxDetailsTitle>Recipient{recipients.length > 1 ? 's' : ''}</TxDetailsTitle>
+        <RecipientsWrapper>
+          {recipients.map((recipient) => (
+            <div key={recipient.address}>{getTruncatedAddress(recipient.address)}</div>
+          ))}
+        </RecipientsWrapper>
+      </TxDetailsRow>
+      <TxDetailsRow>
+        <TxDetailsTitle>{t('AMOUNT')}</TxDetailsTitle>
+        <div>
+          {microstacksToStx((recipients[0] as StacksRecipient).amountMicrostacks).toString()} STX
+        </div>
+      </TxDetailsRow>
+      {fee && (
+        <TxDetailsRow>
+          <TxDetailsTitle>{t('FEES')}</TxDetailsTitle>
+          <div>{microstacksToStx(fee).toString()} STX</div>
+        </TxDetailsRow>
+      )}
+    </TxDetails>
+  );
+
+  const renderLedgerConfirmationView = () => {
+    switch (currentStep) {
+      case Steps.ConnectLedger:
+        return (
+          <div>
+            <LedgerConnectionView
+              title={t('CONNECT.TITLE')}
+              text={t('CONNECT.STX_SUBTITLE')}
+              titleFailed={t('CONNECT.ERROR_TITLE')}
+              textFailed={t(
+                isWrongDevice
+                  ? 'CONNECT.WRONG_DEVICE_ERROR_SUBTITLE'
+                  : 'CONNECT.STX_ERROR_SUBTITLE',
+              )}
+              imageDefault={ledgerConnectStxIcon}
+              isConnectSuccess={isConnectSuccess}
+              isConnectFailed={isConnectFailed}
+            />
+          </div>
+        );
+      case Steps.ConfirmTransaction:
+        return (
+          <div>
+            <LedgerConnectionView
+              title={t('CONFIRM.TITLE')}
+              text={t('CONFIRM.SUBTITLE')}
+              titleFailed={t('CONFIRM.ERROR_TITLE')}
+              textFailed={t('CONFIRM.ERROR_SUBTITLE')}
+              imageDefault={ledgerConnectDefaultIcon}
+              isConnectSuccess={isFinalTxApproved}
+              isConnectFailed={isTxRejected}
+            />
+            {renderTxDetails()}
+          </div>
+        );
+      case Steps.TransactionConfirmed:
+        return (
+          <TxConfirmedContainer>
+            <img src={checkCircleIcon} alt="Success" />
+            <TxConfirmedTitle>{t('SUCCESS.TITLE')}</TxConfirmedTitle>
+            <TxConfirmedDescription>{t('SUCCESS.SUBTITLE')}</TxConfirmedDescription>
+          </TxConfirmedContainer>
+        );
+      default:
+        return null;
+    }
+  };
+
+  const renderLedgerConfirmationControls = () => {
+    switch (currentStep) {
+      case Steps.ConfirmTransaction:
+        return (
+          <SuccessActionsContainer>
+            <ActionButton
+              onPress={isTxRejected || isConnectFailed ? handleRetry : handleConnectAndConfirm}
+              text={t(isTxRejected || isConnectFailed ? 'RETRY_BUTTON' : 'CONNECT_BUTTON')}
+              disabled={isButtonDisabled}
+              processing={isButtonDisabled}
+            />
+            <ActionButton
+              transparent
+              onPress={handleClose}
+              text={t(isTxRejected || isConnectFailed ? 'CLOSE_BUTTON' : 'CANCEL_BUTTON')}
+              disabled={isButtonDisabled}
+            />
+          </SuccessActionsContainer>
+        );
+      case Steps.TransactionConfirmed:
+        return (
+          <SuccessActionsContainer>
+            <ActionButton onPress={handleClose} text={t('CLOSE_BUTTON')} />
+            <ActionButton
+              transparent
+              onPress={handleSeeTransaction}
+              text={t('SEE_TRANSACTION_BUTTON')}
+            />
+          </SuccessActionsContainer>
+        );
+      default:
+        return (
+          <SuccessActionsContainer>
+            <ActionButton
+              onPress={isTxRejected || isConnectFailed ? handleRetry : handleConnectAndConfirm}
+              text={t(isTxRejected || isConnectFailed ? 'RETRY_BUTTON' : 'CONNECT_BUTTON')}
+              disabled={isButtonDisabled}
+              processing={isButtonDisabled}
+            />
+            <ActionButton
+              transparent
+              onPress={handleClose}
+              text={t('CANCEL_BUTTON')}
+              disabled={isButtonDisabled}
+            />
+          </SuccessActionsContainer>
+        );
+    }
+  };
+
+  return (
+    <Container>
+      <FullScreenHeader />
+      {transition((style) => (
+        <>
+          <OnBoardingContentContainer style={style}>
+            {renderLedgerConfirmationView()}
+          </OnBoardingContentContainer>
+          {renderLedgerConfirmationControls()}
+        </>
+      ))}
+    </Container>
+  );
+}
+
+export default ConfirmLedgerStxTransaction;
diff --git a/src/app/screens/ledger/confirmLedgerTransaction/index.tsx b/src/app/screens/ledger/confirmLedgerTransaction/index.tsx
deleted file mode 100644
index 5b608790c..000000000
--- a/src/app/screens/ledger/confirmLedgerTransaction/index.tsx
+++ /dev/null
@@ -1,575 +0,0 @@
-import InfoIcon from '@assets/img/info.svg';
-import ledgerConfirmBtcIcon from '@assets/img/ledger/btc_icon.svg';
-import checkCircleIcon from '@assets/img/ledger/check_circle.svg';
-import ledgerConnectDefaultIcon from '@assets/img/ledger/ledger_connect_default.svg';
-import ledgerConnectStxIcon from '@assets/img/ledger/ledger_import_connect_stx.svg';
-import ledgerConfirmOrdinalsIcon from '@assets/img/ledger/ordinals_icon_big.svg';
-import { type LedgerTransactionType } from '@common/types/ledger';
-import { delay } from '@common/utils/ledger';
-import ActionButton from '@components/button';
-import InfoContainer from '@components/infoContainer';
-import LedgerConnectionView, {
-  ConnectLedgerContainer,
-  ConnectLedgerText,
-} from '@components/ledger/connectLedgerView';
-import LedgerFailView from '@components/ledger/failLedgerView';
-import FullScreenHeader from '@components/ledger/fullScreenHeader';
-import Stepper from '@components/stepper';
-import useBtcClient from '@hooks/apiClients/useBtcClient';
-import useNetworkSelector from '@hooks/useNetwork';
-import useWalletSelector from '@hooks/useWalletSelector';
-import Transport from '@ledgerhq/hw-transport-webusb';
-import { useTransition } from '@react-spring/web';
-import {
-  broadcastSignedTransaction,
-  microstacksToStx,
-  satsToBtc,
-  signLedgerMixedBtcTransaction,
-  signLedgerNativeSegwitBtcTransaction,
-  signLedgerStxTransaction,
-  type Recipient,
-  type StacksRecipient,
-  type UTXO,
-} from '@secretkeylabs/xverse-core';
-import { DEFAULT_TRANSITION_OPTIONS } from '@utils/constants';
-import { getBtcTxStatusUrl, getStxTxStatusUrl, getTruncatedAddress } from '@utils/helper';
-import BigNumber from 'bignumber.js';
-import { useState } from 'react';
-import { useTranslation } from 'react-i18next';
-import { useLocation } from 'react-router-dom';
-
-import { makeRpcSuccessResponse, sendRpcResponse } from '@common/utils/rpc/helpers';
-import useSelectedAccount from '@hooks/useSelectedAccount';
-import {
-  ConfirmTxIconBig,
-  ConnectLedgerTextAdvanced,
-  ConnectLedgerTitle,
-  Container,
-  InfoContainerWrapper,
-  InfoImage,
-  OnBoardingContentContainer,
-  RecipientsWrapper,
-  SuccessActionsContainer,
-  TxConfirmedContainer,
-  TxConfirmedDescription,
-  TxConfirmedTitle,
-  TxDetails,
-  TxDetailsRow,
-  TxDetailsTitle,
-} from './index.styled';
-
-enum Steps {
-  ConnectLedger = 0,
-  ExternalInputs = 0.5,
-  ConfirmTransaction = 1,
-  ConfirmFees = 1.5,
-  TransactionConfirmed = 2,
-}
-
-function ConfirmLedgerTransaction(): JSX.Element {
-  const [currentStep, setCurrentStep] = useState(Steps.ConnectLedger);
-  const [txId, setTxId] = useState<string | undefined>(undefined);
-
-  const [isButtonDisabled, setIsButtonDisabled] = useState(false);
-  const [isConnectSuccess, setIsConnectSuccess] = useState(false);
-  const [isConnectFailed, setIsConnectFailed] = useState(false);
-  const [isWrongDevice, setIsWrongDevice] = useState(false);
-  const [isTxApproved, setIsTxApproved] = useState(false);
-  const [isFinalTxApproved, setIsFinalTxApproved] = useState(false);
-  const [isTxRejected, setIsTxRejected] = useState(false);
-
-  const { t } = useTranslation('translation', { keyPrefix: 'LEDGER_CONFIRM_TRANSACTION_SCREEN' });
-  const location = useLocation();
-  const selectedNetwork = useNetworkSelector();
-
-  const selectedAccount = useSelectedAccount();
-  const { network } = useWalletSelector();
-
-  const btcClient = useBtcClient();
-
-  const {
-    recipients,
-    type,
-    unsignedTx,
-    ordinalUtxo,
-    feeRateInput,
-    fee,
-    tabId,
-    tabMessageId: messageId,
-  }: {
-    amount: BigNumber;
-    recipients: Recipient[] | StacksRecipient[];
-    type: LedgerTransactionType;
-    unsignedTx: Buffer;
-    ordinalUtxo?: UTXO;
-    feeRateInput?: string;
-    fee?: BigNumber;
-    messageId?: string;
-    tabId?: number;
-    tabMessageId?: string;
-  } = location.state;
-
-  const transition = useTransition(currentStep, DEFAULT_TRANSITION_OPTIONS);
-
-  const signAndBroadcastOrdinalsTx = async (transport: Transport, addressIndex: number) => {
-    try {
-      const result = await signLedgerMixedBtcTransaction({
-        transport,
-        esploraProvider: btcClient,
-        network: network.type,
-        addressIndex,
-        recipients: recipients as Recipient[],
-        feeRate: feeRateInput?.toString(),
-        ordinalUtxo,
-      });
-      const { value: psbtCreatedValue } = await result.next();
-
-      const { value: taprootSignedValue } = await result.next();
-      setIsTxApproved(true);
-      setCurrentStep(Steps.ConfirmFees);
-
-      const { value: txHex } = await result.next();
-      setIsFinalTxApproved(true);
-      await delay(1500);
-      const transactionId = await btcClient.sendRawTransaction(txHex || taprootSignedValue);
-      setTxId(transactionId.tx.hash);
-      setCurrentStep(Steps.TransactionConfirmed);
-      if (tabId) {
-        const response = makeRpcSuccessResponse(messageId, { txid: transactionId.tx.hash });
-        sendRpcResponse(tabId, response);
-      }
-    } catch (err) {
-      console.error(err);
-      setIsTxRejected(true);
-      setIsButtonDisabled(false);
-    } finally {
-      transport.close();
-    }
-  };
-
-  const signAndBroadcastBtcTx = async (transport: Transport, addressIndex: number) => {
-    try {
-      const result = await signLedgerNativeSegwitBtcTransaction({
-        transport,
-        esploraProvider: btcClient,
-        network: network.type,
-        addressIndex,
-        recipients: recipients as Recipient[],
-        feeRate: feeRateInput?.toString(),
-      });
-      setIsFinalTxApproved(true);
-      await delay(1500);
-      const transactionId = await btcClient.sendRawTransaction(result);
-      setTxId(transactionId.tx.hash);
-      setCurrentStep(Steps.TransactionConfirmed);
-      if (tabId) {
-        const response = makeRpcSuccessResponse(messageId, { txid: transactionId.tx.hash });
-        sendRpcResponse(tabId, response);
-      }
-    } catch (err) {
-      console.error(err);
-      setIsTxRejected(true);
-      setIsButtonDisabled(false);
-    } finally {
-      transport.close();
-    }
-  };
-
-  const signAndBroadcastStxTx = async (transport: Transport, addressIndex: number) => {
-    try {
-      const result = await signLedgerStxTransaction({
-        transport,
-        transactionBuffer: unsignedTx,
-        addressIndex,
-      });
-      setIsFinalTxApproved(true);
-      await delay(1500);
-      const transactionHash = await broadcastSignedTransaction(result, selectedNetwork);
-      setTxId(transactionHash);
-      setCurrentStep(Steps.TransactionConfirmed);
-    } catch (err) {
-      console.error(err);
-      setIsTxRejected(true);
-      setIsButtonDisabled(false);
-    } finally {
-      transport.close();
-    }
-  };
-
-  const handleConnectAndConfirm = async () => {
-    if (!selectedAccount) {
-      console.error('No account selected');
-      return;
-    }
-
-    try {
-      setIsButtonDisabled(true);
-
-      const transport = await Transport.create();
-
-      if (!transport) {
-        setIsConnectSuccess(false);
-        setIsConnectFailed(true);
-        setIsButtonDisabled(false);
-        return;
-      }
-
-      const addressIndex = selectedAccount.deviceAccountIndex;
-
-      if (addressIndex === undefined) {
-        setIsConnectSuccess(false);
-        setIsConnectFailed(true);
-        setIsWrongDevice(true);
-        setIsButtonDisabled(false);
-        return;
-      }
-
-      setIsConnectSuccess(true);
-      await delay(1500);
-
-      if (
-        type === 'ORDINALS' &&
-        currentStep !== Steps.ExternalInputs &&
-        currentStep !== Steps.ConfirmTransaction
-      ) {
-        setCurrentStep(Steps.ExternalInputs);
-        return;
-      }
-
-      if (currentStep !== Steps.ConfirmTransaction) {
-        setCurrentStep(Steps.ConfirmTransaction);
-      }
-
-      switch (type) {
-        case 'BTC':
-        case 'BRC-20':
-          await signAndBroadcastBtcTx(transport as Transport, addressIndex);
-          break;
-        case 'STX':
-          await signAndBroadcastStxTx(transport as Transport, addressIndex);
-          break;
-        case 'ORDINALS':
-          await signAndBroadcastOrdinalsTx(transport as Transport, addressIndex);
-          break;
-        default:
-          break;
-      }
-      await transport.close();
-    } catch (err) {
-      setIsConnectSuccess(false);
-      setIsConnectFailed(true);
-    } finally {
-      setIsButtonDisabled(false);
-    }
-  };
-
-  const goToConfirmationStep = () => {
-    setCurrentStep(Steps.ConfirmTransaction);
-
-    handleConnectAndConfirm();
-  };
-
-  const handleRetry = async () => {
-    setIsTxRejected(false);
-    setIsConnectSuccess(false);
-    setIsConnectFailed(false);
-    setIsWrongDevice(false);
-    setIsTxApproved(false);
-    setCurrentStep(Steps.ConnectLedger);
-  };
-
-  const handleClose = () => {
-    if (typeof window !== 'undefined') {
-      window.close();
-    }
-  };
-
-  const handleSeeTransaction = () => {
-    if (!txId) {
-      console.error('No txId found');
-      return;
-    }
-
-    switch (type) {
-      case 'BTC':
-      case 'BRC-20':
-        window.open(getBtcTxStatusUrl(txId, network), '_blank', 'noopener,noreferrer');
-        break;
-      case 'STX':
-        window.open(getStxTxStatusUrl(txId, network), '_blank', 'noopener,noreferrer');
-        break;
-      case 'ORDINALS':
-        window.open(getBtcTxStatusUrl(txId, network), '_blank', 'noopener,noreferrer');
-        break;
-      default:
-        break;
-    }
-  };
-
-  const renderTxDetails = () => (
-    <TxDetails>
-      <TxDetailsRow>
-        <TxDetailsTitle>Recipient{recipients.length > 1 ? 's' : ''}</TxDetailsTitle>
-        <RecipientsWrapper>
-          {recipients.map((recipient) => (
-            <div key={recipient.address}>{getTruncatedAddress(recipient.address)}</div>
-          ))}
-        </RecipientsWrapper>
-      </TxDetailsRow>
-      <TxDetailsRow>
-        <TxDetailsTitle>{ordinalUtxo?.value ? 'Ordinal value' : 'Amount'}</TxDetailsTitle>
-        {type === 'STX' ? (
-          <div>
-            {microstacksToStx((recipients[0] as StacksRecipient).amountMicrostacks).toString()} STX
-          </div>
-        ) : (
-          <div>
-            {ordinalUtxo?.value
-              ? satsToBtc(new BigNumber(ordinalUtxo?.value)).toString()
-              : satsToBtc((recipients[0] as Recipient).amountSats).toString()}{' '}
-            BTC
-          </div>
-        )}
-      </TxDetailsRow>
-      {fee && (
-        <TxDetailsRow>
-          <TxDetailsTitle>{t('FEES')}</TxDetailsTitle>
-          {type === 'STX' ? (
-            <div>{microstacksToStx(fee).toString()} STX</div>
-          ) : (
-            <div>{satsToBtc(fee).toString()} BTC</div>
-          )}
-        </TxDetailsRow>
-      )}
-    </TxDetails>
-  );
-
-  const renderOrdinalTxDetails = () => (
-    <>
-      <Stepper
-        steps={[
-          { title: t('SEND_ORDINAL'), isCompleted: isTxApproved },
-          { title: t('CONFIRM_FEES'), isCompleted: isFinalTxApproved },
-        ]}
-      />
-      {renderTxDetails()}
-    </>
-  );
-
-  const connectErrSubtitle =
-    type === 'STX' ? 'CONNECT.STX_ERROR_SUBTITLE' : 'CONNECT.BTC_ERROR_SUBTITLE';
-
-  const renderLedgerConfirmationView = () => {
-    switch (currentStep) {
-      case Steps.ConnectLedger:
-        return (
-          <div>
-            <LedgerConnectionView
-              title={t('CONNECT.TITLE')}
-              text={t(type === 'STX' ? 'CONNECT.STX_SUBTITLE' : 'CONNECT.BTC_SUBTITLE')}
-              titleFailed={t('CONNECT.ERROR_TITLE')}
-              textFailed={t(
-                isWrongDevice ? 'CONNECT.WRONG_DEVICE_ERROR_SUBTITLE' : connectErrSubtitle,
-              )}
-              imageDefault={type === 'STX' ? ledgerConnectStxIcon : ledgerConfirmBtcIcon}
-              isConnectSuccess={isConnectSuccess}
-              isConnectFailed={isConnectFailed}
-            />
-          </div>
-        );
-      case Steps.ExternalInputs:
-        if (isTxRejected || isConnectFailed) {
-          return (
-            <LedgerFailView title={t('CONFIRM.ERROR_TITLE')} text={t('CONFIRM.ERROR_SUBTITLE')} />
-          );
-        }
-
-        return (
-          <div>
-            <ConnectLedgerContainer>
-              <InfoImage src={InfoIcon} alt="external inputs warning" />
-              <ConnectLedgerTitle>{t('EXTERNAL_INPUTS.TITLE')}</ConnectLedgerTitle>
-              <ConnectLedgerText>{t('EXTERNAL_INPUTS.SUBTITLE')}</ConnectLedgerText>
-            </ConnectLedgerContainer>
-          </div>
-        );
-      case Steps.ConfirmTransaction:
-        if (type === 'ORDINALS') {
-          if (isTxRejected || isConnectFailed) {
-            return (
-              <LedgerFailView title={t('CONFIRM.ERROR_TITLE')} text={t('CONFIRM.ERROR_SUBTITLE')} />
-            );
-          }
-
-          return (
-            <ConnectLedgerContainer>
-              <ConfirmTxIconBig
-                src={ledgerConfirmOrdinalsIcon}
-                alt="confirm ordinal transfer tx on the ledger device"
-              />
-              <ConnectLedgerTitle>{t('CONFIRM.ORDINAL_TX.ORDINAL_TITLE')}</ConnectLedgerTitle>
-              <ConnectLedgerTextAdvanced isCompleted={isTxApproved}>
-                {t('CONFIRM.ORDINAL_TX.ORDINAL_SUBTITLE')}
-              </ConnectLedgerTextAdvanced>
-              {renderOrdinalTxDetails()}
-              <div />
-            </ConnectLedgerContainer>
-          );
-        }
-
-        return (
-          <div>
-            <LedgerConnectionView
-              title={t('CONFIRM.TITLE')}
-              text={t('CONFIRM.SUBTITLE')}
-              titleFailed={t('CONFIRM.ERROR_TITLE')}
-              textFailed={t('CONFIRM.ERROR_SUBTITLE')}
-              imageDefault={ledgerConnectDefaultIcon}
-              isConnectSuccess={isFinalTxApproved}
-              isConnectFailed={isTxRejected}
-            />
-            {renderTxDetails()}
-          </div>
-        );
-      case Steps.ConfirmFees:
-        if (type === 'ORDINALS') {
-          if (isTxRejected || isConnectFailed) {
-            return (
-              <LedgerFailView title={t('CONFIRM.ERROR_TITLE')} text={t('CONFIRM.ERROR_SUBTITLE')} />
-            );
-          }
-
-          return (
-            <ConnectLedgerContainer>
-              <ConfirmTxIconBig
-                src={ledgerConfirmBtcIcon}
-                alt="confirm btc fee tx on the ledger device"
-              />
-              <ConnectLedgerTitle>{t('CONFIRM.TITLE')}</ConnectLedgerTitle>
-              <ConnectLedgerTextAdvanced isCompleted={isFinalTxApproved}>
-                {t('CONFIRM.ORDINAL_TX.BTC_SUBTITLE')}
-              </ConnectLedgerTextAdvanced>
-              {renderOrdinalTxDetails()}
-              <div />
-            </ConnectLedgerContainer>
-          );
-        }
-        return null;
-      case Steps.TransactionConfirmed:
-        return (
-          <TxConfirmedContainer>
-            <img src={checkCircleIcon} alt="Success" />
-            <TxConfirmedTitle>{t('SUCCESS.TITLE')}</TxConfirmedTitle>
-            <TxConfirmedDescription>{t('SUCCESS.SUBTITLE')}</TxConfirmedDescription>
-            {type === 'BRC-20' && (
-              <InfoContainerWrapper>
-                <InfoContainer bodyText={t('SUCCESS.BRC20_INFO')} />
-              </InfoContainerWrapper>
-            )}
-          </TxConfirmedContainer>
-        );
-      default:
-        return null;
-    }
-  };
-
-  const renderLedgerConfirmationControls = () => {
-    switch (currentStep) {
-      case Steps.ExternalInputs:
-        if (isTxRejected || isConnectFailed) {
-          return (
-            <SuccessActionsContainer>
-              <ActionButton
-                onPress={handleRetry}
-                text={t('RETRY_BUTTON')}
-                disabled={isButtonDisabled}
-                processing={isButtonDisabled}
-              />
-              <ActionButton
-                transparent
-                onPress={handleClose}
-                text={t('CLOSE_BUTTON')}
-                disabled={isButtonDisabled}
-              />
-            </SuccessActionsContainer>
-          );
-        }
-
-        return (
-          <SuccessActionsContainer>
-            <ActionButton onPress={goToConfirmationStep} text={t('CONTINUE_BUTTON')} />
-          </SuccessActionsContainer>
-        );
-      case Steps.ConfirmTransaction:
-      case Steps.ConfirmFees:
-        if (type === 'ORDINALS' && !isTxRejected && !isConnectFailed) {
-          return (
-            <SuccessActionsContainer>
-              <ActionButton transparent onPress={handleClose} text={t('CANCEL_BUTTON')} />
-            </SuccessActionsContainer>
-          );
-        }
-
-        return (
-          <SuccessActionsContainer>
-            <ActionButton
-              onPress={isTxRejected || isConnectFailed ? handleRetry : handleConnectAndConfirm}
-              text={t(isTxRejected || isConnectFailed ? 'RETRY_BUTTON' : 'CONNECT_BUTTON')}
-              disabled={isButtonDisabled}
-              processing={isButtonDisabled}
-            />
-            <ActionButton
-              transparent
-              onPress={handleClose}
-              text={t(isTxRejected || isConnectFailed ? 'CLOSE_BUTTON' : 'CANCEL_BUTTON')}
-              disabled={isButtonDisabled}
-            />
-          </SuccessActionsContainer>
-        );
-      case Steps.TransactionConfirmed:
-        return (
-          <SuccessActionsContainer>
-            <ActionButton onPress={handleClose} text={t('CLOSE_BUTTON')} />
-            <ActionButton
-              transparent
-              onPress={handleSeeTransaction}
-              text={t('SEE_TRANSACTION_BUTTON')}
-            />
-          </SuccessActionsContainer>
-        );
-      default:
-        return (
-          <SuccessActionsContainer>
-            <ActionButton
-              onPress={isTxRejected || isConnectFailed ? handleRetry : handleConnectAndConfirm}
-              text={t(isTxRejected || isConnectFailed ? 'RETRY_BUTTON' : 'CONNECT_BUTTON')}
-              disabled={isButtonDisabled}
-              processing={isButtonDisabled}
-            />
-            <ActionButton
-              transparent
-              onPress={handleClose}
-              text={t('CANCEL_BUTTON')}
-              disabled={isButtonDisabled}
-            />
-          </SuccessActionsContainer>
-        );
-    }
-  };
-
-  return (
-    <Container>
-      <FullScreenHeader />
-      {transition((style) => (
-        <>
-          <OnBoardingContentContainer style={style}>
-            {renderLedgerConfirmationView()}
-          </OnBoardingContentContainer>
-          {renderLedgerConfirmationControls()}
-        </>
-      ))}
-    </Container>
-  );
-}
-
-export default ConfirmLedgerTransaction;
diff --git a/src/app/screens/signPsbtRequest/index.tsx b/src/app/screens/signPsbtRequest/index.tsx
index 4dfcad44d..4622f1c3f 100644
--- a/src/app/screens/signPsbtRequest/index.tsx
+++ b/src/app/screens/signPsbtRequest/index.tsx
@@ -64,9 +64,11 @@ function SignPsbtRequest() {
   }, [parsedPsbt]);
 
   const onConfirm = async (ledgerTransport?: Transport) => {
+    if (!parsedPsbt) return;
+
     setIsSigning(true);
     try {
-      const signedPsbt = await parsedPsbt?.getSignedPsbtBase64({
+      const signedPsbt = await parsedPsbt.getSignedPsbtBase64({
         finalize: payload.broadcast,
         ledgerTransport,
       });
diff --git a/src/app/screens/signPsbtRequest/useSignPsbt.ts b/src/app/screens/signPsbtRequest/useSignPsbt.ts
index a2288f6ef..6a73e6e49 100644
--- a/src/app/screens/signPsbtRequest/useSignPsbt.ts
+++ b/src/app/screens/signPsbtRequest/useSignPsbt.ts
@@ -10,9 +10,8 @@ import {
   type SignTransactionPayload,
 } from '@sats-connect/core';
 import {
+  base64ToHex,
   btcTransaction,
-  psbtBase64ToHex,
-  signPsbt,
   type InputToSign,
   type SettingsNetwork,
 } from '@secretkeylabs/xverse-core';
@@ -20,7 +19,6 @@ import { decodeToken } from 'jsontokens';
 import { useMemo } from 'react';
 import { useLocation } from 'react-router-dom';
 import useBtcClient from '../../hooks/apiClients/useBtcClient';
-import useSeedVault from '../../hooks/useSeedVault';
 
 const useSignPsbtParams = (network: SettingsNetwork) => {
   const { search } = useLocation();
@@ -70,8 +68,7 @@ const useSignPsbtParams = (network: SettingsNetwork) => {
 };
 
 const useSignPsbt = () => {
-  const { accountsList, network } = useWalletSelector();
-  const { getSeed } = useSeedVault();
+  const { network } = useWalletSelector();
   const btcClient = useBtcClient();
   const { payload, tabId, requestToken, requestId } = useSignPsbtParams(network);
 
@@ -86,27 +83,17 @@ const useSignPsbt = () => {
     }
   }, [txnContext, payload]);
 
-  const confirmSignPsbt = async (signingResponseOverride?: string) => {
-    let signingResponse = signingResponseOverride;
-    if (!signingResponse && payload) {
-      const seedPhrase = await getSeed();
-      signingResponse = await signPsbt(
-        seedPhrase,
-        accountsList,
-        payload.inputsToSign,
-        payload.psbtBase64,
-        payload.broadcast,
-        network.type,
-      );
-    }
+  const confirmSignPsbt = async (signingResponse: string) => {
+    if (!signingResponse) return;
 
     let txId: string = '';
+
     if (payload.broadcast && signingResponse) {
-      const txHex = psbtBase64ToHex(signingResponse);
+      const txHex = base64ToHex(signingResponse);
       const response = await btcClient.sendRawTransaction(txHex);
       txId = response.tx.hash;
     }
-    if (!signingResponse) return;
+
     if (requestToken) {
       const signingMessage = {
         source: MESSAGE_SOURCE,
@@ -128,6 +115,7 @@ const useSignPsbt = () => {
       const response = makeRpcSuccessResponse(requestId as string, result);
       sendRpcResponse(+tabId, response);
     }
+
     return {
       txId,
       signingResponse,
diff --git a/src/app/screens/speedUpTransaction/index.tsx b/src/app/screens/speedUpTransaction/index.tsx
index 4c0d4eb54..31561a046 100644
--- a/src/app/screens/speedUpTransaction/index.tsx
+++ b/src/app/screens/speedUpTransaction/index.tsx
@@ -19,6 +19,7 @@ import useRbfTransactionData, {
 } from '@hooks/useRbfTransactionData';
 import useSeedVault from '@hooks/useSeedVault';
 import useSelectedAccount from '@hooks/useSelectedAccount';
+import useTransactionContext from '@hooks/useTransactionContext';
 import useWalletSelector from '@hooks/useWalletSelector';
 import Transport from '@ledgerhq/hw-transport-webusb';
 import { CarProfile, Lightning, RocketLaunch, ShootingStar } from '@phosphor-icons/react';
@@ -77,6 +78,7 @@ function SpeedUpTransactionScreen() {
   const selectedStacksNetwork = useNetworkSelector();
   const isBtc = isBtcTransaction(stxTransaction || btcTransaction);
   const [isBroadcasting, setIsBroadcasting] = useState(false);
+  const transactionContext = useTransactionContext();
 
   const handleClickFeeButton = (e: React.MouseEvent<HTMLButtonElement>) => {
     if (e.currentTarget.value === 'custom') {
@@ -218,7 +220,7 @@ function SpeedUpTransactionScreen() {
       const signedTx = await rbfTransaction.getReplacementTransaction({
         feeRate: Number(feeRateInput),
         ledgerTransport: transport,
-        getSeedPhrase: getSeed,
+        context: transactionContext,
       });
 
       await btcClient.sendRawTransaction(signedTx.hex);
diff --git a/src/app/utils/currency.ts b/src/app/utils/currency.ts
index 5c898f6b8..98633356f 100644
--- a/src/app/utils/currency.ts
+++ b/src/app/utils/currency.ts
@@ -1,31 +1,31 @@
+import ARG from '@assets/img/settings/currencies/ars.svg';
+import AUS from '@assets/img/settings/currencies/aus.svg';
+import BRA from '@assets/img/settings/currencies/bra.svg';
 import CAN from '@assets/img/settings/currencies/can.svg';
+import CHE from '@assets/img/settings/currencies/che.svg';
 import CHN from '@assets/img/settings/currencies/chn.svg';
 import EU from '@assets/img/settings/currencies/eu.svg';
-import USA from '@assets/img/settings/currencies/usa.svg';
-import ARG from '@assets/img/settings/currencies/ars.svg';
-import KOR from '@assets/img/settings/currencies/kor.svg';
+import GBR from '@assets/img/settings/currencies/gbr.svg';
 import HKG from '@assets/img/settings/currencies/hkg.svg';
+import HUN from '@assets/img/settings/currencies/hun.svg';
+import IDN from '@assets/img/settings/currencies/idn.svg';
+import IND from '@assets/img/settings/currencies/ind.svg';
 import JPN from '@assets/img/settings/currencies/jpn.svg';
-import SGP from '@assets/img/settings/currencies/sgp.svg';
-import GBR from '@assets/img/settings/currencies/gbr.svg';
-import BRA from '@assets/img/settings/currencies/bra.svg';
-import RUS from '@assets/img/settings/currencies/rus.svg';
-import AUS from '@assets/img/settings/currencies/aus.svg';
+import KOR from '@assets/img/settings/currencies/kor.svg';
+import MEX from '@assets/img/settings/currencies/mex.svg';
+import MYS from '@assets/img/settings/currencies/mys.svg';
 import NGA from '@assets/img/settings/currencies/nga.svg';
-import TUR from '@assets/img/settings/currencies/tur.svg';
-import IND from '@assets/img/settings/currencies/ind.svg';
-import CHE from '@assets/img/settings/currencies/che.svg';
-import VNM from '@assets/img/settings/currencies/vnm.svg';
+import PAK from '@assets/img/settings/currencies/pak.svg';
+import PHL from '@assets/img/settings/currencies/phl.svg';
 import POL from '@assets/img/settings/currencies/pol.svg';
-import MYS from '@assets/img/settings/currencies/mys.svg';
-import TWN from '@assets/img/settings/currencies/twn.svg';
-import IDN from '@assets/img/settings/currencies/idn.svg';
-import HUN from '@assets/img/settings/currencies/hun.svg';
+import RUS from '@assets/img/settings/currencies/rus.svg';
+import SGP from '@assets/img/settings/currencies/sgp.svg';
 import THA from '@assets/img/settings/currencies/tha.svg';
-import PHL from '@assets/img/settings/currencies/phl.svg';
-import PAK from '@assets/img/settings/currencies/pak.svg';
+import TUR from '@assets/img/settings/currencies/tur.svg';
+import TWN from '@assets/img/settings/currencies/twn.svg';
+import USA from '@assets/img/settings/currencies/usa.svg';
+import VNM from '@assets/img/settings/currencies/vnm.svg';
 import ZAF from '@assets/img/settings/currencies/zaf.svg';
-import MEX from '@assets/img/settings/currencies/mex.svg';
 
 import type { SupportedCurrency } from '@secretkeylabs/xverse-core';
 
@@ -35,32 +35,32 @@ export interface Currency {
 }
 
 export const currencyList: Currency[] = [
-  { name: 'CAD', isoFlag: CAN },    // Canada
-  { name: 'CNY', isoFlag: CHN },    // China
-  { name: 'EUR', isoFlag: EU },     // Eurozone
-  { name: 'USD', isoFlag: USA },    // United States
-  { name: 'ARS', isoFlag: ARG },    // Argentina
-  { name: 'KRW', isoFlag: KOR },    // South Korea
-  { name: 'HKD', isoFlag: HKG },    // Hong Kong
-  { name: 'JPY', isoFlag: JPN },    // Japan
-  { name: 'SGD', isoFlag: SGP },    // Singapore
-  { name: 'GBP', isoFlag: GBR },    // United Kingdom
-  { name: 'BRL', isoFlag: BRA },    // Brazil
-  { name: 'RUB', isoFlag: RUS },    // Russia
-  { name: 'AUD', isoFlag: AUS },    // Australia
-  { name: 'NGN', isoFlag: NGA },    // Nigeria
-  { name: 'TRY', isoFlag: TUR },    // Turkey
-  { name: 'INR', isoFlag: IND },    // India
-  { name: 'CHF', isoFlag: CHE },    // Switzerland
-  { name: 'VND', isoFlag: VNM },    // Vietnam
-  { name: 'PLN', isoFlag: POL },    // Poland
-  { name: 'MYR', isoFlag: MYS },    // Malaysia
-  { name: 'TWD', isoFlag: TWN },    // Taiwan
-  { name: 'IDR', isoFlag: IDN },    // Indonesia
-  { name: 'HUF', isoFlag: HUN },    // Hungary
-  { name: 'THB', isoFlag: THA },    // Thailand
-  { name: 'PHP', isoFlag: PHL },    // Philippines
-  { name: 'PKR', isoFlag: PAK },    // Pakistan
-  { name: 'ZAR', isoFlag: ZAF },    // South Africa
-  { name: 'MXN', isoFlag: MEX },    // Mexico
+  { name: 'CAD', isoFlag: CAN }, // Canada
+  { name: 'CNY', isoFlag: CHN }, // China
+  { name: 'EUR', isoFlag: EU }, // Eurozone
+  { name: 'USD', isoFlag: USA }, // United States
+  { name: 'ARS', isoFlag: ARG }, // Argentina
+  { name: 'KRW', isoFlag: KOR }, // South Korea
+  { name: 'HKD', isoFlag: HKG }, // Hong Kong
+  { name: 'JPY', isoFlag: JPN }, // Japan
+  { name: 'SGD', isoFlag: SGP }, // Singapore
+  { name: 'GBP', isoFlag: GBR }, // United Kingdom
+  { name: 'BRL', isoFlag: BRA }, // Brazil
+  { name: 'RUB', isoFlag: RUS }, // Russia
+  { name: 'AUD', isoFlag: AUS }, // Australia
+  { name: 'NGN', isoFlag: NGA }, // Nigeria
+  { name: 'TRY', isoFlag: TUR }, // Turkey
+  { name: 'INR', isoFlag: IND }, // India
+  { name: 'CHF', isoFlag: CHE }, // Switzerland
+  { name: 'VND', isoFlag: VNM }, // Vietnam
+  { name: 'PLN', isoFlag: POL }, // Poland
+  { name: 'MYR', isoFlag: MYS }, // Malaysia
+  { name: 'TWD', isoFlag: TWN }, // Taiwan
+  { name: 'IDR', isoFlag: IDN }, // Indonesia
+  { name: 'HUF', isoFlag: HUN }, // Hungary
+  { name: 'THB', isoFlag: THA }, // Thailand
+  { name: 'PHP', isoFlag: PHL }, // Philippines
+  { name: 'PKR', isoFlag: PAK }, // Pakistan
+  { name: 'ZAR', isoFlag: ZAF }, // South Africa
+  { name: 'MXN', isoFlag: MEX }, // Mexico
 ];
diff --git a/src/common/types/ledger.ts b/src/common/types/ledger.ts
index 2ed0fe32f..5022b9df3 100644
--- a/src/common/types/ledger.ts
+++ b/src/common/types/ledger.ts
@@ -1,14 +1,8 @@
 import type { StacksRecipient } from '@secretkeylabs/xverse-core';
 import BigNumber from 'bignumber.js';
 
-export type LedgerTransactionType = 'BTC' | 'STX' | 'ORDINALS' | 'BRC-20';
-
-type ConfirmLedgerTransactionState = {
-  type: LedgerTransactionType;
-  fee: BigNumber;
-};
-
-export type ConfirmStxTransactionState = ConfirmLedgerTransactionState & {
+export type ConfirmStxTransactionState = {
   recipients: StacksRecipient[];
   unsignedTx: Buffer;
+  fee: BigNumber;
 };
diff --git a/src/locales/en.json b/src/locales/en.json
index ac0a420d5..d5b96b60c 100644
--- a/src/locales/en.json
+++ b/src/locales/en.json
@@ -198,7 +198,8 @@
     "SEND_ORDINAL": "Send ordinal",
     "CONFIRM_FEES": "Confirm fees",
     "RETRY_BUTTON": "Try again",
-    "FEES": "Fees"
+    "FEES": "Fees",
+    "AMOUNT": "Amount"
   },
   "DASHBOARD_SCREEN": {
     "TOTAL_BALANCE": "total balance",

From 24a06581bb8b7448fd207a16bea6843447fec9d7 Mon Sep 17 00:00:00 2001
From: GitHub Actions Bot <>
Date: Fri, 4 Oct 2024 10:39:36 +0000
Subject: [PATCH 157/227] release: v0.43.1

---
 package-lock.json | 4 ++--
 package.json      | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index bc96e7796..036ef825f 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "xverse-web-extension",
-  "version": "0.43.0",
+  "version": "0.43.1",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "xverse-web-extension",
-      "version": "0.43.0",
+      "version": "0.43.1",
       "dependencies": {
         "@aryzing/superqs": "0.0.6",
         "@ledgerhq/hw-transport-webusb": "^6.27.13",
diff --git a/package.json b/package.json
index 26075e48a..388dfcee0 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "xverse-web-extension",
   "description": "A Bitcoin wallet for Web3",
-  "version": "0.43.0",
+  "version": "0.43.1",
   "private": true,
   "engines": {
     "node": "^18.18.2"

From 40026299fe9ed41f48e8b272a502fee11ae9fe75 Mon Sep 17 00:00:00 2001
From: Victor Kirov <victor.kirov@gmail.com>
Date: Fri, 4 Oct 2024 14:10:55 +0300
Subject: [PATCH 158/227] [ENG-5371] Fix view summary compilation (#656)

* [ENG-5371] Fix view summary compilation

* Bump core

* Set exact core version
---
 package-lock.json                                  | 14 +++++++-------
 package.json                                       |  2 +-
 .../confirmBtcTransaction/indexBatch.tsx           |  8 ++------
 3 files changed, 10 insertions(+), 14 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 036ef825f..912fa9d41 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -14,7 +14,7 @@
         "@playwright/test": "1.46.1",
         "@react-spring/web": "^9.6.1",
         "@sats-connect/core": "0.3.0",
-        "@secretkeylabs/xverse-core": "23.0.0",
+        "@secretkeylabs/xverse-core": "23.0.3",
         "@stacks/connect": "7.4.1",
         "@stacks/stacks-blockchain-api-types": "6.1.1",
         "@stacks/transactions": "6.16.1",
@@ -1270,9 +1270,9 @@
       }
     },
     "node_modules/@secretkeylabs/xverse-core": {
-      "version": "23.0.0",
-      "resolved": "https://npm.pkg.github.com/download/@secretkeylabs/xverse-core/23.0.0/d5f2b2868344504e3933bca5efca5ff67331e192",
-      "integrity": "sha512-jXkrCtO7aRCBerbz0ktO+1oHiDy8Ef0eMoXQe+YExxba1kVgSh5XevDRXT8vtzf5SQKr7Kg4thxhnMbQ9UofSg==",
+      "version": "23.0.3",
+      "resolved": "https://npm.pkg.github.com/download/@secretkeylabs/xverse-core/23.0.3/e3c8b17a2e4b4e9441a94c2420663e488361115d",
+      "integrity": "sha512-ZIY0CopXhQEANJOtey89lo5MAnIBRmrFhJiPMVNPuLreznM4polvP683LCzDrbK2wdsQaeeK9JNi48zggJ/cng==",
       "license": "ISC",
       "dependencies": {
         "@bitcoinerlab/secp256k1": "^1.0.2",
@@ -13635,9 +13635,9 @@
       }
     },
     "@secretkeylabs/xverse-core": {
-      "version": "23.0.0",
-      "resolved": "https://npm.pkg.github.com/download/@secretkeylabs/xverse-core/23.0.0/d5f2b2868344504e3933bca5efca5ff67331e192",
-      "integrity": "sha512-jXkrCtO7aRCBerbz0ktO+1oHiDy8Ef0eMoXQe+YExxba1kVgSh5XevDRXT8vtzf5SQKr7Kg4thxhnMbQ9UofSg==",
+      "version": "23.0.3",
+      "resolved": "https://npm.pkg.github.com/download/@secretkeylabs/xverse-core/23.0.3/e3c8b17a2e4b4e9441a94c2420663e488361115d",
+      "integrity": "sha512-ZIY0CopXhQEANJOtey89lo5MAnIBRmrFhJiPMVNPuLreznM4polvP683LCzDrbK2wdsQaeeK9JNi48zggJ/cng==",
       "requires": {
         "@bitcoinerlab/secp256k1": "^1.0.2",
         "@noble/curves": "^1.2.0",
diff --git a/package.json b/package.json
index 388dfcee0..4221d0ffe 100644
--- a/package.json
+++ b/package.json
@@ -42,7 +42,7 @@
     "@playwright/test": "1.46.1",
     "@react-spring/web": "^9.6.1",
     "@sats-connect/core": "0.3.0",
-    "@secretkeylabs/xverse-core": "23.0.0",
+    "@secretkeylabs/xverse-core": "23.0.3",
     "@stacks/connect": "7.4.1",
     "@stacks/stacks-blockchain-api-types": "6.1.1",
     "@stacks/transactions": "6.16.1",
diff --git a/src/app/components/confirmBtcTransaction/indexBatch.tsx b/src/app/components/confirmBtcTransaction/indexBatch.tsx
index 59ae5d412..b001b4a3c 100644
--- a/src/app/components/confirmBtcTransaction/indexBatch.tsx
+++ b/src/app/components/confirmBtcTransaction/indexBatch.tsx
@@ -1,8 +1,7 @@
 import useTransactionContext from '@hooks/useTransactionContext';
 import useWalletSelector from '@hooks/useWalletSelector';
 import {
-  compileAggregatedSummary,
-  compileUserTransactionSummary,
+  compileViewSummary,
   parseSummaryForRunes,
   type AggregatedSummary,
   type BaseSummary,
@@ -67,10 +66,7 @@ function ConfirmBatchBtcTransactions({ summaries }: Props) {
       };
 
       setAggregatedParsedTxSummaryContext({
-        extractedTxSummary:
-          base.isFinal && !base.hasExternalInputs
-            ? compileUserTransactionSummary(txnContext, summary, runeSummary, base)
-            : compileAggregatedSummary(txnContext, summary, runeSummary, base),
+        extractedTxSummary: compileViewSummary(txnContext, summary, runeSummary, base),
         batchMintDetails: summaries.map((psbt) => psbt.extractedSummary.runes.mint).flat(),
       });
     })();

From 70527826d60ab932c1c4808d339481e58531ac62 Mon Sep 17 00:00:00 2001
From: Christos Maris <christos@secretkeylabs.com>
Date: Tue, 1 Oct 2024 14:06:48 +0300
Subject: [PATCH 159/227] [ENG-5340] Export necessary functionality from the
 extension to core

---
 .../marketplaceRuneListingResults.tsx         | 24 +++++++++----------
 src/app/utils/constants.ts                    |  2 --
 2 files changed, 12 insertions(+), 14 deletions(-)

diff --git a/src/app/screens/transactionStatus/marketplaceRuneListingResults.tsx b/src/app/screens/transactionStatus/marketplaceRuneListingResults.tsx
index edaa7694d..990f12f31 100644
--- a/src/app/screens/transactionStatus/marketplaceRuneListingResults.tsx
+++ b/src/app/screens/transactionStatus/marketplaceRuneListingResults.tsx
@@ -2,15 +2,18 @@ import CheckCircle from '@assets/img/listings/CheckCircle.svg';
 import XCircle from '@assets/img/listings/XCircle.svg';
 import TokenImage from '@components/tokenImage';
 import { ArrowUpRight } from '@phosphor-icons/react';
-import type { FungibleToken, ListingProvider, Marketplace } from '@secretkeylabs/xverse-core';
+import {
+  marketplaceRuneDashboardUrl,
+  type FungibleToken,
+  type ListingProvider,
+} from '@secretkeylabs/xverse-core';
 import { StyledP } from '@ui-library/common.styled';
-import { MAGIC_EDEN_RUNES_URL, OKX_RUNES_URL, UNISAT_RUNES_URL } from '@utils/constants';
 import { formatNumber } from '@utils/helper';
 import { useTranslation } from 'react-i18next';
 import styled from 'styled-components';
 import theme from 'theme';
 
-const Container = styled.div<{ $successful: boolean }>`
+const Container = styled.div<{ $successful: boolean; $enabled: boolean }>`
   display: flex;
   align-items: center;
   flex-direction: row;
@@ -25,7 +28,7 @@ const Container = styled.div<{ $successful: boolean }>`
   transition: background-color 0.1s ease, border-color 0.1s ease;
   width: 100%;
   gap: 10px;
-  cursor: ${(props) => (props.$successful ? 'pointer' : 'auto')};
+  cursor: ${(props) => (props.$enabled ? 'pointer' : 'auto')};
 `;
 
 const RowCenter = styled.div({
@@ -56,19 +59,16 @@ function MarketplaceRuneListingResult({ minPriceSats, marketplace, rune, success
   const { t } = useTranslation('translation', { keyPrefix: 'LIST_RUNE_SCREEN' });
   const floorPrice = formatNumber(minPriceSats);
 
-  const marketplaceToUrl: { [key in Marketplace]: string } = {
-    'Magic Eden': `${MAGIC_EDEN_RUNES_URL}/${rune.name}`,
-    Unisat: `${UNISAT_RUNES_URL}/market?tick=${rune.name}`,
-    OKX: `${OKX_RUNES_URL}/token/${rune.name}/${rune.ticker}`,
-  };
+  const marketplaceUrl = marketplaceRuneDashboardUrl(rune, marketplace.name);
+  const enabled = successful && !!marketplaceUrl;
 
-  const handleClick = () =>
-    successful && window.open(marketplaceToUrl[marketplace.name], '_blank', 'noopener,noreferrer');
+  const handleClick = () => enabled && window.open(marketplaceUrl, '_blank', 'noopener,noreferrer');
 
   return (
     <Container
       data-testid="marketplace-listing-result"
       $successful={successful}
+      $enabled={enabled}
       onClick={handleClick}
     >
       <div style={{ marginRight: theme.space.s }}>
@@ -102,7 +102,7 @@ function MarketplaceRuneListingResult({ minPriceSats, marketplace, rune, success
           </SubtitleContainer>
         </RowCenter>
       </InfoContainer>
-      {successful && <ArrowUpRight size="16" color={theme.colors.white_0} />}
+      {enabled && <ArrowUpRight size="16" color={theme.colors.white_0} />}
     </Container>
   );
 }
diff --git a/src/app/utils/constants.ts b/src/app/utils/constants.ts
index 1cd4105a8..971e2eff7 100644
--- a/src/app/utils/constants.ts
+++ b/src/app/utils/constants.ts
@@ -35,8 +35,6 @@ export const MIX_PANEL_TOKEN = process.env.MIX_PANEL_TOKEN;
 export const MIX_PANEL_EXPLORE_APP_TOKEN = process.env.MIX_PANEL_EXPLORE_APP_TOKEN;
 
 export const MAGIC_EDEN_RUNES_URL = 'https://magiceden.io/runes';
-export const UNISAT_RUNES_URL = 'https://unisat.io/runes';
-export const OKX_RUNES_URL = 'https://www.okx.com/web3/marketplace/runes';
 
 export type CurrencyTypes = 'STX' | 'BTC' | 'FT' | 'NFT' | 'Ordinal' | 'brc20-Ordinal' | 'RareSat';
 export enum LoaderSize {

From 6db827ac4d8cf1780e8fdc67ff0349886410539a Mon Sep 17 00:00:00 2001
From: Christos Maris <christos@secretkeylabs.com>
Date: Tue, 1 Oct 2024 16:33:17 +0300
Subject: [PATCH 160/227] [ENG-5333] Update Batch PSBT Signing Screen for
 Single PSBT

---
 src/app/components/batchPsbtSigning/index.tsx | 59 ++++++++++++-------
 src/locales/en.json                           |  1 +
 2 files changed, 39 insertions(+), 21 deletions(-)

diff --git a/src/app/components/batchPsbtSigning/index.tsx b/src/app/components/batchPsbtSigning/index.tsx
index 8cbf51b0c..18a34d7cd 100644
--- a/src/app/components/batchPsbtSigning/index.tsx
+++ b/src/app/components/batchPsbtSigning/index.tsx
@@ -59,7 +59,8 @@ function BatchPsbtSigning({ onSigned, psbts, onCancel }: BatchPsbtSigningProps)
   const [isSigningComplete, setIsSigningComplete] = useState(false);
   const [signingPsbtIndex, setSigningPsbtIndex] = useState(1);
   const [currentPsbtIndex, setCurrentPsbtIndex] = useState(0);
-  const [reviewTransaction, setReviewTransaction] = useState(false);
+  const singlePsbt = psbts.length === 1;
+  const [reviewTransaction, setReviewTransaction] = useState(singlePsbt);
   const [isLoading, setIsLoading] = useState(true);
   const txnContext = useTransactionContext();
   useTrackMixPanelPageViewed();
@@ -256,13 +257,36 @@ function BatchPsbtSigning({ onSigned, psbts, onCancel }: BatchPsbtSigningProps)
     );
   };
 
-  const reviewDoneText = hasDuplicateInputs ? t('CONFIRM_ALL') : t('DONE');
-  const onReviewDone = hasDuplicateInputs
-    ? onSignPsbtConfirmed
-    : () => {
-        setReviewTransaction(false);
-        setCurrentPsbtIndex(0);
-      };
+  const modalOnClose =
+    singlePsbt || hasDuplicateInputs
+      ? onCancel
+      : () => {
+          setReviewTransaction(false);
+          setCurrentPsbtIndex(0);
+        };
+
+  const reviewTitle = singlePsbt
+    ? t('SIGN_TRANSACTION')
+    : `${t('TRANSACTION')} ${currentPsbtIndex + 1}/${parsedPsbts.length}`;
+  const reviewBackText = singlePsbt ? t('CANCEL') : t('PREVIOUS');
+  const reviewBackIcon = singlePsbt ? null : <ArrowLeft color="white" size={16} weight="bold" />;
+  const reviewBackDisabled = singlePsbt ? false : currentPsbtIndex === 0;
+  const onReviewBackClick = singlePsbt
+    ? onCancel
+    : () => setCurrentPsbtIndex((prevIndex) => prevIndex - 1);
+
+  const reviewDoneText = hasDuplicateInputs
+    ? t('CONFIRM_ALL')
+    : singlePsbt
+    ? t('CONFIRM')
+    : t('DONE');
+  const onReviewDone =
+    hasDuplicateInputs || singlePsbt
+      ? onSignPsbtConfirmed
+      : () => {
+          setReviewTransaction(false);
+          setCurrentPsbtIndex(0);
+        };
 
   return (
     <>
@@ -271,16 +295,11 @@ function BatchPsbtSigning({ onSigned, psbts, onCancel }: BatchPsbtSigningProps)
       <StyledSheet
         header=""
         visible={reviewTransaction || hasDuplicateInputs}
-        onClose={() => {
-          setReviewTransaction(false);
-          setCurrentPsbtIndex(0);
-        }}
+        onClose={modalOnClose}
       >
         <OuterContainer>
           <ModalContainer>
-            <ReviewTransactionText>
-              {t('TRANSACTION')} {currentPsbtIndex + 1}/{parsedPsbts.length}
-            </ReviewTransactionText>
+            <ReviewTransactionText>{reviewTitle}</ReviewTransactionText>
             {!!parsedPsbts[currentPsbtIndex] && (
               <TxSummaryContext.Provider value={individualTxSummaryContext}>
                 <TransactionSummary />
@@ -290,13 +309,11 @@ function BatchPsbtSigning({ onSigned, psbts, onCancel }: BatchPsbtSigningProps)
         </OuterContainer>
         <TxReviewModalControls>
           <Button
-            title={t('PREVIOUS')}
+            title={reviewBackText}
             variant="secondary"
-            onClick={() => {
-              setCurrentPsbtIndex((prevIndex) => prevIndex - 1);
-            }}
-            icon={<ArrowLeft color="white" size={16} weight="bold" />}
-            disabled={currentPsbtIndex === 0}
+            onClick={onReviewBackClick}
+            icon={reviewBackIcon}
+            disabled={reviewBackDisabled}
           />
           {currentPsbtIndex < parsedPsbts.length - 1 && (
             <Button
diff --git a/src/locales/en.json b/src/locales/en.json
index d5b96b60c..0b983b90d 100644
--- a/src/locales/en.json
+++ b/src/locales/en.json
@@ -349,6 +349,7 @@
     "BUNDLE_PLUS_FEES": "Bundle size + fees",
     "REVIEW_TRANSACTION": "Review transaction",
     "SIGN_TRANSACTIONS": "Sign {{count}} transactions",
+    "SIGN_TRANSACTION": "Sign transaction",
     "AMOUNT": "Amount",
     "INSUFFICIENT_BALANCE": "Insufficient balance",
     "YOUR_ADDRESS": "My address",

From 3c10cd5f2c7a32178af0807554a371a3deb61115 Mon Sep 17 00:00:00 2001
From: fede erbes <fedeerbes@gmail.com>
Date: Fri, 4 Oct 2024 20:37:34 +0200
Subject: [PATCH 161/227] fix: infinit loop by avoiding the usage of objects in
 deps array (#659)

---
 src/app/screens/listRune/index.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/app/screens/listRune/index.tsx b/src/app/screens/listRune/index.tsx
index 100c38e15..78de20cd7 100644
--- a/src/app/screens/listRune/index.tsx
+++ b/src/app/screens/listRune/index.tsx
@@ -287,7 +287,7 @@ export default function ListRuneScreen() {
         ),
       });
     }
-  }, [listItemsResponse, runeFloorPrice, location.state, selectedRune]);
+  }, [listItemsResponse.length, runeFloorPrice, location.state, selectedRune?.decimals]);
 
   useEffect(() => {
     if (signPsbtPayload) {

From b8dc9040a00c6a91a472d07d4256d80bcb9845f8 Mon Sep 17 00:00:00 2001
From: Victor Kirov <victor.kirov@gmail.com>
Date: Mon, 7 Oct 2024 09:10:04 +0300
Subject: [PATCH 162/227] Bump core to resolve merge conflicts

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

diff --git a/package-lock.json b/package-lock.json
index 912fa9d41..5613ad1b8 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -14,7 +14,7 @@
         "@playwright/test": "1.46.1",
         "@react-spring/web": "^9.6.1",
         "@sats-connect/core": "0.3.0",
-        "@secretkeylabs/xverse-core": "23.0.3",
+        "@secretkeylabs/xverse-core": "24.1.0",
         "@stacks/connect": "7.4.1",
         "@stacks/stacks-blockchain-api-types": "6.1.1",
         "@stacks/transactions": "6.16.1",
@@ -1270,9 +1270,9 @@
       }
     },
     "node_modules/@secretkeylabs/xverse-core": {
-      "version": "23.0.3",
-      "resolved": "https://npm.pkg.github.com/download/@secretkeylabs/xverse-core/23.0.3/e3c8b17a2e4b4e9441a94c2420663e488361115d",
-      "integrity": "sha512-ZIY0CopXhQEANJOtey89lo5MAnIBRmrFhJiPMVNPuLreznM4polvP683LCzDrbK2wdsQaeeK9JNi48zggJ/cng==",
+      "version": "24.1.0",
+      "resolved": "https://npm.pkg.github.com/download/@secretkeylabs/xverse-core/24.1.0/0c57f062dd3c9444e284d101756658251fd8681d",
+      "integrity": "sha512-cc01cykJV5YQhAc09VHwD8Iw7voQ+lqBzZWMJ+B5EXasi97O+dEP80JQs2RCpV2MfdsakZO+9JCweP331UqUbw==",
       "license": "ISC",
       "dependencies": {
         "@bitcoinerlab/secp256k1": "^1.0.2",
@@ -13635,9 +13635,9 @@
       }
     },
     "@secretkeylabs/xverse-core": {
-      "version": "23.0.3",
-      "resolved": "https://npm.pkg.github.com/download/@secretkeylabs/xverse-core/23.0.3/e3c8b17a2e4b4e9441a94c2420663e488361115d",
-      "integrity": "sha512-ZIY0CopXhQEANJOtey89lo5MAnIBRmrFhJiPMVNPuLreznM4polvP683LCzDrbK2wdsQaeeK9JNi48zggJ/cng==",
+      "version": "24.1.0",
+      "resolved": "https://npm.pkg.github.com/download/@secretkeylabs/xverse-core/24.1.0/0c57f062dd3c9444e284d101756658251fd8681d",
+      "integrity": "sha512-cc01cykJV5YQhAc09VHwD8Iw7voQ+lqBzZWMJ+B5EXasi97O+dEP80JQs2RCpV2MfdsakZO+9JCweP331UqUbw==",
       "requires": {
         "@bitcoinerlab/secp256k1": "^1.0.2",
         "@noble/curves": "^1.2.0",
diff --git a/package.json b/package.json
index 4221d0ffe..bdae4111e 100644
--- a/package.json
+++ b/package.json
@@ -42,7 +42,7 @@
     "@playwright/test": "1.46.1",
     "@react-spring/web": "^9.6.1",
     "@sats-connect/core": "0.3.0",
-    "@secretkeylabs/xverse-core": "23.0.3",
+    "@secretkeylabs/xverse-core": "24.1.0",
     "@stacks/connect": "7.4.1",
     "@stacks/stacks-blockchain-api-types": "6.1.1",
     "@stacks/transactions": "6.16.1",

From 990cd55546db9440f04425079cf1dcc0b3eb5e7b Mon Sep 17 00:00:00 2001
From: Mahmoud Aboelenein <mahmoud@secretkeylabs.com>
Date: Mon, 7 Oct 2024 11:53:34 +0300
Subject: [PATCH 163/227] disable injecting inpage into iframes

---
 src/manifest.json | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/manifest.json b/src/manifest.json
index 33670d842..7a6f07ffd 100644
--- a/src/manifest.json
+++ b/src/manifest.json
@@ -16,7 +16,6 @@
   "icons": {
     "128": "xverse_icon.png"
   },
-  "devtools_page": "devtools.html",
   "web_accessible_resources": [{ "resources": ["inpage.js"], "matches": ["*://*/*"] }],
   "host_permissions": ["*://*/*"],
   "permissions": ["storage", "tabs"],
@@ -27,8 +26,7 @@
     {
       "run_at": "document_start",
       "js": ["browser-polyfill.js", "content-script.js"],
-      "matches": ["*://*/*"],
-      "all_frames": true
+      "matches": ["*://*/*"]
     }
   ]
 }

From 4ebe56cd3c8e307f384793b0ceedc60c25a6d94b Mon Sep 17 00:00:00 2001
From: Den <36603049+dhriaznov@users.noreply.github.com>
Date: Mon, 7 Oct 2024 11:14:23 +0200
Subject: [PATCH 164/227] [ENG-5332] Fix text alignment and font issue when
 adding Ledger in UI (#635)

* [ENG-5332] Fix text alignment and font issue when adding Ledger in UI

* Add condition for the border-radius

* Make some tweaks
---
 .../ledger/ledgerAssetSelectCard/index.tsx    |  5 +-
 src/app/components/screenContainer/index.tsx  |  3 +-
 .../importLedgerAccount/steps/index.styled.ts | 87 ++++++++++---------
 .../importLedgerAccount/steps/index.tsx       | 16 ++--
 src/locales/en.json                           |  6 +-
 5 files changed, 59 insertions(+), 58 deletions(-)

diff --git a/src/app/components/ledger/ledgerAssetSelectCard/index.tsx b/src/app/components/ledger/ledgerAssetSelectCard/index.tsx
index 686000cf3..b880faed6 100644
--- a/src/app/components/ledger/ledgerAssetSelectCard/index.tsx
+++ b/src/app/components/ledger/ledgerAssetSelectCard/index.tsx
@@ -12,11 +12,10 @@ const CardContainer = styled.button((props) => ({
   transition: 'background 0.1s ease, border 0.1s ease',
   textAlign: 'left',
   color: props.theme.colors.white_0,
-  background:
-    props.className === 'checked' ? props.theme.colors.background.selectBackground : 'transparent',
+  background: props.theme.colors.elevation1,
   borderRadius: props.theme.radius(2),
   border: `1px solid ${
-    props.className === 'checked' ? props.theme.colors.border.select : props.theme.colors.white_900
+    props.className === 'checked' ? '#7383ff4d' : props.theme.colors.elevation1
   }`,
   userSelect: 'none',
 }));
diff --git a/src/app/components/screenContainer/index.tsx b/src/app/components/screenContainer/index.tsx
index 031ecc263..56e97efa9 100644
--- a/src/app/components/screenContainer/index.tsx
+++ b/src/app/components/screenContainer/index.tsx
@@ -13,7 +13,7 @@ const RouteContainer = styled.div`
   width: 360px;
   margin: auto;
   background-color: ${(props) => props.theme.colors.elevation0};
-  border: 1px solid rgba(126, 137, 171, 0.2);
+  border: 1px solid ${(props) => props.theme.colors.elevation2};
   box-shadow: 0px 8px 28px rgba(0, 0, 0, 0.35);
 
   // set some basic responsive properties here for when we load routes
@@ -23,6 +23,7 @@ const RouteContainer = styled.div`
     min-height: 600px;
     max-height: unset;
     height: auto;
+    border-radius: ${(props) => props.theme.radius(2)}px;
   }
 `;
 
diff --git a/src/app/screens/ledger/importLedgerAccount/steps/index.styled.ts b/src/app/screens/ledger/importLedgerAccount/steps/index.styled.ts
index fd2e41104..edfbca5b1 100644
--- a/src/app/screens/ledger/importLedgerAccount/steps/index.styled.ts
+++ b/src/app/screens/ledger/importLedgerAccount/steps/index.styled.ts
@@ -16,7 +16,7 @@ export const ImportBeforeStartContainer = styled.div((props) => ({
   flexDirection: 'column',
   alignItems: 'center',
   maxWidth: '328px',
-  paddingTop: props.theme.spacing(16),
+  paddingTop: props.theme.space.xl,
 }));
 
 export const ImportStartTitle = styled.h1((props) => ({
@@ -27,8 +27,8 @@ export const ImportStartTitle = styled.h1((props) => ({
 export const ImportStartText = styled.p((props) => ({
   ...props.theme.body_m,
   textAlign: 'center',
-  marginTop: props.theme.spacing(6),
-  color: props.theme.colors.white[200],
+  marginTop: props.theme.space.s,
+  color: props.theme.colors.white_200,
 }));
 
 export const ImportBeforeStartTitle = styled.h1((props) => ({
@@ -40,22 +40,22 @@ export const ImportBeforeStartTitle = styled.h1((props) => ({
 export const ImportBeforeStartText = styled.p((props) => ({
   ...props.theme.body_m,
   textAlign: 'left',
-  marginTop: props.theme.spacing(6),
-  color: props.theme.colors.white[200],
+  marginTop: props.theme.space.s,
+  color: props.theme.colors.white_200,
 }));
 
 export const ImportCardContainer = styled.div((props) => ({
   display: 'flex',
   flexDirection: 'column',
-  gap: props.theme.spacing(6),
+  gap: props.theme.space.s,
 }));
 
 export const SelectAssetTextContainer = styled.div((props) => ({
-  marginTop: props.theme.spacing(20),
-  marginBottom: props.theme.spacing(16),
+  marginTop: props.theme.space.xxl,
+  marginBottom: props.theme.space.xl,
   display: 'flex',
   flexDirection: 'column',
-  gap: props.theme.spacing(6),
+  gap: props.theme.space.s,
 }));
 
 export const SelectAssetTitle = styled.h1((props) => ({
@@ -65,40 +65,40 @@ export const SelectAssetTitle = styled.h1((props) => ({
 export const SelectAssetText = styled.p<{
   centered?: boolean;
 }>((props) => ({
-  ...props.theme.body_m,
-  color: props.theme.colors.white[200],
+  ...props.theme.typography.body_m,
+  color: props.theme.colors.white_200,
   textAlign: props.centered ? 'center' : 'left',
 }));
 
 export const SelectAssetFootNote = styled.p((props) => ({
   ...props.theme.body_xs,
-  color: props.theme.colors.white[200],
-  marginTop: props.theme.spacing(6),
+  color: props.theme.colors.white_200,
+  marginTop: props.theme.space.s,
 }));
 
 export const AddAddressHeaderContainer = styled.div((props) => ({
   display: 'flex',
   flexDirection: 'column',
   alignItems: 'center',
-  gap: props.theme.spacing(8),
-  marginTop: props.theme.spacing(20),
-  marginBottom: props.theme.spacing(8),
+  gap: props.theme.space.m,
+  marginTop: props.theme.space.xxl,
+  marginBottom: props.theme.space.m,
 }));
 
 export const CreateAnotherAccountContainer = styled.div((props) => ({
   display: 'flex',
   flexDirection: 'column',
   alignItems: 'center',
-  gap: props.theme.spacing(8),
+  gap: props.theme.space.m,
   paddingTop: props.theme.spacing(90),
-  marginBottom: props.theme.spacing(16),
+  marginBottom: props.theme.space.xl,
 }));
 
 export const AddAddressDetailsContainer = styled.div((props) => ({
   display: 'flex',
   flexDirection: 'column',
   alignItems: 'flex-start',
-  gap: props.theme.spacing(20),
+  gap: props.theme.space.xxl,
 }));
 
 export const AddressAddedContainer = styled.div`
@@ -114,11 +114,11 @@ export const AddressAddedContainer = styled.div`
 `;
 
 export const AddAccountNameContainer = styled.div((props) => ({
-  marginTop: props.theme.spacing(20),
+  marginTop: props.theme.space.xxl,
   width: '100%',
   display: 'flex',
   flexDirection: 'column',
-  gap: props.theme.spacing(6),
+  gap: props.theme.space.s,
 }));
 
 export const AddAccountNameTitleContainer = styled.div((props) => ({
@@ -145,8 +145,8 @@ export const EndScreenTextContainer = styled.div((props) => ({
   flexDirection: 'column',
   alignItems: 'center',
   textAlign: 'center',
-  gap: props.theme.spacing(6),
-  marginBottom: props.theme.spacing(20),
+  gap: props.theme.space.s,
+  marginBottom: props.theme.space.xxl,
 }));
 
 export const ConfirmationText = styled.p((props) => ({
@@ -159,33 +159,34 @@ export const ConfirmationText = styled.p((props) => ({
 export const ConfirmationStepsContainer = styled.div((props) => ({
   display: 'flex',
   justifyContent: 'center',
-  marginTop: props.theme.spacing(12),
+  marginTop: props.theme.space.l,
 }));
 
 export const OptionsContainer = styled.div((props) => ({
   width: '100%',
-  marginTop: props.theme.spacing(16),
+  marginTop: props.theme.space.xl,
 }));
 
 interface OptionProps {
-  selected?: boolean;
+  $selected?: boolean;
 }
 export const Option = styled.button<OptionProps>((props) => ({
+  ...props.theme.typography.body_medium_m,
   width: '100%',
   color: props.theme.colors.white_0,
-  backgroundColor: props.theme.colors.elevation3,
-  padding: props.theme.spacing(8),
+  backgroundColor: props.theme.colors.elevation1,
+  padding: props.theme.space.m,
   paddingTop: props.theme.spacing(7),
   paddingBottom: props.theme.spacing(7),
+  marginBottom: props.theme.space.s,
+  border: `1px solid ${props.$selected ? '#7383ff4d' : props.theme.colors.elevation1}`,
   borderRadius: props.theme.radius(2),
-  fontSize: '0.75rem',
-  marginBottom: props.theme.spacing(6),
-  border: `1px solid ${props.selected ? props.theme.colors.elevation6 : 'transparent'}`,
   cursor: 'pointer',
   userSelect: 'none',
   display: 'flex',
   alignItems: 'center',
   transition: 'border 0.2s ease',
+  textAlign: 'left',
 }));
 
 // TODO create radio button in ui-library
@@ -196,29 +197,29 @@ export const OptionIcon = styled.div<OptionProps>((props) => ({
   width: 16,
   height: 16,
   borderRadius: '50%',
-  border: `1px solid ${props.theme.colors.white[0]}`,
+  border: `1px solid ${props.theme.colors.white_0}`,
   marginRight: props.theme.spacing(10),
   flex: 'none',
   '&::after': {
     content: '""',
-    display: props.selected ? 'block' : 'none',
-    width: 10,
-    height: 10,
+    display: props.$selected ? 'block' : 'none',
+    width: 8,
+    height: 8,
     borderRadius: 100,
-    backgroundColor: props.theme.colors.orange_main,
+    backgroundColor: props.theme.colors.white_0,
   },
 }));
 
 export const ConfirmationStep = styled.div<{
-  isCompleted: boolean;
+  $isCompleted: boolean;
 }>((props) => ({
   width: 32,
   height: 4,
-  backgroundColor: props.isCompleted ? props.theme.colors.white[0] : props.theme.colors.white[900],
+  backgroundColor: props.$isCompleted ? props.theme.colors.white_0 : props.theme.colors.white_900,
   borderRadius: props.theme.radius(1),
   transition: 'background-color 0.2s ease',
   ':first-child': {
-    marginRight: props.theme.spacing(4),
+    marginRight: props.theme.space.xs,
   },
 }));
 
@@ -229,7 +230,7 @@ export const TogglerContainer = styled.div((props) => ({
 }));
 
 export const TogglerText = styled.p((props) => ({
-  marginLeft: props.theme.spacing(8),
+  marginLeft: props.theme.space.m,
   fontWeight: 500,
   fontSize: '0.875rem',
   lineHeight: '140%',
@@ -246,8 +247,8 @@ export const WarningIcon = styled.img({
 });
 
 export const LedgerFailViewContainer = styled.div((props) => ({
-  paddingLeft: props.theme.spacing(8),
-  paddingRight: props.theme.spacing(8),
+  paddingLeft: props.theme.space.m,
+  paddingRight: props.theme.space.m,
   margin: 'auto',
 }));
 
@@ -258,6 +259,6 @@ export const LedgerFailButtonsContainer = styled.div((props) => ({
 
 export const ActionButtonContainer = styled.div((props) => ({
   '&:not(:last-of-type)': {
-    marginBottom: props.theme.spacing(8),
+    marginBottom: props.theme.space.m,
   },
 }));
diff --git a/src/app/screens/ledger/importLedgerAccount/steps/index.tsx b/src/app/screens/ledger/importLedgerAccount/steps/index.tsx
index 5175b5a0b..52a7e30b1 100644
--- a/src/app/screens/ledger/importLedgerAccount/steps/index.tsx
+++ b/src/app/screens/ledger/importLedgerAccount/steps/index.tsx
@@ -165,16 +165,16 @@ function Steps({
           <OptionsContainer>
             <Option
               onClick={() => setSelectedLedgerLiveOption(LedgerLiveOptions.USING)}
-              selected={selectedLedgerLiveOption === LedgerLiveOptions.USING}
+              $selected={selectedLedgerLiveOption === LedgerLiveOptions.USING}
             >
-              <OptionIcon selected={selectedLedgerLiveOption === LedgerLiveOptions.USING} />
+              <OptionIcon $selected={selectedLedgerLiveOption === LedgerLiveOptions.USING} />
               {t('LEDGER_BEFORE_GETTING_STARTED.OPTIONS.USE_LEDGER_LIVE')}
             </Option>
             <Option
               onClick={() => setSelectedLedgerLiveOption(LedgerLiveOptions.NOT_USING)}
-              selected={selectedLedgerLiveOption === LedgerLiveOptions.NOT_USING}
+              $selected={selectedLedgerLiveOption === LedgerLiveOptions.NOT_USING}
             >
-              <OptionIcon selected={selectedLedgerLiveOption === LedgerLiveOptions.NOT_USING} />
+              <OptionIcon $selected={selectedLedgerLiveOption === LedgerLiveOptions.NOT_USING} />
               {t('LEDGER_BEFORE_GETTING_STARTED.OPTIONS.DONT_USE_LEDGER_LIVE')}
             </Option>
           </OptionsContainer>
@@ -340,8 +340,8 @@ function Steps({
           <ConfirmationText>{t('LEDGER_ADD_ADDRESS.CONFIRM_TO_CONTINUE')}</ConfirmationText>
           {isBitcoinSelected && (
             <ConfirmationStepsContainer>
-              <ConfirmationStep isCompleted={isBtcAddressConfirmed} />
-              <ConfirmationStep isCompleted={isOrdinalsAddressConfirmed} />
+              <ConfirmationStep $isCompleted={isBtcAddressConfirmed} />
+              <ConfirmationStep $isCompleted={isOrdinalsAddressConfirmed} />
             </ConfirmationStepsContainer>
           )}
         </>
@@ -379,8 +379,8 @@ function Steps({
           </AddAddressDetailsContainer>
           <ConfirmationText>{t('LEDGER_ADD_ADDRESS.CONFIRM_TO_CONTINUE')}</ConfirmationText>
           <ConfirmationStepsContainer>
-            <ConfirmationStep isCompleted={isBtcAddressConfirmed} />
-            <ConfirmationStep isCompleted={isOrdinalsAddressConfirmed} />
+            <ConfirmationStep $isCompleted={isBtcAddressConfirmed} />
+            <ConfirmationStep $isCompleted={isOrdinalsAddressConfirmed} />
           </ConfirmationStepsContainer>
         </>
       );
diff --git a/src/locales/en.json b/src/locales/en.json
index 0b983b90d..c65a921ec 100644
--- a/src/locales/en.json
+++ b/src/locales/en.json
@@ -106,10 +106,10 @@
     "LEARN_MORE": "Learn More",
     "LEDGER_BEFORE_GETTING_STARTED": {
       "TITLE": "Before getting started",
-      "DESCRIPTION": "Do you use Ledger Live with the hardware wallet device you wish to connect?",
+      "DESCRIPTION": "Please select one of the following options to continue.",
       "OPTIONS": {
-        "USE_LEDGER_LIVE": "I use Ledger Live with the device.",
-        "DONT_USE_LEDGER_LIVE": "I do not use Ledger Live with the device."
+        "USE_LEDGER_LIVE": "I am using Ledger Live with this device.",
+        "DONT_USE_LEDGER_LIVE": "I am not using Ledger Live with this device."
       },
       "IMPORTANT_WARNING": {
         "TITLE": "Important - Please read",

From 32d4f0b2a367f56b88314d2d040396a271c83a45 Mon Sep 17 00:00:00 2001
From: GitHub Actions Bot <>
Date: Mon, 7 Oct 2024 10:46:22 +0000
Subject: [PATCH 165/227] release: v0.43.2

---
 package-lock.json | 4 ++--
 package.json      | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 912fa9d41..16ff10803 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "xverse-web-extension",
-  "version": "0.43.1",
+  "version": "0.43.2",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "xverse-web-extension",
-      "version": "0.43.1",
+      "version": "0.43.2",
       "dependencies": {
         "@aryzing/superqs": "0.0.6",
         "@ledgerhq/hw-transport-webusb": "^6.27.13",
diff --git a/package.json b/package.json
index 4221d0ffe..ce7f76e91 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "xverse-web-extension",
   "description": "A Bitcoin wallet for Web3",
-  "version": "0.43.1",
+  "version": "0.43.2",
   "private": true,
   "engines": {
     "node": "^18.18.2"

From 2ee11a448247f6bd5507e9dba0f826f5a1888ffb Mon Sep 17 00:00:00 2001
From: Victor Kirov <victor.kirov@gmail.com>
Date: Mon, 7 Oct 2024 13:44:58 +0300
Subject: [PATCH 166/227] Add ledger batch signing functionality

---
 src/app/components/batchPsbtSigning/index.tsx | 282 ++++++++++--------
 .../confirmBtcTransaction/index.tsx           | 103 +------
 src/app/components/ledgerSteps/index.tsx      | 121 ++++++++
 .../components/ledgerSteps/ledgerStepView.tsx |  99 ++++++
 .../screens/runeListingBatchSigning/index.tsx |  13 +-
 .../screens/signBatchPsbtRequest/index.tsx    |  13 +-
 src/locales/en.json                           |   6 +-
 7 files changed, 401 insertions(+), 236 deletions(-)
 create mode 100644 src/app/components/ledgerSteps/index.tsx
 create mode 100644 src/app/components/ledgerSteps/ledgerStepView.tsx

diff --git a/src/app/components/batchPsbtSigning/index.tsx b/src/app/components/batchPsbtSigning/index.tsx
index 8cbf51b0c..fcb6007ae 100644
--- a/src/app/components/batchPsbtSigning/index.tsx
+++ b/src/app/components/batchPsbtSigning/index.tsx
@@ -2,7 +2,7 @@ import AccountHeaderComponent from '@components/accountHeader';
 import { TxSummaryContext } from '@components/confirmBtcTransaction/hooks/useTxSummaryContext';
 import ConfirmBatchBtcTransactions from '@components/confirmBtcTransaction/indexBatch';
 import TransactionSummary from '@components/confirmBtcTransaction/transactionSummary';
-import InfoContainer from '@components/infoContainer';
+import LedgerSteps from '@components/ledgerSteps';
 import LoadingTransactionStatus from '@components/loadingTransactionStatus';
 import type { ConfirmationStatus } from '@components/loadingTransactionStatus/circularSvgAnimation';
 import useSelectedAccount from '@hooks/useSelectedAccount';
@@ -16,9 +16,11 @@ import {
   btcTransaction,
   extractViewSummary,
   type AggregatedSummary,
+  type Transport,
   type UserTransactionSummary,
 } from '@secretkeylabs/xverse-core';
 import Button from '@ui-library/button';
+import Sheet from '@ui-library/sheet';
 import Spinner from '@ui-library/spinner';
 import { isLedgerAccount } from '@utils/helper';
 import { trackMixPanel } from '@utils/mixpanel';
@@ -48,22 +50,25 @@ interface BatchPsbtSigningProps {
   psbts: SignMultiplePsbtPayload[];
   onSigned: (signedPsbts: string[]) => void | Promise<void>;
   onCancel: () => void;
+  onPostSignDone: () => void;
 }
 
-function BatchPsbtSigning({ onSigned, psbts, onCancel }: BatchPsbtSigningProps) {
+function BatchPsbtSigning({ onSigned, psbts, onCancel, onPostSignDone }: BatchPsbtSigningProps) {
   const selectedAccount = useSelectedAccount();
   const { network } = useWalletSelector();
   const navigate = useNavigate();
   const { t } = useTranslation('translation', { keyPrefix: 'CONFIRM_TRANSACTION' });
+  const txnContext = useTransactionContext();
+  useTrackMixPanelPageViewed();
+
   const [isSigning, setIsSigning] = useState(false);
   const [isSigningComplete, setIsSigningComplete] = useState(false);
   const [signingPsbtIndex, setSigningPsbtIndex] = useState(1);
   const [currentPsbtIndex, setCurrentPsbtIndex] = useState(0);
   const [reviewTransaction, setReviewTransaction] = useState(false);
   const [isLoading, setIsLoading] = useState(true);
-  const txnContext = useTransactionContext();
-  useTrackMixPanelPageViewed();
   const [parsedPsbts, setParsedPsbts] = useState<ParsedPsbt[]>([]);
+  const [isLedgerModalVisible, setIsLedgerModalVisible] = useState(false);
 
   const individualTxSummaryContext = useMemo(
     () => ({
@@ -109,11 +114,13 @@ function BatchPsbtSigning({ onSigned, psbts, onCancel }: BatchPsbtSigningProps)
     })();
   }, [psbts, txnContext, network, navigate, t]);
 
-  const onSignPsbtConfirmed = async () => {
+  const onSignPsbtConfirmed = async (transport?: Transport) => {
     try {
-      if (isLedgerAccount(selectedAccount)) {
+      if (isLedgerAccount(selectedAccount) && !transport) {
+        setIsLedgerModalVisible(true);
         return;
       }
+
       setIsSigning(true);
 
       const signedPsbts: string[] = [];
@@ -128,6 +135,7 @@ function BatchPsbtSigning({ onSigned, psbts, onCancel }: BatchPsbtSigningProps)
 
         const psbtBase64 = await enhancedPsbt.getSignedPsbtBase64({
           finalize: false,
+          ledgerTransport: transport,
         });
         signedPsbts.push(psbtBase64);
 
@@ -146,6 +154,7 @@ function BatchPsbtSigning({ onSigned, psbts, onCancel }: BatchPsbtSigningProps)
       setIsSigning(false);
 
       onSigned(signedPsbts);
+      setIsLedgerModalVisible(false);
     } catch (err) {
       setIsSigning(false);
       setIsSigningComplete(false);
@@ -164,13 +173,128 @@ function BatchPsbtSigning({ onSigned, psbts, onCancel }: BatchPsbtSigningProps)
     }
   };
 
-  const closeCallback = () => {
-    window.close();
+  const renderSign = isSigning || isSigningComplete;
+
+  const renderPreSign = () => {
+    if (renderSign) return null;
+
+    const visitedInputs = new Set<string>();
+    const hasDuplicateInputs = parsedPsbts.some((parsedPsbt) => {
+      const inputLocations = parsedPsbt.summary.inputs.map(
+        (input) => input.extendedUtxo.utxo.txid + input.extendedUtxo.utxo.vout,
+      );
+      const hasDuplicate = inputLocations.some((input) => {
+        if (visitedInputs.has(input)) {
+          return true;
+        }
+        visitedInputs.add(input);
+        return false;
+      });
+      return hasDuplicate;
+    });
+
+    const renderBody = () => {
+      if (hasDuplicateInputs) {
+        // if there are duplicate inputs on the individual transactions, we won't show a summary
+        // and will have to ask the user to review each txn individually
+        return null;
+      }
+
+      if (isLoading) {
+        return (
+          <LoaderContainer>
+            <Spinner color="white" size={50} />
+          </LoaderContainer>
+        );
+      }
+
+      return (
+        <>
+          <OuterContainer>
+            <Container>
+              <ReviewTransactionText>
+                {t('SIGN_TRANSACTIONS', { count: parsedPsbts.length })}
+              </ReviewTransactionText>
+              <BundleLinkContainer onClick={() => setReviewTransaction(true)}>
+                <BundleLinkText>{t('REVIEW_ALL')}</BundleLinkText>
+                <ArrowRight size={12} weight="bold" />
+              </BundleLinkContainer>
+              <ConfirmBatchBtcTransactions summaries={parsedPsbts} />
+            </Container>
+          </OuterContainer>
+          <ButtonsContainer>
+            <TransparentButtonContainer>
+              <Button title={t('CANCEL')} variant="secondary" onClick={onCancel} />
+            </TransparentButtonContainer>
+            <Button
+              title={t('CONFIRM_ALL')}
+              onClick={() => onSignPsbtConfirmed()}
+              loading={isSigning}
+            />
+          </ButtonsContainer>
+        </>
+      );
+    };
+
+    const reviewDoneText = hasDuplicateInputs ? t('CONFIRM_ALL') : t('DONE');
+    const onReviewDone = hasDuplicateInputs
+      ? () => onSignPsbtConfirmed()
+      : () => {
+          setReviewTransaction(false);
+          setCurrentPsbtIndex(0);
+        };
+
+    return (
+      <>
+        <AccountHeaderComponent disableMenuOption disableAccountSwitch />
+        {renderBody()}
+        <StyledSheet header="" visible={reviewTransaction || hasDuplicateInputs} onClose={onCancel}>
+          <OuterContainer>
+            <ModalContainer>
+              <ReviewTransactionText>
+                {t('TRANSACTION')} {currentPsbtIndex + 1}/{parsedPsbts.length}
+              </ReviewTransactionText>
+              {!!parsedPsbts[currentPsbtIndex] && (
+                <TxSummaryContext.Provider value={individualTxSummaryContext}>
+                  <TransactionSummary />
+                </TxSummaryContext.Provider>
+              )}
+            </ModalContainer>
+          </OuterContainer>
+          <TxReviewModalControls>
+            <Button
+              title={t('PREVIOUS')}
+              variant="secondary"
+              onClick={() => {
+                setCurrentPsbtIndex((prevIndex) => prevIndex - 1);
+              }}
+              icon={<ArrowLeft color="white" size={16} weight="bold" />}
+              disabled={currentPsbtIndex === 0}
+            />
+            {currentPsbtIndex < parsedPsbts.length - 1 && (
+              <Button
+                title={t('NEXT')}
+                variant="secondary"
+                onClick={() => {
+                  setCurrentPsbtIndex((prevIndex) => prevIndex + 1);
+                }}
+                icon={<ArrowRight color="white" size={16} weight="bold" />}
+                iconPosition="right"
+              />
+            )}
+            {currentPsbtIndex === parsedPsbts.length - 1 && (
+              <Button title={reviewDoneText} onClick={onReviewDone} />
+            )}
+          </TxReviewModalControls>
+        </StyledSheet>
+      </>
+    );
   };
 
-  const signingStatus: ConfirmationStatus = isSigningComplete ? 'SUCCESS' : 'LOADING';
+  const renderSigning = () => {
+    if (!renderSign) return null;
 
-  if (isSigning || isSigningComplete) {
+    const signingStatus: ConfirmationStatus = isSigningComplete ? 'SUCCESS' : 'LOADING';
     return (
       <LoadingTransactionStatus
         status={signingStatus}
@@ -183,137 +307,35 @@ function BatchPsbtSigning({ onSigned, psbts, onCancel }: BatchPsbtSigningProps)
           description: t('THIS_MAY_TAKE_A_FEW_MINUTES'),
         }}
         loadingPercentage={isSigningComplete ? 1 : signingPsbtIndex / psbts.length}
-        primaryAction={{ onPress: closeCallback, text: t('CLOSE') }}
+        primaryAction={{ onPress: onPostSignDone, text: t('CLOSE') }}
         withLoadingBgCircle
       />
     );
-  }
-
-  const visitedInputs = new Set<string>();
-  const hasDuplicateInputs = parsedPsbts.some((parsedPsbt) => {
-    const inputLocations = parsedPsbt.summary.inputs.map(
-      (input) => input.extendedUtxo.utxo.txid + input.extendedUtxo.utxo.vout,
-    );
-    const hasDuplicate = inputLocations.some((input) => {
-      if (visitedInputs.has(input)) {
-        return true;
-      }
-      visitedInputs.add(input);
-      return false;
-    });
-    return hasDuplicate;
-  });
-
-  const renderBody = () => {
-    if (hasDuplicateInputs) {
-      // if there are duplicate inputs on the individual transactions, we won't show a summary
-      // and will have to ask the user to review each txn individually
-      return null;
-    }
+  };
 
-    if (isLoading) {
-      return (
-        <LoaderContainer>
-          <Spinner color="white" size={50} />
-        </LoaderContainer>
-      );
+  const onLedgerCancel = () => {
+    if (isSigning) {
+      onCancel();
+      return;
     }
 
-    const isLedger = isLedgerAccount(selectedAccount);
-
-    return (
-      <>
-        <OuterContainer>
-          <Container>
-            {isLedger ? (
-              <InfoContainer bodyText={t('LEDGER.BATCH_NOT_SUPPORTED')} />
-            ) : (
-              <>
-                <ReviewTransactionText>
-                  {t('SIGN_TRANSACTIONS', { count: parsedPsbts.length })}
-                </ReviewTransactionText>
-                <BundleLinkContainer onClick={() => setReviewTransaction(true)}>
-                  <BundleLinkText>{t('REVIEW_ALL')}</BundleLinkText>
-                  <ArrowRight size={12} weight="bold" />
-                </BundleLinkContainer>
-                <ConfirmBatchBtcTransactions summaries={parsedPsbts} />
-              </>
-            )}
-          </Container>
-        </OuterContainer>
-        <ButtonsContainer>
-          <TransparentButtonContainer>
-            <Button title={t('CANCEL')} variant="secondary" onClick={onCancel} />
-          </TransparentButtonContainer>
-          <Button
-            title={t('CONFIRM_ALL')}
-            onClick={onSignPsbtConfirmed}
-            loading={isSigning}
-            disabled={isLedger}
-          />
-        </ButtonsContainer>
-      </>
-    );
+    setIsLedgerModalVisible(false);
   };
 
-  const reviewDoneText = hasDuplicateInputs ? t('CONFIRM_ALL') : t('DONE');
-  const onReviewDone = hasDuplicateInputs
-    ? onSignPsbtConfirmed
-    : () => {
-        setReviewTransaction(false);
-        setCurrentPsbtIndex(0);
-      };
-
   return (
     <>
-      <AccountHeaderComponent disableMenuOption disableAccountSwitch />
-      {renderBody()}
-      <StyledSheet
-        header=""
-        visible={reviewTransaction || hasDuplicateInputs}
-        onClose={() => {
-          setReviewTransaction(false);
-          setCurrentPsbtIndex(0);
-        }}
-      >
-        <OuterContainer>
-          <ModalContainer>
-            <ReviewTransactionText>
-              {t('TRANSACTION')} {currentPsbtIndex + 1}/{parsedPsbts.length}
-            </ReviewTransactionText>
-            {!!parsedPsbts[currentPsbtIndex] && (
-              <TxSummaryContext.Provider value={individualTxSummaryContext}>
-                <TransactionSummary />
-              </TxSummaryContext.Provider>
-            )}
-          </ModalContainer>
-        </OuterContainer>
-        <TxReviewModalControls>
-          <Button
-            title={t('PREVIOUS')}
-            variant="secondary"
-            onClick={() => {
-              setCurrentPsbtIndex((prevIndex) => prevIndex - 1);
-            }}
-            icon={<ArrowLeft color="white" size={16} weight="bold" />}
-            disabled={currentPsbtIndex === 0}
+      {renderPreSign()}
+      {renderSigning()}
+      <Sheet title="" visible={isLedgerModalVisible} onClose={() => setIsLedgerModalVisible(false)}>
+        {isLedgerModalVisible && (
+          <LedgerSteps
+            onConfirm={onSignPsbtConfirmed}
+            onCancel={onLedgerCancel}
+            txnToSignCount={psbts.length}
+            txnSignIndex={signingPsbtIndex}
           />
-          {currentPsbtIndex < parsedPsbts.length - 1 && (
-            <Button
-              title={t('NEXT')}
-              variant="secondary"
-              onClick={() => {
-                setCurrentPsbtIndex((prevIndex) => prevIndex + 1);
-              }}
-              icon={<ArrowRight color="white" size={16} weight="bold" />}
-              iconPosition="right"
-            />
-          )}
-          {currentPsbtIndex === parsedPsbts.length - 1 && (
-            <Button title={reviewDoneText} onClick={onReviewDone} />
-          )}
-        </TxReviewModalControls>
-      </StyledSheet>
+        )}
+      </Sheet>
     </>
   );
 }
diff --git a/src/app/components/confirmBtcTransaction/index.tsx b/src/app/components/confirmBtcTransaction/index.tsx
index b2f612dc4..a0b2ae945 100644
--- a/src/app/components/confirmBtcTransaction/index.tsx
+++ b/src/app/components/confirmBtcTransaction/index.tsx
@@ -1,8 +1,7 @@
-import { delay } from '@common/utils/ledger';
+import LedgerSteps from '@components/ledgerSteps';
 import type { Tab } from '@components/tabBar';
 import useSelectedAccount from '@hooks/useSelectedAccount';
 import useWalletSelector from '@hooks/useWalletSelector';
-import TransportFactory from '@ledgerhq/hw-transport-webusb';
 import {
   type Brc20Definition,
   type btcTransaction,
@@ -23,7 +22,6 @@ import type { Color } from '../../../theme';
 import SendLayout from '../../layouts/sendLayout';
 import useExtractTxSummary from './hooks/useExtractTxSummary';
 import { TxSummaryContext } from './hooks/useTxSummaryContext';
-import LedgerStepView, { Steps } from './ledgerStepView';
 import TransactionSummary from './transactionSummary';
 
 const LoaderContainer = styled.div(() => ({
@@ -42,17 +40,6 @@ const SpacedCallout = styled(Callout)`
   margin-bottom: ${(props) => props.theme.space.m};
 `;
 
-const SuccessActionsContainer = styled.div((props) => ({
-  width: '100%',
-  display: 'flex',
-  flexDirection: 'column',
-  gap: props.theme.space.s,
-  paddingLeft: props.theme.space.m,
-  paddingRight: props.theme.space.m,
-  marginBottom: props.theme.space.xxl,
-  marginTop: props.theme.space.xxl,
-}));
-
 type Props = {
   summary?: btcTransaction.TransactionSummary | btcTransaction.PsbtSummary;
   runeMintDetails?: MintActionDetails;
@@ -118,16 +105,8 @@ function ConfirmBtcTransaction({
   );
 
   const [isModalVisible, setIsModalVisible] = useState(false);
-  const [currentStep, setCurrentStep] = useState(Steps.ConnectLedger);
-  const [isButtonDisabled, setIsButtonDisabled] = useState(false);
-  const [isConnectSuccess, setIsConnectSuccess] = useState(false);
-  const [isConnectFailed, setIsConnectFailed] = useState(false);
-  const [isTxRejected, setIsTxRejected] = useState(false);
 
   const { t } = useTranslation('translation', { keyPrefix: 'CONFIRM_TRANSACTION' });
-  const { t: signatureRequestTranslate } = useTranslation('translation', {
-    keyPrefix: 'SIGNATURE_REQUEST',
-  });
 
   const onConfirmPress = async () => {
     if (!isLedgerAccount(selectedAccount)) {
@@ -137,54 +116,6 @@ function ConfirmBtcTransaction({
     setIsModalVisible(true);
   };
 
-  const handleConnectAndConfirm = async () => {
-    if (!selectedAccount) {
-      console.error('No account selected');
-      return;
-    }
-    setIsButtonDisabled(true);
-
-    const transport = await TransportFactory.create();
-
-    if (!transport) {
-      setIsConnectSuccess(false);
-      setIsConnectFailed(true);
-      setIsButtonDisabled(false);
-      return;
-    }
-
-    setIsConnectSuccess(true);
-    await delay(1500);
-
-    if (currentStep !== Steps.ExternalInputs && currentStep !== Steps.ConfirmTransaction) {
-      setCurrentStep(Steps.ExternalInputs);
-      return;
-    }
-
-    if (currentStep !== Steps.ConfirmTransaction) {
-      setCurrentStep(Steps.ConfirmTransaction);
-    }
-
-    try {
-      onConfirm(transport);
-    } catch (err) {
-      console.error(err);
-      setIsTxRejected(true);
-    }
-  };
-
-  const goToConfirmationStep = () => {
-    setCurrentStep(Steps.ConfirmTransaction);
-
-    handleConnectAndConfirm();
-  };
-
-  const handleRetry = async () => {
-    setIsTxRejected(false);
-    setIsConnectSuccess(false);
-    setCurrentStep(Steps.ConnectLedger);
-  };
-
   if (isLoading || extractTxSummaryLoading) {
     return (
       <LoaderContainer>
@@ -239,37 +170,7 @@ function ConfirmBtcTransaction({
           )}
         </SendLayout>
         <Sheet title="" visible={isModalVisible} onClose={() => setIsModalVisible(false)}>
-          <LedgerStepView
-            currentStep={currentStep}
-            isConnectSuccess={isConnectSuccess}
-            isConnectFailed={isConnectFailed}
-            isTxRejected={isTxRejected}
-            t={t}
-            signatureRequestTranslate={signatureRequestTranslate}
-          />
-          <SuccessActionsContainer>
-            {currentStep === Steps.ExternalInputs && !isTxRejected && !isConnectFailed ? (
-              <Button onClick={goToConfirmationStep} title={t('LEDGER.CONTINUE_BUTTON')} />
-            ) : (
-              <>
-                <Button
-                  onClick={isTxRejected || isConnectFailed ? handleRetry : handleConnectAndConfirm}
-                  title={signatureRequestTranslate(
-                    isTxRejected || isConnectFailed
-                      ? 'LEDGER.RETRY_BUTTON'
-                      : 'LEDGER.CONNECT_BUTTON',
-                  )}
-                  disabled={isButtonDisabled}
-                  loading={isButtonDisabled}
-                />
-                <Button
-                  onClick={onCancel}
-                  title={signatureRequestTranslate('LEDGER.CANCEL_BUTTON')}
-                  variant="secondary"
-                />
-              </>
-            )}
-          </SuccessActionsContainer>
+          {isModalVisible && <LedgerSteps onConfirm={onConfirm} onCancel={onCancel} />}
         </Sheet>
       </TxSummaryContext.Provider>
     );
diff --git a/src/app/components/ledgerSteps/index.tsx b/src/app/components/ledgerSteps/index.tsx
new file mode 100644
index 000000000..789f474d1
--- /dev/null
+++ b/src/app/components/ledgerSteps/index.tsx
@@ -0,0 +1,121 @@
+import { delay } from '@common/utils/ledger';
+import TransportFactory from '@ledgerhq/hw-transport-webusb';
+import { type Transport } from '@secretkeylabs/xverse-core';
+import Button from '@ui-library/button';
+import { useState } from 'react';
+import { useTranslation } from 'react-i18next';
+import styled from 'styled-components';
+import LedgerStepView, { Steps } from './ledgerStepView';
+
+const SuccessActionsContainer = styled.div((props) => ({
+  width: '100%',
+  display: 'flex',
+  flexDirection: 'column',
+  gap: props.theme.space.s,
+  paddingLeft: props.theme.space.m,
+  paddingRight: props.theme.space.m,
+  marginBottom: props.theme.space.xxl,
+  marginTop: props.theme.space.xxl,
+}));
+
+type Props = {
+  onConfirm: (ledgerTransport?: Transport) => void;
+  onCancel: () => void;
+  txnToSignCount?: number;
+  txnSignIndex?: number;
+};
+
+function ConfirmBtcTransaction({ onConfirm, onCancel, txnToSignCount, txnSignIndex }: Props) {
+  const [currentStep, setCurrentStep] = useState(Steps.ConnectLedger);
+  const [isButtonDisabled, setIsButtonDisabled] = useState(false);
+  const [isConnectSuccess, setIsConnectSuccess] = useState(false);
+  const [isConnectFailed, setIsConnectFailed] = useState(false);
+  const [isTxRejected, setIsTxRejected] = useState(false);
+
+  const { t } = useTranslation('translation', { keyPrefix: 'CONFIRM_TRANSACTION' });
+  const { t: signatureRequestTranslate } = useTranslation('translation', {
+    keyPrefix: 'SIGNATURE_REQUEST',
+  });
+
+  const handleConnectAndConfirm = async () => {
+    setIsButtonDisabled(true);
+
+    const transport = await TransportFactory.create();
+
+    if (!transport) {
+      setIsConnectSuccess(false);
+      setIsConnectFailed(true);
+      setIsButtonDisabled(false);
+      return;
+    }
+
+    setIsConnectSuccess(true);
+    await delay(1500);
+
+    if (currentStep !== Steps.ExternalInputs && currentStep !== Steps.ConfirmTransaction) {
+      setCurrentStep(Steps.ExternalInputs);
+      return;
+    }
+
+    if (currentStep !== Steps.ConfirmTransaction) {
+      setCurrentStep(Steps.ConfirmTransaction);
+    }
+
+    try {
+      onConfirm(transport);
+    } catch (err) {
+      console.error(err);
+      setIsTxRejected(true);
+    }
+  };
+
+  const goToConfirmationStep = () => {
+    setCurrentStep(Steps.ConfirmTransaction);
+
+    handleConnectAndConfirm();
+  };
+
+  const handleRetry = async () => {
+    setIsTxRejected(false);
+    setIsConnectSuccess(false);
+    setCurrentStep(Steps.ConnectLedger);
+  };
+
+  return (
+    <>
+      <LedgerStepView
+        currentStep={currentStep}
+        isConnectSuccess={isConnectSuccess}
+        isConnectFailed={isConnectFailed}
+        isTxRejected={isTxRejected}
+        t={t}
+        signatureRequestTranslate={signatureRequestTranslate}
+        txnToSignCount={txnToSignCount}
+        txnSignIndex={txnSignIndex}
+      />
+      <SuccessActionsContainer>
+        {currentStep === Steps.ExternalInputs && !isTxRejected && !isConnectFailed ? (
+          <Button onClick={goToConfirmationStep} title={t('LEDGER.CONTINUE_BUTTON')} />
+        ) : (
+          <>
+            <Button
+              onClick={isTxRejected || isConnectFailed ? handleRetry : handleConnectAndConfirm}
+              title={signatureRequestTranslate(
+                isTxRejected || isConnectFailed ? 'LEDGER.RETRY_BUTTON' : 'LEDGER.CONNECT_BUTTON',
+              )}
+              disabled={isButtonDisabled}
+              loading={isButtonDisabled}
+            />
+            <Button
+              onClick={onCancel}
+              title={signatureRequestTranslate('LEDGER.CANCEL_BUTTON')}
+              variant="secondary"
+            />
+          </>
+        )}
+      </SuccessActionsContainer>
+    </>
+  );
+}
+
+export default ConfirmBtcTransaction;
diff --git a/src/app/components/ledgerSteps/ledgerStepView.tsx b/src/app/components/ledgerSteps/ledgerStepView.tsx
new file mode 100644
index 000000000..f656d1a9f
--- /dev/null
+++ b/src/app/components/ledgerSteps/ledgerStepView.tsx
@@ -0,0 +1,99 @@
+import InfoIcon from '@assets/img/info.svg';
+import ledgerConnectDefaultIcon from '@assets/img/ledger/ledger_connect_default.svg';
+import ledgerConnectBtcIcon from '@assets/img/ledger/ledger_import_connect_btc.svg';
+import LedgerConnectionView, {
+  ConnectLedgerContainer,
+  ConnectLedgerText,
+} from '@components/ledger/connectLedgerView';
+import LedgerFailView from '@components/ledger/failLedgerView';
+import {
+  ConnectLedgerTitle,
+  InfoImage,
+} from '@screens/ledger/confirmLedgerTransaction/index.styled';
+import type { TFunction } from 'react-i18next';
+
+export enum Steps {
+  ConnectLedger = 0,
+  ExternalInputs = 1,
+  ConfirmTransaction = 2,
+}
+
+type Props = {
+  currentStep: Steps;
+  isConnectSuccess: boolean;
+  isConnectFailed: boolean;
+  isTxRejected: boolean;
+  t: TFunction<'translation', 'CONFIRM_TRANSACTION'>;
+  signatureRequestTranslate: TFunction<'translation', 'SIGNATURE_REQUEST'>;
+  txnToSignCount?: number;
+  txnSignIndex?: number;
+};
+
+function LedgerStepView({
+  currentStep,
+  isConnectSuccess,
+  isConnectFailed,
+  isTxRejected,
+  t,
+  signatureRequestTranslate,
+  txnToSignCount,
+  txnSignIndex,
+}: Props) {
+  switch (currentStep) {
+    case Steps.ConnectLedger:
+      return (
+        <LedgerConnectionView
+          title={signatureRequestTranslate('LEDGER.CONNECT.TITLE')}
+          text={signatureRequestTranslate('LEDGER.CONNECT.SUBTITLE', { name: 'Bitcoin' })}
+          titleFailed={signatureRequestTranslate('LEDGER.CONNECT.ERROR_TITLE')}
+          textFailed={signatureRequestTranslate('LEDGER.CONNECT.ERROR_SUBTITLE')}
+          imageDefault={ledgerConnectBtcIcon}
+          isConnectSuccess={isConnectSuccess}
+          isConnectFailed={isConnectFailed}
+        />
+      );
+    case Steps.ExternalInputs:
+      if (isTxRejected || isConnectFailed) {
+        return (
+          <LedgerFailView title={t('CONFIRM.ERROR_TITLE')} text={t('CONFIRM.ERROR_SUBTITLE')} />
+        );
+      }
+
+      return (
+        <div>
+          <ConnectLedgerContainer>
+            <InfoImage src={InfoIcon} alt="external inputs warning" />
+            <ConnectLedgerTitle textAlign="center">
+              {t('LEDGER.INPUTS_WARNING.EXTERNAL_INPUTS')} / <br />
+              {t('LEDGER.INPUTS_WARNING.NON_DEFAULT_SIGHASH')}
+            </ConnectLedgerTitle>
+            <ConnectLedgerText>{t('LEDGER.INPUTS_WARNING.SUBTITLE')}</ConnectLedgerText>
+          </ConnectLedgerContainer>
+        </div>
+      );
+    case Steps.ConfirmTransaction: {
+      let title = signatureRequestTranslate('LEDGER.CONFIRM.TITLE');
+      if (txnToSignCount && txnSignIndex && txnToSignCount > 1) {
+        title = signatureRequestTranslate('LEDGER.CONFIRM.TITLE_WITH_COUNT', {
+          current: txnSignIndex,
+          total: txnToSignCount,
+        });
+      }
+      return (
+        <LedgerConnectionView
+          title={title}
+          text={signatureRequestTranslate('LEDGER.CONFIRM.SUBTITLE')}
+          titleFailed={signatureRequestTranslate('LEDGER.CONFIRM.ERROR_TITLE')}
+          textFailed={signatureRequestTranslate('LEDGER.CONFIRM.ERROR_SUBTITLE')}
+          imageDefault={ledgerConnectDefaultIcon}
+          isConnectSuccess={false}
+          isConnectFailed={isTxRejected}
+        />
+      );
+    }
+    default:
+      return null;
+  }
+}
+
+export default LedgerStepView;
diff --git a/src/app/screens/runeListingBatchSigning/index.tsx b/src/app/screens/runeListingBatchSigning/index.tsx
index 5d227909b..28ffb2a50 100644
--- a/src/app/screens/runeListingBatchSigning/index.tsx
+++ b/src/app/screens/runeListingBatchSigning/index.tsx
@@ -82,7 +82,18 @@ function RuneListingBatchSigning() {
     navigate('/');
   };
 
-  return <BatchPsbtSigning psbts={psbts} onSigned={onSigned} onCancel={onCancel} />;
+  const onDone = () => {
+    navigate('/');
+  };
+
+  return (
+    <BatchPsbtSigning
+      psbts={psbts}
+      onSigned={onSigned}
+      onCancel={onCancel}
+      onPostSignDone={onDone}
+    />
+  );
 }
 
 export default RuneListingBatchSigning;
diff --git a/src/app/screens/signBatchPsbtRequest/index.tsx b/src/app/screens/signBatchPsbtRequest/index.tsx
index faade2408..6700ffb9c 100644
--- a/src/app/screens/signBatchPsbtRequest/index.tsx
+++ b/src/app/screens/signBatchPsbtRequest/index.tsx
@@ -43,6 +43,10 @@ function SignBatchPsbtRequest() {
     window.close();
   };
 
+  const onDone = () => {
+    window.close();
+  };
+
   useEffect(() => {
     if (payload.network.type !== network.type) {
       navigate('/tx-status', {
@@ -78,7 +82,14 @@ function SignBatchPsbtRequest() {
     // eslint-disable-next-line react-hooks/exhaustive-deps -- Only run this once on load
   }, []);
 
-  return <BatchPsbtSigning psbts={payload.psbts} onSigned={onSigned} onCancel={onCancel} />;
+  return (
+    <BatchPsbtSigning
+      psbts={payload.psbts}
+      onSigned={onSigned}
+      onCancel={onCancel}
+      onPostSignDone={onDone}
+    />
+  );
 }
 
 export default SignBatchPsbtRequest;
diff --git a/src/locales/en.json b/src/locales/en.json
index 8ead71045..4b4f26136 100644
--- a/src/locales/en.json
+++ b/src/locales/en.json
@@ -441,8 +441,7 @@
       "CLOSE_BUTTON": "Close",
       "CANCEL_BUTTON": "Cancel",
       "SEE_TRANSACTION_BUTTON": "See transaction",
-      "RETRY_BUTTON": "Try again",
-      "BATCH_NOT_SUPPORTED": "External transaction requests are not yet supported on a Ledger account. Switch to a different account to sign transactions from the application."
+      "RETRY_BUTTON": "Try again"
     },
     "INSCRIBE": {
       "TITLE": "You will inscribe",
@@ -1143,7 +1142,8 @@
         "ERROR_SUBTITLE_DEVICE_LOCKED": "Your Ledger device is locked. Please unlock it to continue."
       },
       "CONFIRM": {
-        "TITLE": "Confirm the signature",
+        "TITLE": "Confirm the transaction",
+        "TITLE_WITH_COUNT": "Confirm the transaction ({{current}} of {{total}})",
         "SUBTITLE": "Authorise the signature on your device to continue.",
         "ERROR_TITLE": "Error requesting signature",
         "ERROR_SUBTITLE": "The signature request encountered an error. Please check that your Ledger Bitcoin app is version 2.1.3 or newer.",

From 2c2927bf8ee78f848f91ff128d4625b9086b9ebb Mon Sep 17 00:00:00 2001
From: Victor Kirov <victor.kirov@gmail.com>
Date: Mon, 7 Oct 2024 14:42:54 +0300
Subject: [PATCH 167/227] Address PR comments

---
 src/app/components/batchPsbtSigning/index.tsx      | 4 ++--
 src/app/components/confirmBtcTransaction/index.tsx | 2 +-
 src/app/components/ledgerSteps/index.tsx           | 4 ++--
 src/app/components/messageSigning/index.tsx        | 2 +-
 src/app/screens/createInscription/index.tsx        | 1 -
 src/app/screens/executeBrc20Transaction/index.tsx  | 2 +-
 src/app/ui-library/sheet.tsx                       | 2 +-
 7 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/src/app/components/batchPsbtSigning/index.tsx b/src/app/components/batchPsbtSigning/index.tsx
index fcb6007ae..b88f46822 100644
--- a/src/app/components/batchPsbtSigning/index.tsx
+++ b/src/app/components/batchPsbtSigning/index.tsx
@@ -292,7 +292,7 @@ function BatchPsbtSigning({ onSigned, psbts, onCancel, onPostSignDone }: BatchPs
   };
 
   const renderSigning = () => {
-    if (!renderSign) return null;
+    if (!renderSign || (!isSigningComplete && isLedgerModalVisible)) return null;
 
     const signingStatus: ConfirmationStatus = isSigningComplete ? 'SUCCESS' : 'LOADING';
     return (
@@ -326,7 +326,7 @@ function BatchPsbtSigning({ onSigned, psbts, onCancel, onPostSignDone }: BatchPs
     <>
       {renderPreSign()}
       {renderSigning()}
-      <Sheet title="" visible={isLedgerModalVisible} onClose={() => setIsLedgerModalVisible(false)}>
+      <Sheet visible={isLedgerModalVisible} onClose={() => setIsLedgerModalVisible(false)}>
         {isLedgerModalVisible && (
           <LedgerSteps
             onConfirm={onSignPsbtConfirmed}
diff --git a/src/app/components/confirmBtcTransaction/index.tsx b/src/app/components/confirmBtcTransaction/index.tsx
index a0b2ae945..7d2a0e691 100644
--- a/src/app/components/confirmBtcTransaction/index.tsx
+++ b/src/app/components/confirmBtcTransaction/index.tsx
@@ -169,7 +169,7 @@ function ConfirmBtcTransaction({
             </StickyHorizontalSplitButtonContainer>
           )}
         </SendLayout>
-        <Sheet title="" visible={isModalVisible} onClose={() => setIsModalVisible(false)}>
+        <Sheet visible={isModalVisible} onClose={() => setIsModalVisible(false)}>
           {isModalVisible && <LedgerSteps onConfirm={onConfirm} onCancel={onCancel} />}
         </Sheet>
       </TxSummaryContext.Provider>
diff --git a/src/app/components/ledgerSteps/index.tsx b/src/app/components/ledgerSteps/index.tsx
index 789f474d1..916efeead 100644
--- a/src/app/components/ledgerSteps/index.tsx
+++ b/src/app/components/ledgerSteps/index.tsx
@@ -25,7 +25,7 @@ type Props = {
   txnSignIndex?: number;
 };
 
-function ConfirmBtcTransaction({ onConfirm, onCancel, txnToSignCount, txnSignIndex }: Props) {
+function LedgerSteps({ onConfirm, onCancel, txnToSignCount, txnSignIndex }: Props) {
   const [currentStep, setCurrentStep] = useState(Steps.ConnectLedger);
   const [isButtonDisabled, setIsButtonDisabled] = useState(false);
   const [isConnectSuccess, setIsConnectSuccess] = useState(false);
@@ -118,4 +118,4 @@ function ConfirmBtcTransaction({ onConfirm, onCancel, txnToSignCount, txnSignInd
   );
 }
 
-export default ConfirmBtcTransaction;
+export default LedgerSteps;
diff --git a/src/app/components/messageSigning/index.tsx b/src/app/components/messageSigning/index.tsx
index e93eb5935..9393e1268 100644
--- a/src/app/components/messageSigning/index.tsx
+++ b/src/app/components/messageSigning/index.tsx
@@ -220,7 +220,7 @@ function MessageSigning({
           <InfoContainer bodyText={t('SIGNATURE_REQUEST.SIGNING_WARNING')} type="Info" />
         </MainContainer>
       </ConfirmScreen>
-      <Sheet title="" visible={isModalVisible} onClose={() => setIsModalVisible(false)}>
+      <Sheet visible={isModalVisible} onClose={() => setIsModalVisible(false)}>
         {currentStepIndex === 0 && (
           <LedgerConnectionView
             title={t('SIGNATURE_REQUEST.LEDGER.CONNECT.TITLE')}
diff --git a/src/app/screens/createInscription/index.tsx b/src/app/screens/createInscription/index.tsx
index f35fd0809..9f263c401 100644
--- a/src/app/screens/createInscription/index.tsx
+++ b/src/app/screens/createInscription/index.tsx
@@ -481,7 +481,6 @@ function CreateInscription() {
             />
           )}
           <Sheet
-            title=""
             visible={isLedgerConnectVisible}
             onClose={isConnectSuccess ? undefined : handleLedgerConnectCancel}
           >
diff --git a/src/app/screens/executeBrc20Transaction/index.tsx b/src/app/screens/executeBrc20Transaction/index.tsx
index b5882c0d6..3bd44db13 100644
--- a/src/app/screens/executeBrc20Transaction/index.tsx
+++ b/src/app/screens/executeBrc20Transaction/index.tsx
@@ -165,7 +165,7 @@ function ExecuteBrc20Transaction() {
           loadingPercentage={loadingPercentageAwareOfStatus}
         />
       )}
-      <Sheet title="" visible={isLedgerModalVisible} onClose={handleClickClose}>
+      <Sheet visible={isLedgerModalVisible} onClose={handleClickClose}>
         <LedgerStepView
           currentStep={progress}
           isConnectSuccess={isConnectSuccess}
diff --git a/src/app/ui-library/sheet.tsx b/src/app/ui-library/sheet.tsx
index f51b5dce4..45f89f1bf 100644
--- a/src/app/ui-library/sheet.tsx
+++ b/src/app/ui-library/sheet.tsx
@@ -44,7 +44,7 @@ const BodyContainer = styled.div`
 `;
 
 type Props = {
-  title: string;
+  title?: string;
   visible: boolean;
   children: React.ReactNode;
   onClose?: () => void;

From af58c9865a328cd6525632548abe7d870e296102 Mon Sep 17 00:00:00 2001
From: Victor Kirov <victor.kirov@gmail.com>
Date: Mon, 7 Oct 2024 15:07:19 +0300
Subject: [PATCH 168/227] Remove extraneous file

---
 .../confirmBtcTransaction/ledgerStepView.tsx  | 87 -------------------
 1 file changed, 87 deletions(-)
 delete mode 100644 src/app/components/confirmBtcTransaction/ledgerStepView.tsx

diff --git a/src/app/components/confirmBtcTransaction/ledgerStepView.tsx b/src/app/components/confirmBtcTransaction/ledgerStepView.tsx
deleted file mode 100644
index 74c7520eb..000000000
--- a/src/app/components/confirmBtcTransaction/ledgerStepView.tsx
+++ /dev/null
@@ -1,87 +0,0 @@
-import InfoIcon from '@assets/img/info.svg';
-import ledgerConnectDefaultIcon from '@assets/img/ledger/ledger_connect_default.svg';
-import ledgerConnectBtcIcon from '@assets/img/ledger/ledger_import_connect_btc.svg';
-import LedgerConnectionView, {
-  ConnectLedgerContainer,
-  ConnectLedgerText,
-} from '@components/ledger/connectLedgerView';
-import LedgerFailView from '@components/ledger/failLedgerView';
-import {
-  ConnectLedgerTitle,
-  InfoImage,
-} from '@screens/ledger/confirmLedgerTransaction/index.styled';
-import type { TFunction } from 'react-i18next';
-
-export enum Steps {
-  ConnectLedger = 0,
-  ExternalInputs = 1,
-  ConfirmTransaction = 2,
-}
-
-type Props = {
-  currentStep: Steps;
-  isConnectSuccess: boolean;
-  isConnectFailed: boolean;
-  isTxRejected: boolean;
-  t: TFunction<'translation', 'CONFIRM_TRANSACTION'>;
-  signatureRequestTranslate: TFunction<'translation', 'SIGNATURE_REQUEST'>;
-};
-
-function LedgerStepView({
-  currentStep,
-  isConnectSuccess,
-  isConnectFailed,
-  isTxRejected,
-  t,
-  signatureRequestTranslate,
-}: Props) {
-  switch (currentStep) {
-    case Steps.ConnectLedger:
-      return (
-        <LedgerConnectionView
-          title={signatureRequestTranslate('LEDGER.CONNECT.TITLE')}
-          text={signatureRequestTranslate('LEDGER.CONNECT.SUBTITLE', { name: 'Bitcoin' })}
-          titleFailed={signatureRequestTranslate('LEDGER.CONNECT.ERROR_TITLE')}
-          textFailed={signatureRequestTranslate('LEDGER.CONNECT.ERROR_SUBTITLE')}
-          imageDefault={ledgerConnectBtcIcon}
-          isConnectSuccess={isConnectSuccess}
-          isConnectFailed={isConnectFailed}
-        />
-      );
-    case Steps.ExternalInputs:
-      if (isTxRejected || isConnectFailed) {
-        return (
-          <LedgerFailView title={t('CONFIRM.ERROR_TITLE')} text={t('CONFIRM.ERROR_SUBTITLE')} />
-        );
-      }
-
-      return (
-        <div>
-          <ConnectLedgerContainer>
-            <InfoImage src={InfoIcon} alt="external inputs warning" />
-            <ConnectLedgerTitle textAlign="center">
-              {t('LEDGER.INPUTS_WARNING.EXTERNAL_INPUTS')} / <br />
-              {t('LEDGER.INPUTS_WARNING.NON_DEFAULT_SIGHASH')}
-            </ConnectLedgerTitle>
-            <ConnectLedgerText>{t('LEDGER.INPUTS_WARNING.SUBTITLE')}</ConnectLedgerText>
-          </ConnectLedgerContainer>
-        </div>
-      );
-    case Steps.ConfirmTransaction:
-      return (
-        <LedgerConnectionView
-          title={signatureRequestTranslate('LEDGER.CONFIRM.TITLE')}
-          text={signatureRequestTranslate('LEDGER.CONFIRM.SUBTITLE')}
-          titleFailed={signatureRequestTranslate('LEDGER.CONFIRM.ERROR_TITLE')}
-          textFailed={signatureRequestTranslate('LEDGER.CONFIRM.ERROR_SUBTITLE')}
-          imageDefault={ledgerConnectDefaultIcon}
-          isConnectSuccess={false}
-          isConnectFailed={isTxRejected}
-        />
-      );
-    default:
-      return null;
-  }
-}
-
-export default LedgerStepView;

From 0aad909fa266a4cc0a263f77e93179712cfaf0bf Mon Sep 17 00:00:00 2001
From: Mahmoud Aboelenein <mahmoud@secretkeylabs.com>
Date: Mon, 7 Oct 2024 15:47:02 +0300
Subject: [PATCH 169/227] [ENG-5298] fix: Asigna - Custom fee is ignored for
 STX transaction requests (#647)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Change nullish coalescing to ternary (#639)

* Remove unreachable expressions (#641)

* fix initial fee not passed

---------

Co-authored-by: Eduard Bardají Puig <ebardaji@gmail.com>
Co-authored-by: Den <36603049+dhriaznov@users.noreply.github.com>
---
 .../confirmStxTransactionComponent/index.tsx  |  1 -
 .../components/rareSatIcon/rareSatIcon.tsx    |  4 +--
 .../ContractCallRequest.tsx                   | 19 +++++++------
 src/app/screens/swap/useMasterCoinsList.tsx   | 11 ++++----
 .../swap/useVisibleMasterCoinsList.tsx        | 13 ++++-----
 src/app/screens/transactionRequest/index.tsx  |  4 +--
 src/app/ui-components/selectFeeRate/index.tsx | 28 ++++++++-----------
 7 files changed, 36 insertions(+), 44 deletions(-)

diff --git a/src/app/components/confirmStxTransactionComponent/index.tsx b/src/app/components/confirmStxTransactionComponent/index.tsx
index 644484171..faf7f8e58 100644
--- a/src/app/components/confirmStxTransactionComponent/index.tsx
+++ b/src/app/components/confirmStxTransactionComponent/index.tsx
@@ -19,7 +19,6 @@ import {
   getNonce,
   getStxFiatEquivalent,
   microstacksToStx,
-  nextBestNonce,
   signLedgerStxTransaction,
   signMultiStxTransactions,
   signTransaction,
diff --git a/src/app/components/rareSatIcon/rareSatIcon.tsx b/src/app/components/rareSatIcon/rareSatIcon.tsx
index 9a2a4e376..79130d074 100644
--- a/src/app/components/rareSatIcon/rareSatIcon.tsx
+++ b/src/app/components/rareSatIcon/rareSatIcon.tsx
@@ -35,8 +35,8 @@ import styled from 'styled-components';
 
 const Image = styled.img<{ size?: number }>`
   object-fit: cover;
-  width: ${(props) => `${props.size}px` ?? '100%'};
-  height: ${(props) => `${props.size}px` ?? '100%'};
+  width: ${(props) => (typeof props.size === 'undefined' ? '100%' : `${props.size}px`)};
+  height: ${(props) => (typeof props.size === 'undefined' ? '100%' : `${props.size}px`)};
 `;
 
 interface Props {
diff --git a/src/app/components/transactionsRequests/ContractCallRequest.tsx b/src/app/components/transactionsRequests/ContractCallRequest.tsx
index 697a4c44f..13ff30087 100644
--- a/src/app/components/transactionsRequests/ContractCallRequest.tsx
+++ b/src/app/components/transactionsRequests/ContractCallRequest.tsx
@@ -19,7 +19,6 @@ import useExecuteOrder from '@screens/swap/components/psbtConfirmation/useExecut
 import {
   addressToString,
   broadcastSignedTransaction,
-  buf2hex,
   extractFromPayload,
   isMultiSig,
   microstacksToStx,
@@ -111,7 +110,9 @@ export default function ContractCallRequest({
   const selectedNetwork = useNetworkSelector();
   const [hasTabClosed, setHasTabClosed] = useState(false);
   const { t } = useTranslation('translation');
-  const [fee, setFee] = useState<BigNumber | undefined>(undefined);
+  const [fee, setFee] = useState<BigNumber | undefined>(
+    new BigNumber(unsignedTx.auth.spendingCondition.fee.toString()),
+  );
   const { executeStxOrder } = useExecuteOrder();
   const [isLoading, setIsLoading] = useState(false);
   const isStxSwap = messageId === 'velar' || messageId === 'alex';
@@ -213,7 +214,7 @@ export default function ContractCallRequest({
             sendSignTransactionSuccessResponseMessage({
               tabId,
               messageId,
-              result: { transaction: buf2hex(tx[0].serialize()) },
+              result: { transaction: Buffer.from(tx[0].serialize()).toString('hex') },
             });
             break;
           }
@@ -222,7 +223,7 @@ export default function ContractCallRequest({
               tabId,
               messageId,
               result: {
-                transaction: buf2hex(tx[0].serialize()),
+                transaction: Buffer.from(tx[0].serialize()).toString('hex'),
                 txid: txId,
               },
             });
@@ -237,7 +238,7 @@ export default function ContractCallRequest({
         finalizeTxSignature({
           requestPayload: requestToken,
           tabId,
-          data: { txId, txRaw: buf2hex(tx[0].serialize()) },
+          data: { txId, txRaw: Buffer.from(tx[0].serialize()).toString('hex') },
         });
       }
       navigate('/tx-status', {
@@ -271,7 +272,7 @@ export default function ContractCallRequest({
     if (isStxSwap) {
       const order: ExecuteStxOrderRequest = {
         providerCode: messageId,
-        signedTransaction: buf2hex(transactions[0].serialize()),
+        signedTransaction: Buffer.from(transactions[0].serialize()).toString('hex'),
       };
       setIsLoading(true);
       const response = await executeStxOrder(order);
@@ -300,7 +301,7 @@ export default function ContractCallRequest({
             sendSignTransactionSuccessResponseMessage({
               tabId,
               messageId,
-              result: { transaction: buf2hex(unsignedTx.serialize()) },
+              result: { transaction: Buffer.from(unsignedTx.serialize()).toString('hex') },
             });
             break;
           }
@@ -322,7 +323,7 @@ export default function ContractCallRequest({
             sendSignTransactionSuccessResponseMessage({
               tabId,
               messageId,
-              result: { transaction: buf2hex(unsignedTx.serialize()) },
+              result: { transaction: Buffer.from(unsignedTx.serialize()).toString('hex') },
             });
             break;
           }
@@ -334,7 +335,7 @@ export default function ContractCallRequest({
         finalizeTxSignature({
           requestPayload: requestToken,
           tabId,
-          data: { txId: '', txRaw: buf2hex(unsignedTx.serialize()) },
+          data: { txId: '', txRaw: Buffer.from(unsignedTx.serialize()).toString('hex') },
         });
       }
       window.close();
diff --git a/src/app/screens/swap/useMasterCoinsList.tsx b/src/app/screens/swap/useMasterCoinsList.tsx
index 51cfd440e..2beb12cb8 100644
--- a/src/app/screens/swap/useMasterCoinsList.tsx
+++ b/src/app/screens/swap/useMasterCoinsList.tsx
@@ -36,12 +36,11 @@ const useMasterCoinsList = () => {
   const isStacksSwapsEnabled = useHasFeature(FeatureId.STACKS_SWAPS);
 
   const coinsMasterList = useMemo(
-    () =>
-      [
-        ...(runesFtList || []),
-        btcFt,
-        ...(!hideStx && isStacksSwapsEnabled ? [stxFt, ...(sip10FtList ?? [])] : []),
-      ] ?? [],
+    () => [
+      ...(runesFtList || []),
+      btcFt,
+      ...(!hideStx && isStacksSwapsEnabled ? [stxFt, ...(sip10FtList ?? [])] : []),
+    ],
     [runesFtList, hideStx, isStacksSwapsEnabled, sip10FtList],
   );
 
diff --git a/src/app/screens/swap/useVisibleMasterCoinsList.tsx b/src/app/screens/swap/useVisibleMasterCoinsList.tsx
index c50669170..d8d0a0267 100644
--- a/src/app/screens/swap/useVisibleMasterCoinsList.tsx
+++ b/src/app/screens/swap/useVisibleMasterCoinsList.tsx
@@ -14,13 +14,12 @@ const useVisibleMasterCoinsList = () => {
   const { hideStx } = useWalletSelector();
 
   const coinsMasterList = useMemo(
-    () =>
-      [
-        ...sip10FtList,
-        ...runesFtList,
-        btcFt,
-        ...(!hideStx && isStacksSwapsEnabled ? [stxFt] : []),
-      ] ?? [],
+    () => [
+      ...sip10FtList,
+      ...runesFtList,
+      btcFt,
+      ...(!hideStx && isStacksSwapsEnabled ? [stxFt] : []),
+    ],
     [sip10FtList, runesFtList, hideStx, isStacksSwapsEnabled],
   );
 
diff --git a/src/app/screens/transactionRequest/index.tsx b/src/app/screens/transactionRequest/index.tsx
index 77e4a500d..784b8e7ec 100644
--- a/src/app/screens/transactionRequest/index.tsx
+++ b/src/app/screens/transactionRequest/index.tsx
@@ -7,7 +7,6 @@ import useTrackMixPanelPageViewed from '@hooks/useTrackMixPanelPageViewed';
 import useWalletReducer from '@hooks/useWalletReducer';
 import useWalletSelector from '@hooks/useWalletSelector';
 import {
-  buf2hex,
   createDeployContractRequest,
   extractFromPayload,
   fetchStxPendingTxData,
@@ -91,7 +90,7 @@ function TransactionRequest() {
 
     navigate(RoutePaths.ConfirmStacksTransaction, {
       state: {
-        unsignedTx: buf2hex(unsignedSendStxTx.serialize()),
+        unsignedTx: Buffer.from(unsignedSendStxTx.serialize()).toString('hex'),
         sponsored: tokenTransferPayload.sponsored,
         isBrowserTx: !dataStxSignTransactionOverride,
         tabId,
@@ -167,7 +166,6 @@ function TransactionRequest() {
     } else if (payload.txType === 'smart_contract') {
       await handleContractDeployRequest(payload, requestAccount);
     } else {
-      console.log(payload);
       navigate(RoutePaths.ConfirmStacksTransaction, {
         state: {
           unsignedTx: payload.txHex,
diff --git a/src/app/ui-components/selectFeeRate/index.tsx b/src/app/ui-components/selectFeeRate/index.tsx
index cb8dbcda5..d9b35d4ac 100644
--- a/src/app/ui-components/selectFeeRate/index.tsx
+++ b/src/app/ui-components/selectFeeRate/index.tsx
@@ -109,22 +109,18 @@ function SelectFeeRate({
   const [selected, setSelected] = useState<FeePriority | 'custom' | null>(null);
 
   useEffect(() => {
-    if (feeRate) {
-      if (feeRate === feeRates.high?.toString()) {
-        if (!selected) {
-          setSelected('high');
-        }
-      }
-      if (feeRate === feeRates.medium?.toString()) {
-        if (!selected) {
-          setSelected('medium');
-        }
-      }
-      if (feeRate === feeRates.low?.toString()) {
-        if (!selected) {
-          setSelected('low');
-        }
-      }
+    if (!feeRate || selected) return;
+
+    const feeRateString = feeRate.toString();
+
+    if (feeRateString === feeRates.high?.toString()) {
+      setSelected('high');
+    } else if (feeRateString === feeRates.medium?.toString()) {
+      setSelected('medium');
+    } else if (feeRateString === feeRates.low?.toString()) {
+      setSelected('low');
+    } else {
+      setSelected('custom');
     }
   }, [feeRates, feeRate, selected]);
 

From 73e680c85f4d9329c9921848918f74460a1e059b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Eduard=20Bardaj=C3=AD=20Puig?= <ebardaji@gmail.com>
Date: Mon, 7 Oct 2024 15:48:47 +0100
Subject: [PATCH 170/227] Prep for ts upgrade 1 (#640)

* Remove non-null assertion

* Remove unreachable expression

* Restore expression and remove nullish coalescing

---------

Co-authored-by: Den <36603049+dhriaznov@users.noreply.github.com>
---
 src/app/components/showBtcReceiveAlert/index.tsx     | 2 +-
 src/app/components/showOrdinalReceiveAlert/index.tsx | 2 +-
 src/app/screens/listRune/index.tsx                   | 6 ++----
 3 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/src/app/components/showBtcReceiveAlert/index.tsx b/src/app/components/showBtcReceiveAlert/index.tsx
index 17858b063..6394c11c6 100644
--- a/src/app/components/showBtcReceiveAlert/index.tsx
+++ b/src/app/components/showBtcReceiveAlert/index.tsx
@@ -26,7 +26,7 @@ function ShowBtcReceiveAlert({ onReceiveAlertClose }: Props) {
       onButtonClick={onReceiveAlertClose}
       tickMarkButtonText={t('DO_NOT_SHOW_MESSAGE')}
       tickMarkButtonClick={onToggleReceiveBtcAlert}
-      tickMarkButtonChecked={!showBtcReceiveAlert ?? false}
+      tickMarkButtonChecked={!showBtcReceiveAlert}
     />
   );
 }
diff --git a/src/app/components/showOrdinalReceiveAlert/index.tsx b/src/app/components/showOrdinalReceiveAlert/index.tsx
index 53859972e..240c2d657 100644
--- a/src/app/components/showOrdinalReceiveAlert/index.tsx
+++ b/src/app/components/showOrdinalReceiveAlert/index.tsx
@@ -26,7 +26,7 @@ function ShowOrdinalReceiveAlert({ onOrdinalReceiveAlertClose }: Props) {
       onButtonClick={onOrdinalReceiveAlertClose}
       tickMarkButtonText={t('DO_NOT_SHOW_MESSAGE')}
       tickMarkButtonClick={onToggleReceiveOrdinalAlert}
-      tickMarkButtonChecked={!showOrdinalReceiveAlert ?? false}
+      tickMarkButtonChecked={!showOrdinalReceiveAlert}
     />
   );
 }
diff --git a/src/app/screens/listRune/index.tsx b/src/app/screens/listRune/index.tsx
index 48e11c987..4589a802e 100644
--- a/src/app/screens/listRune/index.tsx
+++ b/src/app/screens/listRune/index.tsx
@@ -231,15 +231,13 @@ export default function ListRuneScreen() {
     dispatch({ type: 'UPDATE_ONE_LIST_ITEM', key, payload: updatedSelectedListItem });
     if (
       Object.values(listItemsMap).filter((listItem) => listItem.selected).length ===
-        listItemsResponse?.length ??
-      0
+      listItemsResponse?.length
     ) {
       dispatch({ type: 'SET_SELECT_ALL_TOGGLE', payload: true });
     }
     if (
       Object.values(listItemsMap).filter((listItem) => !listItem.selected).length ===
-        listItemsResponse?.length ??
-      0
+      listItemsResponse?.length
     ) {
       dispatch({ type: 'SET_SELECT_ALL_TOGGLE', payload: false });
     }

From 7e9abfcd585f2d5e0ff9d0b1a5e94c86a07f6851 Mon Sep 17 00:00:00 2001
From: "Duska.T" <55587184+DuskaT021@users.noreply.github.com>
Date: Tue, 8 Oct 2024 12:02:48 +0200
Subject: [PATCH 171/227] =?UTF-8?q?Removed=20the=20old=20test=20and=20adde?=
 =?UTF-8?q?d=20a=20new=20test=20for=20the=20send=20STX=20flow=20but=20b?=
 =?UTF-8?q?=E2=80=A6=20(#665)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Removed the old test and added a new test for the send STX flow but better

* clean up code and added comments

* Update tests/specs/transactionSTX.spec.ts

Co-authored-by: Terence Ng <ngtere@live.com.sg>

---------

Co-authored-by: Terence Ng <ngtere@live.com.sg>
---
 tests/specs/transactionSTX.spec.ts | 83 +++++++++++-------------------
 1 file changed, 31 insertions(+), 52 deletions(-)

diff --git a/tests/specs/transactionSTX.spec.ts b/tests/specs/transactionSTX.spec.ts
index fae696298..db74f12bc 100644
--- a/tests/specs/transactionSTX.spec.ts
+++ b/tests/specs/transactionSTX.spec.ts
@@ -53,60 +53,39 @@ test.describe('Transaction STX', () => {
     await expect(page.getByRole('button', { name: /insufficient funds/i })).toBeVisible();
   });
 
-  test('Send STX - Cancel transaction testnet', async ({ page, extensionId }) => {
-    // Restore wallet and setup Testnet network
+  test('Send STX - Cancel transaction mainnet', async ({ page, extensionId }) => {
+    // Restore wallet and setup Mainnet network
     const wallet = new Wallet(page);
-    await wallet.setupTest(extensionId, 'SEED_WORDS1', true);
-
-    // Save initial Balance for later Balance checks
-    const initialSTXBalance = await wallet.getTokenBalance('Stacks');
-
-    // Click on send button
-    await wallet.buttonTransactionSend.click();
-
-    await expect(await wallet.divTokenRow.count()).toBeGreaterThanOrEqual(2);
-    await wallet.clickOnSpecificToken('Stacks');
-    await wallet.checkVisualsSendPage1('send-stx', true);
-
-    // Fill in Receiver Address
-    await wallet.inputField.first().fill(STXTest);
-    await expect(wallet.buttonNext).toBeEnabled();
-    await wallet.buttonNext.click();
-
-    // Send Amount
-    await wallet.checkVisualsSendPage2('', true);
-    await wallet.inputField.first().fill(amountSTXSend.toString());
-    await expect(wallet.buttonNext).toBeEnabled();
-
-    // Balance check
-    const displayBalance = await wallet.labelBalanceAmountSelector.innerText();
-    const displayBalanceNumerical = parseFloat(displayBalance.replace(/[^0-9.]/g, ''));
-    await expect(initialSTXBalance).toEqual(displayBalanceNumerical);
-
-    // Save Fees to check on next Page
-    const fee = await wallet.feeAmount.innerText();
-    const sendFee = parseFloat(fee.replace(/[^0-9.]/g, ''));
-
-    await wallet.buttonNext.click();
-
-    // Transaction Review Page
-    await wallet.checkVisualsSendSTXPage3();
-
-    // Check correct amounts
-    await wallet.checkAmountsSendingSTX(amountSTXSend, STXTest, sendFee);
-
-    await wallet.switchToHighFees();
-
-    // Cancel the transaction
-    await expect(wallet.buttonCancel).toBeEnabled();
-    await wallet.buttonCancel.click();
-
-    // Check startpage
-    await wallet.checkVisualsStartpage();
+    await wallet.setupTest(extensionId, 'SEED_WORDS1', false);
 
-    // Check STX Balance after cancel the transaction
-    const balanceAfterCancel = await wallet.getTokenBalance('Stacks');
-    await expect(initialSTXBalance).toEqual(balanceAfterCancel);
+    await page.getByText('STX').click();
+    await page.getByRole('button', { name: /send/i }).click();
+    await page.getByRole('textbox', { name: /STX Address or .btc domain/i }).fill('zhfr.btc');
+    await expect(page.getByText(/associated address/i)).toBeVisible();
+    await expect(page.getByText(/SP2VCZJDTT5TJ7A3QPPJPTEF7A9CD8FRG2BEEJF3D/i)).toBeVisible();
+    await expect(page.getByRole('button', { name: /next/i })).toBeEnabled();
+    await page.getByRole('button', { name: /next/i }).click();
+    await page.getByRole('textbox', { name: /0/i }).last().fill('1');
+
+    // edit fee component set to custom
+    await page.getByRole('button', { name: /edit/i }).click();
+    await page.getByRole('button', { name: /custom/i }).click();
+    await page.getByRole('textbox', { name: /0/i }).last().fill('0.0974');
+    await page.getByRole('button', { name: /apply/i }).click();
+    await page.getByRole('button', { name: /next/i }).click();
+
+    // review transaction screen and clicking cancel btn
+    await expect(page.getByText(/review transaction/i)).toBeVisible();
+    await expect(page.getByText(/you will send/i)).toBeVisible();
+    await expect(page.getByText(/SP2VCZ...EEJF3D/i)).toBeVisible();
+    await expect(page.getByText(/Mainnet/i)).toBeVisible();
+    await expect(page.getByText(/0.0974 STX/i)).toBeVisible();
+    await expect(page.getByText(/1 STX/i)).toBeVisible();
+    await expect(page.getByRole('button', { name: /confirm/i })).toBeVisible();
+    await page.getByRole('button', { name: /cancel/i }).click();
+
+    // arriving to homepage
+    await page.url().includes('/options.html');
   });
 
   test('Send STX - confirm transaction testnet #localexecution', async ({ page, extensionId }) => {

From 62ea3f3fb068e8961352c7de8b9ce2f40b0f29ad Mon Sep 17 00:00:00 2001
From: "Duska.T" <55587184+DuskaT021@users.noreply.github.com>
Date: Tue, 8 Oct 2024 16:10:39 +0200
Subject: [PATCH 172/227] reenabled the list button for ledger accounts (#667)

* reenabled the list button for ledger accounts

* Update src/app/screens/coinDashboard/coinHeader.tsx

Co-authored-by: Den <36603049+dhriaznov@users.noreply.github.com>

---------

Co-authored-by: Den <36603049+dhriaznov@users.noreply.github.com>
---
 src/app/screens/coinDashboard/coinHeader.tsx | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/src/app/screens/coinDashboard/coinHeader.tsx b/src/app/screens/coinDashboard/coinHeader.tsx
index e74337d8b..53530b8fb 100644
--- a/src/app/screens/coinDashboard/coinHeader.tsx
+++ b/src/app/screens/coinDashboard/coinHeader.tsx
@@ -58,7 +58,7 @@ type Props = {
 
 export default function CoinHeader({ currency, fungibleToken }: Props) {
   const selectedAccount = useSelectedAccount();
-  const { fiatCurrency, network, selectedAccountType } = useWalletSelector();
+  const { fiatCurrency, network } = useWalletSelector();
   const { data: btcBalance } = useBtcWalletData();
   const { data: stxData } = useStxWalletData();
   const { btcFiatRate, stxBtcRate } = useCoinRates();
@@ -70,9 +70,7 @@ export default function CoinHeader({ currency, fungibleToken }: Props) {
   const showRunesListing =
     (useHasFeature(FeatureId.RUNES_LISTING) || process.env.NODE_ENV === 'development') &&
     network.type === 'Mainnet' &&
-    fungibleToken?.protocol === 'runes' &&
-    // TODO: remove this once we implement ledger batch PSBT signing flow
-    selectedAccountType !== 'ledger';
+    fungibleToken?.protocol === 'runes';
 
   const handleReceiveModalOpen = () => {
     setOpenReceiveModal(true);

From d8767ff0c912488658eacb551f18b186845d267a Mon Sep 17 00:00:00 2001
From: Den <36603049+dhriaznov@users.noreply.github.com>
Date: Wed, 9 Oct 2024 17:19:14 +0200
Subject: [PATCH 173/227] Resolve git conflicts (#668)

---
 package-lock.json                             |  14 +-
 package.json                                  |   2 +-
 src/app/components/batchPsbtSigning/index.tsx |   3 +-
 .../confirmBtcTransaction/itemRow/amount.tsx  |   4 +-
 .../itemRow/rareSats.tsx                      |   2 -
 .../sections/feeSection.tsx                   |   4 +-
 .../confirmStxTransactionComponent/index.tsx  |   5 +-
 .../ledger/ledgerAssetSelectCard/index.tsx    |   5 +-
 .../components/ledgerSteps/ledgerStepView.tsx |   2 +-
 .../components/recipientComponent/index.tsx   |   4 +-
 src/app/components/resetWallet/index.tsx      |   1 +
 src/app/components/screenContainer/index.tsx  |   3 +-
 .../components/showBtcReceiveAlert/index.tsx  |   2 +-
 .../showOrdinalReceiveAlert/index.tsx         |   2 +-
 src/app/components/speedUpTransaction/btc.tsx |   4 +-
 src/app/components/speedUpTransaction/stx.tsx |   4 +-
 src/app/components/stepper/index.tsx          | 121 ----
 src/app/components/tokenTile/index.tsx        |   4 +-
 .../transactionSetting/editBtcFee.tsx         | 408 -------------
 .../transactionSetting/editStxFee.tsx         |  17 +-
 .../components/transactionSetting/feeItem.tsx | 186 ------
 .../components/transactionSetting/index.tsx   | 138 +----
 src/app/components/transferFeeView/index.tsx  |   4 +-
 src/app/hooks/queries/useAccountBalance.ts    |   4 +-
 ...eCoinRates.ts => useSupportedCoinRates.ts} |  31 +-
 src/app/hooks/useBtcFeeRate.ts                |   7 +-
 src/app/hooks/useBtcFees.ts                   | 116 ----
 src/app/hooks/useWalletReducer.ts             |  42 +-
 src/app/routes/index.tsx                      |   6 +-
 src/app/screens/backupWallet/index.tsx        |  10 +-
 src/app/screens/coinDashboard/coinHeader.tsx  |   4 +-
 src/app/screens/coinDashboard/index.tsx       |   3 +-
 .../coinDashboard/transactionsHistoryList.tsx |  55 +-
 .../screens/confirmBrc20Transaction/index.tsx |   4 +-
 .../screens/confirmFtTransaction/index.tsx    |   6 +-
 .../screens/confirmNftTransaction/index.tsx   |   6 +-
 .../screens/confirmStxTransaction/index.tsx   |   6 +-
 src/app/screens/createInscription/index.tsx   |   4 +-
 src/app/screens/home/balanceCard/index.tsx    |   4 +-
 src/app/screens/home/index.tsx                |   4 +-
 .../index.styled.ts                           |  22 -
 .../confirmLedgerStxTransaction/index.tsx     | 314 ++++++++++
 .../ledger/confirmLedgerTransaction/index.tsx | 575 ------------------
 .../importLedgerAccount/steps/index.styled.ts |  87 +--
 .../importLedgerAccount/steps/index.tsx       |  16 +-
 src/app/screens/listRune/index.tsx            |  10 +-
 src/app/screens/listRune/setRunePriceItem.tsx |   4 +-
 src/app/screens/ordinalDetail/index.tsx       |   4 +-
 src/app/screens/sendBtc/amountSelector.tsx    |   4 +-
 src/app/screens/sendRune/amountSelector.tsx   |   4 +-
 .../sendStx/steps/Step2SelectAmount.tsx       |   4 +-
 src/app/screens/sendStx/stxAmountSelector.tsx |   4 +-
 src/app/screens/settings/index.tsx            |   4 +-
 .../preferences/fiatCurrency/currencyRow.tsx  |   2 +-
 .../settings/security/backupWallet/index.tsx  |  28 +-
 src/app/screens/settings/security/index.tsx   |   1 +
 .../settings/settingComponent/index.tsx       |  15 +-
 src/app/screens/signPsbtRequest/index.tsx     |   4 +-
 .../screens/signPsbtRequest/useSignPsbt.ts    |  28 +-
 .../speedUpTransaction/customFee/index.tsx    |   4 +-
 src/app/screens/speedUpTransaction/index.tsx  |   4 +-
 .../tokenFromBottomSheet/useFromTokens.ts     |   4 +-
 src/app/screens/swap/index.tsx                |   4 +-
 src/app/screens/swap/quoteSummary/index.tsx   |   4 +-
 src/app/screens/swap/quotesModal/index.tsx    |   4 +-
 src/app/screens/swap/utxoSelection/index.tsx  |   4 +-
 .../marketplaceRuneListingResults.tsx         |  24 +-
 src/app/ui-components/btcAmountSelector.tsx   |   4 +-
 src/app/ui-library/button.tsx                 |  19 +-
 src/app/utils/constants.ts                    |   2 -
 src/app/utils/currency.ts                     |  83 ++-
 .../settings/currencies/{aud.svg => aus.svg}  |   0
 .../settings/currencies/{brl.svg => bra.svg}  |   0
 .../settings/currencies/{cad.svg => can.svg}  |   0
 src/assets/img/settings/currencies/che.svg    |  12 +
 .../settings/currencies/{cny.svg => chn.svg}  |   0
 .../settings/currencies/{eur.svg => eu.svg}   |   0
 .../settings/currencies/{gbp.svg => gbr.svg}  |   0
 .../settings/currencies/{hkd.svg => hkg.svg}  |   0
 src/assets/img/settings/currencies/hun.svg    |  12 +
 src/assets/img/settings/currencies/idn.svg    |  11 +
 src/assets/img/settings/currencies/ind.svg    |  17 +
 .../settings/currencies/{jpy.svg => jpn.svg}  |   0
 .../settings/currencies/{krw.svg => kor.svg}  |   0
 src/assets/img/settings/currencies/mex.svg    | 467 ++++++++++++++
 src/assets/img/settings/currencies/mys.svg    |  14 +
 src/assets/img/settings/currencies/nga.svg    |  11 +
 src/assets/img/settings/currencies/pak.svg    |  13 +
 src/assets/img/settings/currencies/phl.svg    |  13 +
 src/assets/img/settings/currencies/pol.svg    |  11 +
 .../settings/currencies/{rub.svg => rus.svg}  |   0
 .../settings/currencies/{sgd.svg => sgp.svg}  |   0
 src/assets/img/settings/currencies/tha.svg    |  12 +
 src/assets/img/settings/currencies/tur.svg    |  13 +
 src/assets/img/settings/currencies/twn.svg    |  34 ++
 .../settings/currencies/{usd.svg => usa.svg}  |   0
 src/assets/img/settings/currencies/vnm.svg    |  11 +
 src/assets/img/settings/currencies/zaf.svg    |  15 +
 src/common/types/ledger.ts                    |  10 +-
 src/locales/en.json                           |  12 +-
 tests/specs/transactionHistory.spec.ts        |   2 +-
 101 files changed, 1329 insertions(+), 1902 deletions(-)
 delete mode 100644 src/app/components/stepper/index.tsx
 delete mode 100644 src/app/components/transactionSetting/editBtcFee.tsx
 delete mode 100644 src/app/components/transactionSetting/feeItem.tsx
 rename src/app/hooks/queries/{useCoinRates.ts => useSupportedCoinRates.ts} (54%)
 delete mode 100644 src/app/hooks/useBtcFees.ts
 rename src/app/screens/ledger/{confirmLedgerTransaction => confirmLedgerStxTransaction}/index.styled.ts (77%)
 create mode 100644 src/app/screens/ledger/confirmLedgerStxTransaction/index.tsx
 delete mode 100644 src/app/screens/ledger/confirmLedgerTransaction/index.tsx
 rename src/assets/img/settings/currencies/{aud.svg => aus.svg} (100%)
 rename src/assets/img/settings/currencies/{brl.svg => bra.svg} (100%)
 rename src/assets/img/settings/currencies/{cad.svg => can.svg} (100%)
 create mode 100644 src/assets/img/settings/currencies/che.svg
 rename src/assets/img/settings/currencies/{cny.svg => chn.svg} (100%)
 rename src/assets/img/settings/currencies/{eur.svg => eu.svg} (100%)
 rename src/assets/img/settings/currencies/{gbp.svg => gbr.svg} (100%)
 rename src/assets/img/settings/currencies/{hkd.svg => hkg.svg} (100%)
 create mode 100644 src/assets/img/settings/currencies/hun.svg
 create mode 100644 src/assets/img/settings/currencies/idn.svg
 create mode 100644 src/assets/img/settings/currencies/ind.svg
 rename src/assets/img/settings/currencies/{jpy.svg => jpn.svg} (100%)
 rename src/assets/img/settings/currencies/{krw.svg => kor.svg} (100%)
 create mode 100644 src/assets/img/settings/currencies/mex.svg
 create mode 100644 src/assets/img/settings/currencies/mys.svg
 create mode 100644 src/assets/img/settings/currencies/nga.svg
 create mode 100644 src/assets/img/settings/currencies/pak.svg
 create mode 100644 src/assets/img/settings/currencies/phl.svg
 create mode 100644 src/assets/img/settings/currencies/pol.svg
 rename src/assets/img/settings/currencies/{rub.svg => rus.svg} (100%)
 rename src/assets/img/settings/currencies/{sgd.svg => sgp.svg} (100%)
 create mode 100644 src/assets/img/settings/currencies/tha.svg
 create mode 100644 src/assets/img/settings/currencies/tur.svg
 create mode 100644 src/assets/img/settings/currencies/twn.svg
 rename src/assets/img/settings/currencies/{usd.svg => usa.svg} (100%)
 create mode 100644 src/assets/img/settings/currencies/vnm.svg
 create mode 100644 src/assets/img/settings/currencies/zaf.svg

diff --git a/package-lock.json b/package-lock.json
index 16ff10803..a08062fb3 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -14,7 +14,7 @@
         "@playwright/test": "1.46.1",
         "@react-spring/web": "^9.6.1",
         "@sats-connect/core": "0.3.0",
-        "@secretkeylabs/xverse-core": "23.0.3",
+        "@secretkeylabs/xverse-core": "24.1.0",
         "@stacks/connect": "7.4.1",
         "@stacks/stacks-blockchain-api-types": "6.1.1",
         "@stacks/transactions": "6.16.1",
@@ -1270,9 +1270,9 @@
       }
     },
     "node_modules/@secretkeylabs/xverse-core": {
-      "version": "23.0.3",
-      "resolved": "https://npm.pkg.github.com/download/@secretkeylabs/xverse-core/23.0.3/e3c8b17a2e4b4e9441a94c2420663e488361115d",
-      "integrity": "sha512-ZIY0CopXhQEANJOtey89lo5MAnIBRmrFhJiPMVNPuLreznM4polvP683LCzDrbK2wdsQaeeK9JNi48zggJ/cng==",
+      "version": "24.1.0",
+      "resolved": "https://npm.pkg.github.com/download/@secretkeylabs/xverse-core/24.1.0/0c57f062dd3c9444e284d101756658251fd8681d",
+      "integrity": "sha512-cc01cykJV5YQhAc09VHwD8Iw7voQ+lqBzZWMJ+B5EXasi97O+dEP80JQs2RCpV2MfdsakZO+9JCweP331UqUbw==",
       "license": "ISC",
       "dependencies": {
         "@bitcoinerlab/secp256k1": "^1.0.2",
@@ -13635,9 +13635,9 @@
       }
     },
     "@secretkeylabs/xverse-core": {
-      "version": "23.0.3",
-      "resolved": "https://npm.pkg.github.com/download/@secretkeylabs/xverse-core/23.0.3/e3c8b17a2e4b4e9441a94c2420663e488361115d",
-      "integrity": "sha512-ZIY0CopXhQEANJOtey89lo5MAnIBRmrFhJiPMVNPuLreznM4polvP683LCzDrbK2wdsQaeeK9JNi48zggJ/cng==",
+      "version": "24.1.0",
+      "resolved": "https://npm.pkg.github.com/download/@secretkeylabs/xverse-core/24.1.0/0c57f062dd3c9444e284d101756658251fd8681d",
+      "integrity": "sha512-cc01cykJV5YQhAc09VHwD8Iw7voQ+lqBzZWMJ+B5EXasi97O+dEP80JQs2RCpV2MfdsakZO+9JCweP331UqUbw==",
       "requires": {
         "@bitcoinerlab/secp256k1": "^1.0.2",
         "@noble/curves": "^1.2.0",
diff --git a/package.json b/package.json
index ce7f76e91..5de46c2ca 100644
--- a/package.json
+++ b/package.json
@@ -42,7 +42,7 @@
     "@playwright/test": "1.46.1",
     "@react-spring/web": "^9.6.1",
     "@sats-connect/core": "0.3.0",
-    "@secretkeylabs/xverse-core": "23.0.3",
+    "@secretkeylabs/xverse-core": "24.1.0",
     "@stacks/connect": "7.4.1",
     "@stacks/stacks-blockchain-api-types": "6.1.1",
     "@stacks/transactions": "6.16.1",
diff --git a/src/app/components/batchPsbtSigning/index.tsx b/src/app/components/batchPsbtSigning/index.tsx
index b88f46822..75ae036fb 100644
--- a/src/app/components/batchPsbtSigning/index.tsx
+++ b/src/app/components/batchPsbtSigning/index.tsx
@@ -65,7 +65,8 @@ function BatchPsbtSigning({ onSigned, psbts, onCancel, onPostSignDone }: BatchPs
   const [isSigningComplete, setIsSigningComplete] = useState(false);
   const [signingPsbtIndex, setSigningPsbtIndex] = useState(1);
   const [currentPsbtIndex, setCurrentPsbtIndex] = useState(0);
-  const [reviewTransaction, setReviewTransaction] = useState(false);
+  const singlePsbt = psbts.length === 1;
+  const [reviewTransaction, setReviewTransaction] = useState(singlePsbt);
   const [isLoading, setIsLoading] = useState(true);
   const [parsedPsbts, setParsedPsbts] = useState<ParsedPsbt[]>([]);
   const [isLedgerModalVisible, setIsLedgerModalVisible] = useState(false);
diff --git a/src/app/components/confirmBtcTransaction/itemRow/amount.tsx b/src/app/components/confirmBtcTransaction/itemRow/amount.tsx
index 932ab340c..6a50349d8 100644
--- a/src/app/components/confirmBtcTransaction/itemRow/amount.tsx
+++ b/src/app/components/confirmBtcTransaction/itemRow/amount.tsx
@@ -1,6 +1,6 @@
 import FiatAmountText from '@components/fiatAmountText';
 import TokenImage from '@components/tokenImage';
-import useCoinRates from '@hooks/queries/useCoinRates';
+import useSupportedCoinRates from '@hooks/queries/useSupportedCoinRates';
 import useWalletSelector from '@hooks/useWalletSelector';
 import { getBtcFiatEquivalent, satsToBtc } from '@secretkeylabs/xverse-core';
 import { StyledP } from '@ui-library/common.styled';
@@ -50,7 +50,7 @@ type Props = {
 
 export default function Amount({ amount }: Props) {
   const { fiatCurrency } = useWalletSelector();
-  const { btcFiatRate } = useCoinRates();
+  const { btcFiatRate } = useSupportedCoinRates();
   const { t } = useTranslation('translation');
 
   if (!amount) return null;
diff --git a/src/app/components/confirmBtcTransaction/itemRow/rareSats.tsx b/src/app/components/confirmBtcTransaction/itemRow/rareSats.tsx
index 660cc77b9..235a67b7f 100644
--- a/src/app/components/confirmBtcTransaction/itemRow/rareSats.tsx
+++ b/src/app/components/confirmBtcTransaction/itemRow/rareSats.tsx
@@ -121,7 +121,6 @@ function RareSats({
                   types: inscriptionSatributes,
                   amount: 0,
                   fromAddress: '',
-                  offset: -1,
                 }}
               />
             </Range>
@@ -144,7 +143,6 @@ function RareSats({
                     types: ['COMMON'],
                     amount: bundleSize - totalExoticSats,
                     fromAddress: '',
-                    offset: -1,
                   }}
                 />
               </Range>
diff --git a/src/app/components/confirmBtcTransaction/sections/feeSection.tsx b/src/app/components/confirmBtcTransaction/sections/feeSection.tsx
index a23b65251..d3f42110e 100644
--- a/src/app/components/confirmBtcTransaction/sections/feeSection.tsx
+++ b/src/app/components/confirmBtcTransaction/sections/feeSection.tsx
@@ -1,5 +1,5 @@
 import TransferFeeView from '@components/transferFeeView';
-import useCoinRates from '@hooks/queries/useCoinRates';
+import useSupportedCoinRates from '@hooks/queries/useSupportedCoinRates';
 import useBtcFeeRate from '@hooks/useBtcFeeRate';
 import useWalletSelector from '@hooks/useWalletSelector';
 import {
@@ -55,7 +55,7 @@ function FeeSection({
   const { t } = useTranslation('translation', { keyPrefix: 'CONFIRM_TRANSACTION' });
   const { t: tUnits } = useTranslation('translation', { keyPrefix: 'UNITS' });
   const { data: recommendedFees } = useBtcFeeRate();
-  const { btcFiatRate } = useCoinRates();
+  const { btcFiatRate } = useSupportedCoinRates();
 
   const { extractedTxSummary } = useTxSummaryContext();
 
diff --git a/src/app/components/confirmStxTransactionComponent/index.tsx b/src/app/components/confirmStxTransactionComponent/index.tsx
index faf7f8e58..27872a42b 100644
--- a/src/app/components/confirmStxTransactionComponent/index.tsx
+++ b/src/app/components/confirmStxTransactionComponent/index.tsx
@@ -5,8 +5,8 @@ import BottomModal from '@components/bottomModal';
 import ActionButton from '@components/button';
 import LedgerConnectionView from '@components/ledger/connectLedgerView';
 import TransactionSettingAlert from '@components/transactionSetting';
-import useCoinRates from '@hooks/queries/useCoinRates';
 import useStxWalletData from '@hooks/queries/useStxWalletData';
+import useSupportedCoinRates from '@hooks/queries/useSupportedCoinRates';
 import useNetworkSelector from '@hooks/useNetwork';
 import useSeedVault from '@hooks/useSeedVault';
 import useSelectedAccount from '@hooks/useSelectedAccount';
@@ -95,7 +95,7 @@ function ConfirmStxTransactionComponent({
     keyPrefix: 'TRANSACTION_SETTING',
   });
   const selectedNetwork = useNetworkSelector();
-  const { stxBtcRate, btcFiatRate } = useCoinRates();
+  const { stxBtcRate, btcFiatRate } = useSupportedCoinRates();
   const { data: stxData } = useStxWalletData();
   const { getSeed } = useSeedVault();
   const [showFeeSettings, setShowFeeSettings] = useState(false);
@@ -396,7 +396,6 @@ function ConfirmStxTransactionComponent({
         <TransactionSettingAlert
           visible={openTransactionSettingModal}
           fee={microstacksToStx(getFee()).toString()}
-          type="STX"
           nonce={getTxNonce()}
           onApplyClick={applyTxSettings}
           onCrossClick={closeTransactionSettingAlert}
diff --git a/src/app/components/ledger/ledgerAssetSelectCard/index.tsx b/src/app/components/ledger/ledgerAssetSelectCard/index.tsx
index 686000cf3..b880faed6 100644
--- a/src/app/components/ledger/ledgerAssetSelectCard/index.tsx
+++ b/src/app/components/ledger/ledgerAssetSelectCard/index.tsx
@@ -12,11 +12,10 @@ const CardContainer = styled.button((props) => ({
   transition: 'background 0.1s ease, border 0.1s ease',
   textAlign: 'left',
   color: props.theme.colors.white_0,
-  background:
-    props.className === 'checked' ? props.theme.colors.background.selectBackground : 'transparent',
+  background: props.theme.colors.elevation1,
   borderRadius: props.theme.radius(2),
   border: `1px solid ${
-    props.className === 'checked' ? props.theme.colors.border.select : props.theme.colors.white_900
+    props.className === 'checked' ? '#7383ff4d' : props.theme.colors.elevation1
   }`,
   userSelect: 'none',
 }));
diff --git a/src/app/components/ledgerSteps/ledgerStepView.tsx b/src/app/components/ledgerSteps/ledgerStepView.tsx
index f656d1a9f..697b262b5 100644
--- a/src/app/components/ledgerSteps/ledgerStepView.tsx
+++ b/src/app/components/ledgerSteps/ledgerStepView.tsx
@@ -9,7 +9,7 @@ import LedgerFailView from '@components/ledger/failLedgerView';
 import {
   ConnectLedgerTitle,
   InfoImage,
-} from '@screens/ledger/confirmLedgerTransaction/index.styled';
+} from '@screens/ledger/confirmLedgerStxTransaction/index.styled';
 import type { TFunction } from 'react-i18next';
 
 export enum Steps {
diff --git a/src/app/components/recipientComponent/index.tsx b/src/app/components/recipientComponent/index.tsx
index 65c101640..5a14ef5ed 100644
--- a/src/app/components/recipientComponent/index.tsx
+++ b/src/app/components/recipientComponent/index.tsx
@@ -3,7 +3,7 @@ import WalletIcon from '@assets/img/transactions/wallet.svg';
 import { StyledFiatAmountText } from '@components/fiatAmountText';
 import TokenImage from '@components/tokenImage';
 import TransferDetailView from '@components/transferDetailView';
-import useCoinRates from '@hooks/queries/useCoinRates';
+import useSupportedCoinRates from '@hooks/queries/useSupportedCoinRates';
 import useSelectedAccount from '@hooks/useSelectedAccount';
 import useWalletSelector from '@hooks/useWalletSelector';
 import { CubeTransparent } from '@phosphor-icons/react';
@@ -155,7 +155,7 @@ function RecipientComponent({
   const [fiatAmount, setFiatAmount] = useState<string | undefined>('0');
   const { ordinalsAddress } = useSelectedAccount();
   const { fiatCurrency } = useWalletSelector();
-  const { btcFiatRate, stxBtcRate } = useCoinRates();
+  const { btcFiatRate, stxBtcRate } = useSupportedCoinRates();
 
   useEffect(() => {
     setFiatAmount(
diff --git a/src/app/components/resetWallet/index.tsx b/src/app/components/resetWallet/index.tsx
index d90dda642..eef9a344d 100644
--- a/src/app/components/resetWallet/index.tsx
+++ b/src/app/components/resetWallet/index.tsx
@@ -31,6 +31,7 @@ function ResetWalletPrompt({
   openResetWalletScreen,
 }: Props) {
   const { t } = useTranslation('translation', { keyPrefix: 'SETTING_SCREEN' });
+
   return (
     <Sheet
       visible={showResetWalletPrompt}
diff --git a/src/app/components/screenContainer/index.tsx b/src/app/components/screenContainer/index.tsx
index 031ecc263..56e97efa9 100644
--- a/src/app/components/screenContainer/index.tsx
+++ b/src/app/components/screenContainer/index.tsx
@@ -13,7 +13,7 @@ const RouteContainer = styled.div`
   width: 360px;
   margin: auto;
   background-color: ${(props) => props.theme.colors.elevation0};
-  border: 1px solid rgba(126, 137, 171, 0.2);
+  border: 1px solid ${(props) => props.theme.colors.elevation2};
   box-shadow: 0px 8px 28px rgba(0, 0, 0, 0.35);
 
   // set some basic responsive properties here for when we load routes
@@ -23,6 +23,7 @@ const RouteContainer = styled.div`
     min-height: 600px;
     max-height: unset;
     height: auto;
+    border-radius: ${(props) => props.theme.radius(2)}px;
   }
 `;
 
diff --git a/src/app/components/showBtcReceiveAlert/index.tsx b/src/app/components/showBtcReceiveAlert/index.tsx
index 17858b063..6394c11c6 100644
--- a/src/app/components/showBtcReceiveAlert/index.tsx
+++ b/src/app/components/showBtcReceiveAlert/index.tsx
@@ -26,7 +26,7 @@ function ShowBtcReceiveAlert({ onReceiveAlertClose }: Props) {
       onButtonClick={onReceiveAlertClose}
       tickMarkButtonText={t('DO_NOT_SHOW_MESSAGE')}
       tickMarkButtonClick={onToggleReceiveBtcAlert}
-      tickMarkButtonChecked={!showBtcReceiveAlert ?? false}
+      tickMarkButtonChecked={!showBtcReceiveAlert}
     />
   );
 }
diff --git a/src/app/components/showOrdinalReceiveAlert/index.tsx b/src/app/components/showOrdinalReceiveAlert/index.tsx
index 53859972e..240c2d657 100644
--- a/src/app/components/showOrdinalReceiveAlert/index.tsx
+++ b/src/app/components/showOrdinalReceiveAlert/index.tsx
@@ -26,7 +26,7 @@ function ShowOrdinalReceiveAlert({ onOrdinalReceiveAlertClose }: Props) {
       onButtonClick={onOrdinalReceiveAlertClose}
       tickMarkButtonText={t('DO_NOT_SHOW_MESSAGE')}
       tickMarkButtonClick={onToggleReceiveOrdinalAlert}
-      tickMarkButtonChecked={!showOrdinalReceiveAlert ?? false}
+      tickMarkButtonChecked={!showOrdinalReceiveAlert}
     />
   );
 }
diff --git a/src/app/components/speedUpTransaction/btc.tsx b/src/app/components/speedUpTransaction/btc.tsx
index f6d69a7ac..59d266a5b 100644
--- a/src/app/components/speedUpTransaction/btc.tsx
+++ b/src/app/components/speedUpTransaction/btc.tsx
@@ -1,5 +1,5 @@
 import FiatAmountText from '@components/fiatAmountText';
-import useCoinRates from '@hooks/queries/useCoinRates';
+import useSupportedCoinRates from '@hooks/queries/useSupportedCoinRates';
 import useWalletSelector from '@hooks/useWalletSelector';
 import { getBtcFiatEquivalent } from '@secretkeylabs/xverse-core';
 import { EMPTY_LABEL } from '@utils/constants';
@@ -74,7 +74,7 @@ function SpeedUpBtcTransaction({
   const { t } = useTranslation('translation', { keyPrefix: 'SPEED_UP_TRANSACTION' });
   const { t: tUnits } = useTranslation('translation', { keyPrefix: 'UNITS' });
   const { fiatCurrency } = useWalletSelector();
-  const { btcFiatRate } = useCoinRates();
+  const { btcFiatRate } = useSupportedCoinRates();
 
   const theme = useTheme();
 
diff --git a/src/app/components/speedUpTransaction/stx.tsx b/src/app/components/speedUpTransaction/stx.tsx
index 69a6d44a8..23d070dff 100644
--- a/src/app/components/speedUpTransaction/stx.tsx
+++ b/src/app/components/speedUpTransaction/stx.tsx
@@ -1,5 +1,5 @@
 import FiatAmountText from '@components/fiatAmountText';
-import useCoinRates from '@hooks/queries/useCoinRates';
+import useSupportedCoinRates from '@hooks/queries/useSupportedCoinRates';
 import useWalletSelector from '@hooks/useWalletSelector';
 import { getStxFiatEquivalent, stxToMicrostacks } from '@secretkeylabs/xverse-core';
 import { EMPTY_LABEL } from '@utils/constants';
@@ -73,7 +73,7 @@ function SpeedUpStxTransaction({
 }: Props) {
   const { t } = useTranslation('translation', { keyPrefix: 'SPEED_UP_TRANSACTION' });
   const { fiatCurrency } = useWalletSelector();
-  const { btcFiatRate, stxBtcRate } = useCoinRates();
+  const { btcFiatRate, stxBtcRate } = useSupportedCoinRates();
   const theme = useTheme();
 
   return (
diff --git a/src/app/components/stepper/index.tsx b/src/app/components/stepper/index.tsx
deleted file mode 100644
index d73bdb191..000000000
--- a/src/app/components/stepper/index.tsx
+++ /dev/null
@@ -1,121 +0,0 @@
-import checkmarkIcon from '@assets/img/checkmarkIcon.svg';
-import styled from 'styled-components';
-
-interface StepperProps {
-  isActive?: boolean;
-  isCompleted?: boolean;
-}
-
-const Container = styled.div({
-  width: '100%',
-  display: 'flex',
-  justifyContent: 'space-between',
-  userSelect: 'none',
-});
-
-const Title = styled.div<StepperProps>((props) => ({
-  marginTop: props.theme.spacing(8),
-  fontSize: '0.875rem',
-  fontWeight: 500,
-  color: props.isActive ? props.theme.colors.white_0 : props.theme.colors.white_600,
-  transition: 'color 0.3s ease',
-}));
-
-const getBackgroundColor = (props) => {
-  if (props.isCompleted) {
-    return props.theme.colors.success_medium;
-  }
-  if (props.isActive) {
-    return '#4C525F';
-  }
-  return 'transparent';
-};
-
-const Dot = styled.div<StepperProps>((props) => ({
-  height: 30,
-  width: 30,
-  backgroundColor: getBackgroundColor(props),
-  border: '2px solid',
-  borderColor: props.isCompleted
-    ? props.theme.colors.success_medium
-    : props.theme.colors.elevation6,
-  borderRadius: '50%',
-  display: 'flex',
-  justifyContent: 'center',
-  alignItems: 'center',
-  color: props.theme.colors.white_0,
-  fontWeight: 'bold',
-  fontSize: '0.875rem',
-  flex: '1 0 auto',
-  transition: 'background-color 0.3s ease, border-color 0.3s ease',
-  '&::after': {
-    content: '""',
-    display: props.isActive ? 'block' : 'none',
-    position: 'absolute',
-    width: 8,
-    height: 8,
-    borderRadius: '50%',
-    backgroundColor: props.theme.colors.white_0,
-  },
-}));
-
-const calculateColorStops = (props) => {
-  const successColor = props.theme.colors.success_medium;
-
-  // Calculate the color stops
-  let startStop: string;
-  if (props.step === 0) startStop = '0%';
-  if (props.step > 1) startStop = '100%';
-  else startStop = '50%';
-  const endStop = props.step > 0 ? '50%' : '0%';
-
-  return `${successColor} ${startStop}, #4C525F ${endStop}`;
-};
-
-type LineProps = { step: number };
-const Line = styled.div<LineProps>((props) => ({
-  height: 2,
-  width: '100%',
-  background: `linear-gradient(90deg, ${calculateColorStops(props)})`,
-  marginTop: props.theme.spacing(8),
-}));
-
-interface Props {
-  steps: { title: string; isCompleted: boolean }[];
-}
-
-// TODO: Make this component more generic
-export default function Stepper({ steps }: Props): JSX.Element {
-  const currentStepIndex = steps.findIndex((step) => !step.isCompleted);
-  const currentStep = currentStepIndex > -1 ? currentStepIndex : steps.length;
-
-  function getContentForDot(stepIndex: number, isCompleted: boolean, currentPosition: number) {
-    if (isCompleted) {
-      return <img src={checkmarkIcon} alt="Check Icon" />;
-    }
-    if (currentPosition !== stepIndex) {
-      return String(stepIndex + 1);
-    }
-    return '';
-  }
-  return (
-    <>
-      <Container>
-        <Dot isCompleted={steps[0].isCompleted} isActive={currentStep === 0}>
-          {getContentForDot(0, steps[0].isCompleted, currentStep)}
-        </Dot>
-        <Line step={currentStep} />
-        <Dot isCompleted={steps[1].isCompleted} isActive={currentStep === 1}>
-          {getContentForDot(1, steps[1].isCompleted, currentStep)}
-        </Dot>
-      </Container>
-      <Container>
-        {steps.map((step, index) => (
-          <Title key={step.title} isActive={currentStep === index}>
-            {step.title}
-          </Title>
-        ))}
-      </Container>
-    </>
-  );
-}
diff --git a/src/app/components/tokenTile/index.tsx b/src/app/components/tokenTile/index.tsx
index 284152719..3e4b452e6 100644
--- a/src/app/components/tokenTile/index.tsx
+++ b/src/app/components/tokenTile/index.tsx
@@ -2,8 +2,8 @@ import { BetterBarLoader } from '@components/barLoader';
 import { StyledFiatAmountText } from '@components/fiatAmountText';
 import TokenImage from '@components/tokenImage';
 import useBtcWalletData from '@hooks/queries/useBtcWalletData';
-import useCoinRates from '@hooks/queries/useCoinRates';
 import useStxWalletData from '@hooks/queries/useStxWalletData';
+import useSupportedCoinRates from '@hooks/queries/useSupportedCoinRates';
 import useWalletSelector from '@hooks/useWalletSelector';
 import { getFiatEquivalent, type FungibleToken } from '@secretkeylabs/xverse-core';
 import type { CurrencyTypes } from '@utils/constants';
@@ -119,7 +119,7 @@ function TokenTile({
   hideBalance = false,
 }: Props) {
   const { fiatCurrency } = useWalletSelector();
-  const { btcFiatRate, stxBtcRate } = useCoinRates();
+  const { btcFiatRate, stxBtcRate } = useSupportedCoinRates();
   const { data: stxData } = useStxWalletData();
   const { data: btcBalance } = useBtcWalletData();
 
diff --git a/src/app/components/transactionSetting/editBtcFee.tsx b/src/app/components/transactionSetting/editBtcFee.tsx
deleted file mode 100644
index eb012a6e1..000000000
--- a/src/app/components/transactionSetting/editBtcFee.tsx
+++ /dev/null
@@ -1,408 +0,0 @@
-import FiatAmountText from '@components/fiatAmountText';
-import useBtcClient from '@hooks/apiClients/useBtcClient';
-import useCoinRates from '@hooks/queries/useCoinRates';
-import useBtcFees from '@hooks/useBtcFees';
-import useDebounce from '@hooks/useDebounce';
-import useOrdinalsByAddress from '@hooks/useOrdinalsByAddress';
-import useSelectedAccount from '@hooks/useSelectedAccount';
-import useWalletSelector from '@hooks/useWalletSelector';
-import { Faders } from '@phosphor-icons/react';
-import {
-  ErrorCodes,
-  getBtcFees,
-  getBtcFeesForNonOrdinalBtcSend,
-  getBtcFeesForOrdinalSend,
-  getBtcFiatEquivalent,
-  type Recipient,
-  type UTXO,
-} from '@secretkeylabs/xverse-core';
-import { StyledP } from '@ui-library/common.styled';
-import BigNumber from 'bignumber.js';
-import { useEffect, useMemo, useRef, useState } from 'react';
-import { useTranslation } from 'react-i18next';
-import { NumericFormat } from 'react-number-format';
-import styled from 'styled-components';
-import Theme from 'theme';
-import FeeItem from './feeItem';
-
-const Container = styled.div((props) => ({
-  display: 'flex',
-  flexDirection: 'column',
-  paddingBottom: props.theme.space.m,
-}));
-
-const DetailText = styled.h1((props) => ({
-  ...props.theme.typography.body_m,
-  color: props.theme.colors.white_200,
-}));
-
-const InputContainer = styled.div<{
-  withError?: boolean;
-}>((props) => ({
-  display: 'flex',
-  flexDirection: 'row',
-  alignItems: 'center',
-  justifyContent: 'space-between',
-  marginTop: props.theme.space.xs,
-  marginBottom: props.theme.space.s,
-  border: `1px solid ${
-    props.withError ? props.theme.colors.danger_medium : props.theme.colors.elevation6
-  }`,
-  backgroundColor: props.theme.colors.elevation1,
-  borderRadius: props.theme.radius(1),
-  padding: props.theme.space.s,
-}));
-
-const InputField = styled.input((props) => ({
-  ...props.theme.typography.body_m,
-  backgroundColor: 'transparent',
-  color: props.theme.colors.white_0,
-  border: 'transparent',
-  width: '50%',
-  '&::-webkit-outer-spin-button': {
-    '-webkit-appearance': 'none',
-    margin: 0,
-  },
-  '&::-webkit-inner-spin-button': {
-    '-webkit-appearance': 'none',
-    margin: 0,
-  },
-  '&[type=number]': {
-    '-moz-appearance': 'textfield',
-  },
-}));
-
-const FeeText = styled.span((props) => ({
-  ...props.theme.typography.body_m,
-  color: props.theme.colors.white_0,
-}));
-
-const FeeContainer = styled.div({
-  display: 'flex',
-  flexDirection: 'column',
-});
-
-const ErrorText = styled.h1((props) => ({
-  ...props.theme.typography.body_s,
-  color: props.theme.colors.danger_light,
-  marginBottom: props.theme.space.xxs,
-}));
-
-const FeePrioritiesContainer = styled.div`
-  display: flex;
-  margin-top: ${(props) => props.theme.space.m};
-  flex-direction: column;
-`;
-
-const FeeItemContainer = styled.button<{
-  isSelected: boolean;
-}>`
-  display: flex;
-  padding: ${(props) => props.theme.space.s} ${(props) => props.theme.space.m};
-  align-items: center;
-  gap: ${(props) => props.theme.space.s};
-  align-self: stretch;
-  border-radius: ${(props) => props.theme.space.s};
-  border: 1px solid ${(props) => props.theme.colors.elevation6};
-  flex-direction: row;
-  background: ${(props) => (props.isSelected ? props.theme.colors.elevation6_600 : 'transparent')};
-  margin-top: ${(props) => props.theme.space.xs};
-  flex: 1;
-  transition: background-color 0.1s ease;
-
-  &:hover:enabled {
-    background-color: ${(props) => props.theme.colors.elevation6_400};
-  }
-
-  &:active:enabled {
-    background-color: ${(props) => props.theme.colors.elevation6_600};
-  }
-`;
-
-const TextRow = styled.div`
-  display: flex;
-  flex-direction: row;
-  justify-content: space-between;
-  flex: 1;
-`;
-
-const CustomTextsContainer = styled.div`
-  display: flex;
-  flex-direction: row;
-  justify-content: space-between;
-  flex: 1;
-`;
-
-const Row = styled.div`
-  display: flex;
-  flex-direction: row;
-  align-items: center;
-`;
-
-const TotalFeeText = styled(StyledP)`
-  margin-right: ${(props) => props.theme.space.xxs};
-`;
-
-type Props = {
-  type?: string;
-  fee: string;
-  feeRate?: BigNumber | string;
-  btcRecipients?: Recipient[];
-  ordinalTxUtxo?: UTXO;
-  isRestoreFlow?: boolean;
-  nonOrdinalUtxos?: UTXO[];
-  feeMode: string;
-  error: string;
-  customFeeSelected: boolean;
-  setIsLoading: () => void;
-  setIsNotLoading: () => void;
-  setFee: (fee: string) => void;
-  setFeeRate: (feeRate: string) => void;
-  setFeeMode: (feeMode: string) => void;
-  setError: (error: string) => void;
-  setCustomFeeSelected: (selected: boolean) => void;
-  feeOptionSelected: (feeRate: string, totalFee: string) => void;
-};
-
-function EditBtcFee({
-  type,
-  fee,
-  feeRate,
-  btcRecipients,
-  ordinalTxUtxo,
-  isRestoreFlow,
-  nonOrdinalUtxos,
-  feeMode,
-  error,
-  customFeeSelected,
-  setIsLoading,
-  setIsNotLoading,
-  setFee,
-  setFeeRate,
-  setError,
-  setFeeMode,
-  setCustomFeeSelected,
-  feeOptionSelected,
-}: Props) {
-  const { t } = useTranslation('translation');
-
-  const selectedAccount = useSelectedAccount();
-  const { btcAddress, ordinalsAddress } = selectedAccount;
-  const { network, fiatCurrency } = useWalletSelector();
-  const { btcFiatRate } = useCoinRates();
-  const [totalFee, setTotalFee] = useState(fee);
-  const [feeRateInput, setFeeRateInput] = useState(feeRate?.toString() ?? '');
-  const inputRef = useRef<HTMLInputElement>(null);
-  const debouncedFeeRateInput = useDebounce(feeRateInput, 500);
-  const { ordinals } = useOrdinalsByAddress(btcAddress);
-  const ordinalsUtxos = useMemo(() => ordinals?.map((ord) => ord.utxo), [ordinals]);
-  const btcClient = useBtcClient();
-  const { feeData, highFeeError, mediumFeeError } = useBtcFees({
-    isRestoreFlow: !!isRestoreFlow,
-    nonOrdinalUtxos,
-    btcRecipients,
-    type,
-    ordinalTxUtxo,
-  });
-
-  useEffect(() => {
-    setFee(totalFee);
-  }, [totalFee]);
-
-  const recalculateFees = async () => {
-    if (type === 'BTC') {
-      try {
-        setIsLoading();
-        setError('');
-
-        if (isRestoreFlow) {
-          const { fee: modifiedFee, selectedFeeRate } = await getBtcFeesForNonOrdinalBtcSend(
-            btcAddress,
-            nonOrdinalUtxos!,
-            ordinalsAddress,
-            network.type,
-            feeMode,
-            feeRateInput,
-          );
-          setFeeRateInput(selectedFeeRate!.toString());
-          setTotalFee(modifiedFee.toString());
-        } else if (btcRecipients && selectedAccount) {
-          const { fee: modifiedFee, selectedFeeRate } = await getBtcFees(
-            btcRecipients,
-            btcAddress,
-            btcClient,
-            network.type,
-            feeMode,
-            feeRateInput,
-          );
-          setFeeRateInput(selectedFeeRate!.toString());
-          setTotalFee(modifiedFee.toString());
-        }
-      } catch (err: any) {
-        if (Number(err) === ErrorCodes.InSufficientBalance) {
-          setError(t('TX_ERRORS.INSUFFICIENT_BALANCE'));
-        } else if (Number(err) === ErrorCodes.InSufficientBalanceWithTxFee) {
-          setError(t('TX_ERRORS.INSUFFICIENT_BALANCE_FEES'));
-        } else setError(err.toString());
-      } finally {
-        setIsNotLoading();
-      }
-    } else if (type === 'Ordinals' && btcRecipients && ordinalTxUtxo) {
-      try {
-        setIsLoading();
-        setError('');
-
-        const { fee: modifiedFee, selectedFeeRate } = await getBtcFeesForOrdinalSend(
-          btcRecipients[0].address,
-          ordinalTxUtxo,
-          btcAddress,
-          btcClient,
-          network.type,
-          ordinalsUtxos || [],
-          feeMode,
-          feeRateInput,
-        );
-        if (selectedFeeRate) setFeeRateInput(selectedFeeRate.toString());
-        setTotalFee(modifiedFee.toString());
-      } catch (err: any) {
-        if (Number(err) === ErrorCodes.InSufficientBalance) {
-          setError(t('TX_ERRORS.INSUFFICIENT_BALANCE'));
-        } else if (Number(err) === ErrorCodes.InSufficientBalanceWithTxFee) {
-          setError(t('TX_ERRORS.INSUFFICIENT_BALANCE_FEES'));
-        } else setError(err.toString());
-      } finally {
-        setIsNotLoading();
-      }
-    }
-  };
-
-  useEffect(() => {
-    if (feeRateInput) {
-      setFeeRate(feeRateInput);
-    }
-  }, [feeRateInput]);
-
-  useEffect(() => {
-    if (debouncedFeeRateInput) {
-      recalculateFees();
-    }
-  }, [debouncedFeeRateInput]);
-
-  const onInputEditFeesChange = ({ target: { value } }: React.ChangeEvent<HTMLInputElement>) => {
-    if (error) {
-      setError('');
-    }
-
-    if (feeMode !== 'custom') {
-      setFeeMode('custom');
-    }
-
-    setFeeRateInput(value);
-
-    if (type !== 'BTC' && type !== 'Ordinals') {
-      setFeeRateInput(value);
-      setTotalFee(value);
-    }
-  };
-
-  return (
-    <Container>
-      <DetailText>{t('TRANSACTION_SETTING.FEE_INFO')}</DetailText>
-
-      {!customFeeSelected && (
-        <FeePrioritiesContainer>
-          <FeeItem
-            priority="high"
-            time={`~10 ${t('SPEED_UP_TRANSACTION.TIME.MINUTES')}`}
-            feeRate={feeData?.highFeeRate}
-            totalFee={feeData?.highTotalFee}
-            fiatAmount={getBtcFiatEquivalent(
-              new BigNumber(feeData.highTotalFee),
-              BigNumber(btcFiatRate),
-            )}
-            onClick={() => {
-              feeOptionSelected(feeData?.highFeeRate?.toString() || '', feeData?.highTotalFee);
-              setFeeMode('high');
-            }}
-            selected={feeMode === 'high'}
-            error={highFeeError}
-          />
-          <FeeItem
-            priority="medium"
-            time={`~30 ${t('SPEED_UP_TRANSACTION.TIME.MINUTES')}`}
-            feeRate={feeData?.standardFeeRate}
-            totalFee={feeData?.standardTotalFee}
-            fiatAmount={getBtcFiatEquivalent(
-              new BigNumber(feeData.standardTotalFee),
-              BigNumber(btcFiatRate),
-            )}
-            onClick={() => {
-              feeOptionSelected(
-                feeData?.standardFeeRate?.toString() || '',
-                feeData?.standardTotalFee,
-              );
-              setFeeMode('medium');
-            }}
-            selected={feeMode === 'medium'}
-            error={mediumFeeError}
-          />
-          <FeeItemContainer
-            isSelected={feeMode === 'custom'}
-            onClick={() => {
-              setCustomFeeSelected(true);
-            }}
-          >
-            <Faders size={20} color={Theme.colors.tangerine} />
-            <TextRow>
-              <StyledP typography="body_medium_m" color="white_0">
-                {t('TRANSACTION_SETTING.CUSTOM')}
-              </StyledP>
-              <StyledP typography="body_medium_m" color="white_0">
-                {t('TRANSACTION_SETTING.MANUAL_SETTING')}
-              </StyledP>
-            </TextRow>
-          </FeeItemContainer>
-        </FeePrioritiesContainer>
-      )}
-
-      {customFeeSelected && (
-        <FeeContainer>
-          <InputContainer withError={!!error}>
-            <InputField
-              type="number"
-              ref={inputRef}
-              value={feeRateInput?.toString()}
-              onChange={onInputEditFeesChange}
-            />
-            <FeeText>{t('UNITS.SATS_PER_VB')}</FeeText>
-          </InputContainer>
-          <CustomTextsContainer>
-            <Row>
-              <TotalFeeText typography="body_medium_m" color="white_200">
-                {t('TRANSACTION_SETTING.TOTAL_FEE')}:
-              </TotalFeeText>
-              <NumericFormat
-                value={totalFee}
-                displayType="text"
-                thousandSeparator
-                suffix=" sats"
-                renderText={(value: string) => (
-                  <StyledP typography="body_medium_m" color="white_0">
-                    {value}
-                  </StyledP>
-                )}
-              />
-            </Row>
-            <FiatAmountText
-              fiatAmount={getBtcFiatEquivalent(BigNumber(totalFee), BigNumber(btcFiatRate))}
-              fiatCurrency={fiatCurrency}
-            />
-          </CustomTextsContainer>
-          {error && <ErrorText>{error}</ErrorText>}
-        </FeeContainer>
-      )}
-    </Container>
-  );
-}
-
-export default EditBtcFee;
diff --git a/src/app/components/transactionSetting/editStxFee.tsx b/src/app/components/transactionSetting/editStxFee.tsx
index 117c68e9e..9f2925f4a 100644
--- a/src/app/components/transactionSetting/editStxFee.tsx
+++ b/src/app/components/transactionSetting/editStxFee.tsx
@@ -1,5 +1,5 @@
 import FiatAmountText from '@components/fiatAmountText';
-import useCoinRates from '@hooks/queries/useCoinRates';
+import useSupportedCoinRates from '@hooks/queries/useSupportedCoinRates';
 import useWalletSelector from '@hooks/useWalletSelector';
 import { getStxFiatEquivalent, stxToMicrostacks } from '@secretkeylabs/xverse-core';
 import BigNumber from 'bignumber.js';
@@ -105,7 +105,6 @@ const ErrorText = styled.p((props) => ({
 
 // TODO tim: this component needs refactoring. separate business logic from presentation
 type Props = {
-  type?: string;
   fee: string;
   feeRate?: BigNumber | string;
   feeMode: string;
@@ -117,7 +116,6 @@ type Props = {
 };
 
 function EditStxFee({
-  type,
   fee,
   feeRate,
   feeMode,
@@ -129,11 +127,10 @@ function EditStxFee({
 }: Props) {
   const { t } = useTranslation('translation');
   const { fiatCurrency } = useWalletSelector();
-  const { btcFiatRate, stxBtcRate } = useCoinRates();
+  const { btcFiatRate, stxBtcRate } = useSupportedCoinRates();
   const [totalFee, setTotalFee] = useState(fee);
   const [feeRateInput, setFeeRateInput] = useState(feeRate?.toString() ?? '');
   const inputRef = useRef<HTMLInputElement>(null);
-  const isStx = type === 'STX';
 
   const modifyStxFees = (mode: string) => {
     const currentFee = new BigNumber(fee);
@@ -161,7 +158,7 @@ function EditStxFee({
   };
 
   useEffect(() => {
-    if (isStx && feeMode !== 'custom') {
+    if (feeMode !== 'custom') {
       modifyStxFees(feeMode);
     }
   }, [feeMode]);
@@ -215,11 +212,9 @@ function EditStxFee({
         {error && <ErrorText>{error}</ErrorText>}
       </FeeContainer>
       <ButtonContainer>
-        {isStx && (
-          <FeeButton isSelected={feeMode === 'low'} onClick={() => modifyStxFees('low')}>
-            {t('TRANSACTION_SETTING.LOW')}
-          </FeeButton>
-        )}
+        <FeeButton isSelected={feeMode === 'low'} onClick={() => modifyStxFees('low')}>
+          {t('TRANSACTION_SETTING.LOW')}
+        </FeeButton>
         <FeeButton isSelected={feeMode === 'medium'} onClick={() => modifyStxFees('medium')}>
           {t('TRANSACTION_SETTING.STANDARD')}
         </FeeButton>
diff --git a/src/app/components/transactionSetting/feeItem.tsx b/src/app/components/transactionSetting/feeItem.tsx
deleted file mode 100644
index 4af201283..000000000
--- a/src/app/components/transactionSetting/feeItem.tsx
+++ /dev/null
@@ -1,186 +0,0 @@
-import FiatAmountText from '@components/fiatAmountText';
-import useWalletSelector from '@hooks/useWalletSelector';
-import { Bicycle, CarProfile, RocketLaunch } from '@phosphor-icons/react';
-import { ErrorCodes } from '@secretkeylabs/xverse-core';
-import { StyledP } from '@ui-library/common.styled';
-import Spinner from '@ui-library/spinner';
-import BigNumber from 'bignumber.js';
-import { useTranslation } from 'react-i18next';
-import styled from 'styled-components';
-import Theme from 'theme';
-
-const FeeItemContainer = styled.button<{
-  isSelected: boolean;
-}>`
-  display: flex;
-  padding: ${(props) => props.theme.space.s} ${(props) => props.theme.space.m};
-  align-items: center;
-  gap: ${(props) => props.theme.space.s};
-  align-self: stretch;
-  border-radius: ${(props) => props.theme.space.s};
-  border: 1px solid ${(props) => props.theme.colors.elevation6};
-  flex-direction: row;
-  background: ${(props) => (props.isSelected ? props.theme.colors.elevation6_600 : 'transparent')};
-  margin-top: ${(props) => props.theme.space.xs};
-  flex: 1;
-  transition: background-color 0.1s ease;
-
-  &:hover:enabled {
-    background-color: ${(props) => props.theme.colors.elevation6_400};
-  }
-
-  &:active:enabled {
-    background-color: ${(props) => props.theme.colors.elevation6_600};
-  }
-`;
-
-const IconContainer = styled.div`
-  display: flex;
-  align-items: center;
-  justify-content: center;
-`;
-
-const TextsContainer = styled.div`
-  display: flex;
-  flex-direction: row;
-  justify-content: space-between;
-
-  flex: 1;
-`;
-
-const ColumnsTexts = styled.div`
-  display: flex;
-  flex-direction: column;
-  align-items: flex-start;
-  flex: 1;
-`;
-const EndColumnTexts = styled.div`
-  display: flex;
-  flex-direction: column;
-  align-items: flex-end;
-`;
-
-const StyledHeading = styled(StyledP)`
-  margin-bottom: ${(props) => props.theme.space.xxs};
-`;
-
-const StyledSubText = styled(StyledP)`
-  margin-bottom: ${(props) => props.theme.space.xxs};
-`;
-
-const LoaderContainer = styled.div`
-  display: flex;
-  align-items: center;
-  justify-content: flex-end;
-  flex: 1;
-`;
-
-const StyledFiatAmountText = styled(FiatAmountText)`
-  ${(props) => props.theme.typography.body_medium_s}
-  color: ${(props) => props.theme.colors.white_200};
-`;
-
-type FeePriority = 'high' | 'medium' | 'low';
-
-type Props = {
-  priority: FeePriority;
-  time: string;
-  feeRate: string;
-  totalFee: string;
-  fiatAmount: BigNumber;
-  selected: boolean;
-  onClick?: () => void;
-  error?: string;
-};
-
-function FeeItem({
-  priority,
-  time,
-  feeRate,
-  totalFee,
-  fiatAmount,
-  selected,
-  error,
-  onClick,
-}: Props) {
-  const { t } = useTranslation('translation');
-  const { fiatCurrency } = useWalletSelector();
-
-  const getIcon = () => {
-    switch (priority) {
-      case 'high':
-        return <RocketLaunch size={20} color={Theme.colors.tangerine} />;
-      case 'medium':
-        return <CarProfile size={20} color={Theme.colors.tangerine} />;
-      case 'low':
-        return <Bicycle size={20} color={Theme.colors.tangerine} />;
-      default:
-        return <RocketLaunch size={20} color={Theme.colors.tangerine} />;
-    }
-  };
-
-  const getLabel = () => {
-    switch (priority) {
-      case 'high':
-        return t('SPEED_UP_TRANSACTION.HIGH_PRIORITY');
-      case 'medium':
-        return t('SPEED_UP_TRANSACTION.MED_PRIORITY');
-      case 'low':
-        return t('SPEED_UP_TRANSACTION.LOW_PRIORITY');
-      default:
-        return t('SPEED_UP_TRANSACTION.HIGH_PRIORITY');
-    }
-  };
-
-  const getErrorMessage = (btcError: string) => {
-    if (
-      Number(btcError) === ErrorCodes.InSufficientBalance ||
-      Number(btcError) === ErrorCodes.InSufficientBalanceWithTxFee
-    ) {
-      return t('SEND.ERRORS.INSUFFICIENT_BALANCE');
-    }
-    return btcError;
-  };
-
-  return (
-    <FeeItemContainer onClick={onClick} isSelected={selected} disabled={!totalFee || !!error}>
-      <IconContainer>{getIcon()}</IconContainer>
-      <TextsContainer>
-        <ColumnsTexts>
-          <StyledHeading typography="body_medium_m" color="white_0">
-            {getLabel()}
-          </StyledHeading>
-          <StyledSubText typography="body_medium_s" color="white_200">
-            {time}
-          </StyledSubText>
-          <StyledSubText
-            typography="body_medium_s"
-            color="white_200"
-          >{`${feeRate} sats/vB`}</StyledSubText>
-        </ColumnsTexts>
-
-        <EndColumnTexts>
-          {totalFee && (
-            <StyledHeading typography="body_medium_m" color="white_0">
-              {`${totalFee} sats`}
-            </StyledHeading>
-          )}
-          <StyledFiatAmountText fiatAmount={fiatAmount} fiatCurrency={fiatCurrency} />
-          {error && (
-            <StyledSubText typography="body_medium_s" color="danger_medium">
-              {getErrorMessage(error)}
-            </StyledSubText>
-          )}
-        </EndColumnTexts>
-
-        {!totalFee && !error && (
-          <LoaderContainer>
-            <Spinner color="white" size={20} />
-          </LoaderContainer>
-        )}
-      </TextsContainer>
-    </FeeItemContainer>
-  );
-}
-
-export default FeeItem;
diff --git a/src/app/components/transactionSetting/index.tsx b/src/app/components/transactionSetting/index.tsx
index 7ae8c456e..d3701050c 100644
--- a/src/app/components/transactionSetting/index.tsx
+++ b/src/app/components/transactionSetting/index.tsx
@@ -1,20 +1,12 @@
 import ArrowIcon from '@assets/img/settings/arrow.svg';
-import useBtcWalletData from '@hooks/queries/useBtcWalletData';
 import useStxWalletData from '@hooks/queries/useStxWalletData';
-import useWalletSelector from '@hooks/useWalletSelector';
-import {
-  isCustomFeesAllowed,
-  stxToMicrostacks,
-  type Recipient,
-  type UTXO,
-} from '@secretkeylabs/xverse-core';
+import { stxToMicrostacks } from '@secretkeylabs/xverse-core';
 import Button from '@ui-library/button';
 import Sheet from '@ui-library/sheet';
 import BigNumber from 'bignumber.js';
 import { useState } from 'react';
 import { useTranslation } from 'react-i18next';
 import styled from 'styled-components';
-import EditBtcFee from './editBtcFee';
 import EditNonce from './editNonce';
 import EditStxFee from './editStxFee';
 
@@ -49,21 +41,13 @@ const TransactionSettingNonceOptionButton = styled.button((props) => ({
   justifyContent: 'space-between',
 }));
 
-type TxType = 'STX' | 'BTC' | 'Ordinals';
-
 type Props = {
   visible: boolean;
   fee: string;
-  feePerVByte?: BigNumber;
   loading?: boolean;
   nonce?: string;
   onApplyClick: (params: { fee: string; feeRate?: string; nonce?: string }) => void;
   onCrossClick: () => void;
-  type?: TxType;
-  btcRecipients?: Recipient[];
-  ordinalTxUtxo?: UTXO;
-  isRestoreFlow?: boolean;
-  nonOrdinalUtxos?: UTXO[];
   showFeeSettings: boolean;
   nonceSettings?: boolean;
   setShowFeeSettings: (value: boolean) => void;
@@ -72,32 +56,22 @@ type Props = {
 function TransactionSettingAlert({
   visible,
   fee,
-  feePerVByte,
   loading,
   nonce,
   onApplyClick,
   onCrossClick,
-  type = 'STX',
-  btcRecipients,
-  ordinalTxUtxo,
-  isRestoreFlow,
-  nonOrdinalUtxos,
   showFeeSettings,
   nonceSettings = false,
   setShowFeeSettings,
 }: Props) {
   const { t } = useTranslation('translation');
   const [feeInput, setFeeInput] = useState(fee);
-  const [feeRate, setFeeRate] = useState<BigNumber | string | undefined>(feePerVByte);
+  const [feeRate, setFeeRate] = useState<BigNumber | string | undefined>();
   const [nonceInput, setNonceInput] = useState<string | undefined>(nonce);
   const [error, setError] = useState('');
   const [selectedOption, setSelectedOption] = useState<string>('medium');
   const [showNonceSettings, setShowNonceSettings] = useState(false);
-  const [isLoading, setIsLoading] = useState(loading);
-  const [customFeeSelected, setCustomFeeSelected] = useState(false);
-  const { network } = useWalletSelector();
   const { data: stxData } = useStxWalletData();
-  const { data: btcBalance } = useBtcWalletData();
 
   const applyClickForStx = () => {
     if (stxData?.availableBalance) {
@@ -130,40 +104,6 @@ function TransactionSettingAlert({
     onApplyClick({ fee: feeInput.toString(), nonce: nonceInput });
   };
 
-  const applyClickForBtc = async () => {
-    const currentFee = new BigNumber(feeInput);
-    if (currentFee.gt(btcBalance ?? 0)) {
-      // show fee exceeds total balance error
-      setError(t('TRANSACTION_SETTING.GREATER_FEE_ERROR'));
-      return;
-    }
-    if (selectedOption === 'custom' && feeRate) {
-      const response = await isCustomFeesAllowed(network.type, feeRate.toString());
-      if (!response) {
-        setError(t('TRANSACTION_SETTING.LOWER_THAN_MINIMUM'));
-        return;
-      }
-    }
-    setShowNonceSettings(false);
-    setShowFeeSettings(false);
-    setCustomFeeSelected(false);
-    setError('');
-    onApplyClick({ fee: feeInput.toString(), feeRate: feeRate?.toString() });
-  };
-
-  const btcFeeOptionSelected = async (selectedFeeRate: string, totalFee: string) => {
-    const currentFee = new BigNumber(feeInput);
-    if (currentFee.gt(btcBalance ?? 0)) {
-      // show fee exceeds total balance error
-      setError(t('TRANSACTION_SETTING.GREATER_FEE_ERROR'));
-      return;
-    }
-    setShowNonceSettings(false);
-    setShowFeeSettings(false);
-    setError('');
-    onApplyClick({ fee: totalFee, feeRate: selectedFeeRate });
-  };
-
   const onEditFeesPress = () => {
     setShowFeeSettings(true);
   };
@@ -172,14 +112,6 @@ function TransactionSettingAlert({
     setShowNonceSettings(true);
   };
 
-  const onLoading = () => {
-    setIsLoading(true);
-  };
-
-  const onComplete = () => {
-    setIsLoading(false);
-  };
-
   const onClosePress = () => {
     setShowNonceSettings(false);
     setShowFeeSettings(false);
@@ -192,43 +124,16 @@ function TransactionSettingAlert({
     }
 
     if (showFeeSettings) {
-      if (type === 'STX') {
-        return (
-          <EditStxFee
-            fee={fee}
-            feeRate={feeRate}
-            type={type}
-            error={error}
-            setFee={setFeeInput}
-            setFeeRate={setFeeRate}
-            setError={setError}
-            feeMode={selectedOption}
-            setFeeMode={setSelectedOption}
-          />
-        );
-      }
       return (
-        <EditBtcFee
+        <EditStxFee
           fee={fee}
           feeRate={feeRate}
-          type={type}
           error={error}
-          setIsLoading={onLoading}
-          setIsNotLoading={onComplete}
           setFee={setFeeInput}
           setFeeRate={setFeeRate}
           setError={setError}
           feeMode={selectedOption}
           setFeeMode={setSelectedOption}
-          btcRecipients={btcRecipients}
-          ordinalTxUtxo={ordinalTxUtxo}
-          isRestoreFlow={isRestoreFlow}
-          nonOrdinalUtxos={nonOrdinalUtxos}
-          setCustomFeeSelected={(selected: boolean) => {
-            setCustomFeeSelected(selected);
-          }}
-          customFeeSelected={customFeeSelected}
-          feeOptionSelected={btcFeeOptionSelected}
         />
       );
     }
@@ -241,14 +146,12 @@ function TransactionSettingAlert({
           </TransactionSettingOptionText>
           <img src={ArrowIcon} alt="Arrow" />
         </TransactionSettingOptionButton>
-        {type === 'STX' && (
-          <TransactionSettingNonceOptionButton onClick={onEditNoncePress}>
-            <TransactionSettingOptionText>
-              {t('TRANSACTION_SETTING.ADVANCED_SETTING_NONCE_OPTION')}
-            </TransactionSettingOptionText>
-            <img src={ArrowIcon} alt="Arrow" />
-          </TransactionSettingNonceOptionButton>
-        )}
+        <TransactionSettingNonceOptionButton onClick={onEditNoncePress}>
+          <TransactionSettingOptionText>
+            {t('TRANSACTION_SETTING.ADVANCED_SETTING_NONCE_OPTION')}
+          </TransactionSettingOptionText>
+          <img src={ArrowIcon} alt="Arrow" />
+        </TransactionSettingNonceOptionButton>
       </>
     );
   };
@@ -266,7 +169,7 @@ function TransactionSettingAlert({
       onClose={onClosePress}
     >
       {renderContent()}
-      {type === 'STX' && (showFeeSettings || showNonceSettings || nonceSettings) && (
+      {(showFeeSettings || showNonceSettings || nonceSettings) && (
         <ButtonsContainer>
           <Button
             title={t('TRANSACTION_SETTING.BACK')}
@@ -276,25 +179,8 @@ function TransactionSettingAlert({
           <Button
             title={t('TRANSACTION_SETTING.APPLY')}
             onClick={showNonceSettings || nonceSettings ? applyClickForNonceStx : applyClickForStx}
-            loading={isLoading}
-            disabled={isLoading || !!error}
-          />
-        </ButtonsContainer>
-      )}
-      {customFeeSelected && (
-        <ButtonsContainer>
-          <Button
-            title={t('TRANSACTION_SETTING.BACK')}
-            onClick={() => {
-              setCustomFeeSelected(false);
-            }}
-            variant="secondary"
-          />
-          <Button
-            title={t('TRANSACTION_SETTING.APPLY')}
-            onClick={applyClickForBtc}
-            loading={isLoading}
-            disabled={isLoading || !!error}
+            loading={loading}
+            disabled={loading || !!error}
           />
         </ButtonsContainer>
       )}
diff --git a/src/app/components/transferFeeView/index.tsx b/src/app/components/transferFeeView/index.tsx
index 2dffa4b04..0f0c04a00 100644
--- a/src/app/components/transferFeeView/index.tsx
+++ b/src/app/components/transferFeeView/index.tsx
@@ -1,6 +1,6 @@
 import AmountWithInscriptionSatribute from '@components/confirmBtcTransaction/itemRow/amountWithInscriptionSatribute';
 import FiatAmountText from '@components/fiatAmountText';
-import useCoinRates from '@hooks/queries/useCoinRates';
+import useSupportedCoinRates from '@hooks/queries/useSupportedCoinRates';
 import useWalletSelector from '@hooks/useWalletSelector';
 import {
   btcTransaction,
@@ -71,7 +71,7 @@ function TransferFeeView({
   const { t: tUnits } = useTranslation('translation', { keyPrefix: 'UNITS' });
 
   const { fiatCurrency } = useWalletSelector();
-  const { btcFiatRate, stxBtcRate } = useCoinRates();
+  const { btcFiatRate, stxBtcRate } = useSupportedCoinRates();
 
   return (
     <Container>
diff --git a/src/app/hooks/queries/useAccountBalance.ts b/src/app/hooks/queries/useAccountBalance.ts
index 93231e953..9baa4b6ee 100644
--- a/src/app/hooks/queries/useAccountBalance.ts
+++ b/src/app/hooks/queries/useAccountBalance.ts
@@ -1,6 +1,6 @@
 import useBtcClient from '@hooks/apiClients/useBtcClient';
 import useRunesApi from '@hooks/apiClients/useRunesApi';
-import useCoinRates from '@hooks/queries/useCoinRates';
+import useSupportedCoinRates from '@hooks/queries/useSupportedCoinRates';
 import useNetworkSelector from '@hooks/useNetwork';
 import useWalletSelector from '@hooks/useWalletSelector';
 import {
@@ -31,7 +31,7 @@ const useAccountBalance = () => {
     sip10ManageTokens,
     runesManageTokens,
   } = useWalletSelector();
-  const { btcFiatRate, stxBtcRate } = useCoinRates();
+  const { btcFiatRate, stxBtcRate } = useSupportedCoinRates();
   const runesApi = useRunesApi();
   const dispatch = useDispatch();
   const queue = useRef<Account[]>([]);
diff --git a/src/app/hooks/queries/useCoinRates.ts b/src/app/hooks/queries/useSupportedCoinRates.ts
similarity index 54%
rename from src/app/hooks/queries/useCoinRates.ts
rename to src/app/hooks/queries/useSupportedCoinRates.ts
index c837035f6..20b43ba8a 100644
--- a/src/app/hooks/queries/useCoinRates.ts
+++ b/src/app/hooks/queries/useSupportedCoinRates.ts
@@ -1,27 +1,22 @@
+import useXverseApi from '@hooks/apiClients/useXverseApi';
 import useWalletSelector from '@hooks/useWalletSelector';
-import {
-  fetchBtcToCurrencyRate,
-  fetchStxToBtcRate,
-  type NetworkType,
-  type SupportedCurrency,
-} from '@secretkeylabs/xverse-core';
+import { type SupportedCurrency } from '@secretkeylabs/xverse-core';
 import { useQuery } from '@tanstack/react-query';
 
-const useGetRates = (fiatCurrency: SupportedCurrency, networkType: NetworkType) => {
+const useGetSupportedRates = (fiatCurrency: SupportedCurrency) => {
+  const xverseApi = useXverseApi();
   const fetchCoinRates = async () => {
     try {
-      const btcFiatRate = await fetchBtcToCurrencyRate(networkType, {
+      const btcFiatRate = await xverseApi.fetchBtcToCurrencyRate({
         fiatCurrency,
       });
-
       const btcUsdRate =
         fiatCurrency === 'USD'
           ? btcFiatRate
-          : await fetchBtcToCurrencyRate(networkType, {
+          : await xverseApi.fetchBtcToCurrencyRate({
               fiatCurrency: 'USD' as SupportedCurrency,
             });
-
-      const stxBtcRate = await fetchStxToBtcRate(networkType);
+      const stxBtcRate = await xverseApi.fetchStxToBtcRate();
       return { stxBtcRate, btcFiatRate, btcUsdRate };
     } catch (e: any) {
       return Promise.reject(e);
@@ -29,17 +24,15 @@ const useGetRates = (fiatCurrency: SupportedCurrency, networkType: NetworkType)
   };
 
   return useQuery({
-    queryKey: ['coin_rates', fiatCurrency, networkType],
+    queryKey: ['coin_rates', fiatCurrency],
     queryFn: fetchCoinRates,
     staleTime: 5 * 60 * 1000, // 5 min
   });
 };
 
-const useCoinRates = () => {
-  const { fiatCurrency, network } = useWalletSelector();
-
-  const { data } = useGetRates(fiatCurrency, network.type);
-
+const useSupportedCoinRates = () => {
+  const { fiatCurrency } = useWalletSelector();
+  const { data } = useGetSupportedRates(fiatCurrency);
   const stxBtcRate = data?.stxBtcRate.toString() || '0';
   const btcFiatRate = data?.btcFiatRate.toString() || '0';
   const btcUsdRate = data?.btcUsdRate?.toString() || '0';
@@ -47,4 +40,4 @@ const useCoinRates = () => {
   return { stxBtcRate, btcFiatRate, btcUsdRate };
 };
 
-export default useCoinRates;
+export default useSupportedCoinRates;
diff --git a/src/app/hooks/useBtcFeeRate.ts b/src/app/hooks/useBtcFeeRate.ts
index f45037564..c3d63c3ed 100644
--- a/src/app/hooks/useBtcFeeRate.ts
+++ b/src/app/hooks/useBtcFeeRate.ts
@@ -1,12 +1,15 @@
-import { getBtcFeeRate, type BtcFeeResponse } from '@secretkeylabs/xverse-core';
+import { type BtcFeeResponse } from '@secretkeylabs/xverse-core';
 import { useQuery } from '@tanstack/react-query';
+import useXverseApi from './apiClients/useXverseApi';
 import useWalletSelector from './useWalletSelector';
 
 function useBtcFeeRate() {
   const { network } = useWalletSelector();
+  const xverseApi = useXverseApi();
+
   return useQuery<BtcFeeResponse, Error>({
     queryKey: ['btcFeeRate', network.type],
-    queryFn: () => getBtcFeeRate(network.type),
+    queryFn: () => xverseApi.fetchBtcFeeRate(),
     staleTime: 5 * 60 * 1000, // 5 mins
   });
 }
diff --git a/src/app/hooks/useBtcFees.ts b/src/app/hooks/useBtcFees.ts
deleted file mode 100644
index 08b0cde13..000000000
--- a/src/app/hooks/useBtcFees.ts
+++ /dev/null
@@ -1,116 +0,0 @@
-import {
-  getBtcFees,
-  getBtcFeesForNonOrdinalBtcSend,
-  getBtcFeesForOrdinalSend,
-  type Recipient,
-  type UTXO,
-} from '@secretkeylabs/xverse-core';
-import { useEffect, useMemo, useState } from 'react';
-import useBtcClient from './apiClients/useBtcClient';
-import useOrdinalsByAddress from './useOrdinalsByAddress';
-import useSelectedAccount from './useSelectedAccount';
-import useWalletSelector from './useWalletSelector';
-
-interface Params {
-  isRestoreFlow: boolean;
-  nonOrdinalUtxos?: UTXO[];
-  btcRecipients?: Recipient[];
-  type?: string;
-  ordinalTxUtxo?: UTXO;
-}
-
-interface FeeData {
-  standardFeeRate: string;
-  standardTotalFee: string;
-  highFeeRate: string;
-  highTotalFee: string;
-}
-
-const useBtcFees = ({
-  isRestoreFlow,
-  nonOrdinalUtxos,
-  btcRecipients,
-  type,
-  ordinalTxUtxo,
-}: Params): { feeData: FeeData; highFeeError?: string; mediumFeeError?: string } => {
-  const [feeData, setFeeData] = useState<FeeData>({
-    standardFeeRate: '',
-    standardTotalFee: '',
-    highFeeRate: '',
-    highTotalFee: '',
-  });
-  const [highFeeError, setHighFeeError] = useState<string>('');
-  const [standardFeeError, setStandardFeeError] = useState<string>('');
-  const { btcAddress, ordinalsAddress } = useSelectedAccount();
-  const { network } = useWalletSelector();
-  const btcClient = useBtcClient();
-  const { ordinals } = useOrdinalsByAddress(btcAddress);
-  const ordinalsUtxos = useMemo(() => ordinals?.map((ord) => ord.utxo), [ordinals]);
-
-  useEffect(() => {
-    async function fetchFees(mode: 'standard' | 'high') {
-      try {
-        setStandardFeeError('');
-        setHighFeeError('');
-        let feeInfo;
-        if (isRestoreFlow) {
-          feeInfo = await getBtcFeesForNonOrdinalBtcSend(
-            btcAddress,
-            nonOrdinalUtxos || [],
-            ordinalsAddress,
-            network.type,
-            mode,
-          );
-        } else if (type === 'BTC' && btcRecipients) {
-          feeInfo = await getBtcFees(btcRecipients, btcAddress, btcClient, network.type, mode);
-        } else if (type === 'Ordinals' && btcRecipients && ordinalTxUtxo) {
-          feeInfo = await getBtcFeesForOrdinalSend(
-            btcRecipients[0].address,
-            ordinalTxUtxo,
-            btcAddress,
-            btcClient,
-            network.type,
-            ordinalsUtxos || [],
-            mode,
-          );
-        }
-        return {
-          fee: feeInfo?.fee.toString() || '',
-          feeRate: feeInfo?.selectedFeeRate.toString() || '',
-        };
-      } catch (error: any) {
-        if (mode === 'standard') setStandardFeeError(error.toString());
-        else if (mode === 'high') setHighFeeError(error.toString());
-        return { fee: '', feeRate: '' };
-      }
-    }
-
-    async function calculateFees() {
-      const standard = await fetchFees('standard');
-      const high = await fetchFees('high');
-
-      setFeeData({
-        standardFeeRate: standard.feeRate,
-        standardTotalFee: standard.fee,
-        highFeeRate: high.feeRate,
-        highTotalFee: high.fee,
-      });
-    }
-
-    calculateFees();
-  }, [
-    isRestoreFlow,
-    nonOrdinalUtxos,
-    btcRecipients,
-    type,
-    ordinalTxUtxo,
-    btcAddress,
-    btcClient,
-    network,
-    ordinalsUtxos,
-    ordinalsAddress,
-  ]);
-  return { feeData, highFeeError, mediumFeeError: standardFeeError };
-};
-
-export default useBtcFees;
diff --git a/src/app/hooks/useWalletReducer.ts b/src/app/hooks/useWalletReducer.ts
index 12bc3238b..6dd40d5a4 100644
--- a/src/app/hooks/useWalletReducer.ts
+++ b/src/app/hooks/useWalletReducer.ts
@@ -90,7 +90,6 @@ const useWalletReducer = () => {
     selectedAccountType,
     accountsList: accounts,
     savedNames,
-    accountsList: softwareAccountsList,
     ledgerAccountsList,
     showDataCollectionAlert,
     hideStx,
@@ -122,7 +121,7 @@ const useWalletReducer = () => {
         savedNames[network.type],
       );
 
-      const selectedAccount = softwareAccountsList.find((account) => account.id === selectedIndex);
+      const selectedAccount = accounts.find((account) => account.id === selectedIndex);
 
       if (!selectedAccount) {
         // if the selected account index does not exist, we cannot update it
@@ -135,7 +134,7 @@ const useWalletReducer = () => {
       );
 
       if (!accountsMatch) {
-        const newAccountsList = softwareAccountsList.map((account) =>
+        const newAccountsList = accounts.map((account) =>
           account.id === selectedIndex ? recreatedAccount : account,
         );
 
@@ -149,7 +148,7 @@ const useWalletReducer = () => {
       selectedAccountIndex,
       selectedAccountType,
       selectedNetwork,
-      softwareAccountsList,
+      accounts,
       savedNames,
     ],
   );
@@ -213,21 +212,18 @@ const useWalletReducer = () => {
   };
 
   const loadAccountNames = () => {
-    const updatedSavedNames = softwareAccountsList.reduce<{ id: number; name: string }[]>(
-      (acc, account) => {
-        if (account.accountName) {
-          acc.push({ id: account.id, name: account.accountName });
-        }
-        return acc;
-      },
-      [],
-    );
+    const updatedSavedNames = accounts.reduce<{ id: number; name: string }[]>((acc, account) => {
+      if (account.accountName) {
+        acc.push({ id: account.id, name: account.accountName });
+      }
+      return acc;
+    }, []);
     dispatch(updateSavedNamesAction(network.type, updatedSavedNames));
   };
 
   const loadWallet = async () => {
     const seedPhrase = await seedVault.getSeed();
-    const currentAccounts = softwareAccountsList || [];
+    const currentAccounts = accounts || [];
 
     if (currentAccounts.length === 0) {
       // This will happen on first load after the wallet is created. We create the accounts here to ensure
@@ -248,10 +244,7 @@ const useWalletReducer = () => {
 
     await ensureSelectedAccountValid();
 
-    if (
-      !savedNames[network.type]?.length &&
-      softwareAccountsList.some((account) => !!account.accountName)
-    ) {
+    if (!savedNames[network.type]?.length && accounts.some((account) => !!account.accountName)) {
       // there was no savedNames store object initially
       // this is a migration to add the savedNames if there are custom account names that are not saved
       // it should only fire once if ever
@@ -355,12 +348,7 @@ const useWalletReducer = () => {
 
   const createAccount = async () => {
     const seedPhrase = await seedVault.getSeed();
-    const newAccounts = await createWalletAccount(
-      seedPhrase,
-      network,
-      selectedNetwork,
-      softwareAccountsList,
-    );
+    const newAccounts = await createWalletAccount(seedPhrase, network, selectedNetwork, accounts);
     dispatch(updateSoftwareAccountsAction(newAccounts));
   };
 
@@ -399,7 +387,7 @@ const useWalletReducer = () => {
   const changeNetwork = async (changedNetwork: SettingsNetwork) => {
     // Save current custom account names
     const currentNetworkType = network.type;
-    const customAccountNames = softwareAccountsList.map((account) => ({
+    const customAccountNames = accounts.map((account) => ({
       id: account.id,
       name: account.accountName,
     }));
@@ -432,7 +420,7 @@ const useWalletReducer = () => {
     const nextAccounts: Account[] = [];
 
     // we recreate the same number of accounts on the new network
-    for (let i = 0; i < softwareAccountsList.length; i++) {
+    for (let i = 0; i < accounts.length; i++) {
       const account = await createSingleAccount(
         seedPhrase,
         i,
@@ -475,7 +463,7 @@ const useWalletReducer = () => {
     if (updatedAccount.accountType !== 'software') {
       throw new Error('Expected software account. Renaming cancelled.');
     }
-    const newAccountsList = softwareAccountsList.map((account) =>
+    const newAccountsList = accounts.map((account) =>
       account.id === updatedAccount.id ? updatedAccount : account,
     );
 
diff --git a/src/app/routes/index.tsx b/src/app/routes/index.tsx
index 482cceaa4..5c4d20d74 100644
--- a/src/app/routes/index.tsx
+++ b/src/app/routes/index.tsx
@@ -29,7 +29,7 @@ import ForgotPassword from '@screens/forgotPassword';
 import Home from '@screens/home';
 import Landing from '@screens/landing';
 import LedgerAddStxAddress from '@screens/ledger/addStxAddress';
-import ConfirmLedgerTransaction from '@screens/ledger/confirmLedgerTransaction';
+import ConfirmLedgerStxTransaction from '@screens/ledger/confirmLedgerStxTransaction';
 import ImportLedger from '@screens/ledger/importLedgerAccount';
 import VerifyLedger from '@screens/ledger/verifyLedgerAccountAddress';
 import Legal from '@screens/legal';
@@ -181,8 +181,8 @@ const router = createHashRouter([
         ),
       },
       {
-        path: 'confirm-ledger-tx',
-        element: <ConfirmLedgerTransaction />,
+        path: 'confirm-ledger-stx-tx',
+        element: <ConfirmLedgerStxTransaction />,
       },
       {
         path: 'backup',
diff --git a/src/app/screens/backupWallet/index.tsx b/src/app/screens/backupWallet/index.tsx
index 58483a5b1..7751a10ec 100644
--- a/src/app/screens/backupWallet/index.tsx
+++ b/src/app/screens/backupWallet/index.tsx
@@ -10,8 +10,8 @@ import styled from 'styled-components';
 
 const Container = styled.div((props) => ({
   flex: 1,
-  paddingLeft: props.theme.spacing(8),
-  paddingRight: props.theme.spacing(8),
+  paddingLeft: props.theme.space.m,
+  paddingRight: props.theme.space.m,
   display: 'flex',
   flexDirection: 'column',
 }));
@@ -27,7 +27,7 @@ const ContentContainer = styled.div((props) => ({
   display: 'flex',
   flexDirection: 'column',
   justifyContent: 'center',
-  marginBottom: props.theme.spacing(32),
+  marginBottom: props.theme.space.xxxl,
 }));
 
 const Title = styled.h1((props) => ({
@@ -46,7 +46,7 @@ const BackupActionsContainer = styled.div((props) => ({
   display: 'flex',
   flexDirection: 'row',
   justifyContent: 'space-between',
-  marginTop: props.theme.spacing(20),
+  marginTop: props.theme.space.xxl,
   width: '100%',
   columnGap: props.theme.space.xs,
 }));
@@ -55,7 +55,7 @@ const LoadingContainer = styled.div((props) => ({
   display: 'flex',
   justifyContent: 'center',
   alignItems: 'center',
-  marginTop: props.theme.spacing(20),
+  marginTop: props.theme.space.xxl,
   width: '100%',
 }));
 
diff --git a/src/app/screens/coinDashboard/coinHeader.tsx b/src/app/screens/coinDashboard/coinHeader.tsx
index 53530b8fb..15f677265 100644
--- a/src/app/screens/coinDashboard/coinHeader.tsx
+++ b/src/app/screens/coinDashboard/coinHeader.tsx
@@ -9,8 +9,8 @@ import ActionButton from '@components/button';
 import SmallActionButton from '@components/smallActionButton';
 import TokenImage from '@components/tokenImage';
 import useBtcWalletData from '@hooks/queries/useBtcWalletData';
-import useCoinRates from '@hooks/queries/useCoinRates';
 import useStxWalletData from '@hooks/queries/useStxWalletData';
+import useSupportedCoinRates from '@hooks/queries/useSupportedCoinRates';
 import useHasFeature from '@hooks/useHasFeature';
 import useSelectedAccount from '@hooks/useSelectedAccount';
 import useWalletSelector from '@hooks/useWalletSelector';
@@ -61,7 +61,7 @@ export default function CoinHeader({ currency, fungibleToken }: Props) {
   const { fiatCurrency, network } = useWalletSelector();
   const { data: btcBalance } = useBtcWalletData();
   const { data: stxData } = useStxWalletData();
-  const { btcFiatRate, stxBtcRate } = useCoinRates();
+  const { btcFiatRate, stxBtcRate } = useSupportedCoinRates();
   const navigate = useNavigate();
   const { t } = useTranslation('translation', { keyPrefix: 'COIN_DASHBOARD_SCREEN' });
   const [openReceiveModal, setOpenReceiveModal] = useState(false);
diff --git a/src/app/screens/coinDashboard/index.tsx b/src/app/screens/coinDashboard/index.tsx
index 56e89c919..13df8e350 100644
--- a/src/app/screens/coinDashboard/index.tsx
+++ b/src/app/screens/coinDashboard/index.tsx
@@ -50,7 +50,7 @@ const SecondaryContainer = styled.div((props) => ({
   flexDirection: 'column',
   paddingLeft: props.theme.space.m,
   paddingRight: props.theme.space.m,
-  marginTop: props.theme.space.xl,
+  marginTop: props.theme.space.l,
   marginBottom: props.theme.space.xl,
   h1: {
     ...props.theme.typography.body_medium_m,
@@ -295,6 +295,7 @@ export default function CoinDashboard() {
             brc20Token={protocol === 'brc-20' ? selectedFt?.principal || null : null}
             runeToken={protocol === 'runes' ? selectedFt?.name || null : null}
             runeSymbol={protocol === 'runes' ? selectedFt?.runeSymbol || null : null}
+            withTitle={!displayTabs}
           />
         )}
         {showStxContract && (
diff --git a/src/app/screens/coinDashboard/transactionsHistoryList.tsx b/src/app/screens/coinDashboard/transactionsHistoryList.tsx
index f78c73e08..a2bf69848 100644
--- a/src/app/screens/coinDashboard/transactionsHistoryList.tsx
+++ b/src/app/screens/coinDashboard/transactionsHistoryList.tsx
@@ -34,18 +34,18 @@ import { useMemo } from 'react';
 import { useTranslation } from 'react-i18next';
 import styled from 'styled-components';
 
-const ListItemsContainer = styled.div({
+const ListItemsContainer = styled.div((props) => ({
   display: 'flex',
   flexDirection: 'column',
   flex: 1,
-});
+  marginTop: props.theme.space.l,
+}));
 
 const ListHeader = styled.h1((props) => ({
-  marginTop: props.theme.spacing(20),
-  marginBottom: props.theme.spacing(12),
-  marginLeft: props.theme.spacing(8),
-  marginRight: props.theme.spacing(8),
-  ...props.theme.headline_s,
+  ...props.theme.typography.headline_xs,
+  margin: props.theme.space.m,
+  marginTop: 0,
+  marginBottom: props.theme.space.l,
 }));
 
 const LoadingContainer = styled.div({
@@ -65,7 +65,7 @@ const NoTransactionsContainer = styled.div((props) => ({
 }));
 
 const GroupContainer = styled(animated.div)((props) => ({
-  marginBottom: props.theme.spacing(8),
+  marginBottom: props.theme.space.m,
 }));
 
 const SectionHeader = styled.div((props) => ({
@@ -73,8 +73,8 @@ const SectionHeader = styled.div((props) => ({
   flexDirection: 'row',
   alignItems: 'center',
   marginBottom: props.theme.spacing(7),
-  paddingLeft: props.theme.spacing(8),
-  paddingRight: props.theme.spacing(8),
+  paddingLeft: props.theme.space.m,
+  paddingRight: props.theme.space.m,
 }));
 
 const SectionSeparator = styled.div((props) => ({
@@ -86,17 +86,9 @@ const SectionSeparator = styled.div((props) => ({
 const SectionTitle = styled.p((props) => ({
   ...props.theme.body_xs,
   color: props.theme.colors.white_200,
-  marginRight: props.theme.spacing(4),
+  marginRight: props.theme.space.xs,
 }));
 
-interface TransactionsHistoryListProps {
-  coin: CurrencyTypes;
-  stxTxFilter: string | null;
-  brc20Token: string | null;
-  runeToken: string | null;
-  runeSymbol: string | null;
-}
-
 const sortTransactionsByBlockHeight = (transactions: BtcTransactionData[]) =>
   transactions.sort((txA, txB) => {
     if (txB.blockHeight > txA.blockHeight) {
@@ -189,8 +181,24 @@ const filterStxTxs = (
     );
   });
 
-export default function TransactionsHistoryList(props: TransactionsHistoryListProps) {
-  const { coin, stxTxFilter, brc20Token, runeToken, runeSymbol } = props;
+type Props = {
+  coin: CurrencyTypes;
+  stxTxFilter: string | null;
+  brc20Token: string | null;
+  runeToken: string | null;
+  runeSymbol: string | null;
+  withTitle?: boolean;
+};
+
+function TransactionsHistoryList({
+  coin,
+  stxTxFilter,
+  brc20Token,
+  runeToken,
+  runeSymbol,
+  withTitle = true,
+}: Props) {
+  const { t } = useTranslation('translation', { keyPrefix: 'COIN_DASHBOARD_SCREEN' });
   const selectedAccount = useSelectedAccount();
   const { network, selectedAccountType } = useWalletSelector();
   const btcClient = useBtcClient();
@@ -209,7 +217,6 @@ export default function TransactionsHistoryList(props: TransactionsHistoryListPr
     },
   });
 
-  const { t } = useTranslation('translation', { keyPrefix: 'COIN_DASHBOARD_SCREEN' });
   const wallet = selectedAccount
     ? {
         ...selectedAccount,
@@ -249,7 +256,7 @@ export default function TransactionsHistoryList(props: TransactionsHistoryListPr
 
   return (
     <ListItemsContainer>
-      <ListHeader>{t('TRANSACTION_HISTORY_TITLE')}</ListHeader>
+      {withTitle && <ListHeader>{t('TRANSACTION_HISTORY_TITLE')}</ListHeader>}
       {groupedTxs &&
         !isLoading &&
         Object.keys(groupedTxs).map((group) => (
@@ -317,3 +324,5 @@ export default function TransactionsHistoryList(props: TransactionsHistoryListPr
     </ListItemsContainer>
   );
 }
+
+export default TransactionsHistoryList;
diff --git a/src/app/screens/confirmBrc20Transaction/index.tsx b/src/app/screens/confirmBrc20Transaction/index.tsx
index 1439d3ba5..3fe59c373 100644
--- a/src/app/screens/confirmBrc20Transaction/index.tsx
+++ b/src/app/screens/confirmBrc20Transaction/index.tsx
@@ -2,7 +2,7 @@ import InfoContainer from '@components/infoContainer';
 import BottomBar from '@components/tabBar';
 import TopRow from '@components/topRow';
 import TransactionDetailComponent from '@components/transactionDetailComponent';
-import useCoinRates from '@hooks/queries/useCoinRates';
+import useSupportedCoinRates from '@hooks/queries/useSupportedCoinRates';
 import useBtcFeeRate from '@hooks/useBtcFeeRate';
 import useDebounce from '@hooks/useDebounce';
 import { useResetUserFlow } from '@hooks/useResetUserFlow';
@@ -53,7 +53,7 @@ function ConfirmBrc20Transaction() {
   const { network, fiatCurrency, feeMultipliers } = useWalletSelector();
   const selectedAccount = useSelectedAccount();
   const { btcAddress, ordinalsAddress } = selectedAccount;
-  const { btcFiatRate } = useCoinRates();
+  const { btcFiatRate } = useSupportedCoinRates();
   const navigate = useNavigate();
   const {
     recipientAddress,
diff --git a/src/app/screens/confirmFtTransaction/index.tsx b/src/app/screens/confirmFtTransaction/index.tsx
index 9e9f010ba..0a7efc666 100644
--- a/src/app/screens/confirmFtTransaction/index.tsx
+++ b/src/app/screens/confirmFtTransaction/index.tsx
@@ -1,4 +1,4 @@
-import type { ConfirmStxTransactionState, LedgerTransactionType } from '@common/types/ledger';
+import type { ConfirmStxTransactionState } from '@common/types/ledger';
 import ConfirmStxTransactionComponent from '@components/confirmStxTransactionComponent';
 import TransferMemoView from '@components/confirmStxTransactionComponent/transferMemoView';
 import RecipientComponent from '@components/recipientComponent';
@@ -82,15 +82,13 @@ function ConfirmFtTransaction() {
 
   const handleOnConfirmClick = (txs: StacksTransaction[]) => {
     if (isLedgerAccount(selectedAccount)) {
-      const type: LedgerTransactionType = 'STX';
       const state: ConfirmStxTransactionState = {
         unsignedTx: Buffer.from(unsignedTx.serialize()),
-        type,
         recipients: [{ address: recipientAddress, amountMicrostacks: new BigNumber(amount) }],
         fee: new BigNumber(unsignedTx.auth.spendingCondition.fee.toString()),
       };
 
-      navigate('/confirm-ledger-tx', { state });
+      navigate('/confirm-ledger-stx-tx', { state });
       return;
     }
 
diff --git a/src/app/screens/confirmNftTransaction/index.tsx b/src/app/screens/confirmNftTransaction/index.tsx
index b88c00808..f6638aeb6 100644
--- a/src/app/screens/confirmNftTransaction/index.tsx
+++ b/src/app/screens/confirmNftTransaction/index.tsx
@@ -1,5 +1,5 @@
 import AssetIcon from '@assets/img/transactions/Assets.svg';
-import type { ConfirmStxTransactionState, LedgerTransactionType } from '@common/types/ledger';
+import type { ConfirmStxTransactionState } from '@common/types/ledger';
 import AccountHeaderComponent from '@components/accountHeader';
 import ConfirmStxTransactionComponent from '@components/confirmStxTransactionComponent';
 import RecipientComponent from '@components/recipientComponent';
@@ -146,10 +146,8 @@ function ConfirmNftTransaction() {
 
   const handleOnConfirmClick = (txs: StacksTransaction[]) => {
     if (isLedgerAccount(selectedAccount)) {
-      const type: LedgerTransactionType = 'STX';
       const state: ConfirmStxTransactionState = {
         unsignedTx: Buffer.from(unsignedTx.serialize()),
-        type,
         recipients: [
           {
             address: recipientAddress,
@@ -166,7 +164,7 @@ function ConfirmNftTransaction() {
         ),
       };
 
-      navigate('/confirm-ledger-tx', { state });
+      navigate('/confirm-ledger-stx-tx', { state });
       return;
     }
 
diff --git a/src/app/screens/confirmStxTransaction/index.tsx b/src/app/screens/confirmStxTransaction/index.tsx
index 0bbc4d6de..b85630963 100644
--- a/src/app/screens/confirmStxTransaction/index.tsx
+++ b/src/app/screens/confirmStxTransaction/index.tsx
@@ -1,5 +1,5 @@
 import IconStacks from '@assets/img/dashboard/stx_icon.svg';
-import type { ConfirmStxTransactionState, LedgerTransactionType } from '@common/types/ledger';
+import type { ConfirmStxTransactionState } from '@common/types/ledger';
 import {
   sendInternalErrorMessage,
   sendUserRejectionMessage,
@@ -218,16 +218,14 @@ function ConfirmStxTransaction() {
 
   const handleConfirmClick = (txs: StacksTransaction[]) => {
     if (isLedgerAccount(selectedAccount)) {
-      const type: LedgerTransactionType = 'STX';
       const fee = new BigNumber(txs[0].auth.spendingCondition.fee.toString());
       const state: ConfirmStxTransactionState = {
         unsignedTx: Buffer.from(unsignedTx.serialize()),
-        type,
         recipients: [{ address: recipient, amountMicrostacks: amount }],
         fee,
       };
 
-      navigate('/confirm-ledger-tx', { state });
+      navigate('/confirm-ledger-stx-tx', { state });
       return;
     }
     const rawTx = buf2hex(txs[0].serialize());
diff --git a/src/app/screens/createInscription/index.tsx b/src/app/screens/createInscription/index.tsx
index 9f263c401..b2c3d55fa 100644
--- a/src/app/screens/createInscription/index.tsx
+++ b/src/app/screens/createInscription/index.tsx
@@ -28,8 +28,8 @@ import useWalletSelector from '@hooks/useWalletSelector';
 import { isLedgerAccount } from '@utils/helper';
 
 import useBtcClient from '@hooks/apiClients/useBtcClient';
-import useCoinRates from '@hooks/queries/useCoinRates';
 import useConfirmedBtcBalance from '@hooks/queries/useConfirmedBtcBalance';
+import useSupportedCoinRates from '@hooks/queries/useSupportedCoinRates';
 import useSelectedAccount from '@hooks/useSelectedAccount';
 import useTransactionContext from '@hooks/useTransactionContext';
 import Button from '@ui-library/button';
@@ -108,7 +108,7 @@ function CreateInscription() {
   const selectedAccount = useSelectedAccount();
   const { ordinalsAddress, btcAddress } = selectedAccount;
   const { network, fiatCurrency } = useWalletSelector();
-  const { btcFiatRate } = useCoinRates();
+  const { btcFiatRate } = useSupportedCoinRates();
 
   const transactionContext = useTransactionContext();
 
diff --git a/src/app/screens/home/balanceCard/index.tsx b/src/app/screens/home/balanceCard/index.tsx
index cf240a745..65f86d119 100644
--- a/src/app/screens/home/balanceCard/index.tsx
+++ b/src/app/screens/home/balanceCard/index.tsx
@@ -4,8 +4,8 @@ import { useVisibleRuneFungibleTokens } from '@hooks/queries/runes/useRuneFungib
 import { useVisibleSip10FungibleTokens } from '@hooks/queries/stx/useGetSip10FungibleTokens';
 import useAccountBalance from '@hooks/queries/useAccountBalance';
 import useBtcWalletData from '@hooks/queries/useBtcWalletData';
-import useCoinRates from '@hooks/queries/useCoinRates';
 import useStxWalletData from '@hooks/queries/useStxWalletData';
+import useSupportedCoinRates from '@hooks/queries/useSupportedCoinRates';
 import useSelectedAccount from '@hooks/useSelectedAccount';
 import useWalletSelector from '@hooks/useWalletSelector';
 import { currencySymbolMap } from '@secretkeylabs/xverse-core';
@@ -76,7 +76,7 @@ function BalanceCard(props: BalanceCardProps) {
   const { fiatCurrency, hideStx, accountBalances } = useWalletSelector();
   const { data: btcBalance } = useBtcWalletData();
   const { data: stxData } = useStxWalletData();
-  const { btcFiatRate, stxBtcRate } = useCoinRates();
+  const { btcFiatRate, stxBtcRate } = useSupportedCoinRates();
   const { setAccountBalance } = useAccountBalance();
   const { isLoading, isRefetching } = props;
   const oldTotalBalance = accountBalances[selectedAccount.btcAddress];
diff --git a/src/app/screens/home/index.tsx b/src/app/screens/home/index.tsx
index 13048de76..788b12f33 100644
--- a/src/app/screens/home/index.tsx
+++ b/src/app/screens/home/index.tsx
@@ -15,10 +15,10 @@ import { useVisibleRuneFungibleTokens } from '@hooks/queries/runes/useRuneFungib
 import { useVisibleSip10FungibleTokens } from '@hooks/queries/stx/useGetSip10FungibleTokens';
 import useAppConfig from '@hooks/queries/useAppConfig';
 import useBtcWalletData from '@hooks/queries/useBtcWalletData';
-import useCoinRates from '@hooks/queries/useCoinRates';
 import useFeeMultipliers from '@hooks/queries/useFeeMultipliers';
 import useSpamTokens from '@hooks/queries/useSpamTokens';
 import useStxWalletData from '@hooks/queries/useStxWalletData';
+import useSupportedCoinRates from '@hooks/queries/useSupportedCoinRates';
 import useAvatarCleanup from '@hooks/useAvatarCleanup';
 import useHasFeature from '@hooks/useHasFeature';
 import useNotificationBanners from '@hooks/useNotificationBanners';
@@ -110,7 +110,7 @@ function Home() {
     useBtcWalletData();
   const { isInitialLoading: loadingStxWalletData, isRefetching: refetchingStxWalletData } =
     useStxWalletData();
-  const { btcFiatRate, stxBtcRate } = useCoinRates();
+  const { btcFiatRate, stxBtcRate } = useSupportedCoinRates();
   const { data: notificationBannersArr, isFetching: isFetchingNotificationBannersArr } =
     useNotificationBanners();
   const {
diff --git a/src/app/screens/ledger/confirmLedgerTransaction/index.styled.ts b/src/app/screens/ledger/confirmLedgerStxTransaction/index.styled.ts
similarity index 77%
rename from src/app/screens/ledger/confirmLedgerTransaction/index.styled.ts
rename to src/app/screens/ledger/confirmLedgerStxTransaction/index.styled.ts
index c2be25a13..ac60de4bd 100644
--- a/src/app/screens/ledger/confirmLedgerTransaction/index.styled.ts
+++ b/src/app/screens/ledger/confirmLedgerStxTransaction/index.styled.ts
@@ -61,22 +61,6 @@ export const ConnectLedgerTitle = styled.h1<{ textAlign?: 'left' | 'center' }>((
   marginBottom: props.theme.spacing(6),
 }));
 
-export const ConnectLedgerTextAdvanced = styled.p<{
-  isCompleted?: boolean;
-}>((props) => ({
-  ...props.theme.body_m,
-  display: 'flex',
-  alignItems: 'flex-start',
-  color: props.isCompleted ? props.theme.colors.white_400 : props.theme.colors.white_200,
-  textAlign: 'center',
-  marginBottom: props.theme.spacing(16),
-}));
-
-export const InfoContainerWrapper = styled.div((props) => ({
-  textAlign: 'left',
-  marginTop: props.theme.spacing(8),
-}));
-
 export const TxDetails = styled.div((props) => ({
   marginTop: props.theme.spacing(36),
   width: '100%',
@@ -98,9 +82,3 @@ export const RecipientsWrapper = styled.div({
   display: 'flex',
   flexDirection: 'column',
 });
-
-export const ConfirmTxIconBig = styled.img((props) => ({
-  width: 32,
-  height: 32,
-  marginBottom: props.theme.spacing(8),
-}));
diff --git a/src/app/screens/ledger/confirmLedgerStxTransaction/index.tsx b/src/app/screens/ledger/confirmLedgerStxTransaction/index.tsx
new file mode 100644
index 000000000..914d5b1ae
--- /dev/null
+++ b/src/app/screens/ledger/confirmLedgerStxTransaction/index.tsx
@@ -0,0 +1,314 @@
+import checkCircleIcon from '@assets/img/ledger/check_circle.svg';
+import ledgerConnectDefaultIcon from '@assets/img/ledger/ledger_connect_default.svg';
+import ledgerConnectStxIcon from '@assets/img/ledger/ledger_import_connect_stx.svg';
+import { delay } from '@common/utils/ledger';
+import ActionButton from '@components/button';
+import LedgerConnectionView from '@components/ledger/connectLedgerView';
+import FullScreenHeader from '@components/ledger/fullScreenHeader';
+import useNetworkSelector from '@hooks/useNetwork';
+import useWalletSelector from '@hooks/useWalletSelector';
+import Transport from '@ledgerhq/hw-transport-webusb';
+import { useTransition } from '@react-spring/web';
+import {
+  broadcastSignedTransaction,
+  microstacksToStx,
+  signLedgerStxTransaction,
+  type StacksRecipient,
+} from '@secretkeylabs/xverse-core';
+import { DEFAULT_TRANSITION_OPTIONS } from '@utils/constants';
+import { getStxTxStatusUrl, getTruncatedAddress } from '@utils/helper';
+import BigNumber from 'bignumber.js';
+import { useState } from 'react';
+import { useTranslation } from 'react-i18next';
+import { useLocation } from 'react-router-dom';
+
+import useSelectedAccount from '@hooks/useSelectedAccount';
+import {
+  Container,
+  OnBoardingContentContainer,
+  RecipientsWrapper,
+  SuccessActionsContainer,
+  TxConfirmedContainer,
+  TxConfirmedDescription,
+  TxConfirmedTitle,
+  TxDetails,
+  TxDetailsRow,
+  TxDetailsTitle,
+} from './index.styled';
+
+enum Steps {
+  ConnectLedger = 0,
+  ConfirmTransaction = 1,
+  TransactionConfirmed = 2,
+}
+
+function ConfirmLedgerStxTransaction(): JSX.Element {
+  const [currentStep, setCurrentStep] = useState(Steps.ConnectLedger);
+  const [txId, setTxId] = useState<string | undefined>(undefined);
+
+  const [isButtonDisabled, setIsButtonDisabled] = useState(false);
+  const [isConnectSuccess, setIsConnectSuccess] = useState(false);
+  const [isConnectFailed, setIsConnectFailed] = useState(false);
+  const [isWrongDevice, setIsWrongDevice] = useState(false);
+  const [isFinalTxApproved, setIsFinalTxApproved] = useState(false);
+  const [isTxRejected, setIsTxRejected] = useState(false);
+
+  const { t } = useTranslation('translation', { keyPrefix: 'LEDGER_CONFIRM_TRANSACTION_SCREEN' });
+  const location = useLocation();
+  const selectedNetwork = useNetworkSelector();
+
+  const selectedAccount = useSelectedAccount();
+  const { network } = useWalletSelector();
+
+  const {
+    recipients,
+    unsignedTx,
+    fee,
+    tabId,
+    tabMessageId: messageId,
+  }: {
+    amount: BigNumber;
+    recipients: StacksRecipient[];
+    unsignedTx: Buffer;
+    fee?: BigNumber;
+    messageId?: string;
+    tabId?: number;
+    tabMessageId?: string;
+  } = location.state;
+
+  const transition = useTransition(currentStep, DEFAULT_TRANSITION_OPTIONS);
+
+  const signAndBroadcastStxTx = async (transport: Transport, addressIndex: number) => {
+    try {
+      const result = await signLedgerStxTransaction({
+        transport,
+        transactionBuffer: unsignedTx,
+        addressIndex,
+      });
+      setIsFinalTxApproved(true);
+      await delay(1500);
+      const transactionHash = await broadcastSignedTransaction(result, selectedNetwork);
+      setTxId(transactionHash);
+      setCurrentStep(Steps.TransactionConfirmed);
+    } catch (err) {
+      console.error(err);
+      setIsTxRejected(true);
+      setIsButtonDisabled(false);
+    } finally {
+      transport.close();
+    }
+  };
+
+  const handleConnectAndConfirm = async () => {
+    if (!selectedAccount) {
+      console.error('No account selected');
+      return;
+    }
+
+    try {
+      setIsButtonDisabled(true);
+
+      const transport = await Transport.create();
+
+      if (!transport) {
+        setIsConnectSuccess(false);
+        setIsConnectFailed(true);
+        setIsButtonDisabled(false);
+        return;
+      }
+
+      const addressIndex = selectedAccount.deviceAccountIndex;
+
+      if (addressIndex === undefined) {
+        setIsConnectSuccess(false);
+        setIsConnectFailed(true);
+        setIsWrongDevice(true);
+        setIsButtonDisabled(false);
+        return;
+      }
+
+      setIsConnectSuccess(true);
+      await delay(1500);
+
+      if (currentStep !== Steps.ConfirmTransaction) {
+        setCurrentStep(Steps.ConfirmTransaction);
+      }
+
+      await signAndBroadcastStxTx(transport as Transport, addressIndex);
+      await transport.close();
+    } catch (err) {
+      setIsConnectSuccess(false);
+      setIsConnectFailed(true);
+    } finally {
+      setIsButtonDisabled(false);
+    }
+  };
+
+  const goToConfirmationStep = () => {
+    setCurrentStep(Steps.ConfirmTransaction);
+
+    handleConnectAndConfirm();
+  };
+
+  const handleRetry = async () => {
+    setIsTxRejected(false);
+    setIsConnectSuccess(false);
+    setIsConnectFailed(false);
+    setIsWrongDevice(false);
+    setCurrentStep(Steps.ConnectLedger);
+  };
+
+  const handleClose = () => {
+    if (typeof window !== 'undefined') {
+      window.close();
+    }
+  };
+
+  const handleSeeTransaction = () => {
+    if (!txId) {
+      console.error('No txId found');
+      return;
+    }
+
+    window.open(getStxTxStatusUrl(txId, network), '_blank', 'noopener,noreferrer');
+  };
+
+  const renderTxDetails = () => (
+    <TxDetails>
+      <TxDetailsRow>
+        <TxDetailsTitle>Recipient{recipients.length > 1 ? 's' : ''}</TxDetailsTitle>
+        <RecipientsWrapper>
+          {recipients.map((recipient) => (
+            <div key={recipient.address}>{getTruncatedAddress(recipient.address)}</div>
+          ))}
+        </RecipientsWrapper>
+      </TxDetailsRow>
+      <TxDetailsRow>
+        <TxDetailsTitle>{t('AMOUNT')}</TxDetailsTitle>
+        <div>
+          {microstacksToStx((recipients[0] as StacksRecipient).amountMicrostacks).toString()} STX
+        </div>
+      </TxDetailsRow>
+      {fee && (
+        <TxDetailsRow>
+          <TxDetailsTitle>{t('FEES')}</TxDetailsTitle>
+          <div>{microstacksToStx(fee).toString()} STX</div>
+        </TxDetailsRow>
+      )}
+    </TxDetails>
+  );
+
+  const renderLedgerConfirmationView = () => {
+    switch (currentStep) {
+      case Steps.ConnectLedger:
+        return (
+          <div>
+            <LedgerConnectionView
+              title={t('CONNECT.TITLE')}
+              text={t('CONNECT.STX_SUBTITLE')}
+              titleFailed={t('CONNECT.ERROR_TITLE')}
+              textFailed={t(
+                isWrongDevice
+                  ? 'CONNECT.WRONG_DEVICE_ERROR_SUBTITLE'
+                  : 'CONNECT.STX_ERROR_SUBTITLE',
+              )}
+              imageDefault={ledgerConnectStxIcon}
+              isConnectSuccess={isConnectSuccess}
+              isConnectFailed={isConnectFailed}
+            />
+          </div>
+        );
+      case Steps.ConfirmTransaction:
+        return (
+          <div>
+            <LedgerConnectionView
+              title={t('CONFIRM.TITLE')}
+              text={t('CONFIRM.SUBTITLE')}
+              titleFailed={t('CONFIRM.ERROR_TITLE')}
+              textFailed={t('CONFIRM.ERROR_SUBTITLE')}
+              imageDefault={ledgerConnectDefaultIcon}
+              isConnectSuccess={isFinalTxApproved}
+              isConnectFailed={isTxRejected}
+            />
+            {renderTxDetails()}
+          </div>
+        );
+      case Steps.TransactionConfirmed:
+        return (
+          <TxConfirmedContainer>
+            <img src={checkCircleIcon} alt="Success" />
+            <TxConfirmedTitle>{t('SUCCESS.TITLE')}</TxConfirmedTitle>
+            <TxConfirmedDescription>{t('SUCCESS.SUBTITLE')}</TxConfirmedDescription>
+          </TxConfirmedContainer>
+        );
+      default:
+        return null;
+    }
+  };
+
+  const renderLedgerConfirmationControls = () => {
+    switch (currentStep) {
+      case Steps.ConfirmTransaction:
+        return (
+          <SuccessActionsContainer>
+            <ActionButton
+              onPress={isTxRejected || isConnectFailed ? handleRetry : handleConnectAndConfirm}
+              text={t(isTxRejected || isConnectFailed ? 'RETRY_BUTTON' : 'CONNECT_BUTTON')}
+              disabled={isButtonDisabled}
+              processing={isButtonDisabled}
+            />
+            <ActionButton
+              transparent
+              onPress={handleClose}
+              text={t(isTxRejected || isConnectFailed ? 'CLOSE_BUTTON' : 'CANCEL_BUTTON')}
+              disabled={isButtonDisabled}
+            />
+          </SuccessActionsContainer>
+        );
+      case Steps.TransactionConfirmed:
+        return (
+          <SuccessActionsContainer>
+            <ActionButton onPress={handleClose} text={t('CLOSE_BUTTON')} />
+            <ActionButton
+              transparent
+              onPress={handleSeeTransaction}
+              text={t('SEE_TRANSACTION_BUTTON')}
+            />
+          </SuccessActionsContainer>
+        );
+      default:
+        return (
+          <SuccessActionsContainer>
+            <ActionButton
+              onPress={isTxRejected || isConnectFailed ? handleRetry : handleConnectAndConfirm}
+              text={t(isTxRejected || isConnectFailed ? 'RETRY_BUTTON' : 'CONNECT_BUTTON')}
+              disabled={isButtonDisabled}
+              processing={isButtonDisabled}
+            />
+            <ActionButton
+              transparent
+              onPress={handleClose}
+              text={t('CANCEL_BUTTON')}
+              disabled={isButtonDisabled}
+            />
+          </SuccessActionsContainer>
+        );
+    }
+  };
+
+  return (
+    <Container>
+      <FullScreenHeader />
+      {transition((style) => (
+        <>
+          <OnBoardingContentContainer style={style}>
+            {renderLedgerConfirmationView()}
+          </OnBoardingContentContainer>
+          {renderLedgerConfirmationControls()}
+        </>
+      ))}
+    </Container>
+  );
+}
+
+export default ConfirmLedgerStxTransaction;
diff --git a/src/app/screens/ledger/confirmLedgerTransaction/index.tsx b/src/app/screens/ledger/confirmLedgerTransaction/index.tsx
deleted file mode 100644
index 5b608790c..000000000
--- a/src/app/screens/ledger/confirmLedgerTransaction/index.tsx
+++ /dev/null
@@ -1,575 +0,0 @@
-import InfoIcon from '@assets/img/info.svg';
-import ledgerConfirmBtcIcon from '@assets/img/ledger/btc_icon.svg';
-import checkCircleIcon from '@assets/img/ledger/check_circle.svg';
-import ledgerConnectDefaultIcon from '@assets/img/ledger/ledger_connect_default.svg';
-import ledgerConnectStxIcon from '@assets/img/ledger/ledger_import_connect_stx.svg';
-import ledgerConfirmOrdinalsIcon from '@assets/img/ledger/ordinals_icon_big.svg';
-import { type LedgerTransactionType } from '@common/types/ledger';
-import { delay } from '@common/utils/ledger';
-import ActionButton from '@components/button';
-import InfoContainer from '@components/infoContainer';
-import LedgerConnectionView, {
-  ConnectLedgerContainer,
-  ConnectLedgerText,
-} from '@components/ledger/connectLedgerView';
-import LedgerFailView from '@components/ledger/failLedgerView';
-import FullScreenHeader from '@components/ledger/fullScreenHeader';
-import Stepper from '@components/stepper';
-import useBtcClient from '@hooks/apiClients/useBtcClient';
-import useNetworkSelector from '@hooks/useNetwork';
-import useWalletSelector from '@hooks/useWalletSelector';
-import Transport from '@ledgerhq/hw-transport-webusb';
-import { useTransition } from '@react-spring/web';
-import {
-  broadcastSignedTransaction,
-  microstacksToStx,
-  satsToBtc,
-  signLedgerMixedBtcTransaction,
-  signLedgerNativeSegwitBtcTransaction,
-  signLedgerStxTransaction,
-  type Recipient,
-  type StacksRecipient,
-  type UTXO,
-} from '@secretkeylabs/xverse-core';
-import { DEFAULT_TRANSITION_OPTIONS } from '@utils/constants';
-import { getBtcTxStatusUrl, getStxTxStatusUrl, getTruncatedAddress } from '@utils/helper';
-import BigNumber from 'bignumber.js';
-import { useState } from 'react';
-import { useTranslation } from 'react-i18next';
-import { useLocation } from 'react-router-dom';
-
-import { makeRpcSuccessResponse, sendRpcResponse } from '@common/utils/rpc/helpers';
-import useSelectedAccount from '@hooks/useSelectedAccount';
-import {
-  ConfirmTxIconBig,
-  ConnectLedgerTextAdvanced,
-  ConnectLedgerTitle,
-  Container,
-  InfoContainerWrapper,
-  InfoImage,
-  OnBoardingContentContainer,
-  RecipientsWrapper,
-  SuccessActionsContainer,
-  TxConfirmedContainer,
-  TxConfirmedDescription,
-  TxConfirmedTitle,
-  TxDetails,
-  TxDetailsRow,
-  TxDetailsTitle,
-} from './index.styled';
-
-enum Steps {
-  ConnectLedger = 0,
-  ExternalInputs = 0.5,
-  ConfirmTransaction = 1,
-  ConfirmFees = 1.5,
-  TransactionConfirmed = 2,
-}
-
-function ConfirmLedgerTransaction(): JSX.Element {
-  const [currentStep, setCurrentStep] = useState(Steps.ConnectLedger);
-  const [txId, setTxId] = useState<string | undefined>(undefined);
-
-  const [isButtonDisabled, setIsButtonDisabled] = useState(false);
-  const [isConnectSuccess, setIsConnectSuccess] = useState(false);
-  const [isConnectFailed, setIsConnectFailed] = useState(false);
-  const [isWrongDevice, setIsWrongDevice] = useState(false);
-  const [isTxApproved, setIsTxApproved] = useState(false);
-  const [isFinalTxApproved, setIsFinalTxApproved] = useState(false);
-  const [isTxRejected, setIsTxRejected] = useState(false);
-
-  const { t } = useTranslation('translation', { keyPrefix: 'LEDGER_CONFIRM_TRANSACTION_SCREEN' });
-  const location = useLocation();
-  const selectedNetwork = useNetworkSelector();
-
-  const selectedAccount = useSelectedAccount();
-  const { network } = useWalletSelector();
-
-  const btcClient = useBtcClient();
-
-  const {
-    recipients,
-    type,
-    unsignedTx,
-    ordinalUtxo,
-    feeRateInput,
-    fee,
-    tabId,
-    tabMessageId: messageId,
-  }: {
-    amount: BigNumber;
-    recipients: Recipient[] | StacksRecipient[];
-    type: LedgerTransactionType;
-    unsignedTx: Buffer;
-    ordinalUtxo?: UTXO;
-    feeRateInput?: string;
-    fee?: BigNumber;
-    messageId?: string;
-    tabId?: number;
-    tabMessageId?: string;
-  } = location.state;
-
-  const transition = useTransition(currentStep, DEFAULT_TRANSITION_OPTIONS);
-
-  const signAndBroadcastOrdinalsTx = async (transport: Transport, addressIndex: number) => {
-    try {
-      const result = await signLedgerMixedBtcTransaction({
-        transport,
-        esploraProvider: btcClient,
-        network: network.type,
-        addressIndex,
-        recipients: recipients as Recipient[],
-        feeRate: feeRateInput?.toString(),
-        ordinalUtxo,
-      });
-      const { value: psbtCreatedValue } = await result.next();
-
-      const { value: taprootSignedValue } = await result.next();
-      setIsTxApproved(true);
-      setCurrentStep(Steps.ConfirmFees);
-
-      const { value: txHex } = await result.next();
-      setIsFinalTxApproved(true);
-      await delay(1500);
-      const transactionId = await btcClient.sendRawTransaction(txHex || taprootSignedValue);
-      setTxId(transactionId.tx.hash);
-      setCurrentStep(Steps.TransactionConfirmed);
-      if (tabId) {
-        const response = makeRpcSuccessResponse(messageId, { txid: transactionId.tx.hash });
-        sendRpcResponse(tabId, response);
-      }
-    } catch (err) {
-      console.error(err);
-      setIsTxRejected(true);
-      setIsButtonDisabled(false);
-    } finally {
-      transport.close();
-    }
-  };
-
-  const signAndBroadcastBtcTx = async (transport: Transport, addressIndex: number) => {
-    try {
-      const result = await signLedgerNativeSegwitBtcTransaction({
-        transport,
-        esploraProvider: btcClient,
-        network: network.type,
-        addressIndex,
-        recipients: recipients as Recipient[],
-        feeRate: feeRateInput?.toString(),
-      });
-      setIsFinalTxApproved(true);
-      await delay(1500);
-      const transactionId = await btcClient.sendRawTransaction(result);
-      setTxId(transactionId.tx.hash);
-      setCurrentStep(Steps.TransactionConfirmed);
-      if (tabId) {
-        const response = makeRpcSuccessResponse(messageId, { txid: transactionId.tx.hash });
-        sendRpcResponse(tabId, response);
-      }
-    } catch (err) {
-      console.error(err);
-      setIsTxRejected(true);
-      setIsButtonDisabled(false);
-    } finally {
-      transport.close();
-    }
-  };
-
-  const signAndBroadcastStxTx = async (transport: Transport, addressIndex: number) => {
-    try {
-      const result = await signLedgerStxTransaction({
-        transport,
-        transactionBuffer: unsignedTx,
-        addressIndex,
-      });
-      setIsFinalTxApproved(true);
-      await delay(1500);
-      const transactionHash = await broadcastSignedTransaction(result, selectedNetwork);
-      setTxId(transactionHash);
-      setCurrentStep(Steps.TransactionConfirmed);
-    } catch (err) {
-      console.error(err);
-      setIsTxRejected(true);
-      setIsButtonDisabled(false);
-    } finally {
-      transport.close();
-    }
-  };
-
-  const handleConnectAndConfirm = async () => {
-    if (!selectedAccount) {
-      console.error('No account selected');
-      return;
-    }
-
-    try {
-      setIsButtonDisabled(true);
-
-      const transport = await Transport.create();
-
-      if (!transport) {
-        setIsConnectSuccess(false);
-        setIsConnectFailed(true);
-        setIsButtonDisabled(false);
-        return;
-      }
-
-      const addressIndex = selectedAccount.deviceAccountIndex;
-
-      if (addressIndex === undefined) {
-        setIsConnectSuccess(false);
-        setIsConnectFailed(true);
-        setIsWrongDevice(true);
-        setIsButtonDisabled(false);
-        return;
-      }
-
-      setIsConnectSuccess(true);
-      await delay(1500);
-
-      if (
-        type === 'ORDINALS' &&
-        currentStep !== Steps.ExternalInputs &&
-        currentStep !== Steps.ConfirmTransaction
-      ) {
-        setCurrentStep(Steps.ExternalInputs);
-        return;
-      }
-
-      if (currentStep !== Steps.ConfirmTransaction) {
-        setCurrentStep(Steps.ConfirmTransaction);
-      }
-
-      switch (type) {
-        case 'BTC':
-        case 'BRC-20':
-          await signAndBroadcastBtcTx(transport as Transport, addressIndex);
-          break;
-        case 'STX':
-          await signAndBroadcastStxTx(transport as Transport, addressIndex);
-          break;
-        case 'ORDINALS':
-          await signAndBroadcastOrdinalsTx(transport as Transport, addressIndex);
-          break;
-        default:
-          break;
-      }
-      await transport.close();
-    } catch (err) {
-      setIsConnectSuccess(false);
-      setIsConnectFailed(true);
-    } finally {
-      setIsButtonDisabled(false);
-    }
-  };
-
-  const goToConfirmationStep = () => {
-    setCurrentStep(Steps.ConfirmTransaction);
-
-    handleConnectAndConfirm();
-  };
-
-  const handleRetry = async () => {
-    setIsTxRejected(false);
-    setIsConnectSuccess(false);
-    setIsConnectFailed(false);
-    setIsWrongDevice(false);
-    setIsTxApproved(false);
-    setCurrentStep(Steps.ConnectLedger);
-  };
-
-  const handleClose = () => {
-    if (typeof window !== 'undefined') {
-      window.close();
-    }
-  };
-
-  const handleSeeTransaction = () => {
-    if (!txId) {
-      console.error('No txId found');
-      return;
-    }
-
-    switch (type) {
-      case 'BTC':
-      case 'BRC-20':
-        window.open(getBtcTxStatusUrl(txId, network), '_blank', 'noopener,noreferrer');
-        break;
-      case 'STX':
-        window.open(getStxTxStatusUrl(txId, network), '_blank', 'noopener,noreferrer');
-        break;
-      case 'ORDINALS':
-        window.open(getBtcTxStatusUrl(txId, network), '_blank', 'noopener,noreferrer');
-        break;
-      default:
-        break;
-    }
-  };
-
-  const renderTxDetails = () => (
-    <TxDetails>
-      <TxDetailsRow>
-        <TxDetailsTitle>Recipient{recipients.length > 1 ? 's' : ''}</TxDetailsTitle>
-        <RecipientsWrapper>
-          {recipients.map((recipient) => (
-            <div key={recipient.address}>{getTruncatedAddress(recipient.address)}</div>
-          ))}
-        </RecipientsWrapper>
-      </TxDetailsRow>
-      <TxDetailsRow>
-        <TxDetailsTitle>{ordinalUtxo?.value ? 'Ordinal value' : 'Amount'}</TxDetailsTitle>
-        {type === 'STX' ? (
-          <div>
-            {microstacksToStx((recipients[0] as StacksRecipient).amountMicrostacks).toString()} STX
-          </div>
-        ) : (
-          <div>
-            {ordinalUtxo?.value
-              ? satsToBtc(new BigNumber(ordinalUtxo?.value)).toString()
-              : satsToBtc((recipients[0] as Recipient).amountSats).toString()}{' '}
-            BTC
-          </div>
-        )}
-      </TxDetailsRow>
-      {fee && (
-        <TxDetailsRow>
-          <TxDetailsTitle>{t('FEES')}</TxDetailsTitle>
-          {type === 'STX' ? (
-            <div>{microstacksToStx(fee).toString()} STX</div>
-          ) : (
-            <div>{satsToBtc(fee).toString()} BTC</div>
-          )}
-        </TxDetailsRow>
-      )}
-    </TxDetails>
-  );
-
-  const renderOrdinalTxDetails = () => (
-    <>
-      <Stepper
-        steps={[
-          { title: t('SEND_ORDINAL'), isCompleted: isTxApproved },
-          { title: t('CONFIRM_FEES'), isCompleted: isFinalTxApproved },
-        ]}
-      />
-      {renderTxDetails()}
-    </>
-  );
-
-  const connectErrSubtitle =
-    type === 'STX' ? 'CONNECT.STX_ERROR_SUBTITLE' : 'CONNECT.BTC_ERROR_SUBTITLE';
-
-  const renderLedgerConfirmationView = () => {
-    switch (currentStep) {
-      case Steps.ConnectLedger:
-        return (
-          <div>
-            <LedgerConnectionView
-              title={t('CONNECT.TITLE')}
-              text={t(type === 'STX' ? 'CONNECT.STX_SUBTITLE' : 'CONNECT.BTC_SUBTITLE')}
-              titleFailed={t('CONNECT.ERROR_TITLE')}
-              textFailed={t(
-                isWrongDevice ? 'CONNECT.WRONG_DEVICE_ERROR_SUBTITLE' : connectErrSubtitle,
-              )}
-              imageDefault={type === 'STX' ? ledgerConnectStxIcon : ledgerConfirmBtcIcon}
-              isConnectSuccess={isConnectSuccess}
-              isConnectFailed={isConnectFailed}
-            />
-          </div>
-        );
-      case Steps.ExternalInputs:
-        if (isTxRejected || isConnectFailed) {
-          return (
-            <LedgerFailView title={t('CONFIRM.ERROR_TITLE')} text={t('CONFIRM.ERROR_SUBTITLE')} />
-          );
-        }
-
-        return (
-          <div>
-            <ConnectLedgerContainer>
-              <InfoImage src={InfoIcon} alt="external inputs warning" />
-              <ConnectLedgerTitle>{t('EXTERNAL_INPUTS.TITLE')}</ConnectLedgerTitle>
-              <ConnectLedgerText>{t('EXTERNAL_INPUTS.SUBTITLE')}</ConnectLedgerText>
-            </ConnectLedgerContainer>
-          </div>
-        );
-      case Steps.ConfirmTransaction:
-        if (type === 'ORDINALS') {
-          if (isTxRejected || isConnectFailed) {
-            return (
-              <LedgerFailView title={t('CONFIRM.ERROR_TITLE')} text={t('CONFIRM.ERROR_SUBTITLE')} />
-            );
-          }
-
-          return (
-            <ConnectLedgerContainer>
-              <ConfirmTxIconBig
-                src={ledgerConfirmOrdinalsIcon}
-                alt="confirm ordinal transfer tx on the ledger device"
-              />
-              <ConnectLedgerTitle>{t('CONFIRM.ORDINAL_TX.ORDINAL_TITLE')}</ConnectLedgerTitle>
-              <ConnectLedgerTextAdvanced isCompleted={isTxApproved}>
-                {t('CONFIRM.ORDINAL_TX.ORDINAL_SUBTITLE')}
-              </ConnectLedgerTextAdvanced>
-              {renderOrdinalTxDetails()}
-              <div />
-            </ConnectLedgerContainer>
-          );
-        }
-
-        return (
-          <div>
-            <LedgerConnectionView
-              title={t('CONFIRM.TITLE')}
-              text={t('CONFIRM.SUBTITLE')}
-              titleFailed={t('CONFIRM.ERROR_TITLE')}
-              textFailed={t('CONFIRM.ERROR_SUBTITLE')}
-              imageDefault={ledgerConnectDefaultIcon}
-              isConnectSuccess={isFinalTxApproved}
-              isConnectFailed={isTxRejected}
-            />
-            {renderTxDetails()}
-          </div>
-        );
-      case Steps.ConfirmFees:
-        if (type === 'ORDINALS') {
-          if (isTxRejected || isConnectFailed) {
-            return (
-              <LedgerFailView title={t('CONFIRM.ERROR_TITLE')} text={t('CONFIRM.ERROR_SUBTITLE')} />
-            );
-          }
-
-          return (
-            <ConnectLedgerContainer>
-              <ConfirmTxIconBig
-                src={ledgerConfirmBtcIcon}
-                alt="confirm btc fee tx on the ledger device"
-              />
-              <ConnectLedgerTitle>{t('CONFIRM.TITLE')}</ConnectLedgerTitle>
-              <ConnectLedgerTextAdvanced isCompleted={isFinalTxApproved}>
-                {t('CONFIRM.ORDINAL_TX.BTC_SUBTITLE')}
-              </ConnectLedgerTextAdvanced>
-              {renderOrdinalTxDetails()}
-              <div />
-            </ConnectLedgerContainer>
-          );
-        }
-        return null;
-      case Steps.TransactionConfirmed:
-        return (
-          <TxConfirmedContainer>
-            <img src={checkCircleIcon} alt="Success" />
-            <TxConfirmedTitle>{t('SUCCESS.TITLE')}</TxConfirmedTitle>
-            <TxConfirmedDescription>{t('SUCCESS.SUBTITLE')}</TxConfirmedDescription>
-            {type === 'BRC-20' && (
-              <InfoContainerWrapper>
-                <InfoContainer bodyText={t('SUCCESS.BRC20_INFO')} />
-              </InfoContainerWrapper>
-            )}
-          </TxConfirmedContainer>
-        );
-      default:
-        return null;
-    }
-  };
-
-  const renderLedgerConfirmationControls = () => {
-    switch (currentStep) {
-      case Steps.ExternalInputs:
-        if (isTxRejected || isConnectFailed) {
-          return (
-            <SuccessActionsContainer>
-              <ActionButton
-                onPress={handleRetry}
-                text={t('RETRY_BUTTON')}
-                disabled={isButtonDisabled}
-                processing={isButtonDisabled}
-              />
-              <ActionButton
-                transparent
-                onPress={handleClose}
-                text={t('CLOSE_BUTTON')}
-                disabled={isButtonDisabled}
-              />
-            </SuccessActionsContainer>
-          );
-        }
-
-        return (
-          <SuccessActionsContainer>
-            <ActionButton onPress={goToConfirmationStep} text={t('CONTINUE_BUTTON')} />
-          </SuccessActionsContainer>
-        );
-      case Steps.ConfirmTransaction:
-      case Steps.ConfirmFees:
-        if (type === 'ORDINALS' && !isTxRejected && !isConnectFailed) {
-          return (
-            <SuccessActionsContainer>
-              <ActionButton transparent onPress={handleClose} text={t('CANCEL_BUTTON')} />
-            </SuccessActionsContainer>
-          );
-        }
-
-        return (
-          <SuccessActionsContainer>
-            <ActionButton
-              onPress={isTxRejected || isConnectFailed ? handleRetry : handleConnectAndConfirm}
-              text={t(isTxRejected || isConnectFailed ? 'RETRY_BUTTON' : 'CONNECT_BUTTON')}
-              disabled={isButtonDisabled}
-              processing={isButtonDisabled}
-            />
-            <ActionButton
-              transparent
-              onPress={handleClose}
-              text={t(isTxRejected || isConnectFailed ? 'CLOSE_BUTTON' : 'CANCEL_BUTTON')}
-              disabled={isButtonDisabled}
-            />
-          </SuccessActionsContainer>
-        );
-      case Steps.TransactionConfirmed:
-        return (
-          <SuccessActionsContainer>
-            <ActionButton onPress={handleClose} text={t('CLOSE_BUTTON')} />
-            <ActionButton
-              transparent
-              onPress={handleSeeTransaction}
-              text={t('SEE_TRANSACTION_BUTTON')}
-            />
-          </SuccessActionsContainer>
-        );
-      default:
-        return (
-          <SuccessActionsContainer>
-            <ActionButton
-              onPress={isTxRejected || isConnectFailed ? handleRetry : handleConnectAndConfirm}
-              text={t(isTxRejected || isConnectFailed ? 'RETRY_BUTTON' : 'CONNECT_BUTTON')}
-              disabled={isButtonDisabled}
-              processing={isButtonDisabled}
-            />
-            <ActionButton
-              transparent
-              onPress={handleClose}
-              text={t('CANCEL_BUTTON')}
-              disabled={isButtonDisabled}
-            />
-          </SuccessActionsContainer>
-        );
-    }
-  };
-
-  return (
-    <Container>
-      <FullScreenHeader />
-      {transition((style) => (
-        <>
-          <OnBoardingContentContainer style={style}>
-            {renderLedgerConfirmationView()}
-          </OnBoardingContentContainer>
-          {renderLedgerConfirmationControls()}
-        </>
-      ))}
-    </Container>
-  );
-}
-
-export default ConfirmLedgerTransaction;
diff --git a/src/app/screens/ledger/importLedgerAccount/steps/index.styled.ts b/src/app/screens/ledger/importLedgerAccount/steps/index.styled.ts
index fd2e41104..edfbca5b1 100644
--- a/src/app/screens/ledger/importLedgerAccount/steps/index.styled.ts
+++ b/src/app/screens/ledger/importLedgerAccount/steps/index.styled.ts
@@ -16,7 +16,7 @@ export const ImportBeforeStartContainer = styled.div((props) => ({
   flexDirection: 'column',
   alignItems: 'center',
   maxWidth: '328px',
-  paddingTop: props.theme.spacing(16),
+  paddingTop: props.theme.space.xl,
 }));
 
 export const ImportStartTitle = styled.h1((props) => ({
@@ -27,8 +27,8 @@ export const ImportStartTitle = styled.h1((props) => ({
 export const ImportStartText = styled.p((props) => ({
   ...props.theme.body_m,
   textAlign: 'center',
-  marginTop: props.theme.spacing(6),
-  color: props.theme.colors.white[200],
+  marginTop: props.theme.space.s,
+  color: props.theme.colors.white_200,
 }));
 
 export const ImportBeforeStartTitle = styled.h1((props) => ({
@@ -40,22 +40,22 @@ export const ImportBeforeStartTitle = styled.h1((props) => ({
 export const ImportBeforeStartText = styled.p((props) => ({
   ...props.theme.body_m,
   textAlign: 'left',
-  marginTop: props.theme.spacing(6),
-  color: props.theme.colors.white[200],
+  marginTop: props.theme.space.s,
+  color: props.theme.colors.white_200,
 }));
 
 export const ImportCardContainer = styled.div((props) => ({
   display: 'flex',
   flexDirection: 'column',
-  gap: props.theme.spacing(6),
+  gap: props.theme.space.s,
 }));
 
 export const SelectAssetTextContainer = styled.div((props) => ({
-  marginTop: props.theme.spacing(20),
-  marginBottom: props.theme.spacing(16),
+  marginTop: props.theme.space.xxl,
+  marginBottom: props.theme.space.xl,
   display: 'flex',
   flexDirection: 'column',
-  gap: props.theme.spacing(6),
+  gap: props.theme.space.s,
 }));
 
 export const SelectAssetTitle = styled.h1((props) => ({
@@ -65,40 +65,40 @@ export const SelectAssetTitle = styled.h1((props) => ({
 export const SelectAssetText = styled.p<{
   centered?: boolean;
 }>((props) => ({
-  ...props.theme.body_m,
-  color: props.theme.colors.white[200],
+  ...props.theme.typography.body_m,
+  color: props.theme.colors.white_200,
   textAlign: props.centered ? 'center' : 'left',
 }));
 
 export const SelectAssetFootNote = styled.p((props) => ({
   ...props.theme.body_xs,
-  color: props.theme.colors.white[200],
-  marginTop: props.theme.spacing(6),
+  color: props.theme.colors.white_200,
+  marginTop: props.theme.space.s,
 }));
 
 export const AddAddressHeaderContainer = styled.div((props) => ({
   display: 'flex',
   flexDirection: 'column',
   alignItems: 'center',
-  gap: props.theme.spacing(8),
-  marginTop: props.theme.spacing(20),
-  marginBottom: props.theme.spacing(8),
+  gap: props.theme.space.m,
+  marginTop: props.theme.space.xxl,
+  marginBottom: props.theme.space.m,
 }));
 
 export const CreateAnotherAccountContainer = styled.div((props) => ({
   display: 'flex',
   flexDirection: 'column',
   alignItems: 'center',
-  gap: props.theme.spacing(8),
+  gap: props.theme.space.m,
   paddingTop: props.theme.spacing(90),
-  marginBottom: props.theme.spacing(16),
+  marginBottom: props.theme.space.xl,
 }));
 
 export const AddAddressDetailsContainer = styled.div((props) => ({
   display: 'flex',
   flexDirection: 'column',
   alignItems: 'flex-start',
-  gap: props.theme.spacing(20),
+  gap: props.theme.space.xxl,
 }));
 
 export const AddressAddedContainer = styled.div`
@@ -114,11 +114,11 @@ export const AddressAddedContainer = styled.div`
 `;
 
 export const AddAccountNameContainer = styled.div((props) => ({
-  marginTop: props.theme.spacing(20),
+  marginTop: props.theme.space.xxl,
   width: '100%',
   display: 'flex',
   flexDirection: 'column',
-  gap: props.theme.spacing(6),
+  gap: props.theme.space.s,
 }));
 
 export const AddAccountNameTitleContainer = styled.div((props) => ({
@@ -145,8 +145,8 @@ export const EndScreenTextContainer = styled.div((props) => ({
   flexDirection: 'column',
   alignItems: 'center',
   textAlign: 'center',
-  gap: props.theme.spacing(6),
-  marginBottom: props.theme.spacing(20),
+  gap: props.theme.space.s,
+  marginBottom: props.theme.space.xxl,
 }));
 
 export const ConfirmationText = styled.p((props) => ({
@@ -159,33 +159,34 @@ export const ConfirmationText = styled.p((props) => ({
 export const ConfirmationStepsContainer = styled.div((props) => ({
   display: 'flex',
   justifyContent: 'center',
-  marginTop: props.theme.spacing(12),
+  marginTop: props.theme.space.l,
 }));
 
 export const OptionsContainer = styled.div((props) => ({
   width: '100%',
-  marginTop: props.theme.spacing(16),
+  marginTop: props.theme.space.xl,
 }));
 
 interface OptionProps {
-  selected?: boolean;
+  $selected?: boolean;
 }
 export const Option = styled.button<OptionProps>((props) => ({
+  ...props.theme.typography.body_medium_m,
   width: '100%',
   color: props.theme.colors.white_0,
-  backgroundColor: props.theme.colors.elevation3,
-  padding: props.theme.spacing(8),
+  backgroundColor: props.theme.colors.elevation1,
+  padding: props.theme.space.m,
   paddingTop: props.theme.spacing(7),
   paddingBottom: props.theme.spacing(7),
+  marginBottom: props.theme.space.s,
+  border: `1px solid ${props.$selected ? '#7383ff4d' : props.theme.colors.elevation1}`,
   borderRadius: props.theme.radius(2),
-  fontSize: '0.75rem',
-  marginBottom: props.theme.spacing(6),
-  border: `1px solid ${props.selected ? props.theme.colors.elevation6 : 'transparent'}`,
   cursor: 'pointer',
   userSelect: 'none',
   display: 'flex',
   alignItems: 'center',
   transition: 'border 0.2s ease',
+  textAlign: 'left',
 }));
 
 // TODO create radio button in ui-library
@@ -196,29 +197,29 @@ export const OptionIcon = styled.div<OptionProps>((props) => ({
   width: 16,
   height: 16,
   borderRadius: '50%',
-  border: `1px solid ${props.theme.colors.white[0]}`,
+  border: `1px solid ${props.theme.colors.white_0}`,
   marginRight: props.theme.spacing(10),
   flex: 'none',
   '&::after': {
     content: '""',
-    display: props.selected ? 'block' : 'none',
-    width: 10,
-    height: 10,
+    display: props.$selected ? 'block' : 'none',
+    width: 8,
+    height: 8,
     borderRadius: 100,
-    backgroundColor: props.theme.colors.orange_main,
+    backgroundColor: props.theme.colors.white_0,
   },
 }));
 
 export const ConfirmationStep = styled.div<{
-  isCompleted: boolean;
+  $isCompleted: boolean;
 }>((props) => ({
   width: 32,
   height: 4,
-  backgroundColor: props.isCompleted ? props.theme.colors.white[0] : props.theme.colors.white[900],
+  backgroundColor: props.$isCompleted ? props.theme.colors.white_0 : props.theme.colors.white_900,
   borderRadius: props.theme.radius(1),
   transition: 'background-color 0.2s ease',
   ':first-child': {
-    marginRight: props.theme.spacing(4),
+    marginRight: props.theme.space.xs,
   },
 }));
 
@@ -229,7 +230,7 @@ export const TogglerContainer = styled.div((props) => ({
 }));
 
 export const TogglerText = styled.p((props) => ({
-  marginLeft: props.theme.spacing(8),
+  marginLeft: props.theme.space.m,
   fontWeight: 500,
   fontSize: '0.875rem',
   lineHeight: '140%',
@@ -246,8 +247,8 @@ export const WarningIcon = styled.img({
 });
 
 export const LedgerFailViewContainer = styled.div((props) => ({
-  paddingLeft: props.theme.spacing(8),
-  paddingRight: props.theme.spacing(8),
+  paddingLeft: props.theme.space.m,
+  paddingRight: props.theme.space.m,
   margin: 'auto',
 }));
 
@@ -258,6 +259,6 @@ export const LedgerFailButtonsContainer = styled.div((props) => ({
 
 export const ActionButtonContainer = styled.div((props) => ({
   '&:not(:last-of-type)': {
-    marginBottom: props.theme.spacing(8),
+    marginBottom: props.theme.space.m,
   },
 }));
diff --git a/src/app/screens/ledger/importLedgerAccount/steps/index.tsx b/src/app/screens/ledger/importLedgerAccount/steps/index.tsx
index 5175b5a0b..52a7e30b1 100644
--- a/src/app/screens/ledger/importLedgerAccount/steps/index.tsx
+++ b/src/app/screens/ledger/importLedgerAccount/steps/index.tsx
@@ -165,16 +165,16 @@ function Steps({
           <OptionsContainer>
             <Option
               onClick={() => setSelectedLedgerLiveOption(LedgerLiveOptions.USING)}
-              selected={selectedLedgerLiveOption === LedgerLiveOptions.USING}
+              $selected={selectedLedgerLiveOption === LedgerLiveOptions.USING}
             >
-              <OptionIcon selected={selectedLedgerLiveOption === LedgerLiveOptions.USING} />
+              <OptionIcon $selected={selectedLedgerLiveOption === LedgerLiveOptions.USING} />
               {t('LEDGER_BEFORE_GETTING_STARTED.OPTIONS.USE_LEDGER_LIVE')}
             </Option>
             <Option
               onClick={() => setSelectedLedgerLiveOption(LedgerLiveOptions.NOT_USING)}
-              selected={selectedLedgerLiveOption === LedgerLiveOptions.NOT_USING}
+              $selected={selectedLedgerLiveOption === LedgerLiveOptions.NOT_USING}
             >
-              <OptionIcon selected={selectedLedgerLiveOption === LedgerLiveOptions.NOT_USING} />
+              <OptionIcon $selected={selectedLedgerLiveOption === LedgerLiveOptions.NOT_USING} />
               {t('LEDGER_BEFORE_GETTING_STARTED.OPTIONS.DONT_USE_LEDGER_LIVE')}
             </Option>
           </OptionsContainer>
@@ -340,8 +340,8 @@ function Steps({
           <ConfirmationText>{t('LEDGER_ADD_ADDRESS.CONFIRM_TO_CONTINUE')}</ConfirmationText>
           {isBitcoinSelected && (
             <ConfirmationStepsContainer>
-              <ConfirmationStep isCompleted={isBtcAddressConfirmed} />
-              <ConfirmationStep isCompleted={isOrdinalsAddressConfirmed} />
+              <ConfirmationStep $isCompleted={isBtcAddressConfirmed} />
+              <ConfirmationStep $isCompleted={isOrdinalsAddressConfirmed} />
             </ConfirmationStepsContainer>
           )}
         </>
@@ -379,8 +379,8 @@ function Steps({
           </AddAddressDetailsContainer>
           <ConfirmationText>{t('LEDGER_ADD_ADDRESS.CONFIRM_TO_CONTINUE')}</ConfirmationText>
           <ConfirmationStepsContainer>
-            <ConfirmationStep isCompleted={isBtcAddressConfirmed} />
-            <ConfirmationStep isCompleted={isOrdinalsAddressConfirmed} />
+            <ConfirmationStep $isCompleted={isBtcAddressConfirmed} />
+            <ConfirmationStep $isCompleted={isOrdinalsAddressConfirmed} />
           </ConfirmationStepsContainer>
         </>
       );
diff --git a/src/app/screens/listRune/index.tsx b/src/app/screens/listRune/index.tsx
index 78de20cd7..4589a802e 100644
--- a/src/app/screens/listRune/index.tsx
+++ b/src/app/screens/listRune/index.tsx
@@ -5,7 +5,7 @@ import useRuneFloorPricePerMarketplaceQuery from '@hooks/queries/runes/useRuneFl
 import { useVisibleRuneFungibleTokens } from '@hooks/queries/runes/useRuneFungibleTokensQuery';
 import useRuneSellPsbtPerMarketplace from '@hooks/queries/runes/useRuneSellPsbtPerMarketplace';
 import useRuneUtxosQueryPerMarketplace from '@hooks/queries/runes/useRuneUtxosQueryPerMarketplace';
-import useCoinRates from '@hooks/queries/useCoinRates';
+import useSupportedCoinRates from '@hooks/queries/useSupportedCoinRates';
 import useHasFeature from '@hooks/useHasFeature';
 import { useResetUserFlow } from '@hooks/useResetUserFlow';
 import useTrackMixPanelPageViewed from '@hooks/useTrackMixPanelPageViewed';
@@ -74,7 +74,7 @@ export default function ListRuneScreen() {
   const { visible: runesCoinsList } = useVisibleRuneFungibleTokens(false);
   const selectedRune = runesCoinsList.find((ft) => ft.principal === runeId);
   const { fiatCurrency } = useWalletSelector();
-  const { btcFiatRate } = useCoinRates();
+  const { btcFiatRate } = useSupportedCoinRates();
   const location = useLocation();
   const params = new URLSearchParams(location.search);
   const locationFrom = params.get('from');
@@ -231,15 +231,13 @@ export default function ListRuneScreen() {
     dispatch({ type: 'UPDATE_ONE_LIST_ITEM', key, payload: updatedSelectedListItem });
     if (
       Object.values(listItemsMap).filter((listItem) => listItem.selected).length ===
-        listItemsResponse?.length ??
-      0
+      listItemsResponse?.length
     ) {
       dispatch({ type: 'SET_SELECT_ALL_TOGGLE', payload: true });
     }
     if (
       Object.values(listItemsMap).filter((listItem) => !listItem.selected).length ===
-        listItemsResponse?.length ??
-      0
+      listItemsResponse?.length
     ) {
       dispatch({ type: 'SET_SELECT_ALL_TOGGLE', payload: false });
     }
diff --git a/src/app/screens/listRune/setRunePriceItem.tsx b/src/app/screens/listRune/setRunePriceItem.tsx
index ac47aaaca..67c301c1b 100644
--- a/src/app/screens/listRune/setRunePriceItem.tsx
+++ b/src/app/screens/listRune/setRunePriceItem.tsx
@@ -1,4 +1,4 @@
-import useCoinRates from '@hooks/queries/useCoinRates';
+import useSupportedCoinRates from '@hooks/queries/useSupportedCoinRates';
 import useWalletSelector from '@hooks/useWalletSelector';
 import { PencilSimple } from '@phosphor-icons/react';
 import FloorComparisonLabel from '@screens/listRune/floorComparisonLabel';
@@ -84,7 +84,7 @@ function SetRunePriceItem({
   handleShowCustomPriceModal,
 }: Props) {
   const { t } = useTranslation('translation');
-  const { btcFiatRate } = useCoinRates();
+  const { btcFiatRate } = useSupportedCoinRates();
   const { fiatCurrency } = useWalletSelector();
 
   return (
diff --git a/src/app/screens/ordinalDetail/index.tsx b/src/app/screens/ordinalDetail/index.tsx
index 52dc44216..22bd4c6bb 100644
--- a/src/app/screens/ordinalDetail/index.tsx
+++ b/src/app/screens/ordinalDetail/index.tsx
@@ -526,7 +526,7 @@ function OrdinalDetailScreen() {
           <Button
             variant="tertiary"
             icon={<img src={ArrowLeft} alt="go back" />}
-            dataTestId="back-to-gallery"
+            data-testid="back-to-gallery"
             onClick={handleBackButtonClick}
             title={backButtonText}
           />
@@ -561,7 +561,7 @@ function OrdinalDetailScreen() {
           <Button
             variant="tertiary"
             icon={<img src={ArrowLeft} alt="go back" />}
-            dataTestId="back-button"
+            data-testid="back-button"
             onClick={handleBackButtonClick}
             title={backButtonText}
           />
diff --git a/src/app/screens/sendBtc/amountSelector.tsx b/src/app/screens/sendBtc/amountSelector.tsx
index bfaf5ef10..35474742b 100644
--- a/src/app/screens/sendBtc/amountSelector.tsx
+++ b/src/app/screens/sendBtc/amountSelector.tsx
@@ -1,5 +1,5 @@
 import useBtcWalletData from '@hooks/queries/useBtcWalletData';
-import useCoinRates from '@hooks/queries/useCoinRates';
+import useSupportedCoinRates from '@hooks/queries/useSupportedCoinRates';
 import useBtcFeeRate from '@hooks/useBtcFeeRate';
 import useWalletSelector from '@hooks/useWalletSelector';
 import { getBtcFiatEquivalent } from '@secretkeylabs/xverse-core';
@@ -66,7 +66,7 @@ function AmountSelector({
 
   const { fiatCurrency } = useWalletSelector();
   const { data: btcBalance, isLoading: btcBalanceLoading } = useBtcWalletData();
-  const { btcFiatRate } = useCoinRates();
+  const { btcFiatRate } = useSupportedCoinRates();
 
   const { data: recommendedFees } = useBtcFeeRate();
 
diff --git a/src/app/screens/sendRune/amountSelector.tsx b/src/app/screens/sendRune/amountSelector.tsx
index 877d2a9bf..854f7a57a 100644
--- a/src/app/screens/sendRune/amountSelector.tsx
+++ b/src/app/screens/sendRune/amountSelector.tsx
@@ -1,4 +1,4 @@
-import useCoinRates from '@hooks/queries/useCoinRates';
+import useSupportedCoinRates from '@hooks/queries/useSupportedCoinRates';
 import useBtcFeeRate from '@hooks/useBtcFeeRate';
 import useWalletSelector from '@hooks/useWalletSelector';
 import RuneAmountSelector from '@screens/sendRune/runeAmountSelector';
@@ -69,7 +69,7 @@ function AmountSelector({
   const { t } = useTranslation('translation', { keyPrefix: 'SEND' });
   const { t: tUnits } = useTranslation('translation', { keyPrefix: 'UNITS' });
   const { fiatCurrency } = useWalletSelector();
-  const { btcFiatRate } = useCoinRates();
+  const { btcFiatRate } = useSupportedCoinRates();
   const { data: recommendedFees } = useBtcFeeRate();
 
   const balance = getFtBalance(token);
diff --git a/src/app/screens/sendStx/steps/Step2SelectAmount.tsx b/src/app/screens/sendStx/steps/Step2SelectAmount.tsx
index 5660c05d9..eb8ad6e7e 100644
--- a/src/app/screens/sendStx/steps/Step2SelectAmount.tsx
+++ b/src/app/screens/sendStx/steps/Step2SelectAmount.tsx
@@ -1,6 +1,6 @@
-import useCoinRates from '@hooks/queries/useCoinRates';
 import useStxPendingTxData from '@hooks/queries/useStxPendingTxData';
 import useStxWalletData from '@hooks/queries/useStxWalletData';
+import useSupportedCoinRates from '@hooks/queries/useSupportedCoinRates';
 import useNetworkSelector from '@hooks/useNetwork';
 import useSelectedAccount from '@hooks/useSelectedAccount';
 import useWalletSelector from '@hooks/useWalletSelector';
@@ -91,7 +91,7 @@ function Step2SelectAmount({
   const { stxAddress, stxPublicKey } = useSelectedAccount();
   const { fiatCurrency, feeMultipliers } = useWalletSelector();
   const { data: stxData } = useStxWalletData();
-  const { btcFiatRate, stxBtcRate } = useCoinRates();
+  const { btcFiatRate, stxBtcRate } = useSupportedCoinRates();
   const stxBalance = stxData?.availableBalance.toString() ?? '0';
   const ftBalance = fungibleToken ? getFtBalance(fungibleToken) : '0';
 
diff --git a/src/app/screens/sendStx/stxAmountSelector.tsx b/src/app/screens/sendStx/stxAmountSelector.tsx
index 830cd5288..21df7e4b2 100644
--- a/src/app/screens/sendStx/stxAmountSelector.tsx
+++ b/src/app/screens/sendStx/stxAmountSelector.tsx
@@ -1,7 +1,7 @@
 import FiatAmountText from '@components/fiatAmountText';
 import { microStxToStx } from '@components/postCondition/postConditionView/helper';
-import useCoinRates from '@hooks/queries/useCoinRates';
 import useStxWalletData from '@hooks/queries/useStxWalletData';
+import useSupportedCoinRates from '@hooks/queries/useSupportedCoinRates';
 import useWalletSelector from '@hooks/useWalletSelector';
 import { ArrowsDownUp } from '@phosphor-icons/react';
 import {
@@ -70,7 +70,7 @@ function StxAmountSelector({ amount, setAmount, sendMax, setSendMax, disabled =
   const { t } = useTranslation('translation', { keyPrefix: 'SEND' });
   const { fiatCurrency } = useWalletSelector();
   const { data: stxData } = useStxWalletData();
-  const { btcFiatRate, stxBtcRate } = useCoinRates();
+  const { btcFiatRate, stxBtcRate } = useSupportedCoinRates();
   const stxBalanceStr = stxData?.availableBalance.toString() ?? '0';
 
   const [amountDisplay, setAmountDisplay] = useState(
diff --git a/src/app/screens/settings/index.tsx b/src/app/screens/settings/index.tsx
index b0b4209ec..685c720e4 100644
--- a/src/app/screens/settings/index.tsx
+++ b/src/app/screens/settings/index.tsx
@@ -17,8 +17,8 @@ const Container = styled.div`
 
 const Title = styled.h1((props) => ({
   ...props.theme.typography.headline_l,
-  paddingTop: props.theme.space.xxl,
-  paddingBottom: props.theme.space.m,
+  marginTop: props.theme.space.xxl,
+  marginBottom: props.theme.space.s,
 }));
 
 function Setting() {
diff --git a/src/app/screens/settings/preferences/fiatCurrency/currencyRow.tsx b/src/app/screens/settings/preferences/fiatCurrency/currencyRow.tsx
index 41b3cc968..8e7dcb5bb 100644
--- a/src/app/screens/settings/preferences/fiatCurrency/currencyRow.tsx
+++ b/src/app/screens/settings/preferences/fiatCurrency/currencyRow.tsx
@@ -54,7 +54,7 @@ function CurrencyRow({ currency, isSelected, onCurrencySelected, showDivider }:
       $variant={isSelected ? theme.typography.body_bold_l : theme.typography.body_medium_l}
     >
       <CurrencyWrapper>
-        <StyledImg src={currency.flag} alt="flag" />
+        <StyledImg src={currency.isoFlag} alt="flag" />
         {currency.name}
       </CurrencyWrapper>
       {isSelected && <img src={TickIcon} alt="tick" />}
diff --git a/src/app/screens/settings/security/backupWallet/index.tsx b/src/app/screens/settings/security/backupWallet/index.tsx
index 16ec8a7bd..4ca405edc 100644
--- a/src/app/screens/settings/security/backupWallet/index.tsx
+++ b/src/app/screens/settings/security/backupWallet/index.tsx
@@ -3,7 +3,7 @@ import BottomBar from '@components/tabBar';
 import TopRow from '@components/topRow';
 import useSeedVault from '@hooks/useSeedVault';
 import SeedCheck from '@screens/backupWalletSteps/seedCheck';
-import { Container, Title } from '@screens/settings/index.styles';
+import { Container } from '@screens/settings/index.styles';
 import { useEffect, useState } from 'react';
 import { useTranslation } from 'react-i18next';
 import { useNavigate } from 'react-router-dom';
@@ -12,16 +12,10 @@ import styled from 'styled-components';
 const EnterPasswordContainer = styled.div((props) => ({
   width: '100%',
   height: '100%',
-  top: 0,
-  left: 0,
-  bottom: 0,
-  right: 0,
-  position: 'fixed',
   zIndex: 10,
   background: props.theme.colors.elevation0,
   backdropFilter: 'blur(16px)',
-  padding: 16,
-  paddingTop: props.theme.spacing(40),
+  paddingTop: props.theme.space.l,
 }));
 
 const SeedphraseContainer = styled.div((props) => ({
@@ -30,10 +24,10 @@ const SeedphraseContainer = styled.div((props) => ({
 
 function BackupWalletScreen() {
   const { t } = useTranslation('translation');
-  const [password, setPassword] = useState<string>('');
-  const [error, setError] = useState<string>('');
-  const [loading, setLoading] = useState<boolean>(false);
-  const [showSeed, setShowSeed] = useState<boolean>(false);
+  const [password, setPassword] = useState('');
+  const [error, setError] = useState('');
+  const [loading, setLoading] = useState(false);
+  const [showSeed, setShowSeed] = useState(false);
   const [seed, setSeed] = useState('');
   const navigate = useNavigate();
   const { getSeed, unlockVault } = useSeedVault();
@@ -49,7 +43,7 @@ function BackupWalletScreen() {
     };
   }, []);
 
-  const goBack = () => {
+  const handleBackButtonClick = () => {
     navigate(-1);
   };
 
@@ -69,9 +63,8 @@ function BackupWalletScreen() {
 
   return (
     <>
-      <TopRow onClick={goBack} />
+      <TopRow onClick={handleBackButtonClick} />
       <Container>
-        <Title>{t('SETTING_SCREEN.BACKUP_WALLET')}</Title>
         {!showSeed && (
           <EnterPasswordContainer>
             <PasswordInput
@@ -80,15 +73,16 @@ function BackupWalletScreen() {
               enteredPassword={password}
               setEnteredPassword={setPassword}
               handleContinue={handlePasswordNextClick}
-              handleBack={goBack}
+              handleBack={handleBackButtonClick}
               passwordError={error}
               stackButtonAlignment
               loading={loading}
+              autoFocus
             />
           </EnterPasswordContainer>
         )}
         <SeedphraseContainer>
-          {showSeed && <SeedCheck seedPhrase={seed} onContinue={goBack} />}
+          {showSeed && <SeedCheck seedPhrase={seed} onContinue={handleBackButtonClick} />}
         </SeedphraseContainer>
       </Container>
       <BottomBar tab="settings" />
diff --git a/src/app/screens/settings/security/index.tsx b/src/app/screens/settings/security/index.tsx
index 05198bac1..6b13959cc 100644
--- a/src/app/screens/settings/security/index.tsx
+++ b/src/app/screens/settings/security/index.tsx
@@ -109,6 +109,7 @@ function Security() {
           text={t('RESET_WALLET')}
           onClick={openResetWalletPrompt}
           showWarningTitle
+          showArrow={false}
         />
         <ResetWalletPrompt
           showResetWalletPrompt={showResetWalletPrompt}
diff --git a/src/app/screens/settings/settingComponent/index.tsx b/src/app/screens/settings/settingComponent/index.tsx
index e4c715b7d..b7fddbbf2 100644
--- a/src/app/screens/settings/settingComponent/index.tsx
+++ b/src/app/screens/settings/settingComponent/index.tsx
@@ -26,11 +26,11 @@ const TitleText = styled.h1((props) => ({
   paddingTop: props.theme.space.xl,
 }));
 
-const ComponentText = styled.h1<{
-  textColor: string;
+const ComponentText = styled.p<{
+  $textColor: string;
 }>((props) => ({
   ...props.theme.typography.body_medium_l,
-  color: props.textColor,
+  color: props.$textColor,
   flex: 1,
   textAlign: 'left',
 }));
@@ -79,6 +79,7 @@ type Props = {
   onClick?: () => void;
   showDivider?: boolean;
   showWarningTitle?: boolean;
+  showArrow?: boolean;
   toggle?: boolean;
   toggleValue?: boolean;
   description?: string;
@@ -95,6 +96,7 @@ function SettingComponent({
   link,
   showDivider,
   showWarningTitle,
+  showArrow = true,
   toggle,
   toggleValue,
   description,
@@ -103,6 +105,7 @@ function SettingComponent({
   isLoading,
 }: Props) {
   const theme = useTheme();
+
   return (
     <Wrapper>
       <ColumnContainer>
@@ -113,7 +116,7 @@ function SettingComponent({
         >
           <Column>
             <ComponentText
-              textColor={showWarningTitle ? theme.colors.feedback.error : theme.colors.white['200']}
+              $textColor={showWarningTitle ? theme.colors.feedback.error : theme.colors.white_200}
             >
               {text}
             </ComponentText>
@@ -121,7 +124,9 @@ function SettingComponent({
           </Column>
           {textDetail && <ComponentDescriptionText>{textDetail}</ComponentDescriptionText>}
           {!toggle && link && <ArrowUpRight color={theme.colors.white_0} size={16} weight="bold" />}
-          {!toggle && !link && <CaretRight color={theme.colors.white_0} size={16} weight="bold" />}
+          {!toggle && !link && showArrow && (
+            <CaretRight color={theme.colors.white_0} size={16} weight="bold" />
+          )}
           {isLoading && <Spinner color="white" size={16} />}
           {toggle && toggleFunction && !isLoading && (
             <Toggle onChange={toggleFunction} checked={toggleValue ?? false} disabled={disabled} />
diff --git a/src/app/screens/signPsbtRequest/index.tsx b/src/app/screens/signPsbtRequest/index.tsx
index 4dfcad44d..4622f1c3f 100644
--- a/src/app/screens/signPsbtRequest/index.tsx
+++ b/src/app/screens/signPsbtRequest/index.tsx
@@ -64,9 +64,11 @@ function SignPsbtRequest() {
   }, [parsedPsbt]);
 
   const onConfirm = async (ledgerTransport?: Transport) => {
+    if (!parsedPsbt) return;
+
     setIsSigning(true);
     try {
-      const signedPsbt = await parsedPsbt?.getSignedPsbtBase64({
+      const signedPsbt = await parsedPsbt.getSignedPsbtBase64({
         finalize: payload.broadcast,
         ledgerTransport,
       });
diff --git a/src/app/screens/signPsbtRequest/useSignPsbt.ts b/src/app/screens/signPsbtRequest/useSignPsbt.ts
index a2288f6ef..6a73e6e49 100644
--- a/src/app/screens/signPsbtRequest/useSignPsbt.ts
+++ b/src/app/screens/signPsbtRequest/useSignPsbt.ts
@@ -10,9 +10,8 @@ import {
   type SignTransactionPayload,
 } from '@sats-connect/core';
 import {
+  base64ToHex,
   btcTransaction,
-  psbtBase64ToHex,
-  signPsbt,
   type InputToSign,
   type SettingsNetwork,
 } from '@secretkeylabs/xverse-core';
@@ -20,7 +19,6 @@ import { decodeToken } from 'jsontokens';
 import { useMemo } from 'react';
 import { useLocation } from 'react-router-dom';
 import useBtcClient from '../../hooks/apiClients/useBtcClient';
-import useSeedVault from '../../hooks/useSeedVault';
 
 const useSignPsbtParams = (network: SettingsNetwork) => {
   const { search } = useLocation();
@@ -70,8 +68,7 @@ const useSignPsbtParams = (network: SettingsNetwork) => {
 };
 
 const useSignPsbt = () => {
-  const { accountsList, network } = useWalletSelector();
-  const { getSeed } = useSeedVault();
+  const { network } = useWalletSelector();
   const btcClient = useBtcClient();
   const { payload, tabId, requestToken, requestId } = useSignPsbtParams(network);
 
@@ -86,27 +83,17 @@ const useSignPsbt = () => {
     }
   }, [txnContext, payload]);
 
-  const confirmSignPsbt = async (signingResponseOverride?: string) => {
-    let signingResponse = signingResponseOverride;
-    if (!signingResponse && payload) {
-      const seedPhrase = await getSeed();
-      signingResponse = await signPsbt(
-        seedPhrase,
-        accountsList,
-        payload.inputsToSign,
-        payload.psbtBase64,
-        payload.broadcast,
-        network.type,
-      );
-    }
+  const confirmSignPsbt = async (signingResponse: string) => {
+    if (!signingResponse) return;
 
     let txId: string = '';
+
     if (payload.broadcast && signingResponse) {
-      const txHex = psbtBase64ToHex(signingResponse);
+      const txHex = base64ToHex(signingResponse);
       const response = await btcClient.sendRawTransaction(txHex);
       txId = response.tx.hash;
     }
-    if (!signingResponse) return;
+
     if (requestToken) {
       const signingMessage = {
         source: MESSAGE_SOURCE,
@@ -128,6 +115,7 @@ const useSignPsbt = () => {
       const response = makeRpcSuccessResponse(requestId as string, result);
       sendRpcResponse(+tabId, response);
     }
+
     return {
       txId,
       signingResponse,
diff --git a/src/app/screens/speedUpTransaction/customFee/index.tsx b/src/app/screens/speedUpTransaction/customFee/index.tsx
index 94d2b435b..4977ecbbd 100644
--- a/src/app/screens/speedUpTransaction/customFee/index.tsx
+++ b/src/app/screens/speedUpTransaction/customFee/index.tsx
@@ -1,5 +1,5 @@
 import BottomModal from '@components/bottomModal';
-import useCoinRates from '@hooks/queries/useCoinRates';
+import useSupportedCoinRates from '@hooks/queries/useSupportedCoinRates';
 import useWalletSelector from '@hooks/useWalletSelector';
 import {
   getBtcFiatEquivalent,
@@ -57,7 +57,7 @@ export default function CustomFee({
   const { t: tUnits } = useTranslation('translation', { keyPrefix: 'UNITS' });
 
   const { fiatCurrency } = useWalletSelector();
-  const { btcFiatRate, stxBtcRate } = useCoinRates();
+  const { btcFiatRate, stxBtcRate } = useSupportedCoinRates();
 
   const [feeRateInput, setFeeRateInput] = useState(feeRate || minimumFeeRate);
   const [totalFee, setTotalFee] = useState(fee || initialTotalFee);
diff --git a/src/app/screens/speedUpTransaction/index.tsx b/src/app/screens/speedUpTransaction/index.tsx
index 4c0d4eb54..31561a046 100644
--- a/src/app/screens/speedUpTransaction/index.tsx
+++ b/src/app/screens/speedUpTransaction/index.tsx
@@ -19,6 +19,7 @@ import useRbfTransactionData, {
 } from '@hooks/useRbfTransactionData';
 import useSeedVault from '@hooks/useSeedVault';
 import useSelectedAccount from '@hooks/useSelectedAccount';
+import useTransactionContext from '@hooks/useTransactionContext';
 import useWalletSelector from '@hooks/useWalletSelector';
 import Transport from '@ledgerhq/hw-transport-webusb';
 import { CarProfile, Lightning, RocketLaunch, ShootingStar } from '@phosphor-icons/react';
@@ -77,6 +78,7 @@ function SpeedUpTransactionScreen() {
   const selectedStacksNetwork = useNetworkSelector();
   const isBtc = isBtcTransaction(stxTransaction || btcTransaction);
   const [isBroadcasting, setIsBroadcasting] = useState(false);
+  const transactionContext = useTransactionContext();
 
   const handleClickFeeButton = (e: React.MouseEvent<HTMLButtonElement>) => {
     if (e.currentTarget.value === 'custom') {
@@ -218,7 +220,7 @@ function SpeedUpTransactionScreen() {
       const signedTx = await rbfTransaction.getReplacementTransaction({
         feeRate: Number(feeRateInput),
         ledgerTransport: transport,
-        getSeedPhrase: getSeed,
+        context: transactionContext,
       });
 
       await btcClient.sendRawTransaction(signedTx.hex);
diff --git a/src/app/screens/swap/components/tokenFromBottomSheet/useFromTokens.ts b/src/app/screens/swap/components/tokenFromBottomSheet/useFromTokens.ts
index e5aca1f1e..e886fc431 100644
--- a/src/app/screens/swap/components/tokenFromBottomSheet/useFromTokens.ts
+++ b/src/app/screens/swap/components/tokenFromBottomSheet/useFromTokens.ts
@@ -1,4 +1,4 @@
-import useCoinRates from '@hooks/queries/useCoinRates';
+import useSupportedCoinRates from '@hooks/queries/useSupportedCoinRates';
 import useMasterCoinsList from '@screens/swap/useMasterCoinsList';
 import { mapSwapProtocolToFTProtocol } from '@screens/swap/utils';
 import { type Token } from '@secretkeylabs/xverse-core';
@@ -6,7 +6,7 @@ import { sortFtByFiatBalance } from '@utils/tokens';
 
 const useFromTokens = (toToken?: Token) => {
   const tokens = useMasterCoinsList();
-  const { stxBtcRate, btcFiatRate } = useCoinRates();
+  const { stxBtcRate, btcFiatRate } = useSupportedCoinRates();
 
   // Sort tokens, keeping BTC as the first element, and STX (if enabled) as the second
   const sortedTokens = tokens.sort((a, b) => {
diff --git a/src/app/screens/swap/index.tsx b/src/app/screens/swap/index.tsx
index b255b0a25..120a01708 100644
--- a/src/app/screens/swap/index.tsx
+++ b/src/app/screens/swap/index.tsx
@@ -6,8 +6,8 @@ import useRuneFloorPriceQuery from '@hooks/queries/runes/useRuneFloorPriceQuery'
 import useGetSip10TokenInfo from '@hooks/queries/stx/useGetSip10TokenInfo';
 import useGetQuotes from '@hooks/queries/swaps/useGetQuotes';
 import useBtcWalletData from '@hooks/queries/useBtcWalletData';
-import useCoinRates from '@hooks/queries/useCoinRates';
 import useStxWalletData from '@hooks/queries/useStxWalletData';
+import useSupportedCoinRates from '@hooks/queries/useSupportedCoinRates';
 import useSelectedAccount from '@hooks/useSelectedAccount';
 import useWalletSelector from '@hooks/useWalletSelector';
 import type { DataStxSignTransaction } from '@screens/transactionRequest/useStxTransactionRequest';
@@ -130,7 +130,7 @@ export default function SwapScreen() {
   const { data: btcBalance } = useBtcWalletData();
   const { data: stxData } = useStxWalletData();
 
-  const { btcFiatRate, btcUsdRate, stxBtcRate } = useCoinRates();
+  const { btcFiatRate, btcUsdRate, stxBtcRate } = useSupportedCoinRates();
   const navigate = useNavigate();
   const { t } = useTranslation('translation');
   const location = useLocation();
diff --git a/src/app/screens/swap/quoteSummary/index.tsx b/src/app/screens/swap/quoteSummary/index.tsx
index bf7087b3c..dfc457e52 100644
--- a/src/app/screens/swap/quoteSummary/index.tsx
+++ b/src/app/screens/swap/quoteSummary/index.tsx
@@ -2,7 +2,7 @@ import SlippageEditIcon from '@assets/img/swap/slippageEdit.svg';
 import TopRow from '@components/topRow';
 import useRuneFloorPriceQuery from '@hooks/queries/runes/useRuneFloorPriceQuery';
 import useGetSip10TokenInfo from '@hooks/queries/stx/useGetSip10TokenInfo';
-import useCoinRates from '@hooks/queries/useCoinRates';
+import useSupportedCoinRates from '@hooks/queries/useSupportedCoinRates';
 import useBtcFeeRate from '@hooks/useBtcFeeRate';
 import useSearchParamsState from '@hooks/useSearchParamsState';
 import useSelectedAccount from '@hooks/useSelectedAccount';
@@ -186,7 +186,7 @@ export default function QuoteSummary({
   });
 
   const theme = useTheme();
-  const { btcFiatRate, btcUsdRate, stxBtcRate } = useCoinRates();
+  const { btcFiatRate, btcUsdRate, stxBtcRate } = useSupportedCoinRates();
   const { btcAddress, ordinalsAddress, btcPublicKey, ordinalsPublicKey, stxAddress, stxPublicKey } =
     useSelectedAccount();
 
diff --git a/src/app/screens/swap/quotesModal/index.tsx b/src/app/screens/swap/quotesModal/index.tsx
index 313df379c..44bc51244 100644
--- a/src/app/screens/swap/quotesModal/index.tsx
+++ b/src/app/screens/swap/quotesModal/index.tsx
@@ -1,5 +1,5 @@
 import useGetSip10TokenInfo from '@hooks/queries/stx/useGetSip10TokenInfo';
-import useCoinRates from '@hooks/queries/useCoinRates';
+import useSupportedCoinRates from '@hooks/queries/useSupportedCoinRates';
 import {
   getBtcFiatEquivalent,
   getStxFiatEquivalent,
@@ -65,7 +65,7 @@ function QuotesModal({
 }: Props) {
   const { t } = useTranslation('translation', { keyPrefix: 'SWAP_SCREEN' });
 
-  const { btcFiatRate, stxBtcRate } = useCoinRates();
+  const { btcFiatRate, stxBtcRate } = useSupportedCoinRates();
   const { tokenInfo: toTokenInfo } = useGetSip10TokenInfo({ principal: toToken?.ticker });
 
   const sortQuotesByReceiveAmount = <T extends StxQuote | Quote>(quotes: T[]): T[] =>
diff --git a/src/app/screens/swap/utxoSelection/index.tsx b/src/app/screens/swap/utxoSelection/index.tsx
index 351739215..b4f2a7de5 100644
--- a/src/app/screens/swap/utxoSelection/index.tsx
+++ b/src/app/screens/swap/utxoSelection/index.tsx
@@ -13,7 +13,7 @@ import { StyledP } from '@ui-library/common.styled';
 
 import useGetUtxos from '@hooks/queries/swaps/useGetUtxos';
 import useBtcWalletData from '@hooks/queries/useBtcWalletData';
-import useCoinRates from '@hooks/queries/useCoinRates';
+import useSupportedCoinRates from '@hooks/queries/useSupportedCoinRates';
 import useWalletSelector from '@hooks/useWalletSelector';
 import Button from '@ui-library/button';
 import SnackBar from '@ui-library/snackBar';
@@ -136,7 +136,7 @@ export default function UtxoSelection({
   const { t: commonT } = useTranslation('translation', { keyPrefix: 'COMMON' });
 
   const { fiatCurrency } = useWalletSelector();
-  const { btcFiatRate } = useCoinRates();
+  const { btcFiatRate } = useSupportedCoinRates();
   const { data: btcBalance } = useBtcWalletData();
 
   const totalRunesPerBtc = new BigNumber(100000000).dividedBy(
diff --git a/src/app/screens/transactionStatus/marketplaceRuneListingResults.tsx b/src/app/screens/transactionStatus/marketplaceRuneListingResults.tsx
index edaa7694d..990f12f31 100644
--- a/src/app/screens/transactionStatus/marketplaceRuneListingResults.tsx
+++ b/src/app/screens/transactionStatus/marketplaceRuneListingResults.tsx
@@ -2,15 +2,18 @@ import CheckCircle from '@assets/img/listings/CheckCircle.svg';
 import XCircle from '@assets/img/listings/XCircle.svg';
 import TokenImage from '@components/tokenImage';
 import { ArrowUpRight } from '@phosphor-icons/react';
-import type { FungibleToken, ListingProvider, Marketplace } from '@secretkeylabs/xverse-core';
+import {
+  marketplaceRuneDashboardUrl,
+  type FungibleToken,
+  type ListingProvider,
+} from '@secretkeylabs/xverse-core';
 import { StyledP } from '@ui-library/common.styled';
-import { MAGIC_EDEN_RUNES_URL, OKX_RUNES_URL, UNISAT_RUNES_URL } from '@utils/constants';
 import { formatNumber } from '@utils/helper';
 import { useTranslation } from 'react-i18next';
 import styled from 'styled-components';
 import theme from 'theme';
 
-const Container = styled.div<{ $successful: boolean }>`
+const Container = styled.div<{ $successful: boolean; $enabled: boolean }>`
   display: flex;
   align-items: center;
   flex-direction: row;
@@ -25,7 +28,7 @@ const Container = styled.div<{ $successful: boolean }>`
   transition: background-color 0.1s ease, border-color 0.1s ease;
   width: 100%;
   gap: 10px;
-  cursor: ${(props) => (props.$successful ? 'pointer' : 'auto')};
+  cursor: ${(props) => (props.$enabled ? 'pointer' : 'auto')};
 `;
 
 const RowCenter = styled.div({
@@ -56,19 +59,16 @@ function MarketplaceRuneListingResult({ minPriceSats, marketplace, rune, success
   const { t } = useTranslation('translation', { keyPrefix: 'LIST_RUNE_SCREEN' });
   const floorPrice = formatNumber(minPriceSats);
 
-  const marketplaceToUrl: { [key in Marketplace]: string } = {
-    'Magic Eden': `${MAGIC_EDEN_RUNES_URL}/${rune.name}`,
-    Unisat: `${UNISAT_RUNES_URL}/market?tick=${rune.name}`,
-    OKX: `${OKX_RUNES_URL}/token/${rune.name}/${rune.ticker}`,
-  };
+  const marketplaceUrl = marketplaceRuneDashboardUrl(rune, marketplace.name);
+  const enabled = successful && !!marketplaceUrl;
 
-  const handleClick = () =>
-    successful && window.open(marketplaceToUrl[marketplace.name], '_blank', 'noopener,noreferrer');
+  const handleClick = () => enabled && window.open(marketplaceUrl, '_blank', 'noopener,noreferrer');
 
   return (
     <Container
       data-testid="marketplace-listing-result"
       $successful={successful}
+      $enabled={enabled}
       onClick={handleClick}
     >
       <div style={{ marginRight: theme.space.s }}>
@@ -102,7 +102,7 @@ function MarketplaceRuneListingResult({ minPriceSats, marketplace, rune, success
           </SubtitleContainer>
         </RowCenter>
       </InfoContainer>
-      {successful && <ArrowUpRight size="16" color={theme.colors.white_0} />}
+      {enabled && <ArrowUpRight size="16" color={theme.colors.white_0} />}
     </Container>
   );
 }
diff --git a/src/app/ui-components/btcAmountSelector.tsx b/src/app/ui-components/btcAmountSelector.tsx
index 8165876d5..9c2438801 100644
--- a/src/app/ui-components/btcAmountSelector.tsx
+++ b/src/app/ui-components/btcAmountSelector.tsx
@@ -1,5 +1,5 @@
 import useBtcWalletData from '@hooks/queries/useBtcWalletData';
-import useCoinRates from '@hooks/queries/useCoinRates';
+import useSupportedCoinRates from '@hooks/queries/useSupportedCoinRates';
 import useWalletSelector from '@hooks/useWalletSelector';
 import { ArrowsDownUp } from '@phosphor-icons/react';
 import {
@@ -57,7 +57,7 @@ function AmountSelector({
   const { t } = useTranslation('translation', { keyPrefix: 'SEND' });
   const { fiatCurrency } = useWalletSelector();
   const { data: btcBalanceSats } = useBtcWalletData();
-  const { btcFiatRate } = useCoinRates();
+  const { btcFiatRate } = useSupportedCoinRates();
 
   const [amountDisplay, setAmountDisplay] = useState(
     amountSats && satsToBtcString(new BigNumber(amountSats)),
diff --git a/src/app/ui-library/button.tsx b/src/app/ui-library/button.tsx
index 47f130f79..d117e6338 100644
--- a/src/app/ui-library/button.tsx
+++ b/src/app/ui-library/button.tsx
@@ -1,4 +1,5 @@
 import classNames from 'classnames';
+import type React from 'react';
 import styled from 'styled-components';
 import Spinner from './spinner';
 
@@ -105,42 +106,32 @@ const CenterDiv = styled.div`
   align-content: center;
 `;
 
-type Props = {
+type Props = React.ButtonHTMLAttributes<HTMLButtonElement> & {
   title: string;
-  onClick: (e: React.MouseEvent<HTMLButtonElement>) => void;
   icon?: React.ReactNode;
   iconPosition?: 'left' | 'right';
-  disabled?: boolean;
   loading?: boolean;
+  disabled?: boolean;
   className?: string;
   variant?: ButtonVariant;
-  type?: 'button' | 'submit' | 'reset';
-  id?: string;
-  dataTestId?: string;
 };
 
 function Button({
   title,
-  onClick,
   icon,
   iconPosition = 'left',
   className,
   loading = false,
   disabled = false,
   variant = 'primary',
-  type,
-  id,
-  dataTestId,
+  ...props
 }: Props) {
   return (
     <StyledButton
+      {...props}
       className={classNames(className, variant)}
-      onClick={onClick}
       tabIndex={0}
       disabled={disabled || loading}
-      type={type}
-      id={id}
-      data-testid={dataTestId}
     >
       {loading ? (
         <Spinner />
diff --git a/src/app/utils/constants.ts b/src/app/utils/constants.ts
index 1cd4105a8..971e2eff7 100644
--- a/src/app/utils/constants.ts
+++ b/src/app/utils/constants.ts
@@ -35,8 +35,6 @@ export const MIX_PANEL_TOKEN = process.env.MIX_PANEL_TOKEN;
 export const MIX_PANEL_EXPLORE_APP_TOKEN = process.env.MIX_PANEL_EXPLORE_APP_TOKEN;
 
 export const MAGIC_EDEN_RUNES_URL = 'https://magiceden.io/runes';
-export const UNISAT_RUNES_URL = 'https://unisat.io/runes';
-export const OKX_RUNES_URL = 'https://www.okx.com/web3/marketplace/runes';
 
 export type CurrencyTypes = 'STX' | 'BTC' | 'FT' | 'NFT' | 'Ordinal' | 'brc20-Ordinal' | 'RareSat';
 export enum LoaderSize {
diff --git a/src/app/utils/currency.ts b/src/app/utils/currency.ts
index 5d8e80e5b..98633356f 100644
--- a/src/app/utils/currency.ts
+++ b/src/app/utils/currency.ts
@@ -1,35 +1,66 @@
 import ARG from '@assets/img/settings/currencies/ars.svg';
-import AUD from '@assets/img/settings/currencies/aud.svg';
-import BRL from '@assets/img/settings/currencies/brl.svg';
-import CAD from '@assets/img/settings/currencies/cad.svg';
-import CNY from '@assets/img/settings/currencies/cny.svg';
-import EUR from '@assets/img/settings/currencies/eur.svg';
-import GBP from '@assets/img/settings/currencies/gbp.svg';
-import HKD from '@assets/img/settings/currencies/hkd.svg';
-import JPY from '@assets/img/settings/currencies/jpy.svg';
-import KRW from '@assets/img/settings/currencies/krw.svg';
-import RUB from '@assets/img/settings/currencies/rub.svg';
-import SGD from '@assets/img/settings/currencies/sgd.svg';
-import USD from '@assets/img/settings/currencies/usd.svg';
+import AUS from '@assets/img/settings/currencies/aus.svg';
+import BRA from '@assets/img/settings/currencies/bra.svg';
+import CAN from '@assets/img/settings/currencies/can.svg';
+import CHE from '@assets/img/settings/currencies/che.svg';
+import CHN from '@assets/img/settings/currencies/chn.svg';
+import EU from '@assets/img/settings/currencies/eu.svg';
+import GBR from '@assets/img/settings/currencies/gbr.svg';
+import HKG from '@assets/img/settings/currencies/hkg.svg';
+import HUN from '@assets/img/settings/currencies/hun.svg';
+import IDN from '@assets/img/settings/currencies/idn.svg';
+import IND from '@assets/img/settings/currencies/ind.svg';
+import JPN from '@assets/img/settings/currencies/jpn.svg';
+import KOR from '@assets/img/settings/currencies/kor.svg';
+import MEX from '@assets/img/settings/currencies/mex.svg';
+import MYS from '@assets/img/settings/currencies/mys.svg';
+import NGA from '@assets/img/settings/currencies/nga.svg';
+import PAK from '@assets/img/settings/currencies/pak.svg';
+import PHL from '@assets/img/settings/currencies/phl.svg';
+import POL from '@assets/img/settings/currencies/pol.svg';
+import RUS from '@assets/img/settings/currencies/rus.svg';
+import SGP from '@assets/img/settings/currencies/sgp.svg';
+import THA from '@assets/img/settings/currencies/tha.svg';
+import TUR from '@assets/img/settings/currencies/tur.svg';
+import TWN from '@assets/img/settings/currencies/twn.svg';
+import USA from '@assets/img/settings/currencies/usa.svg';
+import VNM from '@assets/img/settings/currencies/vnm.svg';
+import ZAF from '@assets/img/settings/currencies/zaf.svg';
+
 import type { SupportedCurrency } from '@secretkeylabs/xverse-core';
 
 export interface Currency {
   name: SupportedCurrency;
-  flag: string;
+  isoFlag: string;
 }
 
 export const currencyList: Currency[] = [
-  { name: 'CAD', flag: CAD },
-  { name: 'CNY', flag: CNY },
-  { name: 'EUR', flag: EUR },
-  { name: 'USD', flag: USD },
-  { name: 'ARS', flag: ARG },
-  { name: 'KRW', flag: KRW },
-  { name: 'HKD', flag: HKD },
-  { name: 'JPY', flag: JPY },
-  { name: 'SGD', flag: SGD },
-  { name: 'GBP', flag: GBP },
-  { name: 'BRL', flag: BRL },
-  { name: 'RUB', flag: RUB },
-  { name: 'AUD', flag: AUD },
+  { name: 'CAD', isoFlag: CAN }, // Canada
+  { name: 'CNY', isoFlag: CHN }, // China
+  { name: 'EUR', isoFlag: EU }, // Eurozone
+  { name: 'USD', isoFlag: USA }, // United States
+  { name: 'ARS', isoFlag: ARG }, // Argentina
+  { name: 'KRW', isoFlag: KOR }, // South Korea
+  { name: 'HKD', isoFlag: HKG }, // Hong Kong
+  { name: 'JPY', isoFlag: JPN }, // Japan
+  { name: 'SGD', isoFlag: SGP }, // Singapore
+  { name: 'GBP', isoFlag: GBR }, // United Kingdom
+  { name: 'BRL', isoFlag: BRA }, // Brazil
+  { name: 'RUB', isoFlag: RUS }, // Russia
+  { name: 'AUD', isoFlag: AUS }, // Australia
+  { name: 'NGN', isoFlag: NGA }, // Nigeria
+  { name: 'TRY', isoFlag: TUR }, // Turkey
+  { name: 'INR', isoFlag: IND }, // India
+  { name: 'CHF', isoFlag: CHE }, // Switzerland
+  { name: 'VND', isoFlag: VNM }, // Vietnam
+  { name: 'PLN', isoFlag: POL }, // Poland
+  { name: 'MYR', isoFlag: MYS }, // Malaysia
+  { name: 'TWD', isoFlag: TWN }, // Taiwan
+  { name: 'IDR', isoFlag: IDN }, // Indonesia
+  { name: 'HUF', isoFlag: HUN }, // Hungary
+  { name: 'THB', isoFlag: THA }, // Thailand
+  { name: 'PHP', isoFlag: PHL }, // Philippines
+  { name: 'PKR', isoFlag: PAK }, // Pakistan
+  { name: 'ZAR', isoFlag: ZAF }, // South Africa
+  { name: 'MXN', isoFlag: MEX }, // Mexico
 ];
diff --git a/src/assets/img/settings/currencies/aud.svg b/src/assets/img/settings/currencies/aus.svg
similarity index 100%
rename from src/assets/img/settings/currencies/aud.svg
rename to src/assets/img/settings/currencies/aus.svg
diff --git a/src/assets/img/settings/currencies/brl.svg b/src/assets/img/settings/currencies/bra.svg
similarity index 100%
rename from src/assets/img/settings/currencies/brl.svg
rename to src/assets/img/settings/currencies/bra.svg
diff --git a/src/assets/img/settings/currencies/cad.svg b/src/assets/img/settings/currencies/can.svg
similarity index 100%
rename from src/assets/img/settings/currencies/cad.svg
rename to src/assets/img/settings/currencies/can.svg
diff --git a/src/assets/img/settings/currencies/che.svg b/src/assets/img/settings/currencies/che.svg
new file mode 100644
index 000000000..c0b86ae11
--- /dev/null
+++ b/src/assets/img/settings/currencies/che.svg
@@ -0,0 +1,12 @@
+<svg width="60" height="45" viewBox="0 0 60 45" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g clip-path="url(#clip0_1_26819)">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M0 0H60V45H0V0Z" fill="#FF0000"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M15.9375 18.2812H44.0625V26.7188H15.9375V18.2812Z" fill="white"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M25.7812 8.4375H34.2188V36.5625H25.7812V8.4375Z" fill="white"/>
+</g>
+<defs>
+<clipPath id="clip0_1_26819">
+<rect width="60" height="45" fill="white"/>
+</clipPath>
+</defs>
+</svg>
diff --git a/src/assets/img/settings/currencies/cny.svg b/src/assets/img/settings/currencies/chn.svg
similarity index 100%
rename from src/assets/img/settings/currencies/cny.svg
rename to src/assets/img/settings/currencies/chn.svg
diff --git a/src/assets/img/settings/currencies/eur.svg b/src/assets/img/settings/currencies/eu.svg
similarity index 100%
rename from src/assets/img/settings/currencies/eur.svg
rename to src/assets/img/settings/currencies/eu.svg
diff --git a/src/assets/img/settings/currencies/gbp.svg b/src/assets/img/settings/currencies/gbr.svg
similarity index 100%
rename from src/assets/img/settings/currencies/gbp.svg
rename to src/assets/img/settings/currencies/gbr.svg
diff --git a/src/assets/img/settings/currencies/hkd.svg b/src/assets/img/settings/currencies/hkg.svg
similarity index 100%
rename from src/assets/img/settings/currencies/hkd.svg
rename to src/assets/img/settings/currencies/hkg.svg
diff --git a/src/assets/img/settings/currencies/hun.svg b/src/assets/img/settings/currencies/hun.svg
new file mode 100644
index 000000000..f51c943e2
--- /dev/null
+++ b/src/assets/img/settings/currencies/hun.svg
@@ -0,0 +1,12 @@
+<svg width="60" height="45" viewBox="0 0 60 45" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g clip-path="url(#clip0_1_37034)">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M60 45H0V0H60V45Z" fill="white"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M60 45H0V30H60V45Z" fill="#388D00"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M60 15.0094H0V0.00939941H60V15.0094Z" fill="#D43516"/>
+</g>
+<defs>
+<clipPath id="clip0_1_37034">
+<rect width="60" height="45" fill="white"/>
+</clipPath>
+</defs>
+</svg>
diff --git a/src/assets/img/settings/currencies/idn.svg b/src/assets/img/settings/currencies/idn.svg
new file mode 100644
index 000000000..bf9df2a92
--- /dev/null
+++ b/src/assets/img/settings/currencies/idn.svg
@@ -0,0 +1,11 @@
+<svg width="60" height="45" viewBox="0 0 60 45" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g clip-path="url(#clip0_1_37044)">
+<path d="M0 0H60V22.5H0V0Z" fill="#E70011"/>
+<path d="M0 22.5H60V45H0V22.5Z" fill="white"/>
+</g>
+<defs>
+<clipPath id="clip0_1_37044">
+<rect width="60" height="45" fill="white"/>
+</clipPath>
+</defs>
+</svg>
diff --git a/src/assets/img/settings/currencies/ind.svg b/src/assets/img/settings/currencies/ind.svg
new file mode 100644
index 000000000..676e78817
--- /dev/null
+++ b/src/assets/img/settings/currencies/ind.svg
@@ -0,0 +1,17 @@
+<svg width="60" height="45" viewBox="0 0 60 45" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g clip-path="url(#clip0_1_37098)">
+<path d="M0 0H60V15H0V0Z" fill="#FF9933"/>
+<path d="M0 15H60V30H0V15Z" fill="white"/>
+<path d="M0 30H60V45H0V30Z" fill="#128807"/>
+<path d="M30 28.5C33.3137 28.5 36 25.8137 36 22.5C36 19.1863 33.3137 16.5 30 16.5C26.6863 16.5 24 19.1863 24 22.5C24 25.8137 26.6863 28.5 30 28.5Z" fill="#000088"/>
+<path d="M30 27.75C32.8995 27.75 35.25 25.3995 35.25 22.5C35.25 19.6005 32.8995 17.25 30 17.25C27.1005 17.25 24.75 19.6005 24.75 22.5C24.75 25.3995 27.1005 27.75 30 27.75Z" fill="white"/>
+<path d="M30 23.55C30.5799 23.55 31.05 23.0799 31.05 22.5C31.05 21.9201 30.5799 21.45 30 21.45C29.4201 21.45 28.95 21.9201 28.95 22.5C28.95 23.0799 29.4201 23.55 30 23.55Z" fill="#000088"/>
+<path d="M35.1697 23.4549C35.3176 23.4744 35.4532 23.3703 35.4727 23.2225C35.4921 23.0746 35.3881 22.939 35.2402 22.9195C35.0924 22.9001 34.9568 23.0041 34.9373 23.152C34.9178 23.2998 35.0219 23.4354 35.1697 23.4549Z" fill="#000088"/>
+<path d="M30 27.75L30.18 24.6L30 23.1L29.82 24.6L30 27.75Z" fill="#000088"/>
+</g>
+<defs>
+<clipPath id="clip0_1_37098">
+<rect width="60" height="45" fill="white"/>
+</clipPath>
+</defs>
+</svg>
diff --git a/src/assets/img/settings/currencies/jpy.svg b/src/assets/img/settings/currencies/jpn.svg
similarity index 100%
rename from src/assets/img/settings/currencies/jpy.svg
rename to src/assets/img/settings/currencies/jpn.svg
diff --git a/src/assets/img/settings/currencies/krw.svg b/src/assets/img/settings/currencies/kor.svg
similarity index 100%
rename from src/assets/img/settings/currencies/krw.svg
rename to src/assets/img/settings/currencies/kor.svg
diff --git a/src/assets/img/settings/currencies/mex.svg b/src/assets/img/settings/currencies/mex.svg
new file mode 100644
index 000000000..e68c31bc0
--- /dev/null
+++ b/src/assets/img/settings/currencies/mex.svg
@@ -0,0 +1,467 @@
+<svg width="60" height="45" viewBox="0 0 60 45" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g clip-path="url(#clip0_1_38536)">
+<path d="M40.0032 0H60V45H40.0032V0Z" fill="#CE1126"/>
+<path d="M19.9968 0H40.0031V45H19.9968V0Z" fill="white"/>
+<path d="M0 0H19.9969V45H0V0Z" fill="#006847"/>
+<path d="M33.3562 27.1313L33.375 27.5531L33.5343 27.45L33.4125 27.1031L33.3562 27.1313Z" fill="#FCCA3E"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M33.4205 27.0834L33.5513 27.4557L33.362 27.5782L33.3418 27.1227L33.4205 27.0834ZM33.3707 27.1397L33.388 27.5279L33.5174 27.4442L33.4045 27.1228L33.3707 27.1397Z" fill="#AA8C30"/>
+<path d="M33.3375 27.15C33.41 27.15 33.4688 27.0912 33.4688 27.0187C33.4688 26.9462 33.41 26.8875 33.3375 26.8875C33.2651 26.8875 33.2063 26.9462 33.2063 27.0187C33.2063 27.0912 33.2651 27.15 33.3375 27.15Z" fill="#FCCA3E"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M33.3375 26.8969C33.2702 26.8969 33.2156 26.9515 33.2156 27.0188C33.2156 27.0861 33.2702 27.1407 33.3375 27.1407C33.4048 27.1407 33.4594 27.0861 33.4594 27.0188C33.4594 26.9515 33.4048 26.8969 33.3375 26.8969ZM33.1969 27.0188C33.1969 26.9411 33.2599 26.8782 33.3375 26.8782C33.4152 26.8782 33.4781 26.9411 33.4781 27.0188C33.4781 27.0965 33.4152 27.1594 33.3375 27.1594C33.2599 27.1594 33.1969 27.0965 33.1969 27.0188Z" fill="#AA8C30"/>
+<path d="M33.8531 27.7875L33.5531 27.4968L33.4125 27.6093L33.8344 27.8531L33.8531 27.7875Z" fill="#FCCA3E"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M33.5541 27.4781L33.869 27.7833L33.843 27.8743L33.3877 27.6112L33.5541 27.4781ZM33.4374 27.6075L33.8259 27.8319L33.8373 27.7917L33.5523 27.5156L33.4374 27.6075Z" fill="#AA8C30"/>
+<path d="M33.8344 27.9563C33.7876 27.9 33.8063 27.8157 33.8626 27.7688C33.9282 27.7219 34.0126 27.7313 34.0501 27.7875C34.0969 27.8438 34.0782 27.9282 34.0219 27.975C33.9563 28.0219 33.8719 28.0125 33.8344 27.9563Z" fill="#FCCA3E"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M33.8682 27.7762C33.815 27.8207 33.7989 27.8991 33.8415 27.9502L33.8422 27.951L33.8421 27.951C33.8759 28.0017 33.9536 28.012 34.0161 27.9676C34.0693 27.923 34.0854 27.8446 34.0427 27.7935L34.0421 27.7927L34.0421 27.7927C34.0084 27.742 33.9306 27.7318 33.8682 27.7762ZM34.0575 27.7819C34.0161 27.7205 33.9256 27.7121 33.857 27.7611L33.857 27.7611L33.8564 27.7615C33.7975 27.8107 33.7761 27.9006 33.8268 27.9619C33.8681 28.0233 33.9587 28.0316 34.0273 27.9826L34.0273 27.9826L34.0278 27.9822C34.0868 27.933 34.1081 27.8431 34.0575 27.7819Z" fill="#AA8C30"/>
+<path d="M36.2156 23.4L36.5343 23.7094L36.5718 23.55L36.2812 23.3625L36.2156 23.4Z" fill="#FCCA3E"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M36.2817 23.3461L36.5878 23.5436L36.5424 23.7368L36.1924 23.3971L36.2817 23.3461ZM36.2388 23.403L36.5263 23.682L36.5559 23.5565L36.2808 23.379L36.2388 23.403Z" fill="#AA8C30"/>
+<path d="M36.1781 23.4468C36.2506 23.4468 36.3094 23.3881 36.3094 23.3156C36.3094 23.2431 36.2506 23.1843 36.1781 23.1843C36.1056 23.1843 36.0469 23.2431 36.0469 23.3156C36.0469 23.3881 36.1056 23.4468 36.1781 23.4468Z" fill="#FCCA3E"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M36.1781 23.1938C36.1108 23.1938 36.0562 23.2484 36.0562 23.3157C36.0562 23.383 36.1108 23.4375 36.1781 23.4375C36.2454 23.4375 36.3 23.383 36.3 23.3157C36.3 23.2484 36.2454 23.1938 36.1781 23.1938ZM36.0375 23.3157C36.0375 23.238 36.1004 23.175 36.1781 23.175C36.2558 23.175 36.3187 23.238 36.3187 23.3157C36.3187 23.3933 36.2558 23.4563 36.1781 23.4563C36.1004 23.4563 36.0375 23.3933 36.0375 23.3157Z" fill="#AA8C30"/>
+<path d="M37.05 23.5875L36.5625 23.7187L36.6094 23.5594L37.0219 23.5219L37.05 23.5875Z" fill="#FCCA3E"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M37.0308 23.507L37.0694 23.5969L36.542 23.7389L36.5986 23.5462L37.0308 23.507ZM36.6202 23.5725L36.5831 23.6987L37.0308 23.5782L37.013 23.5368L36.6202 23.5725Z" fill="#AA8C30"/>
+<path d="M37.125 23.6437C37.1975 23.6437 37.2563 23.585 37.2563 23.5125C37.2563 23.44 37.1975 23.3812 37.125 23.3812C37.0525 23.3812 36.9938 23.44 36.9938 23.5125C36.9938 23.585 37.0525 23.6437 37.125 23.6437Z" fill="#FCCA3E"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M37.125 23.3906C37.0577 23.3906 37.0031 23.4451 37.0031 23.5125C37.0031 23.5798 37.0577 23.6343 37.125 23.6343C37.1923 23.6343 37.2469 23.5798 37.2469 23.5125C37.2469 23.4451 37.1923 23.3906 37.125 23.3906ZM36.9844 23.5125C36.9844 23.4348 37.0473 23.3718 37.125 23.3718C37.2027 23.3718 37.2656 23.4348 37.2656 23.5125C37.2656 23.5901 37.2027 23.6531 37.125 23.6531C37.0473 23.6531 36.9844 23.5901 36.9844 23.5125Z" fill="#AA8C30"/>
+<path d="M35.4375 25.95L35.1375 25.5L35.1843 25.4719L35.5125 25.8657L35.4375 25.95Z" fill="#FCCA3E"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M35.1875 25.4536L35.5311 25.8659L35.436 25.973L35.1177 25.4955L35.1875 25.4536ZM35.1574 25.5045L35.4392 25.927L35.494 25.8653L35.1813 25.4901L35.1574 25.5045Z" fill="#AA8C30"/>
+<path d="M35.1094 25.5187C35.1819 25.5187 35.2406 25.46 35.2406 25.3875C35.2406 25.315 35.1819 25.2562 35.1094 25.2562C35.0369 25.2562 34.9781 25.315 34.9781 25.3875C34.9781 25.46 35.0369 25.5187 35.1094 25.5187Z" fill="#FCCA3E"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M35.1094 25.2656C35.0421 25.2656 34.9875 25.3201 34.9875 25.3875C34.9875 25.4548 35.0421 25.5093 35.1094 25.5093C35.1767 25.5093 35.2312 25.4548 35.2312 25.3875C35.2312 25.3201 35.1767 25.2656 35.1094 25.2656ZM34.9688 25.3875C34.9688 25.3098 35.0317 25.2468 35.1094 25.2468C35.187 25.2468 35.25 25.3098 35.25 25.3875C35.25 25.4651 35.187 25.5281 35.1094 25.5281C35.0317 25.5281 34.9688 25.4651 34.9688 25.3875Z" fill="#AA8C30"/>
+<path d="M35.4469 25.9687L35.8219 26.0343L35.8313 25.9875L35.5219 25.8562L35.4469 25.9687Z" fill="#FCCA3E"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M35.5166 25.8387L35.8473 25.979L35.833 26.0506L35.4232 25.9789L35.5166 25.8387ZM35.5271 25.8737L35.4705 25.9586L35.8108 26.0182L35.8152 25.996L35.5271 25.8737Z" fill="#AA8C30"/>
+<path d="M35.9344 26.1656C36.0068 26.1656 36.0656 26.1068 36.0656 26.0343C36.0656 25.9618 36.0068 25.9031 35.9344 25.9031C35.8619 25.9031 35.8031 25.9618 35.8031 26.0343C35.8031 26.1068 35.8619 26.1656 35.9344 26.1656Z" fill="#FCCA3E"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M35.9343 25.9125C35.867 25.9125 35.8125 25.9671 35.8125 26.0344C35.8125 26.1017 35.867 26.1563 35.9343 26.1563C36.0016 26.1563 36.0562 26.1017 36.0562 26.0344C36.0562 25.9671 36.0016 25.9125 35.9343 25.9125ZM35.7937 26.0344C35.7937 25.9568 35.8567 25.8938 35.9343 25.8938C36.012 25.8938 36.075 25.9568 36.075 26.0344C36.075 26.1121 36.012 26.1751 35.9343 26.1751C35.8567 26.1751 35.7937 26.1121 35.7937 26.0344Z" fill="#AA8C30"/>
+<path d="M26.6813 27C26.6813 27.075 26.6344 27.1125 26.5875 27.1125C26.5406 27.1125 26.4938 27.0657 26.4938 27C26.4938 26.9344 26.5406 26.8782 26.5875 26.8782C26.6344 26.8782 26.6813 26.9438 26.6813 27.0094V27Z" fill="#FCCA3E"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M26.5304 26.9203C26.5141 26.941 26.5031 26.9694 26.5031 27C26.5031 27.0616 26.5469 27.1031 26.5875 27.1031C26.6084 27.1031 26.6294 27.0948 26.6451 27.078C26.6601 27.062 26.6708 27.0379 26.6718 27.005C26.6708 26.9758 26.6601 26.9467 26.6443 26.9246C26.6276 26.9012 26.6066 26.8875 26.5875 26.8875C26.5678 26.8875 26.5468 26.8995 26.5304 26.9203ZM26.6903 27C26.6883 26.9683 26.6765 26.9375 26.6596 26.9137C26.6412 26.8879 26.6153 26.8688 26.5875 26.8688C26.5603 26.8688 26.5344 26.885 26.5157 26.9087C26.4969 26.9325 26.4844 26.965 26.4844 27C26.4844 27.0697 26.5344 27.1219 26.5875 27.1219C26.6135 27.1219 26.6394 27.1115 26.6588 27.0908C26.6767 27.0717 26.6886 27.0444 26.6904 27.0094H26.6906V27H26.6903Z" fill="#AA8C30"/>
+<path d="M26.6812 27.2156L26.775 27.6843L26.6531 27.6375L26.6156 27.2343L26.6812 27.2156Z" fill="#FCCA3E"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M26.6921 27.1979L26.7938 27.7066L26.64 27.6475L26.6006 27.224L26.6921 27.1979ZM26.6308 27.2447L26.6664 27.6275L26.7562 27.662L26.6705 27.2333L26.6308 27.2447Z" fill="#AA8C30"/>
+<path d="M26.7844 27.0562C26.8406 27.1219 26.7469 27.2344 26.6531 27.2625C26.5594 27.2906 26.4281 27.2437 26.4281 27.15C26.4281 27.0562 26.5781 27.1031 26.6156 27.0937C26.6719 27.075 26.7281 26.9812 26.7844 27.0562Z" fill="#FCCA3E"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M26.6633 27.077C26.6492 27.0872 26.6341 27.0974 26.6185 27.1026L26.6179 27.1028L26.6178 27.1028C26.6119 27.1043 26.6043 27.1046 26.5965 27.1044C26.5885 27.1042 26.5793 27.1034 26.5697 27.1026C26.5683 27.1025 26.567 27.1024 26.5656 27.1023C26.5472 27.1007 26.5271 27.0991 26.508 27.0996C26.4874 27.1002 26.4695 27.1033 26.457 27.111C26.4453 27.1181 26.4375 27.1296 26.4375 27.15C26.4375 27.1918 26.4666 27.2243 26.5092 27.2434C26.5518 27.2624 26.6058 27.2669 26.6504 27.2535C26.6951 27.2401 26.7403 27.2063 26.7673 27.168C26.7946 27.1294 26.801 27.0901 26.7772 27.0623L26.7843 27.0562L26.7768 27.0619C26.7638 27.0445 26.7519 27.0382 26.7412 27.0371C26.7301 27.036 26.7181 27.0401 26.7047 27.0479C26.6944 27.0539 26.6841 27.0615 26.6734 27.0695C26.6701 27.072 26.6667 27.0745 26.6633 27.077ZM26.7916 27.0504C26.7766 27.0304 26.7605 27.0203 26.7431 27.0185C26.7261 27.0167 26.7099 27.0232 26.6952 27.0317C26.6839 27.0383 26.6725 27.0468 26.6616 27.0549C26.6584 27.0573 26.6553 27.0596 26.6522 27.0618C26.6383 27.072 26.6254 27.0805 26.613 27.0847C26.6096 27.0855 26.6043 27.0858 26.597 27.0856C26.5896 27.0854 26.5809 27.0848 26.5712 27.0839C26.5698 27.0838 26.5684 27.0837 26.567 27.0836C26.5488 27.0821 26.5277 27.0803 26.5075 27.0808C26.486 27.0814 26.464 27.0847 26.4472 27.095C26.4296 27.1057 26.4187 27.1235 26.4187 27.15C26.4187 27.2019 26.4552 27.2397 26.5016 27.2605C26.5481 27.2813 26.6066 27.2862 26.6558 27.2715C26.7048 27.2567 26.7534 27.2203 26.7826 27.1788C26.8115 27.1379 26.8238 27.0881 26.7916 27.0504Z" fill="#AA8C30"/>
+<path d="M25.9687 27.8813C26.0516 27.8813 26.1187 27.8351 26.1187 27.7782C26.1187 27.7212 26.0516 27.675 25.9687 27.675C25.8859 27.675 25.8187 27.7212 25.8187 27.7782C25.8187 27.8351 25.8859 27.8813 25.9687 27.8813Z" fill="#FCCA3E"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M25.8679 27.713C25.8425 27.7304 25.8281 27.7536 25.8281 27.7781C25.8281 27.8026 25.8425 27.8259 25.8679 27.8433C25.8933 27.8608 25.9289 27.8719 25.9687 27.8719C26.0085 27.8719 26.0441 27.8608 26.0695 27.8433C26.0949 27.8259 26.1093 27.8026 26.1093 27.7781C26.1093 27.7536 26.0949 27.7304 26.0695 27.713C26.0441 27.6955 26.0085 27.6844 25.9687 27.6844C25.9289 27.6844 25.8933 27.6955 25.8679 27.713ZM25.8573 27.6975C25.8862 27.6776 25.9256 27.6656 25.9687 27.6656C26.0118 27.6656 26.0512 27.6776 26.0801 27.6975C26.1089 27.7173 26.1281 27.7457 26.1281 27.7781C26.1281 27.8106 26.1089 27.839 26.0801 27.8588C26.0512 27.8787 26.0118 27.8906 25.9687 27.8906C25.9256 27.8906 25.8862 27.8787 25.8573 27.8588C25.8285 27.839 25.8093 27.8106 25.8093 27.7781C25.8093 27.7457 25.8285 27.7173 25.8573 27.6975Z" fill="#AA8C30"/>
+<path d="M26.2125 27.75L26.6625 27.7312L26.5875 27.6375L26.2125 27.675V27.75Z" fill="#FCCA3E"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M26.5938 27.6228L26.6909 27.7442L26.1985 27.7647V27.6623L26.5938 27.6228ZM26.2266 27.6878V27.7354L26.6342 27.7184L26.5813 27.6523L26.2266 27.6878Z" fill="#AA8C30"/>
+<path d="M26.25 27.6937C26.2969 27.8156 26.2969 27.9749 26.1656 27.9468C26.0344 27.9374 26.0719 27.8156 26.0531 27.7781C26.0344 27.6937 25.9594 27.6187 26.0344 27.5437C26.1094 27.4687 26.2219 27.5812 26.25 27.6937Z" fill="#FCCA3E"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M26.095 27.5291C26.0763 27.5276 26.0579 27.5335 26.041 27.5504C26.0234 27.568 26.0151 27.585 26.0123 27.6018C26.0094 27.6187 26.0119 27.6361 26.0176 27.6547C26.0224 27.6707 26.0293 27.6869 26.0366 27.704C26.0378 27.7069 26.0391 27.7099 26.0404 27.7128C26.0487 27.7326 26.0571 27.7534 26.062 27.7751C26.0647 27.7808 26.0662 27.7876 26.0672 27.7944C26.0683 27.8018 26.0689 27.81 26.0695 27.8184C26.0695 27.819 26.0696 27.8196 26.0696 27.8202C26.0708 27.8367 26.072 27.8542 26.0763 27.8707C26.0806 27.8878 26.0881 27.9031 26.1015 27.9148C26.1148 27.9265 26.135 27.9353 26.1663 27.9376L26.1676 27.9377L26.1676 27.9378C26.1986 27.9444 26.2203 27.9397 26.2352 27.9288C26.2504 27.9178 26.2604 27.8992 26.2654 27.8747C26.2755 27.8256 26.2643 27.7572 26.2412 27.6972L26.25 27.6938L26.2409 27.6961C26.2273 27.6416 26.1932 27.5872 26.1539 27.5558C26.1343 27.5401 26.114 27.5307 26.095 27.5291ZM26.2589 27.691C26.2443 27.6331 26.2082 27.5753 26.1656 27.5412C26.1442 27.524 26.1205 27.5124 26.0965 27.5104C26.0721 27.5084 26.0484 27.5165 26.0277 27.5372C26.0078 27.5571 25.9974 27.5776 25.9938 27.5986C25.9902 27.6195 25.9935 27.6401 25.9996 27.6602C26.0048 27.6772 26.0121 27.6945 26.0194 27.7115C26.0206 27.7144 26.0219 27.7173 26.0231 27.7202C26.0316 27.7402 26.0395 27.76 26.044 27.7802L26.0442 27.7813L26.0447 27.7824C26.0464 27.7857 26.0477 27.7906 26.0487 27.7972C26.0496 27.8037 26.0502 27.8112 26.0508 27.8197C26.0508 27.8204 26.0509 27.8212 26.0509 27.822C26.0521 27.8381 26.0534 27.8571 26.0581 27.8754C26.0631 27.8947 26.072 27.914 26.0891 27.9289C26.1062 27.9438 26.1303 27.9537 26.1643 27.9562C26.1986 27.9634 26.2259 27.9587 26.2463 27.944C26.2666 27.9292 26.2782 27.9056 26.2838 27.8785C26.2948 27.8246 26.2826 27.7526 26.2589 27.691Z" fill="#AA8C30"/>
+<path d="M24.7875 25.3687C24.8341 25.3687 24.8719 25.3099 24.8719 25.2375C24.8719 25.165 24.8341 25.1062 24.7875 25.1062C24.7409 25.1062 24.7031 25.165 24.7031 25.2375C24.7031 25.3099 24.7409 25.3687 24.7875 25.3687Z" fill="#FCCA3E"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M24.7357 25.1498C24.7215 25.1718 24.7125 25.2028 24.7125 25.2376C24.7125 25.2723 24.7215 25.3033 24.7357 25.3253C24.7499 25.3474 24.7684 25.3594 24.7875 25.3594C24.8065 25.3594 24.825 25.3474 24.8393 25.3253C24.8534 25.3033 24.8625 25.2723 24.8625 25.2376C24.8625 25.2028 24.8534 25.1718 24.8393 25.1498C24.825 25.1277 24.8065 25.1157 24.7875 25.1157C24.7684 25.1157 24.7499 25.1277 24.7357 25.1498ZM24.7199 25.1397C24.7362 25.1143 24.7599 25.0969 24.7875 25.0969C24.815 25.0969 24.8387 25.1143 24.855 25.1397C24.8714 25.1652 24.8812 25.1998 24.8812 25.2376C24.8812 25.2753 24.8714 25.31 24.855 25.3354C24.8387 25.3608 24.815 25.3782 24.7875 25.3782C24.7599 25.3782 24.7362 25.3608 24.7199 25.3354C24.7035 25.31 24.6937 25.2753 24.6937 25.2376C24.6937 25.1998 24.7035 25.1652 24.7199 25.1397Z" fill="#AA8C30"/>
+<path d="M24.7875 25.5375L24.7968 25.9688L24.6843 25.875V25.5188L24.7875 25.5375Z" fill="#FCCA3E"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M24.6703 25.502L24.8013 25.5258L24.8116 25.9994L24.6703 25.8816V25.502ZM24.6984 25.5357V25.8685L24.7821 25.9382L24.7737 25.5493L24.6984 25.5357Z" fill="#AA8C30"/>
+<path d="M24.9562 25.4062C24.9843 25.5 24.8343 25.5562 24.7312 25.5375C24.6375 25.5187 24.5531 25.4719 24.5718 25.3781C24.5812 25.2844 24.7125 25.3031 24.7593 25.3312C24.7968 25.3594 24.9281 25.2562 24.9562 25.3969V25.4062Z" fill="#FCCA3E"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M24.6042 25.3347C24.592 25.344 24.5833 25.358 24.5812 25.379L24.5811 25.3799C24.5724 25.4231 24.5872 25.4549 24.6154 25.4787C24.6441 25.503 24.6868 25.519 24.733 25.5283C24.7825 25.5372 24.8437 25.5282 24.8887 25.5056C24.9112 25.4944 24.929 25.4801 24.9395 25.4638C24.9499 25.4478 24.9534 25.4296 24.9472 25.4089L24.9468 25.4076V25.3978C24.9401 25.3648 24.9277 25.3478 24.9139 25.3392C24.8997 25.3303 24.882 25.3289 24.8623 25.3312C24.8491 25.3327 24.8362 25.3356 24.8235 25.3385C24.8169 25.34 24.8103 25.3415 24.8037 25.3428C24.7946 25.3446 24.7855 25.3459 24.7772 25.3457C24.7691 25.3456 24.7609 25.344 24.7541 25.339C24.7324 25.3261 24.6901 25.315 24.6523 25.3183C24.6335 25.32 24.6167 25.3252 24.6042 25.3347ZM24.6507 25.2996C24.6924 25.2959 24.7389 25.3081 24.7641 25.3232L24.765 25.3237C24.7675 25.3255 24.7714 25.3268 24.7776 25.327C24.7838 25.3271 24.7913 25.3261 24.8002 25.3244C24.8056 25.3233 24.8116 25.3219 24.8179 25.3205C24.8312 25.3175 24.846 25.3142 24.8602 25.3125C24.8815 25.3101 24.9043 25.3111 24.9238 25.3233C24.9436 25.3356 24.9581 25.3583 24.9654 25.395L24.9656 25.3959V25.4049C24.9729 25.4306 24.9682 25.454 24.9553 25.474C24.9424 25.494 24.9215 25.5102 24.8971 25.5224C24.8485 25.5467 24.7831 25.5564 24.7295 25.5467L24.7294 25.5467C24.6818 25.5372 24.6355 25.5203 24.6033 25.4931C24.5706 25.4654 24.5526 25.4271 24.5625 25.3767C24.5652 25.3511 24.5764 25.3324 24.5928 25.3198C24.609 25.3074 24.6297 25.3015 24.6507 25.2996Z" fill="#AA8C30"/>
+<path d="M24.0188 25.9875C24.1016 25.9875 24.1688 25.9581 24.1688 25.9218C24.1688 25.8856 24.1016 25.8562 24.0188 25.8562C23.9359 25.8562 23.8688 25.8856 23.8688 25.9218C23.8688 25.9581 23.9359 25.9875 24.0188 25.9875Z" fill="#FCCA3E"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M23.8873 25.9029C23.8808 25.9095 23.8781 25.916 23.8781 25.9219C23.8781 25.9279 23.8808 25.9343 23.8873 25.941C23.8938 25.9477 23.9036 25.9541 23.9164 25.9597C23.9421 25.971 23.9783 25.9782 24.0188 25.9782C24.0592 25.9782 24.0954 25.971 24.1211 25.9597C24.1339 25.9541 24.1437 25.9477 24.1502 25.941C24.1567 25.9343 24.1594 25.9279 24.1594 25.9219C24.1594 25.916 24.1567 25.9095 24.1502 25.9029C24.1437 25.8962 24.1339 25.8897 24.1211 25.8841C24.0954 25.8729 24.0592 25.8657 24.0188 25.8657C23.9783 25.8657 23.9421 25.8729 23.9164 25.8841C23.9036 25.8897 23.8938 25.8962 23.8873 25.9029ZM23.9089 25.8669C23.9375 25.8544 23.9763 25.8469 24.0188 25.8469C24.0612 25.8469 24.1 25.8544 24.1286 25.8669C24.1429 25.8732 24.155 25.8809 24.1637 25.8899C24.1724 25.8989 24.1781 25.9098 24.1781 25.9219C24.1781 25.9341 24.1724 25.9449 24.1637 25.954C24.155 25.963 24.1429 25.9707 24.1286 25.9769C24.1 25.9894 24.0612 25.9969 24.0188 25.9969C23.9763 25.9969 23.9375 25.9894 23.9089 25.9769C23.8946 25.9707 23.8825 25.963 23.8738 25.954C23.865 25.9449 23.8594 25.9341 23.8594 25.9219C23.8594 25.9098 23.865 25.8989 23.8738 25.8899C23.8825 25.8809 23.8946 25.8732 23.9089 25.8669Z" fill="#AA8C30"/>
+<path d="M24.2906 25.9219L24.6281 25.8938L24.7781 26.0063L24.2812 25.9875L24.2906 25.9219Z" fill="#FCCA3E"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M24.6323 25.8793L24.8226 26.022L24.2651 26.0009L24.2783 25.9088L24.6323 25.8793ZM24.303 25.9349L24.2974 25.974L24.7337 25.9905L24.624 25.9082L24.303 25.9349Z" fill="#AA8C30"/>
+<path d="M24.1687 25.7343C24.2625 25.7343 24.3187 25.8375 24.3094 25.95C24.2906 26.0531 24.2156 26.1375 24.1219 26.1375C24.0375 26.1187 24.0469 26.0437 24.0469 26.025C24.0469 25.9968 24.0937 25.9593 24.1031 25.9312C24.1031 25.8937 24.075 25.8093 24.0937 25.7812C24.0937 25.7437 24.1219 25.7343 24.1687 25.7343ZM23.8875 23.0812C23.85 23.1375 23.775 23.1843 23.7375 23.1656C23.7 23.1375 23.7187 23.0531 23.7562 22.9968C23.7937 22.9312 23.85 22.9031 23.8875 22.9218C23.925 22.95 23.925 23.0156 23.8875 23.0812Z" fill="#FCCA3E"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M23.8263 22.9359C23.8047 22.9478 23.7824 22.9698 23.7643 23.0015L23.764 23.002L23.764 23.002C23.7459 23.0291 23.7324 23.063 23.728 23.0931C23.7235 23.1235 23.7285 23.1466 23.7424 23.1575C23.7492 23.1607 23.7583 23.1613 23.7696 23.159C23.7812 23.1566 23.7943 23.1513 23.8077 23.1434C23.8346 23.1277 23.8615 23.103 23.8795 23.0763C23.8975 23.0446 23.9062 23.0135 23.9062 22.9874C23.9062 22.9617 23.8978 22.9417 23.8825 22.9298C23.8674 22.9227 23.8477 22.9242 23.8263 22.9359ZM23.8874 23.0812L23.8956 23.0858C23.915 23.052 23.9249 23.0176 23.9249 22.9874C23.9249 22.9573 23.9149 22.9307 23.8931 22.9143L23.8924 22.9138L23.8916 22.9134C23.8693 22.9023 23.8425 22.9056 23.8173 22.9195C23.7921 22.9333 23.7676 22.958 23.7482 22.9919C23.7289 23.021 23.7143 23.0573 23.7094 23.0904C23.7046 23.1227 23.7087 23.1557 23.7318 23.1731L23.7325 23.1736L23.7333 23.174C23.7452 23.1799 23.7592 23.1803 23.7733 23.1774C23.7875 23.1745 23.8025 23.1682 23.8172 23.1596C23.8465 23.1425 23.8757 23.1158 23.8952 23.0864L23.8874 23.0812ZM24.107 25.7626C24.1046 25.767 24.1031 25.773 24.1031 25.7812V25.784L24.1015 25.7864C24.0984 25.791 24.0966 25.7992 24.0966 25.8112C24.0966 25.8229 24.0983 25.8367 24.1006 25.8512C24.102 25.86 24.1036 25.8688 24.1052 25.8774C24.1062 25.8831 24.1073 25.8887 24.1082 25.8943C24.1105 25.9079 24.1124 25.9209 24.1124 25.9312V25.9327L24.112 25.9342C24.1092 25.9426 24.1038 25.9512 24.0979 25.9592C24.0936 25.9652 24.0887 25.9714 24.0839 25.9774C24.0822 25.9796 24.0805 25.9818 24.0788 25.9839C24.0724 25.992 24.0666 25.9998 24.0624 26.0071C24.0582 26.0145 24.0562 26.0204 24.0562 26.0249C24.0562 26.0266 24.0561 26.0286 24.0561 26.0308C24.0557 26.0423 24.0552 26.0601 24.0615 26.0781C24.0686 26.0984 24.0847 26.1193 24.1229 26.1281C24.2098 26.1274 24.2817 26.0486 24.3 25.9487C24.3045 25.8943 24.293 25.8426 24.2697 25.8049C24.2464 25.7672 24.2116 25.7437 24.1687 25.7437C24.1454 25.7437 24.1288 25.7461 24.1181 25.7519C24.113 25.7547 24.1094 25.7582 24.107 25.7626ZM24.1091 25.7355C24.1243 25.7272 24.1451 25.7249 24.1687 25.7249C24.2195 25.7249 24.2597 25.753 24.2857 25.795C24.3115 25.8368 24.3235 25.8928 24.3187 25.9507L24.3186 25.9516L24.3185 25.9516C24.2993 26.0574 24.2217 26.1468 24.1218 26.1468H24.1208L24.1198 26.1466C24.0743 26.1365 24.0531 26.1107 24.0438 26.0843C24.0362 26.0626 24.037 26.0406 24.0373 26.0296C24.0374 26.0277 24.0374 26.0261 24.0374 26.0249C24.0374 26.0155 24.0413 26.0061 24.0462 25.9977C24.0511 25.9892 24.0576 25.9805 24.0641 25.9723C24.0659 25.97 24.0677 25.9677 24.0695 25.9654C24.0742 25.9595 24.0787 25.9539 24.0827 25.9483C24.0879 25.9412 24.0916 25.9349 24.0937 25.9296C24.0935 25.9213 24.0919 25.9103 24.0897 25.8975C24.0888 25.8923 24.0878 25.8868 24.0868 25.8812C24.0852 25.8723 24.0835 25.8631 24.0821 25.8542C24.0797 25.8394 24.0779 25.8244 24.0779 25.8112C24.0779 25.7995 24.0793 25.7877 24.0844 25.7785C24.0847 25.7691 24.0867 25.7607 24.0906 25.7535C24.0949 25.7456 24.1013 25.7397 24.1091 25.7355Z" fill="#AA8C30"/>
+<path d="M23.5031 23.7656L23.6906 23.3156L23.6719 23.2875L23.4469 23.6062L23.5031 23.7656Z" fill="#FCCA3E"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M23.6722 23.2627L23.7065 23.3141L23.502 23.8048L23.4312 23.6041L23.6722 23.2627ZM23.4625 23.6085L23.5042 23.7265L23.6747 23.3172L23.6715 23.3124L23.4625 23.6085Z" fill="#AA8C30"/>
+<path d="M23.6625 23.3157C23.5688 23.25 23.55 23.175 23.5688 23.1C23.6063 23.0344 23.6813 23.0813 23.6813 23.0813L23.7563 23.1469C23.7938 23.1657 23.85 23.1469 23.8875 23.2032C23.9344 23.2594 23.9063 23.3157 23.8781 23.3344C23.8406 23.3438 23.7375 23.3719 23.6625 23.3157ZM22.8656 23.2594C22.9313 23.2969 22.9688 23.3532 22.95 23.4C22.9219 23.4469 22.8563 23.4469 22.7813 23.4C22.7156 23.3719 22.6875 23.3063 22.7063 23.2594C22.725 23.2219 22.8 23.2125 22.8656 23.2594Z" fill="#FCCA3E"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M23.5776 23.1036C23.5689 23.1392 23.5691 23.1742 23.5822 23.208C23.5954 23.2422 23.6222 23.2759 23.6679 23.308L23.6682 23.3081C23.7033 23.3345 23.7455 23.3414 23.7841 23.3402C23.8207 23.3392 23.8532 23.331 23.8726 23.3261C23.8732 23.326 23.8737 23.3258 23.8742 23.3257C23.8858 23.3174 23.8977 23.3013 23.9018 23.281C23.9059 23.2604 23.902 23.2352 23.8803 23.2091L23.8797 23.2084C23.8628 23.183 23.842 23.1745 23.8201 23.1701C23.8128 23.1687 23.8059 23.1678 23.7988 23.1668C23.7946 23.1662 23.7903 23.1656 23.7859 23.1649C23.7745 23.1631 23.7628 23.1606 23.7521 23.1553L23.751 23.1547L23.6757 23.0889C23.6753 23.0886 23.6745 23.0881 23.6735 23.0876C23.6716 23.0866 23.6687 23.0851 23.6652 23.0835C23.658 23.0804 23.6483 23.0769 23.6377 23.0753C23.6271 23.0737 23.6159 23.0741 23.6056 23.0781C23.5957 23.082 23.5858 23.0896 23.5776 23.1036ZM23.6863 23.0733L23.6869 23.0737L23.7615 23.139C23.7693 23.1427 23.7784 23.1448 23.7888 23.1464C23.7924 23.147 23.7963 23.1475 23.8004 23.1481C23.808 23.1491 23.816 23.1502 23.8237 23.1518C23.8486 23.1567 23.8745 23.167 23.8951 23.1975C23.92 23.2276 23.9254 23.2585 23.9202 23.2847C23.915 23.3105 23.8995 23.3314 23.8834 23.3422L23.882 23.3431L23.8804 23.3435C23.8794 23.3437 23.8782 23.344 23.8771 23.3443C23.8576 23.3492 23.8233 23.3579 23.7847 23.359C23.7437 23.3602 23.6968 23.353 23.657 23.3232C23.6091 23.2896 23.5796 23.2531 23.5647 23.2147C23.5498 23.1762 23.5499 23.1367 23.5597 23.0977L23.56 23.0965L23.5606 23.0954C23.571 23.0772 23.5843 23.0663 23.5988 23.0607C23.613 23.0551 23.6277 23.0548 23.6405 23.0568C23.6533 23.0587 23.6647 23.0628 23.6728 23.0664C23.6768 23.0682 23.6801 23.0699 23.6825 23.0711C23.6836 23.0718 23.6845 23.0723 23.6852 23.0727L23.6859 23.0731L23.6861 23.0732L23.6863 23.0733ZM22.7148 23.2632C22.6987 23.3043 22.723 23.3648 22.785 23.3914L22.7856 23.3917L22.7862 23.3921C22.8229 23.4149 22.8563 23.4258 22.8832 23.4258C22.9095 23.4258 22.9295 23.4156 22.9416 23.3958C22.9492 23.3761 22.9455 23.3537 22.9315 23.3311C22.9173 23.3082 22.8928 23.2857 22.861 23.2675L22.8657 23.2594L22.8602 23.267C22.829 23.2447 22.7958 23.236 22.7688 23.2371C22.7414 23.2382 22.7222 23.2489 22.7148 23.2632ZM22.8707 23.2515C22.8364 23.2271 22.7994 23.2171 22.768 23.2184C22.737 23.2196 22.7094 23.2322 22.6979 23.2552L22.6976 23.2559C22.6766 23.3084 22.7083 23.3785 22.7769 23.4083C22.8151 23.4321 22.8518 23.4445 22.8832 23.4445C22.9153 23.4445 22.9421 23.4315 22.9581 23.4048L22.9585 23.4042L22.9587 23.4035C22.9695 23.3765 22.9637 23.3476 22.9475 23.3212C22.9313 23.2951 22.9043 23.2708 22.8707 23.2515Z" fill="#AA8C30"/>
+<path d="M23.0625 23.4563L23.4188 23.6625L23.4094 23.8313L23.025 23.5032L23.0625 23.4563Z" fill="#FCCA3E"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M23.0591 23.438L23.4333 23.6546L23.4218 23.8604L23.0055 23.5049L23.0591 23.438ZM23.0659 23.4745L23.0445 23.5012L23.3969 23.8021L23.4042 23.6703L23.0659 23.4745Z" fill="#AA8C30"/>
+<path d="M23.0625 23.4938C22.9875 23.5875 22.9125 23.5875 22.8469 23.5594C22.7813 23.5125 22.8375 23.4469 22.8375 23.4469L22.9125 23.3813C22.9313 23.3438 22.9125 23.2875 22.9781 23.25C23.0438 23.2125 23.0906 23.25 23.1 23.2782C23.1094 23.3157 23.1281 23.4188 23.0625 23.4938Z" fill="#FCCA3E"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M23.0567 23.2482C23.0385 23.2411 23.0134 23.2407 22.9828 23.2581C22.9526 23.2754 22.9422 23.2964 22.9368 23.3179C22.9348 23.3261 22.9335 23.3341 22.9322 23.3423C22.9317 23.3454 22.9312 23.3486 22.9307 23.3518C22.9287 23.3631 22.9262 23.3748 22.9209 23.3855L22.92 23.3871L22.8442 23.4534L22.8442 23.4535C22.8438 23.4539 22.8433 23.4546 22.8427 23.4554C22.8414 23.4571 22.8396 23.4596 22.8377 23.4628C22.8337 23.4692 22.8292 23.478 22.8266 23.4879C22.824 23.4979 22.8234 23.5086 22.8267 23.5193C22.8299 23.5296 22.8371 23.5406 22.8515 23.5512C22.8829 23.5645 22.9156 23.5707 22.9491 23.5631C22.9828 23.5555 23.0186 23.5336 23.0552 23.4879L23.0625 23.4938L23.0554 23.4876C23.1175 23.4167 23.1003 23.3184 23.091 23.2808C23.0871 23.2696 23.0752 23.2554 23.0567 23.2482ZM23.0697 23.4998C23.1385 23.4209 23.1185 23.3135 23.1091 23.2759L23.1089 23.2752C23.1032 23.2583 23.087 23.2399 23.0635 23.2307C23.0395 23.2214 23.0085 23.2219 22.9735 23.2419C22.938 23.2621 22.925 23.288 22.9186 23.3134C22.9164 23.3224 22.9149 23.3316 22.9136 23.3401C22.9131 23.343 22.9126 23.3459 22.9122 23.3486C22.9104 23.3589 22.9084 23.3678 22.9049 23.3755L22.8308 23.4403L22.8304 23.4408L22.8375 23.4469C22.8304 23.4408 22.8304 23.4408 22.8304 23.4408L22.8303 23.4409L22.8301 23.4411L22.8296 23.4418C22.8291 23.4423 22.8285 23.4431 22.8277 23.4442C22.8261 23.4463 22.824 23.4492 22.8217 23.4529C22.8172 23.4603 22.8117 23.4709 22.8085 23.4832C22.8052 23.4955 22.8041 23.51 22.8087 23.5248C22.8134 23.5398 22.8236 23.5543 22.8414 23.567L22.8422 23.5676L22.8432 23.568C22.8771 23.5826 22.9144 23.5902 22.9532 23.5814C22.9921 23.5726 23.0312 23.5478 23.0697 23.4998Z" fill="#AA8C30"/>
+<path d="M33.4313 27.1687L33.3938 27.2063L33.3657 27.3V27.1594L33.4125 27.1312L33.4313 27.1687ZM33.45 27.0844C33.45 27.0844 33.4219 27.1312 33.3469 27.1312C33.2719 27.1312 33.2344 27.0938 33.225 27.0563C33.2157 27.0188 33.2157 26.9906 33.2438 26.9437C33.2625 26.8969 33.2063 26.9812 33.2063 26.9812V27.075L33.2625 27.1312L33.3094 27.15H33.3469L33.4125 27.1312L33.45 27.1031V27.0844ZM33.8438 27.7688C33.8438 27.7688 33.8063 27.7875 33.7782 27.7781C33.6 27.7219 33.45 27.6094 33.45 27.6094L33.8063 27.8344L33.8438 27.7688ZM34.0688 27.8719C34.0688 27.8719 34.0688 27.9375 33.9938 27.9656C33.9282 27.9937 33.8813 27.9844 33.8532 27.9563C33.825 27.9281 33.8157 27.9 33.8157 27.8438L33.8063 27.9L33.8438 27.975L33.9188 28.0125L33.9657 28.0031L34.0125 27.9844L34.05 27.9375L34.0782 27.8906L34.0688 27.8719ZM36.3469 23.4094L36.3375 23.4469V23.5125L36.2532 23.4188L36.2907 23.3719L36.3469 23.4094ZM36.3 23.2969C36.3 23.3625 36.2157 23.4469 36.15 23.4188C36.0844 23.3906 36.0375 23.325 36.0657 23.25L36.0469 23.2781L36.0563 23.3812L36.1219 23.4375H36.2063L36.2625 23.4094L36.3 23.3438V23.2969ZM37.2375 23.4656C37.2282 23.4281 37.2375 23.4656 37.2375 23.4656C37.2469 23.5031 37.1813 23.625 37.1063 23.6156C37.0407 23.6062 37.0125 23.5406 37.0125 23.4844C37.0125 23.4281 37.0032 23.5031 37.0032 23.5031V23.5781L37.05 23.6156L37.1063 23.6531L37.1625 23.6344L37.2282 23.6063L37.2469 23.55V23.4656H37.2375Z" fill="#AA8C30"/>
+<path d="M36.9187 23.5312C36.9187 23.5312 36.9187 23.5687 36.8812 23.5969L36.7594 23.6625L37.0219 23.5875L37.0031 23.5219L36.9187 23.5406V23.5312ZM35.3156 25.6406L35.3063 25.6875V25.7625L35.1562 25.5281L35.2031 25.5L35.3156 25.6406ZM35.2312 25.4156C35.2125 25.4812 35.1 25.5094 35.0437 25.4906C34.9969 25.4531 34.95 25.3406 35.0156 25.3031L34.9781 25.3219L34.9688 25.3875L34.9875 25.4531L35.0437 25.5187L35.0906 25.5281L35.1656 25.5094L35.2219 25.4719C35.2219 25.4719 35.2594 25.35 35.2312 25.4156ZM35.7562 25.95C35.7562 25.95 35.7562 25.9781 35.7094 25.9781H35.5594L35.8031 26.0344L35.8219 25.9781L35.7562 25.95Z" fill="#AA8C30"/>
+<path d="M36.0562 26.0156C36.0844 26.0906 36.0094 26.175 35.9156 26.1469C35.8219 26.1188 35.7937 26.025 35.8219 25.9781L35.8031 26.0344L35.8219 26.1094L35.8781 26.1656H36L36.0562 26.1L36.075 26.0344L36.0656 26.0156H36.0562ZM26.775 27.0563C26.8031 27.0844 26.7656 27.1969 26.6625 27.2438C26.55 27.2813 26.5031 27.2438 26.475 27.2063C26.4469 27.1688 26.4469 27.1313 26.4469 27.1313L26.4281 27.15L26.4469 27.2063L26.4937 27.2531L26.5875 27.2719L26.6625 27.2625L26.7281 27.2156L26.7656 27.1875L26.7937 27.1406V27.0844L26.7844 27.0563H26.775Z" fill="#AA8C30"/>
+<path d="M26.6812 27.2906L26.6531 27.3281L26.625 27.4031V27.2719L26.6719 27.2437L26.6812 27.2906ZM26.325 27.6656C26.325 27.6656 26.325 27.6937 26.3437 27.7125L26.4375 27.7406H26.2687L26.25 27.675H26.325V27.6656ZM26.2687 27.7781V27.7969C26.2685 27.8129 26.2653 27.8288 26.2594 27.8437C26.2406 27.8906 26.2312 27.9375 26.1656 27.9281C26.1407 27.9239 26.1178 27.9115 26.1008 27.8928C26.0838 27.8741 26.0736 27.8502 26.0719 27.825C26.0719 27.7875 26.0531 27.7687 26.0531 27.7687V27.825L26.0906 27.9187L26.1562 27.9469H26.2031L26.25 27.9281L26.2687 27.8719L26.2781 27.825V27.7781H26.2687ZM25.8281 27.7687C25.8281 27.7687 25.8469 27.8437 25.9406 27.8437C26.0344 27.8437 26.0531 27.825 26.0531 27.825V27.8531L26.0344 27.8719H25.875L25.8469 27.8437L25.8187 27.7969V27.7687H25.8281ZM24.9469 25.3875V25.425C24.9375 25.4531 24.8812 25.5187 24.7781 25.5187C24.6844 25.5187 24.6375 25.4906 24.6094 25.4531C24.5812 25.425 24.5719 25.3781 24.5719 25.3781V25.425L24.6094 25.4906L24.7125 25.5375H24.8062L24.9 25.5094L24.9469 25.4625L24.9562 25.4062L24.9469 25.3875ZM24.7875 25.6031C24.7875 25.6031 24.75 25.6031 24.7312 25.6219C24.7179 25.6334 24.7053 25.646 24.6937 25.6594V25.5375H24.7875V25.6031ZM24.3469 25.9219L24.3937 25.95C24.4406 25.9781 24.6844 25.9969 24.6844 25.9969H24.3L24.3094 25.9219H24.3469ZM24.3 25.9219L24.2812 25.9781C24.2625 26.025 24.2156 26.1281 24.1312 26.1094C24.0469 26.1 24.0656 26.0344 24.0656 26.0344V25.9969L24.0469 26.0625L24.0656 26.1L24.1031 26.1187L24.1687 26.1281L24.2062 26.1094L24.2625 26.0625L24.2812 26.0156L24.3 25.9594V25.9312V25.9219ZM24.0937 25.9406C24.0937 25.9406 24.0937 25.9594 24.0281 25.9594C23.9625 25.9594 23.8687 25.9312 23.8687 25.9312L23.9062 25.9687L23.9531 25.9875H24.075L24.0937 25.9406ZM23.9062 23.2219C23.9062 23.2219 23.9062 23.2687 23.8781 23.2969C23.8406 23.325 23.7562 23.3437 23.7094 23.3156C23.6625 23.2875 23.5687 23.1937 23.5687 23.1937L23.6062 23.2687L23.6719 23.325L23.7656 23.3531L23.8594 23.3344L23.8969 23.2969L23.9156 23.2687L23.8969 23.2312L23.9062 23.2219Z" fill="#AA8C30"/>
+<path d="M23.625 23.3531V23.4094L23.6063 23.5125L23.6907 23.325L23.6532 23.3063L23.625 23.3531ZM23.1188 23.4938L23.1375 23.5406C23.1563 23.5875 23.3532 23.7844 23.3532 23.7844L23.0438 23.5125L23.0813 23.4656L23.1188 23.4938ZM23.025 23.5219C23.025 23.5219 22.9782 23.55 22.9313 23.55C22.9032 23.55 22.8375 23.55 22.8375 23.5125C22.8282 23.4656 22.8469 23.4469 22.8469 23.4469L22.8188 23.5031L22.8282 23.5406L22.875 23.5688H22.9407L22.9969 23.5406L23.0157 23.5219H23.025ZM22.8844 23.3906H22.8375C22.7719 23.3906 22.7063 23.3156 22.7063 23.3156L22.7532 23.3906L22.8469 23.4375L22.8844 23.3906Z" fill="#AA8C30"/>
+<path d="M37.4907 22.5187C37.4625 22.875 37.1063 23.0625 36.9188 23.1937C36.7313 23.325 36.6375 23.4937 36.6375 23.4937L36.5813 23.7L36.5532 23.8406L36.5438 23.8875C36.5532 23.925 36.5719 23.9812 36.5719 24.075L36.5625 24.4781L36.8157 24.3L36.9938 24.2344L37.05 24.225C37.05 24.225 36.8438 24.4218 36.7688 24.6375C36.6938 24.8531 36.5438 25.3125 36.2719 25.4625C35.9907 25.6125 35.8219 25.5562 35.7375 25.6312C35.6438 25.7062 35.6438 25.725 35.6438 25.725L35.5219 25.8937L35.4282 26.0062L35.3438 26.0719L35.2875 26.1094C35.2874 26.163 35.2811 26.2165 35.2688 26.2687L35.2032 26.4937C35.2032 26.4937 35.2594 26.4562 35.325 26.4469H35.4469C35.4469 26.4469 35.4 26.5031 35.3813 26.5687C35.3625 26.625 35.3907 27 35.0438 27.225C34.6875 27.4406 33.7875 27.4125 33.7875 27.4125L33.6188 27.4781L33.4594 27.6L33.3094 27.7594V27.7969C33.3094 27.7969 33.1875 27.9375 33.1125 27.9844L32.85 28.1625L33.0563 28.1719L33.3844 28.3125C33.3844 28.3125 33.1782 28.3125 33.0469 28.3594C32.9063 28.4156 32.2782 28.7719 31.9782 28.7625C31.6688 28.7531 31.2282 28.3031 31.2282 28.3031L31.0407 28.1719L30.7125 28.1062L30.3094 28.0875V28.0312L30.3188 27.9656C30.3188 27.9656 30.4594 27.9469 30.675 27.975C30.8625 27.9937 30.9282 28.0687 31.0875 28.0781C31.2469 28.0969 31.3688 28.0781 31.4157 28.05C31.4813 28.0219 31.9688 27.6094 31.9688 27.6094L32.5125 27.4219L32.7282 27.45L32.8219 27.4687L32.9063 27.4969L32.8125 27.5906C32.7732 27.6302 32.7291 27.6648 32.6813 27.6937L32.7469 27.75L33.0938 27.6937L33.2063 27.7219L33.2344 27.7406C33.2344 27.7125 33.2532 27.6656 33.2907 27.6187C33.3282 27.5625 33.525 27.4031 33.6094 27.3469L33.7407 27.2531C33.7688 27.225 33.8813 26.9437 33.8813 26.9437L33.8907 26.7937L34.275 26.4187L34.5375 26.1469L34.65 25.8375L34.6313 25.7719C34.6313 25.7719 34.725 25.8656 34.7157 26.0531C34.6969 26.2594 34.65 26.325 34.65 26.325C34.65 26.325 34.9125 26.1375 35.0532 26.0812C35.1657 26.0344 35.2407 26.0344 35.2782 26.0344C35.3157 26.0156 35.4188 25.95 35.475 25.8656C35.55 25.7531 35.5688 25.725 35.5688 25.6781L35.5875 25.4156L35.5594 24.7594L35.7844 24.2531L36.1125 23.9625L36.1782 23.925L36.1407 24.0375V24.1781C36.1407 24.1781 36.3094 23.9437 36.3938 23.9062L36.4407 23.8781C36.4752 23.8198 36.5005 23.7566 36.5157 23.6906L36.5438 23.4094V23.1281L36.4969 22.9125L36.3375 22.5094V21.9656L36.225 21.8156C36.225 21.8156 36.3282 21.8156 36.4594 22.0031C36.5495 22.1459 36.61 22.3053 36.6375 22.4719L36.9469 21.5062C36.9469 21.5062 37.0313 21.6187 37.0875 21.8156L37.1625 22.125L37.2938 21.8625L37.3032 21.9562C37.3219 22.05 37.5188 22.1531 37.4907 22.5187ZM31.1813 28.6125C31.1813 28.6125 31.1157 28.4625 30.8157 28.3125C30.525 28.1719 30.3 28.1437 30.3 28.1437V28.2469L30.7688 28.4531L30.9938 28.6406L31.1813 28.6125Z" fill="#9CA168"/>
+<path d="M33.3187 27.7125C33.3468 27.675 33.6 27.45 33.7312 27.3844C33.8625 27.3188 34.0312 27.3094 34.0312 27.3094C34.2094 27.2719 34.2375 27.3 34.65 27.075C35.0531 26.85 35.1468 26.5875 35.2312 26.5219C35.3062 26.4562 35.4469 26.4469 35.4469 26.4469L35.1281 26.8125C34.9658 26.976 34.783 27.1178 34.5843 27.2344C34.3623 27.3427 34.1189 27.4003 33.8718 27.4031C33.7311 27.4271 33.6005 27.4924 33.4968 27.5906C33.375 27.6844 33.3093 27.7969 33.3093 27.7969C33.3093 27.7969 33.2906 27.75 33.3093 27.7125H33.3187ZM34.4437 26.5219C34.0687 26.8687 33.9469 27.1969 33.9469 27.1969L34.4531 26.7375C34.6312 26.5688 34.875 26.4938 34.9781 26.3906C35.0906 26.2875 35.1 26.2031 35.1656 26.1375L35.2875 26.0437C35.2875 26.0437 35.1187 25.9125 34.4437 26.5219ZM33.6468 27.3281C33.6468 27.3281 33.8062 27.2531 33.8718 27.1125C33.9187 27 33.8906 26.9719 33.9656 26.85C33.9656 26.85 34.3594 26.475 34.5 26.3063C34.7437 26.0156 34.6312 25.7719 34.6312 25.7719C34.6312 25.7719 34.6594 25.8938 34.5562 26.025C34.4625 26.1563 33.9468 26.4937 33.8812 26.7C33.825 26.9062 33.8531 26.9156 33.825 27.0188C33.7687 27.2625 33.6468 27.3281 33.6468 27.3281ZM33.3844 28.3125C33.3844 28.3125 33.1875 28.1813 32.9625 28.1906C32.5031 28.2281 32.1187 28.5094 31.8187 28.5094C31.5281 28.5188 31.4062 28.3687 31.1719 28.2094C30.9281 28.0406 30.3093 28.0687 30.3093 28.0687V28.0969C30.3093 28.0969 30.7219 28.0969 30.9094 28.1531C31.2469 28.2469 31.4344 28.6031 31.8187 28.5844C32.3344 28.5562 32.7469 28.2469 32.9437 28.2469C33.3 28.2469 33.3844 28.3125 33.3844 28.3125ZM31.1344 28.0875C31.1344 28.0875 31.4812 28.1438 31.7531 27.9469C32.0344 27.75 32.3531 27.4781 32.5312 27.4594C32.7187 27.4594 32.9062 27.4969 32.9062 27.4969C32.9062 27.4969 32.6719 27.4031 32.4937 27.4031C32.3062 27.4031 32.1187 27.4219 31.95 27.525C31.7812 27.6281 31.6969 27.8062 31.5187 27.9281C31.4009 28.0032 31.2708 28.0572 31.1344 28.0875ZM31.0687 28.5563C31.0219 28.5563 30.9656 28.5844 30.9469 28.5844C30.9281 28.5844 30.825 28.4719 30.6656 28.3969C30.5156 28.3031 30.2906 28.2656 30.2906 28.2656C30.2906 28.2656 30.2625 28.2656 30.3187 28.2844L30.675 28.425C30.7683 28.4741 30.8511 28.5409 30.9187 28.6219C30.9281 28.65 30.975 28.7063 31.0593 28.6969C31.1531 28.6969 31.1812 28.65 31.1719 28.6031C31.1719 28.575 31.1156 28.5563 31.0687 28.5563ZM31.3125 28.2188C31.3125 28.2188 31.4531 28.2937 31.6875 28.2937C32.175 28.275 32.4937 27.9375 32.8125 27.825C33.1312 27.6937 33.3 27.7969 33.3 27.7969C33.3 27.7969 33.3094 27.7781 33.3 27.7781C33.192 27.7051 33.0647 27.666 32.9343 27.6656C32.4 27.6656 31.8843 28.0125 31.6687 28.1062C31.4531 28.2 31.3125 28.2188 31.3125 28.2188ZM36.5625 24.4781C36.3937 24.6563 36.1406 25.2 36.0375 25.35C35.925 25.5 35.7844 25.5375 35.7281 25.6031C35.6719 25.6594 35.475 25.9313 35.4281 25.9875C35.3812 26.0531 35.3719 26.0344 35.3343 26.0625C35.3062 26.0906 35.2875 26.0906 35.3437 26.0813C35.4 26.0719 35.4187 26.0344 35.4937 25.9406C35.5875 25.8469 35.5781 25.8094 35.7093 25.6875C35.8406 25.575 36.075 25.4437 36.1875 25.2937C36.3094 25.1531 36.5437 24.5906 36.675 24.45C36.8062 24.3094 37.05 24.225 37.05 24.225C37.05 24.225 36.8625 24.1688 36.5531 24.4781H36.5625ZM35.7187 25.5188C35.7187 25.5188 35.7094 25.425 35.8312 25.275C35.9531 25.125 35.9906 25.1531 36.0937 24.9375C36.1875 24.7219 36.2343 24.5156 36.3093 24.2906C36.3937 24.0656 36.525 23.8406 36.525 23.8406C36.525 23.8406 36.4031 23.8594 36.2718 24.0281C36.0833 24.2769 35.9317 24.5516 35.8219 24.8438C35.7187 25.1625 35.7187 25.5188 35.7187 25.5188ZM35.5593 25.725C35.5593 25.725 35.6062 25.7063 35.6062 25.425C35.6156 25.1531 35.5969 24.7688 35.6719 24.5813C35.7562 24.3938 36.1781 23.925 36.1781 23.925C36.1781 23.925 36 23.9719 35.7562 24.1594C35.5125 24.3469 35.4093 24.6 35.4187 24.7875C35.4375 24.975 35.5406 25.1813 35.55 25.3594L35.5593 25.7344V25.725ZM36.5437 23.8406C36.5437 23.8406 36.6468 23.4656 36.6937 23.3719C36.7406 23.2781 36.7406 23.2313 36.9469 22.9969C37.0687 22.8563 37.1906 22.7719 37.2375 22.5844C37.2937 22.3969 37.2937 21.8625 37.2937 21.8625C37.2937 21.8625 37.2375 21.9094 37.1906 22.0031C37.1437 22.0969 37.1812 22.4438 37.0969 22.6031C37.0219 22.7625 36.8437 23.1281 36.75 23.2125C36.75 23.2125 36.7312 22.9406 36.7687 22.6781C36.7969 22.3969 36.8906 22.3219 36.9281 22.1437C36.9656 21.9656 36.9469 21.5156 36.9469 21.5156C36.9469 21.5156 36.8062 21.6562 36.7312 21.8344C36.6562 22.0031 36.6187 22.3031 36.6187 22.5375C36.6187 22.7719 36.6656 22.9594 36.675 23.0906C36.6844 23.2219 36.6937 23.2781 36.6375 23.4281L36.5812 23.6156C36.5625 23.6977 36.5406 23.779 36.5156 23.8594L36.5437 23.8406ZM36.2156 21.8156C36.2156 21.8156 36.3469 21.975 36.3281 22.1531C36.3 22.3406 36.2343 22.575 36.3093 22.7625C36.375 22.95 36.4875 22.9687 36.5156 23.0812C36.5437 23.1937 36.5437 23.4 36.5437 23.4C36.5437 23.4 36.6 22.9969 36.5625 22.8844C36.5156 22.7813 36.4969 22.8281 36.4406 22.7156C36.3844 22.6031 36.4406 22.275 36.4031 22.0875C36.3562 21.9 36.2156 21.8156 36.2156 21.8156Z" fill="#717732"/>
+<path d="M28.7532 28.575C28.7532 28.575 28.7907 28.4812 29.0438 28.35C29.2602 28.23 29.4899 28.1356 29.7282 28.0687C29.7563 28.0969 29.7 28.2375 29.7 28.2375L29.4563 28.3125L29.2594 28.425L29.025 28.575H28.7532Z" fill="#9CA168"/>
+<path d="M29.4 27.9093C29.0813 27.9187 28.9031 28.0031 28.8375 28.0031C28.8188 28.0125 28.7719 28.05 28.725 28.0312C28.6684 27.9952 28.6204 27.9472 28.5844 27.8906L28.5188 27.825L28.5 28.0593L28.0312 27.6468L27.975 27.9281L27.9094 28.05L27.4406 27.6L27.4594 27.9468L27.3281 27.9562L26.9906 27.7218L26.8969 27.7593L27.0094 27.9656L26.5781 27.9937L26.4844 28.0687C26.4497 28.0964 26.4183 28.1278 26.3906 28.1625V28.2H26.5687C26.6062 28.1812 26.625 28.1343 26.6344 28.1531C26.6531 28.1718 26.6625 28.2656 26.7188 28.2562C26.775 28.2562 26.9719 28.0968 27.1125 28.1625C27.2719 28.2375 26.9062 28.35 26.9437 28.4531C26.9812 28.5656 27.2437 28.5187 27.3187 28.4812C27.375 28.4531 27.5719 28.2 27.6562 28.2937C27.7688 28.425 27.4219 28.5281 27.4875 28.6593C27.5438 28.7812 27.7406 28.7531 27.8344 28.6968C27.9281 28.65 28.1531 28.3125 28.2 28.3781C28.2844 28.5093 28.0125 28.6312 28.0781 28.725C28.1531 28.8187 28.2937 28.725 28.3969 28.65C28.5 28.575 28.5375 28.4156 28.6781 28.3406C28.8094 28.2656 28.8 28.2937 28.8375 28.2937C28.875 28.2937 28.9781 28.1906 28.9781 28.1906L29.3063 28.05L29.4563 28.0687L29.5406 28.1062L29.7 28.125L29.7188 27.9937C29.7188 27.9937 29.5313 27.9 29.4094 27.9L29.4 27.9093ZM26.8313 27.9093L26.8969 27.7875L26.8594 27.7312C26.8594 27.7312 26.7469 27.6656 26.6438 27.5625C26.5912 27.5012 26.5276 27.4503 26.4563 27.4125L26.25 27.2812L26.175 27.0187L26.1281 26.9343L26.0062 26.9906L25.8469 26.4187L25.8187 26.3156H25.7531L25.6125 26.6531L25.4719 26.4375L25.4344 25.9687L25.3406 26.0625L25.2188 26.1937L25.0031 25.7625C25.0031 25.7625 24.9937 25.7531 24.975 25.7906C24.975 25.8187 24.9469 25.9593 24.9656 26.0343C24.7544 25.9014 24.5648 25.737 24.4031 25.5468L24.3094 25.3125L24.4031 25.125L24.45 24.8812L24.2438 24.9656L24.2063 24.4312L24.1781 24.2625L23.925 24.6187L23.8312 24.4593V24.1218L23.7656 24.1031L23.6719 24.2906C23.6719 24.2906 23.5687 24.1031 23.5219 24.0562C23.5312 23.9812 23.5406 23.7843 23.4938 23.6343C23.4375 23.4468 23.3719 23.3437 23.4 23.1843C23.4188 23.0343 23.4844 23.0156 23.475 22.95C23.475 22.875 23.3625 22.9968 23.4 22.9031C23.4375 22.8093 23.7562 22.6031 23.6906 22.4906C23.625 22.3875 23.3156 22.6687 23.3812 22.4812C23.4562 22.2937 23.7563 22.2937 23.775 22.0218C23.7844 21.8625 23.4938 22.125 23.4656 22.0406C23.4375 21.9656 23.6531 21.7968 23.6437 21.6843C23.6437 21.5906 23.6812 21.5718 23.625 21.5156C23.5688 21.4593 23.3812 21.7312 23.3812 21.7312L23.1937 21.6656L23.1188 21.9468L23.0625 22.1812L22.8187 22.0406L22.8844 22.3312L22.9406 22.6125L22.6875 22.5468L22.8187 22.7906L22.9969 22.9781L23.1 23.1187L23.1844 23.1562L23.2781 23.2593L23.325 23.4187L23.3812 23.5968L23.3906 23.7656V23.9906L23.3812 24.0281V24.1312C23.3344 24.1312 23.25 24.0562 23.2219 24.1031C23.1937 24.1593 23.3719 24.2906 23.3344 24.3281C23.3062 24.3656 23.0531 24.2812 23.0344 24.3562C23.0156 24.45 23.0531 24.5625 23.2031 24.6C23.3531 24.6375 23.7 24.7125 23.6437 24.7875C23.5875 24.8531 23.2031 24.5718 23.2219 24.7781C23.2258 24.8496 23.2511 24.9182 23.2946 24.9751C23.3381 25.0319 23.3977 25.0744 23.4656 25.0968C23.5594 25.1343 23.9437 25.0968 23.925 25.1906C23.8969 25.275 23.6156 25.1531 23.5875 25.2843C23.5594 25.4156 23.7844 25.4343 23.8312 25.4343C23.8781 25.4343 24.0375 25.425 24.1031 25.4718L24.5062 25.8562C24.6459 25.9679 24.7898 26.0742 24.9375 26.175C24.8625 26.175 24.7125 26.1468 24.6937 26.2031C24.6656 26.2687 25.2563 26.4843 25.0875 26.5593C24.9188 26.625 24.7312 26.3718 24.6844 26.5218C24.6281 26.6812 24.7969 26.8031 24.8906 26.8593C24.9844 26.9156 25.5188 26.8687 25.4156 26.9906C25.3125 27.1125 24.9187 26.9156 24.9187 27.0562C24.9187 27.1968 25.1719 27.4312 25.3125 27.4218C25.4437 27.4218 25.5938 27.1968 25.65 27.3187C25.7156 27.4312 25.5562 27.4781 25.6781 27.5062C25.8094 27.5437 25.8937 27.375 26.0531 27.4125C26.1937 27.4406 26.4281 27.5343 26.5594 27.6468C26.6522 27.732 26.7429 27.8196 26.8313 27.9093Z" fill="#9CA168"/>
+<path d="M28.9126 28.5094C29.0063 28.5094 29.0063 28.5657 29.0251 28.5657C29.0344 28.5657 29.1938 28.425 29.3344 28.35C29.4537 28.2913 29.5796 28.2472 29.7094 28.2188L29.7188 28.2375C29.7188 28.2375 29.4563 28.3032 29.3251 28.3969L29.0438 28.5938C29.0251 28.6125 28.9688 28.6594 28.8844 28.6594C28.7907 28.6594 28.7532 28.6032 28.7532 28.575C28.7532 28.5563 28.8188 28.5094 28.9126 28.5094ZM29.7094 28.1063C29.7094 28.1063 29.6251 28.1157 29.5876 28.0782C29.5166 28.0275 29.431 28.0011 29.3438 28.0032C29.204 28.0178 29.0725 28.0769 28.9688 28.1719C28.9688 28.1813 28.9407 28.2282 28.8376 28.2938C28.8751 28.3032 28.9407 28.2563 29.0251 28.2C29.124 28.1272 29.2404 28.0819 29.3626 28.0688C29.4563 28.05 29.5219 28.1063 29.5688 28.1344C29.6157 28.1719 29.7001 28.1625 29.7001 28.1625V28.1063H29.7094ZM24.9751 26.175V26.1094C24.9038 26.0804 24.8348 26.0459 24.7688 26.0063C24.6188 25.9125 24.3001 25.65 24.3001 25.65L24.5626 25.9032C24.6938 26.025 24.9376 26.175 24.9376 26.175H24.9751ZM28.3126 28.5375L28.4532 28.3407C28.5376 28.2 28.6126 28.1532 28.6313 28.1344C28.6407 28.1157 28.5938 28.05 28.5657 28.0032L28.5469 27.8907C28.5469 27.8907 28.5844 27.9657 28.6407 28.0125C28.6775 28.0411 28.7119 28.0724 28.7438 28.1063C28.7438 28.1063 28.8751 28.0875 28.8751 28.0594C28.8751 28.0407 28.8751 28.0219 28.8563 28.0125C28.8282 28.0032 28.8094 28.0313 28.7532 28.0125C28.6313 27.9563 28.5844 27.7688 28.5094 27.7688C28.4344 27.7594 28.4907 27.9563 28.4532 27.9563C28.3501 27.975 28.2657 27.5532 27.9844 27.5344C27.7969 27.5344 27.7688 27.5625 27.7594 27.6C27.7594 27.6469 27.9938 27.8907 27.9094 27.9282C27.8344 27.9657 27.5813 27.5344 27.3938 27.5344C27.2157 27.5344 27.2063 27.6 27.2063 27.6375C27.2251 27.675 27.4126 27.7125 27.3751 27.8438C27.3282 27.975 27.1407 27.6563 26.9719 27.6657C26.8032 27.6844 26.7844 27.6938 26.7844 27.75C26.7751 27.7969 26.8407 27.8625 26.8126 27.8813C26.7938 27.9 26.6813 27.8907 26.5969 27.9469C26.5126 28.0125 26.4001 28.1719 26.4001 28.1719C26.4001 28.1719 26.5126 28.0125 26.6532 27.9938C26.828 27.984 27.0033 27.984 27.1782 27.9938L27.0751 27.9188C27.0188 27.8719 26.9719 27.7688 26.9719 27.7688L27.1313 27.9094C27.2063 27.975 27.3094 28.0219 27.3094 28.0219C27.3094 28.0219 27.4688 28.0407 27.4782 28.0594C27.4876 28.0782 27.4782 28.1157 27.4032 28.1813L27.2438 28.3407L27.4313 28.1907L27.5719 28.0782L27.7032 28.0969C27.7126 28.0969 27.7032 28.05 27.6282 27.9375L27.4782 27.7032C27.4782 27.7032 27.5719 27.7875 27.6657 27.9188C27.7688 28.0407 27.7594 28.1063 27.7969 28.1063C27.8344 28.1063 27.8907 28.125 27.9282 28.1157C27.9657 28.1157 27.9563 28.1719 27.8907 28.275C27.8251 28.3782 27.7782 28.5094 27.7782 28.5094C27.7782 28.5094 27.8532 28.3969 27.9282 28.3219C27.9938 28.2469 28.0313 28.1625 28.0688 28.1532H28.2094L28.1344 28.0032C28.0782 27.9094 28.0594 27.7594 28.0594 27.7594C28.0594 27.7594 28.1157 27.8907 28.1907 27.9938L28.3126 28.1719L28.4438 28.1625L28.4719 28.1719C28.4719 28.2188 28.4532 28.2375 28.4063 28.3407C28.3708 28.4042 28.3395 28.4699 28.3126 28.5375ZM26.2969 27.375C26.4094 27.4219 26.4563 27.4219 26.4563 27.4219C26.4563 27.4219 26.2969 27.3282 26.2594 27.1969C26.2126 27.0657 26.2594 26.7844 26.1844 26.7938C26.1188 26.7938 26.0813 26.9907 26.0157 26.9532C25.9407 26.9157 26.0344 26.5407 25.9594 26.3907C25.8844 26.2313 25.7157 26.1188 25.6782 26.175C25.6407 26.2313 25.6501 26.5688 25.5376 26.5032C25.4344 26.4282 25.5469 26.1282 25.5188 26.0063C25.4813 25.8657 25.4063 25.7719 25.3407 25.8094C25.2844 25.8375 25.3688 26.0907 25.2751 26.0907C25.1813 26.0907 25.1907 25.9125 25.1532 25.9032C25.1063 25.8844 25.0969 25.9313 25.0688 25.9032C25.0501 25.8657 25.0688 25.7438 25.0126 25.7532C24.9563 25.7625 24.9657 25.8657 24.9844 25.9125C24.9938 25.9688 25.0313 26.0438 25.0501 26.0813C25.0688 26.1188 25.1438 26.1657 25.1438 26.1938C25.1344 26.2219 25.0969 26.25 25.0501 26.25H24.8719C24.8719 26.25 25.0032 26.2875 25.0501 26.2875C25.0969 26.2875 25.1813 26.2688 25.2094 26.3063C25.2282 26.3532 25.3407 26.4938 25.3407 26.4938C25.3407 26.4938 25.3688 26.4188 25.3782 26.2875C25.3969 26.1469 25.3782 26.0344 25.3782 26.0344C25.3782 26.0344 25.4251 26.1844 25.4157 26.2875C25.4157 26.3813 25.3782 26.5688 25.3782 26.5688C25.3782 26.5688 25.4813 26.6438 25.4532 26.6625C25.4251 26.6907 25.3126 26.6907 25.1907 26.6907C25.0594 26.6907 24.8813 26.6438 24.8813 26.6438C25.077 26.7368 25.2931 26.7787 25.5094 26.7657L25.6782 26.9532C25.6782 26.9532 25.7626 26.8125 25.7719 26.6719V26.3907L25.8094 26.6532C25.8094 26.775 25.7719 26.9907 25.7532 27.0094C25.7013 27.0532 25.6405 27.0852 25.5751 27.1032L25.2469 27.15C25.2469 27.15 25.4532 27.1782 25.6032 27.15C25.7438 27.1125 25.7626 27.0657 25.8094 27.0938L25.8844 27.1594L26.0063 27.2532C26.0157 27.2625 25.9407 27.2907 25.9126 27.3188L25.7719 27.3844L25.9782 27.3188C26.0129 27.3072 26.0473 27.2947 26.0813 27.2813L26.1282 27.3L26.1188 27.1875L26.0907 27.0188C26.0907 27.0188 26.1376 27.0938 26.1563 27.1688L26.1657 27.3188C26.1657 27.3188 26.1844 27.3375 26.2969 27.375ZM23.3813 24.0375C23.3813 24.0375 23.4094 23.8782 23.4094 23.7C23.3899 23.5081 23.3291 23.3226 23.2313 23.1563L23.3251 23.025L23.2126 23.1188L23.1001 23.0719C23.0652 23.0475 23.0363 23.0154 23.0157 22.9782L23.1282 23.0532C23.1844 23.0719 23.1938 23.0625 23.1938 23.0625L23.1469 22.875L22.9688 22.7813C22.8469 22.725 22.7344 22.6125 22.7344 22.6125L22.9969 22.7532C23.0907 22.7907 23.1469 22.7907 23.1469 22.7907L23.2969 22.7344L23.4563 22.6313C23.4563 22.6313 23.3626 22.6875 23.2876 22.6969L23.1376 22.725L23.1094 22.5L23.0063 22.3969C22.9219 22.2844 22.8563 22.125 22.8563 22.125C22.8563 22.125 22.9501 22.2375 23.0157 22.2844C23.0813 22.3407 23.1469 22.425 23.1469 22.425L23.2969 22.3313L23.5594 22.1438L23.3063 22.2657L23.1563 22.3313C23.1563 22.3313 23.1376 22.2375 23.1563 22.1907C23.1844 22.1532 23.2313 22.0782 23.2219 22.0407C23.2219 21.9938 23.1844 22.0125 23.1751 21.975C23.1563 21.9469 23.2126 21.7313 23.2126 21.7313L23.2219 21.8438C23.2219 21.8907 23.2032 21.9375 23.2594 21.9375C23.3157 21.9375 23.5594 21.6844 23.5969 21.6375C23.6251 21.5907 23.6719 21.4688 23.5407 21.5157C23.4094 21.5719 23.4469 21.6844 23.3344 21.675C23.2969 21.675 23.2594 21.5344 23.2219 21.5625C23.1844 21.6 23.0907 21.6844 23.0719 21.7875C23.0532 21.8813 23.0907 22.0313 23.0344 22.0782C22.9782 22.125 22.9407 21.9094 22.8282 21.9375C22.7157 21.9657 22.6876 22.125 22.7063 22.1813C22.7251 22.2375 22.9594 22.5094 22.8938 22.5563C22.8094 22.5844 22.6219 22.3125 22.5188 22.5C22.4251 22.6782 22.8376 22.875 22.8938 22.9125C22.9407 22.9594 22.8938 22.9688 22.9688 23.0625C23.0438 23.1563 23.1376 23.175 23.1938 23.2313C23.3035 23.3969 23.3711 23.5868 23.3907 23.7844L23.3813 24.0375ZM24.4782 25.6407C24.4782 25.6407 24.3844 25.5282 24.4126 25.3313C24.4407 25.1438 24.5813 24.7969 24.5344 24.75C24.4876 24.7032 24.3469 24.9563 24.3094 24.9C24.2719 24.8438 24.3938 24.4969 24.3282 24.3563C24.2719 24.2157 24.2626 24.1219 24.1407 24.1407C24.0188 24.15 23.9719 24.5532 23.9063 24.4782C23.8501 24.4125 23.9438 24.2344 23.9063 24.1313C23.8594 24.0375 23.8407 24.0094 23.7844 24.0188C23.7188 24.0375 23.6907 24.225 23.6532 24.2157C23.6063 24.2157 23.5407 24 23.4469 24.0282C23.3626 24.0563 23.6626 24.45 23.6626 24.45C23.6626 24.45 23.7094 24.4032 23.7376 24.3375L23.7938 24.1969C23.7938 24.1969 23.8219 24.3188 23.7938 24.375C23.7751 24.4219 23.7657 24.5344 23.7657 24.5344C23.7657 24.5344 23.6907 24.5625 23.5688 24.5344C23.4943 24.5225 23.4217 24.5004 23.3532 24.4688C23.3532 24.4688 23.4282 24.525 23.5501 24.5625L23.8032 24.6282C23.8625 24.7149 23.925 24.7993 23.9907 24.8813L24.0657 24.6844L24.1876 24.3563L24.1313 24.7219L24.0657 25.0032C24.0657 25.0032 23.9719 25.0032 23.8219 24.975L23.4844 24.9L23.8219 25.0125L24.0844 25.0782L24.2157 25.2563L24.3094 25.1157L24.4032 24.9469C24.4032 24.9469 24.3751 25.0782 24.3376 25.1625C24.3169 25.2069 24.2951 25.2507 24.2719 25.2938L24.1032 25.3125H23.8688C24.0056 25.3571 24.1472 25.3854 24.2907 25.3969C24.2907 25.3969 24.2907 25.4438 24.3563 25.5188C24.3883 25.5672 24.4298 25.6087 24.4782 25.6407Z" fill="#717732"/>
+<path d="M29.475 29.1375C29.475 29.1375 29.4187 29.0813 29.3437 29.0438C29.2594 28.9969 29.2312 29.0063 29.2312 29.0063L29.1937 28.9969L29.2687 28.8094L29.7844 28.3125L29.8687 27.8157H30.1875V28.4907L30.2812 28.5375L30.8625 28.8844V29.0344L30.7687 29.0719L30.7031 29.1094L30.4875 29.1282L30.1125 28.8469L29.9437 28.6875L29.6625 29.0625L29.475 29.1375Z" fill="white"/>
+<path d="M29.8875 27.8157L29.8782 27.9094C29.8782 27.9938 29.8782 28.3969 29.8594 28.4532C29.8407 28.5094 29.5594 28.6219 29.4 28.7625C29.2407 28.9032 29.2313 29.0063 29.2313 29.0063C29.2313 29.0063 29.1844 29.0063 29.0813 29.0438C28.9875 29.0813 28.9407 29.1375 28.9407 29.1375C28.9407 29.1375 28.9969 28.8938 29.2594 28.6688C29.5125 28.425 29.6344 28.4063 29.6719 28.3688C29.7 28.3313 29.6719 27.9 29.6719 27.8532C29.6813 27.8157 29.7188 27.8157 29.7375 27.8157H29.8875ZM30.5438 29.2875L30.6188 29.1844L30.7125 29.1094L30.5719 29.0344C30.4313 28.9782 30.3563 28.9969 30.2625 28.9219C30.1872 28.8671 30.118 28.8043 30.0563 28.7344L29.9157 28.8469L30.075 29.0344C30.1594 29.1094 30.3282 29.1375 30.4032 29.1844C30.4568 29.2132 30.5071 29.2477 30.5532 29.2875H30.5438Z" fill="#016848"/>
+<path d="M30.1407 27.8063C30.1407 27.8063 30.3001 27.8063 30.3188 27.825L30.3376 27.8813C30.3376 27.8906 30.3376 28.2563 30.3188 28.3781C30.2951 28.48 30.2504 28.5758 30.1876 28.6594L29.8126 29.0063C29.7001 29.1188 29.5876 29.2688 29.5876 29.2688L29.5126 29.175C29.4844 29.1375 29.4469 29.1188 29.4563 29.0906C29.5324 28.9611 29.6385 28.8518 29.7657 28.7719C29.9532 28.65 30.1032 28.5094 30.1407 28.3125C30.1688 28.125 30.1407 27.8063 30.1407 27.8063Z" fill="#CD202A"/>
+<path d="M31.1719 29.0625C31.1719 29.0625 31.1344 29.025 31.0032 29.025L30.8625 29.0343C30.8625 29.0343 30.7875 28.9406 30.675 28.875C30.5625 28.8 30.4782 28.8093 30.3469 28.725C30.225 28.65 30.1594 28.5281 30.1594 28.5281L30.2532 28.3406C30.2532 28.3406 30.3657 28.4812 30.4782 28.5656C30.5813 28.65 30.825 28.725 30.9094 28.7906L31.1719 29.0625Z" fill="#CD202A"/>
+<path d="M32.3438 26.85C32.3438 26.85 32.0063 26.7188 32.025 26.5969C32.0531 26.4844 32.8031 26.2875 32.8031 26.2875L32.8125 26.0906C32.8125 26.0906 32.7 26.0813 32.5125 26.1375C32.325 26.2031 32.025 26.2875 31.7063 26.2875C30.632 26.2081 29.5569 26.1393 28.4813 26.0813C28.1344 26.0531 27.9188 25.5188 27.9188 25.5188L27.75 25.5563C27.75 25.5563 27.7969 25.8094 27.7125 25.8375C27.2577 25.7014 26.8204 25.5126 26.4094 25.275L26.3531 25.5188C26.3531 25.5188 27.0375 25.8938 27.0188 26.0344C27 26.1657 26.7938 26.1563 26.7938 26.1563L26.8875 26.325C26.9156 26.325 28.0125 26.3813 28.0406 26.7094C28.0406 26.85 27.7594 26.925 27.7594 26.925L27.8531 27.0375V27.0938C27.8531 27.0938 28.4813 27.0938 28.65 27.1875C28.8188 27.2813 28.9031 27.4313 29.1188 27.5438C29.325 27.6656 30.7407 27.6375 30.9563 27.5719C31.2094 27.5063 31.3594 27.225 31.7719 27.1031C32.175 26.9719 32.3063 26.9719 32.3063 26.9719L32.3438 26.85Z" fill="#30C2DC"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M26.3937 25.2389L26.4211 25.2548C26.8279 25.49 27.2607 25.6771 27.7107 25.8125C27.7183 25.8073 27.7258 25.7962 27.7313 25.7756C27.7379 25.7511 27.74 25.7194 27.7395 25.6868C27.7389 25.6545 27.7358 25.6229 27.7328 25.5992C27.7313 25.5874 27.7298 25.5777 27.7287 25.5709C27.7282 25.5676 27.7277 25.5649 27.7274 25.5632L27.7271 25.5612L27.727 25.5607L27.727 25.5606L27.7228 25.5383L27.933 25.4916L27.9405 25.51L27.9406 25.5103L27.941 25.5114L27.9428 25.5156C27.9444 25.5194 27.9469 25.525 27.9501 25.5322C27.9565 25.5466 27.9661 25.5672 27.9788 25.5921C28.004 25.642 28.0413 25.7086 28.089 25.7759C28.1856 25.9121 28.3207 26.0446 28.4828 26.0579C29.5582 26.116 30.6331 26.1847 31.7071 26.2641C32.0218 26.264 32.3186 26.1806 32.5048 26.1154L32.5058 26.1151C32.6011 26.0865 32.6777 26.0745 32.7307 26.0697C32.7572 26.0673 32.7778 26.0666 32.792 26.0666C32.7991 26.0666 32.8045 26.0668 32.8083 26.067C32.8102 26.067 32.8116 26.0671 32.8127 26.0672L32.8139 26.0673L32.8142 26.0673L32.8144 26.0673C32.8144 26.0673 32.8144 26.0673 32.8125 26.0907L32.8144 26.0673L32.837 26.0692L32.8257 26.3058L32.8091 26.3102L32.807 26.3108L32.8007 26.3124C32.7953 26.3139 32.7872 26.316 32.777 26.3188C32.7565 26.3244 32.7272 26.3325 32.6919 26.3426C32.6214 26.3628 32.5271 26.3908 32.432 26.4223C32.3367 26.4538 32.2413 26.4887 32.1683 26.5224C32.1317 26.5393 32.1015 26.5556 32.0799 26.5706C32.0691 26.5781 32.0611 26.5849 32.0556 26.5908C32.0507 26.5961 32.0487 26.5998 32.048 26.6018C32.0457 26.6206 32.0565 26.6439 32.0836 26.6714C32.1105 26.6987 32.1489 26.7253 32.1892 26.749C32.2293 26.7724 32.2701 26.7923 32.301 26.8063C32.3164 26.8133 32.3293 26.8188 32.3383 26.8225C32.3428 26.8244 32.3463 26.8258 32.3487 26.8268L32.3514 26.8279L32.3521 26.8281L32.3522 26.8282L32.3726 26.8361L32.3236 26.9954L32.3063 26.9954L32.3062 26.9954L32.3054 26.9954C32.3049 26.9954 32.3042 26.9954 32.3033 26.9955C32.3027 26.9955 32.302 26.9955 32.3012 26.9956C32.2972 26.9958 32.2909 26.9963 32.282 26.9973C32.2641 26.9992 32.2358 27.0032 32.1948 27.0113C32.1127 27.0275 31.98 27.0601 31.7791 27.1255L31.7785 27.1257C31.5765 27.1853 31.4387 27.2839 31.3187 27.3772C31.3062 27.3869 31.2938 27.3966 31.2815 27.4062C31.1775 27.4879 31.0808 27.5637 30.9626 27.5945C30.9334 27.6033 30.886 27.6111 30.8265 27.6178C30.7662 27.6247 30.692 27.6308 30.6086 27.6357C30.4418 27.6457 30.2377 27.6516 30.034 27.6516C29.8303 27.6516 29.6266 27.6457 29.4606 27.6322C29.3777 27.6254 29.3038 27.6167 29.2439 27.6057C29.1852 27.595 29.1371 27.5817 29.1074 27.5643C28.997 27.5066 28.9203 27.4394 28.851 27.3759C28.8453 27.3707 28.8396 27.3655 28.834 27.3604C28.771 27.3025 28.7134 27.2496 28.6386 27.208C28.6004 27.1868 28.5331 27.1697 28.4506 27.1565C28.369 27.1435 28.2755 27.1347 28.1867 27.1289C28.0981 27.1231 28.0147 27.1202 27.9533 27.1187C27.9227 27.118 27.8976 27.1176 27.8802 27.1174C27.8715 27.1173 27.8647 27.1173 27.8601 27.1173L27.8549 27.1172L27.8532 27.1172H27.8531H27.8297V27.046L27.7179 26.9119L27.7533 26.9024L27.7535 26.9024L27.754 26.9022L27.7561 26.9016C27.7581 26.9011 27.761 26.9002 27.7647 26.8991C27.7721 26.8969 27.7828 26.8935 27.7956 26.889C27.8213 26.88 27.8554 26.8667 27.8892 26.8491C27.9233 26.8315 27.956 26.8103 27.98 26.786C28.0036 26.762 28.0169 26.7368 28.0172 26.7104C28.0108 26.6424 27.9483 26.5828 27.8424 26.5321C27.7378 26.4819 27.5995 26.4446 27.4596 26.4172C27.3199 26.3898 27.1801 26.3726 27.0733 26.3623C27.02 26.3571 26.9749 26.3537 26.9424 26.3515C26.9261 26.3504 26.913 26.3496 26.9036 26.3492C26.8988 26.3489 26.8951 26.3487 26.8923 26.3486L26.8889 26.3485L26.8879 26.3485L26.8876 26.3485C26.8875 26.3485 26.8876 26.3485 26.8876 26.3485C26.8876 26.3485 26.8875 26.3485 26.8875 26.3485H26.8737L26.7529 26.131L26.7948 26.1329L26.7952 26.1329L26.7966 26.1329C26.798 26.133 26.8 26.133 26.8026 26.133C26.8079 26.133 26.8156 26.1329 26.8249 26.1323C26.8435 26.1312 26.8683 26.1284 26.8933 26.1219C26.9448 26.1085 26.9882 26.082 26.9955 26.0312C26.9966 26.0229 26.9925 26.0081 26.9765 25.9855C26.961 25.9638 26.9372 25.939 26.907 25.912C26.8468 25.8582 26.7641 25.7989 26.6801 25.7434C26.5962 25.6881 26.5116 25.637 26.4479 25.5998C26.4161 25.5812 26.3896 25.5661 26.371 25.5556C26.3617 25.5504 26.3544 25.5463 26.3494 25.5435L26.3438 25.5404L26.3423 25.5396L26.3419 25.5394L26.3263 25.5308L26.3937 25.2389ZM26.3799 25.5069C26.3839 25.5091 26.3886 25.5117 26.394 25.5148C26.4128 25.5253 26.4395 25.5406 26.4716 25.5594C26.5357 25.5968 26.621 25.6483 26.7059 25.7043C26.7906 25.7602 26.8755 25.821 26.9383 25.877C26.9696 25.905 26.9962 25.9325 27.0146 25.9583C27.0323 25.9831 27.0456 26.0107 27.042 26.0375L27.042 26.0377C27.0305 26.1181 26.9614 26.1526 26.9051 26.1673C26.8787 26.1742 26.853 26.1773 26.833 26.1788L26.9016 26.3021C26.9642 26.3052 27.2164 26.3218 27.4686 26.3712C27.6099 26.3989 27.7528 26.4371 27.8627 26.4898C27.9707 26.5416 28.0558 26.6118 28.064 26.7074L28.0641 26.7084V26.7094C28.0641 26.7529 28.0422 26.7896 28.0134 26.8189C27.9846 26.8482 27.947 26.8721 27.9108 26.8908C27.8743 26.9096 27.8381 26.9238 27.8111 26.9333C27.8071 26.9346 27.8034 26.9359 27.7999 26.9371L27.8766 27.0291V27.0705C27.8779 27.0705 27.8793 27.0705 27.8807 27.0705C27.8983 27.0707 27.9236 27.0711 27.9545 27.0718C28.0162 27.0733 28.1003 27.0762 28.1898 27.0821C28.2792 27.088 28.3744 27.0969 28.458 27.1102C28.5407 27.1234 28.6153 27.1414 28.6614 27.1671C28.7413 27.2114 28.8029 27.2681 28.8652 27.3254C28.871 27.3307 28.8768 27.336 28.8826 27.3414C28.9514 27.4043 29.0246 27.4682 29.1296 27.523L29.1307 27.5236C29.1526 27.5365 29.1936 27.5489 29.2523 27.5596C29.3101 27.5702 29.3823 27.5788 29.4645 27.5855C29.6287 27.5989 29.831 27.6047 30.034 27.6047C30.2369 27.6047 30.44 27.5989 30.6058 27.589C30.6887 27.584 30.762 27.578 30.8212 27.5713C30.8809 27.5645 30.9247 27.557 30.9494 27.5495L30.9504 27.5492C31.0587 27.5211 31.1474 27.4517 31.2531 27.3689C31.2652 27.3594 31.2774 27.3499 31.2899 27.3401C31.4113 27.2459 31.5546 27.143 31.7649 27.0808C31.967 27.015 32.1014 26.982 32.1857 26.9653C32.2279 26.957 32.2575 26.9528 32.2769 26.9507C32.2813 26.9502 32.2852 26.9498 32.2886 26.9495L32.315 26.8636C32.3062 26.8599 32.2948 26.855 32.2816 26.849C32.2498 26.8346 32.2074 26.814 32.1655 26.7894C32.1238 26.765 32.0813 26.7359 32.0502 26.7043C32.0199 26.6736 31.9954 26.6353 32.0018 26.5934L32.002 26.5923L32.0023 26.5912C32.0053 26.5789 32.0127 26.5681 32.0212 26.559C32.0297 26.5497 32.0407 26.5407 32.0531 26.5321C32.0779 26.5148 32.111 26.4972 32.1486 26.4798C32.2241 26.445 32.3215 26.4095 32.4172 26.3778C32.5132 26.346 32.6081 26.3178 32.6791 26.2975C32.7145 26.2874 32.744 26.2792 32.7647 26.2736C32.7708 26.272 32.7761 26.2705 32.7805 26.2693L32.7879 26.1135C32.7753 26.1137 32.7575 26.1143 32.7349 26.1164C32.6849 26.1209 32.6117 26.1323 32.5197 26.1598C32.3311 26.2258 32.0285 26.311 31.7062 26.311H31.7054L31.7045 26.3109C30.6304 26.2315 29.5555 26.1628 28.48 26.1047L28.4794 26.1047C28.2948 26.0897 28.1487 25.941 28.0508 25.8031C28.0013 25.7333 27.9629 25.6646 27.937 25.6133C27.9239 25.5877 27.914 25.5664 27.9073 25.5514C27.9064 25.5495 27.9056 25.5476 27.9049 25.5459L27.7767 25.5744C27.7775 25.5799 27.7784 25.5863 27.7793 25.5933C27.7824 25.618 27.7857 25.6514 27.7863 25.686C27.7869 25.7202 27.7849 25.757 27.7766 25.7878C27.7685 25.8177 27.7526 25.8489 27.7199 25.8598L27.7129 25.8621L27.7058 25.86C27.2593 25.7264 26.8297 25.5422 26.4251 25.3111L26.3799 25.5069Z" fill="#0872A7"/>
+<path d="M26.6719 26.5125C26.7806 26.5125 26.8687 26.4244 26.8687 26.3156C26.8687 26.2069 26.7806 26.1188 26.6719 26.1188C26.5631 26.1188 26.475 26.2069 26.475 26.3156C26.475 26.4244 26.5631 26.5125 26.6719 26.5125Z" fill="white"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M26.6719 26.1656C26.589 26.1656 26.5219 26.2328 26.5219 26.3156C26.5219 26.3985 26.589 26.4656 26.6719 26.4656C26.7547 26.4656 26.8219 26.3985 26.8219 26.3156C26.8219 26.2328 26.7547 26.1656 26.6719 26.1656ZM26.4281 26.3156C26.4281 26.181 26.5372 26.0719 26.6719 26.0719C26.8065 26.0719 26.9156 26.181 26.9156 26.3156C26.9156 26.4503 26.8065 26.5594 26.6719 26.5594C26.5372 26.5594 26.4281 26.4503 26.4281 26.3156Z" fill="#0872A7"/>
+<path d="M27.7875 25.5937C27.8962 25.5937 27.9843 25.5056 27.9843 25.3968C27.9843 25.2881 27.8962 25.2 27.7875 25.2C27.6787 25.2 27.5906 25.2881 27.5906 25.3968C27.5906 25.5056 27.6787 25.5937 27.7875 25.5937Z" fill="white"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M27.7875 25.2468C27.7046 25.2468 27.6375 25.314 27.6375 25.3968C27.6375 25.4797 27.7046 25.5468 27.7875 25.5468C27.8703 25.5468 27.9375 25.4797 27.9375 25.3968C27.9375 25.314 27.8703 25.2468 27.7875 25.2468ZM27.5437 25.3968C27.5437 25.2622 27.6528 25.1531 27.7875 25.1531C27.9221 25.1531 28.0312 25.2622 28.0312 25.3968C28.0312 25.5314 27.9221 25.6406 27.7875 25.6406C27.6528 25.6406 27.5437 25.5314 27.5437 25.3968Z" fill="#0872A7"/>
+<path d="M32.4844 27.0656C32.5931 27.0656 32.6812 26.9775 32.6812 26.8688C32.6812 26.76 32.5931 26.6719 32.4844 26.6719C32.3756 26.6719 32.2875 26.76 32.2875 26.8688C32.2875 26.9775 32.3756 27.0656 32.4844 27.0656Z" fill="white"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M32.4844 26.7188C32.4015 26.7188 32.3344 26.7859 32.3344 26.8688C32.3344 26.9516 32.4015 27.0188 32.4844 27.0188C32.5672 27.0188 32.6344 26.9516 32.6344 26.8688C32.6344 26.7859 32.5672 26.7188 32.4844 26.7188ZM32.2406 26.8688C32.2406 26.7341 32.3497 26.625 32.4844 26.625C32.619 26.625 32.7281 26.7341 32.7281 26.8688C32.7281 27.0034 32.619 27.1125 32.4844 27.1125C32.3497 27.1125 32.2406 27.0034 32.2406 26.8688Z" fill="#0872A7"/>
+<path d="M25.7906 25.1062C25.725 25.2562 25.9781 25.5375 26.1656 25.575C26.3344 25.5937 26.4281 25.5562 26.4656 25.4719C26.4782 25.4326 26.4814 25.3909 26.4749 25.3502C26.4684 25.3095 26.4523 25.2709 26.4281 25.2375C26.3156 25.0781 25.8656 24.9562 25.7906 25.1062Z" fill="#F8C83C"/>
+<path d="M26.3437 25.3312C26.3437 25.2375 26.1937 25.1531 26.1 25.1531C26.0062 25.1531 25.9125 25.1531 25.9312 25.2C25.9406 25.2562 26.1844 25.3218 26.1937 25.35C26.1937 25.3781 26.1187 25.4062 26.1562 25.4437C26.2031 25.4812 26.25 25.4531 26.2875 25.425C26.325 25.3968 26.3531 25.3875 26.3531 25.3312H26.3437Z" fill="white"/>
+<path d="M27.9094 27.0281C27.9469 27.1593 27.8437 27.2156 27.7219 27.2812C27.5812 27.3375 27.3187 27.3 27.2531 27.1968C27.1969 27.0937 27.3469 26.9156 27.5156 26.8781C27.675 26.8406 27.8719 26.9062 27.9094 27.0281Z" fill="#F8C83C"/>
+<path d="M27.6375 27.0937C27.6844 27.0937 27.6937 27.1875 27.7312 27.1687C27.7781 27.1687 27.825 27.0937 27.8062 27.0469C27.7969 26.9906 27.7125 26.925 27.6375 26.9344C27.5625 26.9344 27.3562 27.1219 27.375 27.1687C27.3937 27.2156 27.45 27.2156 27.4875 27.1969C27.525 27.1781 27.5812 27.1031 27.6375 27.1031V27.0937Z" fill="white"/>
+<path d="M32.7376 26.3438C32.8594 26.5032 33.0751 26.3625 33.1313 26.2969C33.1876 26.2407 33.3563 26.1375 33.2907 26.0344C33.2157 25.9313 33.1032 25.9407 33.0094 25.9407C32.9344 25.9407 32.7657 26.0719 32.7376 26.1282C32.7094 26.175 32.6813 26.2782 32.7376 26.3532V26.3438Z" fill="#F8C83C"/>
+<path d="M32.775 26.25C32.775 26.25 32.7844 26.0719 32.9438 26.0625C33.0375 26.0625 33.0375 26.0906 33.1125 26.1281C33.1781 26.1656 33.2063 26.0813 33.2063 26.0813C33.2063 26.0813 33.2063 26.2031 33.1031 26.2031C32.9906 26.2031 33.0281 26.1562 32.9156 26.1375C32.8219 26.1187 32.775 26.2406 32.775 26.2406V26.25Z" fill="white"/>
+<path d="M30.1781 25.9125L30.0937 25.8562H29.8312L29.5125 25.8656L29.8312 26.7937L30.2062 27.3375L30.3562 27.3937L30.6468 27.375L30.7031 27.225L30.5906 26.3343L30.1781 25.9125Z" fill="#F9AA51"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M29.8312 25.8328H30.0937C30.0983 25.8328 30.1029 25.8341 30.1067 25.8367L30.1911 25.893L30.1781 25.9125L30.1948 25.8961L30.6073 26.3179C30.6109 26.3216 30.6132 26.3263 30.6138 26.3314L30.7263 27.222C30.7268 27.2258 30.7264 27.2296 30.725 27.2332L30.6688 27.3832C30.6655 27.3918 30.6575 27.3977 30.6483 27.3983L30.3577 27.4171C30.3544 27.4173 30.3511 27.4168 30.348 27.4156L30.198 27.3594C30.1935 27.3577 30.1896 27.3547 30.1869 27.3508L29.8119 26.807C29.8107 26.8052 29.8097 26.8033 29.809 26.8013L29.4903 25.8732C29.4879 25.8661 29.4889 25.8584 29.4932 25.8522C29.4974 25.8461 29.5043 25.8424 29.5118 25.8421L29.8312 25.8328ZM30.163 25.9306L30.0866 25.8796H29.8315L29.545 25.8881L29.8523 26.783L30.2213 27.3181L30.3597 27.37L30.6302 27.3525L30.6791 27.2221L30.5683 26.3451L30.163 25.9306Z" fill="#953220"/>
+<path d="M29.1188 25.9687L29.1375 25.8656L29.3063 25.8562C29.3751 25.8488 29.4447 25.8519 29.5125 25.8656C29.5125 25.8656 29.7281 26.1375 29.8031 26.3062C29.8781 26.475 29.9625 26.7562 30.0563 26.925C30.15 27.1031 30.3563 27.3937 30.3563 27.3937H29.9813L29.7938 27.3375L29.2688 26.4937L29.1188 25.9687Z" fill="#F9AA51"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M29.4995 25.8869C29.4366 25.8751 29.3724 25.8726 29.3088 25.8795L29.3076 25.8797L29.1573 25.888L29.1428 25.9676L29.2904 26.4841L29.809 27.3176L29.9847 27.3703H30.3112C30.3087 27.3667 30.3061 27.3629 30.3033 27.3589C30.2824 27.3288 30.2537 27.2868 30.2219 27.2392C30.1587 27.1443 30.0831 27.0263 30.0356 26.9361C29.9879 26.8501 29.9428 26.7361 29.9007 26.6238C29.8911 26.5982 29.8817 26.5727 29.8724 26.5476C29.8405 26.4617 29.8104 26.3804 29.7817 26.3158C29.7453 26.2337 29.6739 26.1253 29.6106 26.0362C29.5791 25.9919 29.55 25.9529 29.5287 25.9249C29.5181 25.9109 29.5094 25.8997 29.5034 25.892C29.5019 25.8901 29.5006 25.8884 29.4995 25.8869ZM29.5309 25.8511C29.5276 25.8469 29.5228 25.8438 29.5171 25.8426C29.4471 25.8285 29.3754 25.8252 29.3044 25.8329L29.1362 25.8422C29.1254 25.8428 29.1164 25.8508 29.1145 25.8614L29.0957 25.9645L29.1188 25.9687L29.0962 25.9752L29.2462 26.5002C29.2468 26.5023 29.2477 26.5043 29.2489 26.5061L29.7739 27.3499C29.7769 27.3547 29.7816 27.3583 29.787 27.3599L29.9745 27.4162C29.9767 27.4168 29.979 27.4172 29.9813 27.4172H30.3563C30.365 27.4172 30.3731 27.4123 30.3771 27.4045C30.3811 27.3967 30.3804 27.3873 30.3754 27.3802L30.3748 27.3794L30.3731 27.3769L30.3664 27.3674C30.3606 27.3592 30.3522 27.3472 30.3418 27.3322C30.3211 27.3023 30.2925 27.2605 30.2609 27.2132C30.1977 27.1183 30.1233 27.002 30.077 26.9141L30.0768 26.9136C30.0308 26.831 29.9868 26.72 29.9446 26.6074C29.9352 26.5824 29.9259 26.5572 29.9167 26.5324C29.8848 26.4461 29.8539 26.3629 29.8246 26.2967C29.786 26.21 29.7121 26.0982 29.6488 26.0091C29.617 25.9643 29.5875 25.9248 29.566 25.8965C29.5553 25.8824 29.5465 25.8711 29.5404 25.8632C29.5374 25.8593 29.535 25.8563 29.5334 25.8542L29.5315 25.8519L29.5309 25.8511Z" fill="#953220"/>
+<path d="M28.8938 25.8563H29.1375C29.2984 25.9932 29.4238 26.1668 29.5031 26.3625C29.5969 26.625 29.55 26.6625 29.6719 26.9438C29.8031 27.2157 29.9719 27.4032 29.9719 27.4032C29.9719 27.4032 29.6063 27.4219 29.4094 27.3844C29.1938 27.3469 29.1281 27.3563 29.0719 27.2907C29.0237 27.244 28.9702 27.2031 28.9125 27.1688H28.7063L28.7531 26.8782L28.6969 26.2313L28.7063 25.9032L28.8938 25.8563ZM31.0875 26.025L30.7406 25.8844L30.0844 25.8469L30.1406 26.1844C30.189 26.4349 30.271 26.6778 30.3844 26.9063C30.4875 27.0938 30.5906 27.3188 30.6469 27.375C30.7031 27.4219 31.0781 27.2719 31.0781 27.2719L31.3219 27.2344L31.2938 26.9719L31.2563 26.8782L31.3125 26.1282L31.2563 26.0157L31.0875 26.025Z" fill="#F9AA51"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M30.067 25.8313C30.0717 25.826 30.0786 25.8231 30.0857 25.8235L30.742 25.861C30.7446 25.8612 30.7471 25.8617 30.7495 25.8627L31.0915 26.0014L31.255 25.9923C31.2643 25.9918 31.2731 25.9968 31.2772 26.0052L31.3335 26.1177C31.3354 26.1215 31.3362 26.1257 31.3359 26.1299L31.2801 26.8745L31.3155 26.9632C31.3163 26.9652 31.3168 26.9673 31.3171 26.9694L31.3452 27.2319C31.3465 27.2444 31.3378 27.2557 31.3255 27.2576L31.0843 27.2947L31.0825 27.2954C31.0797 27.2965 31.0756 27.2981 31.0704 27.3001C31.0599 27.3042 31.0449 27.3099 31.0268 27.3166C30.9906 27.33 30.9415 27.3474 30.8906 27.3634C30.8399 27.3793 30.7866 27.3941 30.742 27.4018C30.7198 27.4057 30.6988 27.4079 30.681 27.4075C30.6644 27.4071 30.6454 27.4043 30.6319 27.3931C30.6313 27.3926 30.6308 27.3921 30.6303 27.3916C30.614 27.3753 30.5958 27.3485 30.5766 27.3165C30.557 27.284 30.5354 27.2443 30.5125 27.2008C30.4963 27.1701 30.4795 27.1375 30.4622 27.1041C30.4304 27.0425 30.3972 26.9782 30.3639 26.9176L30.3634 26.9167C30.249 26.6863 30.1664 26.4414 30.1176 26.1889L30.1175 26.1883L30.0613 25.8508C30.0601 25.8438 30.0622 25.8366 30.067 25.8313ZM31.0694 27.2502C31.0711 27.2495 31.0728 27.249 31.0746 27.2488L31.2962 27.2147L31.2708 26.9776L31.2345 26.8869C31.2332 26.8836 31.2326 26.88 31.2329 26.8764L31.2887 26.1329L31.2422 26.0399L31.0888 26.0484L31.0875 26.025L31.0787 26.0468L30.7354 25.9076L30.1123 25.872L30.1637 26.1803C30.2116 26.4284 30.2929 26.669 30.4052 26.8954C30.4387 26.9564 30.4724 27.0217 30.5043 27.0834C30.5215 27.1167 30.5381 27.1489 30.554 27.179C30.5768 27.2222 30.5979 27.261 30.6167 27.2924C30.6353 27.3232 30.6506 27.3452 30.6623 27.3573C30.6629 27.3576 30.6643 27.3583 30.6668 27.3589C30.6704 27.3598 30.6755 27.3605 30.6822 27.3606C30.6956 27.361 30.7132 27.3592 30.734 27.3556C30.7755 27.3484 30.8265 27.3344 30.8766 27.3187C30.9265 27.303 30.9747 27.2859 31.0105 27.2726C31.0284 27.266 31.0432 27.2604 31.0535 27.2564C31.0561 27.2554 31.0585 27.2545 31.0606 27.2537C31.0624 27.2529 31.064 27.2523 31.0653 27.2518L31.0684 27.2506L31.0692 27.2503L31.0694 27.2502ZM28.8876 25.8337C28.8896 25.8331 28.8916 25.8329 28.8938 25.8329H29.1375C29.1431 25.8329 29.1485 25.8348 29.1527 25.8384C29.3164 25.9778 29.4441 26.1545 29.5249 26.3537L29.5252 26.3547C29.5675 26.4729 29.5817 26.5467 29.595 26.6158C29.5966 26.6244 29.5983 26.633 29.6 26.6416C29.6149 26.7175 29.6332 26.7955 29.6932 26.934C29.758 27.0682 29.8321 27.1817 29.8901 27.2617C29.9191 27.3017 29.944 27.3333 29.9616 27.3548C29.9704 27.3655 29.9774 27.3738 29.9822 27.3793C29.9845 27.3821 29.9863 27.3841 29.9876 27.3855L29.9889 27.387L29.9892 27.3874L29.9893 27.3875C29.9893 27.3875 29.9893 27.3875 29.9893 27.3875M28.8876 25.8337L28.7006 25.8804C28.6904 25.883 28.6831 25.892 28.6828 25.9025L28.6735 26.2306C28.6734 26.2315 28.6735 26.2324 28.6736 26.2333L28.7295 26.8773L28.6831 27.1651C28.682 27.1718 28.684 27.1788 28.6884 27.184C28.6929 27.1892 28.6994 27.1922 28.7063 27.1922H28.906C28.9598 27.2247 29.0097 27.2631 29.0548 27.3068C29.0873 27.3443 29.1232 27.36 29.1761 27.371C29.2021 27.3765 29.2331 27.381 29.2702 27.3864L29.2713 27.3865C29.3084 27.3919 29.3522 27.3983 29.4052 27.4075C29.506 27.4267 29.6485 27.4313 29.7645 27.4313C29.8228 27.4313 29.8749 27.4301 29.9124 27.4289C29.9312 27.4284 29.9463 27.4278 29.9568 27.4273C29.962 27.4271 29.9661 27.4269 29.9688 27.4268L29.972 27.4266L29.9728 27.4266L29.973 27.4266L29.9719 27.4032M28.8967 25.8797L28.7292 25.9216L28.7204 26.2306L28.7765 26.8761C28.7767 26.8781 28.7766 26.88 28.7763 26.8819L28.7338 27.1454H28.9125C28.9167 27.1454 28.9209 27.1465 28.9245 27.1486C28.9838 27.1839 29.0387 27.2259 29.0882 27.2738C29.0887 27.2743 29.0892 27.2749 29.0897 27.2754C29.1133 27.3029 29.1382 27.3152 29.1857 27.3252C29.21 27.3302 29.2394 27.3345 29.277 27.34L29.2782 27.3402C29.3153 27.3455 29.3597 27.352 29.4134 27.3613L29.4138 27.3614C29.5099 27.3797 29.6485 27.3844 29.7645 27.3844C29.8222 27.3844 29.8738 27.3833 29.911 27.3821C29.9152 27.382 29.9192 27.3818 29.9231 27.3817C29.9051 27.3597 29.8805 27.3284 29.8521 27.2892C29.793 27.2075 29.7172 27.0915 29.6508 26.954L29.6504 26.9531C29.5887 26.8107 29.5695 26.7294 29.554 26.6507C29.5523 26.642 29.5506 26.6333 29.5489 26.6246C29.5357 26.5561 29.5221 26.4855 29.4812 26.3709C29.4044 26.1815 29.2836 26.0132 29.1289 25.8797H28.8967Z" fill="#953220"/>
+<path d="M28.7906 26.0343C28.7906 26.1093 28.8844 26.1187 28.9031 26.1093C28.9219 26.1093 28.9969 26.0812 28.9969 25.9687C28.9969 25.8562 28.9313 25.7718 28.7906 25.7625C28.6594 25.7625 28.5563 25.9218 28.5563 26.0437C28.5563 26.1562 28.6688 26.2125 28.6688 26.2593C28.6688 26.2593 28.5563 26.3625 28.5656 26.55C28.5656 26.7375 28.7156 26.8875 28.7156 26.8875C28.7156 26.8875 28.5563 27.0093 28.5563 27.1406C28.5563 27.2718 28.6781 27.3562 28.8 27.3562C28.9125 27.3562 29.0625 27.2812 29.0625 27.1875C29.0625 27.0937 28.9688 27.0281 28.9031 27.0281C28.8281 27.0281 28.8 27.075 28.8 27.1031M31.2 26.0812C31.2 26.1656 31.1438 26.175 31.1063 26.175C31.0688 26.175 30.9938 26.1375 30.9938 26.0343C30.9938 25.9406 31.125 25.8843 31.2188 25.8843C31.3031 25.8843 31.4438 25.9968 31.4438 26.1375C31.4438 26.2781 31.35 26.3812 31.35 26.3812C31.35 26.3812 31.4063 26.4093 31.4063 26.5875C31.4063 26.775 31.2938 26.8968 31.2938 26.8968C31.2938 26.8968 31.4438 26.9531 31.4438 27.1406C31.4438 27.3281 31.3125 27.3843 31.2281 27.3843C31.1344 27.3843 30.9844 27.3375 30.9844 27.2062C30.9844 27.0843 31.0594 27.0375 31.125 27.0375C31.1813 27.0375 31.2469 27.1031 31.2469 27.1781" fill="#F9AA51"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M28.6056 25.8431C28.6504 25.7847 28.7151 25.739 28.7906 25.739C28.7912 25.739 28.7917 25.739 28.7922 25.7391C28.867 25.7441 28.9247 25.7693 28.9636 25.8109C29.0025 25.8525 29.0203 25.9079 29.0203 25.9687C29.0203 26.0307 28.9995 26.0719 28.9736 26.0978C28.9609 26.1105 28.9474 26.119 28.9354 26.1245C28.926 26.1288 28.9165 26.1316 28.9083 26.1325C28.904 26.1339 28.8995 26.1347 28.8956 26.1352C28.8896 26.1358 28.883 26.1359 28.8762 26.1355C28.8625 26.1346 28.8465 26.1315 28.831 26.1252C28.7996 26.1123 28.7672 26.0844 28.7672 26.0343C28.7672 26.0214 28.7777 26.0109 28.7906 26.0109C28.8036 26.0109 28.8141 26.0214 28.8141 26.0343C28.8141 26.0593 28.8286 26.0735 28.8487 26.0818C28.859 26.086 28.87 26.0881 28.8792 26.0887C28.8837 26.089 28.8875 26.0889 28.8903 26.0886C28.8922 26.0884 28.8931 26.0881 28.8933 26.0881C28.8964 26.0866 28.8997 26.0859 28.9031 26.0859C28.9031 26.0859 28.9031 26.0859 28.9031 26.0859C28.9034 26.0859 28.9046 26.0858 28.9067 26.0852C28.9092 26.0846 28.9123 26.0835 28.916 26.0818C28.9233 26.0785 28.9321 26.073 28.9405 26.0646C28.9568 26.0483 28.9735 26.0193 28.9735 25.9687C28.9735 25.917 28.9585 25.874 28.9294 25.8429C28.9005 25.812 28.8553 25.7904 28.7899 25.7859C28.7344 25.7862 28.6823 25.8201 28.6428 25.8716C28.6033 25.9232 28.5797 25.9887 28.5797 26.0437C28.5797 26.0915 28.6034 26.1283 28.6306 26.1612C28.6364 26.1682 28.6423 26.1749 28.6481 26.1816C28.649 26.1826 28.6499 26.1837 28.6508 26.1848C28.6574 26.1923 28.664 26.1999 28.6697 26.2073C28.6804 26.2211 28.6922 26.239 28.6922 26.2593C28.6922 26.2659 28.6895 26.2721 28.6847 26.2766L28.6845 26.2767L28.6839 26.2773C28.6832 26.2779 28.6822 26.279 28.6809 26.2804C28.6782 26.2832 28.6742 26.2875 28.6694 26.2933C28.6598 26.3049 28.6469 26.3225 28.6343 26.3456C28.609 26.3918 28.5846 26.4601 28.5891 26.5488L28.5891 26.55C28.5891 26.6377 28.6243 26.7177 28.6606 26.7767C28.6787 26.8061 28.6967 26.8298 28.7103 26.8461C28.717 26.8543 28.7226 26.8606 28.7265 26.8648C28.7284 26.8669 28.7299 26.8685 28.7309 26.8695L28.732 26.8706L28.7322 26.8709C28.7322 26.8708 28.7322 26.8709 28.7156 26.8875C28.6991 26.904 28.6991 26.904 28.6991 26.904L28.6989 26.9038L28.6985 26.9034L28.6971 26.902C28.6958 26.9007 28.6941 26.8989 28.6919 26.8965C28.6892 26.8935 28.6858 26.8897 28.6818 26.8851C28.6795 26.8824 28.6769 26.8793 28.6742 26.876C28.6595 26.8584 28.6401 26.8329 28.6207 26.8013C28.5821 26.7386 28.5424 26.6501 28.5422 26.5505C28.5374 26.452 28.5646 26.3752 28.5931 26.3231C28.6074 26.297 28.6221 26.277 28.6333 26.2634C28.637 26.259 28.6403 26.2552 28.6431 26.2521C28.6413 26.2483 28.6381 26.2431 28.6327 26.236C28.6279 26.2298 28.6221 26.2232 28.6155 26.2156C28.6146 26.2145 28.6137 26.2135 28.6128 26.2124C28.607 26.2058 28.6007 26.1986 28.5945 26.1911C28.5654 26.1559 28.5328 26.1084 28.5328 26.0437C28.5328 25.9769 28.5608 25.9017 28.6056 25.8431ZM28.7298 26.9061L28.7296 26.9063L28.7284 26.9072C28.7274 26.9081 28.7258 26.9093 28.7237 26.911C28.7196 26.9144 28.7136 26.9195 28.7064 26.9259C28.6921 26.9389 28.6729 26.9575 28.6538 26.98C28.6148 27.0259 28.5797 27.0837 28.5797 27.1406C28.5797 27.2548 28.6865 27.3328 28.8 27.3328C28.8518 27.3328 28.9133 27.3153 28.9615 27.2868C29.011 27.2576 29.0391 27.2215 29.0391 27.1875C29.0391 27.1488 29.0198 27.1149 28.9919 27.0901C28.9636 27.065 28.9291 27.0515 28.9031 27.0515C28.8394 27.0515 28.8235 27.0895 28.8235 27.1031C28.8235 27.116 28.813 27.1265 28.8 27.1265C28.7871 27.1265 28.7766 27.116 28.7766 27.1031C28.7766 27.0604 28.8169 27.0046 28.9031 27.0046C28.9429 27.0046 28.988 27.024 29.023 27.0551C29.0584 27.0865 29.086 27.1323 29.086 27.1875C29.086 27.2472 29.039 27.2955 28.9854 27.3272C28.9305 27.3596 28.8608 27.3796 28.8 27.3796C28.6698 27.3796 28.5328 27.2889 28.5328 27.1406C28.5328 27.0663 28.5774 26.9975 28.6181 26.9496C28.6389 26.9252 28.6596 26.9051 28.675 26.8911C28.6774 26.889 28.6797 26.887 28.6818 26.8851M28.7298 26.9061C28.7352 26.902 28.7386 26.8957 28.739 26.889C28.7395 26.8823 28.737 26.8756 28.7322 26.8709M31.0829 25.9445C31.0415 25.9684 31.0172 25.9996 31.0172 26.0343C31.0172 26.1234 31.0806 26.1515 31.1063 26.1515C31.1239 26.1515 31.1413 26.1491 31.1539 26.1404C31.1649 26.1329 31.1766 26.1176 31.1766 26.0812C31.1766 26.0683 31.1871 26.0578 31.2 26.0578C31.213 26.0578 31.2235 26.0683 31.2235 26.0812C31.2235 26.1291 31.2071 26.1608 31.1805 26.179C31.1557 26.1961 31.1262 26.1984 31.1063 26.1984C31.057 26.1984 30.9703 26.1515 30.9703 26.0343C30.9703 25.9753 31.0117 25.9315 31.0594 25.9039C31.1076 25.876 31.1679 25.8609 31.2188 25.8609C31.2696 25.8609 31.3314 25.8935 31.3795 25.9416C31.4282 25.9903 31.4672 26.0592 31.4672 26.1375C31.4672 26.2129 31.4421 26.2777 31.4175 26.3232C31.4052 26.346 31.3928 26.3643 31.3835 26.3768C31.3829 26.3776 31.3824 26.3784 31.3818 26.3791C31.3874 26.386 31.3935 26.3953 31.3993 26.4074C31.4153 26.4408 31.4297 26.4961 31.4297 26.5875C31.4297 26.6859 31.4002 26.767 31.3708 26.8233C31.3561 26.8515 31.3414 26.8736 31.3302 26.8887C31.3302 26.8888 31.3301 26.8889 31.3301 26.8889C31.3454 26.8979 31.3654 26.9118 31.3853 26.9318C31.4266 26.9731 31.4672 27.0398 31.4672 27.1406C31.4672 27.2403 31.432 27.3081 31.3829 27.3505C31.3346 27.3923 31.275 27.4078 31.2281 27.4078C31.1781 27.4078 31.113 27.3954 31.0595 27.3648C31.0053 27.3339 30.961 27.2826 30.961 27.2062C30.961 27.1403 30.9814 27.0917 31.0135 27.0596C31.0454 27.0277 31.0868 27.014 31.125 27.014C31.1618 27.014 31.1981 27.0349 31.2244 27.0639C31.2511 27.0932 31.2703 27.1338 31.2703 27.1781C31.2703 27.191 31.2598 27.2015 31.2469 27.2015C31.234 27.2015 31.2235 27.191 31.2235 27.1781C31.2235 27.1474 31.2099 27.1176 31.1897 27.0954C31.1691 27.0728 31.1445 27.0609 31.125 27.0609C31.0976 27.0609 31.0687 27.0707 31.0467 27.0927C31.0249 27.1145 31.0078 27.1503 31.0078 27.2062C31.0078 27.261 31.0385 27.2988 31.0827 27.3241C31.1277 27.3498 31.1844 27.3609 31.2281 27.3609C31.2657 27.3609 31.3139 27.3482 31.3523 27.315C31.3899 27.2825 31.4203 27.2283 31.4203 27.1406C31.4203 27.0539 31.3859 26.9987 31.3522 26.965C31.3352 26.9479 31.3181 26.9362 31.3054 26.9288C31.2991 26.9251 31.2939 26.9225 31.2903 26.9209C31.2886 26.9201 31.2873 26.9195 31.2864 26.9191L31.2856 26.9188C31.2856 26.9188 31.2856 26.9188 31.2856 26.9188C31.2856 26.9188 31.2855 26.9188 31.2938 26.8968C31.2766 26.8809 31.2765 26.8809 31.2765 26.8809M31.2765 26.8809L31.2767 26.8808L31.2774 26.8799C31.2781 26.8792 31.2792 26.8779 31.2806 26.8762C31.2834 26.8729 31.2875 26.8677 31.2925 26.861C31.3024 26.8474 31.3158 26.8273 31.3292 26.8016C31.3561 26.7501 31.3828 26.6765 31.3828 26.5875C31.3828 26.5007 31.3691 26.4529 31.357 26.4277C31.351 26.4151 31.3454 26.4082 31.342 26.4047C31.3403 26.403 31.3391 26.4021 31.3387 26.4017C31.3386 26.4017 31.3386 26.4017 31.3386 26.4016C31.3325 26.3983 31.3283 26.3924 31.327 26.3855C31.3256 26.3783 31.3277 26.3709 31.3327 26.3654L31.3328 26.3653L31.3334 26.3646C31.334 26.364 31.3348 26.3629 31.336 26.3615C31.3383 26.3587 31.3417 26.3545 31.3458 26.3489C31.3541 26.3378 31.3652 26.3215 31.3763 26.3009C31.3986 26.2597 31.4203 26.2026 31.4203 26.1375C31.4203 26.075 31.389 26.0174 31.3463 25.9747C31.303 25.9314 31.2524 25.9078 31.2188 25.9078C31.1759 25.9078 31.1237 25.9208 31.0829 25.9445M31.2765 26.8809C31.2713 26.8867 31.2692 26.8947 31.271 26.9022C31.2728 26.9098 31.2783 26.916 31.2856 26.9188" fill="#953220"/>
+<path d="M29.0156 27.0562L29.0531 27.1125C29.0719 27.15 29.0813 27.2062 29.1281 27.2437C29.2031 27.3093 29.8031 27.3375 29.9906 27.3375C30.1781 27.3375 30.7219 27.3562 30.825 27.3C30.9187 27.2343 30.9375 27.1312 31.0031 27.0843L31.0875 27.0468L31.0031 27.1125V27.2437L31.05 27.3187C31.05 27.3187 31.0406 27.3562 30.975 27.3937C30.9094 27.4312 30.8531 27.4406 30.7594 27.45C30.6656 27.4593 29.5219 27.4593 29.3344 27.4312C29.1469 27.3937 29.1656 27.4031 29.1094 27.3656C29.0732 27.3397 29.0415 27.308 29.0156 27.2718L29.0437 27.1968L29.0156 27.0656V27.0562ZM30.8906 25.95L30.9844 25.9968C30.9844 25.9968 30.9 26.025 30.8344 26.2125C30.7687 26.4 30.825 26.4468 30.7781 26.4656C30.7312 26.4843 30.2344 26.4656 30.2344 26.4656L30.1406 26.2687L30.8906 25.9593V25.95Z" fill="#953220"/>
+<path d="M32.475 25.8751C32.475 25.8751 32.3906 25.8469 32.3531 25.7813C32.3156 25.7063 32.2781 25.6219 32.3062 25.5938C32.3437 25.5844 32.4 25.6407 32.4 25.6969C32.4 25.7532 32.475 25.8844 32.475 25.8844V25.8751ZM33.45 25.6126C33.45 25.6126 33.5156 25.7251 33.5437 25.7344L33.6562 25.7907C33.6562 25.7907 33.5156 25.7907 33.4687 25.7532C33.4324 25.7098 33.401 25.6627 33.375 25.6126H33.45Z" fill="#231F20"/>
+<path d="M33.75 25.7063C33.75 25.7063 33.6563 25.7532 33.6 25.725C33.525 25.6969 33.4688 25.6594 33.5063 25.6313C33.525 25.5938 33.5438 25.6032 33.5813 25.65C33.6188 25.6875 33.75 25.7063 33.75 25.7063ZM34.2469 25.2844C34.2469 25.2844 34.1719 25.3407 34.125 25.3407C34.0781 25.3407 33.9844 25.3219 33.9844 25.3032C33.9844 25.2844 34.1063 25.2657 34.1344 25.275H34.2469V25.2844ZM33.4969 24.3C33.4969 24.3 33.3938 24.3375 33.3563 24.3938C33.3188 24.4407 33.3281 24.5063 33.375 24.5063C33.4219 24.5063 33.4313 24.4407 33.4313 24.4125L33.4969 24.3ZM33.0094 24.5719C33.0094 24.5719 32.925 24.6188 32.9156 24.6657C32.8875 24.7125 32.8688 24.8157 32.9156 24.8157C32.9625 24.8157 32.9813 24.7407 32.9813 24.7032C32.9813 24.6563 33.0094 24.5719 33.0094 24.5719Z" fill="#231F20"/>
+<path d="M32.1375 25.1625L31.8656 25.4437C31.8656 25.4437 32.4844 25.7906 32.9625 25.7718C33.4312 25.7625 33.975 25.3968 34.0125 25.3031C34.05 25.2375 34.0125 24.9 33.9562 24.7968C33.8906 24.6937 33.5625 24.4406 33.4406 24.45C33.3187 24.4593 33.0937 24.6281 32.8969 24.825C32.6906 25.0218 32.7094 25.1906 32.4281 25.1718L32.1375 25.1625Z" fill="#8CBEBF"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M33.8809 24.6805C33.9231 24.7188 33.9579 24.7557 33.976 24.7843L33.9764 24.7849L33.9768 24.7856C33.9925 24.8143 34.0059 24.8573 34.0169 24.905C34.028 24.9531 34.0369 25.008 34.0428 25.0614C34.0488 25.1149 34.0518 25.1675 34.0509 25.2113C34.0504 25.2332 34.049 25.2532 34.0463 25.2703C34.0438 25.2863 34.04 25.3015 34.0336 25.3133C34.0267 25.3296 34.0112 25.3479 33.9922 25.3665C33.9719 25.3864 33.9449 25.4091 33.9126 25.4333C33.8479 25.4818 33.7607 25.5372 33.6601 25.5899C33.4594 25.6949 33.2027 25.7904 32.9632 25.7953C32.7192 25.8048 32.4413 25.7213 32.2262 25.6366C32.1182 25.5941 32.0253 25.5511 31.9594 25.5186C31.9265 25.5024 31.9002 25.4888 31.8822 25.4793C31.8732 25.4745 31.8662 25.4708 31.8615 25.4682L31.8561 25.4652L31.8547 25.4644L31.8542 25.4642C31.8542 25.4642 31.8542 25.4642 31.8656 25.4437L31.8542 25.4642L31.8276 25.4493L32.1206 25.1462L32.1375 25.1625L32.1383 25.139L32.4297 25.1484C32.4978 25.153 32.5456 25.146 32.5824 25.1314C32.6189 25.117 32.6464 25.0942 32.673 25.0638C32.6923 25.0417 32.7103 25.0165 32.7307 24.9879C32.7391 24.9762 32.7478 24.9639 32.7573 24.951C32.7893 24.9073 32.8276 24.8587 32.8805 24.8082C32.9796 24.7091 33.086 24.6169 33.1833 24.548C33.232 24.5136 33.2789 24.4847 33.3216 24.4638C33.3641 24.443 33.4041 24.4293 33.4388 24.4266C33.4761 24.4237 33.5245 24.4405 33.5737 24.4647C33.6241 24.4894 33.6797 24.5241 33.7331 24.5621C33.7866 24.6001 33.8383 24.6417 33.8809 24.6805ZM32.1471 25.1862L31.904 25.4378C31.904 25.4378 31.9041 25.4378 31.9041 25.4379C31.9218 25.4472 31.9476 25.4606 31.9801 25.4766C32.0452 25.5086 32.1369 25.5511 32.2433 25.593C32.4571 25.6771 32.7275 25.7576 32.9616 25.7484L32.962 25.7484C33.1912 25.7438 33.4406 25.6519 33.6383 25.5483C33.737 25.4967 33.822 25.4426 33.8845 25.3958C33.9157 25.3724 33.941 25.3511 33.9594 25.333C33.9786 25.3142 33.988 25.3012 33.9907 25.2944L33.9913 25.2929L33.9921 25.2915C33.9947 25.287 33.9977 25.278 34 25.2631C34.0022 25.2488 34.0036 25.2309 34.004 25.2103C34.0049 25.1691 34.002 25.1186 33.9962 25.0666C33.9905 25.0146 33.9818 24.9616 33.9712 24.9155C33.9606 24.8693 33.9484 24.8317 33.936 24.8087C33.9212 24.7858 33.8906 24.7526 33.8494 24.7152C33.8082 24.6777 33.758 24.6373 33.7059 24.6003C33.6539 24.5633 33.6005 24.53 33.553 24.5067C33.5044 24.4828 33.466 24.4715 33.4424 24.4733C33.4162 24.4753 33.3824 24.4862 33.3422 24.5059C33.3024 24.5254 33.2578 24.5528 33.2104 24.5863C33.1156 24.6533 33.0112 24.7438 32.9134 24.8415L32.9131 24.8419C32.8629 24.8898 32.8263 24.9361 32.7951 24.9787C32.7866 24.9903 32.7783 25.0019 32.7703 25.0132C32.7492 25.0427 32.7292 25.0706 32.7083 25.0947C32.6786 25.1287 32.6452 25.157 32.5997 25.175C32.5545 25.1929 32.4993 25.2 32.427 25.1952L32.1471 25.1862Z" fill="#04534E"/>
+<path d="M32.0625 25.275C32.0625 25.275 32.7188 25.3687 32.9156 25.2C33.1031 25.0312 33.3188 24.7031 33.45 24.6375C33.5813 24.5531 33.6375 24.5531 33.6375 24.5531L33.7875 24.6562L33.9563 24.7969L34.0125 25.1156V25.2844L33.8063 25.4531L33.4313 25.6312L33.0563 25.7437L32.7563 25.7344L32.1281 25.5469L31.9688 25.4437L31.9313 25.4062L32.0625 25.275Z" fill="#0C8489"/>
+<path d="M33.075 24.8906C33.075 24.8344 33.1125 24.8344 33.1687 24.8344C33.225 24.8344 33.2625 24.8531 33.2625 24.9094C33.2625 24.9656 33.2156 25.0406 33.1687 25.0406C33.1125 25.0406 33.075 24.9469 33.075 24.8906ZM33.3375 25.0594C33.3375 25.0031 33.375 24.9844 33.4313 24.9844C33.4969 24.9844 33.5531 25.05 33.5531 25.0969C33.5531 25.1437 33.5062 25.1906 33.45 25.1906C33.3844 25.1906 33.3375 25.1062 33.3375 25.0594ZM33.2438 25.4531C33.2438 25.3875 33.2906 25.3781 33.3469 25.3781C33.4031 25.3781 33.4406 25.4062 33.4406 25.4719C33.4407 25.5001 33.4302 25.5274 33.4111 25.5483C33.3919 25.5691 33.3657 25.582 33.3375 25.5844C33.2719 25.5844 33.2438 25.5187 33.2438 25.4531ZM32.8969 25.3312C32.8969 25.2656 32.9625 25.2375 33.0188 25.2375C33.075 25.2375 33.1125 25.3031 33.1125 25.3687C33.1125 25.4344 33.075 25.4906 33.0188 25.4906C32.9625 25.4906 32.8969 25.3969 32.8969 25.3312ZM32.3438 25.3969C32.3438 25.3596 32.3586 25.3238 32.3849 25.2974C32.4113 25.271 32.4471 25.2562 32.4844 25.2562C32.5217 25.2562 32.5574 25.271 32.5838 25.2974C32.6102 25.3238 32.625 25.3596 32.625 25.3969C32.625 25.4341 32.6102 25.4699 32.5838 25.4963C32.5574 25.5227 32.5217 25.5375 32.4844 25.5375C32.4471 25.5375 32.4113 25.5227 32.3849 25.4963C32.3586 25.4699 32.3438 25.4341 32.3438 25.3969Z" fill="#04534E"/>
+<path d="M33.3375 25.0594C33.3375 25.0125 33.4031 24.9844 33.4313 24.9844C33.4781 24.9844 33.5062 25.0219 33.5062 25.0594C33.5062 25.0969 33.4781 25.1531 33.4406 25.1531C33.4031 25.1531 33.3469 25.1062 33.3469 25.0594H33.3375ZM33.2438 25.4344C33.2438 25.3875 33.3 25.3594 33.3562 25.3594C33.4125 25.3594 33.45 25.3875 33.45 25.4344C33.45 25.4812 33.4031 25.5281 33.3562 25.5281C33.3 25.5281 33.2531 25.4906 33.2531 25.4344H33.2438ZM32.8969 25.3219C32.8969 25.2656 32.9906 25.2375 33.0375 25.2375C33.075 25.2375 33.0656 25.275 33.0656 25.3312C33.0656 25.3969 33.0375 25.4437 33 25.4437C32.9625 25.4437 32.9062 25.3781 32.9062 25.3219H32.8969ZM33.0656 24.8812C33.0656 24.8344 33.1031 24.8344 33.1406 24.8344C33.1781 24.8344 33.1969 24.8437 33.1969 24.9C33.1969 24.9562 33.1687 24.9937 33.1406 24.9937C33.1031 24.9937 33.0656 24.9375 33.0656 24.8812ZM32.3438 25.3594C32.3438 25.3031 32.4 25.2375 32.475 25.2375C32.55 25.2375 32.6344 25.2656 32.6344 25.3312C32.6344 25.3875 32.5406 25.5 32.4656 25.5C32.3812 25.5 32.3438 25.425 32.3438 25.3594Z" fill="#8CBEBF"/>
+<path d="M32.5968 25.2562C32.5968 25.2562 32.5031 25.2656 32.4562 25.3125C32.4093 25.3593 32.4093 25.4062 32.4281 25.425C32.4562 25.4437 32.4937 25.3968 32.5031 25.3687C32.5031 25.35 32.5968 25.2562 32.5968 25.2562ZM33.0375 25.1625C33.0375 25.1625 32.9437 25.2187 32.9437 25.2843C32.9343 25.3406 32.9437 25.3781 32.9625 25.3781C32.9906 25.3781 33.0093 25.2937 33 25.2656C32.9906 25.2375 33.0375 25.1531 33.0375 25.1531V25.1625Z" fill="#231F20"/>
+<path d="M33.1124 25.2468C33.1124 25.2468 33.0562 25.2469 33.0187 25.2844C32.9718 25.3312 32.9343 25.3781 32.9624 25.3781C32.9906 25.3781 33.0374 25.3594 33.0374 25.3312C33.0374 25.3125 33.1124 25.2468 33.1124 25.2468ZM33.2062 24.7406L33.1312 24.7969C33.1124 24.8156 33.0843 24.8906 33.1124 24.8906C33.1406 24.9094 33.1593 24.8906 33.1874 24.8437C33.2062 24.7969 33.2062 24.7406 33.2062 24.7406ZM33.5343 24.9562C33.5343 24.9562 33.4499 24.9562 33.4218 25.0031C33.3937 25.0406 33.3749 25.0781 33.4218 25.0781C33.4499 25.0781 33.4593 25.0594 33.4781 25.0312C33.4874 24.9937 33.5343 24.9562 33.5343 24.9562ZM33.4874 25.3406C33.4874 25.3406 33.4687 25.4062 33.4124 25.4343C33.3656 25.4625 33.3468 25.4812 33.3187 25.4437C33.3093 25.4062 33.3374 25.3875 33.3562 25.3781L33.4874 25.3406Z" fill="#231F20"/>
+<path d="M34.0125 25.0781C34.0125 25.0781 34.05 25.2656 33.8906 25.3594C33.7312 25.4437 33.2906 25.7531 32.8687 25.7156C32.4468 25.6781 31.9687 25.4344 31.9687 25.4344L31.9031 25.4719L32.0156 25.5188L32.3343 25.65L32.7093 25.7625L32.9437 25.7719L33.1406 25.7531L33.5156 25.6312L33.825 25.4719L33.9937 25.3406L34.0312 25.2844V25.1062L34.0125 25.0781Z" fill="#04534E"/>
+<path d="M25.7718 22.7063C25.7718 22.7063 25.8656 22.7907 25.8656 22.8563C25.8468 22.9313 25.8281 22.9594 25.8 22.95C25.7718 22.9313 25.7718 22.8563 25.7718 22.8282V22.7063ZM26.4937 23.3719C26.4937 23.3719 26.4656 23.5032 26.4093 23.5125C26.3625 23.5219 26.325 23.475 26.3343 23.4469C26.3437 23.4282 26.3906 23.4469 26.4093 23.4282L26.4937 23.3719ZM24.9187 23.4657C24.9187 23.4657 24.9562 23.5407 25.0125 23.5594C25.0875 23.5594 25.1062 23.5219 25.1062 23.5032C25.0968 23.4844 25.0687 23.4844 25.0312 23.4844L24.9187 23.475V23.4657ZM25.2 24.0282C25.2 24.0282 25.2656 24.0844 25.3406 24.0938C25.3651 24.0965 25.39 24.0917 25.4117 24.08C25.4335 24.0682 25.4512 24.0502 25.4625 24.0282C25.4625 24.0094 25.3687 24.0094 25.3406 24.0282C25.3125 24.0563 25.2 24.0282 25.2 24.0282ZM25.6968 24.4407C25.6968 24.4407 25.8281 24.4219 25.8468 24.3844C25.8656 24.3469 25.9031 24.2907 25.875 24.2625C25.8468 24.225 25.8281 24.3094 25.8093 24.3469C25.8 24.3751 25.6968 24.4407 25.6968 24.4407Z" fill="#231F20"/>
+<path d="M26.4938 24.1031C26.4938 24.1031 26.5876 23.5406 26.1188 23.1281C25.6501 22.725 25.3594 22.8281 25.2001 22.9781C25.0407 23.1281 24.9001 23.6063 25.3876 24.0375C25.8844 24.4594 26.4844 24.3188 26.4844 24.3188L26.4938 24.1031Z" fill="#8CBEBF"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M25.5442 22.8223C25.7025 22.8284 25.8973 22.9068 26.134 23.1104L26.1342 23.1105C26.3734 23.3211 26.4692 23.5701 26.505 23.7661C26.5229 23.8641 26.5259 23.9489 26.5244 24.0094C26.5237 24.0396 26.5218 24.0638 26.5201 24.0805C26.5193 24.0889 26.5185 24.0954 26.5179 24.0999C26.5175 24.1021 26.5173 24.1038 26.5171 24.105L26.517 24.1055L26.507 24.3375L26.4897 24.3416L26.4843 24.3188C26.4897 24.3416 26.4897 24.3416 26.4897 24.3416L26.4895 24.3416L26.4891 24.3417L26.4876 24.342C26.4864 24.3423 26.4845 24.3427 26.4822 24.3432C26.4774 24.3442 26.4705 24.3455 26.4616 24.3471C26.4437 24.3502 26.4178 24.3541 26.3852 24.3575C26.32 24.3642 26.228 24.3686 26.1203 24.3597C25.9048 24.3418 25.6254 24.2703 25.3723 24.0554L25.3719 24.0551C24.8746 23.6151 25.014 23.121 25.1839 22.9611C25.2669 22.8829 25.3852 22.8161 25.5442 22.8223ZM26.4617 24.2994L26.4703 24.1007L26.4706 24.0993L26.4706 24.099L26.4708 24.098C26.4709 24.097 26.4711 24.0956 26.4714 24.0936C26.4719 24.0896 26.4727 24.0836 26.4735 24.0758C26.4751 24.0601 26.4769 24.0372 26.4776 24.0082C26.479 23.9503 26.4762 23.8688 26.4589 23.7745C26.4245 23.5862 26.3327 23.3478 26.1033 23.1458C25.8713 22.9463 25.6864 22.8747 25.5424 22.8691C25.399 22.8636 25.2923 22.9234 25.216 22.9952C25.0672 23.1353 24.9253 23.5973 25.4028 24.0198C25.6465 24.2266 25.9155 24.2957 26.1241 24.313C26.2285 24.3216 26.3175 24.3173 26.3804 24.3108C26.4118 24.3076 26.4367 24.3038 26.4535 24.3009C26.4565 24.3004 26.4592 24.2999 26.4617 24.2994Z" fill="#04534E"/>
+<path d="M25.0875 23.5031C25.0875 23.5031 25.0781 23.1843 25.2281 23.0906C25.3688 22.9968 25.8656 22.9218 26.1 23.3812C26.3438 23.8499 26.3531 24.0749 26.2875 24.3187H26.0344L25.6313 24.1499L25.3031 23.9062L25.0875 23.5031Z" fill="#0C8489"/>
+<path d="M26.4375 24.1875C26.4375 24.1875 26.3531 24.2813 26.1843 24.2813C26.025 24.2625 25.2468 24.0657 25.0593 23.3625V23.5219L25.0687 23.5688L25.125 23.7094L25.2843 23.9438L25.4906 24.1219L25.7531 24.2532L25.9406 24.3094L26.175 24.3469H26.3156L26.4375 24.1875Z" fill="#04534E"/>
+<path d="M26.0344 23.9906C26.0344 23.925 26.0625 23.925 26.1094 23.925C26.1562 23.925 26.2031 23.9062 26.2031 23.9625C26.2031 24.0281 26.1656 24.1125 26.1094 24.1125C26.0719 24.1125 26.0344 24.0468 26.0344 23.9906ZM26.0625 23.6156C26.0625 23.5781 26.1 23.5406 26.1562 23.5406C26.2031 23.5406 26.2406 23.5781 26.2406 23.625C26.2406 23.6625 26.2031 23.7 26.1469 23.7C26.1 23.7 26.0625 23.6625 26.0625 23.625V23.6156ZM25.7156 24.0281C25.7156 23.9906 25.7531 23.9625 25.8094 23.9625C25.8656 23.9625 25.9031 23.9906 25.9031 24.0281C25.9031 24.0562 25.8094 24.1031 25.7625 24.1031C25.7062 24.1031 25.7156 24.0562 25.7156 24.0281ZM25.6781 23.5968C25.6781 23.5406 25.7063 23.5593 25.7531 23.5593C25.8 23.5593 25.8656 23.5687 25.8656 23.625C25.8656 23.6812 25.8 23.7562 25.7531 23.7562C25.7063 23.7562 25.6781 23.6437 25.6781 23.5968ZM25.3594 23.6625C25.3594 23.6156 25.3875 23.5593 25.4437 23.5593C25.5 23.5593 25.5656 23.6156 25.5656 23.6625C25.5656 23.7093 25.5188 23.7562 25.4625 23.7562C25.4063 23.7562 25.3594 23.7093 25.3594 23.6625ZM25.4156 23.2875C25.4156 23.2312 25.4438 23.2406 25.5094 23.2406C25.5656 23.2406 25.6125 23.2593 25.6125 23.3062C25.6125 23.3531 25.5469 23.4187 25.4812 23.4187C25.425 23.4187 25.4156 23.325 25.4156 23.2781V23.2875ZM25.7625 23.2406C25.7625 23.2031 25.8094 23.2125 25.8562 23.2125C25.9219 23.2125 25.9594 23.25 25.9594 23.3062C25.9594 23.3625 25.8938 23.4 25.8375 23.4C25.7813 23.4 25.7625 23.2875 25.7625 23.25V23.2406Z" fill="#04534E"/>
+<path d="M25.4062 23.2781C25.425 23.2406 25.4437 23.2125 25.4812 23.2125C25.5281 23.2125 25.5656 23.2219 25.5656 23.2781C25.5656 23.3156 25.5281 23.3625 25.4906 23.3625C25.4437 23.3625 25.3969 23.3156 25.4156 23.2688L25.4062 23.2781ZM25.35 23.6531C25.35 23.6063 25.3687 23.5594 25.4156 23.5594C25.4625 23.5594 25.5094 23.5594 25.5094 23.6063C25.5094 23.6531 25.4625 23.7094 25.4156 23.7094C25.3687 23.7094 25.35 23.7 25.35 23.6531ZM25.7625 23.25C25.7625 23.2125 25.7906 23.2125 25.8375 23.2125C25.8844 23.2125 25.9125 23.2125 25.9125 23.2594C25.9125 23.2969 25.875 23.325 25.8375 23.325C25.8 23.325 25.7625 23.2875 25.7625 23.25ZM25.6781 23.6156C25.6781 23.6625 25.725 23.7094 25.7719 23.7094C25.8187 23.7094 25.8656 23.6625 25.8656 23.6156C25.8656 23.5594 25.8094 23.5219 25.7719 23.5219C25.7344 23.5219 25.6781 23.5594 25.6781 23.6156ZM26.0812 23.5594C26.0812 23.6063 26.1187 23.6438 26.175 23.6438C26.2219 23.6438 26.2594 23.6063 26.2594 23.5594C26.2594 23.5125 26.2125 23.475 26.1656 23.475C26.1187 23.475 26.0719 23.5125 26.0719 23.5688L26.0812 23.5594ZM25.6969 24.0281C25.6969 23.9813 25.7437 23.9438 25.7812 23.9438C25.8187 23.9438 25.8656 23.9719 25.8656 24.0094C25.8656 24.0469 25.7906 24.1031 25.7531 24.1031C25.7062 24.1031 25.6969 24.0656 25.6969 24.0188V24.0281ZM26.0344 23.9625C26.0344 23.9156 26.0719 23.9063 26.1281 23.9063C26.175 23.9063 26.2031 23.9156 26.2031 23.9625C26.2031 24.0188 26.1562 24.0563 26.1094 24.0563C26.0625 24.0563 26.0344 24.0094 26.0344 23.9625Z" fill="#8CBEBF"/>
+<path d="M26.1281 23.3813C26.1281 23.3813 26.175 23.4469 26.1844 23.5031V23.6156C26.1563 23.6156 26.1281 23.5781 26.1188 23.5313C26.1094 23.4844 26.1188 23.3813 26.1188 23.3813H26.1281ZM25.8281 23.0719C25.8281 23.0719 25.8656 23.1188 25.8656 23.1656C25.8656 23.2125 25.8656 23.2594 25.8375 23.2594C25.8094 23.2594 25.8094 23.2219 25.8094 23.1844L25.8281 23.0719ZM25.4813 23.1188C25.4813 23.1188 25.5188 23.1656 25.5188 23.2125C25.5188 23.2594 25.5188 23.3063 25.4906 23.3063C25.4625 23.3063 25.4625 23.2688 25.4625 23.2313L25.4813 23.1188Z" fill="#231F20"/>
+<path d="M25.3594 23.1843L25.4531 23.2218C25.4812 23.2593 25.5 23.2968 25.4812 23.3156C25.4719 23.3343 25.4344 23.3062 25.425 23.2781L25.3594 23.1843ZM25.6219 23.5406C25.6219 23.5406 25.6875 23.5406 25.725 23.5875C25.7625 23.6156 25.8 23.6437 25.7719 23.6718C25.7531 23.6906 25.7062 23.6531 25.6781 23.625L25.6219 23.5406ZM25.3031 23.5406L25.3969 23.5687C25.425 23.5875 25.4344 23.6343 25.4156 23.6437C25.4062 23.6531 25.3781 23.6437 25.3594 23.6062L25.3031 23.5312V23.5406ZM26.0812 23.775L26.1 23.9062C26.1 23.9531 26.1094 24 26.0812 24C26.0531 24 26.0531 23.9343 26.0531 23.9062C26.0531 23.8593 26.0812 23.775 26.0812 23.775Z" fill="#231F20"/>
+<path d="M25.9969 23.8969L26.0719 23.9437C26.1 23.9625 26.1 24 26.0813 24L26.0438 23.9531C26.0274 23.935 26.0117 23.9163 25.9969 23.8969ZM25.65 23.9156L25.7344 23.9437C25.7531 23.9625 25.7625 24.0375 25.7531 24.0469C25.7531 24.0562 25.7156 24.0469 25.6969 24.0187L25.65 23.925V23.9156Z" fill="#231F20"/>
+<path d="M25.5094 22.8563C25.5094 22.8563 25.2094 22.9219 25.1532 23.1282C25.0969 23.3157 25.0875 23.5407 25.0875 23.5407L25.05 23.2875L25.1063 23.1282L25.2 22.9782L25.3313 22.8844L25.4532 22.8469L25.5094 22.8563ZM26.4657 24.0282C26.4657 24.0282 26.5032 23.9532 26.4094 23.7094C26.3157 23.475 26.1282 23.1469 26.1282 23.1469L26.2782 23.3157L26.3907 23.5032L26.4469 23.6719L26.4938 23.8313V23.9813L26.4657 24.0375V24.0282Z" fill="#04534E"/>
+<path d="M26.775 23.6438C26.775 23.6438 26.8875 23.7094 26.8968 23.7469C26.9062 23.7844 26.9156 23.8032 26.8875 23.8125C26.8593 23.8219 26.8125 23.775 26.7937 23.7469C26.7845 23.7132 26.7782 23.6786 26.775 23.6438ZM26.325 24.8438C26.325 24.8438 26.3812 24.7501 26.4468 24.7219C26.5125 24.6844 26.5593 24.6844 26.5781 24.7125C26.5968 24.7313 26.5406 24.7782 26.4843 24.7969L26.325 24.8532V24.8438ZM27.0843 25.1344C27.0843 25.1344 27.1593 25.0969 27.2062 25.0407C27.2531 24.9938 27.2625 24.9563 27.2437 24.9469C27.225 24.9188 27.1687 24.9469 27.1406 24.9938C27.1125 25.0313 27.0843 25.1344 27.0843 25.1344ZM27 25.0688C27 25.0688 27.0281 24.975 27.0562 24.9375C27.0843 24.9094 27.1125 24.8907 27.15 24.9094C27.1687 24.9282 27.15 24.9657 27.1312 24.9938C27.0902 25.0233 27.0462 25.0484 27 25.0688Z" fill="#231F20"/>
+<path d="M28.2657 24.4876C28.2657 24.4876 27.7969 23.8126 27.0657 23.7751C26.973 23.7674 26.8798 23.7784 26.7915 23.8075C26.7032 23.8366 26.6217 23.8831 26.5517 23.9444C26.4817 24.0056 26.4248 24.0802 26.3842 24.1639C26.3437 24.2475 26.3204 24.3385 26.3157 24.4313C26.3344 24.5813 26.5594 24.9188 27.3375 24.9751C28.1157 25.0313 28.2375 24.6094 28.275 24.5907C28.3032 24.5719 28.2657 24.4969 28.2657 24.4969V24.4876Z" fill="#8CBEBF"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M27.0672 23.7517C27.4396 23.7709 27.7442 23.9522 27.9548 24.1274C28.0603 24.2151 28.1427 24.3015 28.1987 24.3662C28.2267 24.3985 28.2481 24.4253 28.2626 24.4442C28.2699 24.4536 28.2754 24.4611 28.2791 24.4662C28.281 24.4687 28.2824 24.4707 28.2834 24.472L28.2845 24.4736L28.2848 24.474L28.2848 24.4741C28.2848 24.4741 28.2849 24.4742 28.2656 24.4876L28.2848 24.4741L28.2891 24.4802V24.4917C28.2901 24.4938 28.2913 24.4966 28.2927 24.4999C28.296 24.5077 28.3002 24.5187 28.3034 24.5305C28.3066 24.542 28.3094 24.5559 28.3088 24.5692C28.3082 24.5823 28.304 24.5995 28.288 24.6102L28.2874 24.6106C28.287 24.611 28.2864 24.6117 28.2855 24.613C28.283 24.6162 28.2798 24.6209 28.2756 24.6275C28.274 24.6301 28.2722 24.6329 28.2703 24.636C28.2627 24.6479 28.2531 24.6631 28.2413 24.68C28.2115 24.7227 28.1668 24.7774 28.0982 24.8296C27.9604 24.9345 27.7295 25.0269 27.3358 24.9984C26.5528 24.9418 26.3132 24.6006 26.2924 24.4342L26.2921 24.4322L26.2922 24.4301C26.2971 24.3341 26.3212 24.2401 26.3631 24.1537C26.405 24.0672 26.4639 23.99 26.5362 23.9267C26.6085 23.8634 26.6928 23.8153 26.7841 23.7853C26.8753 23.7552 26.9715 23.7438 27.0672 23.7517ZM28.2447 24.5074L28.2422 24.5025V24.4951C28.2419 24.4947 28.2416 24.4942 28.2412 24.4938C28.2377 24.489 28.2325 24.4819 28.2255 24.4728C28.2115 24.4546 28.1906 24.4284 28.1632 24.3969C28.1085 24.3337 28.028 24.2491 27.9249 24.1634C27.7184 23.9917 27.4231 23.8169 27.0644 23.7985L27.0637 23.7984C26.9742 23.791 26.8841 23.8017 26.7988 23.8298C26.7135 23.8579 26.6347 23.9028 26.5671 23.962C26.4995 24.0211 26.4445 24.0933 26.4053 24.1741C26.3664 24.2543 26.3439 24.3414 26.3391 24.4304C26.3577 24.5653 26.5697 24.8961 27.3392 24.9517C27.7237 24.9795 27.9427 24.8891 28.0698 24.7923C28.1336 24.7438 28.175 24.6931 28.2029 24.6531C28.214 24.6372 28.2229 24.6232 28.2304 24.6113C28.2324 24.6082 28.2343 24.6051 28.2361 24.6023C28.2403 24.5957 28.2444 24.5894 28.2482 24.5845C28.2509 24.5809 28.2553 24.5755 28.2613 24.5716C28.2616 24.5709 28.2619 24.5695 28.262 24.5671C28.2623 24.561 28.2609 24.5526 28.2583 24.5431C28.2557 24.5338 28.2523 24.5248 28.2494 24.518C28.248 24.5147 28.2468 24.5119 28.2459 24.5101L28.2449 24.508L28.2447 24.5075L28.2447 24.5074Z" fill="#04534E"/>
+<path d="M27.7126 24.0281C27.7126 24.0281 27.9001 24.1687 27.9938 24.2906C28.0688 24.4031 28.0876 24.4968 28.0407 24.5062C27.9938 24.525 27.5719 24.1312 27.2157 24.0468C26.8688 23.9625 26.5688 24.0468 26.5032 24.2062C26.4376 24.3656 26.4657 24.6281 26.6157 24.7312C26.7844 24.825 27.5251 24.9468 27.5251 24.9468L27.8719 24.9L28.0876 24.7781L28.1344 24.6562L28.1907 24.5062L28.2094 24.4406L28.0313 24.2531L27.7126 24.0187V24.0281Z" fill="#0C8489"/>
+<path d="M27.1125 24.1219C27.1125 24.1594 27.0656 24.1875 27.0188 24.1875C26.9719 24.1875 26.9344 24.1594 26.9344 24.1219C26.9344 24.075 26.9719 24.0375 27.0281 24.0375C27.0844 24.0375 27.1219 24.075 27.1219 24.1219H27.1125ZM26.6813 24.2719C26.6813 24.225 26.7375 24.2344 26.775 24.2344C26.8313 24.2344 26.8688 24.2625 26.8688 24.3094C26.8688 24.3562 26.7938 24.4125 26.7469 24.3937C26.6906 24.3656 26.6813 24.3187 26.6813 24.2719ZM27.15 24.525C27.15 24.4687 27.1875 24.4312 27.2438 24.4312C27.3094 24.4312 27.3563 24.4687 27.3563 24.525C27.3563 24.5812 27.2813 24.6375 27.2156 24.6375C27.15 24.6375 27.15 24.5812 27.15 24.525Z" fill="#04534E"/>
+<path d="M26.7937 24.6281C26.7937 24.5813 26.85 24.5719 26.8875 24.5719C26.9343 24.5719 26.9812 24.6188 26.9812 24.6656C26.9812 24.7125 26.9343 24.75 26.8875 24.75C26.85 24.75 26.7937 24.675 26.7937 24.6281Z" fill="#8CBEBF"/>
+<path d="M27.4219 24.7969C27.4219 24.7594 27.4406 24.7219 27.4875 24.7219C27.525 24.7219 27.5813 24.75 27.5813 24.7875C27.5813 24.825 27.5344 24.8719 27.4875 24.8719C27.4693 24.8696 27.4525 24.8607 27.4404 24.8468C27.4283 24.833 27.4217 24.8152 27.4219 24.7969ZM27.7031 24.5812C27.7031 24.5344 27.7313 24.5437 27.7781 24.5437C27.825 24.5437 27.8719 24.5625 27.8719 24.6187C27.8719 24.675 27.8156 24.6937 27.7688 24.6937C27.7219 24.6937 27.7031 24.6375 27.7031 24.5812Z" fill="#04534E"/>
+<path d="M27.0938 24.0843C27.0938 24.1218 27.075 24.1406 27.0282 24.1406C26.9813 24.1406 26.9438 24.1218 26.9438 24.0843C26.9438 24.0375 26.9625 24.0281 27 24.0281C27.0375 24.0281 27.0938 24.0375 27.0938 24.0843ZM26.8594 24.2625C26.8594 24.3093 26.7938 24.3281 26.7657 24.3281C26.7188 24.3281 26.6907 24.3093 26.6907 24.2625C26.6907 24.2156 26.7188 24.2062 26.7657 24.2062C26.8125 24.2062 26.8594 24.2156 26.8594 24.2625ZM26.9532 24.6187C26.9532 24.6562 26.9532 24.6843 26.9063 24.6843C26.8594 24.6843 26.8125 24.6562 26.8125 24.6187C26.8125 24.5812 26.8125 24.5531 26.8594 24.5531C26.9063 24.5531 26.9625 24.5812 26.9625 24.6187H26.9532ZM27.3282 24.4968C27.3282 24.5343 27.2625 24.5906 27.2157 24.5906C27.1782 24.5906 27.1594 24.5062 27.1594 24.4687C27.1594 24.4312 27.1969 24.4031 27.2344 24.4031C27.2719 24.4031 27.3282 24.4593 27.3282 24.4968ZM27.8719 24.6187C27.8719 24.6562 27.8063 24.6562 27.7782 24.6562C27.7313 24.6562 27.7032 24.6093 27.7032 24.5625C27.7032 24.525 27.7125 24.4875 27.7969 24.4968C27.8438 24.4968 27.8719 24.5718 27.8719 24.6187ZM27.5532 24.7781C27.5532 24.825 27.525 24.8531 27.4875 24.8531C27.4677 24.8531 27.4486 24.8452 27.4345 24.8311C27.4204 24.817 27.4125 24.798 27.4125 24.7781C27.4125 24.7406 27.45 24.7218 27.4875 24.7218C27.525 24.7218 27.5532 24.7406 27.5532 24.7781Z" fill="#8CBEBF"/>
+<path d="M27.6 24.5625C27.6 24.5625 27.675 24.5343 27.7406 24.5343C27.7969 24.5343 27.7969 24.5625 27.7969 24.5718C27.7969 24.5812 27.75 24.6 27.7312 24.5906C27.6874 24.5784 27.6436 24.5659 27.6 24.5531V24.5625ZM27.2906 24.825C27.2906 24.825 27.3469 24.7875 27.3937 24.7781C27.4406 24.7687 27.4781 24.7781 27.4687 24.8156C27.4687 24.8437 27.45 24.8437 27.4125 24.8437L27.2906 24.825ZM27.0844 24.3562C27.0844 24.3562 27.2156 24.4125 27.2437 24.4593C27.2719 24.5156 27.2812 24.525 27.2531 24.5437C27.225 24.5625 27.1969 24.525 27.1781 24.4968L27.0844 24.3562Z" fill="#231F20"/>
+<path d="M27.0469 24.525L27.1969 24.4968C27.2438 24.4968 27.2531 24.4968 27.2625 24.5156C27.2625 24.5343 27.2531 24.5437 27.2156 24.5437L27.0469 24.525ZM26.7281 24.525C26.7281 24.525 26.8406 24.5437 26.8688 24.5718C26.8969 24.6 26.8969 24.6281 26.8781 24.6375C26.8781 24.6562 26.8219 24.6468 26.8031 24.6375L26.7281 24.525Z" fill="#231F20"/>
+<path d="M26.7188 24.6844C26.7188 24.6844 26.7562 24.6188 26.7937 24.6094C26.8312 24.6 26.8875 24.6 26.8875 24.6188C26.8969 24.6375 26.85 24.6657 26.8219 24.6751L26.7094 24.6844H26.7188ZM26.625 24.2063L26.7375 24.2344C26.775 24.2625 26.7844 24.2907 26.775 24.3001C26.775 24.3094 26.7281 24.3188 26.7 24.3001C26.6531 24.2626 26.6344 24.2063 26.6344 24.2063H26.625ZM26.8688 23.925C26.8688 23.925 26.9813 23.9626 27.0188 24.0188C27.0563 24.0657 27.0469 24.0938 27.0281 24.1032L26.9437 24.0657C26.9156 24.0376 26.8688 23.9344 26.8688 23.9344V23.925Z" fill="#231F20"/>
+<path d="M28.125 24.7219C28.125 24.7219 27.9094 24.9094 27.4032 24.9C26.8875 24.8813 26.4282 24.6656 26.3157 24.4313L26.3625 24.5437L26.475 24.6937L26.8313 24.8812L27.2344 24.9656L27.5438 24.9844L27.8438 24.9281L28.0782 24.825L28.1157 24.7594L28.1344 24.7219H28.125ZM28.2 24.4875C28.2 24.4875 28.1157 24.375 27.9938 24.2719C27.8813 24.1594 27.4125 23.8594 27.4125 23.8594L27.7875 24.0281L28.0407 24.2344L28.2094 24.4219L28.2 24.4875Z" fill="#04534E"/>
+<path d="M28.2188 24.0375C28.2188 24.0375 28.35 24.0844 28.3688 24.1126L28.4156 24.1688C28.4156 24.1688 28.3875 24.2625 28.3594 24.225L28.2844 24.1407L28.2188 24.0375ZM28.5938 23.8313C28.5938 23.8313 28.7156 23.8782 28.7625 23.9344C28.8094 24 28.8 24.0469 28.7813 24.0563C28.7625 24.0563 28.6875 23.9907 28.6687 23.9625C28.6476 23.9184 28.6257 23.8747 28.6031 23.8313H28.5938Z" fill="#231F20"/>
+<path d="M28.725 23.8125C28.725 23.8125 28.8375 23.8875 28.8563 23.925C28.8657 23.9625 28.9032 24.0187 28.8657 24.0187C28.8375 24.0375 28.7813 23.9812 28.7719 23.9437L28.7157 23.8031L28.725 23.8125ZM29.3625 23.9531C29.3625 23.9531 29.4563 23.9906 29.4563 24.0656V24.1875L29.3907 24.1219V24.0562L29.3625 23.9625V23.9531ZM29.5313 24.0187C29.5313 24.0187 29.6063 24.0844 29.6157 24.1312C29.6157 24.1781 29.6344 24.2062 29.5875 24.225C29.55 24.225 29.5313 24.1781 29.5313 24.1312V24.0187ZM28.3782 25.425C28.3782 25.425 28.4344 25.4437 28.4907 25.425C28.5375 25.4062 28.5844 25.3594 28.575 25.3312C28.5657 25.2937 28.5375 25.2656 28.5 25.3125C28.4625 25.35 28.4813 25.3687 28.4532 25.3875L28.3875 25.4156L28.3782 25.425ZM29.0157 25.5937C29.0157 25.5937 29.1 25.575 29.1563 25.5094C29.2125 25.4531 29.2407 25.4156 29.2032 25.3969C29.1657 25.3781 29.1094 25.3969 29.1094 25.4437L29.0157 25.5937ZM29.5313 25.6031L29.6532 25.5187C29.7 25.4812 29.7188 25.4531 29.6907 25.425C29.6625 25.3781 29.6344 25.4062 29.6157 25.425L29.5969 25.4906L29.5407 25.6031H29.5313Z" fill="#231F20"/>
+<path d="M29.6907 25.6032C29.6907 25.6032 29.7657 25.5188 29.7844 25.4719C29.7938 25.425 29.8032 25.3782 29.775 25.3782C29.7375 25.3782 29.7 25.425 29.7 25.4625V25.6032H29.6907Z" fill="#231F20"/>
+<path d="M28.1157 24.7594C28.1157 24.5344 28.4438 24.0094 28.8188 24.0094C28.9688 24.0094 29.2782 24.1031 29.5219 24.2063C29.7282 24.3 29.8032 24.3938 29.9344 24.4313C30.0751 24.4688 30.2813 24.4406 30.2813 24.4406L30.7501 24.3938L30.3751 24.9281L30.2438 25.0406C30.2438 25.0406 30.1313 25.2656 29.8032 25.3969C29.4657 25.5281 28.9126 25.4344 28.6594 25.3688C28.4063 25.3031 28.0969 25.0688 28.1157 24.7594Z" fill="#8CBEBF"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M28.1942 24.557C28.1582 24.6365 28.1391 24.7079 28.1391 24.7594V24.7601L28.1391 24.7608C28.1302 24.9068 28.1986 25.0365 28.3021 25.1388C28.4057 25.2413 28.5426 25.3143 28.6653 25.3461C28.7908 25.3786 28.9909 25.4182 29.2013 25.4333C29.4124 25.4484 29.6308 25.4388 29.7946 25.3751C29.9551 25.3109 30.0624 25.2239 30.1296 25.1534C30.1631 25.1181 30.1867 25.0869 30.2017 25.0647C30.2092 25.0536 30.2146 25.0448 30.2181 25.0388C30.2198 25.0358 30.221 25.0336 30.2218 25.0321L30.2227 25.0305L30.2228 25.0302L30.225 25.0259L30.3576 24.9123L30.7015 24.4222L30.284 24.4639L30.2838 24.464L30.2819 24.4642C30.2803 24.4644 30.2779 24.4647 30.2749 24.4651C30.2688 24.4658 30.2601 24.4667 30.2491 24.4678C30.2272 24.4699 30.1965 24.4723 30.1614 24.4734C30.0916 24.4758 30.0021 24.4736 29.9284 24.4539L29.928 24.4538C29.8585 24.434 29.8042 24.3992 29.7435 24.3595C29.7411 24.3579 29.7387 24.3563 29.7363 24.3548C29.6771 24.3161 29.6097 24.2719 29.5125 24.2277C29.3915 24.1766 29.2543 24.1277 29.1287 24.0917C29.0025 24.0554 28.8903 24.0328 28.8188 24.0328C28.642 24.0328 28.4722 24.1573 28.3448 24.3148C28.2816 24.3929 28.2299 24.4779 28.1942 24.557ZM30.2781 24.4174L30.279 24.4173L30.7986 24.3654L30.3925 24.944L30.2624 25.0556C30.2615 25.0573 30.2602 25.0596 30.2586 25.0623C30.2546 25.0692 30.2487 25.0789 30.2405 25.091C30.2242 25.1151 30.1991 25.1483 30.1635 25.1857C30.0924 25.2605 29.9795 25.3516 29.8119 25.4187L29.8117 25.4187C29.638 25.4863 29.4111 25.4954 29.198 25.48C28.9842 25.4647 28.7812 25.4246 28.6536 25.3915C28.5232 25.3577 28.3788 25.2807 28.2691 25.1722C28.1595 25.0637 28.0826 24.9218 28.0922 24.7587C28.0924 24.6977 28.1144 24.6195 28.1515 24.5376C28.1889 24.4549 28.2427 24.3665 28.3084 24.2853C28.4389 24.124 28.6207 23.986 28.8188 23.986C28.8973 23.986 29.0148 24.0102 29.1417 24.0466C29.2692 24.0832 29.4084 24.1328 29.5311 24.1847L29.5316 24.1849C29.6323 24.2307 29.7023 24.2765 29.7616 24.3153C29.7641 24.317 29.7666 24.3186 29.7691 24.3203C29.8302 24.3602 29.879 24.391 29.9407 24.4087C30.0075 24.4265 30.0914 24.4289 30.1598 24.4266C30.1938 24.4254 30.2235 24.4231 30.2447 24.4211C30.2552 24.4201 30.2637 24.4192 30.2694 24.4185C30.2723 24.4182 30.2745 24.4179 30.276 24.4177L30.2776 24.4175L30.278 24.4174L30.2781 24.4174Z" fill="#04534E"/>
+<path d="M28.1156 24.7594H28.1344C28.1344 24.7125 28.1531 24.6375 28.1906 24.5625C28.2513 24.4286 28.3373 24.3076 28.4438 24.2062C28.5469 24.1125 28.6781 24.0375 28.8094 24.0375C28.8844 24.0375 28.9969 24.0562 29.1281 24.0937C29.2593 24.128 29.3878 24.1718 29.5125 24.225C29.6063 24.2719 29.6813 24.3187 29.7375 24.3656C29.8031 24.4031 29.8594 24.4406 29.925 24.4594C29.9866 24.4726 30.0495 24.4789 30.1125 24.4781L30.2813 24.4687L30.6938 24.4219L30.3563 24.9094L30.225 25.0219V25.0312C30.1244 25.192 29.9724 25.3143 29.7938 25.3781C29.6719 25.4156 29.5313 25.4344 29.3719 25.4344C29.1094 25.4344 28.8188 25.3875 28.6594 25.3406C28.5254 25.3073 28.4026 25.2394 28.3031 25.1437C28.2516 25.0955 28.2102 25.0375 28.1813 24.9731C28.1523 24.9087 28.1364 24.8393 28.1344 24.7687H28.0875C28.0875 24.9281 28.1625 25.0687 28.275 25.1812C28.3792 25.2845 28.5084 25.3588 28.65 25.3969C28.8094 25.4344 29.1 25.4906 29.3719 25.4906C29.5214 25.494 29.6705 25.4718 29.8125 25.425C30.0044 25.3568 30.1667 25.2243 30.2719 25.05H30.2438L30.2625 25.0594L30.3938 24.9375L30.7969 24.3562L30.2719 24.4219H30.2625C30.1563 24.431 30.0493 24.4278 29.9438 24.4125C29.8788 24.3932 29.8183 24.3614 29.7656 24.3187C29.7094 24.2812 29.6344 24.225 29.5313 24.1875C29.4038 24.1306 29.2722 24.0835 29.1375 24.0469C29.0156 24.0094 28.8938 23.9906 28.8188 23.9906H28.8094C28.7156 23.9906 28.6219 24.0187 28.5281 24.0844C28.4025 24.17 28.2969 24.282 28.2188 24.4125C28.1477 24.5158 28.1027 24.6348 28.0875 24.7594H28.1156Z" fill="#04534E"/>
+<path d="M30.375 24.8344C30.3375 24.8625 30.2813 24.8625 30.2438 24.8625C30.1969 24.8625 29.1563 24.2344 28.8375 24.2625C28.5094 24.2906 28.2 24.4219 28.1907 24.7594C28.1907 25.0875 28.2657 25.0875 28.3313 25.1813C28.3969 25.275 29.0344 25.4156 29.0344 25.4156H29.4188L29.7282 25.3781L30.0094 25.2281L30.15 25.1063L30.2532 24.9844L30.375 24.8344Z" fill="#0C8489"/>
+<path d="M28.7344 24.6563C28.7344 24.7313 28.7062 24.7782 28.6406 24.7782C28.5844 24.7782 28.5375 24.75 28.5375 24.6844C28.5375 24.6188 28.575 24.5907 28.6312 24.5907C28.6969 24.5907 28.725 24.6 28.725 24.6657L28.7344 24.6563ZM28.8375 24.375C28.8375 24.3188 28.8937 24.3 28.95 24.3C29.0156 24.3 29.0625 24.3188 29.0625 24.375C29.0625 24.4313 29.0156 24.4688 28.95 24.4688C28.8937 24.4688 28.8375 24.4313 28.8375 24.375ZM29.4656 24.5438C29.4656 24.4969 29.5031 24.4594 29.5594 24.4594C29.6062 24.4594 29.6437 24.4969 29.6437 24.5532C29.6437 24.6094 29.6062 24.6282 29.55 24.6282C29.5267 24.6283 29.5041 24.6197 29.4868 24.6041C29.4695 24.5885 29.4586 24.567 29.4562 24.5438H29.4656ZM29.5875 24.9188C29.5875 24.8625 29.6344 24.825 29.6812 24.825C29.7375 24.825 29.7937 24.8438 29.7937 24.9C29.7937 24.9563 29.775 25.0219 29.7187 25.0219C29.6625 25.0219 29.5875 24.9844 29.5875 24.9282V24.9188ZM29.2875 25.1719C29.2875 25.1157 29.3344 25.0782 29.3812 25.0782C29.4469 25.0782 29.4937 25.1157 29.4937 25.1719C29.4937 25.2188 29.4469 25.2563 29.4 25.2563C29.3344 25.2563 29.2875 25.2188 29.2875 25.1625V25.1719ZM28.725 25.0782C28.725 25.0219 28.7531 24.9844 28.8094 24.9844C28.8234 24.9798 28.8384 24.9786 28.8531 24.9809C28.8677 24.9831 28.8816 24.9889 28.8936 24.9975C28.9056 25.0062 28.9154 25.0177 28.9221 25.0309C28.9289 25.0441 28.9324 25.0587 28.9324 25.0735C28.9324 25.0883 28.9289 25.1029 28.9221 25.1161C28.9154 25.1293 28.9056 25.1407 28.8936 25.1494C28.8816 25.1581 28.8677 25.1638 28.8531 25.1661C28.8384 25.1684 28.8234 25.1672 28.8094 25.1625C28.7845 25.1625 28.7606 25.1527 28.7431 25.1351C28.7255 25.1175 28.7156 25.0937 28.7156 25.0688L28.725 25.0782Z" fill="#04534E"/>
+<path d="M28.725 24.6562C28.725 24.7031 28.6875 24.75 28.6312 24.75C28.6064 24.75 28.5825 24.7401 28.5649 24.7225C28.5474 24.7049 28.5375 24.6811 28.5375 24.6562C28.5375 24.6 28.575 24.5812 28.6312 24.5812C28.6875 24.5812 28.725 24.6 28.725 24.6468V24.6562ZM29.0344 24.3562C29.0344 24.4031 29.0156 24.4406 28.9594 24.4406C28.9125 24.4406 28.8375 24.4031 28.8375 24.3562C28.8375 24.3093 28.8844 24.2625 28.9312 24.2625C28.9875 24.2625 29.025 24.3093 29.025 24.3562H29.0344ZM29.6344 24.5156C29.6344 24.5625 29.5969 24.6 29.5406 24.6C29.4844 24.6 29.4562 24.5625 29.4562 24.5156C29.4562 24.4781 29.4937 24.4406 29.55 24.4406C29.6062 24.4406 29.6344 24.4781 29.6344 24.5156Z" fill="#8CBEBF"/>
+<path d="M29.3156 24.7687C29.3156 24.8344 29.2875 24.8812 29.2219 24.8812C29.1656 24.8812 29.1188 24.8531 29.1188 24.7875C29.1188 24.7219 29.1469 24.6937 29.2125 24.6937C29.2781 24.6937 29.3063 24.7125 29.3063 24.7687H29.3156Z" fill="#04534E"/>
+<path d="M28.875 25.05C28.875 25.0969 28.8375 25.1438 28.7812 25.1438C28.725 25.1438 28.6875 25.0969 28.6875 25.05C28.6875 25.0032 28.7438 24.975 28.8 24.975C28.8563 24.975 28.875 25.0032 28.875 25.05ZM29.2969 24.7688C29.2969 24.7937 29.287 24.8175 29.2694 24.8351C29.2518 24.8527 29.228 24.8625 29.2031 24.8625C29.1783 24.8625 29.1544 24.8527 29.1368 24.8351C29.1193 24.8175 29.1094 24.7937 29.1094 24.7688C29.1094 24.7439 29.1193 24.7201 29.1368 24.7025C29.1544 24.6849 29.1783 24.675 29.2031 24.675C29.228 24.675 29.2518 24.6849 29.2694 24.7025C29.287 24.7201 29.2969 24.7439 29.2969 24.7688ZM29.7844 24.8907C29.7844 24.9469 29.7563 24.9844 29.6906 24.9844C29.6344 24.9844 29.5875 24.9469 29.5875 24.8907C29.5875 24.8344 29.6062 24.8157 29.6625 24.8157C29.7187 24.8157 29.7844 24.8344 29.7844 24.8907ZM29.475 25.1438C29.475 25.2 29.4375 25.2375 29.3812 25.2375C29.325 25.2375 29.2781 25.2 29.2781 25.1438C29.2781 25.0969 29.325 25.0688 29.3719 25.0688C29.4281 25.0688 29.4656 25.0969 29.4656 25.1438H29.475Z" fill="#8CBEBF"/>
+<path d="M29.5125 24.8438C29.5125 24.8438 29.6625 24.825 29.6906 24.8438C29.7187 24.8813 29.7187 24.9188 29.7 24.9375C29.6906 24.9375 29.625 24.9469 29.6062 24.9281C29.6062 24.9 29.5125 24.8344 29.5125 24.8344V24.8438ZM29.3531 24.3375C29.3531 24.3375 29.475 24.3656 29.5219 24.4219C29.5687 24.4688 29.5594 24.5156 29.5594 24.525C29.5406 24.5344 29.5031 24.5438 29.4656 24.5063L29.3531 24.3375ZM29.0062 24.5813C29.0062 24.5813 29.1469 24.6563 29.175 24.7031C29.2031 24.7406 29.2125 24.7781 29.1937 24.7969C29.1844 24.8156 29.1187 24.7969 29.1 24.7688C29.1 24.7406 29.0062 24.5813 29.0062 24.5813Z" fill="#231F20"/>
+<path d="M28.9407 24.6844C28.9407 24.6844 29.1 24.7031 29.1282 24.7312C29.175 24.7687 29.2032 24.7687 29.2032 24.7875C29.2032 24.8156 29.175 24.825 29.1563 24.825C29.1163 24.8163 29.0781 24.8004 29.0438 24.7781L28.95 24.6844H28.9407ZM28.7625 24.2344C28.7625 24.2344 28.9219 24.2531 28.95 24.2812C28.9875 24.3094 28.9969 24.375 28.9594 24.3938C28.9219 24.4125 28.8844 24.375 28.8657 24.3469C28.8381 24.3065 28.8067 24.2688 28.7719 24.2344H28.7625ZM28.425 24.4688C28.425 24.4688 28.5657 24.5437 28.6125 24.6C28.6407 24.6375 28.6594 24.6656 28.6125 24.6937C28.575 24.6937 28.5282 24.6281 28.5282 24.6C28.4982 24.5529 28.4637 24.509 28.425 24.4688Z" fill="#231F20"/>
+<path d="M28.3875 24.6562L28.5281 24.6375C28.575 24.6375 28.6406 24.6281 28.6406 24.6562C28.6406 24.6937 28.5843 24.7031 28.5468 24.6937L28.3875 24.6562ZM29.1937 25.1812C29.1937 25.1812 29.2968 25.1156 29.3531 25.125C29.4 25.1344 29.4187 25.1344 29.4187 25.1625C29.4187 25.2 29.3531 25.1906 29.3343 25.1906L29.1937 25.1812ZM28.6312 25.0969C28.6312 25.0969 28.6687 25.0406 28.7156 25.0312C28.7531 25.0312 28.7718 25.0312 28.7812 25.05C28.7812 25.0687 28.7437 25.1062 28.725 25.1062H28.6312V25.0969Z" fill="#231F20"/>
+<path d="M30.2438 24.9938C30.2438 24.9938 30.0938 25.1813 29.8688 25.275C29.6568 25.3684 29.424 25.404 29.1938 25.3782C28.9944 25.3749 28.7979 25.3298 28.6171 25.2459C28.4362 25.1619 28.275 25.0409 28.1438 24.8907L28.1813 24.9938L28.3688 25.2375L28.5844 25.3313L28.9125 25.425L29.2219 25.4532H29.4563L29.7375 25.4063L29.9157 25.3407L30.0375 25.2657L30.1313 25.1907L30.2438 25.0032V24.9938ZM29.9625 24.4407C29.9625 24.4407 29.8688 24.4688 29.6813 24.3563C29.4938 24.2438 29.2782 24.0938 28.8563 24.0938C28.4344 24.0938 28.3032 24.375 28.275 24.3938L28.4625 24.15L28.65 24.0469L28.8094 24.0188H28.95L29.1375 24.075L29.2969 24.1313L29.4938 24.1969L29.6625 24.2907L29.8688 24.3938L29.9625 24.4407ZM30.525 24.5719H30.2063C30.1313 24.5719 30.1313 24.5907 30.1125 24.6094C30.107 24.6223 30.1007 24.6348 30.0938 24.6469L30.0188 24.4875L30.3469 24.4407L30.5344 24.5063L30.5157 24.5625L30.525 24.5719Z" fill="#04534E"/>
+<path d="M30.0656 26.2875C30.0843 26.3344 30.1218 26.3813 30.1687 26.3813H30.3187L30.6562 26.3531L30.7687 26.2219L30.8437 25.9219L30.9375 25.8094L31.2468 25.6313L31.5093 25.5563L31.6875 25.5375L31.9218 25.4625L32.1 25.3688L32.175 25.2563L32.25 25.0875L32.175 24.8531L31.9875 24.6L31.6687 24.4781H31.4062L31.125 24.5813L30.6093 24.7031C30.6093 24.7031 30.3281 24.825 30.2062 25.05C30.0843 25.2656 30.0937 25.3313 30.0656 25.6125C30.0468 25.9125 30.0656 26.2875 30.0656 26.2875Z" fill="#0C8489"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M31.402 24.4547H31.673L32.0022 24.5806L32.1961 24.8423L32.275 25.0889L32.1956 25.2676L32.1162 25.3867L31.9309 25.4842L31.6923 25.5606L31.5138 25.5794L31.256 25.653L30.9528 25.8276L30.8651 25.9328L30.7901 26.233L30.6677 26.3757L30.3197 26.4047H30.1687C30.137 26.4047 30.1103 26.3888 30.09 26.3685C30.0697 26.3482 30.0541 26.3219 30.0438 26.2962L30.0656 26.2875L30.0422 26.2887L30.0421 26.2876L30.042 26.2843L30.0414 26.2719C30.0409 26.261 30.0403 26.2451 30.0395 26.2251C30.0381 26.1851 30.0363 26.1287 30.0351 26.0629C30.0328 25.9315 30.0328 25.762 30.0422 25.6111L30.0422 25.6102C30.0459 25.5741 30.0489 25.5414 30.0516 25.5114C30.0595 25.4255 30.0654 25.3612 30.0778 25.3019C30.0949 25.2203 30.1241 25.1477 30.1857 25.0387C30.2492 24.9216 30.3534 24.8324 30.4402 24.7729C30.4839 24.743 30.5236 24.7203 30.5525 24.705C30.567 24.6973 30.5787 24.6916 30.5869 24.6877C30.591 24.6857 30.5943 24.6842 30.5965 24.6832L30.599 24.6821L30.5997 24.6818L30.5999 24.6817C30.5999 24.6817 30.6 24.6816 30.6093 24.7031L30.6 24.6816L30.6019 24.6808L31.1182 24.5588L31.402 24.4547ZM30.6169 24.7255L30.6158 24.7259C30.6139 24.7268 30.6109 24.7282 30.6071 24.73C30.5994 24.7336 30.5883 24.7391 30.5744 24.7464C30.5468 24.761 30.5086 24.7829 30.4667 24.8115C30.3825 24.8692 30.2852 24.9534 30.2268 25.0612L30.2266 25.0616C30.1664 25.1681 30.1394 25.2361 30.1237 25.3115C30.1119 25.368 30.1063 25.4285 30.0986 25.5131C30.0958 25.5435 30.0927 25.5769 30.0889 25.6144C30.0797 25.7634 30.0796 25.9312 30.082 26.0621C30.0832 26.1276 30.0849 26.1837 30.0864 26.2234C30.0871 26.2432 30.0878 26.259 30.0882 26.2698L30.0888 26.2821L30.0888 26.2824C30.0972 26.3023 30.1092 26.3214 30.1232 26.3354C30.138 26.3503 30.1535 26.3578 30.1687 26.3578H30.3177L30.6447 26.3306L30.7473 26.2108L30.8223 25.911L30.9221 25.7912L31.2376 25.6095L31.5049 25.5332L31.6826 25.5145L31.9127 25.4408L32.0838 25.3508L32.1544 25.2449L32.2249 25.0862L32.1538 24.864L31.9727 24.6195L31.6644 24.5016H31.4104L31.1317 24.6038L30.6169 24.7255Z" fill="#04534E"/>
+<path d="M30.2062 26.175C30.3 26.175 30.225 26.0156 30.3375 25.8188C30.45 25.6313 30.5812 25.3875 30.6187 25.3875C30.6562 25.3875 30.6562 25.425 30.7031 25.4156C30.7406 25.3969 30.8156 25.3406 30.8156 25.3219C30.8156 25.3031 30.8156 25.2 30.9094 25.1344C30.9844 25.0594 31.1062 24.9563 31.1625 24.9469C31.2187 24.9375 31.2562 24.9188 31.2562 24.9469C31.2656 24.975 31.2281 25.0125 31.2656 25.0219C31.3031 25.0406 31.3969 25.0313 31.4156 24.975L31.4344 24.8813C31.4344 24.8813 31.4906 24.8344 31.6031 24.8531C31.7156 24.8813 31.725 24.8719 31.7344 24.9188C31.7437 24.9563 31.6875 24.9656 31.6969 24.9938V25.05C31.7156 25.0688 31.7344 25.1438 31.8094 25.1438C31.8844 25.1344 31.9125 25.0875 31.9125 25.0875L31.9406 25.05C31.9406 25.05 31.9594 25.0031 31.9312 24.9844C31.9031 24.9656 31.9125 24.9469 31.9312 24.9563C31.9687 24.9656 32.0812 25.125 32.1187 25.0594C32.1562 24.9938 32.1656 24.9 32.1375 24.8719C32.0766 24.7886 32.0172 24.7042 31.9594 24.6188L31.6781 24.525L31.3031 24.5531L30.9281 24.7594L30.5906 24.9469C30.5906 24.9469 30.5719 25.2188 30.5156 25.1625C30.45 25.1156 30.3656 24.975 30.3375 25.0219C30.3094 25.0688 30.2531 25.275 30.2156 25.3781C30.1875 25.4719 30.0844 25.7906 30.0937 25.9031C30.1031 26.0156 30.1687 26.175 30.2062 26.175Z" fill="#8CBEBF"/>
+<path d="M30.5438 25.725C30.5156 25.725 30.4781 25.7531 30.4688 25.7718C30.45 25.7906 30.4406 25.8187 30.45 25.8656C30.45 25.8937 30.5156 25.9312 30.5156 25.9312H30.5625L30.6563 25.9031L30.6844 25.8281C30.6844 25.7812 30.6563 25.7718 30.6469 25.7718C30.6122 25.7569 30.5778 25.7413 30.5438 25.725ZM31.125 25.2562C31.0688 25.2281 31.05 25.2656 31.0313 25.2843V25.3312C31.0313 25.3312 31.05 25.4062 31.0688 25.425C31.0969 25.425 31.1719 25.4531 31.1906 25.425C31.2188 25.4062 31.2375 25.3875 31.2375 25.3406C31.2375 25.2937 31.1719 25.275 31.1719 25.275L31.125 25.2468V25.2562ZM31.5938 25.3593C31.5938 25.3406 31.5469 25.3312 31.5094 25.3406C31.4813 25.3406 31.4438 25.3781 31.4531 25.4343C31.4719 25.5 31.5281 25.5 31.5656 25.4906C31.6125 25.4812 31.6031 25.4156 31.6031 25.4062L31.5938 25.3593ZM30.2438 25.4531C30.2438 25.4812 30.2906 25.5468 30.3563 25.5375C30.3827 25.5361 30.4079 25.5263 30.4282 25.5094C30.4485 25.4925 30.4627 25.4694 30.4688 25.4437C30.4688 25.4062 30.4313 25.4718 30.375 25.4906C30.3188 25.5093 30.3094 25.5093 30.2813 25.4906C30.2625 25.4531 30.2438 25.4531 30.2438 25.4531Z" fill="#8CBEBF"/>
+<path d="M30.6843 25.8281C30.6843 25.8281 30.6843 25.8844 30.6468 25.9219C30.6 25.95 30.5718 25.95 30.5531 25.95C30.525 25.95 30.4968 25.95 30.4781 25.9219L30.45 25.8562C30.45 25.8562 30.4968 25.9312 30.5718 25.9125C30.6189 25.9 30.6592 25.8698 30.6843 25.8281ZM31.9312 25.05C31.9312 25.05 31.9312 25.1063 31.8843 25.1344C31.8375 25.1625 31.8187 25.1625 31.7906 25.1625C31.7718 25.1625 31.7343 25.1531 31.725 25.125C31.6687 25.0312 31.6968 24.9844 31.6968 24.9844C31.6968 24.9844 31.7343 25.1344 31.8187 25.125C31.8642 25.1149 31.9043 25.0881 31.9312 25.05ZM30.8156 25.3219C30.8156 25.3219 30.7781 25.4344 30.7031 25.4344C30.6187 25.4344 30.6281 25.4156 30.6375 25.3969C30.6375 25.3875 30.6656 25.4156 30.7031 25.3969C30.7406 25.3969 30.8156 25.3219 30.8156 25.3219ZM31.0312 25.2937C31.0312 25.2937 31.0312 25.3875 31.05 25.4062C31.0781 25.4438 31.1156 25.4531 31.1437 25.4531C31.1718 25.4531 31.2 25.4531 31.2281 25.4156C31.2562 25.3781 31.2375 25.3406 31.2375 25.3406L31.2187 25.3875C31.1906 25.4156 31.1718 25.4156 31.1437 25.4156C31.1156 25.4156 31.0781 25.4156 31.0687 25.3875L31.0312 25.2937ZM31.4343 24.8906C31.4343 24.8906 31.4531 24.9563 31.4062 25.0031C31.3593 25.0594 31.2656 25.0219 31.2656 25.0219C31.2656 25.0219 31.3406 25.05 31.3781 25.0031C31.4156 24.9656 31.4343 24.8906 31.4343 24.8906Z" fill="#04534E"/>
+<path d="M30.1594 26.3531C30.1594 26.3531 30.6563 26.3531 30.6938 26.2781C30.7313 26.2125 30.6563 25.9406 30.9469 25.7344C31.2469 25.5281 31.4813 25.5281 31.6407 25.5188C31.8 25.5 32.1375 25.3969 32.2032 25.0969C32.2313 24.9094 31.9875 24.8906 31.8938 24.7219C31.8 24.5344 31.5563 24.6094 31.5375 24.6094C31.5282 24.6094 31.2563 24.6094 31.1344 24.7313C31.05 24.8063 31.0594 24.9 31.0313 24.9375C30.9938 24.9844 30.6563 24.9375 30.6282 24.9938C30.5907 25.05 30.6375 25.1531 30.6094 25.1813C30.5907 25.2094 30.5157 25.1063 30.5157 25.1063L30.5344 24.8438L30.9563 24.6L31.425 24.3375L31.7532 24.3469L32.0813 24.5156L32.2407 24.7031C32.2407 24.7031 32.2688 24.7781 32.2875 24.9188C32.2933 24.9819 32.287 25.0455 32.2688 25.1063C32.1938 25.3688 31.9219 25.5563 31.6407 25.575C31.4048 25.5926 31.1781 25.6736 30.9844 25.8094C30.8532 25.9031 30.7875 26.3063 30.7875 26.3625C30.7875 26.4094 30.1688 26.3719 30.1688 26.3719V26.3531H30.1594Z" fill="#04534E"/>
+<path d="M30.375 25.3875C30.3468 25.4156 30.3093 25.4062 30.3 25.3875C30.2812 25.2937 30.3281 25.1813 30.3281 25.1813V25.3313C30.3375 25.35 30.3656 25.3406 30.375 25.3594V25.3875ZM30.675 25.3313C30.6562 25.3219 30.6656 25.2375 30.675 25.2094C30.6937 25.1812 30.8343 25.0781 30.8343 25.0781L30.7781 25.2188C30.7593 25.2562 30.7125 25.3406 30.6843 25.3313H30.675ZM30.5625 25.8281C30.5343 25.8281 30.5343 25.7906 30.5343 25.7344C30.5343 25.6781 30.6281 25.5844 30.6281 25.5844L30.5906 25.6969L30.6093 25.7906C30.6093 25.8188 30.5812 25.8281 30.5625 25.8281Z" fill="#231F20"/>
+<path d="M30.7875 25.6875C30.7875 25.6875 30.7406 25.7438 30.6937 25.7719C30.6469 25.8 30.5906 25.8375 30.5625 25.8281C30.525 25.8281 30.5719 25.7531 30.5906 25.7438L30.7875 25.6875ZM31.2094 25.0875C31.2094 25.0875 31.1531 25.1344 31.125 25.2C31.0969 25.2656 31.0875 25.3219 31.1156 25.3313C31.1437 25.35 31.1812 25.2563 31.1906 25.2281L31.2094 25.0875Z" fill="#231F20"/>
+<path d="M31.3688 25.3031C31.3688 25.3031 31.3219 25.2656 31.2563 25.2469C31.1813 25.2281 31.1625 25.2469 31.1438 25.2656C31.1438 25.2844 31.0875 25.3125 31.1157 25.3313C31.1344 25.35 31.1719 25.3031 31.1907 25.3031C31.2094 25.2938 31.2375 25.275 31.275 25.2844L31.3688 25.3031ZM31.275 24.8813C31.3032 24.9094 31.3407 24.8625 31.3688 24.825C31.4063 24.7875 31.4344 24.7125 31.4344 24.7125L31.3407 24.7781C31.3032 24.8063 31.2563 24.8719 31.275 24.8813ZM31.9219 24.8719C31.9219 24.8719 31.8282 24.9094 31.8094 24.9469C31.7813 24.9844 31.7438 25.0219 31.7719 25.0406C31.8 25.0688 31.8282 25.0219 31.8469 24.9938L31.9219 24.8719ZM31.7344 25.3031C31.7344 25.3031 31.7063 25.3594 31.65 25.3969C31.6032 25.4344 31.5375 25.4438 31.5282 25.425C31.5188 25.4063 31.5375 25.3688 31.5563 25.3594L31.6313 25.3406C31.6666 25.3309 31.7011 25.3184 31.7344 25.3031Z" fill="#231F20"/>
+<path d="M27.4683 24.2811C27.6168 24.3038 27.7644 24.1438 27.7981 23.9237C27.8317 23.7036 27.7387 23.5068 27.5903 23.4841C27.4419 23.4614 27.2942 23.6214 27.2606 23.8415C27.2269 24.0616 27.3199 24.2584 27.4683 24.2811Z" fill="url(#paint0_radial_1_38536)"/>
+<path d="M27.6938 23.1562L27.5344 23.55L27.6657 23.5312L27.7313 23.175L27.6938 23.1562Z" fill="#FCCA3E"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M27.6865 23.1368L27.747 23.1671L27.6777 23.5437L27.5122 23.5674L27.6865 23.1368ZM27.7011 23.1756L27.5566 23.5326L27.6537 23.5187L27.7155 23.1828L27.7011 23.1756Z" fill="#AA8C30"/>
+<path d="M27.7594 22.9781C27.7031 22.9781 27.6562 23.0156 27.6469 23.0719C27.6469 23.1375 27.6844 23.1938 27.7406 23.2031C27.7969 23.2031 27.8437 23.1656 27.8531 23.1094C27.8531 23.0438 27.825 22.9875 27.7594 22.9781Z" fill="#FCCA3E"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M27.6376 23.0703C27.6477 23.0093 27.6987 22.9688 27.7593 22.9688H27.76L27.7607 22.9688C27.7962 22.9739 27.822 22.9919 27.8387 23.0175C27.8552 23.0429 27.8625 23.0754 27.8625 23.1094V23.1102L27.8623 23.1109C27.8522 23.1719 27.8012 23.2125 27.7406 23.2125H27.7398L27.739 23.2124C27.6769 23.202 27.6375 23.1405 27.6375 23.0719V23.0711L27.6376 23.0703ZM27.6562 23.0727C27.6565 23.1346 27.6916 23.185 27.7414 23.1937C27.7926 23.1934 27.8349 23.1594 27.8437 23.1086C27.8436 23.0773 27.8368 23.0491 27.823 23.0278C27.8093 23.0067 27.7884 22.9919 27.7587 22.9875C27.7073 22.9878 27.665 23.0218 27.6562 23.0727Z" fill="#AA8C30"/>
+<path d="M34.6594 23.9812L34.2656 24.3562L34.425 24.3937L34.6969 24.0375L34.6594 23.9812Z" fill="#FCCA3E"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M34.6617 23.9595L34.7141 24.038L34.4306 24.4095L34.2371 24.3639L34.6617 23.9595ZM34.2941 24.3485L34.4193 24.3779L34.6796 24.0369L34.6569 24.0029L34.2941 24.3485Z" fill="#AA8C30"/>
+<path d="M34.8376 23.8218C34.8051 23.805 34.7674 23.8015 34.7324 23.812C34.6974 23.8225 34.6679 23.8462 34.6501 23.8781C34.6032 23.9437 34.6219 24.0187 34.6876 24.0656C34.7532 24.0937 34.8376 24.0656 34.8751 23.9999C34.9126 23.9437 34.8938 23.8593 34.8376 23.8218Z" fill="#FCCA3E"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M34.7297 23.8031C34.767 23.7919 34.8073 23.7957 34.8419 23.8136L34.8428 23.8141L34.8427 23.8141C34.903 23.8543 34.9233 23.9442 34.883 24.005C34.8431 24.0744 34.7539 24.1043 34.6838 24.0743L34.6829 24.0739L34.6821 24.0733C34.6477 24.0487 34.625 24.0164 34.6174 23.9809C34.6098 23.9455 34.6175 23.9078 34.6421 23.8731C34.6611 23.8393 34.6925 23.8142 34.7297 23.8031ZM34.8328 23.83C34.8026 23.8145 34.7676 23.8113 34.7351 23.821C34.7024 23.8308 34.6749 23.853 34.6582 23.8827L34.6577 23.8836L34.6577 23.8836C34.6356 23.9145 34.6293 23.947 34.6358 23.977C34.6422 24.0069 34.6614 24.0352 34.6922 24.0574C34.7531 24.083 34.8319 24.0567 34.8669 23.9954L34.8672 23.9948L34.8672 23.9948C34.9016 23.9432 34.8846 23.8649 34.8328 23.83Z" fill="#AA8C30"/>
+<path d="M24.6375 21.8437L24.8437 22.3031L24.9375 22.1718L24.6937 21.825L24.6375 21.8437Z" fill="#FCCA3E"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M24.6992 21.8083L24.9547 22.1719L24.8409 22.3312L24.6183 21.8353L24.6992 21.8083ZM24.6567 21.8522L24.8465 22.275L24.9203 22.1718L24.6882 21.8417L24.6567 21.8522Z" fill="#AA8C30"/>
+<path d="M24.5531 21.6469C24.4968 21.6844 24.4968 21.7688 24.5437 21.8251C24.5812 21.8813 24.6656 21.8907 24.7125 21.8438C24.7687 21.7969 24.7687 21.7219 24.7218 21.6563C24.7004 21.6332 24.6708 21.6194 24.6393 21.6176C24.6079 21.6159 24.577 21.6264 24.5531 21.6469Z" fill="#FCCA3E"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M24.5475 21.6394C24.5732 21.6175 24.6063 21.6064 24.64 21.6082C24.6738 21.6101 24.7057 21.625 24.7288 21.6499L24.7296 21.6508L24.7296 21.6508C24.7539 21.685 24.7665 21.7221 24.7653 21.7574C24.764 21.7927 24.7488 21.8256 24.7189 21.8507C24.6677 21.9015 24.577 21.8911 24.5363 21.8307C24.5116 21.8009 24.4992 21.7636 24.5005 21.7286C24.5017 21.6935 24.5168 21.6602 24.5475 21.6394ZM24.5532 21.6469L24.5584 21.6547C24.5332 21.6715 24.5203 21.6989 24.5192 21.7293C24.5181 21.7597 24.529 21.7926 24.551 21.819L24.5517 21.8198L24.5516 21.8198C24.586 21.8714 24.6634 21.8797 24.7059 21.8372L24.7065 21.8366L24.7066 21.8366C24.7326 21.8149 24.7455 21.7869 24.7465 21.7567C24.7476 21.7265 24.7369 21.6936 24.7147 21.6622C24.6949 21.6412 24.6678 21.6286 24.6389 21.627C24.6099 21.6253 24.5813 21.635 24.5593 21.654L24.5532 21.6469Z" fill="#AA8C30"/>
+<path d="M27.8062 22.9969C27.8062 22.9969 27.8344 23.0063 27.8062 22.9969C27.7594 22.9969 27.675 23.0344 27.675 23.0906C27.675 23.1155 27.6849 23.1394 27.7024 23.1569C27.72 23.1745 27.7439 23.1844 27.7687 23.1844C27.8156 23.1844 27.75 23.2031 27.75 23.2031L27.6844 23.1844L27.6656 23.1469L27.6469 23.1L27.6562 23.0438L27.6937 22.9969L27.7406 22.9781H27.7687L27.8062 22.9969Z" fill="#AA8C30"/>
+<path d="M27.7125 23.2594C27.7125 23.2594 27.6844 23.2594 27.6656 23.2875C27.6442 23.3222 27.6223 23.3566 27.6 23.3907L27.6937 23.175L27.7312 23.1938L27.7125 23.2594ZM34.875 23.8594C34.875 23.8594 34.9031 23.8969 34.8656 23.8594C34.8281 23.8313 34.6968 23.8407 34.6687 23.9063C34.6312 23.9813 34.6687 24.0376 34.725 24.0657C34.7812 24.0844 34.7062 24.0657 34.7062 24.0657L34.6406 24.0188L34.6312 23.9625V23.8969L34.6781 23.8407L34.7437 23.8125H34.8094L34.8375 23.8313L34.875 23.8594Z" fill="#AA8C30"/>
+<path d="M34.6312 24.1219C34.6312 24.1219 34.6031 24.1032 34.5563 24.1219L34.425 24.2063L34.6406 24L34.6875 24.0563L34.6312 24.1219ZM24.6 21.6188C24.6 21.6188 24.6375 21.6094 24.6 21.6282C24.5531 21.6563 24.525 21.7594 24.5719 21.8157C24.6281 21.8625 24.6937 21.8532 24.7312 21.8157C24.7687 21.7688 24.7312 21.8344 24.7312 21.8344L24.6656 21.8719H24.6094L24.5531 21.8438L24.5156 21.7875V21.7125L24.5344 21.6657L24.5625 21.6375L24.5906 21.6188H24.6Z" fill="#AA8C30"/>
+<path d="M24.75 21.9188C24.75 21.9188 24.7219 21.9281 24.7312 21.975L24.7594 22.1156L24.6469 21.8625L24.7125 21.8438L24.75 21.9188Z" fill="#AA8C30"/>
+<path d="M24.8502 22.8368C24.9587 23.0488 25.1624 23.1614 25.3053 23.0883C25.4482 23.0152 25.4761 22.784 25.3676 22.572C25.2591 22.36 25.0553 22.2474 24.9124 22.3205C24.7695 22.3936 24.7417 22.6248 24.8502 22.8368Z" fill="url(#paint1_radial_1_38536)"/>
+<path d="M24.6187 22.6125C24.6187 22.6125 24.7124 22.6312 24.7593 22.6125C24.8062 22.5937 24.8156 22.5469 24.8249 22.5375C24.8343 22.5281 24.8531 22.4812 24.8437 22.4437C24.8229 22.3934 24.7908 22.3485 24.7499 22.3125L24.6562 22.3031C24.6468 22.2937 24.6562 22.2656 24.6374 22.2562C24.6093 22.2562 24.4781 22.4062 24.4968 22.425C24.5249 22.4531 24.5343 22.425 24.5437 22.4344V22.5375C24.5437 22.5656 24.6187 22.6125 24.6187 22.6125Z" fill="#E92736"/>
+<path d="M24.7501 22.3218C24.7594 22.35 24.8157 22.4156 24.8344 22.4156C24.8532 22.4343 24.9094 22.4343 24.9282 22.4156C24.9563 22.4156 25.0219 22.35 25.0219 22.3218C25.0241 22.2995 25.0209 22.277 25.0126 22.2562C24.9938 22.2281 25.0032 22.1625 24.9751 22.1531C24.9563 22.1531 24.9469 22.1437 24.9282 22.125V22.0593C24.9001 22.0312 24.6844 22.1625 24.7032 22.1906C24.7219 22.2093 24.7407 22.1906 24.7501 22.2V22.3218Z" fill="#E92736"/>
+<path d="M25.2375 22.275C25.2563 22.2375 25.2469 22.1344 25.2281 22.1063C25.2094 22.0782 25.1719 22.0782 25.1625 22.0688C25.1625 22.0594 25.1906 22.05 25.1906 22.0219C25.1906 21.9938 24.9469 22.0313 24.9656 22.0594C24.9844 22.0875 25.0219 22.0688 25.0219 22.0875C25.0219 22.1063 24.9844 22.125 24.975 22.1438L25.0031 22.2469C25.0031 22.2657 25.0031 22.2844 25.0219 22.2938L25.0781 22.3125H25.2094C25.2188 22.3032 25.2281 22.3032 25.2375 22.2657V22.275ZM27.3 23.475C27.3 23.475 27.3281 23.5407 27.375 23.5688H27.4688L27.525 23.5219C27.5438 23.5032 27.5625 23.4094 27.5531 23.3907C27.5531 23.3719 27.5063 23.3344 27.5063 23.3157C27.5063 23.2969 27.5344 23.2969 27.525 23.2782C27.5156 23.2594 27.3375 23.2594 27.3375 23.2969C27.3375 23.325 27.3656 23.3157 27.3563 23.325C27.3563 23.3438 27.3094 23.3719 27.3 23.3907C27.2813 23.4 27.3 23.4844 27.3 23.4844V23.475Z" fill="#E92736"/>
+<path d="M27.5437 23.3906C27.5437 23.4094 27.525 23.4844 27.5437 23.4937C27.5437 23.5125 27.5719 23.5593 27.5906 23.5687H27.7031C27.7211 23.5543 27.7342 23.5346 27.7406 23.5125C27.75 23.4844 27.7969 23.4468 27.7875 23.4281C27.7781 23.4093 27.7687 23.4094 27.7781 23.3906C27.7781 23.3719 27.8062 23.3719 27.8062 23.3437C27.8062 23.3156 27.6094 23.25 27.6 23.2781C27.6 23.3062 27.6281 23.2969 27.6187 23.3156C27.6187 23.3344 27.5531 23.3719 27.5437 23.3906Z" fill="#E92736"/>
+<path d="M27.8719 23.6719C27.9 23.6531 27.9656 23.5875 27.9656 23.5687C27.9656 23.5312 27.9375 23.5125 27.9469 23.5031L27.9938 23.4937C28.0031 23.475 27.8438 23.3437 27.8344 23.3719C27.8344 23.4 27.8625 23.4094 27.8531 23.4187L27.7875 23.4281C27.7781 23.4375 27.7406 23.4844 27.7406 23.5031C27.7406 23.5219 27.7125 23.5219 27.7219 23.55L27.7406 23.5875C27.75 23.6062 27.8156 23.6719 27.8344 23.6719H27.8719ZM34.0594 24.1875C34.0594 24.1875 34.0594 24.2625 34.0969 24.3C34.125 24.3281 34.1531 24.3281 34.1719 24.3375H34.2375C34.2758 24.3141 34.3079 24.282 34.3313 24.2437C34.3313 24.2156 34.3031 24.1687 34.3125 24.15C34.3219 24.1312 34.3406 24.15 34.3406 24.1312C34.3406 24.1031 34.1906 24.0281 34.1813 24.0562C34.1719 24.075 34.2 24.0844 34.1813 24.0937L34.1063 24.1125C34.0875 24.1125 34.0594 24.1875 34.0594 24.1875Z" fill="#E92736"/>
+<path d="M34.3125 24.2344L34.2375 24.3094C34.2375 24.3281 34.2375 24.375 34.2563 24.3844C34.2563 24.4031 34.3219 24.4406 34.35 24.4312C34.3594 24.4312 34.3782 24.4312 34.3969 24.4125C34.4157 24.4031 34.4719 24.3937 34.4719 24.375L34.4813 24.3375C34.4907 24.3281 34.5188 24.3375 34.5375 24.3187C34.5563 24.3 34.425 24.1594 34.4063 24.1781C34.3875 24.1969 34.4063 24.2062 34.4063 24.2156C34.3875 24.2156 34.3219 24.2156 34.3125 24.2344Z" fill="#E92736"/>
+<path d="M34.35 24.5813H34.4813L34.5188 24.5344C34.5281 24.5344 34.5281 24.5531 34.5563 24.5531C34.575 24.5531 34.5563 24.3656 34.5281 24.3844C34.5094 24.3937 34.5188 24.4312 34.5094 24.4219C34.4906 24.4219 34.4813 24.3938 34.4625 24.3938C34.431 24.3902 34.399 24.3934 34.3688 24.4031C34.3688 24.4031 34.35 24.4031 34.3406 24.4219L34.3219 24.4594V24.5531C34.3313 24.5719 34.3219 24.5719 34.35 24.5813Z" fill="#E92736"/>
+<path d="M24.7688 22.4063C24.7875 22.4438 24.7594 22.5188 24.7407 22.5375C24.7313 22.5563 24.6188 22.5281 24.6188 22.5094C24.6188 22.4906 24.6094 22.4531 24.6188 22.4344C24.6375 22.4156 24.675 22.3688 24.7032 22.3781C24.7313 22.3781 24.7594 22.4063 24.7688 22.4156V22.4063ZM24.7969 22.2844C24.7782 22.3125 24.7969 22.3406 24.8157 22.35C24.825 22.3688 24.9094 22.3875 24.9282 22.3781C24.9469 22.3594 24.9844 22.2375 24.9657 22.2188C24.9469 22.2 24.9094 22.2 24.9 22.2C24.8813 22.2 24.8063 22.2563 24.7969 22.2844ZM25.05 22.1625V22.2281C25.0688 22.2375 25.1157 22.275 25.1438 22.275C25.1719 22.275 25.1907 22.1813 25.1907 22.1719C25.1907 22.1531 25.1813 22.1438 25.1625 22.1344L25.05 22.1531V22.1625ZM27.4969 23.4469C27.4969 23.4844 27.4313 23.5125 27.4125 23.5125C27.3938 23.5125 27.3469 23.4188 27.3563 23.4188C27.3657 23.4 27.3844 23.3719 27.4032 23.3719C27.4219 23.3719 27.4688 23.3719 27.4875 23.3906L27.5063 23.4563L27.4969 23.4469ZM27.6 23.3906C27.5813 23.4 27.5719 23.4281 27.5719 23.4469C27.5719 23.4656 27.6 23.5219 27.6188 23.5313C27.6375 23.5313 27.7313 23.4844 27.7407 23.4656C27.7407 23.4469 27.7219 23.4188 27.7032 23.4094L27.6094 23.3906H27.6ZM27.825 23.4844C27.8063 23.4844 27.7875 23.5125 27.7875 23.5313C27.7875 23.5313 27.7875 23.5875 27.8157 23.6063C27.8344 23.625 27.8907 23.5875 27.9 23.5781V23.5406C27.9 23.5219 27.825 23.4844 27.825 23.4844ZM34.2563 24.2531C34.2375 24.2719 34.1719 24.2719 34.1625 24.2531C34.1344 24.2531 34.1344 24.1594 34.1532 24.1594C34.1625 24.15 34.1907 24.1313 34.2094 24.1406C34.2282 24.1406 34.2657 24.1688 34.2657 24.1969L34.2563 24.2531ZM34.35 24.2625C34.3219 24.2625 34.3032 24.2719 34.2938 24.2906C34.2844 24.3 34.275 24.3563 34.2938 24.375C34.3032 24.3844 34.4063 24.3938 34.4157 24.375V24.3281L34.35 24.2625ZM34.4438 24.45H34.3969C34.3875 24.45 34.3594 24.4875 34.3594 24.5156C34.3594 24.5344 34.425 24.5438 34.4344 24.5438L34.4625 24.525L34.4532 24.45H34.4438Z" fill="#F7E204"/>
+<path d="M33.7232 24.9467C33.7995 25.0313 34.0016 24.9731 34.1745 24.8169C34.3473 24.6607 34.4256 24.4656 34.3492 24.3811C34.2728 24.2965 34.0708 24.3547 33.8979 24.5109C33.725 24.6671 33.6468 24.8622 33.7232 24.9467Z" fill="url(#paint2_radial_1_38536)"/>
+<path d="M26.7938 18.6844C26.7938 18.6844 26.4375 18.7125 26.1844 18.675C25.9313 18.6375 25.9969 17.9907 25.9875 17.9719C25.9875 17.9532 25.8375 17.8032 25.8563 17.6625C25.8844 17.5219 26.3438 17.1469 26.4 17.1188C26.4469 17.1094 26.5407 17.1469 26.5407 17.1469C26.5407 17.1469 26.6532 17.0344 26.6907 17.0344C26.7282 17.0344 26.775 17.1 26.7657 17.1282C26.7469 17.1563 26.5875 17.25 26.5782 17.3157C26.5594 17.3907 26.5782 17.4563 26.5313 17.5313C26.4844 17.5969 26.4 17.6907 26.3907 17.7563C26.3813 17.8125 26.3532 17.8594 26.3907 17.8875C26.4375 17.9063 26.5875 17.8875 26.7188 17.8313C26.85 17.7657 26.9063 17.6907 26.9157 17.7C26.9344 17.7 26.8407 17.8594 26.7 17.925C26.5594 17.9813 26.4657 18.0469 26.3907 18.0375C26.3907 18.0375 26.3157 18.225 26.5594 18.2438C26.8032 18.2438 26.9344 18.1875 26.9344 18.1875L26.7938 18.6844ZM25.3875 20.1844C25.3875 20.1844 25.575 20.2594 25.575 20.4657C25.575 20.6719 25.3782 20.85 25.3875 21.2157C25.3875 21.5907 25.4438 21.5907 25.9313 21.9938C26.0011 22.0573 26.0529 22.1382 26.0813 22.2282C26.1094 22.35 26.1938 23.0625 26.6625 23.0625C27.1313 23.0625 27.2063 22.7532 27.2063 22.7532L27 22.4625C27 22.4625 26.8407 22.5094 26.7469 22.4907C26.6979 22.4774 26.6527 22.4526 26.6152 22.4184C26.5777 22.3841 26.549 22.3414 26.5313 22.2938C26.475 22.1813 26.4657 21.9094 26.3813 21.7875C26.1938 21.4875 25.8375 21.4407 25.8282 21.1313C25.8282 20.8125 26.0438 20.7844 25.9875 20.4094C25.9219 20.0344 25.4813 19.8657 25.4813 19.8657L25.3032 19.7907L25.2375 20.1657L25.3875 20.1844Z" fill="#A8AC71"/>
+<path d="M26.6907 17.5875C26.85 17.55 26.7563 17.1375 26.7563 17.1375L26.6438 17.2312C26.6438 17.2312 26.7188 17.325 26.7188 17.4187C26.7188 17.5125 26.6907 17.5875 26.6907 17.5875Z" fill="#F1A720"/>
+<path d="M26.9813 21.7031L26.8969 21.6375C26.8407 21.6 26.5969 21.3938 26.6344 20.8031C26.6813 20.1281 27.6657 19.7719 27.7219 19.5094C27.7969 19.2094 28.0125 19.0875 27.2344 18.4781L27.0469 18.6844L27.375 18.9281C27.375 18.9281 27.4407 18.8906 27.45 18.9844C27.45 19.0781 27.3563 19.1438 27.3375 19.2188C27.3188 19.2844 26.8313 19.6219 26.7938 19.65L26.5125 19.875C26.5125 19.875 26.3907 19.9969 26.2782 20.2594C26.1563 20.5219 26.2125 20.8594 26.2125 20.8594C26.2125 20.8594 26.2125 21.5719 26.9813 21.7031Z" fill="#A8AC71"/>
+<path d="M26.5031 22.0781L26.5594 22.3312L26.4 22.3875H26.3344L26.2875 22.4062L26.1656 22.5187H26.1375C26.1375 22.5187 26.1188 22.5187 26.1094 22.4437C26.1094 22.3687 26.0906 22.3031 26.0906 22.3031L26.2406 22.3687H26.2969L26.325 22.3593L26.3906 22.2187L26.5031 22.0781ZM26.0531 22.125L25.9781 22.0312L25.8844 21.9468L25.9969 21.8906H26.1094L26.0906 22.0312L26.0531 22.125ZM26.3063 21.7218C26.3063 21.7218 26.3813 21.75 26.4 21.8156L26.4563 21.9281L26.2688 21.9093L26.1375 21.8718L26.2313 21.7406L26.3063 21.7218ZM26.2406 22.8375C26.2406 22.8375 26.2031 22.8093 26.175 22.7531L26.1375 22.6031L26.2594 22.575L26.4 22.6406H26.4375L26.4094 22.7156L26.2688 22.8375H26.2406ZM26.7094 22.4531C26.7094 22.4531 26.6156 22.4156 26.5969 22.3593C26.5781 22.3125 26.5594 22.3218 26.5594 22.3218L26.5313 22.4625L26.4844 22.6031L26.5031 22.6218L26.6063 22.5937L26.6906 22.5093L26.7188 22.4531H26.7094ZM26.2688 22.9031L26.4 22.9687C26.475 23.0156 26.5125 23.0156 26.5125 23.0156L26.5688 22.9593L26.6344 22.8375V22.8281L26.3531 22.8562L26.2688 22.9031ZM26.6813 22.7906L26.9344 22.6406L26.9438 22.5093L26.8969 22.4718H26.7563L26.7094 22.6406L26.6813 22.7906ZM26.5125 23.025C26.5125 23.025 26.6813 23.1 26.9813 22.9875C27.1125 22.9406 27.1406 22.875 27.1406 22.875L27.0188 22.8281L26.9063 22.9218L26.5125 23.0156V23.025ZM26.2781 21.1218L26.2406 20.9906C26.2219 20.9156 26.2313 20.8875 26.2313 20.8875L26.3156 20.9343L26.4375 21.0281L26.3438 21.0937L26.2781 21.1218ZM26.4844 21.4687L26.4 21.375C26.3793 21.3385 26.3605 21.3009 26.3438 21.2625L26.4375 21.2812L26.5406 21.3375L26.4938 21.4687H26.4844Z" fill="#78732E"/>
+<path d="M25.9313 17.5312C25.9125 17.5968 25.8938 17.7093 25.9781 17.7187C26.0156 17.7375 26.1938 17.7187 26.4 17.4937C26.4938 17.3812 26.4938 17.2687 26.4938 17.2687L26.5406 17.1468C26.5406 17.1468 26.4563 17.0906 26.3344 17.1656C26.2125 17.2406 25.9313 17.5406 25.9313 17.5406V17.5312Z" fill="#C6C7A6"/>
+<path d="M26.4844 17.25C26.5051 17.25 26.5219 17.2333 26.5219 17.2125C26.5219 17.1918 26.5051 17.175 26.4844 17.175C26.4637 17.175 26.4469 17.1918 26.4469 17.2125C26.4469 17.2333 26.4637 17.25 26.4844 17.25Z" fill="#1C242F"/>
+<path d="M26.2219 17.25C26.1652 17.2995 26.112 17.3527 26.0625 17.4094C26.0625 17.4094 26.1938 17.3719 26.3063 17.2688C26.3625 17.2125 26.4938 17.1938 26.55 17.2031C26.5875 17.2125 26.5688 17.1656 26.55 17.1563C26.5219 17.1281 26.4188 17.1188 26.4 17.1281L26.2219 17.25Z" fill="#A8AC71"/>
+<path d="M26.6344 21.0469V20.8406L26.55 20.9156L26.475 21.0188L26.5969 21.0656L26.6344 21.0469ZM26.2125 20.8031V20.5875C26.2125 20.4938 26.2594 20.2969 26.2594 20.2969L26.3156 20.4281L26.4563 20.6531L26.5031 20.6906L26.3813 20.7844L26.25 20.8219L26.2125 20.8031ZM26.6344 20.7469L26.6625 20.6531C26.6719 20.5969 26.7094 20.5219 26.7094 20.5219V20.5313C26.6442 20.5811 26.5816 20.6343 26.5219 20.6906L26.5969 20.7563H26.6438M26.2969 20.1938C26.2969 20.1938 26.3156 20.1375 26.3906 20.0531L26.5125 19.8844L26.5688 20.1094L26.6063 20.2969V20.3344L26.5406 20.3531C26.5219 20.3531 26.3906 20.3531 26.3719 20.325L26.2969 20.2031V20.1938ZM27.0844 21.0188L27.1594 20.9344L27.2531 20.8406L26.9531 20.8969L27 20.9906L27.075 21.0188H27.0844ZM26.8969 20.3906C26.8969 20.3906 26.925 20.3906 27.0094 20.2969C27.0844 20.2219 27.1313 20.2313 27.1313 20.2313L27.1594 20.55L27.0094 20.5031L26.8969 20.3906Z" fill="#78732E"/>
+<path d="M26.9344 20.2687L27.1219 20.0812L26.8125 19.9875L26.8687 20.2031L26.9344 20.2687ZM27.0656 19.7812L27.0844 19.4719C27.0844 19.4719 27.0187 19.5 26.9437 19.5656L26.8312 19.65L26.8687 19.7062L26.9625 19.7719H27.0562L27.0656 19.7812ZM27.3281 19.4813V19.2188C27.3281 19.2188 27.2812 19.2937 27.2344 19.3312L27.15 19.4062L27.2344 19.4625H27.3281V19.4813ZM27.4406 19.8094L27.5906 19.6875C27.6464 19.643 27.694 19.5891 27.7312 19.5281L27.3375 19.5L27.3562 19.6594L27.45 19.8094H27.4406ZM26.5406 18.5156L26.5219 18.6844H26.85L26.7656 18.5719L26.6719 18.5156L26.5781 18.4219L26.5406 18.5156ZM27.1594 20.0344C27.1781 20.0344 27.2625 19.9594 27.3094 19.9219C27.3469 19.875 27.4219 19.8281 27.4219 19.8281L27.1125 19.8V20.0062L27.1594 20.0344ZM27.75 19.4813C27.75 19.4813 27.7875 19.3594 27.7781 19.2375C27.7781 19.125 27.7594 19.0687 27.7594 19.0687L27.525 19.2281L27.5625 19.3406L27.6562 19.4344L27.75 19.4813Z" fill="#78732E"/>
+<path d="M27.3562 19.2C27.3562 19.2 27.4218 19.1062 27.4312 19.0687V19.0312H27.6187L27.7218 19.05H27.7406L27.6562 19.1531L27.5437 19.2187L27.4031 19.2375L27.3562 19.2ZM27.7312 19.0125L27.6093 18.825C27.5718 18.7593 27.5343 18.7312 27.5343 18.7312L27.4406 18.9843V19.0125H27.7218H27.7312Z" fill="#78732E"/>
+<path d="M25.4625 20.8312L25.4344 20.9062C25.4344 20.9062 25.5562 20.8406 25.65 20.8406C25.7437 20.8406 25.8469 20.9625 25.8469 20.9625L25.8656 20.8781C25.8656 20.8781 25.7437 20.7562 25.6594 20.7562C25.5844 20.7468 25.4719 20.8312 25.4719 20.8312H25.4625ZM25.5281 20.2875L25.5562 20.325C25.5562 20.3343 25.5656 20.2312 25.6875 20.1843C25.8187 20.1281 25.875 20.175 25.875 20.175C25.875 20.175 25.8562 20.1 25.8 20.0812C25.7437 20.0718 25.6969 20.0812 25.6312 20.1281C25.5827 20.1706 25.547 20.2258 25.5281 20.2875ZM25.9406 20.7C25.9406 20.7 25.8844 20.5687 25.7906 20.55C25.6875 20.5218 25.5562 20.5968 25.5562 20.5968L25.5375 20.6625C25.5375 20.6625 25.6781 20.5875 25.7719 20.625C25.875 20.6718 25.9125 20.7843 25.9125 20.7843L25.9406 20.6906V20.7ZM25.4719 20.2218L25.5094 20.2687C25.5094 20.2687 25.4906 20.1375 25.5562 20.0718C25.5856 20.0355 25.6204 20.0039 25.6594 19.9781L25.6031 19.95C25.6031 19.95 25.5187 19.9968 25.4906 20.0531C25.4682 20.1063 25.4617 20.1649 25.4719 20.2218ZM25.425 20.0062C25.4531 19.9312 25.5375 19.9125 25.5375 19.9125L25.5094 19.8843H25.4625C25.4625 19.8843 25.4156 19.9125 25.3781 19.9781C25.35 20.0625 25.35 20.1656 25.35 20.1656L25.4062 20.1937C25.4062 20.1937 25.3969 20.0625 25.425 20.0062ZM26.1562 18.2062C26.2406 18.1687 26.2969 18.1781 26.2969 18.1781C26.2969 18.1781 26.175 18.3 26.2312 18.45C26.1656 18.5718 26.1469 18.6656 26.1469 18.6656H26.2125L26.25 18.4968C26.325 18.6187 26.4375 18.6843 26.4375 18.6843H26.5312C26.5312 18.6843 26.5312 18.5625 26.5687 18.4593H26.5781C26.6277 18.5213 26.6922 18.5697 26.7656 18.6V18.5625C26.7656 18.5625 26.6625 18.5062 26.6062 18.4218L26.5969 18.4125C26.6358 18.3436 26.6946 18.288 26.7656 18.2531L26.8312 18.3093L26.85 18.2906L26.8031 18.225H26.7469L26.5781 18.3843C26.5488 18.3399 26.5237 18.2928 26.5031 18.2437L26.4656 18.225C26.4656 18.225 26.3625 18.2343 26.2781 18.3843C26.2594 18.2718 26.3812 18.1593 26.3812 18.1593V18.1125L26.1562 18.1687C26.0625 18.1968 25.9969 18.2812 25.9969 18.2812V18.3562C25.9969 18.3562 26.0906 18.2531 26.1562 18.2062ZM26.2969 18.4125C26.3531 18.3187 26.4844 18.2718 26.4844 18.2718C26.4844 18.2718 26.4844 18.3375 26.55 18.4312C26.5031 18.5156 26.475 18.6375 26.475 18.6375C26.475 18.6375 26.3812 18.5812 26.2969 18.45C26.2896 18.4413 26.2833 18.4319 26.2781 18.4218L26.2969 18.4125ZM25.5844 20.3906V20.4656C25.5844 20.4656 25.6594 20.3812 25.7719 20.3718C25.8844 20.3718 25.9875 20.4656 25.9875 20.4656C25.9875 20.4656 25.9875 20.3718 25.9687 20.3531C25.9594 20.3531 25.8656 20.2968 25.7812 20.2968C25.6969 20.2968 25.5844 20.3906 25.5844 20.3906ZM27.5906 19.3406L27.5437 19.2468L27.6 19.2187C27.6577 19.1738 27.711 19.1236 27.7594 19.0687L27.7219 19.0125H27.5719L27.4406 19.0031L27.4875 18.8437L27.5437 18.7125L27.4875 18.6656C27.4875 18.6656 27.5062 18.7125 27.4125 18.7218C27.3187 18.7312 27.15 18.6468 27.15 18.6468V18.6843L27.3844 18.75C27.4406 18.75 27.4781 18.7406 27.4969 18.7218L27.45 18.8437L27.4219 18.9375L27.4406 18.9562V19.0312L27.5719 19.0406L27.7219 19.05C27.7219 19.05 27.6469 19.1437 27.5625 19.1906C27.5531 19.1912 27.5437 19.1912 27.5344 19.1906L27.4406 19.05L27.4312 19.0968L27.4969 19.2093C27.4498 19.2133 27.4024 19.2101 27.3562 19.2L27.3187 19.2375V19.4718L27.15 19.4156L27.1219 19.4437V19.4343L27.0844 19.4718C27.0844 19.4718 27.0469 19.6031 27.0562 19.7625V19.7718C26.9712 19.7533 26.8932 19.7111 26.8312 19.65L26.7937 19.6781C26.7937 19.6781 26.7656 19.8093 26.7937 19.9781C26.6718 19.95 26.5594 19.8375 26.5594 19.8375L26.5125 19.8843C26.5285 20.032 26.5504 20.179 26.5781 20.325C26.5563 20.3265 26.5343 20.3265 26.5125 20.325C26.3812 20.325 26.2969 20.2031 26.2969 20.2031L26.2594 20.2968C26.2594 20.2968 26.3156 20.55 26.4469 20.6718L26.4844 20.6906C26.3625 20.7843 26.2219 20.8031 26.2219 20.8031V20.8875C26.2892 20.9364 26.358 20.9833 26.4281 21.0281C26.3848 21.0689 26.3338 21.1008 26.2781 21.1218L26.2969 21.1687L26.4656 21.0468L26.6344 21.0937V21.0468L26.4937 21.0187L26.5031 21.0093C26.55 20.9718 26.6344 20.8406 26.6344 20.8406V20.7468C26.6344 20.7468 26.5875 20.7468 26.5312 20.6906C26.7 20.5781 26.7094 20.5218 26.7094 20.5218L26.7469 20.4656C26.7469 20.4656 26.6812 20.4375 26.6437 20.3531L26.9156 20.2875L26.9344 20.2687C26.9344 20.2687 26.8687 20.1562 26.8406 20.025L27.1219 20.0812L27.1594 20.0437L27.1125 19.8187C27.2812 19.8187 27.4125 19.8375 27.4125 19.8375L27.4406 19.8093C27.4406 19.8093 27.3469 19.6312 27.3469 19.5281C27.378 19.5313 27.4094 19.5313 27.4406 19.5281H27.7219L27.75 19.4812C27.75 19.4812 27.6187 19.3875 27.5906 19.3406ZM26.6062 20.7937C26.6062 20.7937 26.5594 20.8875 26.475 20.9812L26.4562 21C26.4402 20.9946 26.4246 20.9884 26.4094 20.9812C26.3062 20.925 26.2781 20.8593 26.2781 20.8593L26.5125 20.7093L26.6062 20.7937ZM26.6906 20.4937L26.5031 20.6812C26.4894 20.6666 26.4769 20.6509 26.4656 20.6343C26.3906 20.5218 26.2781 20.4375 26.2969 20.2781C26.2969 20.2781 26.3625 20.3906 26.5031 20.3718C26.5345 20.3698 26.5657 20.3667 26.5969 20.3625C26.6344 20.4562 26.6906 20.4937 26.6906 20.4937ZM26.8781 20.2593L26.625 20.325C26.6211 20.3095 26.618 20.2938 26.6156 20.2781C26.5687 20.1281 26.5687 19.9031 26.5687 19.9031C26.5687 19.9031 26.6625 19.9781 26.8125 20.0156L26.8781 20.2593ZM26.8312 19.9781C26.8125 19.8468 26.8406 19.7062 26.8406 19.7062C26.8406 19.7062 26.9156 19.7812 27.0562 19.8C27.0656 19.9406 27.0844 19.9968 27.0844 19.9968L26.8312 19.9875V19.9781ZM27.375 19.7718C27.375 19.7718 27.2812 19.8093 27.1125 19.7812C27.1122 19.7656 27.1122 19.7499 27.1125 19.7343C27.1064 19.6407 27.1064 19.5467 27.1125 19.4531L27.3281 19.5187C27.332 19.6048 27.3478 19.69 27.375 19.7718ZM27.375 19.4812H27.3562V19.2187C27.3562 19.2187 27.45 19.2468 27.5156 19.2375C27.5344 19.275 27.5156 19.2843 27.5625 19.35C27.6 19.4156 27.6656 19.4718 27.6656 19.4718C27.6656 19.4718 27.45 19.4906 27.3656 19.4718L27.375 19.4812ZM26.6625 21.225L26.6531 21.1781C26.6531 21.1781 26.5594 21.2437 26.5406 21.3093C26.5309 21.3071 26.5215 21.304 26.5125 21.3L26.325 21.225L26.3437 21.2625L26.5125 21.3375H26.5312L26.4844 21.4687L26.5031 21.4968L26.55 21.3375L26.6625 21.3468L26.6437 21.4218L26.6062 21.5625L26.6531 21.5906H26.8406L26.8125 21.5531L26.7469 21.5437H26.6437L26.6719 21.4312L26.7 21.3562L26.6719 21.2906L26.5781 21.3093C26.5999 21.2755 26.6286 21.2467 26.6625 21.225ZM25.6031 21.1031C25.725 21.1031 25.8187 21.1875 25.8187 21.1875V21.1312C25.8187 21.1312 25.725 21 25.6219 21C25.5094 21 25.3875 21.1125 25.3875 21.1125V21.225C25.3875 21.225 25.4812 21.1031 25.6031 21.1031ZM26.85 22.9218C26.7281 22.9781 26.5969 22.9781 26.5969 22.9781L26.6719 22.8375C26.9062 22.7625 26.9531 22.6125 26.9531 22.6125L26.9344 22.5468C26.9344 22.5468 26.8781 22.6968 26.6906 22.7718C26.7281 22.6593 26.7562 22.4718 26.7562 22.4718L26.6906 22.4531C26.6906 22.4531 26.5969 22.575 26.5031 22.6031C26.5434 22.524 26.5689 22.4382 26.5781 22.35L26.55 22.3031C26.55 22.3031 26.4844 22.3593 26.3906 22.3781C26.372 22.3812 26.353 22.3812 26.3344 22.3781C26.3906 22.3031 26.4937 22.0781 26.4937 22.0781L26.475 22.0312C26.475 22.0312 26.4 22.2281 26.3156 22.3312C26.3065 22.3439 26.2971 22.3564 26.2875 22.3687C26.1937 22.3406 26.0812 22.275 26.0812 22.275L26.0906 22.3031C26.0906 22.3031 26.1656 22.3593 26.2594 22.3968C26.22 22.4356 26.1793 22.4732 26.1375 22.5093V22.6031L26.4187 22.6406C26.325 22.7906 26.2312 22.8375 26.2312 22.8375L26.2781 22.9031C26.2781 22.9031 26.4 22.9031 26.625 22.8468C26.5687 22.9593 26.5125 23.0156 26.5125 23.0156C26.5125 23.0156 26.7187 23.0343 26.8594 22.9593C27 22.8843 27.0469 22.8093 27.0469 22.8093L27.0094 22.7718C27.0094 22.7718 26.9719 22.8656 26.85 22.9218ZM26.2031 22.5468L26.3156 22.4062C26.4656 22.4343 26.5031 22.3968 26.5031 22.3968C26.5031 22.3968 26.5312 22.4718 26.4469 22.6125C26.3437 22.6125 26.2031 22.5375 26.2031 22.5375V22.5468ZM26.3344 22.8281L26.4562 22.6781L26.4844 22.65C26.625 22.65 26.7 22.5281 26.7 22.5281C26.7 22.5281 26.7187 22.6406 26.6531 22.7812C26.475 22.8468 26.3344 22.8281 26.3344 22.8281ZM26.1562 21.9093C26.2969 21.9093 26.4656 21.975 26.4656 21.975L26.4469 21.9093L26.175 21.8531C26.2076 21.7883 26.2602 21.7357 26.325 21.7031L26.2781 21.675C26.2781 21.675 26.2219 21.6843 26.1469 21.8156C26.1399 21.8277 26.1337 21.8402 26.1281 21.8531C26.1187 21.8527 26.1093 21.8527 26.1 21.8531C26.0206 21.8555 25.9432 21.8781 25.875 21.9187L25.8937 21.9562C25.8937 21.9562 25.9969 21.9093 26.1094 21.9093C26.0838 21.9832 26.0619 22.0583 26.0437 22.1343L26.0719 22.1906L26.1656 21.9093H26.1562ZM25.875 21.3281L25.8469 21.2625C25.8469 21.2625 25.7062 21.2062 25.5937 21.2625C25.4906 21.3093 25.4062 21.4406 25.4062 21.4406L25.4531 21.525C25.4531 21.525 25.5281 21.3843 25.6312 21.3468C25.725 21.3187 25.875 21.3281 25.875 21.3281ZM26.1562 21.5531L26.0625 21.4968C26.0625 21.4968 25.9031 21.5437 25.8562 21.6C25.8 21.6562 25.7531 21.7968 25.7625 21.8343C25.7812 21.8812 25.8281 21.9 25.8281 21.9C25.8281 21.9 25.8562 21.7593 25.9312 21.6843C26.0062 21.6093 26.1562 21.5531 26.1562 21.5531ZM25.7906 21.5062C25.8442 21.4597 25.9087 21.4274 25.9781 21.4125L25.9125 21.3656C25.9125 21.3656 25.7719 21.3843 25.7062 21.45C25.6312 21.5156 25.5375 21.6468 25.5375 21.6468L25.6219 21.7312C25.6219 21.7312 25.7344 21.5625 25.7906 21.5062ZM26.2781 17.3156V17.3062C26.3531 17.2125 26.4281 17.2125 26.4562 17.2125H26.5125C26.4765 17.2866 26.4513 17.3655 26.4375 17.4468C26.4187 17.5406 26.3719 17.5593 26.3437 17.625C26.3062 17.6906 26.2406 17.7937 26.2312 17.8875C26.2312 17.9812 26.2594 18.0375 26.2781 18.0468C26.3062 18.0562 26.3531 18.0093 26.3437 17.9812C26.3437 17.9531 26.3156 17.9812 26.3062 17.9812C26.2875 17.9812 26.2875 17.9531 26.2781 17.8968C26.2687 17.8406 26.3437 17.6906 26.3719 17.6343C26.4 17.5875 26.4656 17.5312 26.4656 17.4468L26.5312 17.2125C26.5312 17.2031 26.4937 17.1937 26.4094 17.1843C26.3531 17.1843 26.2687 17.2312 26.2312 17.2968C26.1937 17.3531 26.0719 17.4 26.0719 17.4C26.0719 17.4 26.2031 17.4 26.2781 17.3062V17.3156Z" fill="white"/>
+<path d="M26.7375 18.2344H26.5031L26.5687 18.4219L26.7375 18.2344ZM26.4562 18.225L26.4093 18.1875C26.4013 18.1769 26.3919 18.1674 26.3812 18.1594L26.2968 18.2063L26.25 18.3844L26.2781 18.4125L26.4656 18.225H26.4562ZM26.4281 18.6938L26.2593 18.4407L26.1656 18.6469L26.2125 18.6657L26.325 18.6844H26.4281V18.6938ZM27.1218 22.8844C26.9882 22.9731 26.8321 23.0219 26.6718 23.025C26.5591 23.023 26.449 22.9906 26.3531 22.9313C26.2918 22.8928 26.243 22.8375 26.2125 22.7719C26.1562 22.6688 26.1375 22.5375 26.1187 22.3969C26.0906 22.275 26.0718 22.1532 26.0156 22.0594C25.9406 21.9375 25.7906 21.8625 25.6593 21.75C25.584 21.6916 25.5218 21.618 25.4766 21.534C25.4314 21.4501 25.4042 21.3576 25.3968 21.2625C25.3956 21.2376 25.3956 21.2125 25.3968 21.1875C25.3968 21.0282 25.4437 20.8875 25.4906 20.7657C25.5375 20.6438 25.6031 20.5313 25.6031 20.4375V20.3907C25.575 20.325 25.5093 20.2594 25.4625 20.2125C25.4156 20.1657 25.35 20.1375 25.35 20.1375L25.2562 20.1188L25.2468 20.1469L25.3406 20.1657V20.1563V20.1657L25.4625 20.2594C25.5093 20.2969 25.5562 20.3532 25.5656 20.4C25.5669 20.4125 25.5669 20.4251 25.5656 20.4375C25.5656 20.5313 25.5187 20.625 25.4718 20.7469C25.404 20.8843 25.3656 21.0344 25.3593 21.1875V21.2625C25.3675 21.3634 25.3967 21.4614 25.4451 21.5503C25.4936 21.6391 25.5602 21.7167 25.6406 21.7782C25.7812 21.8813 25.9218 21.9657 25.9875 22.0782C26.0625 22.1907 26.0812 22.3594 26.1093 22.5469C26.1281 22.6219 26.1468 22.7063 26.1843 22.7813C26.2218 22.8563 26.2687 22.9219 26.3343 22.9688C26.439 23.0317 26.5591 23.0642 26.6812 23.0625C26.9343 23.0625 27.1406 22.9125 27.1406 22.9125L27.1218 22.8844Z" fill="#78732E"/>
+<path d="M26.925 22.425C26.8885 22.4481 26.8464 22.4611 26.8032 22.4625C26.7563 22.4625 26.7 22.4438 26.6438 22.3875C26.5834 22.3301 26.5438 22.2543 26.5313 22.1719C26.5125 22.0875 26.5032 21.9844 26.4375 21.8625C26.3907 21.7219 26.25 21.6188 26.1094 21.5156C25.9875 21.4125 25.8657 21.3094 25.8375 21.1969C25.8352 21.1751 25.8352 21.1531 25.8375 21.1313C25.8375 21.0375 25.875 20.9438 25.9125 20.8406C25.9747 20.6991 26.0035 20.5451 25.9969 20.3906C25.9782 20.2031 25.8375 20.0625 25.6969 19.9688C25.6146 19.9154 25.5265 19.8714 25.4344 19.8375L25.425 19.8656H25.4438C25.4907 19.8938 25.6125 19.95 25.725 20.0344C25.8469 20.1281 25.95 20.2406 25.9688 20.3906V20.4656C25.9688 20.6063 25.9313 20.7188 25.8844 20.8313C25.8375 20.9438 25.8 21.0375 25.8 21.1313L25.8094 21.2063C25.8375 21.3281 25.9594 21.4313 26.0907 21.5438C26.2313 21.6375 26.3719 21.75 26.4188 21.8719C26.475 21.9938 26.4844 22.0969 26.5032 22.1719C26.5219 22.2656 26.5407 22.3313 26.6157 22.4063C26.6813 22.4719 26.7469 22.4906 26.8032 22.4906C26.8495 22.4899 26.8947 22.477 26.9344 22.4531L26.925 22.425Z" fill="#78732E"/>
+<path d="M27.7875 21.7125C27.7875 21.7125 27.9468 21.75 27.9375 21.8813C27.9266 21.9904 27.9014 22.0975 27.8625 22.2L27.6375 21.9938L27.7593 21.8813L27.8062 21.8156L27.7875 21.7125Z" fill="#A8AC71"/>
+<path d="M24.975 20.1094C24.975 20.1094 24.8156 20.1657 24.7781 20.1C24.7406 20.025 24.7594 19.9688 24.7594 19.9594C24.7594 19.9407 24.6656 19.9313 24.6656 19.8375C24.675 19.7438 24.7969 19.7532 24.8156 19.7532C24.8438 19.7532 24.8531 19.6125 24.9375 19.6219C25.0125 19.6219 25.05 19.7157 25.05 19.7157L24.975 20.1094Z" fill="#F8C83C"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M24.8364 19.756C24.8324 19.761 24.8256 19.7672 24.8157 19.7672C24.8143 19.7672 24.8124 19.7672 24.8102 19.7672C24.7963 19.7668 24.7683 19.7662 24.7409 19.7738C24.7253 19.7781 24.7109 19.7848 24.7001 19.7951C24.6897 19.8049 24.6819 19.8185 24.6797 19.8383C24.68 19.8787 24.6998 19.9005 24.7206 19.9151C24.7289 19.9209 24.7369 19.9253 24.7444 19.9294C24.7469 19.9307 24.7493 19.9321 24.7517 19.9334C24.7561 19.9359 24.7609 19.9388 24.7646 19.9421C24.7681 19.9451 24.7735 19.9508 24.7735 19.9594C24.7735 19.962 24.773 19.9651 24.7726 19.9673L24.7726 19.9675C24.7725 19.9681 24.7723 19.9687 24.7722 19.9693C24.7718 19.9716 24.7714 19.974 24.771 19.9769C24.7699 19.9842 24.7688 19.9937 24.7688 20.0051C24.7688 20.0278 24.7731 20.0583 24.7906 20.0934C24.7972 20.1047 24.8096 20.1119 24.8275 20.1154C24.8455 20.1189 24.8673 20.1183 24.8888 20.1154C24.9103 20.1126 24.9307 20.1078 24.9458 20.1036C24.9528 20.1017 24.9586 20.1 24.9628 20.0987L25.0354 19.7173C25.0344 19.715 25.0327 19.7117 25.0306 19.7077C25.0262 19.6994 25.0196 19.6885 25.0109 19.6776C24.9933 19.6555 24.9687 19.636 24.9375 19.636H24.9368L24.936 19.6359C24.9194 19.6341 24.9069 19.6394 24.8963 19.6489C24.8851 19.659 24.8761 19.6737 24.8682 19.6902C24.8642 19.6983 24.8607 19.7066 24.8573 19.7146C24.8569 19.7156 24.8565 19.7165 24.8562 19.7174C24.8532 19.7244 24.8503 19.7313 24.8474 19.7374C24.8443 19.7441 24.8407 19.7508 24.8364 19.756ZM25.05 19.7157L25.0631 19.7105L25.0646 19.7143L24.9889 20.1121L24.975 20.1094L24.9797 20.1227L24.9796 20.1228L24.9792 20.1229L24.9777 20.1234C24.9765 20.1238 24.9747 20.1244 24.9724 20.1251C24.9678 20.1266 24.9612 20.1286 24.9533 20.1308C24.9374 20.1351 24.9156 20.1403 24.8925 20.1433C24.8696 20.1463 24.8444 20.1474 24.8221 20.143C24.7997 20.1386 24.7781 20.1284 24.766 20.107L24.7656 20.1064C24.7457 20.0667 24.7407 20.0316 24.7407 20.0051C24.7407 19.9919 24.7419 19.9809 24.7432 19.9727C24.7437 19.9695 24.7442 19.9667 24.7445 19.9644C24.7446 19.9638 24.7447 19.9632 24.7448 19.9627C24.7449 19.9626 24.7449 19.9624 24.7449 19.9623C24.7434 19.9612 24.7411 19.9598 24.7378 19.9579C24.736 19.9569 24.734 19.9558 24.7318 19.9546C24.7241 19.9503 24.7141 19.9449 24.7045 19.9381C24.6786 19.92 24.6516 19.8904 24.6516 19.8376V19.8369L24.6517 19.8362C24.6544 19.8094 24.6653 19.7893 24.6808 19.7746C24.696 19.7602 24.7151 19.7517 24.7334 19.7467C24.7653 19.7379 24.7982 19.7387 24.8114 19.739C24.8123 19.7391 24.8132 19.7391 24.8139 19.7391C24.8141 19.7389 24.8143 19.7386 24.8146 19.7383C24.8166 19.7358 24.819 19.7317 24.822 19.7254C24.8246 19.7199 24.8272 19.7136 24.8302 19.7065C24.8306 19.7056 24.831 19.7046 24.8314 19.7037C24.8348 19.6956 24.8386 19.6868 24.8429 19.6779C24.8513 19.6604 24.8622 19.6418 24.8775 19.628C24.893 19.614 24.9131 19.6053 24.9383 19.6079C24.9817 19.6082 25.0132 19.6354 25.0329 19.66C25.043 19.6726 25.0505 19.6851 25.0554 19.6944C25.0579 19.6991 25.0598 19.703 25.0611 19.7058C25.0617 19.7072 25.0622 19.7083 25.0625 19.7091L25.0629 19.71L25.063 19.7103L25.0631 19.7105C25.0631 19.7105 25.0631 19.7105 25.05 19.7157ZM24.8132 19.7397C24.8132 19.7397 24.8133 19.7397 24.8133 19.7397L24.8132 19.7397Z" fill="#977C2E"/>
+<path d="M25.1532 20.1562C25.1532 20.1562 25.0125 20.2312 24.9657 20.1562C24.9282 20.0906 24.9657 20.0062 24.9563 19.9875C24.9375 19.9781 24.8625 19.95 24.8719 19.8656C24.8907 19.7812 24.975 19.8094 25.0032 19.7906C25.0313 19.7812 25.0594 19.6594 25.1438 19.6781C25.2282 19.7062 25.2375 19.7719 25.2375 19.7719L25.1438 20.1562H25.1532Z" fill="#F8C83C"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M25.0095 19.8033C24.9994 19.8094 24.9861 19.8112 24.975 19.8124C24.9719 19.8127 24.9689 19.813 24.966 19.8133C24.9562 19.8143 24.9466 19.8152 24.937 19.8173C24.9248 19.8199 24.9142 19.8242 24.9056 19.8316C24.8973 19.8388 24.89 19.8498 24.8858 19.868C24.8788 19.935 24.9323 19.9605 24.9572 19.9723C24.9592 19.9733 24.961 19.9742 24.9626 19.975L24.9668 19.9771L24.9689 19.9812C24.9716 19.9867 24.972 19.9929 24.9719 19.9977C24.9719 20.0028 24.9712 20.0086 24.9704 20.0145C24.9698 20.019 24.969 20.0236 24.9683 20.0283C24.967 20.0368 24.9655 20.0458 24.9644 20.0559C24.961 20.0866 24.9614 20.1203 24.9778 20.1491C24.9869 20.1636 25.0005 20.1711 25.0172 20.1741C25.0344 20.1771 25.0543 20.1752 25.0739 20.1707C25.0933 20.1663 25.1116 20.1595 25.125 20.1539C25.127 20.1531 25.1288 20.1523 25.1305 20.1515L25.2232 19.7716C25.2228 19.7702 25.2223 19.7682 25.2214 19.7657C25.2196 19.76 25.2162 19.752 25.2105 19.7432C25.1993 19.7259 25.1786 19.7047 25.1401 19.6917C25.1071 19.6847 25.0841 19.7039 25.0638 19.7321C25.0568 19.7418 25.0508 19.7517 25.045 19.7612C25.0423 19.7656 25.0397 19.7698 25.037 19.774C25.033 19.7804 25.0288 19.7866 25.0245 19.7916C25.0207 19.7959 25.0158 19.8007 25.0095 19.8033ZM25.2376 19.7719C25.2515 19.7699 25.2515 19.7699 25.2515 19.7699L25.2515 19.7697L25.2514 19.7695L25.2513 19.7686C25.2511 19.768 25.251 19.767 25.2507 19.7659C25.2502 19.7637 25.2494 19.7605 25.2481 19.7568C25.2456 19.7492 25.2413 19.739 25.2341 19.7279C25.2196 19.7055 25.1937 19.68 25.1483 19.6648L25.1476 19.6646L25.1469 19.6644C25.0959 19.6531 25.0628 19.6854 25.041 19.7156C25.0333 19.7263 25.0263 19.7377 25.0203 19.7476C25.0178 19.7517 25.0154 19.7556 25.0133 19.7589C25.0094 19.7651 25.0061 19.7698 25.0032 19.7732C25.0004 19.7764 24.999 19.7772 24.9988 19.7773C24.9987 19.7773 24.9987 19.7773 24.9988 19.7773L24.997 19.7779L24.9954 19.779C24.9917 19.7814 24.9846 19.7831 24.9719 19.7844C24.9695 19.7847 24.9669 19.785 24.9642 19.7852C24.9542 19.7862 24.9424 19.7873 24.9311 19.7898C24.9163 19.793 24.9006 19.7987 24.8872 19.8104C24.8736 19.8221 24.8634 19.839 24.8582 19.8626L24.858 19.8633L24.858 19.8641C24.8483 19.9509 24.9186 19.9855 24.9438 19.9972C24.9438 19.9972 24.9438 19.9973 24.9438 19.9973C24.9438 20.0006 24.9433 20.005 24.9425 20.0106C24.942 20.0142 24.9414 20.0183 24.9407 20.0228C24.9393 20.0318 24.9377 20.0422 24.9365 20.0528C24.9329 20.0852 24.9325 20.1265 24.9535 20.1633L24.9538 20.1637C24.968 20.1866 24.9895 20.1977 25.0123 20.2018C25.0347 20.2057 25.0587 20.203 25.0801 20.1981C25.1017 20.1932 25.1216 20.1858 25.1359 20.1798C25.1432 20.1768 25.1491 20.174 25.1532 20.172C25.1552 20.171 25.1569 20.1702 25.158 20.1696L25.1593 20.169L25.1596 20.1688L25.1597 20.1687C25.1598 20.1687 25.1598 20.1687 25.1546 20.1589L25.1597 20.1687L25.1575 20.1595L25.2519 19.7726L25.2515 19.7699L25.2376 19.7719Z" fill="#977C2E"/>
+<path d="M25.3875 20.1843C25.3875 20.1843 25.3406 20.2781 25.2469 20.2593C25.1531 20.2406 25.1812 20.1 25.1625 20.0718C25.1531 20.0437 25.0781 20.025 25.0875 19.9406C25.1062 19.8468 25.1906 19.8562 25.2281 19.8468C25.2562 19.8375 25.2937 19.6968 25.3594 19.7156C25.425 19.7437 25.4812 19.8187 25.4719 19.8562C25.4719 19.8562 25.3312 19.9031 25.3125 19.9968C25.2937 20.0906 25.3875 20.1843 25.3875 20.1843Z" fill="#F8C83C"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M25.25 19.8467C25.2459 19.8518 25.2401 19.8577 25.2326 19.8602L25.2316 19.8606C25.2239 19.8625 25.2142 19.8637 25.2047 19.8649C25.2014 19.8653 25.1981 19.8658 25.1949 19.8662C25.1817 19.8681 25.1683 19.8705 25.1557 19.8753C25.1432 19.88 25.1319 19.8867 25.1226 19.8971C25.1134 19.9074 25.1057 19.9218 25.1014 19.9428C25.0975 19.9792 25.1114 20.0009 25.1279 20.0174C25.1342 20.0237 25.1404 20.0288 25.1467 20.0341C25.1494 20.0362 25.152 20.0384 25.1547 20.0407C25.1622 20.0471 25.1711 20.0553 25.1752 20.0657C25.1786 20.0714 25.1803 20.0783 25.1815 20.0847C25.1828 20.092 25.1837 20.1005 25.1844 20.1092C25.1847 20.1127 25.185 20.1162 25.1853 20.1199C25.1865 20.1349 25.1877 20.1509 25.1904 20.1668C25.1973 20.2067 25.212 20.2381 25.2496 20.2456C25.2908 20.2538 25.3217 20.2376 25.3429 20.2185C25.3536 20.2088 25.3617 20.1986 25.3671 20.1907C25.3682 20.1891 25.3692 20.1877 25.3701 20.1863C25.3679 20.1838 25.3652 20.1808 25.3623 20.1772C25.3535 20.1666 25.3419 20.1513 25.3309 20.133C25.3092 20.0968 25.2883 20.0462 25.2987 19.9941C25.3093 19.9413 25.3535 19.9034 25.3918 19.8795C25.4113 19.8673 25.4301 19.8582 25.444 19.8521C25.4499 19.8496 25.4549 19.8476 25.4588 19.8461C25.4586 19.8412 25.4573 19.835 25.4544 19.8275C25.45 19.8164 25.4426 19.8038 25.4327 19.7911C25.413 19.7659 25.3846 19.742 25.3547 19.7289C25.3444 19.7263 25.3346 19.7292 25.324 19.7378C25.3127 19.747 25.302 19.7614 25.2916 19.7781C25.2865 19.7863 25.2817 19.7948 25.277 19.8032C25.2762 19.8046 25.2754 19.806 25.2746 19.8074C25.2708 19.8142 25.267 19.8209 25.2633 19.827C25.259 19.8342 25.2546 19.8411 25.25 19.8467ZM25.4763 19.8696L25.476 19.8697L25.475 19.8701C25.474 19.8704 25.4726 19.8709 25.4708 19.8716C25.4671 19.873 25.4617 19.8751 25.4552 19.8779C25.4422 19.8836 25.4247 19.8921 25.4067 19.9033C25.3699 19.9263 25.3345 19.9587 25.3263 19.9996C25.318 20.0413 25.3346 20.0844 25.355 20.1185C25.3651 20.1354 25.3758 20.1494 25.384 20.1593C25.3881 20.1642 25.3915 20.1681 25.3939 20.1706C25.3951 20.1719 25.396 20.1729 25.3966 20.1736L25.3973 20.1743L25.3974 20.1744L25.4046 20.1816L25.4001 20.1907L25.3875 20.1844C25.4001 20.1907 25.4001 20.1907 25.4001 20.1907L25.4 20.1908L25.3999 20.1911L25.3993 20.1921C25.3989 20.1929 25.3983 20.194 25.3975 20.1954C25.3958 20.1982 25.3935 20.2021 25.3903 20.2067C25.384 20.2159 25.3745 20.2279 25.3618 20.2394C25.3362 20.2624 25.2967 20.2837 25.2441 20.2732C25.188 20.2619 25.1699 20.2136 25.1627 20.1715C25.1597 20.1542 25.1584 20.1366 25.1572 20.1215C25.1569 20.1181 25.1567 20.1147 25.1564 20.1116C25.1557 20.1029 25.1549 20.0956 25.1538 20.0898C25.1527 20.0836 25.1515 20.0807 25.1508 20.0797L25.1498 20.0781L25.1492 20.0763C25.1482 20.0735 25.1449 20.0693 25.1364 20.062C25.1344 20.0604 25.1322 20.0585 25.1298 20.0566C25.1232 20.0511 25.1153 20.0445 25.108 20.0373C25.0872 20.0164 25.0682 19.9866 25.0735 19.9391L25.0737 19.9379C25.0788 19.9123 25.0886 19.8929 25.1016 19.8784C25.1146 19.8638 25.1302 19.8548 25.1458 19.8489C25.1614 19.8431 25.1772 19.8403 25.191 19.8384C25.1952 19.8378 25.1991 19.8373 25.2028 19.8368C25.2111 19.8357 25.2179 19.8348 25.2237 19.8335C25.2241 19.8332 25.2256 19.8321 25.2283 19.8289C25.2314 19.825 25.235 19.8195 25.2392 19.8126C25.2426 19.8068 25.2462 19.8005 25.2501 19.7936C25.2508 19.7922 25.2517 19.7908 25.2525 19.7894C25.2572 19.781 25.2623 19.772 25.2677 19.7633C25.2785 19.746 25.2912 19.7282 25.3063 19.716C25.3218 19.7034 25.3411 19.6958 25.3632 19.7021L25.3641 19.7023L25.3649 19.7027C25.4003 19.7179 25.4326 19.7453 25.4548 19.7738C25.466 19.788 25.475 19.803 25.4806 19.8173C25.4861 19.8313 25.4889 19.8463 25.4855 19.8597L25.4837 19.8671L25.4763 19.8696Z" fill="#977C2E"/>
+<path d="M27.5343 21.675L27.3281 21.4312C27.2437 21.3093 27.1125 21.1781 27.1125 21.1781L26.9062 21.075L26.775 20.85L26.7562 20.5875L26.8125 20.4375L26.8875 20.325C26.8875 20.325 26.4562 20.4843 26.6812 21.3093C26.775 21.6656 27.0093 21.7125 27.0093 21.7125L27.4125 21.6843H27.5343V21.675Z" fill="#AF7029"/>
+<path d="M27.3375 18.9094C27.375 18.9094 27.3937 18.9281 27.4125 18.9469L27.4312 19.0031V19.0406C27.2812 19.3594 26.9812 19.5094 26.7 19.6969C26.5572 19.7966 26.436 19.9241 26.3437 20.0719C26.2316 20.2648 26.1794 20.4867 26.1937 20.7094C26.2031 21.1781 26.3812 21.4406 26.5875 21.5812C26.7333 21.6734 26.9024 21.7222 27.075 21.7219H27.1125L27.2437 21.7125C27.3372 21.7023 27.431 21.696 27.525 21.6937L27.6937 21.7031L27.7781 21.7406C27.7896 21.7536 27.7962 21.7702 27.7969 21.7875C27.7969 21.825 27.7687 21.8625 27.7406 21.9L27.6469 21.9656L27.6656 21.9937C27.7007 21.9739 27.7323 21.9486 27.7594 21.9187C27.7969 21.8812 27.825 21.8344 27.825 21.7875C27.825 21.7687 27.825 21.7406 27.7969 21.7219C27.7781 21.6937 27.7406 21.6844 27.6937 21.675L27.525 21.6656C27.3375 21.6656 27.1031 21.6937 27.1031 21.6937V21.7125V21.6937C27.0937 21.6939 27.0844 21.6939 27.075 21.6937C26.9086 21.692 26.7461 21.6433 26.6062 21.5531C26.4094 21.4219 26.2312 21.1781 26.2312 20.7094V20.6719C26.2312 20.4187 26.2781 20.2312 26.3719 20.0812C26.5031 19.8562 26.7187 19.725 26.9344 19.5844C27.1541 19.4596 27.3331 19.274 27.45 19.05V19.0031C27.45 18.9844 27.45 18.9469 27.4312 18.9281C27.4125 18.9 27.3844 18.8812 27.3375 18.8812V18.9094Z" fill="#816C2A"/>
+<path d="M27.9187 21.8156C27.9187 21.8156 27.825 22.0031 27.7875 22.0031C27.7687 22.0031 27.8812 22.0312 27.9094 22.0781L27.8812 22.125C27.8812 22.125 27.7687 22.0406 27.6937 22.0312V21.975L27.7969 21.9094C27.8375 21.8639 27.8665 21.8092 27.8812 21.75L27.9187 21.8156Z" fill="white"/>
+<path d="M28.3125 21.9375L28.0594 22.0125L27.9375 21.9187C27.9375 21.9187 27.9375 21.825 27.8906 21.7781L27.7406 21.6844C27.6844 21.6656 27.5062 21.6656 27.5062 21.6656L27.0375 21.1687L27.225 21.1875L27.4875 21.15L27.7406 21.1312L27.8719 21.15L28.0219 21.1875L28.0969 21.2531L28.1719 21.3281L28.2469 21.45L28.3031 21.6L28.3219 21.7594V21.9375H28.3125Z" fill="#FCCA3D"/>
+<path d="M28.3312 21.9187C28.3312 21.9187 28.2375 21.9468 28.125 21.9468C28.0031 21.9468 27.9375 21.9281 27.9375 21.9281L27.9187 22.0125C27.9 22.0968 27.8718 22.1343 27.8718 22.1343V22.4343L28.1156 22.4812L28.2468 22.4343L28.3125 22.1062L28.3312 21.9187Z" fill="#AF7029"/>
+<path d="M28.2656 21.7969V21.9094L28.3219 21.9281V21.8156L28.2656 21.7969ZM28.0312 18.9844L28.0031 18.7875L27.9281 18.6469L27.825 18.5063L27.7125 18.3844L27.6562 18.3375L27.6281 18.2906L27.3562 18.3094L27.225 18.4688C27.225 18.4688 27.5812 18.7313 27.7219 19.0125C27.8207 19.0441 27.9107 19.0988 27.9844 19.1719L27.9937 19.1531L28.0312 18.9844Z" fill="#FCCA3D"/>
+<path d="M27.7781 19.2187C27.7781 19.425 27.7313 19.5187 27.7031 19.5656L27.8719 19.3781L27.9844 19.1718C27.9107 19.0987 27.8207 19.0441 27.7219 19.0125C27.7594 19.0781 27.7781 19.1437 27.7781 19.2093V19.2187Z" fill="#AF7029"/>
+<path d="M28.1531 22.3031L28.0219 22.1531C27.9656 22.0968 27.9 22.0593 27.9 22.0593L27.8812 22.0968H27.8906L28.0031 22.1718C28.0466 22.2194 28.0873 22.2695 28.125 22.3218L28.1531 22.3031Z" fill="#816C2A"/>
+<path d="M28.3125 22.0781C28.3125 22.0781 28.2844 22.1719 28.1906 22.2469C28.0969 22.3406 27.9844 22.3875 27.9844 22.3875L28.2469 22.4813L28.425 22.3219L28.3125 22.0781Z" fill="#6F5B24"/>
+<path d="M28.35 22.2938L28.3312 22.3219L28.2843 22.3688L28.2468 22.4156L28.3031 22.1344L28.3593 22.2281V22.2656L28.35 22.2938Z" fill="#404118"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M26.5472 17.1535L26.5428 17.1579L26.5371 17.1556L26.5369 17.1555L26.5361 17.1552L26.5331 17.1541C26.5305 17.1531 26.5268 17.1517 26.5221 17.15C26.5127 17.1467 26.4997 17.1424 26.4853 17.1383C26.4709 17.1343 26.4552 17.1306 26.4404 17.1285C26.426 17.1264 26.4131 17.126 26.403 17.1277C26.3965 17.1312 26.3842 17.1395 26.3672 17.152C26.3493 17.1651 26.3267 17.1825 26.3011 17.2031C26.2498 17.2443 26.1864 17.2981 26.1239 17.3554C26.0613 17.4127 25.9998 17.4733 25.9522 17.5283C25.9284 17.5558 25.9083 17.5818 25.8932 17.605C25.8782 17.6283 25.8687 17.6483 25.8655 17.6641C25.8567 17.7309 25.8879 17.801 25.9228 17.858C25.9401 17.8863 25.958 17.9108 25.9717 17.9297L25.9719 17.9299C25.9787 17.9393 25.9847 17.9474 25.9889 17.9538C25.991 17.957 25.9928 17.96 25.9941 17.9626C25.9951 17.9644 25.9963 17.967 25.9967 17.9699C25.9969 17.9705 25.997 17.9711 25.9971 17.9715C25.9973 17.9725 25.9974 17.9736 25.9975 17.9746C25.9977 17.9767 25.9978 17.9793 25.9978 17.9823C25.9979 17.9883 25.9978 17.9964 25.9976 18.0062C25.9975 18.0124 25.9973 18.0193 25.9971 18.0269C25.9967 18.0433 25.9963 18.0627 25.996 18.0845C25.9951 18.1483 25.9957 18.2317 26.0038 18.3155C26.012 18.3995 26.0277 18.4833 26.0567 18.5482C26.0857 18.613 26.127 18.6571 26.1857 18.6658C26.3115 18.6844 26.4632 18.6867 26.5838 18.6844C26.644 18.6832 26.6963 18.6809 26.7336 18.6788C26.7522 18.6778 26.7671 18.6769 26.7773 18.6762C26.781 18.6759 26.784 18.6757 26.7865 18.6755L26.9203 18.2028C26.918 18.2035 26.9156 18.2044 26.9129 18.2052C26.8965 18.2106 26.8722 18.2177 26.8403 18.2248C26.7764 18.239 26.6819 18.2532 26.5593 18.2532H26.5586C26.4965 18.2484 26.4536 18.2327 26.4246 18.2112C26.3953 18.1895 26.3807 18.1623 26.3744 18.1358C26.3682 18.1095 26.3701 18.0841 26.3735 18.0655C26.3751 18.0561 26.3772 18.0483 26.3789 18.0429C26.3797 18.0402 26.3804 18.038 26.381 18.0365L26.3816 18.0347L26.3818 18.0343L26.3819 18.0341C26.3819 18.0341 26.3819 18.034 26.3906 18.0375L26.3819 18.0341L26.3846 18.0273L26.3918 18.0282C26.4264 18.0326 26.4664 18.0196 26.5169 17.9973C26.5343 17.9896 26.553 17.9808 26.573 17.9713C26.6097 17.954 26.6508 17.9346 26.6962 17.9164C26.7647 17.8844 26.8221 17.8294 26.8602 17.782C26.8793 17.7584 26.8933 17.7369 26.9013 17.7216C26.9025 17.7193 26.9035 17.7172 26.9044 17.7153C26.9 17.7187 26.8949 17.723 26.8888 17.7282C26.8831 17.733 26.8765 17.7385 26.8688 17.7448C26.8368 17.7708 26.7894 17.8064 26.7229 17.8397L26.7224 17.8399C26.656 17.8684 26.5849 17.8873 26.5245 17.8968C26.4942 17.9015 26.4665 17.9039 26.4432 17.9039C26.4201 17.9039 26.4005 17.9016 26.3871 17.8962L26.386 17.8958L26.385 17.895C26.374 17.8868 26.3675 17.8768 26.3644 17.8655C26.3614 17.8545 26.3619 17.8427 26.3637 17.831C26.3655 17.8198 26.3687 17.8078 26.3719 17.7958L26.3723 17.7942C26.3757 17.7814 26.3791 17.7684 26.3813 17.7548C26.3864 17.7195 26.4112 17.6781 26.4392 17.6384C26.4534 17.6183 26.4687 17.5982 26.4834 17.5792C26.4846 17.5776 26.4858 17.576 26.487 17.5744C26.5003 17.5572 26.5128 17.5409 26.5234 17.5261C26.5457 17.4904 26.5524 17.4569 26.5559 17.4225C26.5568 17.4133 26.5575 17.4039 26.5582 17.3943C26.56 17.3686 26.562 17.3417 26.5689 17.3138C26.5718 17.2947 26.5851 17.2749 26.6017 17.2564C26.6188 17.2374 26.6406 17.2182 26.6624 17.2006C26.6775 17.1883 26.6929 17.1765 26.7067 17.1659C26.7128 17.1613 26.7186 17.1568 26.7239 17.1527C26.7328 17.1458 26.7404 17.1397 26.7464 17.1345C26.7517 17.1299 26.7552 17.1264 26.757 17.124C26.758 17.1198 26.7574 17.1133 26.7543 17.1048C26.751 17.0958 26.7454 17.0858 26.7382 17.0764C26.7311 17.0671 26.7227 17.0587 26.7141 17.0528C26.7054 17.0468 26.6973 17.0438 26.6906 17.0438C26.6879 17.0438 26.6836 17.0449 26.6773 17.0477C26.6712 17.0505 26.6642 17.0547 26.6565 17.0598C26.6412 17.07 26.6239 17.0838 26.6076 17.0978C26.5914 17.1117 26.5763 17.1256 26.5652 17.1361C26.5597 17.1414 26.5552 17.1457 26.552 17.1488L26.5485 17.1523L26.5475 17.1532L26.5472 17.1535ZM26.3971 18.0475C26.397 18.0478 26.3969 18.0481 26.3968 18.0484C26.3953 18.0532 26.3934 18.0603 26.3919 18.0688C26.3888 18.0859 26.3872 18.1085 26.3927 18.1314C26.3981 18.1542 26.4105 18.1774 26.4357 18.1961C26.4611 18.2149 26.5001 18.2298 26.5597 18.2344C26.6807 18.2344 26.7736 18.2204 26.8362 18.2065C26.8675 18.1995 26.8913 18.1926 26.9071 18.1874C26.915 18.1848 26.921 18.1827 26.9249 18.1812C26.9269 18.1804 26.9283 18.1798 26.9293 18.1795L26.9304 18.179L26.9306 18.1789L26.9487 18.1712L26.8027 18.687L26.7937 18.6844L26.7944 18.6937L26.7942 18.6938L26.7934 18.6938L26.7903 18.6941C26.7877 18.6943 26.7837 18.6945 26.7785 18.6949C26.7683 18.6956 26.7533 18.6965 26.7346 18.6976C26.6972 18.6996 26.6446 18.702 26.5841 18.7031C26.4633 18.7055 26.3103 18.7032 26.183 18.6843C26.1151 18.6742 26.0697 18.6234 26.0395 18.5558C26.0093 18.4882 25.9934 18.4021 25.9852 18.3173C25.9769 18.2325 25.9763 18.1483 25.9772 18.0843C25.9775 18.0623 25.978 18.0427 25.9784 18.0263C25.9786 18.0187 25.9787 18.0119 25.9789 18.0058C25.9791 17.996 25.9792 17.9882 25.9791 17.9826C25.979 17.9798 25.9789 17.9777 25.9788 17.9763C25.9788 17.9759 25.9787 17.9755 25.9787 17.9753L25.9781 17.9741V17.9726C25.978 17.9724 25.9778 17.9719 25.9774 17.9711C25.9766 17.9694 25.9752 17.9671 25.9732 17.9641C25.9693 17.9582 25.9637 17.9505 25.9567 17.9409L25.9565 17.9406C25.9427 17.9217 25.9245 17.8967 25.9068 17.8678C25.8715 17.8101 25.8371 17.735 25.8469 17.6613L25.847 17.6607C25.8509 17.6414 25.8619 17.619 25.8775 17.5948C25.8932 17.5706 25.9139 17.5439 25.938 17.5161C25.9863 17.4603 26.0484 17.3991 26.1112 17.3415C26.1741 17.284 26.2378 17.2299 26.2894 17.1885C26.3151 17.1678 26.3379 17.1502 26.3561 17.1369C26.374 17.1237 26.3879 17.1143 26.3958 17.1104L26.3969 17.1098L26.3981 17.1096C26.4114 17.1069 26.4273 17.1077 26.443 17.1099C26.459 17.1122 26.4755 17.1161 26.4904 17.1203C26.5053 17.1245 26.5187 17.1289 26.5283 17.1323C26.5323 17.1338 26.5357 17.135 26.5383 17.136L26.5389 17.1354C26.5421 17.1323 26.5467 17.1278 26.5523 17.1225C26.5635 17.1119 26.5789 17.0977 26.5954 17.0835C26.6119 17.0694 26.6299 17.055 26.6461 17.0442C26.6543 17.0388 26.6622 17.0341 26.6694 17.0307C26.6765 17.0275 26.6839 17.025 26.6906 17.025C26.7026 17.025 26.7144 17.0302 26.7248 17.0374C26.7353 17.0446 26.745 17.0545 26.7531 17.065C26.7612 17.0756 26.7679 17.0873 26.7719 17.0984C26.7758 17.1093 26.7778 17.1211 26.7745 17.1311L26.7741 17.1323L26.7734 17.1333C26.7703 17.138 26.7649 17.1433 26.7587 17.1487C26.7523 17.1542 26.7443 17.1606 26.7355 17.1675C26.7299 17.1718 26.724 17.1763 26.7179 17.181C26.7041 17.1915 26.6892 17.203 26.6742 17.2151C26.6527 17.2326 26.6317 17.251 26.6157 17.2689C26.5994 17.2871 26.5893 17.3035 26.5874 17.317L26.5872 17.3179C26.5807 17.3442 26.5788 17.3689 26.577 17.3942C26.5763 17.4041 26.5755 17.4142 26.5745 17.4244C26.5709 17.4603 26.5637 17.497 26.5392 17.5362L26.5389 17.5367C26.528 17.5519 26.5152 17.5685 26.5019 17.5858C26.5007 17.5874 26.4994 17.589 26.4982 17.5906C26.4836 17.6097 26.4684 17.6294 26.4545 17.6492C26.4263 17.6891 26.4042 17.7273 26.3999 17.7576L26.3998 17.7578C26.3974 17.7724 26.3938 17.7862 26.3904 17.799L26.3901 17.8001C26.3868 17.8125 26.3839 17.8237 26.3823 17.8339C26.3806 17.8444 26.3805 17.8532 26.3825 17.8606C26.3843 17.8674 26.3881 17.8736 26.3952 17.8793C26.4054 17.883 26.4216 17.8852 26.4432 17.8852C26.4653 17.8852 26.492 17.8829 26.5216 17.8783C26.5805 17.869 26.65 17.8505 26.7148 17.8228C26.7794 17.7904 26.8257 17.7557 26.8569 17.7303C26.864 17.7245 26.8705 17.719 26.8763 17.7142C26.8831 17.7085 26.8889 17.7036 26.8936 17.7C26.8979 17.6966 26.9021 17.6936 26.9058 17.6918C26.9076 17.6909 26.9101 17.69 26.9128 17.6899C26.9148 17.6898 26.9171 17.6901 26.9192 17.6912C26.9205 17.6916 26.9218 17.6923 26.923 17.6933C26.9253 17.6951 26.9264 17.6975 26.9269 17.6995C26.9278 17.7029 26.9272 17.7065 26.9266 17.7091C26.9253 17.7148 26.9222 17.7221 26.9179 17.7303C26.9092 17.7469 26.8945 17.7694 26.8748 17.7938C26.8356 17.8425 26.776 17.8999 26.7039 17.9335L26.7034 17.9337C26.6583 17.9518 26.6184 17.9707 26.582 17.9878C26.5618 17.9974 26.5427 18.0064 26.5245 18.0145C26.4773 18.0353 26.4354 18.0499 26.3971 18.0475Z" fill="#78732E"/>
+<path d="M29.8782 15.9937C29.8782 15.9937 29.2219 15.8719 29.2219 16.4156C29.2313 16.5937 29.2688 16.65 29.4094 16.6969C29.55 16.725 29.8219 16.7437 30.0657 16.95C30.3 17.1656 30.3188 17.325 30.3188 17.4469C30.3188 17.5781 30.2532 17.6906 30.2532 17.6906L30.4032 18.4125L30.5532 18.9469L31.0032 18.6937L31.2657 17.8969L30.9282 16.4719L29.8782 15.9937Z" fill="#AB6D29"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M29.8816 15.9754C29.8816 15.9754 29.8816 15.9754 29.8782 15.9938L29.8859 15.9767L30.9443 16.4587L31.2851 17.8978L31.0187 18.7066L30.5415 18.975L30.3847 18.4164L30.2333 17.6874L30.2369 17.6812L30.2371 17.681L30.2375 17.6802C30.238 17.6794 30.2386 17.6783 30.2395 17.6767C30.2411 17.6736 30.2436 17.6689 30.2466 17.6628C30.2525 17.6507 30.2604 17.6331 30.2684 17.6115C30.2843 17.5682 30.3 17.5096 30.3 17.4469C30.3 17.3872 30.2954 17.3196 30.2628 17.2408C30.2301 17.1619 30.1687 17.0704 30.0532 16.9641C29.8481 16.7907 29.6236 16.7528 29.4736 16.7274C29.4488 16.7232 29.426 16.7194 29.4057 16.7153L29.4046 16.7151L29.4035 16.7147C29.3319 16.6909 29.2825 16.6634 29.2508 16.6159C29.2197 16.5692 29.2079 16.5061 29.2032 16.4167L29.2031 16.4157C29.2031 16.2757 29.2455 16.1765 29.3108 16.1075C29.3757 16.0389 29.4616 16.0018 29.5458 15.9826C29.6301 15.9633 29.714 15.9616 29.7765 15.9645C29.8078 15.966 29.834 15.9687 29.8523 15.971C29.8615 15.9722 29.8687 15.9733 29.8737 15.974C29.8762 15.9744 29.8781 15.9748 29.8795 15.975L29.881 15.9753L29.8814 15.9753L29.8816 15.9754ZM30.2729 17.6937L30.4214 18.4081L30.5648 18.9189L30.9876 18.681L31.2462 17.8961L30.912 16.4852L29.8726 16.0119C29.8714 16.0117 29.8698 16.0114 29.8679 16.0111C29.8632 16.0104 29.8564 16.0093 29.8476 16.0082C29.8301 16.006 29.8049 16.0034 29.7747 16.002C29.7142 15.9991 29.634 16.0009 29.5542 16.0191C29.4744 16.0374 29.3962 16.0718 29.3381 16.1333C29.2804 16.1942 29.2407 16.2836 29.2407 16.4152C29.2453 16.5036 29.257 16.5575 29.282 16.5951C29.3065 16.6319 29.3459 16.6559 29.4142 16.6788C29.4332 16.6825 29.4549 16.6862 29.4787 16.6902C29.6284 16.7153 29.864 16.7549 30.0778 16.9357L30.0784 16.9362C30.1971 17.0455 30.2622 17.1414 30.2974 17.2265C30.3327 17.3117 30.3375 17.3848 30.3375 17.4469C30.3375 17.5155 30.3204 17.5787 30.3036 17.6245C30.2951 17.6475 30.2866 17.6662 30.2803 17.6793C30.2773 17.6853 30.2748 17.6902 30.2729 17.6937Z" fill="#4D2A15"/>
+<path d="M30.525 18.75C30.525 18.75 30.7594 18.6563 30.8063 18.4688C30.8344 18.4219 30.5813 18.1969 30.5813 18.1969C30.5719 18.1969 30.7031 18.2625 30.7688 18.3188C30.825 18.375 30.8719 18.4031 30.8906 18.3938C30.9094 18.3844 31.0125 18.1406 30.975 18.0844C30.9375 18.0281 30.8719 17.8969 30.7781 17.8406C30.6844 17.775 30.5531 17.7844 30.5531 17.7844C30.5531 17.7844 30.7313 17.7281 30.8156 17.7844C30.9094 17.8313 30.9094 17.8781 30.9187 17.8688C30.9281 17.8406 30.9 17.5969 30.8625 17.5219C30.825 17.4281 30.7875 17.4 30.675 17.3719C30.5719 17.3531 30.4594 17.3625 30.4594 17.3625C30.4594 17.3625 30.6094 17.2781 30.7219 17.3063C30.8438 17.3344 30.8438 17.4 30.8531 17.3813C30.8531 17.3719 30.7969 17.1563 30.7594 17.1C30.7062 17.0307 30.6391 16.9732 30.5625 16.9313L30.3938 16.9125H30.3375C30.3375 16.9125 30.4313 16.8563 30.5344 16.8656C30.6469 16.875 30.6563 16.9125 30.6656 16.9031C30.6844 16.9031 30.6562 16.8844 30.5906 16.8375C30.525 16.7906 30.1969 16.65 30.1969 16.65H29.8875C29.8875 16.65 29.8875 16.575 29.9812 16.5563C30.0656 16.5469 30.0844 16.5656 30.075 16.5469C30.075 16.5188 29.8313 16.4719 29.8313 16.4719H29.625L29.3438 16.5C29.3438 16.5 29.3625 16.4531 29.4094 16.4156C29.4375 16.3875 29.4938 16.3688 29.5312 16.3594C29.625 16.3313 29.475 16.2563 29.475 16.2563L29.5594 16.1344L29.925 16.1625L30.6937 16.6125L31.0594 16.9219L31.2844 17.5031L31.2188 18.5156L30.7031 18.9375L30.4781 18.9656L30.525 18.75Z" fill="#4D2A15"/>
+<path d="M29.85 16.2469C29.85 16.2469 29.8313 16.1813 29.8313 16.0875C29.8313 15.9938 29.85 16.0032 29.85 16.0032C29.85 16.0032 29.5969 15.975 29.4188 16.1157C29.2407 16.2563 29.3438 16.5 29.3438 16.5C29.3438 16.5 29.4188 16.425 29.5219 16.3875C29.6157 16.35 29.8032 16.3594 29.8032 16.3594C29.8219 16.3407 29.7657 16.2657 29.7 16.2563C29.625 16.2375 29.5032 16.2375 29.5032 16.2375C29.5032 16.2375 29.5782 16.1907 29.7094 16.2C29.8407 16.2094 29.8594 16.2469 29.8594 16.2469H29.85Z" fill="#D2A567"/>
+<path d="M30.6282 18.8344L30.4594 18.8906L30.5532 19.5937L31.2282 20.7281L31.575 20.6719L31.6969 20.4562L31.7907 20.5031C31.8282 20.5406 31.9594 20.7656 32.0719 20.8125C32.175 20.85 32.2313 20.8312 32.325 20.9062C32.4188 21 32.7844 21.525 32.7938 21.5437C32.8219 21.5625 32.7844 21.3187 32.7844 21.3187L32.6719 21L32.5407 20.775L32.5125 20.7187H32.7L32.8125 20.7937L33 20.9344L33.0844 21.0469L33.1313 21.1594L33.15 21.2531L33.1969 21.4031L33.2907 21.6187L33.4125 21.8156L33.45 21.7312L33.3938 21.4969L33.2063 20.9344L33.1125 20.7469L33.2907 20.8594C33.3282 20.8687 33.4594 21.0656 33.4594 21.0656L33.5438 21.2719L33.6 21.4594L33.6375 21.6187L33.7032 21.7969L33.7969 21.7312L33.7875 21.6094L33.6938 21.2156L33.6563 20.7937C33.6563 20.7937 33.7125 20.7937 33.7688 20.8594C33.8165 20.9254 33.8544 20.998 33.8813 21.075L33.9282 21.4594L33.9938 21.8156L34.1063 22.1719L34.2188 22.3969L34.3032 22.5187V22.3312L34.1532 20.8312L34.1719 20.775C34.1719 20.775 34.1907 20.7656 34.2469 20.8406C34.2938 20.9062 34.3407 21.0187 34.3407 21.0187L34.3875 21.2531L34.4063 21.4125L34.4344 21.7219L34.4813 22.05L34.6313 22.4062L34.7157 22.5937L34.7625 22.3687L34.6875 20.7656L34.725 20.7187C34.725 20.7187 34.8094 20.7844 34.8375 20.8406L34.9125 20.9344L34.9688 21.2906L35.0063 22.2937L35.0438 22.5562L35.3438 19.9125L35.5313 19.875L35.55 19.8187L35.4094 19.725L35.1094 19.2562L34.9125 18.7969L34.5563 18.1406L33.9375 17.3906L33.45 16.9875C33.3931 16.9435 33.3336 16.9028 33.2719 16.8656L33.3094 16.7719L33.4032 16.6125L33.3938 16.6031H33.3094L33.1032 16.6406L32.8969 16.575L32.4844 16.2937L32.0532 16.0781L31.7907 15.9844L31.1719 15.8344L30.5532 15.7406H30.2719L30.0282 15.7875C30.0282 15.7875 29.8969 15.8437 29.8594 15.9281C29.8125 16.0031 29.8125 16.0594 29.8219 16.1719C29.8407 16.2937 29.9157 16.35 30.0844 16.425C30.2532 16.4906 30.6657 16.7625 30.6657 16.7625L30.8532 16.9594L30.9282 17.0531L30.9469 17.1281L31.0782 18.1687L30.8157 18.7312L30.6282 18.825V18.8344Z" fill="#8F4620"/>
+<path d="M31.2937 20.4563C31.2937 20.4563 31.4062 20.6438 31.5656 20.5031C31.725 20.3531 31.4906 19.9406 31.5 19.9125C31.5 19.8844 31.5656 19.8844 31.5656 19.8844L31.6875 20.0906C31.6875 20.0906 31.7531 20.2125 31.725 20.3906C31.7062 20.5781 31.5281 20.7375 31.5281 20.7375L31.3218 20.6906L31.2937 20.4563Z" fill="#AB6D29"/>
+<path d="M35.1844 22.8938L35.0344 22.4719L34.9969 22.1438C34.9969 22.0875 34.9687 21.4031 34.95 21.2719C34.95 21.1406 34.95 20.9906 34.9313 20.9813L34.7812 20.775L34.7156 20.7094L34.7625 20.6813C34.7625 20.6813 34.8187 20.7375 34.8281 20.7094C34.8469 20.6719 34.8281 20.5219 34.7719 20.2875C34.7062 20.0531 34.4062 19.5094 34.4062 19.5094L34.4437 19.5281L34.5281 19.6219L34.6969 19.7625L35.0813 19.9031L35.2875 19.9313L35.4187 20.2031C35.4187 20.2031 35.5125 20.6625 35.5125 20.8969C35.5125 21.1219 35.4938 21.3188 35.4 21.5531C35.3063 21.7781 35.2875 22.5188 35.2781 22.6313C35.2687 22.7531 35.2219 22.8656 35.2219 22.8656L35.175 22.8938H35.1844Z" fill="#4D2A15"/>
+<path d="M35.1843 21.675C35.1843 21.675 35.2593 21.5812 35.2968 21.45C35.3343 21.3187 35.3437 20.2875 35.2218 20.1656C35.1154 20.0655 34.9869 19.9916 34.8468 19.95C34.8281 19.95 34.9406 20.2781 34.9406 20.2781L35.0156 20.4093L35.0718 20.5781C35.0812 20.6718 35.1562 20.8687 35.1656 21.1406L35.1843 21.675Z" fill="#8F4620"/>
+<path d="M34.6219 22.3125C34.6219 22.3125 34.6687 21.8343 34.65 21.4687C34.6219 21.1218 34.5937 21.075 34.5562 21.0093C34.4576 20.8212 34.379 20.6233 34.3219 20.4187C34.2375 20.1187 34.1812 19.8937 34.1344 19.8375C34.0781 19.7812 33.975 19.65 33.9469 19.6875C33.9187 19.7156 33.9187 19.7906 33.9187 19.7906L33.7781 19.7531L33.7406 19.6593L33.7875 19.5093V19.4437L33.7594 19.3406L33.9469 19.4906L34.3406 19.7531L34.5281 20.5593L34.7156 21.0562L34.7344 21.9L34.7156 22.65L34.6219 22.3218V22.3125ZM34.8469 19.9968C34.8469 19.9968 34.9406 20.0906 35.0062 20.1281C35.0719 20.1656 35.175 20.2312 35.1562 20.2406C35.0906 20.2241 35.0276 20.1989 34.9687 20.1656L34.8562 20.0906V19.9968H34.8469Z" fill="#4D2A15"/>
+<path d="M34.0969 22.125C34.0969 22.125 34.1719 21.9562 34.1625 21.7406C34.1367 21.4679 34.0865 21.1981 34.0125 20.9344C33.975 20.8688 33.825 20.775 33.6844 20.4844C33.5438 20.1937 33.5625 20.1281 33.4688 20.0156C33.375 19.9219 33.2813 19.7906 33.2813 19.7906L33.3094 19.4813L33.6469 19.65L33.7969 19.725L33.9656 20.5406L34.1156 20.775L34.1813 21.1031L34.2656 21.8531L34.3031 22.4719L34.2844 22.5187L34.0969 22.125ZM33.7031 21.7781C33.7031 21.7781 33.7125 21.5437 33.6563 21.3281C33.5906 21.1125 33.5531 20.9531 33.4781 20.8781C33.4125 20.8125 33.2438 20.6344 33.0938 20.4094C32.9438 20.175 32.7281 19.9406 32.7281 19.9406V19.6312L32.9156 19.7719C32.9915 19.8076 33.0665 19.8451 33.1406 19.8844L33.2344 20.2313L33.3469 20.4844L33.5156 20.7094L33.6281 20.8125L33.6938 21.1875L33.7313 21.4031L33.825 21.7031L33.7875 21.8625L33.7031 21.7781ZM33.4219 21.7781L33.3281 21.6937C33.3281 21.6937 33.3844 21.6375 33.3563 21.5062C33.3281 21.3937 33.3 21.2812 33.2438 21.1594C33.1875 21.0469 33.1781 20.9719 33.15 20.9437C33.0125 20.8153 32.8719 20.6902 32.7281 20.5687C32.6344 20.475 32.475 20.325 32.3813 20.2594C32.2875 20.2031 32.2125 20.1844 32.2125 20.1844L32.1656 19.8094C32.1656 19.8094 32.2875 19.9781 32.3625 19.9969C32.4276 20.0232 32.4933 20.0482 32.5594 20.0719L32.8219 20.5406L32.9156 20.6625L33.1594 20.85L33.2531 21.0563L33.3375 21.2906L33.4313 21.6094L33.4406 21.7969L33.4219 21.7875V21.7781ZM32.9063 21.6844C32.9063 21.6844 32.7469 21.4969 32.7188 21.3844C32.7 21.2719 32.7375 21.2719 32.6906 21.1406C32.6438 21.0094 32.475 20.8125 32.3438 20.7094C32.2125 20.5969 32.025 20.4469 32.0344 20.3531C32.0438 20.2688 32.0719 20.2594 32.0719 20.2594L32.1469 20.3344L32.5688 20.775L32.7 21.0094L32.7938 21.3L32.8594 21.4406L32.925 21.6094L32.9063 21.675V21.6844ZM34.4063 19.5C34.4063 19.5 34.6969 19.8563 34.7813 19.5281C34.8094 19.3781 34.6688 19.0969 34.6688 19.0969C34.6688 19.0969 34.4063 18.6281 34.3125 18.5156L33.7781 17.8312L33.45 17.6813L33.5625 17.8688C33.5625 17.8688 33.8063 18.1125 34.1156 18.6562C34.425 19.1906 34.3688 19.4906 34.3688 19.4906H34.4156L34.4063 19.5ZM32.7375 17.3438C32.7375 17.3438 33.3094 17.8313 33.675 18.3563C34.05 18.8906 34.1906 19.2375 34.1156 19.3125C34.0219 19.3781 33.7969 19.275 33.7031 19.125C33.6094 18.975 33.5344 18.7125 33.1875 18.3187C32.8406 17.925 32.6719 17.8688 32.6719 17.8688L32.4188 17.4656L32.7375 17.3438ZM32.4375 18.5156C32.4375 18.5156 32.775 18.7969 33 19.0219C33.1156 19.1453 33.2222 19.2769 33.3188 19.4156L33.45 19.5469C33.45 19.5469 33.3656 19.4062 33.4125 19.3594C33.4594 19.3031 33.5156 19.3312 33.5156 19.3312L32.4375 18.2062V18.5156ZM32.3719 18.5438C32.3719 18.5438 32.4844 18.7594 32.6531 18.9281C32.7805 19.0539 32.9086 19.1789 33.0375 19.3031L33.1125 19.575C33.1125 19.575 32.625 19.2 32.625 19.2938C32.625 19.3875 32.7375 19.575 32.7375 19.575L32.5875 19.4813L32.3813 19.1906L32.2594 18.9281L32.1188 18.5719L32.3719 18.5438Z" fill="#4D2A15"/>
+<path d="M30.8906 19.7063C30.8906 19.7063 31.1437 19.9313 31.2844 19.7063C31.425 19.4906 31.3125 19.2375 31.3125 19.2375C31.3125 19.2375 31.6781 19.7625 31.7812 19.2656C31.8 19.1719 31.5562 18.8344 31.5562 18.8344L31.65 18.75L31.8281 19.0594C31.8281 19.0594 31.9969 18.9844 31.9969 18.7781C31.9969 18.5719 31.8187 18.2813 31.8187 18.2813L31.9875 18.4688C31.9875 18.4688 32.325 18.4688 32.3344 18.2813C32.3344 18.075 32.0531 17.8594 32.0531 17.8594C32.0531 17.8594 32.2781 17.8688 32.2781 17.7375C32.2781 17.6063 31.9594 17.5125 31.9594 17.4281C31.9594 17.3438 32.0531 17.2031 32.1937 17.2875C32.3344 17.3625 32.5218 17.4188 32.6062 17.2688C32.6812 17.1188 32.5969 17.0813 32.5969 17.0813L32.4 17.0438L32.0812 16.875L31.8281 16.7813L31.5656 16.7438L31.6594 16.9313L31.7344 17.475V17.7188L31.7812 18.2625L31.65 18.7031L31.5844 18.7875L31.5375 18.8438L31.425 19.0875L31.275 19.2563L31.0687 19.5094L30.8812 19.7063H30.8906Z" fill="#4D2A15"/>
+<path d="M32.7 20.7094C32.7 20.7094 32.6343 20.55 32.4937 20.4375C32.3867 20.3698 32.2639 20.331 32.1375 20.325L32.5125 20.7188L32.7 20.7094ZM33.225 20.8031C33.225 20.8031 33.1031 20.5594 32.9625 20.4094C32.8218 20.2594 32.7281 20.0719 32.6812 20.0719H32.625L32.6625 20.3813L32.9156 20.6344C32.9156 20.6344 33.1593 20.8219 33.225 20.8031ZM33.6562 20.7844C33.6562 20.7844 33.6 20.5031 33.45 20.2219C33.3093 19.9594 33.1593 19.8469 33.1593 19.8469L33.1968 20.1281L33.3093 20.4094L33.4968 20.6906L33.6562 20.7844ZM34.0125 20.625C34.0125 20.625 34.1062 20.0438 34.0125 19.875C33.9281 19.725 33.7593 19.6875 33.7593 19.6875L33.7031 19.7813L33.7593 20.1844L33.9 20.5031L34.0125 20.625ZM34.3593 19.6594C34.3593 19.6594 34.4437 19.6969 34.5468 19.8938C34.6581 20.1525 34.7399 20.423 34.7906 20.7C34.7906 20.7281 34.7437 20.7188 34.725 20.7188C34.7062 20.7094 34.3593 20.1563 34.3593 20.1563L34.3031 19.65H34.3593V19.6594Z" fill="#AB6D29"/>
+<path d="M31.9126 20.325C31.9126 20.325 32.1001 20.2875 32.1001 20.2313C32.1001 20.1563 31.8751 20.025 31.8938 19.9219C31.8938 19.875 32.0813 19.9313 32.0907 19.8938C32.1001 19.8563 31.9032 19.5563 31.9688 19.4813C32.0251 19.4063 32.1938 19.8094 32.1938 19.8094C32.1938 19.8094 32.2876 19.9969 32.2594 20.1094C32.1469 20.4469 31.9126 20.325 31.9126 20.325ZM32.3438 19.9125C32.3532 19.8844 32.6344 19.95 32.6344 19.9313C32.6532 19.8657 32.3813 19.65 32.3813 19.65C32.3813 19.65 32.3251 19.5375 32.3438 19.5188C32.3626 19.5 32.5313 19.5375 32.5313 19.5188C32.5501 19.4907 32.3438 19.2188 32.3438 19.1719C32.3438 19.125 32.4001 19.1719 32.4001 19.1719C32.4001 19.1719 32.5594 19.3313 32.6438 19.4719C32.7376 19.6032 32.8126 19.7157 32.7844 19.9313C32.7469 20.1657 32.3157 19.9875 32.3438 19.9125ZM33.6188 19.4813C33.6188 19.4813 33.5719 19.2938 33.6001 19.2657L33.7032 19.2188C33.7032 19.2188 33.5532 19.125 33.4782 19.125C33.4126 19.125 33.4032 19.1063 33.3844 19.125C33.3657 19.1625 33.5063 19.35 33.5063 19.35L33.6188 19.4813Z" fill="#D2A567"/>
+<path d="M32.7562 19.6312C32.7562 19.6312 33.1969 19.7437 33.2156 19.7062C33.2344 19.6781 32.8687 19.3312 32.8687 19.3312C32.8687 19.3312 32.8406 19.275 32.85 19.2562C32.85 19.2375 33.0094 19.2281 33.0562 19.2656C33.1031 19.3031 33.0562 19.3781 33.0656 19.4062C33.0844 19.4343 33.225 19.6406 33.2531 19.6031C33.2719 19.575 33.2156 19.3218 33.225 19.2937C33.2437 19.275 33.3937 19.4437 33.4406 19.4718C33.4781 19.5 33.7219 19.6875 33.75 19.6031C33.7781 19.5093 33.7875 19.5 33.7781 19.4437C33.7781 19.3875 33.8625 19.6875 33.75 19.725C33.6375 19.7625 33.5062 19.6875 33.5062 19.6875L33.4031 19.6125L33.3469 19.5468C33.3469 19.5468 33.4125 19.7812 33.3281 19.8C33.2531 19.8281 33.1687 19.8187 33.1687 19.8187L32.9812 19.8L32.7562 19.6312ZM33.7594 19.3312C33.7594 19.3312 34.2281 19.6125 34.2656 19.5656C34.3125 19.5187 34.1531 18.8625 34.1719 18.7968C34.2 18.7406 34.5469 19.5375 34.3781 19.6406C34.2469 19.7343 34.1906 19.6687 34.1906 19.6687L33.9562 19.5468L33.7687 19.3312H33.7594ZM35.0531 20.5125L35.1469 20.5593L35.2125 20.5781L35.0812 20.5968L35.0531 20.5031V20.5125ZM34.6031 18.975L34.6687 19.0031L34.7344 19.0312C34.7344 19.0312 34.6969 19.0593 34.6781 19.05H34.6406L34.6031 18.975ZM34.4719 18.7406C34.4719 18.7406 34.5187 18.7687 34.575 18.7218C34.6406 18.6843 34.6406 18.6468 34.6312 18.6281C34.6312 18.6093 34.5375 18.6093 34.5 18.5812C34.4719 18.5625 34.4719 18.525 34.4719 18.525H34.3687L34.3312 18.5343L34.4719 18.7406ZM34.875 20.0906C34.875 20.0906 35.0156 20.1843 35.0625 20.1843C35.1 20.1843 35.1656 20.2312 35.1562 20.2406C35.1562 20.25 35.0437 20.2593 34.9875 20.2312C34.9312 20.2031 34.9219 20.2218 34.9219 20.2218L34.875 20.0906ZM34.1156 17.9812H34.1719C34.2 17.9812 34.2187 17.9625 34.2281 17.9812C34.2469 18 34.2281 18.0937 34.2 18.1218L34.1062 18.1687C34.0543 18.1014 34.0043 18.0326 33.9562 17.9625L34.1156 17.9812ZM33.45 17.3812H33.5906C33.6375 17.3812 33.6844 17.4093 33.7312 17.4375C33.7687 17.4656 33.8156 17.7468 33.7875 17.7937C33.7687 17.85 33.45 17.6062 33.4406 17.5968C33.4406 17.5687 33.3 17.3625 33.3 17.3625L33.45 17.3812ZM33.15 17.25C33.15 17.25 33.3844 17.2687 33.3562 17.1281C33.3524 17.0855 33.3396 17.0443 33.3186 17.0071C33.2976 16.9699 33.2688 16.9377 33.2344 16.9125L32.9625 17.1093L33.15 17.25ZM32.5406 16.9875C32.5406 16.9875 32.6062 17.025 32.6719 16.9875C32.7375 16.9687 32.9156 16.7343 33.0469 16.7062C33.1781 16.6781 33.2062 16.6781 33.2344 16.7062C33.2531 16.7437 33.2344 16.875 33.2156 16.9125C33.1875 16.95 32.8031 17.1 32.8031 17.1L32.6625 17.0906C32.6208 17.0779 32.58 17.0623 32.5406 17.0437V16.9875ZM32.475 16.5656C32.4094 16.4343 32.3156 16.3781 32.2687 16.3875C32.2312 16.3968 32.4 16.5281 32.4281 16.7156C32.4562 16.9031 32.4469 17.025 32.4469 17.0343L32.5219 17.0437L32.5406 16.9781L32.55 16.9312V16.8843L32.5406 16.7906L32.5219 16.7062L32.5031 16.65L32.475 16.5656ZM31.9312 16.3781C31.7866 16.2264 31.6106 16.108 31.4156 16.0312C31.3969 16.0312 31.7906 16.2656 31.8844 16.4062C31.9687 16.5656 31.9687 16.7718 32.0062 16.8C32.0437 16.8281 32.0812 16.7812 32.0906 16.7812C32.0906 16.7812 32.1187 16.7343 32.1094 16.7156L32.0906 16.6218L32.025 16.5281L31.9875 16.4531L31.9312 16.3781ZM31.4156 16.1625C31.1906 15.975 30.7969 15.8812 30.4781 15.8812C30.15 15.8625 29.9812 15.9 30.0281 16.0687C30.075 16.2375 30.2156 16.3312 30.4969 16.3312C30.7687 16.3312 30.8344 16.3031 30.9844 16.35C31.109 16.3876 31.2241 16.4515 31.3219 16.5375C31.3687 16.5843 31.2187 16.3968 31.0781 16.2937C30.9375 16.1812 30.8437 16.1343 30.8437 16.1343C30.8437 16.1343 30.8156 16.0687 31.0031 16.0968C31.1906 16.125 31.4437 16.2468 31.5187 16.4062C31.5844 16.5656 31.575 16.65 31.575 16.6875C31.575 16.7156 31.6406 16.6687 31.6406 16.6687L31.6687 16.5843C31.6687 16.5843 31.6687 16.5281 31.6406 16.4531C31.6031 16.3875 31.5937 16.3593 31.5094 16.2656C31.425 16.1625 31.4156 16.1718 31.4156 16.1718V16.1625ZM30.5156 18.8343C30.6562 18.8343 30.9656 18.5718 31.0031 18.2062C31.05 17.8312 30.825 17.0906 30.7687 17.0156C30.7219 16.9312 30.8625 16.9781 30.9281 17.0531C31.0783 17.3631 31.1583 17.7024 31.1625 18.0468C31.1625 18.4406 31.0875 18.5437 30.8812 18.75C30.675 18.9375 30.5062 18.9187 30.5062 18.9187L30.5156 18.8343ZM30.9937 19.9218C30.9937 19.9218 31.0594 20.0156 31.1437 19.9781C31.2844 19.9312 31.5 19.8187 31.5 19.6218C31.5 19.4906 31.3312 19.3687 31.3219 19.3218V19.2281L31.4719 19.2656L31.5187 19.4718C31.5187 19.4718 31.575 19.5375 31.6406 19.5093C31.6969 19.4906 31.875 19.3593 31.8469 19.2281C31.8187 19.1156 31.6594 18.9562 31.6406 18.9C31.6219 18.8343 31.6406 18.7875 31.6406 18.7875L31.7906 18.8062L31.8281 18.9937C31.8281 18.9937 31.8656 19.05 31.95 19.0312C32.025 19.0218 32.175 18.8718 32.1375 18.7968L31.9969 18.5531V18.4687L32.0437 18.5062C32.0437 18.5062 32.1 18.525 32.2125 18.4968C32.3156 18.4593 32.4281 18.3843 32.4281 18.3093C32.4281 18.2343 32.3344 18.1593 32.3344 18.1218V18.0656H32.4094L32.5031 18.1781L32.5125 18.3093L32.4844 18.4218L32.3531 18.5718L32.2219 18.6281H32.1844L32.2594 18.7593L32.2406 18.9468L32.1187 19.0593L31.9594 19.1531L31.95 19.3312L31.8562 19.5187L31.6687 19.6312H31.6031L31.5844 19.7437L31.4531 19.9312L31.2375 20.0718L31.0781 20.1L30.9844 19.9687L30.9937 19.9218Z" fill="#D2A567"/>
+<path d="M32.1938 17.9438C32.1938 17.9438 32.5688 18.0469 32.55 17.8125C32.55 17.6907 32.1938 17.3907 32.175 17.3438C32.1469 17.2875 32.1563 17.2219 32.1563 17.2219L32.3344 17.3907C32.3344 17.3907 32.5688 17.4469 32.6344 17.3063C32.7 17.175 32.6438 17.0907 32.6344 17.0907L32.6907 17.0813L32.7938 17.1L32.7844 17.3063L32.6625 17.8219C32.6625 17.8219 32.6907 18.0282 32.5313 18.0375C32.3719 18.0563 32.1938 17.9438 32.1938 17.9438ZM32.5407 20.7094C32.5407 20.7094 32.5407 20.6063 32.4657 20.5219C32.3813 20.4563 32.2313 20.3907 32.2032 20.3719C32.2867 20.4844 32.3743 20.5938 32.4657 20.7H32.5407V20.7094ZM33.0657 20.7282C33.0657 20.7282 32.8782 20.5032 32.85 20.4188C32.8032 20.3438 32.7094 20.175 32.6344 20.1657C32.5594 20.1657 32.7094 20.4469 32.7094 20.4469L33.0094 20.7188H33.0657V20.7282ZM33.5719 20.7282L33.375 20.3344C33.3375 20.25 33.2532 20.0157 33.1594 19.95C33.0657 19.8844 33.1688 20.0532 33.1688 20.0532L33.2719 20.3625L33.45 20.6344L33.5719 20.7282ZM33.9375 20.5032C33.9375 20.5032 33.9282 20.25 33.8907 20.0719C33.8625 19.9032 33.7313 19.7532 33.7219 19.7625V20.0719L33.9375 20.5032ZM34.6969 20.6907L34.5094 20.25C34.4625 20.1 34.3407 19.8657 34.3219 19.8563L34.3594 20.1375L34.5188 20.5782L34.7063 20.6907H34.6969ZM35.3532 19.8938C35.3532 19.8938 35.2407 19.7813 34.9875 19.6782C34.7344 19.5844 34.4813 19.5657 34.4813 19.5657L34.5094 19.6032L34.6313 19.6969L34.8938 19.8375L35.2407 19.9219L35.3625 19.8938H35.3532Z" fill="#D2A567"/>
+<path d="M32.6437 20.0437C32.6437 20.0437 32.6437 20.2687 32.7656 20.4C32.8781 20.5406 33.1406 20.775 33.1969 20.8312C33.2531 20.8781 33.2906 21.15 33.375 21.375C33.45 21.6 33.4687 21.7875 33.5062 21.8531C33.5437 21.9187 33.6094 22.0218 33.5531 22.0125C33.5062 22.0031 33.4594 21.9375 33.4219 21.8531C33.3937 21.7687 33.4031 21.7687 33.4031 21.6656C33.4031 21.5437 33.2344 20.9625 33.15 20.9062C33.0656 20.8406 32.7 20.5312 32.55 20.3156C32.4094 20.1 32.4375 20.0531 32.4375 20.0531H32.6437V20.0437Z" fill="#202020"/>
+<path d="M33.2438 21.4969C33.1688 21.3375 33.1501 21.1875 33.1313 21.0937C33.0202 20.9373 32.8802 20.8036 32.7188 20.7C32.6626 20.6719 32.5407 20.7 32.4938 20.6719L32.1469 20.2969C32.1469 20.2969 32.1001 20.3437 32.1188 20.3531C32.1282 20.3625 32.4376 20.7 32.5501 20.8031C32.6626 20.9156 32.7282 21.15 32.8032 21.3375C32.8876 21.525 32.8501 21.4875 32.8594 21.5719C32.8688 21.6656 32.9251 21.7125 32.9813 21.7125C33.0376 21.7125 33.0563 21.6937 33.0376 21.675C32.9473 21.5807 32.8772 21.469 32.8313 21.3469C32.7657 21.1875 32.6907 20.8875 32.5969 20.7844L32.5688 20.7562L32.6907 20.7375C32.7657 20.7375 33.0751 21.0187 33.1032 21.1125C33.1313 21.1875 33.1032 21.225 33.2344 21.5062C33.3657 21.7875 33.4219 21.8531 33.4219 21.8531H33.4407C33.4407 21.8531 33.3282 21.6656 33.2532 21.4969H33.2438ZM32.7563 19.6312C32.7563 19.6312 32.9907 19.7719 33.0563 19.7906C33.0932 19.8023 33.1308 19.8117 33.1688 19.8187C33.1688 19.8187 33.2063 20.2312 33.3657 20.4562C33.5344 20.6906 33.6657 20.775 33.6657 20.775C33.6657 20.775 33.6657 21.225 33.7969 21.525C33.9188 21.8344 33.9376 22.2094 33.9094 22.275C33.8813 22.3312 33.7782 22.0875 33.7219 21.8719L33.5344 21.2906C33.4841 21.1391 33.4044 20.9989 33.3001 20.8781C33.2251 20.8125 33.2813 20.8219 33.3282 20.8594C33.3657 20.8969 33.4876 21.0469 33.5626 21.2812C33.6376 21.5156 33.6657 21.75 33.7032 21.75C33.7501 21.75 33.7782 21.7219 33.7782 21.6656C33.7782 21.6281 33.7219 21.4969 33.6844 21.2812C33.6682 21.1297 33.6303 20.9813 33.5719 20.8406C33.5344 20.7844 33.4782 20.775 33.3469 20.5219C33.2452 20.3684 33.1662 20.2011 33.1126 20.025C33.0938 19.9125 33.1126 19.9312 33.0938 19.9031C33.0751 19.8937 33.0563 19.9031 32.9438 19.8469C32.8407 19.7906 32.7563 19.6312 32.7563 19.6312Z" fill="#202020"/>
+<path d="M33.3469 19.5469C33.3469 19.5469 33.4782 19.6594 33.5625 19.6875C33.6375 19.725 33.75 19.725 33.75 19.725C33.75 19.725 33.7219 20.1188 33.8719 20.3719C34.0219 20.625 34.1813 20.7656 34.1813 20.7656C34.1813 20.7656 34.2094 20.8594 34.2563 21.4031L34.3219 22.1813C34.3313 22.3969 34.3407 23.175 34.3125 23.1469C34.1907 23.0531 34.2938 22.6406 34.2282 22.4625C34.1719 22.2938 34.0782 22.2656 33.9657 21.7687C33.8532 21.2812 33.9282 21.1687 33.8438 20.9906C33.7594 20.8031 33.6563 20.7844 33.6563 20.7844C33.6563 20.7844 33.8063 20.8219 33.8719 20.9719C33.9282 21.1219 33.9375 21.5344 33.9938 21.7406C34.1063 22.2 34.2657 22.4344 34.2657 22.4344C34.2657 22.4344 34.2282 21.8531 34.1907 21.525C34.1438 21.1969 34.1438 20.925 34.0875 20.8031C34.0219 20.6719 33.8907 20.5781 33.8063 20.4094C33.7313 20.2406 33.7032 19.9125 33.6657 19.8281C33.6282 19.7438 33.6094 19.7719 33.5532 19.7531C33.3657 19.6781 33.3469 19.5469 33.3469 19.5469Z" fill="#202020"/>
+<path d="M33.7594 19.3313C33.7594 19.3313 33.8813 19.4719 34.05 19.575C34.2188 19.6688 34.3125 19.6407 34.3313 19.6688C34.3594 19.6875 34.3031 20.025 34.4813 20.3438C34.6594 20.6625 34.725 20.6719 34.725 20.7188L34.7813 22.0219C34.8094 22.3407 34.8281 23.4094 34.6969 23.4094C34.5656 23.4094 34.6875 22.6125 34.6219 22.4344C34.5563 22.2469 34.5563 22.3032 34.5 22.1532C34.4344 22.0032 34.4344 21.4219 34.3313 21.075C34.2563 20.8125 34.1813 20.775 34.1813 20.775C34.1813 20.775 34.3125 20.8407 34.3688 21.0563C34.425 21.2625 34.4438 21.9938 34.5094 22.0969C34.5844 22.2188 34.6781 22.3594 34.6969 22.4719C34.7086 21.9841 34.6961 21.496 34.6594 21.0094C34.6313 20.9157 34.3313 20.3907 34.3125 20.1C34.2844 19.8 34.275 19.7719 34.2469 19.7532C34.2281 19.725 34.1438 19.7532 34.0031 19.6125C33.8625 19.4813 33.7594 19.3313 33.7594 19.3313Z" fill="#202020"/>
+<path d="M34.4344 19.5C34.4344 19.4719 34.5281 19.6594 34.7812 19.7625C35.0531 19.875 35.3063 19.8563 35.3438 19.8844C35.3719 19.9125 35.5313 20.3063 35.5406 20.8407C35.55 21.3657 35.4469 21.3188 35.3719 21.7782C35.2875 22.2375 35.2781 23.1657 35.2312 23.3063C35.2125 23.3532 35.1844 23.3813 35.1562 23.4657C35.1281 23.5594 35.175 23.7282 35.0906 23.7282C35.0156 23.7282 34.9969 23.5969 34.9969 23.5313C34.9969 23.4563 35.0906 23.2032 35.0906 22.95C35.0906 22.6969 35.0344 22.6688 34.9969 22.3688C34.9594 22.0594 34.9594 21.1032 34.9219 21.0094C34.8937 20.9157 34.725 20.7188 34.725 20.7188C34.725 20.7188 34.9031 20.8313 34.95 20.9625C34.9875 21.0844 34.9969 22.1532 35.0437 22.3688C35.0906 22.5938 35.0719 22.3219 35.0906 22.2C35.1094 22.0782 35.175 21.5438 35.1656 21.2625C35.1563 20.9813 35.0344 20.3813 34.9406 20.2782C34.9406 20.2782 34.9875 20.3344 35.0437 20.4657C35.0437 20.475 35.0813 20.5125 35.1188 20.5313L35.2125 20.5782C35.2125 20.5782 35.1563 20.5782 35.1188 20.55C35.0813 20.5407 35.0625 20.5125 35.0625 20.5125C35.1455 20.7538 35.1867 21.0074 35.1844 21.2625C35.1937 21.75 35.1187 22.8 35.1937 22.8094C35.2687 22.8282 35.2594 22.2469 35.3344 21.7594C35.4094 21.2907 35.5219 21.2157 35.4844 20.8313C35.4563 20.4469 35.3531 20.025 35.2688 19.9688C35.1844 19.9219 34.95 19.9407 34.7438 19.8C34.5375 19.6688 34.425 19.5282 34.4344 19.5ZM31.0781 20.0344C31.0781 20.0344 31.1531 20.0719 31.2375 20.0344C31.3313 19.9875 31.5656 19.8 31.5656 19.725V19.575C31.5656 19.575 31.5656 19.6032 31.6312 19.6125C31.7062 19.6219 31.8937 19.4813 31.9125 19.3875C31.9284 19.291 31.9252 19.1922 31.9031 19.0969C31.8844 19.0594 31.9594 19.125 31.9969 19.0969C32.0344 19.0594 32.2219 18.9375 32.2219 18.8157C32.2219 18.6844 32.1188 18.5719 32.1188 18.5719C32.1188 18.5719 32.2125 18.5907 32.2688 18.5719C32.3156 18.5625 32.5031 18.45 32.4938 18.3469C32.4938 18.2344 32.4281 18.0657 32.2781 18.0469C32.2781 18.0469 32.3906 18.075 32.4938 18.0375C32.5875 18 32.6344 17.9438 32.6344 17.8219C32.6344 17.7094 32.4188 17.4469 32.3906 17.4282C32.3531 17.4094 32.6156 17.5032 32.6719 17.4C32.7469 17.2969 32.7563 17.2219 32.7375 17.1657C32.7188 17.1 32.6625 17.0907 32.6625 17.0907C32.6625 17.0907 32.775 17.1188 32.925 17.0438C33.075 16.9688 33.2062 16.8563 33.2812 16.8657C33.3563 16.8657 33.0656 17.025 33.0469 17.1094C33.0469 17.1469 33.1312 17.2032 33.2625 17.2969C33.2625 17.3063 33.2625 17.3157 33.2812 17.325C33.3469 17.3532 33.5625 17.3625 33.5906 17.3719C33.6094 17.3907 33.3656 17.3813 33.3844 17.4C33.5814 17.5477 33.7607 17.7175 33.9187 17.9063C33.9281 17.9063 33.9656 17.9438 34.0125 17.9532L34.1344 17.9813H33.9844C34.0939 18.1236 34.1971 18.2706 34.2937 18.4219C34.2937 18.4313 34.3313 18.4782 34.3781 18.4969C34.425 18.5157 34.4719 18.5063 34.4812 18.5157C34.4906 18.5344 34.35 18.5157 34.3594 18.5344C34.4703 18.7175 34.5735 18.9052 34.6687 19.0969C34.6687 19.0969 34.3875 18.6 34.0406 18.2063C33.6844 17.8125 33.6 17.7657 33.5906 17.7938C33.5719 17.8313 33.8438 18.1782 33.9938 18.4219C34.1438 18.6657 34.275 18.975 34.275 18.975C34.275 18.975 33.9281 18.2438 33.4313 17.7938C32.9438 17.3438 32.8875 17.2782 32.8406 17.2875C32.7844 17.3063 32.7469 17.6438 32.775 17.7094C32.8031 17.775 33.1688 18.0469 33.4688 18.4125C33.7781 18.7688 34.1719 19.3875 34.1719 19.3875C34.1719 19.3875 33.8906 18.9469 33.4219 18.45C32.9531 17.9532 32.775 17.8313 32.7375 17.8407C32.7 17.8407 32.7 17.9344 32.6438 18.0094C32.5875 18.075 32.475 18.0657 32.475 18.1032C32.475 18.1407 32.8687 18.5063 32.9437 18.5438C33.0281 18.5907 33.075 18.5719 33.1312 18.6L33.2625 18.6938L33.1125 18.6469C33.0563 18.6282 32.9906 18.6188 32.9906 18.6469C32.9906 18.675 33.3187 19.05 33.3656 19.0782C33.4219 19.1063 33.4594 19.0875 33.525 19.1157C33.6 19.1438 33.7125 19.2188 33.7125 19.2188C33.7125 19.2188 33.5906 19.1532 33.5156 19.1438C33.4313 19.125 33.4031 19.1438 33.4031 19.1625C33.4031 19.1813 33.6469 19.5 33.6375 19.5C33.6281 19.5 33.2625 19.0688 32.9531 18.7969C32.6437 18.5157 32.5031 18.4594 32.4844 18.4688C32.4656 18.4782 32.4844 18.5625 32.4 18.5907C32.325 18.6188 32.2594 18.6282 32.2594 18.6563C32.2594 18.6844 32.5406 18.9375 32.7281 19.1625C32.8559 19.3006 32.981 19.4413 33.1031 19.5844L32.6813 19.1813C32.4656 18.975 32.3531 18.9 32.325 18.9C32.3062 18.9188 32.3062 19.0219 32.325 19.05C32.3437 19.0782 32.7563 19.5563 32.7375 19.5657C32.7281 19.5844 32.2687 19.0032 32.2312 19.0032C32.2031 19.0032 32.1844 19.0688 32.1562 19.0969C32.1187 19.1344 31.9875 19.1344 31.9875 19.1907C31.9875 19.2282 32.6438 19.875 32.6344 19.8938C32.6344 19.8938 32.0906 19.425 32.0719 19.4532C32.0531 19.4813 32.2969 19.9219 32.2781 19.9407C32.2687 19.9407 31.9594 19.4719 31.9313 19.4719C31.9031 19.4719 31.9125 19.5282 31.8375 19.5938C31.7438 19.6688 31.65 19.6313 31.65 19.6688C31.65 19.6969 32.1 20.2032 32.0906 20.2125C32.0719 20.2219 31.6219 19.7344 31.6219 19.7625C31.6125 19.7625 31.5844 19.7907 31.6031 19.8282C31.6313 19.95 31.7344 20.1657 31.725 20.1844C31.725 20.1844 31.575 19.8844 31.5375 19.9032C31.5 19.9032 31.5 19.9688 31.425 20.0063C31.3594 20.0532 31.3031 20.0438 31.3031 20.0719C31.3031 20.1 31.3781 20.1657 31.4156 20.2313C31.4531 20.2969 31.4812 20.4563 31.4812 20.4563C31.4812 20.4563 31.4344 20.325 31.3781 20.2407C31.3125 20.1563 31.2562 20.1 31.2 20.1C31.1437 20.1 31.125 20.1469 31.125 20.1469L31.0781 20.0344Z" fill="#202020"/>
+<path d="M35.3437 19.875C35.3437 19.875 35.4844 19.875 35.5031 19.8375C35.5219 19.8094 35.4469 19.8375 35.3156 19.6875C35.1844 19.5375 34.8469 18.5531 34.4719 18.0563C33.8531 17.2406 33.2812 16.8656 33.2812 16.8656C33.2812 16.8656 33.9656 17.2594 34.5 18.0281C35.025 18.8156 35.1562 19.425 35.3063 19.5844C35.4563 19.7438 35.6063 19.7719 35.5875 19.8188C35.5875 19.8656 35.5594 19.8938 35.5031 19.9125L35.3156 19.9219L35.3344 19.8844L35.3437 19.875ZM30.8438 19.6688L30.8719 19.6781C30.9 19.6781 31.0875 19.5 31.0781 19.4438C31.0781 19.4438 30.9844 19.4156 30.9281 19.35C30.8625 19.275 30.8438 19.1719 30.8438 19.1719C30.8438 19.1719 30.9094 19.2938 30.9563 19.3219C31.0125 19.3594 31.0875 19.3781 31.125 19.35C31.1531 19.3313 31.425 19.125 31.4062 19.05C31.4062 19.05 31.3219 19.05 31.2375 18.9938C31.1625 18.9375 31.1438 18.8063 31.1438 18.8063C31.1438 18.8063 31.2 18.9094 31.2844 18.9469C31.3594 18.9844 31.4438 18.975 31.4719 18.9469C31.4906 18.9188 31.6594 18.6656 31.6406 18.6C31.6406 18.6 31.5469 18.6 31.4719 18.5531C31.3875 18.4969 31.35 18.3469 31.35 18.3469C31.35 18.3469 31.4063 18.4688 31.5094 18.4875C31.6125 18.5156 31.6969 18.45 31.7156 18.375C31.7344 18.3 31.7906 18.0281 31.6969 17.9531C31.6969 17.9531 31.5656 18 31.4719 17.9531C31.3781 17.8969 31.3406 17.775 31.3406 17.775C31.3406 17.775 31.425 17.8875 31.5281 17.9063C31.6406 17.9156 31.6875 17.8594 31.7063 17.8125C31.7274 17.7195 31.7242 17.6226 31.6969 17.5313C31.6594 17.4375 31.5937 17.4563 31.575 17.325C31.575 17.325 31.5469 17.3719 31.4062 17.3719C31.2656 17.3719 31.1906 17.2219 31.1906 17.2219C31.1906 17.2219 31.3031 17.3156 31.4156 17.3156C31.4578 17.3089 31.4962 17.2872 31.5238 17.2545C31.5513 17.2218 31.5662 17.1803 31.5656 17.1375C31.5656 17.0719 31.5094 17.0063 31.4719 16.9406C31.4531 16.8656 31.4438 16.7813 31.425 16.7906C31.4063 16.7906 31.3781 16.8656 31.2375 16.8469C31.0969 16.8188 31.0687 16.725 31.0687 16.725C31.0687 16.725 31.1625 16.7906 31.2562 16.7906C31.3312 16.7906 31.3781 16.7438 31.3781 16.6969C31.3781 16.6406 31.35 16.5375 31.1719 16.3875C31.0658 16.299 30.9563 16.2146 30.8438 16.1344C31.0156 16.3389 31.2258 16.5077 31.4625 16.6313C31.4625 16.6313 31.6219 16.6875 31.65 16.6313C31.6594 16.575 31.6594 16.5 31.6031 16.4063C31.5563 16.3125 31.4156 16.1625 31.4156 16.1625C31.4156 16.1625 31.5656 16.2844 31.6312 16.4156C31.7062 16.5375 31.6687 16.6219 31.6781 16.6594C31.6781 16.6875 31.9875 16.8094 32.0531 16.7625C32.1281 16.725 32.1 16.6313 32.0344 16.5469L31.9406 16.3781C31.9406 16.3781 32.0062 16.4531 32.0531 16.5469C32.1094 16.6406 32.1469 16.7063 32.1281 16.7438C32.1094 16.7906 32.0719 16.8094 32.0719 16.8281L32.2875 16.95C32.3812 17.0063 32.5031 17.0438 32.5219 17.025C32.5406 16.9875 32.55 16.9219 32.5406 16.8188C32.5313 16.725 32.475 16.5656 32.475 16.5656C32.475 16.5656 32.5406 16.7156 32.55 16.8188C32.5594 16.9219 32.5406 17.0063 32.5594 17.0438C32.5875 17.0813 32.6625 17.0906 32.6625 17.0906C32.6625 17.0906 32.6062 17.1281 32.475 17.0906C32.3344 17.0531 31.7531 16.7531 31.725 16.7813C31.6969 16.8188 31.9969 16.9969 32.1281 17.1281C32.2688 17.25 32.3344 17.3906 32.3344 17.3906C32.3344 17.3906 32.2313 17.2969 32.1281 17.2406C32.025 17.1844 31.7156 17.025 31.6875 17.0531C31.6687 17.0719 31.8094 17.1 31.8187 17.1188C31.8281 17.1469 31.725 17.2406 31.725 17.2875C31.725 17.325 32.1656 17.6344 32.1469 17.6625C32.1375 17.7 32.0344 17.7844 32.0156 17.775C32.0062 17.775 31.7812 17.6063 31.7812 17.625C31.7812 17.6438 31.9125 17.7656 31.9125 17.7844C31.9125 17.8125 31.8188 17.8594 31.8375 17.9156C31.8563 17.9719 32.0813 18.1594 32.0813 18.225C32.0813 18.2906 31.95 18.3469 31.9781 18.3844L32.1188 18.5719C32.1188 18.5719 31.9875 18.4875 31.95 18.4406C31.9125 18.4031 31.8281 18.3 31.8094 18.3188C31.8 18.3281 31.7156 18.5063 31.7156 18.5531C31.7344 18.5906 31.8375 18.6469 31.8562 18.7688C31.875 18.8719 31.8375 18.9938 31.8281 18.9938C31.8281 18.9938 31.6781 18.8063 31.6406 18.7969C31.6219 18.7969 31.5844 18.8063 31.5563 18.8531C31.5281 18.9 31.4438 19.05 31.4625 19.0781C31.4625 19.1063 31.6125 19.1438 31.6125 19.2563C31.6099 19.3375 31.5763 19.4146 31.5188 19.4719L31.3219 19.2469C31.3031 19.2469 31.1156 19.4625 31.1062 19.4906C31.1062 19.5094 31.2375 19.6125 31.2187 19.65C31.1906 19.6875 31.0969 19.6313 31.05 19.6594L30.8906 19.725C30.8719 19.725 30.8438 19.6688 30.8438 19.6688Z" fill="#202020"/>
+<path d="M33.2812 16.875L33.3281 16.7813C33.3563 16.7532 33.4688 16.6219 33.4219 16.5938C33.3844 16.575 33.2344 16.6219 33.1406 16.6125C33.0469 16.6125 32.9812 16.6313 32.7094 16.3969C32.7094 16.3969 31.8375 15.7969 30.4969 15.7125C30.0656 15.6938 29.8781 15.8438 29.8594 15.9188C29.8594 15.9375 29.9719 15.75 30.3938 15.7594C30.5813 15.7594 31.9406 15.8625 32.6438 16.4157C32.6813 16.4438 32.9156 16.6688 33.1312 16.6407C33.3469 16.6219 33.3938 16.5938 33.3844 16.6219C33.3844 16.6594 33.3188 16.7344 33.3 16.7719C33.2885 16.8057 33.2791 16.8401 33.2719 16.875H33.2812ZM30.9375 17.0625V17.0438C30.9188 17.0063 30.8344 16.8844 30.6844 16.7532C30.4517 16.5888 30.1998 16.4535 29.9344 16.35C29.9062 16.3407 30.4969 16.6219 30.6562 16.7719L30.9375 17.0532V17.0625Z" fill="#202020"/>
+<path d="M30.9375 18.0187C30.9375 18.0187 30.9 17.9625 30.7781 17.8875C30.7051 17.8424 30.6263 17.8077 30.5437 17.7843L30.825 17.85C30.8715 17.8979 30.9067 17.9555 30.9281 18.0187H30.9375ZM30.8625 17.5218C30.8625 17.5218 30.825 17.4656 30.6656 17.4093C30.5063 17.3531 30.4594 17.3625 30.4594 17.3625C30.4594 17.3625 30.6094 17.2968 30.7219 17.3625C30.7545 17.3762 30.7839 17.3967 30.8081 17.4225C30.8323 17.4484 30.8509 17.479 30.8625 17.5125V17.5218ZM30.7688 17.1C30.7688 17.1 30.7313 17.025 30.5813 16.9781C30.4406 16.9218 30.3375 16.9125 30.3375 16.9125C30.3375 16.9125 30.4875 16.875 30.6375 16.9312C30.7781 16.9875 30.7688 17.1 30.7688 17.1ZM30.5813 16.8375C30.5813 16.8375 30.5437 16.7812 30.2719 16.7156C29.9906 16.65 29.8969 16.65 29.8969 16.65C29.8969 16.65 30.2813 16.6125 30.3844 16.6593C30.4875 16.7062 30.5906 16.8375 30.5906 16.8375H30.5813ZM30.0844 16.5562C30.0844 16.5562 29.9156 16.5 29.7562 16.4906C29.5969 16.4812 29.3438 16.5 29.3438 16.5C29.3438 16.5 29.8125 16.425 29.9344 16.4531C30.0656 16.4812 30.0844 16.5468 30.0844 16.5468V16.5562Z" fill="#D2A567"/>
+<path d="M28.5468 22.35C28.5468 22.35 28.6312 22.5 28.7906 22.5C28.9593 22.5094 29.0812 22.7438 29.0812 22.7438L28.9031 22.9219L28.4718 22.9406L28.3312 22.7156L28.5468 22.35ZM28.5468 22.2C28.5656 22.1719 28.425 21.8906 28.3218 21.8438C28.2281 21.7969 28.3593 21.9375 28.3406 21.9938C28.3125 22.05 28.3031 22.125 28.3125 22.1344C28.3125 22.1344 28.3968 22.2656 28.35 22.3219C28.3125 22.3688 28.5562 22.2 28.5562 22.2H28.5468Z" fill="#F8C83C"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M28.3279 21.8311C28.3567 21.8442 28.3864 21.8727 28.414 21.9063C28.442 21.9405 28.4691 21.9816 28.4923 22.0219C28.5154 22.0622 28.5347 22.1021 28.5472 22.134C28.5534 22.1498 28.5581 22.1641 28.5605 22.1756C28.5613 22.1792 28.5619 22.1827 28.5623 22.186H28.6012L28.5642 22.2116L28.5599 22.2054C28.5599 22.2054 28.5599 22.2054 28.5599 22.2054L28.5642 22.2116L28.5615 22.2135L28.5538 22.2188C28.5472 22.2233 28.5378 22.2297 28.5266 22.2373C28.5043 22.2524 28.4749 22.2721 28.4467 22.2904C28.4186 22.3085 28.3911 22.3255 28.3729 22.3351C28.3683 22.3375 28.3641 22.3396 28.3605 22.3411C28.3573 22.3424 28.3529 22.344 28.3487 22.3442C28.3468 22.3443 28.3414 22.3443 28.3369 22.34C28.3314 22.335 28.3317 22.3285 28.3323 22.3254C28.333 22.3224 28.3343 22.32 28.3352 22.3184C28.3363 22.3166 28.3376 22.3149 28.339 22.3131L28.3392 22.3129C28.3477 22.3027 28.3511 22.2881 28.3499 22.2698C28.3487 22.2516 28.343 22.2314 28.3357 22.2121C28.3283 22.1929 28.3196 22.1754 28.3126 22.1625C28.3091 22.1561 28.3061 22.1509 28.304 22.1474C28.3029 22.1456 28.302 22.1442 28.3015 22.1433L28.3011 22.1428C28.2979 22.1387 28.2966 22.1338 28.296 22.1306C28.2952 22.1264 28.2949 22.1215 28.2949 22.1164C28.2949 22.1061 28.2962 22.0933 28.2986 22.0793C28.3034 22.0516 28.313 22.0179 28.3275 21.9885C28.3286 21.9846 28.3288 21.9791 28.3275 21.9717C28.3261 21.9639 28.3233 21.955 28.3194 21.9453C28.3129 21.9293 28.3043 21.9127 28.2961 21.897C28.2942 21.8935 28.2924 21.89 28.2906 21.8866C28.2859 21.8775 28.2815 21.8687 28.2785 21.861C28.2769 21.8572 28.2756 21.8534 28.2747 21.8497C28.2739 21.8462 28.2733 21.8418 28.274 21.8374C28.2747 21.8325 28.2773 21.8269 28.283 21.8234C28.2881 21.8203 28.2937 21.8201 28.2979 21.8205C28.306 21.8213 28.3162 21.8252 28.3279 21.8311ZM28.3243 22.1268L28.3244 22.1269L28.3246 22.1273L28.3254 22.1285C28.326 22.1295 28.3269 22.131 28.3281 22.1329C28.3304 22.1368 28.3336 22.1423 28.3373 22.1491C28.3446 22.1626 28.354 22.1814 28.3619 22.202C28.3698 22.2226 28.3765 22.2458 28.3779 22.268C28.3787 22.2792 28.3781 22.2907 28.3754 22.3015C28.3911 22.2924 28.4108 22.28 28.4314 22.2667C28.4594 22.2487 28.4886 22.2291 28.5108 22.214C28.5175 22.2095 28.5236 22.2054 28.5287 22.2018L28.5344 22.1933C28.5345 22.193 28.5345 22.1926 28.5345 22.192C28.5345 22.1897 28.5341 22.1863 28.5331 22.1815C28.531 22.1721 28.527 22.1594 28.521 22.1442C28.5092 22.1139 28.4904 22.0753 28.4679 22.0359C28.4453 21.9966 28.419 21.9568 28.3923 21.9242C28.3652 21.8912 28.3388 21.8669 28.316 21.8566L28.3156 21.8564C28.3113 21.8543 28.3078 21.8527 28.305 21.8515C28.3075 21.8576 28.3111 21.865 28.3156 21.8737C28.3172 21.8768 28.319 21.8801 28.3207 21.8835C28.329 21.8992 28.3384 21.9174 28.3454 21.9348C28.3497 21.9454 28.3533 21.9564 28.3552 21.9668C28.357 21.9772 28.3573 21.9881 28.3539 21.9982L28.3536 21.9992L28.3532 22.0001C28.3399 22.0267 28.3308 22.0581 28.3263 22.0841C28.3241 22.097 28.323 22.1082 28.323 22.1164C28.323 22.1205 28.3233 22.1235 28.3237 22.1253C28.3237 22.1256 28.3238 22.1258 28.3238 22.126L28.3243 22.1268ZM28.324 22.1267C28.324 22.1267 28.324 22.1267 28.324 22.1266L28.324 22.1267ZM28.3477 22.7154L28.4794 22.9263L28.897 22.9081L29.0638 22.7413C29.0637 22.7411 29.0636 22.7409 29.0634 22.7407C29.0599 22.7344 29.0546 22.7254 29.0477 22.7146C29.0339 22.6928 29.0138 22.6638 28.9886 22.6346C28.9376 22.5756 28.8684 22.5186 28.7902 22.5141C28.706 22.514 28.642 22.4743 28.5995 22.4354C28.5782 22.4159 28.562 22.3964 28.5512 22.3818C28.5499 22.38 28.5486 22.3783 28.5475 22.3767L28.3477 22.7154ZM28.5469 22.35L28.5347 22.3429L28.3148 22.7159L28.4643 22.9551L28.9092 22.9357L29.0985 22.7464L29.0937 22.7373L29.0812 22.7438C29.0937 22.7373 29.0937 22.7373 29.0937 22.7373L29.0936 22.7371L29.0933 22.7365L29.0922 22.7344C29.0912 22.7326 29.0898 22.73 29.0879 22.7267C29.0841 22.7201 29.0786 22.7107 29.0714 22.6995C29.0571 22.677 29.0362 22.6468 29.0098 22.6162C28.9577 22.5558 28.8818 22.491 28.7914 22.486L28.7906 22.486C28.7156 22.486 28.6579 22.4507 28.6185 22.4147C28.5988 22.3966 28.5838 22.3786 28.5738 22.3651C28.5688 22.3584 28.5651 22.3528 28.5626 22.3489C28.5614 22.347 28.5605 22.3455 28.5599 22.3445L28.5593 22.3434L28.5591 22.3432L28.5469 22.35Z" fill="#977C2E"/>
+<path d="M28.4813 22.6313C28.4813 22.6313 28.5563 22.6688 28.6125 22.65C28.6781 22.6313 28.7344 22.5657 28.7344 22.5657M28.3969 22.5188C28.3969 22.5188 28.6406 22.3407 28.6219 22.2469C28.6031 22.1532 28.5563 22.1532 28.5281 22.1625C28.4528 22.2024 28.3859 22.2565 28.3313 22.3219C28.3219 22.35 28.3969 22.5188 28.3969 22.5188Z" fill="#F8C83C"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M28.5858 22.154C28.6082 22.1675 28.626 22.1955 28.6357 22.2442C28.6416 22.2736 28.6268 22.3066 28.6063 22.3368C28.5853 22.3679 28.5558 22.3998 28.5262 22.4282C28.4965 22.4567 28.4663 22.4821 28.4435 22.5005C28.4321 22.5096 28.4226 22.517 28.4159 22.5222C28.4125 22.5247 28.4099 22.5267 28.408 22.5281L28.406 22.5296L28.4054 22.53L28.4053 22.5301L28.3969 22.5188L28.3841 22.5245L28.3838 22.524L28.3832 22.5226L28.3808 22.5171C28.3788 22.5124 28.3758 22.5057 28.3724 22.4975C28.3655 22.4811 28.3563 22.459 28.3474 22.436C28.3386 22.413 28.3299 22.3888 28.3241 22.3685C28.3211 22.3583 28.3188 22.3488 28.3175 22.3407C28.3164 22.3333 28.3156 22.3245 28.3179 22.3175L28.3188 22.315L28.3205 22.3129C28.3763 22.2461 28.4446 22.1908 28.5216 22.1501L28.5226 22.1496L28.5237 22.1492C28.5397 22.1439 28.5632 22.1405 28.5858 22.154ZM28.4027 22.4968C28.4088 22.4921 28.4167 22.4859 28.4259 22.4786C28.4482 22.4606 28.4778 22.4356 28.5067 22.4079C28.5357 22.38 28.5636 22.3498 28.583 22.3211C28.603 22.2916 28.6116 22.2671 28.6081 22.2497C28.5991 22.2046 28.584 22.1858 28.5713 22.1781C28.5591 22.1708 28.5456 22.1718 28.5337 22.1756C28.4615 22.2139 28.3973 22.2656 28.3445 22.328C28.3445 22.3295 28.3446 22.3322 28.3453 22.3363C28.3463 22.3428 28.3483 22.351 28.3511 22.3607C28.3566 22.3799 28.365 22.4032 28.3737 22.4259C28.3824 22.4485 28.3914 22.4703 28.3983 22.4865C28.3999 22.4903 28.4014 22.4937 28.4027 22.4968ZM28.6167 22.6635C28.6522 22.6533 28.6843 22.6308 28.7071 22.6116C28.7187 22.6019 28.7281 22.5928 28.7346 22.5861C28.7379 22.5827 28.7405 22.5799 28.7423 22.578L28.7443 22.5757L28.7449 22.5751L28.745 22.5749L28.7451 22.5748L28.7237 22.5565L28.7236 22.5566L28.7232 22.5571L28.7215 22.5591C28.7199 22.5608 28.7176 22.5633 28.7145 22.5664C28.7085 22.5726 28.6997 22.5811 28.689 22.5901C28.6673 22.6083 28.6387 22.628 28.6087 22.6365L28.6081 22.6367C28.584 22.6448 28.5545 22.641 28.5295 22.6341C28.5173 22.6308 28.5067 22.6269 28.4992 22.6238C28.4954 22.6223 28.4925 22.621 28.4905 22.6201L28.4882 22.619L28.4877 22.6188L28.4876 22.6187L28.475 22.6439L28.4751 22.6439L28.4753 22.644L28.4761 22.6444C28.4767 22.6447 28.4776 22.6451 28.4788 22.6457C28.4811 22.6467 28.4844 22.6482 28.4886 22.6499C28.4969 22.6533 28.5085 22.6576 28.5221 22.6613C28.5486 22.6685 28.5846 22.6741 28.6167 22.6635Z" fill="#977C2E"/>
+<path d="M28.2188 22.6407C28.2188 22.6407 28.275 22.7625 28.35 22.7625C28.425 22.7625 28.5375 22.6969 28.5375 22.65C28.5469 22.6032 28.4625 22.5094 28.4156 22.4906C28.3594 22.4625 28.2375 22.5282 28.2375 22.5282L28.2281 22.6407H28.2188Z" fill="#F8C83C"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M28.4214 22.4778C28.435 22.4834 28.4502 22.4937 28.4649 22.5062C28.4799 22.5189 28.4952 22.5345 28.5086 22.5509C28.5219 22.5673 28.5338 22.585 28.5417 22.6021C28.5493 22.6182 28.5542 22.6357 28.5515 22.6515C28.551 22.668 28.5413 22.6837 28.5291 22.6969C28.5162 22.711 28.4986 22.7244 28.4791 22.736C28.4403 22.759 28.3909 22.7766 28.35 22.7766C28.3273 22.7766 28.3069 22.7674 28.2896 22.7549C28.2723 22.7424 28.2573 22.726 28.2451 22.7102C28.2329 22.6943 28.2231 22.6784 28.2165 22.6666C28.2131 22.6607 28.2105 22.6558 28.2088 22.6523C28.2079 22.6505 28.2072 22.6491 28.2067 22.6481L28.2062 22.647L28.2061 22.6467L28.206 22.6466L28.1968 22.6266H28.2152L28.2241 22.5194L28.2308 22.5158L28.231 22.5157L28.2313 22.5156L28.2324 22.515C28.2333 22.5145 28.2347 22.5138 28.2365 22.5129C28.2401 22.5111 28.2452 22.5085 28.2515 22.5056C28.2641 22.4998 28.2816 22.4922 28.3009 22.4856C28.3202 22.479 28.3417 22.4731 28.3625 22.4707C28.3827 22.4684 28.4039 22.4693 28.4214 22.4778ZM28.2509 22.5371L28.2412 22.6532C28.2474 22.6642 28.2563 22.6787 28.2674 22.693C28.2786 22.7077 28.2918 22.7218 28.3061 22.7321C28.3204 22.7425 28.3352 22.7485 28.35 22.7485C28.3841 22.7485 28.4285 22.7333 28.4647 22.7118C28.4827 22.7011 28.4979 22.6893 28.5084 22.6779C28.5193 22.666 28.5234 22.6565 28.5234 22.6501V22.6487L28.5237 22.6473C28.5252 22.64 28.5232 22.6287 28.5163 22.614C28.5096 22.5996 28.4992 22.5839 28.4868 22.5687C28.4744 22.5535 28.4603 22.5392 28.4467 22.5276C28.4328 22.5159 28.4201 22.5076 28.4104 22.5037L28.4093 22.5033C28.3988 22.498 28.3839 22.4966 28.3657 22.4986C28.3477 22.5007 28.3283 22.5059 28.31 22.5122C28.2919 22.5184 28.2754 22.5255 28.2634 22.5311C28.2583 22.5335 28.2541 22.5355 28.2509 22.5371Z" fill="#977C2E"/>
+<path d="M28.4437 22.4812C28.4437 22.5187 28.2843 22.5937 28.2281 22.5937C28.1812 22.5937 28.0781 22.4718 28.1156 22.4531L28.2562 22.4156C28.2937 22.3968 28.3031 22.3406 28.3218 22.3406C28.35 22.3406 28.4156 22.35 28.425 22.3875C28.4437 22.4343 28.4625 22.4437 28.4437 22.4812Z" fill="#F8C83C"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M28.3083 22.378C28.2991 22.3942 28.2855 22.4167 28.2625 22.4282L28.2612 22.4288L28.1218 22.466C28.1217 22.4661 28.1217 22.4662 28.1217 22.4664C28.1214 22.4683 28.1218 22.4721 28.124 22.4782C28.1283 22.4901 28.1381 22.5057 28.1511 22.5215C28.164 22.5372 28.1793 22.5522 28.1939 22.5631C28.2012 22.5686 28.2081 22.5729 28.2142 22.5757C28.2205 22.5786 28.2251 22.5797 28.2281 22.5797C28.2398 22.5797 28.2585 22.5756 28.2811 22.5681C28.3033 22.5607 28.3278 22.5504 28.3507 22.539C28.3737 22.5275 28.3945 22.5151 28.4093 22.5035C28.4168 22.4977 28.4223 22.4925 28.4258 22.4881C28.4294 22.4835 28.4297 22.4814 28.4297 22.4812C28.4297 22.4812 28.4297 22.4812 28.4297 22.4812L28.4437 22.4812L28.4312 22.4749C28.4354 22.4666 28.437 22.4607 28.4373 22.4562C28.4377 22.4518 28.437 22.4477 28.4352 22.4427C28.4334 22.4376 28.4306 22.4322 28.4267 22.4246C28.4265 22.4241 28.4262 22.4235 28.4259 22.423C28.4218 22.4149 28.4169 22.405 28.4119 22.3927L28.4116 22.3918L28.4113 22.3909C28.4085 22.3797 28.3963 22.3701 28.376 22.3633C28.3573 22.3571 28.3363 22.3548 28.3232 22.3547C28.3227 22.3551 28.3217 22.3561 28.3203 22.358C28.3175 22.3618 28.3146 22.3669 28.311 22.3733C28.3101 22.3748 28.3092 22.3764 28.3083 22.378ZM28.4575 22.485C28.4565 22.4929 28.4523 22.4999 28.4478 22.5056C28.4424 22.5124 28.435 22.5192 28.4266 22.5257C28.4098 22.5388 28.3872 22.5522 28.3633 22.5641C28.3393 22.5761 28.3135 22.5869 28.29 22.5948C28.2668 22.6025 28.2445 22.6078 28.2281 22.6078C28.2194 22.6078 28.2106 22.605 28.2023 22.6012C28.194 22.5973 28.1854 22.5919 28.1771 22.5857C28.1604 22.5732 28.1434 22.5565 28.1294 22.5394C28.1154 22.5224 28.1035 22.504 28.0976 22.4878C28.0947 22.4798 28.0927 22.471 28.0938 22.4627C28.095 22.4535 28.1 22.4452 28.1093 22.4405L28.1106 22.4399L28.2511 22.4024C28.265 22.395 28.2746 22.3803 28.2839 22.3641C28.2846 22.3628 28.2854 22.3614 28.2862 22.3601C28.2898 22.3536 28.2937 22.3467 28.2977 22.3413C28.3019 22.3355 28.3098 22.3265 28.3219 22.3265C28.3371 22.3265 28.3621 22.329 28.3849 22.3366C28.4065 22.3438 28.4314 22.3574 28.4384 22.3831C28.4427 22.3938 28.447 22.4025 28.451 22.4102C28.4513 22.4109 28.4517 22.4116 28.452 22.4123C28.4556 22.4193 28.4592 22.4263 28.4616 22.4331C28.4645 22.4409 28.4662 22.4491 28.4654 22.4585C28.4646 22.467 28.462 22.4756 28.4575 22.485Z" fill="#977C2E"/>
+<path d="M28.2938 22.5844C28.2938 22.5844 28.05 22.9032 27.9469 22.8938C27.8531 22.875 27.9938 22.425 27.9938 22.425L28.1063 22.4813C28.1906 22.5 28.2656 22.5375 28.2938 22.575V22.5844Z" fill="#F8C83C"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M27.9853 22.405L28.111 22.4679C28.1536 22.4775 28.1939 22.4918 28.2274 22.5085C28.261 22.5253 28.2891 22.5453 28.305 22.5666L28.3079 22.5703V22.5891L28.305 22.5929L28.3048 22.5932L28.3042 22.5939L28.3021 22.5966C28.3003 22.5989 28.2976 22.6024 28.2942 22.6068C28.2872 22.6155 28.2773 22.628 28.265 22.643C28.2404 22.6728 28.2065 22.7127 28.1693 22.7522C28.1322 22.7917 28.0914 22.8313 28.0532 22.8605C28.0341 22.8752 28.0152 22.8875 27.9974 22.8959C27.9799 22.9042 27.9621 22.9093 27.9457 22.9078L27.9449 22.9077L27.9442 22.9075C27.9257 22.9038 27.9148 22.8895 27.9088 22.873C27.9029 22.8567 27.9006 22.8356 27.9006 22.8126C27.9006 22.7663 27.9097 22.7072 27.9214 22.6495C27.9332 22.5917 27.948 22.5345 27.9597 22.4919C27.9656 22.4705 27.9708 22.4528 27.9745 22.4404C27.9763 22.4342 27.9778 22.4293 27.9788 22.426L27.98 22.4221L27.9803 22.4212L27.9803 22.4209L27.9938 22.425L27.9804 22.4208L27.9853 22.405ZM28.0024 22.445C28.0021 22.4461 28.0018 22.4472 28.0014 22.4484C27.9978 22.4606 27.9927 22.4782 27.9868 22.4993C27.9752 22.5417 27.9606 22.5982 27.949 22.6552C27.9373 22.7124 27.9288 22.7692 27.9288 22.8126C27.9288 22.8344 27.9309 22.8516 27.9352 22.8634C27.9393 22.8746 27.9442 22.8786 27.949 22.8798C27.9582 22.8804 27.9704 22.8776 27.9854 22.8704C28.0007 22.8632 28.0178 22.8521 28.0361 22.8382C28.0726 22.8103 28.1121 22.772 28.1488 22.7329C28.1854 22.694 28.2189 22.6547 28.2432 22.6251C28.2554 22.6103 28.2653 22.598 28.2721 22.5893C28.2753 22.5853 28.2778 22.582 28.2796 22.5797C28.2668 22.5646 28.2445 22.5485 28.2149 22.5337C28.1832 22.5178 28.1444 22.5041 28.1032 22.495L28.1016 22.4946L28.0024 22.445Z" fill="#977C2E"/>
+<path d="M27.8625 22.35C27.8625 22.35 28.1719 22.4062 28.1813 22.4531C28.2 22.5094 28.0407 22.575 27.9469 22.575C27.8625 22.575 27.8625 22.35 27.8625 22.35Z" fill="#F8C83C"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M27.865 22.3361L27.8625 22.35H27.8484L27.8484 22.3331L27.865 22.3361ZM28.1948 22.4494C28.2015 22.4707 28.1906 22.4905 28.1757 22.5057C28.1603 22.5214 28.1376 22.5358 28.1122 22.5478C28.0616 22.5719 27.9963 22.589 27.9468 22.589C27.9183 22.589 27.8987 22.5697 27.8858 22.5467C27.8728 22.5236 27.8645 22.4937 27.8592 22.4651C27.8538 22.4362 27.8511 22.4074 27.8497 22.386C27.8491 22.3753 27.8487 22.3663 27.8486 22.36C27.8485 22.3569 27.8484 22.3544 27.8484 22.3527L27.8484 22.3507L27.8484 22.3502L27.8484 22.35H27.8625L27.865 22.3361L27.8659 22.3363L27.8685 22.3368C27.8708 22.3372 27.8742 22.3379 27.8784 22.3387C27.8869 22.3403 27.8991 22.3427 27.9138 22.3457C27.943 22.3518 27.9822 22.3603 28.0218 22.3703C28.0612 22.3803 28.1014 22.3919 28.1326 22.4041C28.1481 22.4102 28.1619 22.4166 28.1724 22.4234C28.1777 22.4268 28.1825 22.4305 28.1864 22.4346C28.19 22.4385 28.1934 22.4434 28.1948 22.4494ZM27.8769 22.367C27.8771 22.372 27.8774 22.3778 27.8778 22.3843C27.8791 22.405 27.8817 22.4325 27.8868 22.4599C27.892 22.4875 27.8996 22.5138 27.9103 22.5329C27.9211 22.5521 27.9332 22.5609 27.9468 22.5609C27.9912 22.5609 28.0524 22.5452 28.1002 22.5224C28.1241 22.5111 28.1435 22.4984 28.1556 22.486C28.1681 22.4733 28.17 22.4641 28.1679 22.4576L28.1676 22.4567L28.1674 22.456C28.1674 22.4559 28.167 22.4551 28.1658 22.4538C28.1641 22.452 28.1613 22.4497 28.1572 22.447C28.149 22.4418 28.1371 22.4361 28.1223 22.4303C28.0928 22.4188 28.0539 22.4075 28.0149 22.3976C27.9759 22.3877 27.9371 22.3793 27.9081 22.3733C27.8957 22.3707 27.885 22.3686 27.8769 22.367Z" fill="#977C2E"/>
+<path d="M27.0938 22.8187C27.0938 22.8187 27.1406 22.9687 27.2719 22.9781C27.4031 22.9781 27.5344 22.8375 27.5344 22.8375L27.2156 22.7156L27.0938 22.8187Z" fill="#202220"/>
+<path d="M27.0937 22.8188L27.1312 22.9032C27.1594 22.9407 27.1969 22.9782 27.2719 22.9875H27.2812C27.4125 22.9875 27.5344 22.8375 27.5344 22.8375L27.2156 22.7063L27.0844 22.8188H27.0937L27.2156 22.725L27.525 22.8469V22.8375L27.5062 22.8563C27.4687 22.8938 27.375 22.9688 27.2812 22.9688H27.2719C27.2456 22.9674 27.2201 22.9598 27.1974 22.9468C27.1746 22.9338 27.1551 22.9156 27.1406 22.8938C27.129 22.8762 27.1196 22.8574 27.1125 22.8375V22.8282L27.1031 22.8188H27.0937Z" fill="#4B4139"/>
+<path d="M27.1875 22.7812C27.1875 22.7812 27.2344 22.8937 27.4125 22.8937C27.5906 22.8937 27.7219 22.7531 27.7219 22.7531L27.4406 22.5375L27.1875 22.7812Z" fill="#202220"/>
+<path d="M27.1875 22.7812C27.1875 22.7812 27.2343 22.8937 27.4125 22.9031C27.6 22.9031 27.7312 22.7625 27.7312 22.7625L27.45 22.5281L27.1687 22.7812H27.1875L27.45 22.5468L27.7218 22.7625V22.7531C27.6409 22.8315 27.5344 22.8781 27.4218 22.8843C27.3546 22.8886 27.2881 22.8687 27.2343 22.8281C27.2236 22.8167 27.2141 22.8041 27.2062 22.7906C27.2029 22.7877 27.1997 22.7845 27.1968 22.7812H27.1875Z" fill="#4B4139"/>
+<path d="M27.2063 22.8094C27.2063 22.8094 27.2907 22.8657 27.375 22.875C27.4688 22.875 27.5813 22.8469 27.5813 22.8469L27.4782 22.8844L27.4032 22.8938L27.3282 22.8844L27.2719 22.8563L27.2157 22.8188V22.8L27.2063 22.8094Z" fill="#4B4139"/>
+<path d="M27.4125 22.65C27.4125 22.65 27.4875 22.8375 27.6562 22.8187C27.8156 22.8 27.8156 22.7062 27.8156 22.7062L27.6281 22.4437L27.4125 22.65Z" fill="#202220"/>
+<path d="M27.4125 22.65L27.4593 22.7438C27.4968 22.7813 27.5531 22.8375 27.6281 22.8375L27.6562 22.8282C27.7312 22.8188 27.7781 22.7907 27.7968 22.7625C27.825 22.7344 27.825 22.7063 27.825 22.7063L27.6375 22.425L27.4031 22.65H27.4125L27.6375 22.4532L27.8156 22.7063C27.8156 22.725 27.7875 22.8 27.6468 22.8094H27.6281C27.5976 22.8095 27.5675 22.8028 27.54 22.7898C27.5124 22.7768 27.4881 22.7579 27.4687 22.7344C27.4545 22.7168 27.442 22.698 27.4312 22.6782V22.6594C27.4279 22.6564 27.4248 22.6533 27.4218 22.65H27.4125Z" fill="#4B4139"/>
+<path d="M27.4312 22.6875C27.4312 22.6875 27.525 22.8094 27.6187 22.8094C27.6681 22.8094 27.7166 22.7965 27.7594 22.7719V22.7812L27.7125 22.8094L27.6375 22.8187H27.5625L27.4969 22.7719L27.4406 22.6875H27.4312ZM27.1312 22.875C27.1312 22.875 27.2062 22.9594 27.2719 22.9594C27.3346 22.9536 27.3953 22.9344 27.45 22.9031H27.4594L27.4406 22.9125L27.3656 22.95L27.2812 22.9781L27.2156 22.9688L27.1594 22.9313L27.1312 22.8937V22.875Z" fill="#4B4139"/>
+<path d="M27.8438 22.3406C27.9188 22.3218 28.0688 22.5281 28.0688 22.6406C28.0688 22.7531 28.0219 22.8937 27.9469 22.8937C27.8719 22.8937 27.7031 22.7343 27.6656 22.6593C27.6281 22.5749 27.5906 22.5281 27.6188 22.4812C27.6469 22.4437 27.8438 22.3406 27.8438 22.3406ZM27.0938 22.3593C27.0938 22.3593 26.9625 22.2656 26.9156 22.3124C26.8688 22.3593 26.8875 22.5281 26.9156 22.5562C26.9531 22.5937 27.1031 22.4812 27.1031 22.4812L27.0844 22.3593H27.0938Z" fill="#F8C83C"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M27.0704 22.3607C27.0687 22.3596 27.067 22.3585 27.0652 22.3574C27.0524 22.3495 27.0351 22.3396 27.0165 22.3311C26.9977 22.3226 26.9784 22.3159 26.9616 22.314C26.9447 22.312 26.933 22.3151 26.9256 22.3224C26.9169 22.3311 26.91 22.3471 26.9057 22.369C26.9016 22.3905 26.9004 22.4157 26.9016 22.4407C26.9027 22.4657 26.9061 22.49 26.9109 22.5095C26.9132 22.5193 26.9159 22.5276 26.9186 22.5341C26.9215 22.5409 26.924 22.5447 26.9256 22.5463C26.9272 22.5478 26.93 22.5494 26.9354 22.5497C26.941 22.5501 26.9482 22.5492 26.9571 22.5467C26.9748 22.5419 26.9959 22.532 27.0166 22.5205C27.0372 22.509 27.0568 22.4964 27.0712 22.4866C27.0782 22.4819 27.0839 22.4778 27.088 22.4749L27.0704 22.3607ZM27.1116 22.4925L27.1115 22.4926L27.1111 22.4928L27.1098 22.4938C27.1087 22.4946 27.107 22.4959 27.1049 22.4974C27.1006 22.5005 27.0945 22.5048 27.087 22.5098C27.0722 22.5199 27.0519 22.5331 27.0303 22.5451C27.0089 22.557 26.9854 22.5682 26.9645 22.5739C26.954 22.5767 26.9434 22.5784 26.9335 22.5778C26.9236 22.5771 26.9135 22.5739 26.9057 22.5662C26.9003 22.5607 26.8961 22.5531 26.8927 22.545C26.8892 22.5368 26.8861 22.5269 26.8835 22.5162C26.8783 22.4947 26.8747 22.4686 26.8735 22.442C26.8723 22.4155 26.8735 22.3879 26.8781 22.3637C26.8827 22.3399 26.891 22.3172 26.9057 22.3025C26.9218 22.2864 26.944 22.2836 26.9649 22.286C26.9859 22.2885 27.0082 22.2965 27.0281 22.3055C27.0482 22.3146 27.0666 22.3252 27.0799 22.3335C27.0866 22.3376 27.0921 22.3412 27.0959 22.3437C27.0978 22.345 27.0993 22.346 27.1003 22.3467L27.1015 22.3476L27.1018 22.3478L27.1019 22.3479L27.1377 22.3734H27.1008L27.1183 22.4874L27.1116 22.4925ZM27.8438 22.3406L27.8373 22.3281L27.8367 22.3284L27.835 22.3293L27.8287 22.3327C27.8232 22.3356 27.8154 22.3398 27.8059 22.3449C27.7869 22.3552 27.7613 22.3693 27.7348 22.3847C27.7083 22.4 27.6808 22.4165 27.658 22.4317C27.6466 22.4393 27.6363 22.4466 27.6278 22.4534C27.6195 22.4599 27.6122 22.4666 27.6075 22.4728L27.6071 22.4734L27.6067 22.474C27.5895 22.5027 27.5932 22.5312 27.6044 22.5611C27.61 22.5759 27.6176 22.5918 27.6259 22.6087C27.627 22.6108 27.628 22.6129 27.629 22.615C27.6366 22.6303 27.6447 22.6468 27.6528 22.665L27.6531 22.6656C27.6731 22.7056 27.7263 22.7657 27.783 22.8152C27.8115 22.8402 27.8415 22.863 27.8694 22.8797C27.8967 22.896 27.9241 22.9078 27.9469 22.9078C27.9704 22.9078 27.9908 22.8967 28.0075 22.8799C28.0242 22.8633 28.0379 22.8405 28.0489 22.8149C28.0708 22.7637 28.0828 22.6985 28.0828 22.6406C28.0828 22.6097 28.0727 22.5737 28.0571 22.538C28.0414 22.5021 28.0197 22.4654 27.9957 22.433C27.9718 22.4007 27.9451 22.372 27.919 22.3525C27.8938 22.3336 27.8657 22.3206 27.8404 22.3269L27.8438 22.3406ZM27.9021 22.375C27.8791 22.3577 27.8608 22.3517 27.8487 22.3539L27.8481 22.3542L27.8419 22.3575C27.8365 22.3604 27.8287 22.3645 27.8193 22.3696C27.8005 22.3799 27.7751 22.3939 27.7489 22.409C27.7226 22.4242 27.6957 22.4404 27.6736 22.4551C27.6626 22.4625 27.6529 22.4693 27.6453 22.4754C27.6378 22.4813 27.633 22.4859 27.6304 22.4891C27.62 22.507 27.621 22.5253 27.6308 22.5513C27.6358 22.5646 27.6428 22.5792 27.6512 22.5963C27.6522 22.5983 27.6532 22.6004 27.6543 22.6025C27.6618 22.6178 27.6701 22.6346 27.6784 22.6533C27.696 22.6883 27.7458 22.7453 27.8015 22.7941C27.8292 22.8183 27.8578 22.84 27.8838 22.8556C27.9104 22.8715 27.9322 22.8796 27.9469 22.8796C27.9609 22.8796 27.9745 22.8732 27.9877 22.86C28.0009 22.8468 28.0129 22.8274 28.023 22.8038C28.0433 22.7565 28.0547 22.6952 28.0547 22.6406C28.0547 22.6152 28.0462 22.5833 28.0313 22.5492C28.0165 22.5154 27.996 22.4806 27.9731 22.4497C27.9502 22.4188 27.9253 22.3924 27.9021 22.375Z" fill="#977C2E"/>
+<path d="M27.075 22.4719C27.075 22.4719 26.9062 22.4907 26.9062 22.5657C26.9062 22.6407 26.9906 22.7157 27 22.7344C27.0187 22.7438 27.1687 22.6688 27.1687 22.6688L27.075 22.4719Z" fill="#F8C83C"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M27.0735 22.4579L27.075 22.4719L27.0877 22.4658L27.1874 22.6751L27.1751 22.6813L27.1746 22.6815L27.1733 22.6822L27.1685 22.6846C27.1643 22.6866 27.1583 22.6895 27.1511 22.693C27.1367 22.6999 27.1172 22.7091 27.0971 22.7179C27.0771 22.7268 27.0561 22.7355 27.0389 22.7414C27.0303 22.7443 27.0222 22.7467 27.0154 22.748C27.012 22.7487 27.0085 22.7492 27.0052 22.7492C27.0023 22.7493 26.9979 22.749 26.9937 22.7469L26.9895 22.7448L26.9874 22.7407C26.987 22.7398 26.9856 22.7377 26.9823 22.7336C26.9794 22.73 26.9758 22.7257 26.9714 22.7206L26.9707 22.7197C26.9615 22.7089 26.9498 22.6951 26.9383 22.6794C26.9157 22.6485 26.8922 22.6079 26.8922 22.5656C26.8922 22.5409 26.9063 22.522 26.924 22.5082C26.9416 22.4945 26.9645 22.4845 26.9862 22.4773C27.0081 22.47 27.0299 22.4651 27.0461 22.4621C27.0542 22.4606 27.061 22.4596 27.0658 22.4589C27.0682 22.4586 27.0701 22.4583 27.0714 22.4581L27.0729 22.458L27.0733 22.4579L27.0735 22.4579ZM27.1501 22.6622L27.0667 22.4872C27.0626 22.4878 27.0573 22.4887 27.0512 22.4898C27.0358 22.4926 27.0154 22.4972 26.9951 22.504C26.9746 22.5108 26.9553 22.5195 26.9413 22.5304C26.9273 22.5413 26.9203 22.5528 26.9203 22.5656C26.9203 22.5984 26.939 22.6327 26.961 22.6628C26.9718 22.6776 26.9829 22.6907 26.9921 22.7015L26.9929 22.7025C26.9972 22.7075 27.0011 22.7121 27.0043 22.716C27.0055 22.7176 27.0068 22.7192 27.008 22.7208C27.0086 22.7207 27.0092 22.7206 27.01 22.7204C27.0149 22.7195 27.0216 22.7175 27.0297 22.7148C27.0459 22.7092 27.0659 22.7009 27.0858 22.6922C27.1055 22.6835 27.1247 22.6745 27.139 22.6676C27.1431 22.6656 27.1469 22.6638 27.1501 22.6622Z" fill="#977C2E"/>
+<path d="M27.1407 22.6032C27.1407 22.6032 26.9719 22.6594 26.9719 22.7157C26.9719 22.7719 27.0469 22.875 27.0938 22.875C27.1407 22.875 27.1875 22.7813 27.2063 22.7532C27.2344 22.7344 27.1407 22.6032 27.1407 22.6032ZM27.2157 22.125C27.2157 22.125 27.1875 22.0782 27.1219 22.1063C27.0469 22.1344 26.9719 22.2 26.9813 22.3219C26.9907 22.425 27.0375 22.5094 27.0375 22.5094L27.2907 22.4157L27.2157 22.125Z" fill="#F8C83C"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M27.2276 22.1178C27.2276 22.1178 27.2276 22.1178 27.2156 22.1251L27.2292 22.1215L27.3074 22.4245L27.031 22.5268L27.0252 22.5163L27.0251 22.5162L27.025 22.5159L27.0245 22.5151C27.0242 22.5144 27.0236 22.5134 27.0229 22.5121C27.0216 22.5094 27.0196 22.5056 27.0173 22.5007C27.0126 22.4909 27.0063 22.4767 26.9997 22.4593C26.9865 22.4246 26.972 22.3764 26.9672 22.3232L26.9672 22.323C26.9622 22.2587 26.9796 22.2084 27.0087 22.1704C27.0376 22.1328 27.0774 22.108 27.1166 22.0932C27.153 22.0777 27.1809 22.0825 27.2 22.0927C27.2092 22.0977 27.216 22.1038 27.2205 22.1086C27.2227 22.111 27.2244 22.1132 27.2256 22.1148C27.2262 22.1156 27.2266 22.1163 27.227 22.1168L27.2274 22.1174L27.2275 22.1177L27.2276 22.1178ZM27.0443 22.4919L27.2738 22.4069L27.2026 22.131C27.202 22.1302 27.201 22.129 27.1998 22.1277C27.197 22.1246 27.1926 22.1207 27.1866 22.1175C27.1753 22.1114 27.1564 22.1068 27.1274 22.1192L27.1268 22.1195C27.0911 22.1329 27.056 22.1549 27.031 22.1875C27.0063 22.2198 26.9908 22.2632 26.9952 22.3208C26.9998 22.3706 27.0134 22.4162 27.026 22.4494C27.0323 22.4659 27.0383 22.4794 27.0427 22.4886C27.0432 22.4898 27.0438 22.4909 27.0443 22.4919ZM27.1361 22.5898L27.1406 22.6032L27.152 22.595L27.1521 22.5951L27.1523 22.5954L27.1531 22.5966L27.1561 22.6009C27.1587 22.6045 27.1623 22.6098 27.1665 22.6162C27.175 22.629 27.186 22.6462 27.1962 22.6642C27.2063 22.682 27.2159 22.7012 27.2212 22.7175C27.2238 22.7256 27.2257 22.734 27.2255 22.7417C27.2254 22.7486 27.2234 22.7569 27.2167 22.7628C27.214 22.767 27.2108 22.7724 27.2069 22.7788C27.2046 22.7826 27.2021 22.7869 27.1993 22.7914C27.1915 22.8043 27.1821 22.819 27.1718 22.833C27.1615 22.8469 27.1499 22.8606 27.1373 22.8708C27.1249 22.881 27.1101 22.8891 27.0937 22.8891C27.0773 22.8891 27.0607 22.8804 27.0463 22.8692C27.0314 22.8577 27.0168 22.842 27.0039 22.8249C26.9911 22.8077 26.9797 22.7886 26.9714 22.77C26.9633 22.7515 26.9578 22.7325 26.9578 22.7157C26.9578 22.6948 26.9729 22.6771 26.9892 22.6636C27.0062 22.6494 27.0284 22.6365 27.0499 22.6258C27.0715 22.6149 27.093 22.606 27.1091 22.5997C27.1172 22.5966 27.1239 22.5941 27.1286 22.5925C27.131 22.5916 27.1328 22.591 27.1341 22.5905L27.1356 22.59L27.136 22.5899L27.1361 22.5898ZM27.1351 22.62C27.1309 22.6215 27.1255 22.6235 27.1193 22.626C27.1037 22.632 27.0831 22.6406 27.0625 22.6509C27.0418 22.6613 27.0218 22.673 27.0072 22.6852C26.9918 22.698 26.9859 22.7084 26.9859 22.7157C26.9859 22.727 26.9898 22.7419 26.9971 22.7586C27.0044 22.7751 27.0147 22.7924 27.0264 22.808C27.0382 22.8237 27.0511 22.8374 27.0635 22.8469C27.0763 22.8568 27.0867 22.861 27.0937 22.861C27.1007 22.861 27.1094 22.8574 27.1195 22.8491C27.1295 22.8409 27.1395 22.8294 27.1492 22.8163C27.1588 22.8033 27.1676 22.7894 27.1753 22.7768C27.1777 22.7728 27.1801 22.7689 27.1823 22.7652C27.187 22.7573 27.1912 22.7503 27.1945 22.7454L27.1961 22.743L27.1973 22.7422C27.1974 22.7419 27.1974 22.7415 27.1974 22.741C27.1975 22.7379 27.1967 22.733 27.1944 22.7262C27.19 22.7126 27.1815 22.6954 27.1717 22.6781C27.162 22.6609 27.1513 22.6442 27.1431 22.6317C27.14 22.6272 27.1373 22.6232 27.1351 22.62Z" fill="#977C2E"/>
+<path d="M27.2344 22.3125C27.2344 22.3125 27.0281 22.3875 27.0187 22.4719C27.0094 22.5562 27.0656 22.6312 27.1125 22.6594C27.1781 22.6594 27.3562 22.4906 27.3562 22.4906L27.2344 22.3219V22.3125Z" fill="#F8C83C"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M27.2484 22.2925V22.3174L27.3749 22.4924L27.3659 22.5009L27.3658 22.501L27.3654 22.5014L27.3638 22.5028C27.3625 22.5041 27.3605 22.5059 27.358 22.5083C27.353 22.5129 27.3457 22.5196 27.3368 22.5275C27.3189 22.5435 27.2944 22.5647 27.2678 22.586C27.2412 22.6073 27.2123 22.6288 27.1856 22.6451C27.1723 22.6532 27.1593 22.6602 27.1472 22.6652C27.1353 22.6701 27.1234 22.6735 27.1125 22.6735H27.1086L27.1053 22.6715C27.0795 22.6561 27.0521 22.6284 27.0323 22.5938C27.0124 22.559 26.9997 22.5161 27.0048 22.4704C27.0077 22.4441 27.0255 22.4207 27.0469 22.4011C27.0687 22.3811 27.0964 22.3632 27.1233 22.3483C27.1502 22.3334 27.1767 22.3211 27.1965 22.3127C27.2064 22.3084 27.2146 22.3051 27.2204 22.3029C27.2233 22.3017 27.2255 22.3009 27.2271 22.3003L27.2289 22.2996L27.2294 22.2994L27.2295 22.2994L27.2484 22.2925ZM27.2241 22.3317C27.2194 22.3335 27.2138 22.3358 27.2075 22.3385C27.1883 22.3467 27.1627 22.3586 27.1369 22.3729C27.111 22.3873 27.0854 22.404 27.0659 22.4218C27.046 22.44 27.0345 22.4575 27.0327 22.4735C27.0284 22.5121 27.0391 22.549 27.0568 22.5798C27.0734 22.609 27.0959 22.632 27.1162 22.6451C27.1214 22.6445 27.1281 22.6426 27.1364 22.6392C27.1467 22.6349 27.1584 22.6287 27.171 22.6211C27.1962 22.6057 27.224 22.585 27.2502 22.5641C27.2763 22.5432 27.3004 22.5223 27.318 22.5066C27.3261 22.4994 27.3327 22.4933 27.3376 22.4888L27.2241 22.3317Z" fill="#977C2E"/>
+<path d="M27.4219 22.6593C27.4219 22.6593 27.2156 22.8 27.1875 22.8C27.1594 22.8 27.075 22.6875 27.0938 22.6125C27.1125 22.5375 27.2531 22.4906 27.3094 22.4625C27.3656 22.4437 27.4219 22.6593 27.4219 22.6593ZM27.6094 21.8906C27.6094 21.8906 27.5438 21.8343 27.4219 21.8437C27.2906 21.8531 27.1969 22.0312 27.1781 22.1062C27.1594 22.1906 27.1781 22.35 27.225 22.3687C27.2719 22.3968 27.5344 22.1812 27.5344 22.1812L27.6094 21.9V21.8906Z" fill="#F8C83C"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M27.6185 21.8799C27.6186 21.8799 27.6186 21.8799 27.6094 21.8906L27.6185 21.8799L27.6235 21.8841V21.9018L27.5468 22.1892L27.5433 22.1921L27.5431 22.1923L27.5426 22.1927L27.5403 22.1946C27.5384 22.1961 27.5355 22.1985 27.5318 22.2014C27.5245 22.2073 27.514 22.2156 27.5013 22.2256C27.4759 22.2454 27.4414 22.2716 27.4054 22.297C27.3695 22.3223 27.3317 22.3471 27.2996 22.3638C27.2837 22.3721 27.2686 22.3787 27.2555 22.3823C27.2438 22.3855 27.2299 22.3874 27.2188 22.3814C27.2021 22.3742 27.1905 22.3563 27.1824 22.3372C27.1737 22.3168 27.1673 22.2913 27.1631 22.2643C27.1547 22.2103 27.1546 22.1475 27.1644 22.1032L27.1645 22.1028C27.1744 22.0633 27.2034 21.9983 27.2467 21.9418C27.2897 21.8857 27.3492 21.8348 27.4209 21.8297C27.4842 21.8248 27.5333 21.837 27.5667 21.8506C27.5834 21.8574 27.5961 21.8646 27.6048 21.8701C27.6091 21.8729 27.6125 21.8752 27.6148 21.8769C27.6159 21.8778 27.6168 21.8785 27.6174 21.879L27.6182 21.8796L27.6184 21.8798L27.6185 21.8799ZM27.522 22.1732L27.5953 21.8981V21.8976C27.5938 21.8965 27.5919 21.8952 27.5897 21.8938C27.5823 21.8891 27.571 21.8828 27.5561 21.8767C27.5262 21.8645 27.4815 21.8532 27.423 21.8578C27.3634 21.862 27.3104 21.9049 27.269 21.9589C27.228 22.0125 27.2008 22.0739 27.1918 22.1095C27.183 22.1495 27.1829 22.2085 27.1909 22.2599C27.1949 22.2856 27.2008 22.3087 27.2082 22.3262C27.216 22.3444 27.2241 22.3532 27.2303 22.3557L27.2313 22.3561L27.2323 22.3567C27.2323 22.3567 27.2333 22.3572 27.2361 22.3572C27.239 22.3572 27.2429 22.3566 27.2481 22.3552C27.2583 22.3524 27.2714 22.3468 27.2866 22.3388C27.317 22.323 27.3536 22.2991 27.3892 22.274C27.4247 22.249 27.4588 22.2231 27.484 22.2034C27.4966 22.1936 27.507 22.1853 27.5142 22.1795C27.5175 22.1769 27.5201 22.1747 27.522 22.1732ZM27.3146 22.4756C27.3041 22.4808 27.2909 22.4866 27.2765 22.4929C27.2713 22.4953 27.2658 22.4976 27.2603 22.5001C27.239 22.5096 27.2161 22.5202 27.1943 22.5322C27.1726 22.5442 27.1525 22.5574 27.137 22.5717C27.1214 22.5861 27.1112 22.6008 27.1074 22.6159C27.0994 22.6478 27.1134 22.6905 27.1352 22.7272C27.1458 22.7451 27.1577 22.7606 27.1684 22.7713C27.1737 22.7768 27.1785 22.7807 27.1823 22.7832C27.1854 22.7852 27.1871 22.7857 27.1875 22.7859C27.1879 22.7858 27.1888 22.7856 27.1903 22.7851C27.1927 22.7843 27.1959 22.783 27.1998 22.7812C27.2076 22.7776 27.2176 22.7723 27.2291 22.7658C27.2521 22.7528 27.2802 22.7353 27.3077 22.7178C27.3351 22.7003 27.3617 22.6828 27.3814 22.6696C27.3913 22.6631 27.3994 22.6576 27.4051 22.6537L27.4057 22.6534C27.4041 22.6476 27.4017 22.6396 27.3988 22.6301C27.3927 22.6104 27.3841 22.5845 27.3737 22.5592C27.3633 22.5337 27.3515 22.5099 27.3395 22.4938C27.3334 22.4857 27.3279 22.4804 27.3232 22.4777C27.3193 22.4754 27.3167 22.4751 27.3146 22.4756ZM27.4219 22.6594L27.4355 22.6558L27.4355 22.6556L27.4353 22.6551L27.4348 22.6533C27.4344 22.6517 27.4338 22.6493 27.4329 22.6463C27.4312 22.6404 27.4288 22.6319 27.4257 22.6218C27.4195 22.6017 27.4105 22.5749 27.3998 22.5486C27.3891 22.5225 27.3762 22.4959 27.362 22.4769C27.3548 22.4674 27.3467 22.4589 27.3376 22.4535C27.328 22.4478 27.3168 22.4452 27.305 22.4491L27.304 22.4495L27.3031 22.4499C27.2931 22.4549 27.2804 22.4605 27.2658 22.4669C27.2604 22.4693 27.2548 22.4718 27.2489 22.4744C27.2274 22.484 27.2035 22.495 27.1807 22.5076C27.158 22.5202 27.1358 22.5346 27.1179 22.551C27.1001 22.5674 27.0857 22.5867 27.0801 22.6091C27.0694 22.6522 27.0882 22.7032 27.111 22.7415C27.1226 22.7611 27.1359 22.7785 27.1484 22.7911C27.1546 22.7974 27.1609 22.8028 27.167 22.8068C27.1727 22.8105 27.1799 22.814 27.1875 22.814C27.1917 22.814 27.1959 22.8129 27.1993 22.8117C27.203 22.8105 27.2072 22.8087 27.2116 22.8067C27.2204 22.8026 27.2312 22.7969 27.2429 22.7902C27.2666 22.7769 27.2952 22.7591 27.3228 22.7415C27.3505 22.7239 27.3772 22.7062 27.397 22.693C27.407 22.6864 27.4151 22.6809 27.4209 22.6771L27.4275 22.6726L27.4298 22.671L27.4219 22.6594ZM27.4219 22.6594L27.4298 22.671L27.438 22.6654L27.4355 22.6558L27.4219 22.6594Z" fill="#977C2E"/>
+<path d="M27.3562 22.5281C27.2625 22.5187 27.1875 22.3875 27.1968 22.3125C27.2156 22.2375 27.3843 22.1062 27.4781 22.125C27.5718 22.1344 27.5531 22.3594 27.5531 22.3594C27.5531 22.3594 27.4406 22.5375 27.3562 22.5281Z" fill="#F8C83C"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M27.2107 22.3151C27.207 22.348 27.2216 22.3957 27.2495 22.4371C27.2777 22.4788 27.3167 22.51 27.3576 22.5141L27.3578 22.5142C27.3739 22.5159 27.3932 22.5088 27.4146 22.4941C27.4357 22.4796 27.4568 22.4592 27.4758 22.4379C27.4947 22.4167 27.5111 22.3952 27.5228 22.3789C27.5286 22.3707 27.5333 22.3639 27.5364 22.3592C27.5376 22.3574 27.5386 22.3559 27.5393 22.3548C27.5394 22.3533 27.5396 22.3513 27.5397 22.3489C27.54 22.3429 27.5404 22.3343 27.5405 22.3239C27.5408 22.303 27.5402 22.2753 27.5368 22.2474C27.5334 22.2193 27.5272 22.1922 27.5169 22.172C27.5066 22.1519 27.4935 22.1407 27.4767 22.139L27.476 22.1389L27.4754 22.1388C27.4555 22.1348 27.4303 22.1386 27.4021 22.149C27.3742 22.1594 27.3449 22.1757 27.3175 22.1951C27.2901 22.2145 27.2652 22.2366 27.2461 22.2582C27.227 22.2798 27.2148 22.2997 27.2107 22.3151ZM27.5531 22.3594L27.565 22.3669L27.5649 22.3671L27.5646 22.3675L27.5636 22.369C27.5627 22.3704 27.5615 22.3723 27.5598 22.3748C27.5565 22.3798 27.5517 22.3868 27.5456 22.3953C27.5336 22.4121 27.5166 22.4345 27.4968 22.4566C27.4771 22.4787 27.4543 22.501 27.4306 22.5173C27.4072 22.5333 27.3809 22.545 27.3548 22.5421C27.302 22.5368 27.2566 22.4978 27.2262 22.4528C27.1958 22.4078 27.1776 22.3529 27.1829 22.3108L27.183 22.3099L27.1832 22.3091C27.1887 22.2871 27.2045 22.2628 27.225 22.2396C27.2457 22.2162 27.2723 22.1926 27.3012 22.1721C27.3301 22.1517 27.3617 22.134 27.3924 22.1227C27.4226 22.1115 27.4533 22.1059 27.4802 22.1111C27.5099 22.1143 27.5294 22.1347 27.5419 22.1592C27.5544 22.1838 27.5611 22.2147 27.5647 22.244C27.5683 22.2736 27.5689 22.3027 27.5686 22.3243C27.5685 22.3351 27.5681 22.3441 27.5678 22.3504C27.5676 22.3536 27.5674 22.3561 27.5673 22.3578L27.5672 22.3598L27.5671 22.3603L27.5671 22.3605L27.5531 22.3594ZM27.5531 22.3594L27.5671 22.3605L27.5668 22.364L27.565 22.3669L27.5531 22.3594Z" fill="#977C2E"/>
+<path d="M27.6282 22.5C27.6282 22.5 27.5907 22.6125 27.4969 22.6594C27.4032 22.6969 27.3563 22.6594 27.3094 22.5938C27.2532 22.5188 27.3282 22.4813 27.3657 22.4438C27.4125 22.4063 27.525 22.3782 27.525 22.3782L27.6282 22.5094V22.5Z" fill="#F8C83C"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M27.5305 22.3623L27.6382 22.4994L27.6423 22.5V22.5501L27.6293 22.5336C27.6244 22.5439 27.6179 22.5563 27.6097 22.5696C27.5879 22.6047 27.5533 22.6469 27.5032 22.672L27.5022 22.6725C27.4529 22.6922 27.4137 22.693 27.3799 22.6781C27.347 22.6637 27.3218 22.6352 27.2981 22.6021C27.2829 22.5818 27.2755 22.5626 27.2752 22.5443C27.2748 22.5258 27.2815 22.51 27.2909 22.4967C27.3001 22.4835 27.3124 22.472 27.3239 22.4619C27.3276 22.4587 27.3312 22.4556 27.3347 22.4527C27.3425 22.446 27.3496 22.44 27.3557 22.4338L27.3563 22.4333L27.3569 22.4328C27.3824 22.4124 27.4244 22.3953 27.4584 22.3836C27.4757 22.3777 27.4914 22.3729 27.5029 22.3696C27.5086 22.368 27.5133 22.3667 27.5165 22.3658L27.5203 22.3649L27.5213 22.3646L27.5215 22.3645L27.5216 22.3645L27.5305 22.3623ZM27.5197 22.3941C27.5172 22.3948 27.5141 22.3957 27.5106 22.3967C27.4995 22.3998 27.4842 22.4044 27.4675 22.4102C27.4338 22.4218 27.3965 22.4374 27.375 22.4543C27.3681 22.4612 27.3599 22.4682 27.3519 22.4749C27.3487 22.4777 27.3455 22.4804 27.3424 22.4831C27.3311 22.4929 27.3211 22.5025 27.3139 22.5128C27.3069 22.5228 27.3031 22.5329 27.3033 22.5437C27.3035 22.5546 27.3078 22.5682 27.3207 22.5853L27.3209 22.5856C27.344 22.618 27.3656 22.6411 27.3913 22.6524C27.416 22.6633 27.4469 22.6642 27.4912 22.6466C27.5345 22.6247 27.5655 22.5874 27.5858 22.5547C27.5959 22.5384 27.6032 22.5235 27.608 22.5127C27.6086 22.5113 27.6092 22.5099 27.6097 22.5087L27.5197 22.3941Z" fill="#977C2E"/>
+<path d="M27.4875 22.2375C27.4875 22.2375 27.3937 22.3125 27.45 22.4062C27.5062 22.5 27.5437 22.5375 27.6187 22.5468C27.6937 22.5562 27.7406 22.5281 27.7969 22.4625C27.8531 22.3968 27.9375 22.3687 27.9281 22.275C27.9187 22.1906 27.8906 22.125 27.8344 22.1062C27.7875 22.0781 27.6281 22.1062 27.4875 22.2375Z" fill="#F8C83C"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M27.8402 22.0934C27.872 22.1044 27.8951 22.1284 27.9113 22.1595C27.9276 22.1909 27.9373 22.2303 27.9421 22.2734L27.9421 22.2736L27.9421 22.2736C27.9474 22.3261 27.9258 22.3605 27.8971 22.3892C27.8857 22.4006 27.8728 22.4115 27.8602 22.4221C27.8573 22.4246 27.8544 22.427 27.8516 22.4294C27.836 22.4427 27.8209 22.4561 27.8076 22.4716C27.779 22.505 27.7517 22.5301 27.7211 22.5454C27.6902 22.5609 27.6568 22.5658 27.617 22.5608C27.5771 22.5558 27.5463 22.5432 27.5182 22.5188C27.4906 22.495 27.4662 22.4605 27.4379 22.4135C27.4066 22.3612 27.4172 22.3135 27.4353 22.28C27.4442 22.2635 27.455 22.2502 27.4634 22.2411C27.4677 22.2365 27.4714 22.233 27.4741 22.2305C27.4755 22.2293 27.4766 22.2283 27.4774 22.2276L27.4782 22.2269C27.55 22.16 27.6267 22.1192 27.6919 22.0987C27.7245 22.0884 27.7545 22.0832 27.7798 22.0824C27.8038 22.0816 27.8252 22.0849 27.8402 22.0934ZM27.4963 22.2485L27.4962 22.2486L27.4956 22.2491C27.495 22.2496 27.4942 22.2503 27.4931 22.2513C27.4909 22.2533 27.4877 22.2563 27.484 22.2603C27.4767 22.2682 27.4675 22.2795 27.46 22.2934C27.4453 22.3208 27.4372 22.3576 27.4621 22.399C27.4901 22.4457 27.5126 22.4769 27.5365 22.4976C27.5599 22.5178 27.5854 22.5285 27.6205 22.5329C27.6557 22.5373 27.6833 22.5329 27.7086 22.5202C27.7342 22.5074 27.7586 22.4856 27.7862 22.4533C27.801 22.4361 27.8176 22.4214 27.8333 22.408C27.8364 22.4054 27.8395 22.4028 27.8424 22.4003C27.855 22.3897 27.8667 22.3798 27.8772 22.3694C27.9023 22.3442 27.9182 22.3177 27.9141 22.2765C27.9096 22.2353 27.9005 22.1997 27.8864 22.1725C27.8723 22.1455 27.8537 22.1275 27.8299 22.1196L27.8285 22.1191L27.8271 22.1183C27.8188 22.1133 27.8033 22.1098 27.7806 22.1105C27.7584 22.1112 27.731 22.1159 27.7003 22.1255C27.639 22.1448 27.5659 22.1836 27.4971 22.2478L27.4963 22.2485L27.4963 22.2485Z" fill="#977C2E"/>
+<path d="M27.7687 21.8437C27.7687 21.8437 27.675 21.7968 27.5906 21.8437C27.5156 21.8906 27.4593 21.9843 27.45 22.0687L27.4687 22.2843C27.4687 22.2843 27.5812 22.2468 27.6562 22.1906C27.7218 22.1343 27.75 22.1156 27.7312 22.0875C27.7312 22.0687 27.6937 22.05 27.6937 21.975C27.6937 21.8437 27.7687 21.8343 27.7687 21.8343V21.8437Z" fill="#202220"/>
+<path d="M27.7687 21.8438C27.7687 21.8438 27.6562 21.8157 27.5906 21.8532C27.5293 21.8954 27.4859 21.9588 27.4687 22.0313C27.4406 22.1063 27.4594 22.125 27.4594 22.125V21.9938C27.4969 21.9188 27.5531 21.8531 27.6094 21.8344C27.6844 21.8063 27.7687 21.8344 27.7687 21.8344V21.8438Z" fill="#4B4139"/>
+<path d="M30.825 24.0938L30.975 24.0188L31.1625 23.9062L31.2 24.1125L31.0313 24.2438H30.8906L30.8063 24.1781L30.825 24.0844V24.0938Z" fill="#F8C83C"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M31.1727 23.8838L31.2154 24.1184L31.0361 24.2579H30.8858L30.7908 24.1839L30.8112 24.0817L30.8193 24.0825L30.8187 24.0812L30.9682 24.0065L31.1727 23.8838ZM30.8354 24.1044L30.8218 24.1724L30.8955 24.2297H31.0264L31.1847 24.1067L31.1523 23.9288L30.9813 24.0314L30.8354 24.1044Z" fill="#977C2E"/>
+<path d="M30.6 24.1125H30.6937C30.7969 24.1125 30.8062 24.0844 30.825 24.0844C30.8437 24.0937 30.8719 24.2063 30.8719 24.2063L30.8344 24.2719L30.6937 24.3562L30.5719 24.2812L30.5625 24.1125H30.6ZM31.7344 24.0375C31.7344 24.0375 31.7063 23.9906 31.65 23.9437L31.4437 23.7656V24.2344L31.6594 24.225L31.7625 24.0844L31.7344 24.0375Z" fill="#F8C83C"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M31.4297 23.7349L31.6591 23.933C31.688 23.9571 31.7097 23.9812 31.7242 23.9994C31.7315 24.0085 31.737 24.0161 31.7407 24.0215C31.7425 24.0241 31.7439 24.0263 31.7449 24.0278L31.746 24.0295L31.7463 24.03L31.7464 24.0302L31.7793 24.0851L31.6667 24.2387L31.4297 24.249V23.7349ZM31.7223 24.0446L31.7221 24.0443L31.7212 24.0429C31.7204 24.0417 31.7191 24.0398 31.7175 24.0374C31.7141 24.0325 31.7091 24.0254 31.7023 24.017C31.6887 23.9999 31.6682 23.9772 31.641 23.9545L31.6408 23.9544L31.4578 23.7963V24.2197L31.652 24.2112L31.7456 24.0836L31.7223 24.0446ZM30.7962 24.1115C30.7766 24.1193 30.7466 24.1265 30.6937 24.1265H30.5773L30.5855 24.2731L30.6938 24.3398L30.824 24.2617L30.8568 24.2042C30.856 24.2012 30.8549 24.1971 30.8536 24.1922C30.8507 24.1816 30.8467 24.1675 30.842 24.1531C30.8374 24.1386 30.8323 24.1242 30.8274 24.113C30.8249 24.1074 30.8226 24.103 30.8206 24.0999C30.8205 24.0999 30.8205 24.0998 30.8205 24.0998C30.8197 24.1002 30.8187 24.1006 30.8175 24.1012C30.8166 24.1017 30.8157 24.1022 30.8147 24.1027C30.8102 24.1051 30.804 24.1083 30.7962 24.1115ZM30.8855 24.2028L30.8855 24.2027L30.8854 24.2025L30.8852 24.2015L30.8842 24.1978C30.8834 24.1947 30.8822 24.1902 30.8807 24.1848C30.8778 24.174 30.8736 24.1594 30.8688 24.1445C30.8641 24.1297 30.8586 24.1142 30.8531 24.1016C30.8503 24.0954 30.8473 24.0895 30.8442 24.0846C30.8414 24.0804 30.8372 24.0747 30.8313 24.0718L30.8283 24.0703H30.825C30.8166 24.0703 30.8099 24.0735 30.8046 24.0762C30.8035 24.0768 30.8023 24.0774 30.8011 24.078C30.7967 24.0804 30.7921 24.0828 30.7858 24.0853C30.7702 24.0916 30.744 24.0984 30.6937 24.0984H30.5476L30.5582 24.2893L30.6936 24.3727L30.8447 24.282L30.8869 24.2083L30.8855 24.2028Z" fill="#977C2E"/>
+<path d="M30.6 24.1125C30.6 24.1125 30.5625 24.0656 30.4781 24.075C30.3843 24.075 30.2906 24.1593 30.2812 24.2156C30.2718 24.2812 30.2812 24.4593 30.3281 24.4968C30.375 24.5343 30.4406 24.5437 30.5343 24.525C30.6281 24.4968 31.1343 24.1875 31.1343 24.1875L31.0031 24.2156C30.9375 24.2343 30.8718 24.2062 30.8718 24.2062C30.8718 24.2062 30.8062 24.2812 30.7218 24.3C30.6468 24.3 30.6281 24.2531 30.6093 24.2156L30.6 24.1125Z" fill="#F8C83C"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M30.611 24.1037C30.611 24.1037 30.611 24.1037 30.6 24.1125L30.614 24.1112L30.6231 24.2117C30.6238 24.213 30.6244 24.2143 30.6251 24.2156C30.6336 24.2329 30.6416 24.2491 30.6545 24.2619C30.6678 24.2753 30.6872 24.2856 30.7203 24.2859C30.759 24.277 30.794 24.2552 30.8198 24.235C30.8328 24.2249 30.8433 24.2153 30.8505 24.2082C30.854 24.2047 30.8568 24.2018 30.8586 24.1999C30.8595 24.1989 30.8602 24.1982 30.8607 24.1977L30.8612 24.1971L30.8613 24.197L30.868 24.1893L30.8774 24.1933L30.8779 24.1935L30.8798 24.1943C30.8816 24.1949 30.8842 24.1959 30.8875 24.197C30.8942 24.1992 30.9039 24.2019 30.9155 24.2042C30.9389 24.2086 30.9693 24.2107 30.9993 24.2021L31.0002 24.2018L31.1314 24.1737L31.1417 24.1995L31.136 24.203L31.1197 24.2129C31.1057 24.2214 31.0855 24.2336 31.0611 24.2483C31.0121 24.2778 30.9458 24.3174 30.8766 24.3578C30.8074 24.3983 30.7352 24.4397 30.6744 24.4728C30.6142 24.5055 30.5635 24.5309 30.5384 24.5385L30.5371 24.5388C30.4416 24.558 30.3709 24.5491 30.3193 24.5079C30.3042 24.4957 30.2938 24.4741 30.2863 24.4506C30.2786 24.4265 30.2732 24.3977 30.2696 24.3685C30.2625 24.3103 30.2624 24.248 30.2673 24.2136L30.2674 24.2133C30.2702 24.1963 30.2791 24.1785 30.2914 24.1616C30.3039 24.1446 30.3203 24.1279 30.3394 24.1131C30.3772 24.0838 30.4267 24.0612 30.4773 24.0609C30.5221 24.0561 30.5552 24.0661 30.5773 24.0778C30.5883 24.0837 30.5966 24.0899 30.6021 24.0948C30.6049 24.0972 30.607 24.0993 30.6085 24.1009C30.6092 24.1016 30.6098 24.1023 30.6102 24.1028L30.6107 24.1034L30.6109 24.1036L30.611 24.1037ZM31.0557 24.2187L31.0065 24.2293C30.971 24.2393 30.936 24.2367 30.9103 24.2318C30.8973 24.2293 30.8864 24.2262 30.8788 24.2237C30.8777 24.2234 30.8767 24.223 30.8757 24.2227C30.8741 24.2243 30.8723 24.2262 30.8701 24.2283C30.8624 24.2359 30.8511 24.2462 30.8372 24.2572C30.8094 24.2789 30.77 24.3037 30.7249 24.3137L30.7234 24.3141H30.7219C30.681 24.3141 30.6539 24.3011 30.6346 24.2818C30.6182 24.2655 30.6081 24.2449 30.5998 24.2281C30.5988 24.226 30.5978 24.2239 30.5968 24.2219L30.5956 24.2195L30.5864 24.1186C30.5856 24.1178 30.5847 24.1169 30.5835 24.1159C30.5794 24.1123 30.573 24.1074 30.5641 24.1027C30.5465 24.0933 30.5189 24.0846 30.4797 24.089L30.4789 24.0891H30.4781C30.4353 24.0891 30.3913 24.1085 30.3567 24.1353C30.3394 24.1487 30.3248 24.1636 30.3141 24.1782C30.3034 24.1929 30.297 24.2067 30.2951 24.2178C30.2907 24.249 30.2906 24.3086 30.2975 24.3651C30.301 24.3933 30.3061 24.4202 30.3131 24.4421C30.3203 24.4646 30.3286 24.4793 30.3369 24.4859C30.379 24.5195 30.4394 24.5296 30.5309 24.5113C30.553 24.5046 30.6005 24.4809 30.661 24.448C30.7214 24.4152 30.7933 24.374 30.8624 24.3336C30.9315 24.2932 30.9977 24.2537 31.0466 24.2242C31.0497 24.2224 31.0527 24.2205 31.0557 24.2187ZM30.5891 24.1214C30.5891 24.1214 30.5891 24.1214 30.5891 24.1214V24.1214Z" fill="#977C2E"/>
+<path d="M30.9375 24.2719L30.825 24.3187L30.7031 24.375L30.7406 24.525L30.9563 24.5719L31.0875 24.4687V24.3187L30.9281 24.2719H30.9375ZM31.9125 24.1594L31.8375 24.0844C31.8 24.0469 31.7438 24.0375 31.7438 24.0375L31.6219 24.1781V24.2719L31.7344 24.3375L31.8187 24.3562L31.9219 24.2812L31.9125 24.1594Z" fill="#F8C83C"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M31.7461 24.0236L31.7462 24.0237L31.7463 24.0237L31.7469 24.0238L31.749 24.0242C31.7508 24.0246 31.7534 24.0251 31.7565 24.0259C31.7628 24.0275 31.7715 24.03 31.7815 24.0337C31.8012 24.0411 31.8267 24.0537 31.8474 24.0744L31.9224 24.1494L31.9125 24.1594L31.9265 24.1583L31.9365 24.288L31.8219 24.3714L31.7292 24.3508L31.6078 24.28V24.1729L31.7383 24.0223L31.7461 24.0236ZM31.8989 24.1656L31.8275 24.0943C31.8108 24.0775 31.7894 24.0667 31.7716 24.06C31.7628 24.0568 31.7551 24.0546 31.7497 24.0532C31.7494 24.0531 31.7492 24.0531 31.7489 24.053L31.6359 24.1834V24.2638L31.7396 24.3243L31.8156 24.3412L31.9072 24.2745L31.8989 24.1656ZM30.9277 24.2607L30.9281 24.2578H30.9375L30.9379 24.2601L31.1016 24.3082V24.4756L30.9597 24.587L30.7291 24.5369L30.6866 24.3671L30.8196 24.3058L30.9277 24.2607ZM30.9344 24.2884L30.8306 24.3316L30.7196 24.3829L30.7521 24.5131L30.9528 24.5567L31.0734 24.4619V24.3293L30.9344 24.2884Z" fill="#977C2E"/>
+<path d="M31.1812 24.0938C31.1812 24.0938 31.0875 24.1312 31.0406 24.1687L30.9281 24.2625C30.9281 24.2812 31.0312 24.3938 31.0312 24.3938L31.1437 24.4031L31.3781 24.2438L31.3594 24.0938H31.1812ZM32.0719 24.2812L32.025 24.2156C31.9875 24.1781 31.9312 24.1594 31.9125 24.1594C31.8844 24.1594 31.7906 24.3 31.7906 24.3V24.3375L31.8656 24.4313L32.0156 24.4781L32.1187 24.3656L32.0719 24.2812Z" fill="#F8C83C"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M31.1813 24.0797H31.3718L31.3931 24.2506L31.1475 24.4176L31.0246 24.4073L31.0209 24.4033L31.0206 24.4029L31.0197 24.402L31.0164 24.3983C31.0136 24.3952 31.0095 24.3907 31.0046 24.3853C30.9949 24.3744 30.9819 24.3596 30.969 24.3443C30.956 24.3289 30.9429 24.3128 30.9329 24.2993C30.9279 24.2925 30.9236 24.2861 30.9204 24.2806C30.9188 24.2778 30.9173 24.2751 30.9163 24.2724C30.9153 24.27 30.9141 24.2664 30.9141 24.2625V24.2559L31.0318 24.1578C31.0566 24.138 31.093 24.1187 31.1224 24.1045C31.1373 24.0974 31.1507 24.0915 31.1603 24.0873C31.1651 24.0852 31.169 24.0836 31.1718 24.0825L31.1749 24.0812L31.1757 24.0808L31.1759 24.0808L31.1813 24.0938V24.0797ZM31.184 24.1078L31.1825 24.1085C31.1799 24.1095 31.1761 24.1111 31.1714 24.1131C31.162 24.1172 31.149 24.123 31.1346 24.1299C31.1055 24.1439 31.0716 24.162 31.0495 24.1797L30.9449 24.2668C30.9474 24.271 30.951 24.2764 30.9556 24.2826C30.965 24.2954 30.9776 24.3109 30.9904 24.3261C31.0032 24.3412 31.016 24.3558 31.0256 24.3665C31.0304 24.3719 31.0344 24.3764 31.0372 24.3795L31.0379 24.3802L31.14 24.3887L31.3631 24.237L31.347 24.1078H31.184ZM31.8909 24.1541C31.8964 24.1501 31.9041 24.1453 31.9125 24.1453C31.9248 24.1453 31.9457 24.151 31.9674 24.1606C31.9896 24.1705 32.0146 24.1854 32.0349 24.2057L32.0358 24.2065L32.0833 24.2731L32.0719 24.2813L32.0842 24.2744L32.136 24.3677L32.02 24.4942L31.8573 24.4434L31.7766 24.3425V24.2958L31.7789 24.2922L31.779 24.2921L31.7792 24.2918L31.78 24.2906L31.7831 24.2861C31.7857 24.2822 31.7895 24.2766 31.7942 24.27C31.8035 24.2567 31.8162 24.239 31.8299 24.2212C31.8434 24.2034 31.8582 24.1854 31.8715 24.1716C31.8781 24.1647 31.8847 24.1586 31.8909 24.1541ZM31.8047 24.3043V24.3326L31.8739 24.4191L32.0113 24.4621L32.1015 24.3636L32.06 24.2888L32.0143 24.2248C31.9972 24.208 31.9757 24.1951 31.956 24.1863C31.936 24.1774 31.9197 24.1737 31.913 24.1735C31.9129 24.1736 31.9112 24.1741 31.9075 24.1768C31.9032 24.18 31.8978 24.1848 31.8917 24.1911C31.8795 24.2038 31.8655 24.2208 31.8522 24.2383C31.8389 24.2556 31.8264 24.273 31.8172 24.2861C31.8127 24.2927 31.8089 24.2981 31.8063 24.3019L31.8047 24.3043Z" fill="#977C2E"/>
+<path d="M31.6875 24.45L31.8 24.4688C31.8 24.4688 31.8 24.4969 31.8282 24.5157C31.8563 24.5438 31.8563 24.5157 31.8563 24.5157C31.8563 24.5157 31.875 24.6282 31.9875 24.7032C31.9875 24.7032 32.1188 24.7594 32.175 24.7219C32.25 24.6844 32.2407 24.7219 32.2407 24.7219L32.4282 24.4969C32.4282 24.4969 32.4282 24.45 32.3813 24.45C32.3813 24.45 32.4188 24.3 32.2875 24.2625C32.175 24.2438 32.0813 24.2813 32.0813 24.2813C32.0813 24.2813 31.9875 24.45 31.9313 24.4313C31.9034 24.4208 31.8779 24.4049 31.8563 24.3844L31.7907 24.3C31.7907 24.3 31.7532 24.3094 31.7063 24.2813C31.6594 24.2532 31.6219 24.1782 31.6219 24.1782C31.6219 24.1782 31.5563 24.1688 31.5282 24.1407L31.4813 24.0657L31.3032 24.1969C31.3032 24.1969 31.3032 24.2438 31.2 24.3188C31.0969 24.3938 31.0407 24.3938 31.0407 24.3938C31.0407 24.3938 31.0032 24.5532 30.8907 24.525C30.7782 24.4969 30.7032 24.375 30.7032 24.375C30.7032 24.375 30.6188 24.3563 30.5719 24.4313C30.5157 24.4969 30.4875 24.525 30.4875 24.5907C30.4875 24.6657 30.5344 24.7594 30.5813 24.7969C30.6094 24.825 30.7219 24.9188 30.8625 24.8532C30.9938 24.7782 30.9469 24.6657 30.9469 24.6657L31.0219 24.6188C31.1063 24.5625 31.1907 24.4782 31.2563 24.4594" fill="#F8C83C"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M31.4838 24.0518C31.4877 24.0525 31.491 24.0548 31.4931 24.0581L31.5391 24.1317C31.5507 24.1425 31.5704 24.1508 31.5895 24.1564C31.5989 24.1592 31.6076 24.1611 31.6139 24.1624C31.617 24.163 31.6196 24.1635 31.6213 24.1637L31.6232 24.1641L31.6237 24.1641L31.6238 24.1642C31.6238 24.1642 31.6238 24.1642 31.6238 24.1642L31.6198 24.192L31.6196 24.192L31.6189 24.1919L31.6166 24.1915C31.6155 24.1913 31.6142 24.1911 31.6126 24.1908C31.6114 24.1905 31.6099 24.1903 31.6084 24.19C31.6015 24.1886 31.592 24.1864 31.5815 24.1834C31.5613 24.1774 31.5349 24.1673 31.5181 24.1505C31.5174 24.1498 31.5167 24.1489 31.5161 24.148L31.4773 24.0859L31.3161 24.2047C31.3158 24.206 31.3155 24.2076 31.315 24.2092C31.313 24.2161 31.3092 24.2254 31.3022 24.237C31.2881 24.26 31.2609 24.2918 31.2082 24.3301C31.1557 24.3683 31.1146 24.3877 31.0862 24.3976C31.072 24.4025 31.061 24.4051 31.0533 24.4064C31.0527 24.4065 31.0521 24.4066 31.0516 24.4067C31.0503 24.411 31.0485 24.4166 31.0462 24.423C31.0407 24.4381 31.0321 24.4582 31.0196 24.4775C31.0072 24.4968 30.9904 24.516 30.9684 24.5285C30.946 24.5413 30.9189 24.5465 30.8872 24.5386C30.8272 24.5236 30.7781 24.484 30.7445 24.4492C30.7276 24.4316 30.7143 24.415 30.7053 24.4028C30.7007 24.3967 30.6972 24.3916 30.6948 24.3881C30.6948 24.388 30.6947 24.3879 30.6947 24.3878C30.6929 24.3876 30.6907 24.3874 30.6882 24.3872C30.6804 24.3867 30.6696 24.3867 30.6574 24.3888C30.6334 24.393 30.6046 24.4053 30.5838 24.4387C30.5834 24.4393 30.583 24.4398 30.5825 24.4404C30.5788 24.4446 30.5753 24.4487 30.5719 24.4527C30.5489 24.4794 30.5322 24.4988 30.5206 24.5181C30.5079 24.5393 30.5015 24.5602 30.5015 24.5906C30.5015 24.6254 30.5125 24.6656 30.5295 24.7018C30.5465 24.7381 30.5688 24.7689 30.59 24.7858C30.5904 24.7862 30.5908 24.7865 30.5911 24.7869C30.6185 24.8143 30.7243 24.9016 30.856 24.8406C30.9174 24.8053 30.9358 24.7625 30.9399 24.7295C30.942 24.7125 30.9404 24.6977 30.9383 24.6871C30.9373 24.6818 30.9361 24.6776 30.9352 24.6748C30.9347 24.6734 30.9344 24.6724 30.9341 24.6717L30.9339 24.6711C30.9339 24.671 30.9339 24.6711 30.9339 24.6711C30.9339 24.6711 30.9338 24.671 30.9468 24.6656C30.9598 24.6602 30.9598 24.6602 30.9598 24.6602L30.9599 24.6604L30.96 24.6608L30.9605 24.662C30.9609 24.663 30.9614 24.6645 30.962 24.6663C30.9625 24.6678 30.963 24.6696 30.9636 24.6717C30.9643 24.6745 30.9651 24.6778 30.9659 24.6816C30.9685 24.6944 30.9704 24.7124 30.9678 24.7329C30.9626 24.7748 30.9389 24.8256 30.8694 24.8653L30.8684 24.8659C30.72 24.9351 30.6016 24.8368 30.5718 24.8073C30.5463 24.7867 30.522 24.7521 30.504 24.7137C30.4858 24.675 30.4734 24.6307 30.4734 24.5906C30.4734 24.5553 30.4811 24.5293 30.4965 24.5037C30.5094 24.4821 30.5279 24.4607 30.5506 24.4343C30.5538 24.4306 30.5571 24.4267 30.5605 24.4228C30.5865 24.3818 30.623 24.3663 30.6526 24.3611C30.6675 24.3585 30.6806 24.3585 30.6901 24.3592C30.6949 24.3595 30.6987 24.36 30.7015 24.3604C30.7029 24.3606 30.7039 24.3608 30.7047 24.3609L30.7057 24.3611L30.706 24.3612L30.7061 24.3612C30.7061 24.3612 30.7061 24.3612 30.7031 24.375L30.7061 24.3612C30.7098 24.362 30.7131 24.3643 30.715 24.3676M30.715 24.3676L30.7152 24.3678L30.7158 24.3687C30.7163 24.3696 30.7171 24.3708 30.7182 24.3724C30.7204 24.3756 30.7236 24.3803 30.7279 24.3861C30.7364 24.3976 30.7489 24.4132 30.7648 24.4296C30.7968 24.4628 30.8414 24.4982 30.894 24.5113C30.9185 24.5174 30.9383 24.5133 30.9545 24.5041C30.9712 24.4946 30.9849 24.4793 30.9959 24.4622C31.0069 24.4453 31.0147 24.4273 31.0197 24.4134C31.0223 24.4064 31.0241 24.4006 31.0252 24.3966C31.0258 24.3946 31.0262 24.393 31.0265 24.3919L31.0268 24.3908L31.0269 24.3905L31.0406 24.3937L31.0406 24.3796C31.0405 24.3796 31.0405 24.3796 31.0405 24.3796C31.034 24.3797 31.0284 24.3842 31.0269 24.3905M31.289 24.1964C31.2891 24.1921 31.2912 24.1881 31.2947 24.1855L31.4729 24.0543C31.476 24.0519 31.48 24.051 31.4838 24.0518M31.289 24.1964L31.289 24.1966L31.289 24.1967C31.289 24.1967 31.289 24.1968 31.3031 24.1968L31.289 24.1968C31.289 24.1967 31.289 24.1966 31.289 24.1964ZM31.0142 24.6069L30.9394 24.6537C30.9335 24.6573 30.9312 24.6647 30.9339 24.6711M31.0142 24.6069C31.0437 24.5872 31.073 24.5642 31.1019 24.5415C31.1138 24.5321 31.1257 24.5228 31.1375 24.5138C31.1771 24.4835 31.2166 24.456 31.2523 24.4458C31.2598 24.4437 31.2676 24.448 31.2697 24.4555C31.2719 24.4629 31.2675 24.4707 31.2601 24.4728C31.2302 24.4814 31.1947 24.5055 31.1546 24.5361C31.1434 24.5447 31.1319 24.5537 31.1202 24.5629C31.0909 24.5859 31.0601 24.6101 31.0296 24.6304L31.0293 24.6306L30.9636 24.6717M31.7845 24.3151C31.7796 24.3155 31.7729 24.3158 31.7649 24.3151C31.7477 24.3138 31.7245 24.3086 31.699 24.2933C31.6728 24.2776 31.6503 24.2497 31.6348 24.227C31.6269 24.2155 31.6206 24.2049 31.6162 24.1972C31.6148 24.1947 31.6136 24.1926 31.6126 24.1908M31.7845 24.3151L31.8451 24.393C31.8455 24.3935 31.846 24.3941 31.8465 24.3946C31.8696 24.4163 31.8966 24.4332 31.9262 24.4444L31.9268 24.4445C31.9482 24.4517 31.9699 24.4403 31.9871 24.4267C32.0051 24.4124 32.023 24.392 32.0385 24.3718C32.0541 24.3514 32.0678 24.3305 32.0776 24.3147C32.0825 24.3068 32.0865 24.3002 32.0892 24.2955C32.0898 24.2944 32.0904 24.2935 32.0909 24.2926C32.0935 24.2917 32.0971 24.2905 32.1017 24.2891C32.1118 24.286 32.1266 24.282 32.1447 24.2786C32.1809 24.2718 32.2305 24.2673 32.2843 24.2762C32.314 24.2848 32.3334 24.2995 32.3463 24.3162C32.3595 24.3332 32.3664 24.3531 32.3697 24.3726C32.3729 24.3921 32.3724 24.4107 32.371 24.4245C32.3703 24.4314 32.3694 24.437 32.3687 24.4409C32.3684 24.4428 32.3681 24.4443 32.3679 24.4452L32.3676 24.4463L32.3676 24.4465C32.3676 24.4465 32.3676 24.4465 32.3676 24.4465C32.3665 24.4507 32.3675 24.4552 32.3701 24.4586C32.3728 24.462 32.3769 24.464 32.3812 24.464C32.3905 24.464 32.3965 24.4663 32.4005 24.469C32.4046 24.4717 32.4075 24.4755 32.4096 24.4797C32.4118 24.4839 32.4129 24.4883 32.4135 24.4918C32.4135 24.492 32.4135 24.4921 32.4135 24.4923L32.2437 24.6961C32.2437 24.6961 32.2437 24.6961 32.2437 24.6961C32.2359 24.6908 32.2257 24.6901 32.2143 24.6922C32.2028 24.6943 32.188 24.6996 32.1687 24.7092C32.1681 24.7095 32.1676 24.7098 32.1672 24.7101C32.1564 24.7173 32.1409 24.7207 32.1219 24.7207C32.1032 24.7207 32.0827 24.7174 32.0633 24.7128C32.0441 24.7083 32.0264 24.7026 32.0135 24.698C32.0071 24.6957 32.0019 24.6938 31.9984 24.6923C31.9966 24.6916 31.9952 24.6911 31.9943 24.6907L31.9941 24.6906C31.941 24.6549 31.91 24.6105 31.8922 24.5749C31.8833 24.557 31.8777 24.5414 31.8744 24.5303C31.8727 24.5248 31.8716 24.5204 31.8709 24.5174C31.8706 24.516 31.8704 24.5149 31.8702 24.5142L31.8701 24.5134L31.8701 24.5133C31.8701 24.5133 31.8701 24.5133 31.8701 24.5133C31.8689 24.5061 31.8623 24.501 31.855 24.5016C31.8496 24.502 31.8451 24.5055 31.8431 24.5103C31.8417 24.5092 31.84 24.5076 31.838 24.5056C31.8374 24.505 31.8366 24.5044 31.8359 24.5039C31.8247 24.4964 31.8193 24.4873 31.8166 24.4802C31.8153 24.4766 31.8146 24.4734 31.8143 24.4713C31.8141 24.4702 31.8141 24.4695 31.814 24.469L31.814 24.4686C31.814 24.4685 31.814 24.4685 31.814 24.4686M31.8486 24.5421C31.8455 24.5422 31.8426 24.5417 31.8399 24.5408C31.8331 24.5385 31.8263 24.5335 31.8191 24.5265C31.8029 24.5153 31.7946 24.5014 31.7903 24.49C31.7891 24.4867 31.7882 24.4836 31.7875 24.4809L31.6851 24.4638C31.6775 24.4625 31.6723 24.4553 31.6736 24.4476C31.6749 24.44 31.6821 24.4348 31.6898 24.4361L31.8023 24.4548C31.809 24.456 31.814 24.4617 31.814 24.4686M31.8486 24.5421C31.8524 24.5541 31.8582 24.5698 31.8671 24.5875C31.8866 24.6267 31.9209 24.6756 31.9797 24.7148C31.9804 24.7153 31.9811 24.7157 31.9819 24.716L31.982 24.7161L31.9824 24.7162L31.9836 24.7167C31.9846 24.7171 31.9861 24.7177 31.988 24.7185C31.9919 24.72 31.9974 24.7221 32.0041 24.7245C32.0176 24.7293 32.0363 24.7354 32.0569 24.7402C32.0774 24.745 32.1002 24.7488 32.1219 24.7488C32.1431 24.7488 32.1647 24.7452 32.182 24.734C32.1997 24.7252 32.2117 24.7212 32.2194 24.7198C32.2231 24.7192 32.2254 24.7192 32.2267 24.7193C32.2256 24.7254 32.2286 24.7315 32.2342 24.7344C32.2401 24.7373 32.2472 24.7359 32.2514 24.7308L32.4389 24.5058C32.441 24.5033 32.4421 24.5001 32.4421 24.4968H32.4281C32.4421 24.4968 32.4421 24.4968 32.4421 24.4968L32.4421 24.4967L32.4421 24.4965L32.4421 24.4958C32.4421 24.4953 32.4421 24.4946 32.442 24.4938C32.4419 24.4922 32.4417 24.4899 32.4412 24.4872C32.4403 24.4819 32.4385 24.4746 32.4348 24.4671C32.431 24.4596 32.4252 24.4516 32.4161 24.4456C32.4108 24.442 32.4047 24.4394 32.3977 24.4377C32.3982 24.4346 32.3986 24.4311 32.399 24.4273C32.4005 24.4119 32.4012 24.3906 32.3974 24.3679C32.3936 24.3453 32.3853 24.3206 32.3686 24.299C32.3517 24.2771 32.3269 24.2591 32.2913 24.2489C32.2908 24.2488 32.2903 24.2487 32.2898 24.2486C32.2314 24.2389 32.1782 24.2437 32.1395 24.251C32.1202 24.2546 32.1045 24.2588 32.0935 24.2622C32.088 24.2639 32.0837 24.2653 32.0807 24.2664C32.0793 24.2669 32.0781 24.2673 32.0773 24.2676L32.0764 24.268L32.0761 24.2681L32.076 24.2681C32.073 24.2693 32.0705 24.2715 32.0689 24.2744C32.0689 24.2744 32.0689 24.2744 32.0689 24.2744L32.0689 24.2745L32.0687 24.2748L32.0679 24.2761C32.0672 24.2773 32.0662 24.2791 32.0649 24.2813C32.0623 24.2858 32.0585 24.2922 32.0537 24.2998C32.0442 24.3151 32.031 24.3352 32.0161 24.3547C32.0011 24.3743 31.985 24.3925 31.9697 24.4046C31.9536 24.4173 31.9426 24.42 31.9359 24.4179C31.9102 24.4082 31.8867 24.3936 31.8666 24.3748L31.8017 24.2913C31.7983 24.2869 31.7926 24.285 31.7872 24.2863L31.7864 24.2865C31.7856 24.2866 31.7843 24.2868 31.7825 24.287C31.779 24.2874 31.7737 24.2876 31.767 24.2871C31.7537 24.2861 31.7348 24.282 31.7134 24.2691C31.6927 24.2567 31.673 24.2331 31.658 24.2111C31.6507 24.2004 31.6447 24.1905 31.6406 24.1833C31.6386 24.1797 31.637 24.1768 31.6359 24.1748L31.6348 24.1725L31.6345 24.1719L31.6344 24.1718" fill="#977C2E"/>
+<path d="M31.4812 23.5125V23.8125C31.4812 23.8125 31.5187 24.0843 31.4625 24.1593C31.4062 24.2531 31.1906 24.225 31.1625 24.1593C31.1343 24.0843 31.1437 23.8593 31.1437 23.8593L31.4812 23.5125Z" fill="#F8C83C"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M31.1297 23.8588L31.1297 23.8595L31.1296 23.8614L31.1293 23.8687C31.1291 23.8751 31.1289 23.8842 31.1287 23.8954C31.1282 23.9178 31.1279 23.9485 31.1285 23.9815C31.1291 24.0145 31.1306 24.0501 31.1337 24.0822C31.1368 24.114 31.1416 24.1437 31.1493 24.1643L31.1496 24.1649C31.1588 24.1865 31.1819 24.2024 31.2079 24.2132C31.2347 24.2243 31.2676 24.2313 31.3012 24.2332C31.3347 24.235 31.3697 24.2317 31.4003 24.2215C31.4306 24.2114 31.4578 24.1941 31.4742 24.1672C31.4903 24.1453 31.4987 24.1113 31.5031 24.0752C31.5076 24.0382 31.5082 23.9964 31.507 23.9574C31.5058 23.9183 31.5029 23.8816 31.5002 23.8548C31.4989 23.8413 31.4976 23.8303 31.4967 23.8226C31.4962 23.8188 31.4959 23.8158 31.4956 23.8138L31.4953 23.8115V23.5125H31.4812L31.4712 23.5027L31.1299 23.8534L31.1297 23.8588ZM31.1576 23.8653L31.1574 23.8696C31.1572 23.8759 31.157 23.8849 31.1568 23.896C31.1563 23.9181 31.156 23.9484 31.1566 23.981C31.1572 24.0136 31.1587 24.0484 31.1617 24.0795C31.1647 24.1108 31.1693 24.1372 31.1755 24.1541C31.1805 24.1653 31.1949 24.1774 31.2187 24.1872C31.2421 24.1969 31.2718 24.2034 31.3027 24.2051C31.3336 24.2068 31.3649 24.2036 31.3914 24.1948C31.4179 24.186 31.4386 24.1718 31.4504 24.1521L31.4508 24.1515L31.4512 24.1509C31.4629 24.1353 31.4708 24.1075 31.4752 24.0718C31.4795 24.0368 31.4801 23.9966 31.4789 23.9582C31.4777 23.92 31.4748 23.884 31.4722 23.8575C31.4709 23.8443 31.4697 23.8335 31.4688 23.826C31.4683 23.8223 31.468 23.8193 31.4677 23.8174L31.4674 23.8151L31.4673 23.8146L31.4673 23.8144L31.4672 23.8135V23.5471L31.1576 23.8653Z" fill="#977C2E"/>
+<path d="M31.2469 24.4219C31.2469 24.4219 31.2 24.4969 31.3406 24.5157C31.3781 24.5157 31.4063 24.4969 31.425 24.4782C31.4625 24.4407 31.4531 24.4032 31.4531 24.4032C31.4531 24.4032 31.4344 24.5157 31.5656 24.5157C31.6969 24.525 31.6875 24.3938 31.6875 24.3938" fill="#F8C83C"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M31.6865 24.3797C31.6943 24.3791 31.701 24.385 31.7016 24.3927L31.6875 24.3937C31.7016 24.3927 31.7016 24.3927 31.7016 24.3927L31.7016 24.3927L31.7016 24.3928L31.7016 24.3929L31.7016 24.3933L31.7017 24.3946C31.7017 24.3958 31.7017 24.3973 31.7017 24.3993C31.7017 24.4033 31.7016 24.4088 31.7009 24.4154C31.6997 24.4285 31.6965 24.4462 31.6887 24.4639C31.6808 24.4816 31.668 24.4996 31.6475 24.5124C31.6271 24.5252 31.6001 24.5321 31.5652 24.5296C31.5306 24.5296 31.5045 24.5221 31.4852 24.5099C31.4679 24.499 31.4568 24.4848 31.4498 24.4704C31.4457 24.4762 31.4408 24.4821 31.435 24.488C31.4147 24.5083 31.3832 24.5296 31.3407 24.5296C31.34 24.5296 31.3394 24.5296 31.3388 24.5295C31.2667 24.5199 31.2357 24.4949 31.2275 24.4654C31.2236 24.4515 31.2256 24.4387 31.2283 24.4298C31.2297 24.4253 31.2312 24.4216 31.2325 24.419C31.2331 24.4177 31.2337 24.4166 31.2341 24.4158L31.2347 24.4149L31.2349 24.4146L31.2349 24.4145L31.235 24.4144L31.235 24.4144C31.235 24.4144 31.235 24.4144 31.2469 24.4218M31.6865 24.3797C31.6788 24.3802 31.673 24.387 31.6735 24.3947L31.6865 24.3797Z" fill="#977C2E"/>
+<path d="M30.1125 24.6656C30.1125 24.6656 30.0375 24.5344 30.1219 24.4875C30.2156 24.4406 30.2625 24.4875 30.3187 24.4875C30.375 24.4875 30.3562 24.3562 30.3469 24.3281C30.3323 24.2868 30.31 24.2486 30.2812 24.2156C30.2625 24.1968 29.9531 24.2343 29.9625 24.4312C29.9625 24.6281 30.1125 24.6656 30.1125 24.6656ZM30.5812 25.1531C30.5812 25.1531 30.4875 25.0125 30.5437 24.9281C30.5906 24.8437 30.6375 24.9 30.6562 24.8906C30.6844 24.8906 30.6937 24.8343 30.6562 24.7406C30.6094 24.6468 30.5531 24.6093 30.525 24.6C30.4875 24.6 30.3094 24.7312 30.3375 24.9C30.3499 24.9609 30.3795 25.0171 30.4226 25.0619C30.4658 25.1067 30.5208 25.1384 30.5812 25.1531ZM32.2875 24.9843C32.2875 24.9843 32.6156 25.125 32.6344 24.7968C32.6531 24.6093 32.4937 24.4875 32.4469 24.4875C32.4094 24.4875 32.3812 24.5156 32.325 24.5812C32.2594 24.6562 32.2219 24.7031 32.2406 24.7312C32.2687 24.7593 32.3625 24.7031 32.4094 24.8062C32.475 24.9937 32.2875 24.9843 32.2875 24.9843Z" fill="#202220"/>
+<path d="M30.5813 25.1531C30.5813 25.1531 30.3281 25.0969 30.3281 24.8438C30.3281 24.675 30.5156 24.6 30.5156 24.6C30.5156 24.6 30.3469 24.6938 30.3469 24.8438C30.3375 25.0969 30.5813 25.1531 30.5813 25.1531ZM30.1125 24.6656C30.1125 24.6656 29.9625 24.6375 29.9531 24.4219C29.9344 24.2063 30.2813 24.2156 30.2813 24.2156C30.2813 24.2156 29.9531 24.2344 29.9625 24.4406C29.9813 24.6469 30.1125 24.6656 30.1125 24.6656ZM32.2875 24.9844C32.2875 24.9844 32.3531 25.0125 32.4281 25.0125C32.5031 25.0125 32.5969 24.9844 32.6156 24.8625C32.6531 24.7406 32.6438 24.675 32.5594 24.5719C32.5031 24.4875 32.4469 24.4969 32.4469 24.4969C32.4469 24.4969 32.5031 24.4969 32.5406 24.5719C32.5969 24.6469 32.6625 24.7219 32.6156 24.8625C32.5688 25.0031 32.4281 25.0031 32.3813 25.0031C32.3495 24.9998 32.3181 24.9935 32.2875 24.9844Z" fill="#4B4139"/>
+<path d="M28.3688 18.0375L28.3125 18.0187L28.35 17.925L28.5281 17.8593L28.6969 17.85L28.8844 17.8406L28.9594 17.8968L29.0531 18.1125L28.7156 18.3187L28.6594 18.3375L28.6406 18.2437L28.5844 18.1125L28.3688 18.0375Z" fill="#904720"/>
+<path d="M31.5937 23.0156L31.5656 22.5L30.1781 22.9313L30.7219 23.4469L31.5937 23.0156Z" fill="#202020"/>
+<path d="M29.0062 22.1156L28.8938 22.0219L28.7625 21.9469H28.6594L28.6406 21.975L28.6594 22.0219L28.7812 22.1719L28.9969 22.2844L29.0719 22.35L29.1188 22.3688L29.0156 22.1156H29.0062ZM28.9781 22.3313L29.0531 22.35L29.1375 22.4438L29.1844 22.5375L29.25 22.6594L29.2688 22.7344L29.1188 22.7063L28.6687 22.5656L28.7063 22.4531L28.7812 22.3875L28.8469 22.3594L28.9406 22.3406L28.9781 22.3313Z" fill="#D2A567"/>
+<path d="M29.2687 22.7062H29.3437L29.4 22.6594L29.3719 22.4906L29.4 21.9469L29.0344 21.5156L28.9594 21.7594L29.0625 22.2L29.1469 22.4625L29.2687 22.7062Z" fill="#D2A567"/>
+<path d="M29.0063 21.7219C29.0063 21.7219 28.9875 21.7594 29.0156 21.9094C29.0438 22.0501 29.1 22.3688 29.2219 22.5844L29.1 22.4063C29.1 22.4063 28.9125 21.9751 28.9406 21.6376C28.9688 21.3094 29.0063 21.7126 29.0063 21.7126V21.7219ZM29.2781 21.9938C29.2781 21.9938 29.1938 22.0876 29.1844 22.1719V22.3782C29.1844 22.3782 29.1844 22.2844 29.2594 22.2563C29.3438 22.2282 29.325 22.4719 29.3344 22.5001L29.3813 22.0594L29.2781 21.9938ZM29.3156 22.8938L28.9031 22.8001C28.6875 22.7063 28.575 22.6313 28.5844 22.5844C28.5844 22.5282 28.9594 22.5938 29.0156 22.6032L29.2406 22.6969H29.3344L29.5125 22.6219L29.5313 22.8094L29.3156 22.9032V22.8938ZM28.6313 22.8188C28.6313 22.8188 28.725 22.8938 28.6781 22.9126C28.6101 22.941 28.5356 22.9508 28.4625 22.9407L28.8563 23.0344L28.9406 22.9688L28.6313 22.8188Z" fill="#AB6D29"/>
+<path d="M28.5188 22.7062C28.5375 22.6875 28.5469 22.7718 28.6875 22.7812C28.8282 22.8 28.8938 22.7625 28.8938 22.7625L28.9594 22.8L29.0344 22.8187L28.9688 22.9218L28.7063 22.8468L28.5657 22.7718L28.5188 22.7062Z" fill="#D2A567"/>
+<path d="M29.4375 22.5281L29.5125 22.6219L29.5594 22.3969V22.1625L29.4094 22.0687L29.4375 22.5281Z" fill="#AB6D29"/>
+<path d="M29.0344 22.1344L28.9125 21.9375L28.7532 21.6469L28.8469 21.4781L28.9688 21.6469C28.9688 21.6469 28.9313 21.7688 28.9594 21.8813C28.9782 21.9938 29.0344 22.1344 29.0344 22.1344Z" fill="#4D2A15"/>
+<path d="M28.2 22.875C28.2 22.875 28.2562 22.7906 28.3781 22.7812C28.4536 22.7755 28.5296 22.7818 28.6031 22.8L28.8468 22.9312L28.9031 23.0156L28.4343 22.95L28.2 22.875Z" fill="#D2A567"/>
+<path d="M29.4375 22.0312L29.4563 22.4062C29.4563 22.5 29.5219 22.5937 29.5125 22.6218C29.4938 22.6593 29.475 22.6781 29.4188 22.7062C29.3625 22.725 29.2313 22.7062 29.2313 22.7062C29.2313 22.7062 29.3531 22.6875 29.3625 22.6593C29.3625 22.6406 29.325 22.5281 29.3156 22.4343C29.3156 22.3406 29.325 22.2281 29.2875 22.2281C29.2594 22.2281 29.2219 22.2656 29.2125 22.2843C29.2125 22.2843 29.25 21.9281 29.2875 21.8906C29.325 21.8531 29.4375 22.0406 29.4375 22.0406V22.0312Z" fill="#8F4620"/>
+<path d="M28.5657 22.7813C28.5657 22.7813 28.5188 22.7438 28.5188 22.7063C28.5188 22.6781 28.575 22.8563 28.8375 22.8469C29.1 22.8469 29.0813 22.8281 29.0813 22.8281H29.2032C29.2032 22.8281 29.175 22.95 29.1563 22.9594C29.0866 23.0017 29.0179 23.0454 28.95 23.0906L28.8844 23.1281V23.1094L28.8563 22.9125L28.6313 22.8188L28.5657 22.7813Z" fill="#AB6D29"/>
+<path d="M29.0344 22.1344C29.0344 22.1344 28.7344 21.825 28.6313 21.6187C28.5375 21.4125 28.5938 21.1312 28.5938 21.1312L28.875 21.5062C28.875 21.5062 28.8375 21.5719 28.8469 21.6937C28.8656 21.8062 29.0344 22.1344 29.0344 22.1344Z" fill="#8F4620"/>
+<path d="M28.8375 23.2781C28.8375 23.25 28.8187 23.1844 28.875 23.1094C29.0625 22.8844 29.5125 22.7344 29.5125 22.7344V22.9969L28.9312 23.2781H28.8375Z" fill="#AB6D29"/>
+<path d="M28.875 23.0625C28.9032 23.0531 29.0063 22.9687 29.0063 22.9406C29.0063 22.9031 28.9407 22.9031 28.8094 22.875C28.6688 22.8469 28.5657 22.7812 28.5657 22.7812C28.5657 22.7812 28.725 22.9125 28.7907 22.9406C28.8563 22.9594 28.8469 22.9875 28.8375 23.0062L28.875 23.0625ZM29.6532 23.1281C29.6532 23.1281 29.5688 23.0062 29.5407 22.9312C29.5125 22.8562 29.5125 22.7344 29.5125 22.725L29.4188 22.7906L29.2313 22.8562C29.2313 22.8562 29.4188 22.8562 29.4188 22.9125C29.4188 22.9781 29.1375 23.0062 29.1375 23.0062C29.1375 23.0156 29.3625 22.9687 29.3532 23.0156C29.3344 23.0719 29.2407 23.0812 29.1188 23.1281L28.9032 23.2219L28.8375 23.2687C28.8375 23.2687 28.8938 23.3062 28.9782 23.2969C29.0625 23.2969 29.25 23.25 29.25 23.25L29.6063 23.1094L29.6532 23.1281Z" fill="#8F4620"/>
+<path d="M29.6531 23.1282C29.6531 23.1282 29.5594 23.1 29.4844 22.6782C29.4094 22.2563 29.4281 22.1438 29.4281 22.1438L29.5969 22.2657L29.7562 22.5469L29.6531 23.1282Z" fill="#AB6D29"/>
+<path d="M29.7093 22.4343C29.7093 22.4343 29.6249 22.6687 29.6249 22.8093C29.6249 22.9406 29.6156 23.0343 29.6531 23.1281C29.6906 23.2218 29.8218 23.3437 29.8218 23.3437L29.8874 23.2875L29.9156 23.1L29.9249 22.7812L29.7093 22.4343Z" fill="#8F4620"/>
+<path d="M29.9438 22.7532C29.9438 22.7532 29.9813 23.3438 29.8313 23.3625C29.7656 23.3625 29.6531 23.1375 29.6531 23.1282C29.6531 23.1282 29.7844 23.3438 29.8406 23.325C29.9344 23.2875 29.8969 22.7063 29.8969 22.7063L29.9438 22.7532ZM29.6531 23.1282C29.6531 23.1282 29.625 23.1282 29.5875 23.0532C29.55 22.9875 29.5875 23.1094 29.2688 23.2219C28.95 23.3344 28.8375 23.2688 28.8375 23.2688C28.8375 23.2688 28.9406 23.3625 29.2594 23.2688C29.5781 23.175 29.55 23.1469 29.5969 23.1375H29.6531V23.1282Z" fill="#202020"/>
+<path d="M29.0625 22.3781C29.0625 22.3781 29.1188 22.425 29.175 22.5375C29.2061 22.6001 29.2374 22.6626 29.2688 22.725H29.2875C29.2875 22.725 29.25 22.6031 29.1938 22.5188L28.9875 22.2281L29.0625 22.3781Z" fill="#AB6D29"/>
+<path d="M28.875 23.1094C28.875 23.1094 28.9031 23.0063 28.875 22.9781C28.8468 22.9594 28.8093 22.9781 28.5937 22.9594C28.4608 22.9396 28.3293 22.9114 28.2 22.875C28.2 22.875 28.35 22.9687 28.4812 23.0062L28.8093 23.0812L28.8562 23.0906L28.875 23.1094Z" fill="#8F4620"/>
+<path d="M28.875 23.1094L28.8562 23.0625C28.8281 23.0344 28.7906 23.0719 28.5281 22.9969C28.2656 22.9313 28.2 22.875 28.2 22.875C28.2 22.875 28.2937 22.9688 28.5187 23.0156L28.875 23.1094Z" fill="#202020"/>
+<path d="M28.9969 22.3313C28.9969 22.3313 28.8 22.3407 28.7344 22.3969C28.6687 22.4438 28.5844 22.5844 28.5844 22.5844L28.7062 22.5938C28.7062 22.5938 28.6969 22.4813 28.7531 22.4157C28.8187 22.3594 28.9125 22.35 28.9969 22.3313Z" fill="#AB6D29"/>
+<path d="M28.6218 21.9563C28.6218 21.9563 28.6968 22.0688 28.7812 22.0969C28.8656 22.1344 28.95 22.1719 28.9875 22.2094C29.025 22.2469 29.0718 22.3782 29.0718 22.3782C29.0718 22.3782 28.7906 22.2563 28.725 22.1907C28.6796 22.1179 28.6449 22.0389 28.6218 21.9563Z" fill="#8F4620"/>
+<path d="M28.8937 22.0313C28.8937 22.0313 28.8656 21.9844 28.7906 21.9469C28.7156 21.9094 28.6593 21.9188 28.6312 21.9375C28.6031 21.9563 28.6218 21.9563 28.6218 21.9563L28.7156 22.1157L28.7812 22.0969C28.7812 22.0969 28.6312 22.0032 28.6593 21.975C28.7343 21.9094 28.8937 22.0219 28.8937 22.0219V22.0313Z" fill="#8F4620"/>
+<path d="M29.6531 21.6656L31.2469 20.85L31.9969 21.8906L30.6188 22.2656L29.8969 22.3219L29.5406 22.0687L29.6531 21.6656Z" fill="#202020"/>
+<path d="M31.7813 22.1156L33.75 23.8219L33.5344 23.9719L33.0657 23.8406L32.1094 22.8937L31.7532 22.5375L31.7813 22.1156Z" fill="#4D2A15"/>
+<path d="M34.3125 23.4844L33.1875 22.6312L31.7532 21.5531L31.7907 22.0687L33.4219 23.5687L33.9563 23.8219L34.2375 23.7469L34.3688 23.5969L34.3125 23.4844Z" fill="#4D2A15"/>
+<path d="M31.7812 22.275C31.7812 22.275 32.3437 22.9219 32.775 23.25C33.2062 23.5782 33.6187 23.9344 33.7125 23.8782C33.7875 23.8313 33.7593 23.7844 33.7593 23.7844L31.7625 22.1438L31.7718 22.275H31.7812Z" fill="#803F1D"/>
+<path d="M33.1688 23.9156L32.9719 24.075L32.7375 23.9813L31.5188 22.7438L31.5844 22.5094L31.7532 22.5375L33.1688 23.9156Z" fill="#4D2A15"/>
+<path d="M34.3125 23.4844C34.3125 23.4844 34.1625 23.8406 33.8437 23.7562C33.525 23.6719 31.7812 22.0219 31.7812 22.0219V22.1906C31.7812 22.1906 33.5437 23.8125 33.8906 23.8781C34.2281 23.9437 34.5094 23.6437 34.4719 23.6156C34.4199 23.5705 34.3667 23.5268 34.3125 23.4844Z" fill="#202020"/>
+<path d="M31.5844 22.5375C31.5844 22.5375 32.1469 23.2593 32.4375 23.5218C32.7375 23.7937 33 23.9906 33.1125 23.9718C33.2344 23.9531 33.0469 23.8125 33.0469 23.8125L32.1937 22.9687L31.7531 22.5375C31.7531 22.5375 31.5844 22.4718 31.5844 22.5375Z" fill="#803F1D"/>
+<path d="M31.725 22.5375C31.725 22.5375 33.15 23.9906 33.2625 24.0281C33.4969 24.0937 33.8437 23.8406 33.8437 23.8406L33.7219 23.775L33.7031 23.8219C33.7031 23.8219 33.6375 23.9719 33.3281 23.9062C33.0281 23.8406 31.7719 22.4906 31.7719 22.4906L31.725 22.5375Z" fill="#202020"/>
+<path d="M32.25 23.9344L31.7344 23.3344L31.6219 23.1375L31.5938 22.8844L32.625 23.925L32.4844 24.0188L32.3531 23.9813L32.25 23.9344Z" fill="#4D2A15"/>
+<path d="M33.1969 23.9531C33.1969 23.9531 33.075 24.1406 32.8969 24.1031C32.795 24.0784 32.7033 24.0227 32.6344 23.9437L31.6407 22.9687L31.6125 22.8187C31.6125 22.8187 32.7094 23.9719 32.8969 24.0187C33.0469 24.0562 33.15 23.8875 33.15 23.8875L33.1969 23.9531Z" fill="#202020"/>
+<path d="M32.6438 23.9156C32.6438 23.9156 32.5969 24.0656 32.4563 24.0469C32.3063 24.0187 32.2688 23.9625 32.2688 23.9625L31.65 23.2406L31.6406 23.0531C31.6406 23.0531 32.2781 23.925 32.4187 23.9719C32.5687 24.0187 32.6062 23.8781 32.6062 23.8781L32.6438 23.9156Z" fill="#202020"/>
+<path d="M31.9969 22.0218C31.9969 22.0218 32.5875 22.5281 32.6344 22.5468C32.6813 22.575 32.8875 22.5843 32.8969 22.6125C32.9157 22.6406 32.7657 22.6125 32.7563 22.6406C32.7469 22.6781 33.0563 22.9218 33.1032 22.9312C33.15 22.9312 33.4032 22.9312 33.3938 22.9687C33.3938 22.9968 33.225 22.9687 33.2157 23.0062C33.2157 23.0437 33.4875 23.2593 33.5344 23.2687C33.5813 23.2687 33.9 23.2687 33.9 23.3062C33.9 23.3343 33.6469 23.3062 33.6469 23.3531C33.6563 23.4093 34.0782 23.6718 34.0594 23.7093C34.0407 23.7468 33.5532 23.3812 33.5438 23.4C33.525 23.4187 33.5063 23.5312 33.4782 23.55C33.45 23.5687 33.4782 23.4 33.4594 23.325C33.4313 23.25 33.1407 23.0343 33.1125 23.0531C33.0844 23.0812 33.1125 23.2125 33.075 23.2125C33.0375 23.2125 33.0844 23.0531 33.0563 22.9968C32.9582 22.887 32.8445 22.7923 32.7188 22.7156C32.6813 22.7156 32.7094 22.8375 32.6813 22.8562C32.6532 22.875 32.6625 22.7156 32.625 22.6687C32.5875 22.6218 31.9688 22.0593 31.9969 22.0125V22.0218Z" fill="#B07229"/>
+<path d="M30.9844 23.6531C30.9844 23.6531 30.9844 23.8781 30.8906 23.9156C30.7875 23.9437 30.6 23.5031 30.6 23.5031L30.5531 23.0906L30.8437 23.3719L30.9844 23.6531ZM31.7719 23.5406V23.4375C31.7719 23.3812 31.7437 23.2969 31.7437 23.2969L31.725 23.0719L31.6687 22.9125L31.6312 22.8187H31.5656L31.4062 22.9312L31.3594 23.0812L31.4344 23.3625L31.5094 23.6156L31.6312 23.6531L31.7719 23.5594V23.5406Z" fill="#4D2A15"/>
+<path d="M31.575 23.9343C31.6031 23.925 31.5375 23.6156 31.5375 23.6156L31.35 23.1656L31.3031 23.0062L31.1625 22.95L31.0687 23.0625L31.0875 23.2406C31.0875 23.2406 31.2281 23.5406 31.2937 23.6437C31.3687 23.7468 31.5094 23.9531 31.575 23.9343Z" fill="#4D2A15"/>
+<path d="M31.4062 22.9688C31.4696 23.0378 31.5147 23.1216 31.5375 23.2125C31.5375 23.2125 31.6594 23.55 31.6406 23.5875C31.6219 23.6156 31.5469 23.6156 31.5469 23.6156C31.5469 23.6156 31.7156 23.7844 31.7625 23.7656C31.8094 23.7469 31.7906 23.5781 31.7719 23.5406C31.7625 23.5031 31.7062 23.5406 31.6781 23.4938C31.6687 23.4563 31.6031 23.2406 31.6031 23.1V22.8469C31.6219 22.8188 31.7438 23.1281 31.7438 23.2875L31.8 23.3531L31.7438 23.0531L31.6781 22.8375C31.6781 22.8188 31.7063 22.7625 31.7063 22.6969V22.6031C31.7063 22.6031 31.7625 22.65 31.7906 22.65C31.8188 22.65 31.8562 22.6125 31.8656 22.4625C31.8844 22.3219 31.8562 21.9 31.8562 21.9L31.2188 22.7438L31.4062 22.9781V22.9688Z" fill="#202020"/>
+<path d="M31.4063 22.9031C31.4063 22.9031 31.3781 23.1281 31.4625 23.3531L31.5844 23.6343C31.6031 23.6625 31.6031 23.9062 31.575 23.9343C31.575 23.9343 31.4063 23.5218 31.35 23.3156C31.3031 23.1187 31.2844 23.0343 31.2563 23.0156L31.1813 22.9968L31.4063 22.9031Z" fill="#202020"/>
+<path d="M31.35 24.0938C31.3688 24.0938 31.35 24 31.35 24L31.3313 23.7844L31.1063 23.325L30.8625 23.1094L30.7313 22.9219L30.7125 23.2969C30.7125 23.2969 30.9 23.6719 31.0031 23.7656C31.125 23.8781 31.3125 24.1031 31.35 24.0938Z" fill="#4D2A15"/>
+<path d="M30.4407 23.0625C30.4407 23.0625 30.4782 23.1657 30.4782 23.2313V23.3625L30.6469 23.6907C30.7313 23.8313 30.8063 23.9813 30.8719 23.9532C30.9375 23.9157 30.9657 23.8125 30.9657 23.7938C30.975 23.7844 30.8907 23.9157 30.8532 23.8969C30.7634 23.6974 30.6912 23.4903 30.6375 23.2782L30.5438 23.2032C30.5073 23.1611 30.4729 23.1173 30.4407 23.0719V23.0625ZM31.0969 23.5782L30.9375 23.2875C30.8907 23.1938 30.825 23.1282 30.8063 23.1282C30.7875 23.1282 30.7594 22.9407 30.7594 22.9407C30.7594 22.9407 30.825 23.0625 30.9094 23.1C31.0032 23.1469 31.05 23.175 31.0969 23.1657L31.1157 23.3532L31.0969 23.5782Z" fill="#202020"/>
+<path d="M30.6938 23.2781C30.6938 23.2781 30.7407 23.4093 30.825 23.5312C30.9 23.6531 31.0407 23.8031 31.0407 23.8031C31.0407 23.8031 30.8907 23.6531 30.8063 23.5406C30.7529 23.4583 30.7088 23.3702 30.675 23.2781H30.6938Z" fill="#5C3A1D"/>
+<path d="M31.1251 23.1281C31.1251 23.1281 31.1719 23.0156 31.2001 23.0062L31.3126 22.9781C31.3126 22.9781 31.2469 22.9688 31.2001 22.9031L31.0782 22.7812L31.1157 22.9688L31.1251 23.1281ZM31.0876 23.1656C31.0876 23.1656 31.2751 23.5406 31.3126 23.6813C31.3594 23.8031 31.3501 24 31.3501 24C31.3501 24 31.3313 23.8594 31.2938 23.7469L31.0688 23.2781C31.0594 23.25 31.0876 23.1656 31.0876 23.1656Z" fill="#202020"/>
+<path d="M31.3313 22.9125L31.3781 22.35L31.3313 22.1438L31.0781 21.5813C31.0781 21.5813 31.0688 21.6563 31.0031 21.6563C30.8917 21.6299 30.7906 21.5712 30.7125 21.4875C30.6665 21.6332 30.66 21.7885 30.6937 21.9375L31.1906 22.8657L31.3313 22.9125Z" fill="#4D2A15"/>
+<path d="M30.3563 23.2781C30.3563 23.2781 30.4313 23.3719 30.4781 23.3719C30.5156 23.3531 30.5063 23.175 30.45 23.0719C30.3938 22.9781 29.7938 22.1719 29.7 22.125C29.6063 22.0781 30.3563 23.2781 30.3563 23.2781Z" fill="#8B441F"/>
+<path d="M30.7594 22.95C30.7781 22.9875 30.8156 23.2406 30.7125 23.2687C30.5719 23.2969 29.9156 22.3875 29.8125 22.2656C29.8125 22.2656 29.4 22.0031 29.3906 21.9375C29.3813 21.8719 29.8313 22.0312 29.8313 22.0312L30.7219 22.875L30.7688 22.95H30.7594Z" fill="#8B441F"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M29.3971 21.9313C29.3955 21.9326 29.3948 21.9342 29.3952 21.9369C29.3957 21.94 29.3974 21.9442 29.4008 21.9495C29.4042 21.9547 29.4089 21.9607 29.4149 21.9673C29.4268 21.9806 29.4435 21.996 29.4635 22.0129C29.5033 22.0466 29.5556 22.0855 29.6077 22.1224C29.6598 22.1592 29.7116 22.1941 29.7504 22.2197C29.7698 22.2325 29.786 22.243 29.7973 22.2503C29.8029 22.254 29.8073 22.2568 29.8103 22.2587L29.8138 22.2609L29.8149 22.2617L29.8156 22.2621L29.816 22.2626C29.8365 22.2868 29.8785 22.3417 29.9339 22.414C29.9485 22.4332 29.9641 22.4536 29.9805 22.4749C30.0587 22.5769 30.1548 22.701 30.252 22.8205C30.3493 22.94 30.4476 23.0547 30.5303 23.1377C30.5717 23.1793 30.6091 23.2127 30.6403 23.2349C30.656 23.246 30.67 23.2542 30.6821 23.2591C30.6942 23.2641 30.7039 23.2657 30.7114 23.2642C30.735 23.2577 30.7511 23.2382 30.7615 23.2107C30.772 23.1832 30.7763 23.1483 30.7769 23.1128C30.7775 23.0774 30.7743 23.0416 30.7698 23.0124C30.7675 22.9978 30.765 22.9849 30.7624 22.9745C30.7598 22.964 30.7572 22.9563 30.7551 22.9521L30.7517 22.9453H30.7602L30.7182 22.878L29.8287 22.0354L29.8284 22.0352L29.8246 22.0339C29.8213 22.0328 29.8165 22.0311 29.8104 22.029C29.7981 22.0248 29.7806 22.0188 29.7596 22.0119C29.7176 21.9979 29.6617 21.9801 29.6061 21.9643C29.5505 21.9485 29.4953 21.9348 29.4548 21.9291C29.4345 21.9263 29.4183 21.9255 29.4076 21.9273C29.4022 21.9282 29.3989 21.9297 29.3971 21.9313ZM29.8328 22.0269L29.8337 22.0272L30.7259 22.8725L30.7258 22.8725L30.7772 22.9547H30.7663C30.7681 22.9595 30.7698 22.9654 30.7715 22.9722C30.7741 22.9829 30.7768 22.9962 30.779 23.011C30.7836 23.0406 30.7869 23.0769 30.7863 23.113C30.7857 23.149 30.7813 23.185 30.7703 23.214C30.7593 23.243 30.7415 23.2657 30.7137 23.2733L30.7134 23.2734C30.7033 23.2754 30.6915 23.2731 30.6785 23.2678C30.6655 23.2625 30.6509 23.2539 30.6349 23.2426C30.603 23.2199 30.5652 23.186 30.5237 23.1444C30.4406 23.061 30.342 22.946 30.2448 22.8264C30.1474 22.7068 30.0513 22.5826 29.9731 22.4806C29.9566 22.4592 29.941 22.4387 29.9263 22.4195C29.8714 22.3479 29.8298 22.2935 29.8093 22.2692L29.8087 22.2688L29.8053 22.2666C29.8023 22.2647 29.7978 22.2618 29.7922 22.2582C29.7809 22.2509 29.7647 22.2404 29.7453 22.2275C29.7064 22.2019 29.6545 22.167 29.6023 22.13C29.5501 22.0931 29.4976 22.054 29.4574 22.0201C29.4374 22.0031 29.4203 21.9873 29.4079 21.9736C29.4017 21.9668 29.3966 21.9604 29.3929 21.9546C29.3892 21.9488 29.3867 21.9433 29.3859 21.9382C29.3851 21.9326 29.3868 21.9278 29.3909 21.9242C29.3946 21.921 29.4 21.9191 29.406 21.9181C29.4182 21.916 29.4356 21.917 29.4561 21.9198C29.4973 21.9256 29.553 21.9395 29.6087 21.9553C29.6644 21.9711 29.7204 21.989 29.7625 22.003C29.7835 22.0099 29.8011 22.0159 29.8134 22.0201C29.8196 22.0222 29.8244 22.0239 29.8277 22.0251L29.8315 22.0264L29.8328 22.0269Z" fill="#5C3A1D"/>
+<path d="M30.3562 23.2781C30.3562 23.2781 30.2812 23.1562 30.2719 23.0625C30.2719 22.9688 30.2344 22.9219 30.2344 22.8844C30.2344 22.8563 29.7469 22.1625 29.7 22.1156C29.6437 22.0687 29.4844 21.9844 29.4844 21.9844C29.4879 22.06 29.4973 22.1352 29.5125 22.2094C29.5125 22.2094 29.6625 22.4906 29.8875 22.7438C30.0422 22.9263 30.1985 23.1076 30.3562 23.2875V23.2781Z" fill="#202020"/>
+<path d="M31.0875 23.1563C31.1531 23.1281 31.125 22.9031 31.0968 22.8281C30.9627 22.5329 30.8251 22.2391 30.6843 21.9469L30.5625 21.9844L30.3468 21.8156L30.2156 21.675C30.2156 21.675 30.2625 21.8719 30.2531 21.9656V22.1156L30.5625 22.6688L31.0875 23.1656V23.1563ZM31.5281 22.6688L31.6218 22.5469L31.575 22.1344L31.3125 21.2531C31.3125 21.2531 31.2468 21.2625 31.1812 21.225C31.125 21.1875 31.05 21.1031 31.05 21.1031L31.1156 21.6375L31.3875 22.3875L31.4062 22.6031L31.5281 22.6688Z" fill="#4D2A15"/>
+<path d="M30.7218 22.875C30.7218 22.875 30.4593 22.5938 30.375 22.4532L30.2156 22.1719C30.2156 22.1719 30.1406 22.2 30.0468 22.1719C29.9531 22.125 29.8406 22.0032 29.8406 22.0032C29.8406 22.0032 29.7656 22.1438 30.1406 22.5282C30.5718 22.9594 30.7218 22.875 30.7218 22.875Z" fill="#202020"/>
+<path d="M31.35 22.9688C31.4625 22.9313 31.4531 22.4625 31.35 22.1531C31.2562 21.8438 31.0781 21.5719 31.0781 21.5719C31.0781 21.5719 31.2937 22.0781 31.3406 22.275C31.3781 22.4813 31.3406 22.6219 31.3031 22.6125C31.2656 22.6031 31.2656 22.4906 31.1812 22.2938C31.0875 22.1063 31.0312 22.05 31.0312 22.05C31.0312 22.05 31.3406 22.875 31.2469 22.8563C31.1625 22.8375 30.75 21.9281 30.7312 21.9C30.7125 21.8813 30.6937 21.9375 30.6937 21.9375C30.6937 21.9375 31.0687 23.0813 31.35 22.9688Z" fill="#8B441F"/>
+<path d="M31.5938 20.7468L31.7813 21.1406L31.8375 21.5531L31.8563 21.9C31.8563 21.9 31.8563 22.5937 31.7813 22.6125C31.6875 22.6218 31.65 22.5468 31.65 22.5281C31.5965 22.2688 31.5434 22.0094 31.4907 21.75L31.3313 20.9531L31.3875 20.8968L31.4063 20.7843L31.5282 20.775L31.5938 20.7468Z" fill="#4D2A15"/>
+<path d="M31.0875 23.1562C31.1625 23.1562 31.0875 22.9687 31.0875 22.9687C31.0875 22.9687 31.0312 23.0625 30.975 22.9969C30.9281 22.9312 30.8531 22.7062 30.8531 22.7062L30.8062 22.5656C30.8062 22.5656 30.75 22.7156 30.6843 22.7156C30.6187 22.7156 30.2531 22.1156 30.2531 22.1156L30.2156 22.1719C30.2156 22.1719 30.7218 23.2125 31.0875 23.1656V23.1562Z" fill="#8B441F"/>
+<path d="M30.8532 22.7063C30.8532 22.7063 30.9188 22.5563 30.8907 22.425C30.8625 22.2844 30.6844 21.9469 30.6844 21.9469C30.6844 21.9469 30.6282 21.9563 30.5532 21.9282C30.4798 21.8998 30.4105 21.862 30.3469 21.8157C30.4722 22.1352 30.6427 22.4351 30.8532 22.7063ZM31.1438 22.4907C31.1438 22.4907 31.0969 22.1719 30.9563 21.8719C30.8063 21.5813 30.7125 21.4875 30.7125 21.4875V21.8157C30.7125 21.8157 30.8532 21.8625 30.9563 22.0407C31.05 22.2282 31.1438 22.4907 31.1438 22.4907ZM31.5469 21.9469C31.5469 21.9469 31.5188 21.6 31.4719 21.4032L31.3594 20.9344C31.3594 20.9344 31.3594 20.9157 31.3875 20.8969H31.4438C31.5188 20.925 31.5469 21.1032 31.5469 21.1032L31.5375 20.8125L31.5094 20.7657H31.3782C31.3782 20.7657 31.4063 20.8594 31.3688 20.8875C31.3407 20.9157 31.3125 20.8688 31.3032 20.8594L31.2844 20.8969L31.3219 21.0844L31.3125 21.2438C31.3125 21.2438 31.3594 21.45 31.425 21.5719C31.4813 21.7032 31.5469 21.9469 31.5469 21.9469ZM31.8563 21.9C31.8563 21.9 31.9125 21.4032 31.8 21.0844C31.6875 20.7657 31.5938 20.6907 31.5938 20.6907L31.5375 20.7469C31.5375 20.7469 31.7063 21.0282 31.7625 21.2719L31.8563 21.9ZM31.35 22.1532C31.35 22.1532 31.2938 21.7688 31.2282 21.5157C31.1944 21.4039 31.1631 21.2914 31.1344 21.1782L31.0313 21.0844C31.0313 21.0844 31.0969 21.3375 31.0875 21.4219L31.0782 21.5532C31.0782 21.5532 31.125 21.6844 31.2 21.7969C31.2596 21.9114 31.3097 22.0306 31.35 22.1532Z" fill="#202020"/>
+<path d="M31.6125 22.7719C31.7062 22.7719 31.6219 22.2094 31.5844 22.0688C31.5469 21.9188 31.3031 21.2438 31.3031 21.2438C31.3031 21.2438 31.5844 22.2094 31.5656 22.2563C31.5375 22.3313 31.425 21.9656 31.4062 21.975C31.3875 21.975 31.6125 22.6219 31.5281 22.6313C31.4531 22.6313 31.4062 22.4906 31.4062 22.4906L31.4156 22.6313C31.4156 22.6313 31.4719 22.7625 31.6125 22.7719Z" fill="#904720"/>
+<path d="M31.7343 22.4907C31.8 22.4907 31.7156 21.9563 31.6687 21.7219L31.4812 21.0188C31.4812 21.0188 31.6218 21.3469 31.6968 21.7219C31.7718 22.0969 31.8281 22.5657 31.7531 22.5844C31.6781 22.5844 31.6406 22.5094 31.6406 22.5094V22.425C31.6406 22.425 31.6687 22.4907 31.7343 22.4907Z" fill="#904720"/>
+<path d="M30.825 23.1094C30.825 23.1469 30.825 23.3344 30.7312 23.3157C30.6375 23.3063 30.4594 23.1376 30.4219 23.0344C30.4219 23.0344 30.6281 23.2688 30.7031 23.2594C30.7781 23.2594 30.7781 23.0251 30.7594 22.9594C30.7594 22.9032 30.8156 23.1094 30.8156 23.1094H30.825Z" fill="#312317"/>
+<path d="M31.3219 20.5782C31.3219 20.5782 31.4531 20.6626 31.5469 20.6063C31.5945 20.5753 31.6344 20.5338 31.6637 20.4851C31.6929 20.4364 31.7107 20.3817 31.7156 20.3251C31.7156 20.2501 31.7156 20.1844 31.65 20.1001C31.5844 20.0157 31.7438 20.1657 31.7438 20.3157C31.7438 20.4657 31.7438 20.7188 31.5094 20.7844C31.275 20.8313 31.3781 20.7657 31.3781 20.7657L31.3219 20.5782Z" fill="#D2A567"/>
+<path d="M31.1344 20.1282C31.1344 20.1282 31.2844 20.3719 31.3406 20.5969C31.4063 20.8125 31.3875 20.8969 31.3594 20.9063C31.3219 20.9063 31.3031 20.8782 31.2938 20.8219C31.2938 20.7657 31.1344 20.1282 31.1344 20.1282Z" fill="#8F4620"/>
+<path d="M28.5094 20.4375L29.5031 21.8719L30.7406 20.4657L29.9625 19.6594L28.5094 20.4375Z" fill="#1E2121"/>
+<path d="M29.7656 19.5469L29.7094 19.7719L29.8312 20.1562L30.0375 20.3719L30.2719 20.5312L30.3281 20.3437L30.3844 20.1375L30.45 20.1187L30.6 20.175L30.6937 20.0344L30.8625 19.7437L30.825 19.6312L30.7875 19.5469L30.5344 19.1156L30.45 19.275L30.375 19.3219L30.225 19.2469L30.0562 19.4719L29.8406 19.3781L29.7656 19.5469Z" fill="#4D2A15"/>
+<path d="M30.2812 20.5313C30.2812 20.5313 30.3187 20.5031 30.3375 20.3813C30.3562 20.2688 30.3562 19.9219 30.3281 19.7813C30.2999 19.6406 30.2062 19.3688 30.1874 19.3875C30.1687 19.4156 30.3281 19.6969 30.3093 20.0438C30.2812 20.3813 30.2906 20.475 30.2156 20.5125C30.1499 20.5406 30.2718 20.5313 30.2718 20.5313H30.2812Z" fill="#5C3818"/>
+<path d="M30.3375 19.95C30.3375 19.95 30.4969 20.1844 30.5719 20.1C30.6563 20.0156 30.6188 19.725 30.5719 19.6031L30.4594 19.3219L30.5063 19.2656L30.5906 19.5844C30.6188 19.7156 30.7125 20.0719 30.6 20.1469C30.4969 20.2031 30.3375 20.0062 30.3375 20.0062V19.95Z" fill="#5C3818"/>
+<path d="M29.8031 20.1188C29.8031 20.1188 29.8594 20.025 29.9344 20.025C30.0094 20.025 30.0281 20.0531 30.0281 20.0531L30.0844 20.2406L30.1969 20.4469L30.2906 20.5406L30.2437 20.5969L30.1594 20.6156L29.925 20.4844L29.8594 20.3906L29.8031 20.1094V20.1188Z" fill="#8F4620"/>
+<path d="M30.1875 22.1531C30.1125 22.2 29.9344 22.1062 29.8407 22.0219L29.2032 21.3937L29.1282 21.0938L29.3344 21.15L29.7 20.9906L29.7657 20.8688L30.1969 20.6437L30.4407 20.5125L30.9563 20.5031L31.0875 20.25C31.0875 20.25 31.2563 20.55 31.2844 20.6719C31.3219 20.8031 31.3125 21.1781 31.2657 21.2062C31.2188 21.2344 31.05 21.0937 31.0219 21.0844C31.0032 21.075 31.1532 21.6187 31.0219 21.6469C30.9 21.6656 30.6844 21.4406 30.6844 21.4406C30.6844 21.4406 30.7782 21.9281 30.6657 21.9281C30.4893 21.8935 30.3266 21.8089 30.1969 21.6844C30.1969 21.6844 30.3188 22.0875 30.1969 22.1531H30.1875Z" fill="#D2A567"/>
+<path d="M30.0937 21.525L30.1969 21.6844C30.225 21.7219 30.1969 21.9562 30.1781 22.0031C30.15 22.0875 30.0281 21.8906 29.9625 21.7219L29.7562 21.3656C29.7562 21.3281 30.0844 21.525 30.0844 21.525H30.0937ZM31.1062 20.3156C31.1062 20.3156 31.2937 21.075 31.2 21.1031C31.1062 21.1313 30.8625 20.8594 30.825 20.8219L30.45 20.2219L30.375 20.1469L30.3937 20.1094L30.5531 20.1656L31.1156 20.3156H31.1062Z" fill="#8F4620"/>
+<path d="M29.8032 21.7781C29.7657 21.8063 29.6813 21.6844 29.6438 21.6469L29.3625 21.3375C29.2828 21.2698 29.2133 21.1909 29.1563 21.1031C29.1563 21.075 29.0813 21 29.0813 21L29.1469 20.9063H29.2313C29.2313 20.9063 29.7375 21.3 29.7657 21.375C29.8032 21.4313 29.8219 21.7594 29.8032 21.7781ZM30.5532 21.7781C30.5344 21.8063 30.2063 21.5625 30.0657 21.3656C29.925 21.1594 29.7844 20.9906 29.7375 20.8969L29.6813 20.7188L29.775 20.7375C29.775 20.7375 30.6 21.75 30.5625 21.7875L30.5532 21.7781ZM30.675 21.4313C30.6563 21.4594 30.5157 21.3469 30.4219 21.2344C30.3282 21.1125 30.3844 20.9625 30.3844 20.9625C30.3844 20.9625 30.6938 21.4125 30.675 21.4313ZM30.8625 21.3844C30.8157 21.4125 30.6282 21.1781 30.4688 20.9156C30.3469 20.7281 30.3188 20.7 30.3 20.6813C30.2532 20.6531 30.1688 20.6438 30.1688 20.6438L30.15 20.6156L30.2438 20.5969L30.3 20.5219L30.3938 20.4L30.7969 21.1969C30.7969 21.1969 30.8907 21.375 30.8625 21.3844Z" fill="#8F4620"/>
+<path d="M29.8407 22.0219C29.8407 22.05 29.8407 22.0782 29.7282 22.0688C29.3512 21.9258 29.0273 21.6706 28.8 21.3375L28.5188 20.8688L28.6219 20.7375L29.5219 21.7688L29.8407 22.0219Z" fill="#AB6D29"/>
+<path d="M29.8406 22.0219C29.8406 22.0687 29.7937 22.0781 29.7375 22.0687C29.6812 22.05 29.4562 21.975 29.0906 21.5719C28.894 21.3644 28.7268 21.131 28.5937 20.8781L28.575 20.7094L28.6875 20.6625L29.2968 21.6L29.8406 22.0219Z" fill="#8F4620"/>
+<path d="M30.4312 21.6188C30.4312 21.6188 30.2437 21.4781 30.1312 21.3375C29.9875 21.1773 29.8675 20.9974 29.775 20.8031C29.7843 20.7375 29.8875 20.7375 29.8875 20.7375V20.5687L29.9062 20.5125L30.0843 20.5875L30.3 20.8594L30.3843 20.9625C30.3843 20.9625 30.525 21.3094 30.4968 21.3375C30.4687 21.3656 30.2718 21.15 30.2437 21.1781C30.2156 21.2062 30.4687 21.5906 30.4312 21.6188ZM30.0843 21.525C30.0843 21.525 30.15 21.6188 30.1218 21.6844C30.0937 21.75 30.075 21.7781 29.9812 21.6469C29.9207 21.5449 29.8483 21.4505 29.7656 21.3656C29.7656 21.375 29.775 21.5812 29.7375 21.5812C29.6906 21.5812 29.55 21.4031 29.4562 21.2719L29.2218 20.9062V20.7188L29.2125 20.4844L29.2406 20.5687L29.2781 20.6344L29.6156 21.0281L29.7093 20.9625L29.9062 21.3375L30.0937 21.525H30.0843ZM28.8187 20.9531C28.8187 20.9531 29.0812 21.4031 29.3156 21.6562C29.4647 21.8116 29.6432 21.9358 29.8406 22.0219L29.0531 21.0938L28.8187 20.9531ZM30.8062 21.2156C30.693 21.1282 30.5976 21.02 30.525 20.8969C30.4312 20.7469 30.3468 20.5219 30.3562 20.4281C30.3562 20.3344 30.3937 20.1094 30.3937 20.1094C30.3937 20.1094 30.6562 20.3906 30.7125 20.5125C30.7593 20.6438 30.8718 20.8219 30.8437 20.8406C30.825 20.8594 30.6468 20.7188 30.6187 20.7469C30.6 20.7844 30.8343 21.1969 30.8062 21.2156ZM31.1062 20.9344C31.0781 20.9438 30.9375 20.7844 30.9093 20.6906C30.8796 20.593 30.8607 20.4924 30.8531 20.3906L30.7406 20.1094V19.8L30.8718 19.7812L31.05 20.0344C31.05 20.0344 31.1156 20.175 31.1156 20.3812C31.1156 20.5969 31.1437 20.9062 31.1156 20.925L31.1062 20.9344ZM28.9968 21.6844C28.8559 21.508 28.7304 21.3198 28.6218 21.1219L28.5281 20.85L28.575 20.8875C28.575 20.8875 28.65 21.1875 29.0156 21.5531C29.3906 21.9281 29.475 21.9469 29.475 21.9469C29.475 21.9469 29.5406 22.1531 29.5125 22.2281C29.5125 22.2281 29.2406 21.9844 28.9968 21.6937V21.6844Z" fill="#4D2A15"/>
+<path d="M29.4 22.1156C29.4 22.1156 29.0813 21.8343 28.8375 21.5156C28.6827 21.3214 28.5447 21.1144 28.425 20.8968L28.5375 20.8031C28.7428 21.2894 29.0351 21.7342 29.4 22.1156ZM29.8407 22.0218L29.2782 21.45C29.0907 21.2437 28.9969 21.0375 28.9969 21.0375L29.1469 21.0937C29.1469 21.0937 29.2125 21.2531 29.3344 21.4218L29.8407 22.0218ZM29.7657 21.3656C29.7657 21.3656 29.5688 21.1218 29.475 20.9718L29.2875 20.6156C29.2875 20.6156 29.55 20.925 29.625 20.9437C29.7094 20.9625 29.7094 20.9437 29.7094 20.9437C29.7094 20.9437 29.6719 21.0562 29.7 21.15L29.7657 21.3656ZM29.85 20.3718C29.85 20.3718 29.8782 20.55 29.8594 20.6531C29.8407 20.7468 29.7844 20.7468 29.7844 20.7468C29.8857 20.8935 30.0127 21.0206 30.1594 21.1218L29.9907 20.8687C29.9438 20.775 29.8688 20.6812 29.8969 20.6062C29.9344 20.5125 30.0938 20.6625 30.1407 20.7L30.3844 20.9625C30.3844 20.9625 30.3094 20.7281 30.2157 20.6437C30.0949 20.5474 29.9698 20.4566 29.8407 20.3718H29.85Z" fill="#202020"/>
+<path d="M30.6562 20.8875L30.4969 20.4937L30.3469 20.0062V20.2687C30.3375 20.3812 30.3 20.55 30.2531 20.5781C30.1969 20.5969 30.1875 20.6062 30.0937 20.5781C30 20.5594 30.1594 20.625 30.1594 20.625C30.1594 20.625 30.2531 20.625 30.2906 20.5781C30.3281 20.5312 30.3375 20.4375 30.3844 20.4469C30.4219 20.4656 30.4781 20.6062 30.5062 20.6719L30.6562 20.8875Z" fill="#202020"/>
+<path d="M30.3469 20.0062C30.3469 20.0062 30.5344 20.2219 30.6282 20.1281C30.7032 20.0344 30.6563 19.7531 30.6563 19.7531C30.6563 19.7531 30.7688 19.8 30.8063 19.7719C30.8438 19.7344 30.825 19.6312 30.825 19.6312C30.825 19.6312 31.0407 19.9312 31.1344 20.1281C31.2375 20.3156 31.2844 20.6719 31.2844 20.6719C31.2844 20.6719 31.1157 20.3906 31.0313 20.1281C30.9469 19.8844 30.8344 19.7719 30.8157 19.8C30.7793 19.889 30.7695 19.9867 30.7875 20.0812C30.8063 20.175 30.8813 20.2781 30.9282 20.4094L31.0313 20.7281L30.8813 20.4937C30.8157 20.4187 30.7594 20.3812 30.7219 20.3437C30.6844 20.3062 30.6282 20.2312 30.5625 20.2125C30.5063 20.1844 30.3938 20.1281 30.3938 20.175C30.3938 20.2219 30.3657 20.0812 30.3657 20.0812L30.3469 20.0062Z" fill="#202020"/>
+<path d="M29.7 20.9343C29.8028 21.1487 29.9354 21.3475 30.0937 21.525C30.0937 21.525 29.9062 21.3562 29.8312 21.2437C29.7756 21.146 29.7316 21.0422 29.7 20.9343Z" fill="#171717"/>
+<path d="M30.9562 20.9906C30.9281 20.9906 30.8343 20.9625 30.825 20.9906C30.825 21.0281 30.8812 21.1594 30.9468 21.225C31.0125 21.2906 31.0406 21.2907 31.05 21.2813C31.0687 21.2813 31.05 21.2157 31.0312 21.15V20.9906C31.0218 20.9625 30.9562 20.9906 30.9562 20.9906Z" fill="#8F4620"/>
+<path d="M28.6875 19.6312L28.5656 19.6968L28.4343 19.9781L28.4718 20.475L28.6687 20.7562C28.7437 20.8687 28.9968 21.15 29.0625 21.1312C29.1281 21.1125 29.1937 20.9156 29.2031 20.8125L29.2218 20.5125L29.3906 20.7281C29.4937 20.85 29.5781 20.9531 29.6343 20.9437C29.6812 20.9437 29.8218 20.6437 29.8218 20.6062C29.8312 20.5687 29.4656 19.6687 29.4656 19.6687L29.2968 19.575L28.6781 19.6312H28.6875Z" fill="#D2A567"/>
+<path d="M29.5125 20.3813L29.6062 20.7281C29.6531 20.8406 29.6062 20.9438 29.6343 20.9438C29.6531 20.9438 29.85 20.6906 29.85 20.5688C29.85 20.4563 29.85 20.3344 29.8031 19.9781C29.7562 19.6219 29.8218 19.5094 29.8218 19.5094L29.7093 19.4156L29.5218 19.8094L29.5125 20.3813ZM28.8562 20.175L28.9218 20.6438C28.95 20.7563 29.0156 20.9531 29.0531 20.9438C29.0906 20.9438 29.2031 20.6344 29.2125 20.5313C29.2125 20.5313 29.1281 20.3813 29.1375 20.0156C29.1375 19.6406 29.1 19.6031 29.1 19.6031L28.8562 20.175Z" fill="#AB6D29"/>
+<path d="M28.3594 19.4531C28.3594 19.4531 28.0687 19.8844 28.0781 20.1094C28.0781 20.3438 28.1156 20.2969 28.1812 20.5031C28.2469 20.7187 28.2844 21.0281 28.2937 21.0563C28.2937 21.075 28.3406 21.0375 28.3406 21.0094L28.3594 19.4531Z" fill="#45392D"/>
+<path d="M28.3594 19.5C28.3594 19.5 28.1063 19.9031 28.125 20.1188C28.1438 20.3344 28.1719 20.3344 28.2469 20.5312C28.3219 20.7188 28.3219 21.0375 28.3219 21.0375C28.3219 21.0375 28.4156 21.0187 28.5 20.9531C28.5938 20.8875 28.6688 20.7562 28.6688 20.7562L28.575 20.5594C28.5482 20.4996 28.5292 20.4366 28.5188 20.3719L28.4438 20.2781L28.4625 19.8937L28.5281 19.6125V19.5187L28.3594 19.5094V19.5Z" fill="#AB6D29"/>
+<path d="M29.7375 20.1843C29.7375 20.1843 29.6156 20.1562 29.5594 20.1281C29.5031 20.1 29.4844 20.025 29.4844 20.025L29.5219 19.95L29.7375 20.1843Z" fill="#DBAD6C"/>
+<path d="M28.4063 19.5469C28.4063 19.5469 28.2188 19.95 28.2469 20.2219C28.275 20.4937 28.425 20.8406 28.4344 20.85C28.4531 20.85 28.4344 20.8219 28.4438 20.7562V19.9406L28.5281 19.6781V19.5375L28.4063 19.5469Z" fill="#D2A567"/>
+<path d="M28.8562 19.6406C28.8562 19.6406 28.8843 19.7531 28.8656 19.8094C28.8468 19.8563 28.7531 19.9219 28.7156 19.9969C28.6687 20.0719 28.6218 20.2594 28.6218 20.2594C28.6218 20.2594 28.6593 20.1563 28.7156 20.0906C28.7812 20.025 28.8093 19.9781 28.8093 20.0156C28.8281 20.0531 28.8468 20.2031 28.8375 20.2313C28.8281 20.2594 28.7718 20.3063 28.7437 20.4188C28.7062 20.5406 28.7437 20.6438 28.7437 20.6438L28.7906 20.4375C28.8093 20.3813 28.8562 20.3438 28.8562 20.3438L28.95 20.5688C28.95 20.5688 28.95 20.4656 28.9781 20.3813C28.9875 20.3063 29.0718 20.1938 29.1 20.1938C29.1281 20.1938 29.175 20.1844 29.0718 20.1281C29.0343 20.1094 29.0625 19.7344 29.0812 19.7156C29.1093 19.6969 29.2593 19.6969 29.2406 19.6406C29.1993 19.5659 29.1489 19.4967 29.0906 19.4344C29.0812 19.425 28.8562 19.6406 28.8562 19.6406Z" fill="#8F4620"/>
+<path d="M29.7187 20.4469L29.5781 20.4188C29.5312 20.4188 29.5219 20.3625 29.5219 20.3625L29.5406 20.3063L29.6531 20.3719L29.7187 20.4469Z" fill="#DBAD6C"/>
+<path d="M28.5375 20.4938C28.5375 20.5313 28.5094 20.5782 28.4906 20.6344C28.4625 20.7001 28.4531 20.7844 28.4531 20.7844L28.4156 20.4751L28.3875 20.2501C28.3687 20.2501 28.3219 20.3157 28.3219 20.3157C28.3219 20.3157 28.3219 20.1657 28.35 20.1001C28.3781 20.0344 28.3969 19.9313 28.3781 19.9126C28.35 19.9032 28.3031 19.9407 28.2844 19.9782C28.2583 20.0182 28.2333 20.0588 28.2094 20.1001C28.2094 20.1001 28.2375 19.9782 28.2656 19.9219C28.2937 19.8751 28.4344 19.7157 28.4531 19.6594C28.4906 19.5938 28.4906 19.5282 28.4906 19.5282H28.5844C28.5844 19.5282 28.6781 19.6032 28.6781 19.6688C28.6781 19.7063 28.5844 19.7532 28.5844 19.7626C28.5844 19.7626 28.5094 19.7532 28.4906 20.0626C28.4719 20.3813 28.5469 20.3626 28.5375 20.4938ZM29.4187 19.6782C29.4187 19.6782 29.4375 19.8469 29.4187 19.9032C29.4 19.9594 29.3531 19.9969 29.3156 20.0719C29.2781 20.1376 29.2781 20.2969 29.2781 20.2969L29.325 20.1657L29.3906 20.0719C29.4 20.0719 29.4469 20.1376 29.4656 20.2313L29.5406 20.4657C29.5406 20.4657 29.5219 20.3532 29.55 20.3532C29.5781 20.3532 29.5969 20.3438 29.6344 20.3719L29.7187 20.4469C29.7187 20.4469 29.7187 20.4001 29.6531 20.3438C29.5969 20.2782 29.5594 20.2876 29.55 20.2032C29.5312 20.1094 29.5219 20.0344 29.5312 19.9969C29.5312 19.9688 29.5781 20.0251 29.6156 20.0626L29.7562 20.1938L29.6906 20.1001V19.8188C29.6906 19.7251 29.6906 19.6407 29.7281 19.6219C29.7562 19.5938 29.7656 19.4719 29.7469 19.4532C29.7375 19.4344 29.4187 19.6782 29.4187 19.6782Z" fill="#8F4620"/>
+<path d="M30.4312 19.3219C30.4437 19.5496 30.4911 19.7741 30.5719 19.9875C30.5719 19.9875 30.4781 19.8 30.4219 19.65C30.3656 19.5 30.3375 19.3219 30.3 19.3125C30.2625 19.2937 30.2062 19.3875 30.2062 19.4531C30.2062 19.5187 30.2531 19.7625 30.3094 19.8469C30.3656 19.9406 30.2156 19.7344 30.1875 19.6312L30.1219 19.425C30.1219 19.425 30.0844 19.5187 30.0937 19.6125C30.1125 19.7156 30.1969 19.8656 30.1969 19.8656L30.1031 19.7719L30.0469 19.7062C30.0469 19.7062 30.0469 19.8469 30.0844 19.9031L30.1969 20.0625L30.075 19.9687L30.0375 19.8937C30.0375 19.8937 30.0562 20.0906 30.0937 20.2031L30.2344 20.4844C30.2344 20.4844 30.1219 20.3906 30.0469 20.2125C29.9719 20.0437 29.9344 19.5281 29.9531 19.4531L30.0562 19.275C30.1125 19.2 30.1781 18.8344 30.1781 18.8344C30.1781 18.8344 30.2625 19.1719 30.3187 19.2375C30.375 19.3031 30.4312 19.3312 30.4312 19.3312V19.3219ZM29.625 19.2281L29.7 19.35L29.7562 19.4437C29.7562 19.4437 29.6625 19.5469 29.5406 19.6312C29.4281 19.725 29.2781 19.8187 29.25 19.7719C29.2125 19.725 29.2125 19.6781 29.2125 19.6781C29.2125 19.6781 29.3437 19.6031 29.4375 19.5094C29.5013 19.4518 29.5524 19.3815 29.5875 19.3031C29.6062 19.2469 29.6344 19.2187 29.6344 19.2187L29.625 19.2281ZM28.6031 19.5562C28.6031 19.5562 28.6219 19.7625 28.7156 19.7625C28.8 19.7625 29.0625 19.4906 29.0812 19.4812C29.1 19.4719 29.1187 19.4062 29.1187 19.3875L29.1 19.3125C29.1 19.3125 28.8187 19.5937 28.725 19.6125C28.6406 19.6125 28.6031 19.5562 28.6031 19.5562ZM28.6125 19.275L28.5844 19.4625C28.5844 19.5094 28.6031 19.5469 28.6031 19.5469C28.6031 19.5469 28.3969 19.6125 28.3687 19.5469C28.3312 19.4906 28.3594 19.3969 28.3594 19.3969H28.5C28.5562 19.3781 28.6125 19.275 28.6125 19.275ZM30.5156 18.9844L30.6562 19.2844L30.7875 19.5469C30.7875 19.5469 30.6562 19.3875 30.6094 19.3594L30.4969 19.2656L30.5156 19.1625V18.975V18.9844Z" fill="#1E2121"/>
+<path d="M28.3219 19.4063H28.4437C28.4906 19.4063 28.5187 19.3875 28.5187 19.3875L28.6031 19.275C28.6031 19.275 28.5562 19.4063 28.5844 19.5094C28.6125 19.6032 28.6781 19.6125 28.6969 19.6125C28.7747 19.6007 28.8469 19.5646 28.9031 19.5094C28.9875 19.4157 29.1 19.3313 29.1 19.3313C29.1 19.3313 29.0719 19.4532 29.1187 19.5844C29.1656 19.7063 29.2312 19.7063 29.325 19.6219C29.4187 19.5469 29.5125 19.4157 29.5687 19.3594L29.6344 19.2657L29.7375 19.1719L29.8312 18.6657L29.7844 18.6L29.6531 18.6657L29.4937 18.6L29.4469 18.5344L29.3531 18.6938L29.2594 18.75L29.2125 18.7594L29.1 18.7875L29.0531 18.6844L29.025 18.6094L28.9687 18.5813L28.7437 18.8157L28.6125 18.8063L28.4906 19.0125L28.3969 19.1344L28.3031 19.3594L28.3219 19.4063Z" fill="#DBAD6C"/>
+<path d="M29.4281 18.8906C29.4281 18.8906 29.4468 19.0125 29.3812 19.2281C29.3156 19.4437 29.2312 19.5937 29.2312 19.5937C29.2312 19.5937 29.4562 19.4531 29.5687 19.2C29.6718 18.9562 29.6531 18.6656 29.6531 18.6656L29.4281 18.8906ZM29.7093 18.6562C29.7093 18.6562 29.7281 18.6937 29.7093 18.8812L29.6343 19.2562L29.6906 19.3687C29.7281 19.4343 29.8031 19.5375 29.85 19.5187C29.9062 19.5 30 19.4343 30.0562 19.3125C30.1125 19.1812 30.1593 19.0593 30.1875 19.0406C30.2062 19.0218 30.2156 19.05 30.225 19.0593C30.225 19.0687 30.2531 19.1812 30.3093 19.2281C30.3562 19.275 30.4312 19.35 30.4593 19.3218C30.4968 19.3031 30.5343 19.2375 30.525 19.2093L30.4031 18.8343L30.2531 18.4593L30.1593 18.3093L29.8968 18.3375L29.7093 18.6562Z" fill="#8F4620"/>
+<path d="M30.1594 18.3093C30.1594 18.3093 30.2344 18.4687 30.2438 18.6468C30.2438 18.8156 30.2063 19.0031 30.2063 19.0031C30.2063 19.0031 30.225 18.7875 30.2063 18.6562C30.1781 18.525 30.1406 18.4406 30.1406 18.4031L30.1594 18.3093Z" fill="#AB6D29"/>
+<path d="M30.525 18.9938V19.2094C30.5063 19.2844 30.4031 19.1625 30.3375 18.9281C30.2813 18.6938 30.2906 18.6469 30.2438 18.525L30.1594 18.3188L30.3 18.2906L30.525 18.9938ZM29.8688 19.425C29.8688 19.425 30.1313 19.2844 30.1594 18.8438C30.1781 18.6469 30.0469 18.3094 30.0469 18.3094C30.0469 18.3094 30.0469 18.6656 29.9531 18.8906C29.8983 19.0178 29.8389 19.1428 29.775 19.2656C29.775 19.2656 29.8406 19.2469 29.8688 19.2094L29.9438 19.1063C29.9438 19.1063 29.9531 19.1719 29.9344 19.2563L29.8781 19.425H29.8688ZM29.6531 18.6656C29.6531 18.6656 29.6438 18.7594 29.5313 18.8531C29.4375 18.9375 29.2406 19.0313 29.2406 19.0313C29.2406 19.0313 29.3813 18.9 29.4281 18.7875C29.4844 18.675 29.4375 18.6 29.4375 18.6C29.4375 18.6 29.4188 18.6563 29.3625 18.7031C29.3063 18.75 29.2125 18.7594 29.2125 18.7594C29.2125 18.7594 29.2125 18.7031 29.2781 18.6375C29.2781 18.6281 29.2781 18.6 29.2969 18.5719C29.325 18.4781 29.4 18.3563 29.4 18.3563C29.4 18.3563 29.4656 18.4875 29.5219 18.5438L29.6531 18.6656Z" fill="#4D2A15"/>
+<path d="M30.4406 18.15C30.3947 18.4338 30.4238 18.7247 30.525 18.9938C30.525 18.9938 30.3937 18.7875 30.3656 18.7125C30.3281 18.6188 30.3281 18.4969 30.3 18.4313C30.2761 18.3934 30.2441 18.3614 30.2062 18.3375C30.1781 18.3188 30.1125 18.3281 30.1125 18.3281C30.1125 18.3281 30.1875 18.2906 30.1875 18.225V18.1312L30.3187 18.1594H30.4406V18.15ZM29.8781 19.0687C29.8781 19.0687 30.0093 18.8813 30.0468 18.6375C30.0843 18.3938 30.0468 18.3094 30.0468 18.3094C30.0468 18.3094 29.9906 18.3094 29.9437 18.2625C29.8968 18.2156 29.8218 18.0938 29.8218 18.0938C29.8218 18.0938 29.8406 18.225 29.8218 18.375C29.7843 18.525 29.6531 18.6562 29.6531 18.6562C29.6531 18.6562 29.7281 18.6938 29.7843 18.6562C29.925 18.5719 29.9156 18.4219 29.9156 18.4219C29.9156 18.4219 29.9437 18.4406 29.9437 18.6281C29.9437 18.8156 29.8781 19.0687 29.8781 19.0687Z" fill="#1E2121"/>
+<path d="M28.2375 19.3968C28.2094 19.3968 28.3313 19.2093 28.4063 19.0781L28.6031 18.7593C28.6031 18.7593 28.6313 18.7875 28.6781 18.7875C28.7248 18.7782 28.7689 18.7593 28.8077 18.7318C28.8464 18.7043 28.879 18.669 28.9031 18.6281C28.9493 18.5568 28.9811 18.4772 28.9969 18.3937C28.9969 18.3656 28.9875 18.5625 29.0906 18.675C29.1844 18.7781 29.175 18.7687 29.2125 18.7687C29.2125 18.7687 29.2125 18.9 29.175 19.0218L29.1 19.3312C29.1 19.3312 29.1188 19.0968 29.0719 19.0312C29.0344 18.9562 29.0156 19.0312 28.9781 19.125C28.95 19.2093 28.875 19.2656 28.875 19.2656C28.875 19.2656 28.9313 19.1625 28.9688 19.05C29.0063 18.9375 28.9875 18.9375 28.9688 18.9375C28.9688 18.9375 28.95 18.9281 28.9125 18.975C28.8656 19.0218 28.8281 19.0312 28.8281 19.0312C28.8281 19.0312 28.875 18.9937 28.8938 18.9375C28.9151 18.8762 28.9468 18.8191 28.9875 18.7687C29.0063 18.7406 29.025 18.7031 29.025 18.675C29.025 18.6562 29.025 18.6093 29.0063 18.6093C28.9875 18.6093 28.9594 18.6375 28.875 18.7218L28.7531 18.8437L28.6688 19.0875C28.6452 19.1775 28.6139 19.2654 28.575 19.35L28.5188 19.3875L28.6031 19.1625L28.6969 18.8437C28.6781 18.8156 28.6313 18.8156 28.6219 18.8437L28.4344 19.1062C28.3406 19.2375 28.3406 19.3968 28.3219 19.4062L28.2281 19.3968H28.2375Z" fill="#8F4620"/>
+<path d="M30.5344 18.0094C30.5344 18.0281 30.5344 18.1219 30.4407 18.15C30.3687 18.1683 30.2927 18.1617 30.225 18.1312C30.2063 18.1312 30.2063 18 30.2063 18L30.5344 18.0094Z" fill="#874F20"/>
+<path d="M28.6875 18.3187C28.6875 18.3187 28.6687 18.4031 28.6125 18.5062C28.5656 18.6187 28.4812 18.7125 28.4906 18.7312C28.4906 18.7406 28.5468 18.7969 28.6218 18.7875C28.6968 18.7875 28.725 18.3375 28.725 18.3375L28.7156 18.3187H28.6875Z" fill="#B27129"/>
+<path d="M29.85 18.0657C29.85 18.0657 29.8219 18.6657 29.6532 18.6657C29.4844 18.6657 29.4 18.3657 29.4 18.3657C29.4 18.3657 29.3907 18.7688 29.175 18.7688C29.0813 18.7688 28.9782 18.45 28.9969 18.3938C28.9969 18.3938 28.9594 18.6094 28.8563 18.6938C28.65 18.8532 28.5282 18.7782 28.5188 18.75C28.5188 18.7219 28.6875 18.5625 28.7063 18.3188C28.7063 18.3188 28.7438 18.3282 28.8 18.2625C28.8563 18.1969 28.8657 18.1125 28.9219 18.1219C28.9688 18.1407 29.2032 18.0282 29.2032 18.0282L29.3344 17.8688C29.3344 17.8688 29.3532 17.9157 29.4469 17.85C29.5028 17.8105 29.5453 17.7549 29.5688 17.6907L29.8219 17.9063L29.85 18.0657Z" fill="#DBAD6C"/>
+<path d="M29.1937 17.4938L29.4469 17.85L29.5031 17.8032C29.5406 17.85 29.5594 17.8875 29.5406 17.9157C29.5031 18.0094 29.4187 18.1313 29.4937 18.2625C29.4937 18.2625 29.4656 18.1875 29.5031 18.0938C29.5406 18 29.5687 17.9625 29.5969 17.9719C29.6156 17.9719 29.6531 18.5157 29.6906 18.5157C29.7187 18.5157 29.775 18.2625 29.775 18.0938C29.775 17.925 29.8031 18.0657 29.8219 18.0938C29.8406 18.1313 29.9906 18.375 30.1125 18.3375C30.2437 18.3 30.225 18.075 30.225 18.0282C30.225 17.9719 30.1312 17.6813 30.1312 17.6813L29.5594 17.3157L29.5125 17.4657C29.4844 17.5594 29.1937 17.4938 29.1937 17.4938Z" fill="#B27129"/>
+<path d="M30 17.4375C30 17.4375 30.0375 17.475 30.0938 17.6157C30.15 17.7563 30.1594 18.2157 30.0844 18.2157C30.0094 18.2157 29.8688 18.1219 29.8407 18.0657C29.8125 18 29.8407 17.775 29.8032 17.7094C29.7505 17.6327 29.7123 17.5469 29.6907 17.4563L29.7 17.2688L29.8313 17.2219L30.0094 17.4375H30Z" fill="#8F4620"/>
+<path d="M29.9625 17.2968L30.2062 17.6625L30.4218 17.9718L30.5343 18.0093C30.498 18.0515 30.4479 18.0793 30.3929 18.0879C30.338 18.0965 30.2818 18.0853 30.2343 18.0562C30.15 18.0093 30.1968 17.8687 30.0937 17.6343C29.9812 17.4 29.7937 17.2968 29.7937 17.2968L29.8593 17.2312L29.9625 17.2968Z" fill="#4D2A15"/>
+<path d="M29.8313 17.1C29.8313 17.1 30.0469 17.2406 30.1219 17.4C30.2062 17.5594 30.2438 17.6531 30.3375 17.8031C30.4313 17.9531 30.5344 18 30.525 18.0094C30.525 18.0187 30.4594 18.0375 30.4125 18.0094C30.3579 17.97 30.313 17.9187 30.2812 17.8594C30.2154 17.7231 30.1402 17.5915 30.0563 17.4656C30.0094 17.4 29.8406 17.2781 29.8406 17.2875C29.8406 17.2969 29.8875 17.3344 29.9812 17.4844C30.0415 17.5708 30.0801 17.6705 30.0938 17.775L29.9906 17.5875C29.8969 17.4469 29.7281 17.2781 29.7188 17.3062C29.7094 17.325 29.8125 17.4844 29.8594 17.5781L29.9812 17.8875L29.8125 17.6062C29.7188 17.4656 29.7 17.4844 29.6625 17.4375L29.5312 17.2687C29.5312 17.2687 29.625 17.2969 29.7 17.2406C29.7937 17.1844 29.8313 17.1 29.8313 17.1Z" fill="#1E2121"/>
+<path d="M29.2781 17.5032C29.2781 17.5032 29.4187 17.5313 29.4937 17.5219H29.5968C29.5968 17.5219 29.6437 17.5782 29.6437 17.6532C29.6437 17.7188 29.5968 17.85 29.5687 17.8594C29.55 17.8594 29.55 17.7375 29.5218 17.6907L29.2781 17.5032Z" fill="#8F4620"/>
+<path d="M29.3531 17.8688C29.3531 17.8688 29.4 18.0188 29.3625 18.2344C29.325 18.4406 29.2031 18.6656 29.175 18.6656C29.1468 18.6656 29.1562 18.4219 29.1375 18.2906C29.1375 18.2781 29.1375 18.2656 29.1375 18.2531L29.0906 18.4031L29.1281 18.1594L29.1187 18.0844L29.2687 17.8969L29.3531 17.8688Z" fill="#B27129"/>
+<path d="M29.0906 18.0281C29.0437 18.075 28.9781 18.0656 28.9219 18.0844C28.8656 18.1031 28.8375 18.1781 28.8375 18.1781C28.8375 18.1781 28.8844 18.15 28.9031 18.1594C28.9312 18.1688 28.95 18.1688 28.9125 18.2719C28.8656 18.375 28.7062 18.5531 28.7156 18.5531C28.7156 18.5531 28.9031 18.4125 28.95 18.3188C29.0156 18.2344 29.0062 18.1875 29.025 18.15C29.025 18.1219 29.1 18.0844 29.1187 18.0844C29.1281 18.0844 29.1656 18.0844 29.175 18.15L29.2312 18.3938L29.3062 18.15C29.325 18.0563 29.325 17.8781 29.325 17.8781L29.2687 17.8688C29.2219 17.8594 29.1281 17.775 29.1281 17.775C29.1281 17.775 29.1469 17.9625 29.0812 18.0281H29.0906Z" fill="#8F4620"/>
+<path d="M29.8406 16.95C29.8406 16.95 29.8969 17.0906 29.775 17.1937C29.7375 17.2218 29.7094 17.2406 29.6438 17.25C29.5874 17.2421 29.5332 17.223 29.4844 17.1937L29.1094 17.0437L28.9219 16.9875L28.8281 16.9593L28.8469 16.8562H29.1281L29.4094 16.9687L29.5312 17.0156L29.6344 17.0343H29.7188L29.7844 17.0156L29.8219 16.9875L29.8406 16.95Z" fill="#DBAD6C"/>
+<path d="M29.8406 16.95C29.8406 16.9781 29.8125 17.0531 29.7843 17.0718C29.7562 17.0718 29.7093 17.1 29.5968 17.0718C29.4937 17.0531 29.3812 16.9781 29.2593 16.95C29.1375 16.9125 29.0437 16.8843 28.95 16.8843C28.8562 16.8843 28.9031 16.8468 28.9031 16.8468C28.9031 16.8468 29.1187 16.8187 29.3062 16.8937C29.4937 16.9593 29.5781 17.0062 29.6812 17.0062C29.8125 17.0062 29.8406 16.95 29.8406 16.95Z" fill="#AB6D29"/>
+<path d="M28.8375 16.8375H28.9219C28.9594 16.8375 28.9875 16.8093 28.9875 16.8093C28.9875 16.8093 28.9875 16.8562 28.9688 16.875C28.9406 16.8937 28.875 16.8843 28.8563 16.8843L28.8375 16.8375Z" fill="#4D2A15"/>
+<path d="M29.5593 17.2875C29.5593 17.2875 29.6812 17.4094 29.6531 17.5125L29.4 17.4L29.0062 17.2407L28.7906 17.175L28.7625 17.1375L28.8187 17.0625L28.8375 16.9875L29.1 17.025L29.3812 17.1188L29.5593 17.2875Z" fill="#DBAD6C"/>
+<path d="M29.2875 17.4657C29.2875 17.4657 29.5125 17.7563 29.4562 17.85L28.9312 17.5219L28.7437 17.8313L28.3031 17.6157C28.3031 17.6157 28.6594 17.3344 28.6969 17.2875L28.7437 17.2219L28.9312 17.2594L29.25 17.3532L29.2875 17.4657Z" fill="#DBAD6C"/>
+<path d="M29.1563 17.025C29.1563 17.025 29.3438 17.0719 29.4657 17.1375C29.5875 17.1938 29.7469 17.2125 29.7469 17.2125C29.7469 17.2125 29.6907 17.2781 29.5594 17.2875C29.5219 17.2875 29.4282 17.2125 29.3719 17.1656C29.3063 17.1281 29.1282 17.0719 29.1282 17.0719L29.1563 17.025Z" fill="#AB6D29"/>
+<path d="M28.8375 16.9313C28.8375 16.9313 28.9687 16.9594 29.0437 16.9969C29.1375 17.025 29.1375 17.0156 29.1562 17.0062C29.1844 17.0062 29.1844 16.9875 29.1844 16.9875C29.1844 16.9875 29.2031 17.0812 29.1375 17.0812C29.0719 17.0812 29.0438 17.0531 28.9688 17.0156C28.875 16.9781 28.8281 17.0156 28.8281 17.0156V16.9219L28.8375 16.9313Z" fill="#4D2A15"/>
+<path d="M29.5688 17.4375C29.5688 17.4375 29.6625 17.5031 29.6531 17.5219C29.6344 17.5219 29.5875 17.55 29.5031 17.5594C29.4383 17.5663 29.3728 17.5532 29.3156 17.5219C29.2594 17.5031 29.2219 17.4 29.0813 17.3344C28.9962 17.2991 28.9084 17.2709 28.8188 17.25L28.6969 17.2312L28.7906 17.1937L29.0906 17.25L29.3531 17.3344L29.5125 17.4094L29.5688 17.4469V17.4375ZM29.0625 17.625L29.1188 17.8687L29.0813 18.0094L29.0063 18.0656L28.9313 18.0375L28.9031 17.9906C28.9031 17.9906 28.9406 17.9344 28.9031 17.8875C28.875 17.8312 28.7156 17.775 28.7156 17.775C28.7156 17.775 28.7813 17.6531 28.8469 17.625C28.9219 17.5969 28.8844 17.5125 28.8844 17.5125L29.0625 17.625Z" fill="#AB6D29"/>
+<path d="M28.7625 17.1375C28.7625 17.1375 28.8093 17.175 28.9031 17.1843C28.95 17.1843 29.025 17.2031 29.1093 17.2312L29.2031 17.2031L29.1562 17.2406C29.2406 17.2593 29.3437 17.3062 29.3906 17.325C29.4609 17.3521 29.5247 17.3936 29.5781 17.4468L29.3906 17.3531C29.2996 17.3166 29.2054 17.2883 29.1093 17.2687C28.9218 17.2406 28.7343 17.25 28.7062 17.2312C28.6687 17.2312 28.7156 17.2218 28.7437 17.2031C28.7625 17.1843 28.7625 17.1375 28.7625 17.1375Z" fill="#4D2A15"/>
+<path d="M29.4375 17.7938C29.4375 17.7938 29.5031 17.8594 29.4375 17.8781C29.3812 17.8969 29.2125 17.8969 29.1375 17.8125L29.0812 17.7C29.012 17.6391 28.9366 17.5857 28.8562 17.5406C28.7906 17.4938 28.8843 17.4938 28.8843 17.4938L29.2218 17.6344C29.2993 17.6794 29.3717 17.7329 29.4375 17.7938Z" fill="#AB6D29"/>
+<path d="M29.4375 17.8031C29.4375 17.8031 29.325 17.6344 28.9781 17.4938L29.0906 17.475H28.9031C28.8783 17.4652 28.8533 17.4558 28.8281 17.4469C28.6406 17.3906 28.6406 17.3906 28.6219 17.3719C28.6125 17.3438 28.5844 17.3719 28.5656 17.4L28.5 17.4938C28.5761 17.4708 28.6567 17.4676 28.7344 17.4844C28.8375 17.5125 28.8281 17.55 28.8281 17.5781C28.8187 17.625 28.6969 17.7656 28.7063 17.775C28.725 17.775 28.8 17.6344 28.8938 17.6531C28.9875 17.6813 29.0062 17.7281 29.0062 17.7281C29.0062 17.7281 29.0063 17.6719 28.9875 17.6531C28.9688 17.6344 28.8656 17.5313 28.8938 17.5313C28.9219 17.5313 29.0437 17.5594 29.2031 17.6438C29.3719 17.7281 29.3906 17.7469 29.4469 17.8031H29.4375Z" fill="#4D2A15"/>
+<path d="M28.8844 17.5312C28.8844 17.5312 29.1469 17.6063 29.1375 17.8875C29.1281 18.1688 28.9219 18.1125 28.9031 18.0094C28.8844 17.9156 28.9313 18.0562 28.9969 18.0469C29.0813 18.0281 29.0906 17.9531 29.0906 17.8406C29.0906 17.7469 29.0625 17.6906 28.9969 17.6344C28.9615 17.6007 28.9239 17.5694 28.8844 17.5406V17.5312Z" fill="#DBAD6C"/>
+<path d="M27.75 16.8656C27.75 16.8656 27.7875 16.8844 27.7125 17.0812C27.6375 17.2781 27.5907 17.3437 27.4782 17.475C27.2719 17.7 27.1782 17.7094 27.1969 17.8031C27.225 17.8969 27.3 17.8781 27.3188 17.8781C27.3375 17.8781 27.7219 17.3156 27.7219 17.3156L27.8063 16.9875L27.7875 16.8937L27.7594 16.8656H27.75Z" fill="#6C3F18"/>
+<path d="M28.6969 16.4625C28.6969 16.4625 28.8094 16.6312 28.7719 16.9312C28.7437 17.25 28.3312 17.5219 28.3312 17.5219L27.7312 17.9344L27.4781 17.9156H27.4031C27.3656 17.9062 27.3281 17.8687 27.3187 17.8687L27.2719 17.7562L27.3562 17.6625L27.5719 17.4469L27.7031 17.2594C27.7031 17.2594 27.7687 17.1375 27.7781 17.025C27.7781 16.9219 27.7594 16.8656 27.7594 16.8656L27.8062 16.9406L27.8344 17.1094L27.8156 17.2969L27.9656 17.1844L28.1719 17.0906C28.1719 17.0906 28.2375 17.0906 28.2656 16.9687C28.3125 16.8562 28.35 16.6875 28.35 16.6125L28.3406 16.4437H28.3687C28.3875 16.4437 28.4344 16.5562 28.4344 16.6031L28.4719 16.8656L28.5656 16.7719L28.6594 16.6312C28.6781 16.5844 28.6969 16.5094 28.6969 16.4625Z" fill="#DBAD6C"/>
+<path d="M28.7625 18.0187C28.7625 18.0187 28.8094 18.0562 28.7906 18.1687C28.7719 18.2812 28.6875 18.3375 28.6406 18.3375V18.1875L28.5094 18.075L28.3688 18.0375L28.3969 18.0093C28.4063 17.9906 28.5563 17.9343 28.5563 17.9343L28.7625 18.0187Z" fill="#904720"/>
+<path d="M28.6594 18.0188C28.6594 18.0188 28.7063 18.0563 28.7719 18.0469C28.8375 18.0281 28.8656 17.925 28.8281 17.8781C28.7906 17.8406 28.8094 17.9719 28.7625 18C28.725 18.0094 28.6688 17.8875 28.6219 17.8781C28.5563 17.8688 28.4719 17.9063 28.4438 17.9438C28.425 17.9813 28.5375 17.9438 28.5375 17.9438L28.6031 17.9719H28.65L28.6594 18.0188Z" fill="#AB6D29"/>
+<path d="M27.7969 17.5875C27.7969 17.5875 27.8719 17.6156 27.9563 17.5969L28.2469 17.5031L28.4157 17.3813C28.4813 17.3156 28.7063 17.175 28.7344 16.9031C28.7532 16.6219 28.6969 16.4625 28.6969 16.4625C28.6969 16.4625 29.025 16.8188 28.7438 17.2313C28.5563 17.4938 28.3875 17.5781 28.3875 17.5781C28.3875 17.5781 28.7063 17.4844 28.7344 17.5594C28.7625 17.6344 28.725 17.7469 28.7157 17.775C28.7157 17.775 28.8938 17.8125 28.9219 17.9063C28.9313 17.9625 28.7157 17.8406 28.5469 17.8875C28.3782 17.925 28.3125 18.0188 28.3125 18.0188C28.3125 18.0188 28.275 17.9719 28.125 17.9719C27.9844 17.9719 27.9188 18.0375 27.8344 18.0375C27.7407 18.0375 27.4875 17.9813 27.4407 17.9063L27.6094 17.7C27.6844 17.55 27.7969 17.5875 27.7969 17.5875Z" fill="#904720"/>
+<path d="M28.4812 16.8469C28.4812 16.8469 28.6031 16.725 28.65 16.6313C28.6875 16.5375 28.6968 16.4625 28.6968 16.4625C28.6968 16.4625 28.7156 16.5563 28.6406 16.6781C28.5656 16.8 28.4812 16.8656 28.4812 16.8656V16.8469Z" fill="#AB6D29"/>
+<path d="M28.4437 16.5657C28.4437 16.5657 28.5469 16.9782 28.4437 17.1375C28.3219 17.3063 27.8344 17.5219 27.8344 17.5219C27.8344 17.5219 28.2094 17.325 28.3219 17.0907C28.4344 16.8563 28.425 16.6688 28.425 16.6688L28.4437 16.575V16.5657Z" fill="#904720"/>
+<path d="M27.9563 17.5969C27.9563 17.5969 28.1157 17.5969 28.2 17.5406C28.2938 17.4937 28.4157 17.3812 28.4157 17.3812C28.4157 17.3812 28.3032 17.475 28.2657 17.475C28.2375 17.475 28.2094 17.4281 28.2188 17.3906C28.2188 17.3906 28.1907 17.4656 28.125 17.5219C28.05 17.5687 27.9563 17.5969 27.9563 17.5969ZM28.3219 17.0906C28.3219 17.0906 28.4532 16.9594 28.4532 16.6781C28.4532 16.3969 28.3407 16.4437 28.3407 16.4437C28.3407 16.4437 28.4344 16.5094 28.4063 16.725C28.3875 16.9406 28.3125 17.1 28.3125 17.1L28.3219 17.0906ZM28.4813 17.1187C28.4813 17.1187 28.6313 17.0906 28.6782 16.9969C28.725 16.9031 28.7344 16.7437 28.7344 16.7437C28.7344 16.7437 28.7157 16.9031 28.6688 16.9594C28.6313 17.0156 28.4813 17.1187 28.4813 17.1187ZM28.3875 18.0094C28.3875 18.0094 28.4625 17.8687 28.5657 17.9062C28.6594 17.9437 28.6594 18.0187 28.6594 18.0187C28.6594 18.0187 28.6219 17.9625 28.5469 17.9531C28.4813 17.9531 28.3969 18.0094 28.3969 18.0094H28.3875ZM28.1157 17.7562L28.4625 17.6625L28.7438 17.5687C28.7438 17.5687 28.6313 17.6906 28.4625 17.7844C28.3125 17.8781 28.1813 17.8781 28.1813 17.8781C28.1813 17.8781 28.4813 17.7469 28.5 17.6906C28.5 17.6906 28.2188 17.775 28.125 17.7562H28.1157Z" fill="#1E2121"/>
+<path d="M27.7688 17.4187C27.8194 17.4555 27.8532 17.51 27.8633 17.5712C27.8734 17.6324 27.8591 17.6957 27.8233 17.7482C27.7876 17.8007 27.7329 17.8385 27.6706 17.8539C27.6082 17.8693 27.5428 17.8612 27.4875 17.8312" fill="white"/>
+<path d="M27.7594 17.4469C27.796 17.482 27.8184 17.5289 27.8226 17.5793C27.8269 17.6297 27.8127 17.6805 27.7826 17.7229C27.7525 17.7652 27.7084 17.7964 27.6579 17.8111C27.6074 17.8258 27.5537 17.823 27.5062 17.8031" fill="#F16E16"/>
+<path d="M27.6563 17.5687C27.6735 17.5668 27.6909 17.5696 27.7066 17.5769C27.7223 17.5843 27.7357 17.5958 27.7452 17.6103C27.7548 17.6247 27.7601 17.6416 27.7607 17.6589C27.7612 17.6762 27.7569 17.6933 27.7484 17.7084C27.7398 17.7234 27.7272 17.7358 27.712 17.7441C27.6968 17.7524 27.6795 17.7564 27.6622 17.7555C27.6449 17.7546 27.6282 17.749 27.6139 17.7392C27.5996 17.7294 27.5883 17.7158 27.5813 17.7" fill="black"/>
+<path d="M27.675 17.6812C27.6738 17.6887 27.6696 17.6953 27.6635 17.6997C27.6573 17.7041 27.6497 17.7059 27.6422 17.7047C27.6348 17.7034 27.6281 17.6993 27.6237 17.6931C27.6193 17.687 27.6176 17.6793 27.6188 17.6718C27.6188 17.6644 27.6218 17.6572 27.627 17.652C27.6323 17.6467 27.6395 17.6437 27.6469 17.6437C27.6516 17.6435 27.6562 17.6443 27.6604 17.6463C27.6646 17.6482 27.6683 17.6512 27.671 17.6549C27.6738 17.6586 27.6757 17.663 27.6764 17.6676C27.677 17.6722 27.6766 17.6769 27.675 17.6812Z" fill="#D5D3CA"/>
+<path d="M27.825 17.2687C27.825 17.2687 27.975 17.1281 28.0031 16.9406C28.0312 16.7531 28.0125 16.6406 28.0125 16.6406L28.0968 16.7344L28.125 16.8656L28.0781 17.1094L28.2281 17.0344C28.2843 16.9594 28.3687 16.6406 28.3406 16.4437C28.3406 16.4437 28.3781 16.5375 28.3218 16.8C28.2656 17.0719 28.2281 17.1 28.0218 17.2125C27.8662 17.3049 27.742 17.4421 27.6656 17.6062C27.6032 17.7069 27.531 17.8011 27.45 17.8875L27.6 17.6437C27.675 17.475 27.7593 17.3812 27.7593 17.3812L27.825 17.2687Z" fill="#AB6D29"/>
+<path d="M27.7594 17.3813C27.7594 17.3813 27.825 17.1938 27.825 17.0907C27.825 16.9875 27.7594 16.8657 27.7594 16.8657C27.7594 16.8657 27.8531 16.8563 27.8531 17.0719C27.8625 17.2969 27.8156 17.3157 27.7594 17.3813Z" fill="#904720"/>
+<path d="M28.05 17.1375C28.05 17.1375 28.1156 16.9781 28.1156 16.8563C28.1156 16.7531 28.0219 16.6406 28.0219 16.6406C28.0219 16.6406 28.125 16.6687 28.1344 16.8656C28.1437 17.0719 28.1156 17.0719 28.0406 17.1469L28.05 17.1375Z" fill="#4D2A15"/>
+<path d="M27.3844 17.9062C27.3844 17.9062 27.3281 17.8312 27.3375 17.7844C27.3375 17.7281 27.3375 17.7187 27.4688 17.5781C27.5606 17.4967 27.6396 17.4019 27.7031 17.2969C27.7313 17.2125 27.8438 17.0156 27.7594 16.8656C27.7594 16.8656 27.8156 17.0906 27.6844 17.2687C27.6003 17.4 27.4959 17.5171 27.375 17.6156C27.2719 17.6906 27.2531 17.7281 27.2625 17.775C27.2625 17.8219 27.2719 17.8687 27.2906 17.8687C27.3281 17.8969 27.3844 17.8969 27.3844 17.8969V17.9062Z" fill="#AB6D29"/>
+<path d="M28.6406 18.3375C28.6406 18.3375 28.6687 18.3375 28.6875 18.3094C28.7063 18.2813 28.7063 18.2157 28.6594 18.1594C28.6184 18.1092 28.5626 18.0731 28.5 18.0563L28.3125 18.0188C28.3125 18.0188 28.35 18.0938 28.4344 18.1407C28.4719 18.1594 28.5469 18.1407 28.5844 18.1782C28.6312 18.2157 28.6406 18.3375 28.6406 18.3375Z" fill="#6C4119"/>
+<path d="M28.6406 18.3375C28.6406 18.3375 28.7812 18.2906 28.7906 18.15L28.7812 18.0375C28.7812 18.0375 28.8 18.0844 28.8562 18.1031L28.9125 18.0844C28.9125 18.0844 28.8187 18.3469 28.6312 18.3375H28.6406Z" fill="#6C4119"/>
+<path d="M27.6375 18.3093L27.7125 18.3843L27.7969 18.4781L28.1438 18.3843L28.2563 18.2718L28.1625 18.1218H27.9094L27.6282 18.3093H27.6375Z" fill="#BF802D"/>
+<path d="M28.4813 18.1875L28.4157 18.1031L28.35 18.0469C28.2938 18.0187 28.0875 18.0187 28.0875 18.0187L27.9375 18.0469C27.9375 18.0469 27.8907 18.0937 27.8157 18.075C27.7325 18.0489 27.6511 18.0176 27.5719 17.9812L27.3938 17.9156C27.3938 17.9156 27.2719 17.8594 27.2438 17.8687C27.2157 17.8781 27.1032 17.9906 27.1032 17.9906C27.1032 17.9906 27.0844 18.0562 27.1313 18.0562C27.1688 18.0562 27.0657 18.075 27.0657 18.075C27.0657 18.075 26.8032 18.225 26.7657 18.4875C26.7188 18.7406 27.1969 19.125 27.375 18.9281C27.375 18.9281 27.1125 18.7406 27.1688 18.5812C27.2157 18.4219 27.3375 18.3187 27.5438 18.3C27.7407 18.3 27.7594 18.2719 27.8438 18.2062C27.9375 18.15 28.0969 18.1125 28.2188 18.2344C28.3407 18.3656 27.75 18.4875 27.75 18.4875L27.8157 18.5812C27.8157 18.5812 28.5375 18.3281 28.4719 18.1969L28.4813 18.1875Z" fill="#F9C83A"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M27.4009 17.8983L27.4001 17.898L27.3961 17.8962C27.3927 17.8946 27.3877 17.8924 27.3817 17.8898C27.3697 17.8846 27.3533 17.8778 27.3359 17.8712C27.3187 17.8647 27.3001 17.8582 27.2837 17.854C27.2756 17.8519 27.2675 17.8503 27.2603 17.8495C27.2535 17.8488 27.2452 17.8485 27.2378 17.851C27.2316 17.8531 27.2249 17.8572 27.219 17.8613C27.2126 17.8657 27.2055 17.8712 27.198 17.8773C27.1831 17.8895 27.1661 17.9047 27.1502 17.9195C27.1342 17.9343 27.1191 17.9488 27.1081 17.9595C27.1025 17.9649 27.098 17.9694 27.0948 17.9725L27.0912 17.9761L27.0902 17.9771L27.0899 17.9774L27.0864 17.9809L27.0851 17.9855L27.1031 17.9907C27.0851 17.9855 27.0851 17.9855 27.0851 17.9855L27.0851 17.9857L27.085 17.9859L27.0848 17.9867C27.0846 17.9873 27.0844 17.9881 27.0842 17.9892C27.0837 17.9913 27.083 17.9943 27.0824 17.9978C27.0813 18.0048 27.0802 18.0146 27.0809 18.0248C27.0815 18.0329 27.0833 18.0427 27.0883 18.0516C27.0845 18.0524 27.0809 18.0531 27.0776 18.0537C27.0731 18.0546 27.0693 18.0553 27.0665 18.0558L27.0634 18.0564L27.0623 18.0566L27.0591 18.0572L27.0563 18.0588L27.0656 18.0751C27.0563 18.0588 27.0563 18.0588 27.0563 18.0588L27.0562 18.0588L27.056 18.0589L27.0554 18.0593L27.053 18.0607C27.0509 18.062 27.048 18.0638 27.0442 18.0662C27.0367 18.071 27.026 18.0781 27.0131 18.0874C26.9872 18.106 26.9524 18.1336 26.9164 18.1696C26.8447 18.2414 26.7668 18.3479 26.7471 18.4845C26.7344 18.554 26.7578 18.6301 26.7999 18.7005C26.8423 18.7714 26.905 18.8387 26.9746 18.8916C27.0441 18.9443 27.1218 18.9835 27.1948 18.9964C27.268 19.0095 27.3387 18.9962 27.3889 18.9408L27.403 18.9252L27.3859 18.9129L27.3858 18.9128L27.3853 18.9125L27.3832 18.911C27.3814 18.9096 27.3787 18.9076 27.3753 18.905C27.3684 18.8997 27.3586 18.8919 27.347 18.8821C27.3237 18.8624 27.2934 18.8346 27.2649 18.8021C27.2363 18.7695 27.2102 18.7329 27.1945 18.6955C27.179 18.6582 27.1744 18.6216 27.1864 18.5875L27.1867 18.5866C27.2092 18.5102 27.2493 18.4481 27.308 18.4028C27.3665 18.3575 27.4446 18.328 27.5446 18.3188C27.6429 18.3188 27.6995 18.3118 27.7426 18.2953C27.7791 18.2814 27.8052 18.2607 27.837 18.2355C27.8426 18.231 27.8483 18.2265 27.8544 18.2218C27.9449 18.1679 28.0927 18.1352 28.2052 18.2474C28.2168 18.26 28.2179 18.2696 28.2156 18.2779C28.2127 18.2881 28.2034 18.3005 28.1854 18.3146C28.1497 18.3424 28.0898 18.3692 28.0238 18.3925C27.9584 18.4157 27.889 18.4349 27.8358 18.4483C27.8092 18.455 27.7868 18.4602 27.771 18.4638C27.7631 18.4655 27.7569 18.4669 27.7527 18.4678L27.7478 18.4689L27.7466 18.4691L27.7463 18.4692L27.7183 18.475L27.8084 18.6037L27.8218 18.599L27.8156 18.5813C27.8218 18.599 27.8218 18.599 27.8218 18.599L27.8224 18.5988L27.824 18.5982L27.83 18.5961C27.8353 18.5942 27.8431 18.5914 27.853 18.5878C27.8727 18.5806 27.9007 18.5701 27.9342 18.5572C28.001 18.5313 28.0896 18.4954 28.1762 18.4554C28.2626 18.4154 28.348 18.3708 28.408 18.3276C28.4378 18.306 28.4627 18.2839 28.4779 18.2618C28.4906 18.2435 28.4982 18.2227 28.4934 18.2019L28.5062 18.1891L28.4293 18.0902L28.3604 18.0312L28.3584 18.0302C28.3414 18.0216 28.3152 18.0161 28.2879 18.0121C28.26 18.0081 28.2283 18.0054 28.1988 18.0036C28.1692 18.0018 28.1414 18.0009 28.121 18.0005C28.1108 18.0003 28.1025 18.0002 28.0967 18.0001L28.0899 18.0001L28.0881 18.0001L28.0875 18.0001L28.0858 18.0001L27.9283 18.0296L27.9243 18.0336L27.9241 18.0338C27.9239 18.034 27.9236 18.0343 27.923 18.0348C27.9219 18.0357 27.9202 18.0371 27.9179 18.0389C27.9132 18.0423 27.9062 18.0468 27.8971 18.0509C27.8791 18.0589 27.8531 18.065 27.8207 18.057C27.7385 18.0312 27.658 18.0002 27.5797 17.9643L27.579 17.964L27.4009 17.8983ZM27.9461 18.0644C27.9445 18.0657 27.9425 18.0673 27.9401 18.0691C27.9337 18.0738 27.9243 18.0798 27.9123 18.0852C27.8882 18.0959 27.8534 18.1038 27.8111 18.0932L27.81 18.093C27.7263 18.0667 27.6444 18.0352 27.5647 17.9986L27.3866 17.933L27.3859 17.9327L27.3856 17.9326L27.3846 17.9321L27.3808 17.9304C27.3775 17.9289 27.3727 17.9268 27.3668 17.9242C27.3551 17.9192 27.3393 17.9126 27.3226 17.9063C27.3059 17.8999 27.2888 17.894 27.2744 17.8903C27.2672 17.8885 27.2611 17.8873 27.2563 17.8868C27.2521 17.8863 27.2502 17.8866 27.2497 17.8866C27.2496 17.8866 27.2496 17.8866 27.2497 17.8866C27.2497 17.8866 27.2496 17.8866 27.2495 17.8867L27.2488 17.8869C27.2483 17.8872 27.2476 17.8876 27.2468 17.888C27.245 17.889 27.2429 17.8904 27.2403 17.8922C27.2351 17.8957 27.2288 17.9005 27.2218 17.9063C27.2077 17.9178 27.1913 17.9325 27.1756 17.947C27.16 17.9615 27.1451 17.9758 27.1342 17.9864C27.1288 17.9917 27.1243 17.9961 27.1212 17.9992L27.1201 18.0002C27.1199 18.0013 27.1197 18.0026 27.1194 18.004C27.1185 18.0094 27.1179 18.016 27.1183 18.0222C27.1188 18.0286 27.1203 18.0325 27.1218 18.0345C27.1226 18.0355 27.1245 18.0376 27.1312 18.0376C27.1339 18.0376 27.1364 18.0376 27.1387 18.0379C27.1398 18.038 27.1412 18.0382 27.1427 18.0385C27.1438 18.0388 27.1467 18.0396 27.1496 18.0415C27.1527 18.0436 27.1591 18.0495 27.1581 18.0594C27.1574 18.067 27.1524 18.0713 27.1513 18.0723C27.1484 18.0748 27.145 18.0762 27.1438 18.0766C27.1377 18.0791 27.1267 18.0817 27.1166 18.084C27.1058 18.0864 27.0939 18.0888 27.0847 18.0905C27.0801 18.0914 27.0762 18.0922 27.0734 18.0927L27.0723 18.0929C27.0705 18.094 27.0678 18.0956 27.0643 18.0978C27.0574 18.1023 27.0473 18.109 27.035 18.1178C27.0104 18.1355 26.9772 18.1618 26.9429 18.1961C26.8741 18.2649 26.8021 18.3645 26.7842 18.4902L26.7841 18.491C26.7735 18.548 26.7923 18.6147 26.8321 18.6812C26.8717 18.7475 26.931 18.8114 26.9973 18.8617C27.0637 18.9121 27.136 18.9479 27.2013 18.9595C27.2585 18.9697 27.3086 18.9612 27.3462 18.9299C27.3397 18.9248 27.3318 18.9183 27.3228 18.9107C27.2986 18.8903 27.2668 18.8612 27.2367 18.8269C27.2067 18.7927 27.1777 18.7526 27.1599 18.71C27.1422 18.6674 27.135 18.621 27.1509 18.5755C27.1753 18.4928 27.2195 18.4238 27.285 18.3731C27.3505 18.3224 27.4362 18.291 27.542 18.2814L27.5429 18.2813H27.5437C27.6418 18.2813 27.6928 18.2742 27.7292 18.2603C27.7599 18.2485 27.781 18.2319 27.8129 18.2067C27.8189 18.202 27.8253 18.1969 27.8322 18.1915L27.8331 18.1908L27.8341 18.1902C27.9311 18.132 28.1012 18.0904 28.232 18.2212L28.2325 18.2217C28.2512 18.2418 28.2583 18.2646 28.2516 18.2881C28.2455 18.3097 28.2287 18.3283 28.2085 18.3441C28.1677 18.376 28.1028 18.4044 28.0363 18.4279C27.9694 18.4516 27.8987 18.4711 27.845 18.4846C27.8193 18.4911 27.7974 18.4962 27.7815 18.4998L27.8228 18.5588C27.8274 18.5572 27.8333 18.5551 27.8401 18.5526C27.8596 18.5454 27.8874 18.5351 27.9206 18.5222C27.9871 18.4965 28.0749 18.4609 28.1605 18.4213C28.2464 18.3816 28.3291 18.3383 28.386 18.2972C28.4147 18.2765 28.4354 18.2573 28.4471 18.2405C28.4587 18.2237 28.4589 18.213 28.4551 18.2053L28.4491 18.1932L28.4563 18.186L28.402 18.1162L28.3397 18.0628C28.3282 18.0576 28.3083 18.053 28.2826 18.0492C28.256 18.0454 28.2256 18.0428 28.1965 18.041C28.1675 18.0393 28.1403 18.0384 28.1202 18.038C28.1102 18.0378 28.102 18.0377 28.0963 18.0376L28.0897 18.0376L28.0892 18.0376L27.9461 18.0644Z" fill="#8F4620"/>
+<path d="M27.1313 18.8156C27.1313 18.8156 26.8406 18.7406 26.8594 18.4687C26.8875 18.2062 27.1406 18.1031 27.1781 18.0937C27.2156 18.075 27.2063 17.9437 27.2531 17.925C27.2859 17.9184 27.3197 17.9191 27.3522 17.9273C27.3846 17.9354 27.4148 17.9506 27.4406 17.9718L27.5719 18.0468C27.5719 18.0468 27.0563 18.2718 27.0563 18.5718C27.0563 18.7687 27.1313 18.8062 27.1313 18.8062V18.8156Z" fill="#FCF3D8"/>
+<path d="M28.4813 18.1688C28.4813 18.1688 28.4438 18.1875 28.4344 18.1688C28.3781 18.075 28.2469 18.0375 28.1531 18.0469C28.0125 18.0469 27.9281 18.0938 27.8344 18.0938C27.7406 18.0938 27.7688 18.0844 27.6656 18.075C27.5625 18.075 27.3375 17.9063 27.2906 17.925C27.2344 17.9438 27.2156 18 27.2156 18.0282C27.225 18.0657 27.1219 18.0657 27.1219 18.0375C27.1031 18.0188 27.1875 17.8782 27.2813 17.8782C27.525 17.8782 27.7125 18.0375 27.825 18.0375C27.9469 18.0375 27.9844 17.9719 28.1438 17.9719C28.3031 17.9719 28.4719 18.0469 28.4813 18.1594V18.1688Z" fill="#FDEAAF"/>
+<path d="M27.675 18.3562C27.675 18.3562 27.7969 18.3375 27.8813 18.3L28.0875 18.225L27.9 18.3375L27.7125 18.3844L27.675 18.3562Z" fill="#513625"/>
+<path d="M27.2625 18.9657C27.2438 18.9657 27.1406 18.9657 26.9813 18.8625C26.8125 18.75 26.7656 18.5625 26.7656 18.5625C26.7656 18.5625 26.7281 18.3844 26.8969 18.2063C27.0656 18.0282 27.0938 18.0844 27.1031 18.0938C27.1125 18.0938 27.1031 18.1032 27.1031 18.1032L26.9438 18.225L26.8781 18.3469L26.8125 18.4594V18.5907L26.8875 18.7313L27.1219 18.8719L27.2625 18.9657Z" fill="#F9C83A"/>
+<path d="M27.1687 17.9438V17.925V17.9532V17.925V17.9532V17.925L27.1406 17.9438H27.1593V17.925L27.1406 17.9438L27.1593 17.925H27.1406C27.1384 17.9311 27.1384 17.9377 27.1406 17.9438L27.1593 17.925H27.1406H27.1593H27.1406H27.1593H27.1406H27.1593L27.1406 17.9157L27.1593 17.925L27.1406 17.9157L27.1312 17.925C27.1176 17.9398 27.1051 17.9554 27.0937 17.9719L27.075 18.0282V18.0375C27.075 18.0657 27.0937 18.0844 27.1125 18.0938H27.2437C27.2498 18.0899 27.2541 18.0839 27.2559 18.0769C27.2576 18.0699 27.2566 18.0626 27.2531 18.0563C27.2511 18.0505 27.2472 18.0456 27.2421 18.0422C27.2371 18.0388 27.231 18.0372 27.225 18.0375L27.1593 18.0469C27.15 18.0487 27.1405 18.0487 27.1312 18.0469V18.0282C27.1299 18.022 27.1299 18.0156 27.1312 18.0094C27.139 17.9929 27.1485 17.9772 27.1593 17.9625L27.1781 17.9532V17.9438L27.1875 17.925C27.1854 17.9193 27.1816 17.9144 27.1765 17.911C27.1714 17.9076 27.1654 17.9059 27.1593 17.9063C27.1536 17.9083 27.1486 17.9122 27.1453 17.9172C27.1419 17.9223 27.1402 17.9283 27.1406 17.9344C27.1426 17.9402 27.1464 17.9451 27.1515 17.9485C27.1566 17.9519 27.1626 17.9535 27.1687 17.9532V17.9438Z" fill="#8B5122"/>
+<path d="M27.6657 18.1968L27.3094 18.3C27.2813 18.3187 27.4219 18.3 27.5344 18.3L27.6563 18.3093L27.7407 18.2906C27.8719 18.2437 28.1532 18.1406 28.1813 18.2625C28.2001 18.3562 27.7969 18.45 27.7969 18.45V18.4968L28.1157 18.4125L28.2938 18.3187L28.3407 18.2343L28.1813 18.1218H27.9376L27.825 18.15L27.6657 18.1968Z" fill="#F9C83A"/>
+<path d="M27.1594 18.7031C27.1875 18.7781 27.2437 18.8906 27.3094 18.9187C27.3094 18.9187 27.3187 18.9187 27.3094 18.9187C27.3094 18.9281 27.2625 18.9656 27.15 18.9281C27.0375 18.9 26.8688 18.8625 26.7656 18.5531V18.6187L26.8313 18.7406L26.9344 18.8531L27.1125 18.9562L27.225 18.9844L27.3187 18.9656L27.375 18.9281L27.2719 18.8344L27.1406 18.6187L27.1594 18.7125V18.7031Z" fill="#8F4620"/>
+<path d="M28.3219 21.8062V21.9187H28.2562V21.7781L28.3219 21.8062ZM27.8812 18.5812L27.7687 18.45L27.6937 18.4593L27.8062 18.6281L27.8812 18.5812Z" fill="#FCCA3D"/>
+<path d="M28.3125 22.0781L28.1531 21.9843C28.0807 21.9563 28.0051 21.9374 27.9281 21.9281V21.9562H27.9469L28.1437 22.0125C28.1989 22.04 28.2522 22.0713 28.3031 22.1062L28.3125 22.0781ZM28.3125 21.7875H28.0312C27.9869 21.8016 27.9456 21.8238 27.9094 21.8531L27.9187 21.8718C27.9892 21.8209 28.0759 21.7976 28.1625 21.8062C28.2063 21.808 28.2501 21.8111 28.2937 21.8156V21.7875H28.3125ZM28.275 21.5343L28.0312 21.6656L27.8812 21.7781L27.9 21.7968L27.9469 21.7593C28.0233 21.7019 28.1049 21.6517 28.1906 21.6093L28.2844 21.5625L28.275 21.5343ZM28.1156 21.2812C28.1156 21.2812 28.1156 21.3468 28.0875 21.3937C28.0702 21.4198 28.0514 21.4448 28.0312 21.4687C27.9548 21.5516 27.8767 21.6328 27.7969 21.7125L27.8156 21.7406C27.8944 21.6569 27.9726 21.5725 28.05 21.4875L28.1156 21.4125C28.1437 21.3562 28.1437 21.2906 28.1437 21.2812H28.1156ZM27.9187 21.1687C27.931 21.2379 27.9245 21.3091 27.9 21.375L27.8062 21.5812L27.7687 21.6656L27.75 21.6937L27.7687 21.7125C27.7687 21.7125 27.8906 21.5062 27.9281 21.3843C27.9469 21.3375 27.9469 21.2906 27.9469 21.2437C27.95 21.2157 27.95 21.1874 27.9469 21.1593H27.9094L27.9187 21.1687ZM27.7219 21.1406C27.7193 21.178 27.7193 21.2156 27.7219 21.2531C27.7219 21.3093 27.7219 21.3656 27.7031 21.4125L27.6375 21.5812L27.6094 21.675L27.6375 21.6843L27.7312 21.4218C27.75 21.375 27.75 21.3093 27.75 21.2531V21.1406H27.7219ZM27.5719 21.1406V21.2531L27.5437 21.4406C27.5262 21.5183 27.5106 21.5965 27.4969 21.675H27.525L27.5437 21.6L27.5719 21.4406C27.6 21.3468 27.6 21.1406 27.6 21.1406H27.5719ZM27.4031 21.1687C27.393 21.259 27.393 21.3502 27.4031 21.4406C27.3835 21.5174 27.371 21.5959 27.3656 21.675H27.3937C27.4023 21.5993 27.4148 21.5242 27.4312 21.45L27.4406 21.3187V21.1687H27.4031ZM27.2812 21.1875V21.2062C27.2804 21.2758 27.271 21.3451 27.2531 21.4125L27.1969 21.5906L27.1781 21.6843H27.2062L27.2812 21.4125C27.2992 21.3451 27.3086 21.2759 27.3094 21.2062V21.1875H27.2812ZM27.1312 21.1875V21.2531C27.1312 21.3093 27.1312 21.3843 27.0937 21.4406C27.0629 21.4978 27.0216 21.5487 26.9719 21.5906C26.9505 21.604 26.9286 21.6165 26.9062 21.6281L26.8875 21.6468L26.8969 21.675C26.8969 21.675 27.0562 21.5812 27.1219 21.4593C27.1594 21.3937 27.1687 21.3093 27.1687 21.2531V21.1875H27.1312ZM27.0469 21.1593V21.1781C27.0254 21.2421 26.9937 21.3023 26.9531 21.3562C26.925 21.3937 26.8687 21.4312 26.8312 21.4593C26.8068 21.4759 26.7818 21.4916 26.7562 21.5062L26.775 21.5343C26.775 21.5343 26.9062 21.4593 26.9719 21.375C27.0167 21.3119 27.0514 21.2424 27.075 21.1687H27.0469V21.1593ZM26.9062 21.0937V21.1031C26.8805 21.1477 26.849 21.1887 26.8125 21.225C26.8031 21.2437 26.7656 21.2625 26.7281 21.2812L26.6719 21.3187L26.6812 21.3468L26.7469 21.3093L26.8406 21.2437L26.9062 21.1593L26.9344 21.1031L26.9062 21.0937ZM26.8406 21L26.8125 21.0281L26.7281 21.1218C26.7131 21.1351 26.6975 21.1476 26.6812 21.1593L26.6437 21.1875L26.6531 21.2156L26.7187 21.1781C26.7844 21.1218 26.8594 21.0187 26.8594 21.0187L26.8406 21ZM26.8031 20.9437L26.7844 20.9625L26.7 21.0187C26.6773 21.0334 26.6517 21.043 26.625 21.0468V21.0843L26.6812 21.0562C26.7469 21.0281 26.8219 20.9625 26.8219 20.9625L26.8031 20.9437ZM26.7844 20.8781L26.7094 20.9156L26.6531 20.9437C26.6414 20.9514 26.6288 20.9577 26.6156 20.9625V20.9906C26.6344 20.9906 26.6437 20.9906 26.6625 20.9718L26.7937 20.9062L26.7844 20.8781ZM26.7469 20.7562L26.7 20.8031L26.6156 20.8312V20.8593C26.6573 20.8567 26.6969 20.8402 26.7281 20.8125C26.7448 20.8013 26.7604 20.7887 26.775 20.775L26.7469 20.7562ZM26.7562 20.55L26.7 20.5968C26.6719 20.625 26.6437 20.6531 26.6344 20.6906C26.6312 20.6908 26.6281 20.6908 26.625 20.6906V20.7375L26.6437 20.7187C26.651 20.7136 26.6574 20.7073 26.6625 20.7C26.6625 20.6812 26.7 20.6437 26.7281 20.6156C26.743 20.5993 26.7587 20.5836 26.775 20.5687L26.7562 20.55ZM27.7594 19.35H27.9094L27.9187 19.3312V19.3218H27.9094V19.35V19.3406H27.8906H27.9H27.8906V19.3218L27.9 19.3312V19.3218V19.3312V19.3218H27.7594V19.35ZM27.7594 19.2562H27.7781C27.7968 19.2562 27.8156 19.2562 27.8344 19.2375C27.8719 19.2281 27.9 19.2 27.9281 19.1812L27.975 19.1531C27.9843 19.1513 27.9938 19.1513 28.0031 19.1531V19.1156L27.9469 19.1343L27.8531 19.2L27.7781 19.2281L27.7687 19.2562H27.7594ZM27.7594 19.1156L27.825 19.0968L27.9375 19.0218C27.975 18.9937 28.0031 18.9843 28.0312 18.9843V18.9562C28.0031 18.9562 27.9844 18.9562 27.9562 18.975L27.8437 19.0406C27.8157 19.0619 27.7839 19.0778 27.75 19.0875V19.1156H27.7594ZM27.7031 18.9843L27.8437 18.8906L27.9937 18.7781L27.9844 18.75L27.825 18.8625C27.7781 18.9093 27.7219 18.9468 27.6844 18.9562L27.7031 18.9937V18.9843ZM27.6094 18.8437L27.9094 18.6281L27.8906 18.6L27.5906 18.8156L27.6 18.8437H27.6094ZM27.4687 18.6937C27.5676 18.6114 27.6743 18.5392 27.7875 18.4781L27.7687 18.4593L27.6281 18.5531L27.45 18.675L27.4687 18.6937ZM27.375 18.6C27.4555 18.5427 27.5368 18.4864 27.6187 18.4312L27.6937 18.3843L27.6844 18.3562C27.6584 18.3703 27.6334 18.3859 27.6094 18.4031C27.5241 18.4643 27.4397 18.5268 27.3562 18.5906L27.3656 18.6093L27.375 18.6Z" fill="#816C2A"/>
+<path d="M27.6093 18.3188L27.6187 18.3281C27.7046 18.3981 27.7832 18.4766 27.8531 18.5625C27.9468 18.675 28.0218 18.8156 28.0218 18.9469V18.9938C27.9925 19.17 27.9108 19.3333 27.7875 19.4625C27.6 19.6781 27.3375 19.875 27.1312 20.0625C27.0261 20.1478 26.9317 20.2453 26.85 20.3531C26.7756 20.4534 26.7361 20.5752 26.7375 20.7C26.7409 20.8139 26.7766 20.9245 26.8406 21.0188C26.8798 21.0793 26.9342 21.1284 26.9984 21.1613C27.0625 21.1942 27.1342 21.2097 27.2062 21.2063C27.375 21.2063 27.5625 21.1406 27.7312 21.1406C27.8812 21.1406 28.0125 21.1781 28.1437 21.3188C28.2656 21.45 28.3031 21.6563 28.3031 21.8531C28.3031 22.0031 28.2843 22.1344 28.2656 22.2469C28.2551 22.3036 28.2426 22.3599 28.2281 22.4156H28.2562C28.2562 22.4156 28.3312 22.1531 28.3312 21.8531C28.3312 21.6563 28.2937 21.4313 28.1625 21.2906C28.1083 21.2308 28.0415 21.1838 27.9669 21.153C27.8923 21.1222 27.8118 21.1084 27.7312 21.1125C27.5531 21.1125 27.3656 21.1688 27.2062 21.1688C27.1401 21.173 27.074 21.1596 27.0147 21.1299C26.9554 21.1003 26.905 21.0555 26.8687 21C26.8079 20.9083 26.7753 20.8007 26.775 20.6906V20.6813C26.775 20.5313 26.8406 20.4 26.9531 20.2781C27.1218 20.0906 27.375 19.9031 27.6093 19.6969C27.825 19.4906 28.0218 19.275 28.05 18.9938V18.9469C28.05 18.7781 27.9468 18.6188 27.8343 18.4969C27.769 18.4216 27.6968 18.3526 27.6187 18.2906L27.6093 18.3188Z" fill="#78732E"/>
+<path d="M27.3844 18.6L27.3469 18.5719L27.3187 18.5813L27.375 18.6281L27.3844 18.6ZM27.4781 18.6938L27.45 18.6656H27.4406L27.4594 18.7031L27.4781 18.6938Z" fill="#A8AC71"/>
+<path d="M27.6093 18.8438L27.5906 18.8063L27.5718 18.825L27.6 18.8531L27.6093 18.8438ZM27.7031 18.9844L27.6937 18.9563H27.6656L27.7031 19.0031V18.9844ZM27.7687 19.125L27.75 19.0875V19.125H27.7687ZM27.7687 19.2656V19.2281L27.75 19.2188V19.2656H27.7687ZM27.7687 19.3594V19.3125L27.7593 19.3031V19.3594H27.7687ZM26.625 20.7281L26.6343 20.6625C26.6437 20.6344 26.6062 20.6719 26.6062 20.6719V20.7188L26.625 20.7281Z" fill="#78732E"/>
+<path d="M26.625 20.8219L26.5969 20.8313L26.6063 20.8781L26.6157 20.8594V20.8219H26.625Z" fill="white"/>
+<path d="M26.625 20.9906V20.9531H26.6062V21.0094L26.625 20.9906Z" fill="#78732E"/>
+<path d="M26.625 21.0844V21.0469H26.6156V21.0844H26.625ZM26.6531 21.2156V21.1781L26.6344 21.1875L26.6437 21.225L26.6531 21.2156ZM26.6906 21.3469L26.6812 21.3H26.6625L26.6812 21.3563L26.6906 21.3469Z" fill="white"/>
+<path d="M26.775 21.5344L26.7563 21.5062H26.7375L26.7657 21.5344H26.775ZM26.9157 21.6656L26.8688 21.6375C26.8407 21.6094 26.8594 21.6562 26.8594 21.6562L26.8969 21.675H26.9157V21.6656ZM27.8344 21.7406L27.7969 21.7125C27.7782 21.7125 27.7969 21.7125 27.8157 21.75C27.825 21.7781 27.8344 21.7406 27.8344 21.7406Z" fill="#A8AC71"/>
+<path d="M27.9094 21.7969L27.8812 21.7688V21.7969H27.9H27.9094Z" fill="white"/>
+<path d="M27.9282 21.8437C27.9188 21.825 27.9094 21.8531 27.9094 21.8531L27.9282 21.8812V21.8344V21.8437ZM27.9282 21.9656V21.9187C27.9282 21.9 27.9188 21.9187 27.9188 21.9187V21.9656H27.9282Z" fill="#A8AC71"/>
+<path d="M27.8812 22.0969L27.9 22.0594H27.8812V22.0969ZM26.4938 17.2219C26.4938 17.2219 26.5406 17.2031 26.5031 17.2594L26.5312 17.2125H26.4844L26.4938 17.2219Z" fill="white"/>
+<path d="M27.6188 18.2812L27.6562 18.3094H27.6094L27.6188 18.2812Z" fill="#F9C83A"/>
+<path d="M27.6562 18.3094L27.5906 18.3188C27.5718 18.3188 27.6093 18.3 27.6093 18.3L27.6468 18.3094H27.6562Z" fill="#8F4620"/>
+<path d="M28.2187 22.4156C28.2187 22.4156 28.2469 22.4156 28.2656 22.3875C28.2844 22.3594 28.2562 22.425 28.2562 22.425L28.2281 22.4344L28.2094 22.4156H28.2187Z" fill="#977C2E"/>
+</g>
+<defs>
+<radialGradient id="paint0_radial_1_38536" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(27.522 23.8819) rotate(22.9532) scale(0.354543 0.354775)">
+<stop stop-color="white"/>
+<stop offset="1" stop-color="#F15770"/>
+</radialGradient>
+<radialGradient id="paint1_radial_1_38536" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(25.1138 22.7081) rotate(-95.2707) scale(0.351574 0.326323)">
+<stop stop-color="white"/>
+<stop offset="1" stop-color="#F15770"/>
+</radialGradient>
+<radialGradient id="paint2_radial_1_38536" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(34.0278 24.6661) rotate(50.043) scale(0.183111 0.35952)">
+<stop stop-color="white"/>
+<stop offset="1" stop-color="#F15770"/>
+</radialGradient>
+<clipPath id="clip0_1_38536">
+<rect width="60" height="45" fill="white"/>
+</clipPath>
+</defs>
+</svg>
diff --git a/src/assets/img/settings/currencies/mys.svg b/src/assets/img/settings/currencies/mys.svg
new file mode 100644
index 000000000..b5a1d9d1d
--- /dev/null
+++ b/src/assets/img/settings/currencies/mys.svg
@@ -0,0 +1,14 @@
+<svg width="60" height="45" viewBox="0 0 60 45" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g clip-path="url(#clip0_1_38983)">
+<path d="M0 0H60V45H0V0Z" fill="#CC0000"/>
+<path d="M0.046875 3.7406H59.9531V7.3406H0.046875V3.7406ZM0.046875 11.1187H59.9531V14.7187H0.046875V11.1187ZM0.046875 18.5062H59.9531V22.1062H0.046875V18.5062Z" fill="white"/>
+<path d="M0 0.046875H30V26.2969H0V0.046875Z" fill="#000066"/>
+<path d="M19.4531 6.91875L20.0156 10.7344L22.1718 7.54688L21.0093 11.2219L24.3374 9.27188L21.7031 12.0844L25.5468 11.7844L21.9562 13.1719L25.5468 14.5594L21.7031 14.2594L24.3374 17.0719L21.0093 15.1219L22.1624 18.8063L20.0062 15.6094L19.4437 19.425L18.8906 15.6094L16.7343 18.7969L17.8968 15.1219L14.5687 17.0719L17.1937 14.2594L13.3499 14.5594L16.9499 13.1719L13.3593 11.7844L17.2031 12.0844L14.5687 9.27188L17.8968 11.2219L16.7343 7.5375L18.8906 10.7344L19.4531 6.91875ZM16.3312 7.07813C15.3164 6.62829 14.2053 6.439 13.0989 6.52744C11.9924 6.61588 10.9255 6.97925 9.99504 7.58457C9.06459 8.18988 8.30004 9.01798 7.77078 9.9937C7.24152 10.9694 6.96432 12.0619 6.96432 13.1719C6.96432 14.2819 7.24152 15.3743 7.77078 16.3501C8.30004 17.3258 9.06459 18.1539 9.99504 18.7592C10.9255 19.3645 11.9924 19.7279 13.0989 19.8163C14.2053 19.9048 15.3164 19.7155 16.3312 19.2656C15.2104 20.0698 13.8897 20.5492 12.5141 20.6513C11.1385 20.7534 9.76136 20.4741 8.53419 19.8443C7.30702 19.2144 6.27733 18.2583 5.55836 17.0811C4.83939 15.9039 4.45898 14.5513 4.45898 13.1719C4.45898 11.7925 4.83939 10.4398 5.55836 9.26266C6.27733 8.08547 7.30702 7.12937 8.53419 6.49949C9.76136 5.86961 11.1385 5.59036 12.5141 5.69245C13.8897 5.79453 15.2104 6.274 16.3312 7.07813Z" fill="#FFCC00"/>
+<path d="M0.046875 25.8938H59.9531V29.4938H0.046875V25.8938ZM0.046875 33.225H59.9531V36.825H0.046875V33.225ZM0 41.4H59.9062V45H0V41.4Z" fill="white"/>
+</g>
+<defs>
+<clipPath id="clip0_1_38983">
+<rect width="60" height="45" fill="white"/>
+</clipPath>
+</defs>
+</svg>
diff --git a/src/assets/img/settings/currencies/nga.svg b/src/assets/img/settings/currencies/nga.svg
new file mode 100644
index 000000000..0db8695d8
--- /dev/null
+++ b/src/assets/img/settings/currencies/nga.svg
@@ -0,0 +1,11 @@
+<svg width="60" height="45" viewBox="0 0 60 45" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g clip-path="url(#clip0_1_39043)">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M0 0H60V45H0V0Z" fill="white"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M39.9938 0H60V45H39.9938V0ZM0 0H19.9969V45H0V0Z" fill="#008753"/>
+</g>
+<defs>
+<clipPath id="clip0_1_39043">
+<rect width="60" height="45" fill="white"/>
+</clipPath>
+</defs>
+</svg>
diff --git a/src/assets/img/settings/currencies/pak.svg b/src/assets/img/settings/currencies/pak.svg
new file mode 100644
index 000000000..37d707196
--- /dev/null
+++ b/src/assets/img/settings/currencies/pak.svg
@@ -0,0 +1,13 @@
+<svg width="60" height="45" viewBox="0 0 60 45" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g clip-path="url(#clip0_1_39738)">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M-3.75586 0H63.7441V45H-3.75586V0Z" fill="#0C590B"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M-3.75586 0H13.1631V45H-3.75586V0Z" fill="white"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M40.0752 19.8105L37.333 19.2305L35.8916 21.6299L35.5928 18.8525L32.8682 18.2197L35.417 17.0771L35.1797 14.291L37.0605 16.3652L39.6357 15.2754L38.2383 17.7012L40.084 19.8105H40.0752Z" fill="white"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M41.1035 26.8945C40.5186 28.1709 39.6871 29.319 38.6569 30.2729C37.6268 31.2268 36.4182 31.9676 35.1007 32.4528C33.7832 32.938 32.3828 33.1579 30.98 33.1C29.5772 33.0421 28.1997 32.7074 26.9267 32.1152C24.344 30.9194 22.342 28.7466 21.3613 26.0748C20.3806 23.4029 20.5014 20.4509 21.6972 17.8682C22.2911 16.5405 23.1562 15.3518 24.237 14.3785C25.3177 13.4052 26.5902 12.6689 27.9726 12.2168C27.6107 12.5181 27.2646 12.8379 26.9355 13.1748C25.2208 15.0738 24.3105 17.5646 24.3966 20.1218C24.4827 22.679 25.5585 25.1028 27.3972 26.8821C29.2358 28.6615 31.6936 29.6573 34.2522 29.6596C36.8109 29.662 39.2704 28.6706 41.1123 26.8945H41.1035Z" fill="white"/>
+</g>
+<defs>
+<clipPath id="clip0_1_39738">
+<rect width="60" height="45" fill="white"/>
+</clipPath>
+</defs>
+</svg>
diff --git a/src/assets/img/settings/currencies/phl.svg b/src/assets/img/settings/currencies/phl.svg
new file mode 100644
index 000000000..bbca901e0
--- /dev/null
+++ b/src/assets/img/settings/currencies/phl.svg
@@ -0,0 +1,13 @@
+<svg width="60" height="45" viewBox="0 0 60 45" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g clip-path="url(#clip0_1_39733)">
+<path d="M0 0H60V22.5H0V0Z" fill="#0038A8"/>
+<path d="M0 22.5H60V45H0V22.5Z" fill="#CE1126"/>
+<path d="M38.9719 22.5L0 45V0" fill="white"/>
+<path d="M2.50313 3.97498L3.84375 5.15623L5.4 4.29373L4.70625 5.93435L6.01875 7.1531L4.2375 7.0031L3.47812 8.6156L3.075 6.88123L1.3125 6.65623L2.84062 5.71873L2.50313 3.97498ZM32.8594 20.1281L32.8969 21.9093L34.5844 22.5L32.8969 23.0812L32.8594 24.8625L31.7812 23.4469L30.075 23.9625L31.0875 22.5L30.075 21.0375L31.7812 21.5531L32.8594 20.1281ZM3.4875 36.3844L4.2375 37.9968L6.01875 37.8469L4.71562 39.0656L5.40938 40.7062L3.85312 39.8531L2.50313 41.0156L2.84062 39.2625L1.3125 38.3437L3.08438 38.1187L3.4875 36.3844ZM14.1937 13.0406L13.6125 13.6219L13.9031 18.0281L13.6219 18.0562L13.0875 14.0344L12.6094 14.5031L13.3219 18.1031C12.7457 18.2165 12.1977 18.4427 11.7094 18.7687L9.675 15.7312H9L11.475 18.9469C11.398 19.0069 11.3229 19.0694 11.25 19.1344L8.33438 15.8062H7.50937V16.6312L10.8281 19.5375L10.6406 19.7719L7.425 17.3062V17.9718L10.4719 20.0062C10.1531 20.4937 9.91875 21.0375 9.80625 21.6187L6.21563 20.9062L5.7375 21.375L9.75937 21.9093C9.74062 22.0031 9.73125 22.1062 9.73125 22.2L5.325 21.9187L4.74375 22.5L5.325 23.0812L9.73125 22.7906L9.75937 23.0812L5.7375 23.6156L6.20625 24.0844L9.80625 23.3718C9.91964 23.948 10.1459 24.496 10.4719 24.9844L7.425 27.0187V27.6937L10.6406 25.2281C10.7007 25.3051 10.7632 25.3802 10.8281 25.4531L7.50937 28.3594V29.1843H8.34375L11.25 25.8656L11.4844 26.0531L9 29.2687H9.675L11.7094 26.2219C12.1875 26.5406 12.7406 26.775 13.3219 26.8875L12.6094 30.4875L13.0781 30.9562L13.6125 26.9343C13.7062 26.9531 13.8 26.9625 13.9031 26.9625L13.6219 31.3687L14.1937 31.95L14.7844 31.3687L14.4938 26.9625L14.775 26.9343L15.3094 30.9656L15.7875 30.4875L15.075 26.8875C15.6511 26.7741 16.1991 26.5479 16.6875 26.2219L18.7219 29.2687H19.3969L16.9219 26.0531C16.9989 25.9931 17.0739 25.9305 17.1469 25.8656L20.0625 29.1843H20.8875V28.3594L17.5687 25.4531L17.7562 25.2281L20.9719 27.6937V27.0187L17.925 24.9844C18.2437 24.5062 18.4781 23.9531 18.5906 23.3718L22.1813 24.0844L22.6594 23.6156L18.6375 23.0812C18.6562 22.9875 18.6656 22.8937 18.6656 22.7906L23.0719 23.0719L23.6531 22.5L23.0719 21.9187L18.6656 22.2L18.6375 21.9187L22.6594 21.3844L22.1906 20.9156L18.5906 21.6187C18.4772 21.0426 18.251 20.4946 17.925 20.0062L20.9719 17.9718V17.3062L17.7562 19.7719C17.6962 19.6948 17.6337 19.6198 17.5687 19.5469L20.8875 16.6406V15.8062H20.0625L17.1562 19.1344C17.0802 19.0693 17.0021 19.0067 16.9219 18.9469L19.3969 15.7312H18.7219L16.6875 18.7687C16.2094 18.45 15.6562 18.2156 15.075 18.1031L15.7875 14.5125L15.3187 14.0437L14.7844 18.0562L14.4938 18.0281L14.775 13.6219L14.1937 13.0406Z" fill="#FCD116"/>
+</g>
+<defs>
+<clipPath id="clip0_1_39733">
+<rect width="60" height="45" fill="white"/>
+</clipPath>
+</defs>
+</svg>
diff --git a/src/assets/img/settings/currencies/pol.svg b/src/assets/img/settings/currencies/pol.svg
new file mode 100644
index 000000000..2e707c067
--- /dev/null
+++ b/src/assets/img/settings/currencies/pol.svg
@@ -0,0 +1,11 @@
+<svg width="60" height="45" viewBox="0 0 60 45" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g clip-path="url(#clip0_1_39745)">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M60 45H0V0H60V45Z" fill="white"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M60 45H0V22.5H60V45Z" fill="#DC143C"/>
+</g>
+<defs>
+<clipPath id="clip0_1_39745">
+<rect width="60" height="45" fill="white"/>
+</clipPath>
+</defs>
+</svg>
diff --git a/src/assets/img/settings/currencies/rub.svg b/src/assets/img/settings/currencies/rus.svg
similarity index 100%
rename from src/assets/img/settings/currencies/rub.svg
rename to src/assets/img/settings/currencies/rus.svg
diff --git a/src/assets/img/settings/currencies/sgd.svg b/src/assets/img/settings/currencies/sgp.svg
similarity index 100%
rename from src/assets/img/settings/currencies/sgd.svg
rename to src/assets/img/settings/currencies/sgp.svg
diff --git a/src/assets/img/settings/currencies/tha.svg b/src/assets/img/settings/currencies/tha.svg
new file mode 100644
index 000000000..fbd5ba069
--- /dev/null
+++ b/src/assets/img/settings/currencies/tha.svg
@@ -0,0 +1,12 @@
+<svg width="60" height="45" viewBox="0 0 60 45" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g clip-path="url(#clip0_1_41727)">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M0 0H60V45H0V0Z" fill="#F4F5F8"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M0 15.2344H60V30.2344H0V15.2344Z" fill="#2D2A4A"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M0 0H60V7.73438H0V0ZM0 37.5H60V45H0V37.5Z" fill="#A51931"/>
+</g>
+<defs>
+<clipPath id="clip0_1_41727">
+<rect width="60" height="45" fill="white"/>
+</clipPath>
+</defs>
+</svg>
diff --git a/src/assets/img/settings/currencies/tur.svg b/src/assets/img/settings/currencies/tur.svg
new file mode 100644
index 000000000..34fac9b7c
--- /dev/null
+++ b/src/assets/img/settings/currencies/tur.svg
@@ -0,0 +1,13 @@
+<svg width="60" height="45" viewBox="0 0 60 45" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g clip-path="url(#clip0_1_41996)">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M0 0H60V45H0V0Z" fill="#E30A17"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M38.1562 23.2031C38.1562 29.4094 33.0375 34.4438 26.7188 34.4438C20.4 34.4438 15.2812 29.4094 15.2812 23.1938C15.2812 16.9781 20.4 11.9625 26.7188 11.9625C33.0375 11.9625 38.1562 16.9969 38.1562 23.2031Z" fill="white"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M38.7188 23.2031C38.7188 28.1719 34.6313 32.1938 29.5782 32.1938C24.5251 32.1938 20.4282 28.1625 20.4282 23.1938C20.4282 18.225 24.5251 14.2125 29.5782 14.2125C34.6313 14.2125 38.7282 18.2344 38.7282 23.2031H38.7188Z" fill="#E30A17"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M40.3782 17.9531L40.2845 22.1062L36.4126 23.1562L40.2376 24.5156L40.1438 28.3312L42.6282 25.35L46.397 26.6625L44.222 23.4656L46.8751 20.2875L42.797 21.4125L40.3782 17.9437V17.9531Z" fill="white"/>
+</g>
+<defs>
+<clipPath id="clip0_1_41996">
+<rect width="60" height="45" fill="white"/>
+</clipPath>
+</defs>
+</svg>
diff --git a/src/assets/img/settings/currencies/twn.svg b/src/assets/img/settings/currencies/twn.svg
new file mode 100644
index 000000000..2d13f22cf
--- /dev/null
+++ b/src/assets/img/settings/currencies/twn.svg
@@ -0,0 +1,34 @@
+<svg width="60" height="45" viewBox="0 0 60 45" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g clip-path="url(#clip0_1_42014)">
+<path d="M0 0H67.5V45H0V0Z" fill="#FF0000"/>
+<path d="M0 0H33.75V22.5H0V0Z" fill="#000095"/>
+<path d="M14.4375 11.8969L14.2031 12.7969L15.0844 13.0406L14.9156 12.375L14.4375 11.8969ZM18.8344 12.375L18.6656 13.0406L19.5469 12.7969L19.3125 11.8969L18.8344 12.375ZM14.9156 10.125L14.4375 10.6031L14.6156 11.25L14.9156 10.125Z" fill="white"/>
+<path d="M14.6156 11.25L14.4375 11.8969L14.9156 12.375L14.6156 11.25Z" fill="white"/>
+<path d="M14.4375 10.6031L13.7906 11.25L14.4375 11.8969L14.6156 11.25L14.4375 10.6031ZM15.75 13.2094L16.2281 13.6875L16.875 13.5094L15.75 13.2094ZM17.5219 13.6875L18.4219 13.9219L18.6656 13.0407L18 13.2094L17.5219 13.6875Z" fill="white"/>
+<path d="M18 13.2094L18.6656 13.0406L18.8344 12.375L18 13.2094ZM15.0844 13.0406L15.3281 13.9219L16.2281 13.6875L15.75 13.2094L15.0844 13.0406ZM16.875 13.5094L17.5219 13.6875L18 13.2094L16.875 13.5094Z" fill="white"/>
+<path d="M16.2281 13.6875L16.875 14.3344L17.5219 13.6875L16.875 13.5094L16.2281 13.6875ZM15.0844 9.45935L14.2031 9.7031L14.4375 10.6031L14.9156 10.125L15.0844 9.45935ZM14.9156 12.375L15.0844 13.0406L15.75 13.2094L14.9156 12.375ZM19.1344 11.25L19.3125 10.6031L18.8344 10.125L19.1344 11.25Z" fill="white"/>
+<path d="M15.75 9.29065L15.0844 9.4594L14.9156 10.125L15.75 9.29065ZM18.8344 10.125L18.6656 9.4594L18 9.29065L18.8344 10.125ZM19.3125 11.8969L19.9594 11.25L19.3125 10.6031L19.1344 11.25L19.3125 11.8969Z" fill="white"/>
+<path d="M18.8344 10.125L18 9.2906L16.875 8.9906L15.75 9.2906L14.9156 10.125L14.6156 11.25L14.9156 12.375L15.75 13.2093L16.875 13.5094L18 13.2093L18.8344 12.375L19.1344 11.25L18.8344 10.125Z" fill="white"/>
+<path d="M18.8344 12.375L19.3125 11.8969L19.1344 11.25L18.8344 12.375ZM19.3125 10.6031L19.5469 9.70312L18.6656 9.45938L18.8344 10.125L19.3125 10.6031ZM18.6656 9.45938L18.4219 8.57812L17.5219 8.8125L18 9.29062L18.6656 9.45938ZM16.2281 8.8125L15.3281 8.57812L15.0844 9.45938L15.75 9.29062L16.2281 8.8125ZM16.875 8.99063L16.2281 8.8125L15.75 9.29062L16.875 8.99063Z" fill="white"/>
+<path d="M17.5219 8.81252L16.875 8.16565L16.2281 8.81252L16.875 8.99065L17.5219 8.81252Z" fill="white"/>
+<path d="M18 9.29062L17.5219 8.8125L16.875 8.99063L18 9.29062ZM16.2281 13.6875L15.3281 13.9219L15.75 15.4781L16.875 14.3344L16.2281 13.6875ZM15.75 15.4781L16.875 19.6875L18 15.4781L16.875 14.3344L15.75 15.4781ZM15.0844 13.0406L14.2031 12.7969L13.7906 14.3344L15.3281 13.9219L15.0844 13.0406Z" fill="white"/>
+<path d="M13.7906 14.3344L12.6656 18.5625L15.75 15.4781L15.3281 13.9219L13.7906 14.3344ZM12.6656 12.375L9.5625 15.4781L13.7906 14.3344L14.2031 12.7969L12.6656 12.375Z" fill="white"/>
+<path d="M14.4375 11.8969L13.7906 11.25L12.6656 12.375L14.2031 12.7969L14.4375 11.8969ZM14.4375 10.6031L14.2031 9.70312L12.6656 10.125L13.7906 11.25L14.4375 10.6031Z" fill="white"/>
+<path d="M12.6656 10.125L8.4375 11.25L12.6656 12.375L13.7906 11.25L12.6656 10.125ZM21.1031 12.375L19.5469 12.7969L19.9594 14.3344L24.1875 15.4781L21.1031 12.375Z" fill="white"/>
+<path d="M18.6656 13.0406L18.4219 13.9219L19.9594 14.3344L19.5469 12.7969L18.6656 13.0406ZM17.5219 13.6875L16.875 14.3344L18 15.4781L18.4219 13.9219L17.5219 13.6875ZM19.3125 11.8969L19.5469 12.7969L21.1031 12.375L19.9594 11.25L19.3125 11.8969Z" fill="white"/>
+<path d="M18 15.4782L21.1031 18.5625L19.9594 14.3344L18.4219 13.9219L18 15.4782ZM18.6656 9.4594L19.5469 9.70315L19.9594 8.16565L18.4219 8.57815L18.6656 9.4594Z" fill="white"/>
+<path d="M21.1031 10.125L24.1875 7.04062L19.9594 8.16562L19.5469 9.70312L21.1031 10.125ZM19.9594 8.16562L21.1031 3.9375L18 7.04062L18.4219 8.57812L19.9594 8.16562ZM21.1031 12.375L25.3125 11.25L21.1031 10.125L19.9594 11.25L21.1031 12.375Z" fill="white"/>
+<path d="M19.3125 10.6031L19.9594 11.25L21.1031 10.125L19.5469 9.70312L19.3125 10.6031ZM15.75 7.04062L12.6656 3.9375L13.7906 8.16562L15.3281 8.57812L15.75 7.04062Z" fill="white"/>
+<path d="M15.0844 9.4594L15.3281 8.57815L13.7906 8.16565L14.2031 9.70315L15.0844 9.4594Z" fill="white"/>
+<path d="M13.7906 8.16565L9.5625 7.04065L12.6656 10.125L14.2031 9.70315L13.7906 8.16565ZM17.5219 8.81252L18.4219 8.57815L18 7.04065L16.875 8.16565L17.5219 8.81252Z" fill="white"/>
+<path d="M18 7.04062L16.875 2.8125L15.75 7.04062L16.875 8.16562L18 7.04062Z" fill="white"/>
+<path d="M16.2281 8.81252L16.875 8.16565L15.75 7.04065L15.3281 8.57815L16.2281 8.81252Z" fill="white"/>
+<path d="M16.875 16.0406C19.5208 16.0406 21.6656 13.8958 21.6656 11.25C21.6656 8.60419 19.5208 6.45935 16.875 6.45935C14.2292 6.45935 12.0844 8.60419 12.0844 11.25C12.0844 13.8958 14.2292 16.0406 16.875 16.0406Z" fill="#000095"/>
+<path d="M16.875 15.4781C19.2101 15.4781 21.1031 13.5851 21.1031 11.25C21.1031 8.91485 19.2101 7.02185 16.875 7.02185C14.5399 7.02185 12.6469 8.91485 12.6469 11.25C12.6469 13.5851 14.5399 15.4781 16.875 15.4781Z" fill="white"/>
+</g>
+<defs>
+<clipPath id="clip0_1_42014">
+<rect width="60" height="45" fill="white"/>
+</clipPath>
+</defs>
+</svg>
diff --git a/src/assets/img/settings/currencies/usd.svg b/src/assets/img/settings/currencies/usa.svg
similarity index 100%
rename from src/assets/img/settings/currencies/usd.svg
rename to src/assets/img/settings/currencies/usa.svg
diff --git a/src/assets/img/settings/currencies/vnm.svg b/src/assets/img/settings/currencies/vnm.svg
new file mode 100644
index 000000000..4561861df
--- /dev/null
+++ b/src/assets/img/settings/currencies/vnm.svg
@@ -0,0 +1,11 @@
+<svg width="60" height="45" viewBox="0 0 60 45" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g clip-path="url(#clip0_1_43151)">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M-3.75 0H63.75V45H-3.75V0Z" fill="#DA251D"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M38.2266 33.4863L30.3516 27.624L22.5293 33.5391L25.4297 23.9062L17.6074 17.9561L27.2842 17.8682L30.29 8.25293L33.3398 17.8418L43.0166 17.8506L35.2383 23.8623L38.2178 33.4951L38.2266 33.4863Z" fill="#FFFF00"/>
+</g>
+<defs>
+<clipPath id="clip0_1_43151">
+<rect width="60" height="45" fill="white"/>
+</clipPath>
+</defs>
+</svg>
diff --git a/src/assets/img/settings/currencies/zaf.svg b/src/assets/img/settings/currencies/zaf.svg
new file mode 100644
index 000000000..49ee153be
--- /dev/null
+++ b/src/assets/img/settings/currencies/zaf.svg
@@ -0,0 +1,15 @@
+<svg width="60" height="45" viewBox="0 0 60 45" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g clip-path="url(#clip0_1_43198)">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M-0.000488603 35.841V9.17554L19.8536 22.5083L-0.00927734 35.841H-0.000488603Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M13.5432 45.0077L35.8318 30.0139H67.4893V44.9989H13.5432V45.0077Z" fill="#0000CC"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M12.1194 -1.50269e-06H67.4893V15.0114H35.823C35.823 15.0114 12.4094 -0.149412 12.1194 -1.50269e-06Z" fill="#FF0000"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M-0.000488603 5.62488V9.17558L19.8536 22.4995L-0.00927734 35.841V39.3829L24.9951 22.5083L-0.00927734 5.62488H-0.000488603Z" fill="#FFCC00"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M-0.000488281 5.62488V0H8.34894L34.821 17.9293H67.4981V27.0873H34.821L8.34015 44.999H-0.000488281V39.3829L24.9951 22.5083L0.00830046 5.62488H-0.000488281Z" fill="#009933"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M8.34021 0H13.5432L35.8318 15.0026H67.4893V17.9293H34.8211L8.34021 0.00878888V0ZM8.34021 45.0078H13.5432L35.8318 30.014H67.4893V27.0961H34.8211L8.34021 44.999V45.0078Z" fill="white"/>
+</g>
+<defs>
+<clipPath id="clip0_1_43198">
+<rect width="60" height="45" fill="white"/>
+</clipPath>
+</defs>
+</svg>
diff --git a/src/common/types/ledger.ts b/src/common/types/ledger.ts
index 2ed0fe32f..5022b9df3 100644
--- a/src/common/types/ledger.ts
+++ b/src/common/types/ledger.ts
@@ -1,14 +1,8 @@
 import type { StacksRecipient } from '@secretkeylabs/xverse-core';
 import BigNumber from 'bignumber.js';
 
-export type LedgerTransactionType = 'BTC' | 'STX' | 'ORDINALS' | 'BRC-20';
-
-type ConfirmLedgerTransactionState = {
-  type: LedgerTransactionType;
-  fee: BigNumber;
-};
-
-export type ConfirmStxTransactionState = ConfirmLedgerTransactionState & {
+export type ConfirmStxTransactionState = {
   recipients: StacksRecipient[];
   unsignedTx: Buffer;
+  fee: BigNumber;
 };
diff --git a/src/locales/en.json b/src/locales/en.json
index 4b4f26136..470eec381 100644
--- a/src/locales/en.json
+++ b/src/locales/en.json
@@ -106,10 +106,10 @@
     "LEARN_MORE": "Learn More",
     "LEDGER_BEFORE_GETTING_STARTED": {
       "TITLE": "Before getting started",
-      "DESCRIPTION": "Do you use Ledger Live with the hardware wallet device you wish to connect?",
+      "DESCRIPTION": "Please select one of the following options to continue.",
       "OPTIONS": {
-        "USE_LEDGER_LIVE": "I use Ledger Live with the device.",
-        "DONT_USE_LEDGER_LIVE": "I do not use Ledger Live with the device."
+        "USE_LEDGER_LIVE": "I am using Ledger Live with this device.",
+        "DONT_USE_LEDGER_LIVE": "I am not using Ledger Live with this device."
       },
       "IMPORTANT_WARNING": {
         "TITLE": "Important - Please read",
@@ -198,7 +198,8 @@
     "SEND_ORDINAL": "Send ordinal",
     "CONFIRM_FEES": "Confirm fees",
     "RETRY_BUTTON": "Try again",
-    "FEES": "Fees"
+    "FEES": "Fees",
+    "AMOUNT": "Amount"
   },
   "DASHBOARD_SCREEN": {
     "TOTAL_BALANCE": "total balance",
@@ -348,6 +349,7 @@
     "BUNDLE_PLUS_FEES": "Bundle size + fees",
     "REVIEW_TRANSACTION": "Review transaction",
     "SIGN_TRANSACTIONS": "Sign {{count}} transactions",
+    "SIGN_TRANSACTION": "Sign transaction",
     "AMOUNT": "Amount",
     "INSUFFICIENT_BALANCE": "Insufficient balance",
     "YOUR_ADDRESS": "My address",
@@ -1006,7 +1008,7 @@
     "SWAP": "Swap",
     "BUY": "Buy",
     "LIST": "List",
-    "TRANSACTION_HISTORY_TITLE": "Transaction history",
+    "TRANSACTION_HISTORY_TITLE": "Transactions",
     "TRANSACTIONS_LIST_EMPTY": "No transactions found.",
     "TRANSACTIONS_LIST_ERROR": "Error fetching transaction history for this token",
     "TRANSACTION_SENT": "Sent",
diff --git a/tests/specs/transactionHistory.spec.ts b/tests/specs/transactionHistory.spec.ts
index 3d1b6e16d..51b4918c2 100644
--- a/tests/specs/transactionHistory.spec.ts
+++ b/tests/specs/transactionHistory.spec.ts
@@ -80,7 +80,7 @@ test.describe('Transaction', () => {
     await wallet.checkAndClickOnSpecificRune('SKIBIDI•OHIO•RIZZ');
     const originalBalanceAmount = await wallet.checkVisualsRunesDashboard('SKIBIDI•OHIO•RIZZ');
     await expect(originalBalanceAmount).toBeGreaterThan(0);
-    await expect(wallet.containerTransactionHistory.first()).toBeVisible();
+    await expect(wallet.containerTransactionHistory.first()).toBeHidden();
     // There should be at least one transaction visible
     await expect(await wallet.containerTransactionHistory.count()).toBeGreaterThanOrEqual(1);
     // check able to see rune bundles

From c4ac817282a98bc74dcfb142c632b556fb45ca73 Mon Sep 17 00:00:00 2001
From: Denys Hriaznov <hriaznov.dev@gmail.com>
Date: Wed, 9 Oct 2024 17:35:16 +0200
Subject: [PATCH 174/227] Merge branch 'develop' of
 github.com:secretkeylabs/xverse-web-extension-private into release/v0.43.2


From 982ccbd776e69024b8da2fc06d61238ee405dd40 Mon Sep 17 00:00:00 2001
From: Tim Man <tim@secretkeylabs.com>
Date: Fri, 11 Oct 2024 20:28:48 +0800
Subject: [PATCH 175/227] [ENG-5185] change sip10 tokens to default on, if seen
 on swaps provider lists (#613)

---
 package-lock.json                             |  14 +-
 package.json                                  |   2 +-
 .../transactions/transactionAmount.tsx        |   2 +-
 .../transactions/transactionTitle.tsx         |   2 +-
 .../components/transactions/txTransfers.tsx   |   2 +-
 .../ordinals/useGetBrc20FungibleTokens.ts     |  56 ++--
 .../runes/useRuneFungibleTokensQuery.ts       |  75 +++--
 .../queries/stx/useGetSip10FungibleTokens.ts  | 117 +++----
 .../hooks/queries/stx/useGetSip10TokenInfo.ts |   3 +-
 src/app/hooks/queries/useAccountBalance.ts    |  42 ++-
 src/app/screens/coinDashboard/index.tsx       |   6 +-
 src/app/screens/home/balanceCard/index.tsx    |   6 +-
 src/app/screens/home/index.tsx                |  68 ++--
 src/app/screens/listRune/index.tsx            |   2 +-
 src/app/screens/manageTokens/index.tsx        |  72 ++--
 src/app/screens/sendStx/index.tsx             |   2 +-
 .../tokenFromBottomSheet/useFromTokens.ts     |   4 +-
 .../tokenToBottomSheet/useToTokens.ts         |  23 +-
 src/app/screens/swap/index.tsx                |   6 +-
 src/app/screens/swap/useMasterCoinsList.tsx   |   2 +-
 .../swap/useVisibleMasterCoinsList.tsx        |  14 +-
 src/app/screens/unlistRune/index.tsx          |   2 +-
 src/app/stores/index.ts                       |   4 +-
 src/app/utils/helper.ts                       |  14 +-
 tests/pages/wallet.ts                         | 103 +++---
 tests/specs/managementAccount.spec.ts         |  14 +-
 tests/specs/managementToken.spec.ts           | 307 +++++-------------
 tests/specs/transactionHistory.spec.ts        |   9 +-
 28 files changed, 407 insertions(+), 566 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index a08062fb3..7d7c77fb0 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -14,7 +14,7 @@
         "@playwright/test": "1.46.1",
         "@react-spring/web": "^9.6.1",
         "@sats-connect/core": "0.3.0",
-        "@secretkeylabs/xverse-core": "24.1.0",
+        "@secretkeylabs/xverse-core": "24.2.0",
         "@stacks/connect": "7.4.1",
         "@stacks/stacks-blockchain-api-types": "6.1.1",
         "@stacks/transactions": "6.16.1",
@@ -1270,9 +1270,9 @@
       }
     },
     "node_modules/@secretkeylabs/xverse-core": {
-      "version": "24.1.0",
-      "resolved": "https://npm.pkg.github.com/download/@secretkeylabs/xverse-core/24.1.0/0c57f062dd3c9444e284d101756658251fd8681d",
-      "integrity": "sha512-cc01cykJV5YQhAc09VHwD8Iw7voQ+lqBzZWMJ+B5EXasi97O+dEP80JQs2RCpV2MfdsakZO+9JCweP331UqUbw==",
+      "version": "24.2.0",
+      "resolved": "https://npm.pkg.github.com/download/@secretkeylabs/xverse-core/24.2.0/67ae914442d4276dcfd0d1e3b8bdf623133557bb",
+      "integrity": "sha512-mBxIPL6jmGhRZLpUBL0ztTvBporCL/1CzTsz42/XZo7WFZIFfb1Arj2oQkeT+AngV+bf1CH60cV2vXnqH0mYkQ==",
       "license": "ISC",
       "dependencies": {
         "@bitcoinerlab/secp256k1": "^1.0.2",
@@ -13635,9 +13635,9 @@
       }
     },
     "@secretkeylabs/xverse-core": {
-      "version": "24.1.0",
-      "resolved": "https://npm.pkg.github.com/download/@secretkeylabs/xverse-core/24.1.0/0c57f062dd3c9444e284d101756658251fd8681d",
-      "integrity": "sha512-cc01cykJV5YQhAc09VHwD8Iw7voQ+lqBzZWMJ+B5EXasi97O+dEP80JQs2RCpV2MfdsakZO+9JCweP331UqUbw==",
+      "version": "24.2.0",
+      "resolved": "https://npm.pkg.github.com/download/@secretkeylabs/xverse-core/24.2.0/67ae914442d4276dcfd0d1e3b8bdf623133557bb",
+      "integrity": "sha512-mBxIPL6jmGhRZLpUBL0ztTvBporCL/1CzTsz42/XZo7WFZIFfb1Arj2oQkeT+AngV+bf1CH60cV2vXnqH0mYkQ==",
       "requires": {
         "@bitcoinerlab/secp256k1": "^1.0.2",
         "@noble/curves": "^1.2.0",
diff --git a/package.json b/package.json
index 5de46c2ca..a7ad4f339 100644
--- a/package.json
+++ b/package.json
@@ -42,7 +42,7 @@
     "@playwright/test": "1.46.1",
     "@react-spring/web": "^9.6.1",
     "@sats-connect/core": "0.3.0",
-    "@secretkeylabs/xverse-core": "24.1.0",
+    "@secretkeylabs/xverse-core": "24.2.0",
     "@stacks/connect": "7.4.1",
     "@stacks/stacks-blockchain-api-types": "6.1.1",
     "@stacks/transactions": "6.16.1",
diff --git a/src/app/components/transactions/transactionAmount.tsx b/src/app/components/transactions/transactionAmount.tsx
index f84201d05..7911eaa03 100644
--- a/src/app/components/transactions/transactionAmount.tsx
+++ b/src/app/components/transactions/transactionAmount.tsx
@@ -33,7 +33,7 @@ const TransactionValue = styled.p((props) => ({
 
 export default function TransactionAmount(props: TransactionAmountProps): JSX.Element | null {
   const { transaction, currency, protocol, tokenSymbol } = props;
-  const { visible: sip10CoinsList } = useVisibleSip10FungibleTokens();
+  const { data: sip10CoinsList } = useVisibleSip10FungibleTokens();
   if (currency === 'STX' || (currency === 'FT' && protocol === 'stacks')) {
     const stxTransaction = transaction as StxTransactionData;
     if (stxTransaction.txType === 'token_transfer') {
diff --git a/src/app/components/transactions/transactionTitle.tsx b/src/app/components/transactions/transactionTitle.tsx
index cfd70607e..2f757181e 100644
--- a/src/app/components/transactions/transactionTitle.tsx
+++ b/src/app/components/transactions/transactionTitle.tsx
@@ -29,7 +29,7 @@ const TransactionTitleText = styled.p((props) => ({
 export default function TransactionTitle(props: TransactionTitleProps) {
   const { transaction } = props;
   const { t } = useTranslation('translation', { keyPrefix: 'COIN_DASHBOARD_SCREEN' });
-  const { visible: sip10CoinsList } = useVisibleSip10FungibleTokens();
+  const { data: sip10CoinsList } = useVisibleSip10FungibleTokens();
 
   const getTokenTransferTitle = (
     tx: StxTransactionData | BtcTransactionData | Brc20HistoryTransactionData,
diff --git a/src/app/components/transactions/txTransfers.tsx b/src/app/components/transactions/txTransfers.tsx
index 18d1d79c9..34cb6edda 100644
--- a/src/app/components/transactions/txTransfers.tsx
+++ b/src/app/components/transactions/txTransfers.tsx
@@ -60,7 +60,7 @@ interface TxTransfersProps {
 export default function TxTransfers(props: TxTransfersProps) {
   const { transaction, coin, txFilter } = props;
   const selectedAccount = useSelectedAccount();
-  const { visible: sip10CoinsList } = useVisibleSip10FungibleTokens();
+  const { data: sip10CoinsList } = useVisibleSip10FungibleTokens();
   const { t } = useTranslation('translation', { keyPrefix: 'COIN_DASHBOARD_SCREEN' });
 
   function formatAddress(addr: string): string {
diff --git a/src/app/hooks/queries/ordinals/useGetBrc20FungibleTokens.ts b/src/app/hooks/queries/ordinals/useGetBrc20FungibleTokens.ts
index 7d30bdafb..9fd844ab9 100644
--- a/src/app/hooks/queries/ordinals/useGetBrc20FungibleTokens.ts
+++ b/src/app/hooks/queries/ordinals/useGetBrc20FungibleTokens.ts
@@ -2,13 +2,14 @@ import useSelectedAccount from '@hooks/useSelectedAccount';
 import useWalletSelector from '@hooks/useWalletSelector';
 import {
   getBrc20Tokens,
+  getFungibleTokenStates,
   getOrdinalsFtBalance,
   type Brc20Token,
   type FungibleToken,
+  type FungibleTokenWithStates,
   type SettingsNetwork,
 } from '@secretkeylabs/xverse-core';
 import { useQuery } from '@tanstack/react-query';
-import BigNumber from 'bignumber.js';
 
 const brc20TokenToFungibleToken = (coin: Brc20Token): FungibleToken => ({
   name: coin.name,
@@ -17,7 +18,6 @@ const brc20TokenToFungibleToken = (coin: Brc20Token): FungibleToken => ({
   total_sent: '',
   total_received: '',
   assetName: coin.name ?? coin.ticker,
-  visible: true,
   ticker: coin.ticker,
   protocol: 'brc-20',
   supported: coin.supported,
@@ -54,40 +54,38 @@ export const fetchBrc20FungibleTokens =
       );
   };
 
-export const useGetBrc20FungibleTokens = () => {
+export const useGetBrc20FungibleTokens = (select?: (data: FungibleTokenWithStates[]) => any) => {
   const { ordinalsAddress } = useSelectedAccount();
-  const { fiatCurrency, network, spamTokens, showSpamTokens } = useWalletSelector();
+  const { brc20ManageTokens, fiatCurrency, network, spamTokens, showSpamTokens } =
+    useWalletSelector();
+
   const queryFn = fetchBrc20FungibleTokens(ordinalsAddress, fiatCurrency, network);
+  const selectWithDerivedState = (data: FungibleToken[]) => {
+    const withDerivedState = data.map(
+      (ft: FungibleToken) =>
+        ({
+          ...ft,
+          ...getFungibleTokenStates({
+            fungibleToken: ft,
+            manageTokens: brc20ManageTokens,
+            spamTokens,
+            showSpamTokens,
+          }),
+        } as FungibleTokenWithStates),
+    );
+    return select ? select(withDerivedState) : withDerivedState;
+  };
 
-  const query = useQuery({
+  return useQuery({
     queryKey: ['brc20-fungible-tokens', ordinalsAddress, network.type, fiatCurrency],
     queryFn,
     enabled: Boolean(network && ordinalsAddress),
+    select: selectWithDerivedState,
   });
-
-  return {
-    ...query,
-    unfilteredData: query.data,
-    data: query.data?.filter((ft) => {
-      let passedSpamCheck = true;
-      if (spamTokens?.length) {
-        passedSpamCheck = showSpamTokens || !spamTokens.includes(ft.principal);
-      }
-      return passedSpamCheck;
-    }),
-  };
 };
 
-export const useVisibleBrc20FungibleTokens = (): ReturnType<typeof useGetBrc20FungibleTokens> & {
-  visible: FungibleToken[];
-} => {
-  const { brc20ManageTokens } = useWalletSelector();
-  const brc20Query = useGetBrc20FungibleTokens();
-  return {
-    ...brc20Query,
-    visible: (brc20Query.data ?? []).filter((ft) => {
-      const userSetting = brc20ManageTokens[ft.principal];
-      return userSetting === true || (userSetting === undefined && new BigNumber(ft.balance).gt(0));
-    }),
-  };
+// convenience hook to get only enabled brc20 fungible tokens
+export const useVisibleBrc20FungibleTokens = () => {
+  const selectEnabled = (data: FungibleTokenWithStates[]) => data.filter((ft) => ft.isEnabled);
+  return useGetBrc20FungibleTokens(selectEnabled);
 };
diff --git a/src/app/hooks/queries/runes/useRuneFungibleTokensQuery.ts b/src/app/hooks/queries/runes/useRuneFungibleTokensQuery.ts
index e9526fe33..e11dc6dc5 100644
--- a/src/app/hooks/queries/runes/useRuneFungibleTokensQuery.ts
+++ b/src/app/hooks/queries/runes/useRuneFungibleTokensQuery.ts
@@ -1,10 +1,12 @@
 import useRunesApi from '@hooks/apiClients/useRunesApi';
-import useHasFeature from '@hooks/useHasFeature';
 import useSelectedAccount from '@hooks/useSelectedAccount';
 import useWalletSelector from '@hooks/useWalletSelector';
-import { FeatureId, type FungibleToken } from '@secretkeylabs/xverse-core';
+import {
+  getFungibleTokenStates,
+  type FungibleToken,
+  type FungibleTokenWithStates,
+} from '@secretkeylabs/xverse-core';
 import { useQuery } from '@tanstack/react-query';
-import BigNumber from 'bignumber.js';
 
 export const fetchRuneBalances =
   (
@@ -31,47 +33,44 @@ export const fetchRuneBalances =
     }
   };
 
-export const useRuneFungibleTokensQuery = (backgroundRefetch = true) => {
+export const useRuneFungibleTokensQuery = (
+  select?: (data: FungibleTokenWithStates[]) => any,
+  backgroundRefetch = true,
+) => {
   const { ordinalsAddress } = useSelectedAccount();
-  const { network, fiatCurrency, spamTokens, showSpamTokens } = useWalletSelector();
-  const showRunes = useHasFeature(FeatureId.RUNES_SUPPORT);
+  const { runesManageTokens, network, fiatCurrency, spamTokens, showSpamTokens } =
+    useWalletSelector();
   const runesApi = useRunesApi();
+
   const queryFn = fetchRuneBalances(runesApi, ordinalsAddress, fiatCurrency);
-  const query = useQuery({
+  const selectWithDerivedState = (data: FungibleToken[]) => {
+    const withDerivedState = data.map(
+      (ft: FungibleToken) =>
+        ({
+          ...ft,
+          ...getFungibleTokenStates({
+            fungibleToken: ft,
+            manageTokens: runesManageTokens,
+            spamTokens,
+            showSpamTokens,
+          }),
+        } as FungibleTokenWithStates),
+    );
+    return select ? select(withDerivedState) : withDerivedState;
+  };
+
+  return useQuery({
     queryKey: ['get-rune-fungible-tokens', network.type, ordinalsAddress, fiatCurrency],
-    enabled: Boolean(network && ordinalsAddress && showRunes),
-    refetchOnWindowFocus: backgroundRefetch,
-    refetchOnReconnect: backgroundRefetch,
     queryFn,
+    enabled: Boolean(network && ordinalsAddress),
+    select: selectWithDerivedState,
+    refetchOnWindowFocus: !!backgroundRefetch,
+    refetchOnReconnect: !!backgroundRefetch,
   });
-  return {
-    ...query,
-    unfilteredData: query.data,
-    data: query.data?.filter((ft) => {
-      let passedSpamCheck = true;
-      if (spamTokens?.length) {
-        passedSpamCheck = showSpamTokens || !spamTokens.includes(ft.principal);
-      }
-      return passedSpamCheck;
-    }),
-  };
 };
 
-/*
- * This hook is used to get the list of runes which the user has not hidden
- */
-export const useVisibleRuneFungibleTokens = (
-  backgroundRefetch = true,
-): ReturnType<typeof useRuneFungibleTokensQuery> & {
-  visible: FungibleToken[];
-} => {
-  const { runesManageTokens } = useWalletSelector();
-  const runesQuery = useRuneFungibleTokensQuery(backgroundRefetch);
-  return {
-    ...runesQuery,
-    visible: (runesQuery.data ?? []).filter((ft) => {
-      const userSetting = runesManageTokens[ft.principal];
-      return userSetting === true || (userSetting === undefined && new BigNumber(ft.balance).gt(0));
-    }),
-  };
+// convenience hook to get only enabled rune fungible tokens
+export const useVisibleRuneFungibleTokens = (backgroundRefetch = true) => {
+  const selectEnabled = (data: FungibleTokenWithStates[]) => data.filter((ft) => ft.isEnabled);
+  return useRuneFungibleTokensQuery(selectEnabled, backgroundRefetch);
 };
diff --git a/src/app/hooks/queries/stx/useGetSip10FungibleTokens.ts b/src/app/hooks/queries/stx/useGetSip10FungibleTokens.ts
index 93203de73..88e810de2 100644
--- a/src/app/hooks/queries/stx/useGetSip10FungibleTokens.ts
+++ b/src/app/hooks/queries/stx/useGetSip10FungibleTokens.ts
@@ -3,14 +3,14 @@ import useSelectedAccount from '@hooks/useSelectedAccount';
 import useWalletSelector from '@hooks/useWalletSelector';
 import {
   StacksNetwork,
-  // getCoinMetaData,
-  getCoinsInfo,
   getFtData,
+  getFungibleTokenStates,
+  getXverseApiClient,
   type FungibleToken,
+  type FungibleTokenWithStates,
   type SettingsNetwork,
 } from '@secretkeylabs/xverse-core';
 import { useQuery } from '@tanstack/react-query';
-import BigNumber from 'bignumber.js';
 
 export const fetchSip10FungibleTokens =
   (
@@ -18,47 +18,32 @@ export const fetchSip10FungibleTokens =
     fiatCurrency: string,
     network: SettingsNetwork,
     currentNetworkInstance: StacksNetwork,
-  ) =>
+  ): (() => Promise<FungibleToken[]>) =>
   async () => {
-    // get sip10 metadata and balances for the stxAddress
     const sip10Balances = await getFtData(stxAddress, currentNetworkInstance);
+    const sip10ContractInfos =
+      (await getXverseApiClient(network.type).getSip10Tokens(
+        sip10Balances.map((ft) => ft.principal),
+        fiatCurrency,
+      )) || [];
 
-    // getting contract ids of all fts
-    const contractids: string[] = sip10Balances.map((ft) => ft.principal);
-    const sip10ContractInfos = (await getCoinsInfo(network.type, contractids, fiatCurrency)) || [];
-
-    // combine
-    return sip10Balances
-      .map((ft) => {
-        const found = (sip10ContractInfos || []).find((coin) => coin.contract === ft.principal);
-        if (!found) {
-          return ft;
-        }
-        return {
-          ...ft,
-          ...found,
-          visible: true,
-          name: found.name || ft.principal.split('.')[1],
-        };
-      })
-      .concat(
-        sip10ContractInfos
-          .filter((coin) => !sip10Balances.some((ft) => ft.principal === coin.contract))
-          .map((coin) => ({
-            ...coin,
-            principal: coin.contract,
-            assetName: coin.name || coin.contract.split('.')[1],
-            protocol: 'stacks',
-            balance: '0',
-            total_sent: '',
-            total_received: '',
-          })),
-      );
+    return sip10Balances.map((ft) => {
+      const found = sip10ContractInfos.find((coin) => coin.contract === ft.principal);
+      if (!found) {
+        return ft;
+      }
+      return {
+        ...ft,
+        ...found,
+        name: found.name || ft.principal.split('.')[1],
+      };
+    });
   };
 
-export const useGetSip10FungibleTokens = () => {
+export const useGetSip10FungibleTokens = (select?: (data: FungibleTokenWithStates[]) => any) => {
   const { stxAddress } = useSelectedAccount();
-  const { fiatCurrency, network, spamTokens, showSpamTokens } = useWalletSelector();
+  const { sip10ManageTokens, fiatCurrency, network, spamTokens, showSpamTokens } =
+    useWalletSelector();
   const currentNetworkInstance = useNetworkSelector();
 
   const queryFn = fetchSip10FungibleTokens(
@@ -67,46 +52,32 @@ export const useGetSip10FungibleTokens = () => {
     network,
     currentNetworkInstance,
   );
+  const selectWithDerivedState = (data: FungibleToken[]) => {
+    const withDerivedState = data.map(
+      (ft: FungibleToken) =>
+        ({
+          ...ft,
+          ...getFungibleTokenStates({
+            fungibleToken: ft,
+            manageTokens: sip10ManageTokens,
+            spamTokens,
+            showSpamTokens,
+          }),
+        } as FungibleTokenWithStates),
+    );
+    return select ? select(withDerivedState) : withDerivedState;
+  };
 
-  const query = useQuery({
+  return useQuery({
     queryKey: ['sip10-fungible-tokens', network.type, stxAddress, fiatCurrency],
     queryFn,
     enabled: Boolean(network && stxAddress),
+    select: selectWithDerivedState,
   });
-
-  return {
-    ...query,
-    unfilteredData: query.data,
-    data: query.data?.filter((ft) => {
-      let passedSpamCheck = true;
-      if (spamTokens?.length) {
-        passedSpamCheck = showSpamTokens || !spamTokens.includes(ft.principal);
-      }
-      return passedSpamCheck;
-    }),
-  };
 };
 
-export const useVisibleSip10FungibleTokens = (): ReturnType<typeof useGetSip10FungibleTokens> & {
-  visible: FungibleToken[];
-} => {
-  const { sip10ManageTokens } = useWalletSelector();
-  const sip10Query = useGetSip10FungibleTokens();
-  // set visible false for unsupported tokens
-  const sip10FTList = sip10Query.data || [];
-  sip10FTList.forEach((ft) => {
-    ft.visible = !!ft.supported;
-  });
-
-  return {
-    ...sip10Query,
-    visible: sip10FTList.filter((ft) => {
-      const userSetting = sip10ManageTokens[ft.principal];
-
-      return (
-        userSetting === true ||
-        (userSetting === undefined && ft.supported && new BigNumber(ft.balance).gt(0))
-      );
-    }),
-  };
+// convenience hook to get only enabled sip10 fungible tokens
+export const useVisibleSip10FungibleTokens = () => {
+  const selectEnabled = (data: FungibleTokenWithStates[]) => data.filter((ft) => ft.isEnabled);
+  return useGetSip10FungibleTokens(selectEnabled);
 };
diff --git a/src/app/hooks/queries/stx/useGetSip10TokenInfo.ts b/src/app/hooks/queries/stx/useGetSip10TokenInfo.ts
index 3f621bbce..959c332c3 100644
--- a/src/app/hooks/queries/stx/useGetSip10TokenInfo.ts
+++ b/src/app/hooks/queries/stx/useGetSip10TokenInfo.ts
@@ -15,11 +15,10 @@ const useGetSip10TokenInfo = ({
 
   const fetchTokensInfo = async () => {
     if (principal) {
-      const coinsInfo = await xverseApiClient.getCoinsInfo(
+      const coinsInfo = await xverseApiClient.getSip10Tokens(
         [principal],
         fiatCurrency ?? defaultFiatCurrency,
       );
-
       const tokenInfo = coinsInfo.find((coin) => coin.contract === principal);
       return tokenInfo;
     }
diff --git a/src/app/hooks/queries/useAccountBalance.ts b/src/app/hooks/queries/useAccountBalance.ts
index 9baa4b6ee..627bae3f7 100644
--- a/src/app/hooks/queries/useAccountBalance.ts
+++ b/src/app/hooks/queries/useAccountBalance.ts
@@ -5,9 +5,11 @@ import useNetworkSelector from '@hooks/useNetwork';
 import useWalletSelector from '@hooks/useWalletSelector';
 import {
   API_TIMEOUT_MILLI,
+  getFungibleTokenStates,
   type Account,
   type BtcAddressData,
   type FungibleToken,
+  type FungibleTokenWithStates,
   type TokensResponse,
 } from '@secretkeylabs/xverse-core';
 import { setAccountBalanceAction } from '@stores/wallet/actions/actionCreators';
@@ -30,6 +32,8 @@ const useAccountBalance = () => {
     brc20ManageTokens,
     sip10ManageTokens,
     runesManageTokens,
+    spamTokens,
+    showSpamTokens,
   } = useWalletSelector();
   const { btcFiatRate, stxBtcRate } = useSupportedCoinRates();
   const runesApi = useRunesApi();
@@ -38,6 +42,17 @@ const useAccountBalance = () => {
   const [isProcessingQueue, setIsProcessingQueue] = useState(false);
   const [queueLength, setQueueLength] = useState(0);
 
+  const withDerivedState = (ft: FungibleToken) =>
+    ({
+      ...ft,
+      ...getFungibleTokenStates({
+        fungibleToken: ft,
+        manageTokens: sip10ManageTokens,
+        spamTokens,
+        showSpamTokens,
+      }),
+    } as FungibleTokenWithStates);
+
   const fetchBalances = async (account: Account | null) => {
     if (!account) {
       return;
@@ -45,9 +60,9 @@ const useAccountBalance = () => {
 
     let btcBalance = '0';
     let stxBalance = '0';
-    let finalSipCoinsList: FungibleToken[] = [];
-    let finalBrcCoinsList: FungibleToken[] = [];
-    let finalRunesCoinsList: FungibleToken[] = [];
+    let finalSipCoinsList: FungibleTokenWithStates[] = [];
+    let finalBrcCoinsList: FungibleTokenWithStates[] = [];
+    let finalRunesCoinsList: FungibleTokenWithStates[] = [];
 
     try {
       if (account.btcAddress) {
@@ -61,15 +76,13 @@ const useAccountBalance = () => {
           fiatCurrency,
           network,
         );
-        finalBrcCoinsList = (await fetchBrc20Balances()).filter((ft) => {
-          const setting = brc20ManageTokens[ft.principal];
-          return setting === true || (setting === undefined && new BigNumber(ft.balance).gt(0));
-        });
+        finalBrcCoinsList = (await fetchBrc20Balances())
+          .map(withDerivedState)
+          .filter((ft) => ft.isEnabled);
         const runeBalances = fetchRuneBalances(runesApi, account.ordinalsAddress, fiatCurrency);
-        finalRunesCoinsList = (await runeBalances()).filter((ft) => {
-          const setting = runesManageTokens[ft.principal];
-          return setting === true || (setting === undefined && new BigNumber(ft.balance).gt(0));
-        });
+        finalRunesCoinsList = (await runeBalances())
+          .map(withDerivedState)
+          .filter((ft) => ft.isEnabled);
       }
       if (account.stxAddress) {
         const apiUrl = `${stacksNetwork.coreApiUrl}/extended/v1/address/${account.stxAddress}/balances`;
@@ -88,10 +101,9 @@ const useAccountBalance = () => {
           network,
           stacksNetwork,
         );
-        finalSipCoinsList = (await fetchSip10Balances()).filter((ft) => {
-          const setting = sip10ManageTokens[ft.principal];
-          return setting === true || (setting === undefined && new BigNumber(ft.balance).gt(0));
-        });
+        finalSipCoinsList = (await fetchSip10Balances())
+          .map(withDerivedState)
+          .filter((ft) => ft.isEnabled);
       }
     } catch (error) {
       console.error('Failed to fetch balances:', error);
diff --git a/src/app/screens/coinDashboard/index.tsx b/src/app/screens/coinDashboard/index.tsx
index 13df8e350..490ba015b 100644
--- a/src/app/screens/coinDashboard/index.tsx
+++ b/src/app/screens/coinDashboard/index.tsx
@@ -166,9 +166,9 @@ export default function CoinDashboard() {
   const { addToSpamTokens } = useSpamTokens();
   const dispatch = useDispatch();
   const { currency } = useParams();
-  const { visible: runesCoinsList } = useVisibleRuneFungibleTokens();
-  const { visible: sip10CoinsList } = useVisibleSip10FungibleTokens();
-  const { visible: brc20CoinsList } = useVisibleBrc20FungibleTokens();
+  const { data: runesCoinsList } = useVisibleRuneFungibleTokens();
+  const { data: sip10CoinsList } = useVisibleSip10FungibleTokens();
+  const { data: brc20CoinsList } = useVisibleBrc20FungibleTokens();
 
   let selectedFt: FungibleToken | undefined;
 
diff --git a/src/app/screens/home/balanceCard/index.tsx b/src/app/screens/home/balanceCard/index.tsx
index 65f86d119..be2e94dd8 100644
--- a/src/app/screens/home/balanceCard/index.tsx
+++ b/src/app/screens/home/balanceCard/index.tsx
@@ -80,9 +80,9 @@ function BalanceCard(props: BalanceCardProps) {
   const { setAccountBalance } = useAccountBalance();
   const { isLoading, isRefetching } = props;
   const oldTotalBalance = accountBalances[selectedAccount.btcAddress];
-  const { visible: sip10CoinsList } = useVisibleSip10FungibleTokens();
-  const { visible: brc20CoinsList } = useVisibleBrc20FungibleTokens();
-  const { visible: runesCoinList } = useVisibleRuneFungibleTokens();
+  const { data: sip10CoinsList } = useVisibleSip10FungibleTokens();
+  const { data: brc20CoinsList } = useVisibleBrc20FungibleTokens();
+  const { data: runesCoinList } = useVisibleRuneFungibleTokens();
 
   const balance = calculateTotalBalance({
     stxBalance: stxData?.balance.toString() ?? '0',
diff --git a/src/app/screens/home/index.tsx b/src/app/screens/home/index.tsx
index 788b12f33..455a2f3f5 100644
--- a/src/app/screens/home/index.tsx
+++ b/src/app/screens/home/index.tsx
@@ -10,9 +10,18 @@ import ReceiveCardComponent from '@components/receiveCardComponent';
 import ShowBtcReceiveAlert from '@components/showBtcReceiveAlert';
 import ShowOrdinalReceiveAlert from '@components/showOrdinalReceiveAlert';
 import BottomBar from '@components/tabBar';
-import { useVisibleBrc20FungibleTokens } from '@hooks/queries/ordinals/useGetBrc20FungibleTokens';
-import { useVisibleRuneFungibleTokens } from '@hooks/queries/runes/useRuneFungibleTokensQuery';
-import { useVisibleSip10FungibleTokens } from '@hooks/queries/stx/useGetSip10FungibleTokens';
+import {
+  useGetBrc20FungibleTokens,
+  useVisibleBrc20FungibleTokens,
+} from '@hooks/queries/ordinals/useGetBrc20FungibleTokens';
+import {
+  useRuneFungibleTokensQuery,
+  useVisibleRuneFungibleTokens,
+} from '@hooks/queries/runes/useRuneFungibleTokensQuery';
+import {
+  useGetSip10FungibleTokens,
+  useVisibleSip10FungibleTokens,
+} from '@hooks/queries/stx/useGetSip10FungibleTokens';
 import useAppConfig from '@hooks/queries/useAppConfig';
 import useBtcWalletData from '@hooks/queries/useBtcWalletData';
 import useFeeMultipliers from '@hooks/queries/useFeeMultipliers';
@@ -28,7 +37,12 @@ import useWalletSelector from '@hooks/useWalletSelector';
 import { ArrowDown, ArrowUp, Plus } from '@phosphor-icons/react';
 import { animated, useTransition } from '@react-spring/web';
 import CoinSelectModal from '@screens/home/coinSelectModal';
-import { AnalyticsEvents, FeatureId, type FungibleToken } from '@secretkeylabs/xverse-core';
+import {
+  AnalyticsEvents,
+  FeatureId,
+  type FungibleToken,
+  type FungibleTokenWithStates,
+} from '@secretkeylabs/xverse-core';
 import {
   changeShowDataCollectionAlertAction,
   setBrc20ManageTokensAction,
@@ -43,7 +57,6 @@ import type { CurrencyTypes } from '@utils/constants';
 import { isInOptions, isLedgerAccount } from '@utils/helper';
 import { optInMixPanel, optOutMixPanel, trackMixPanel } from '@utils/mixpanel';
 import { sortFtByFiatBalance } from '@utils/tokens';
-import BigNumber from 'bignumber.js';
 import { useEffect, useState } from 'react';
 import toast from 'react-hot-toast';
 import { useTranslation } from 'react-i18next';
@@ -113,21 +126,22 @@ function Home() {
   const { btcFiatRate, stxBtcRate } = useSupportedCoinRates();
   const { data: notificationBannersArr, isFetching: isFetchingNotificationBannersArr } =
     useNotificationBanners();
+
+  const { data: fullSip10CoinsList } = useGetSip10FungibleTokens();
+  const { data: fullBrc20CoinsList } = useGetBrc20FungibleTokens();
+  const { data: fullRunesCoinsList } = useRuneFungibleTokensQuery();
   const {
-    unfilteredData: fullSip10CoinsList,
-    visible: sip10CoinsList,
+    data: sip10CoinsList,
     isInitialLoading: loadingStxCoinData,
     isRefetching: refetchingStxCoinData,
   } = useVisibleSip10FungibleTokens();
   const {
-    unfilteredData: fullBrc20CoinsList,
-    visible: brc20CoinsList,
+    data: brc20CoinsList,
     isInitialLoading: loadingBrcCoinData,
     isRefetching: refetchingBrcCoinData,
   } = useVisibleBrc20FungibleTokens();
   const {
-    unfilteredData: fullRunesCoinsList,
-    visible: runesCoinsList,
+    data: runesCoinsList,
     isInitialLoading: loadingRunesData,
     isRefetching: refetchingRunesData,
   } = useVisibleRuneFungibleTokens();
@@ -163,11 +177,23 @@ function Home() {
                 isEnabled: true,
               };
 
-              if (fullRunesCoinsList?.find((ft) => ft.principal === spamToken.principal)) {
+              if (
+                fullRunesCoinsList?.find(
+                  (ft: FungibleTokenWithStates) => ft.principal === spamToken.principal,
+                )
+              ) {
                 dispatch(setRunesManageTokensAction(payload));
-              } else if (fullSip10CoinsList?.find((ft) => ft.principal === spamToken.principal)) {
+              } else if (
+                fullSip10CoinsList?.find(
+                  (ft: FungibleTokenWithStates) => ft.principal === spamToken.principal,
+                )
+              ) {
                 dispatch(setSip10ManageTokensAction(payload));
-              } else if (fullBrc20CoinsList?.find((ft) => ft.principal === spamToken.principal)) {
+              } else if (
+                fullBrc20CoinsList?.find(
+                  (ft: FungibleTokenWithStates) => ft.principal === spamToken.principal,
+                )
+              ) {
                 dispatch(setBrc20ManageTokensAction(payload));
               }
 
@@ -181,10 +207,12 @@ function Home() {
     }
   }, [spamToken]);
 
-  const combinedFtList = sip10CoinsList
-    .concat(brc20CoinsList)
-    .concat(runesCoinsList)
-    .sort((a, b) => sortFtByFiatBalance(a, b, stxBtcRate, btcFiatRate));
+  const combinedFtList = (sip10CoinsList ?? [])
+    .concat(brc20CoinsList ?? [])
+    .concat(runesCoinsList ?? [])
+    .sort((a: FungibleTokenWithStates, b: FungibleTokenWithStates) =>
+      sortFtByFiatBalance(a, b, stxBtcRate, btcFiatRate),
+    );
 
   const filteredNotificationBannersArr = notificationBannersArr
     ? notificationBannersArr.filter((banner) => !notificationBanners[banner.id])
@@ -508,7 +536,7 @@ function Home() {
               onPress={handleTokenPressed}
             />
           )}
-          {combinedFtList.map((coin) => {
+          {combinedFtList.map((coin: FungibleTokenWithStates) => {
             const isLoading = loadingStxCoinData || loadingBrcCoinData || loadingRunesData;
             return (
               <StyledTokenTile
@@ -539,7 +567,7 @@ function Home() {
           onClose={onSendModalClose}
           onSelectCoin={onSendFtSelect}
           visible={openSendModal}
-          coins={combinedFtList.filter((ft) => new BigNumber(ft.balance).gt(0))}
+          coins={combinedFtList}
           title={t('SEND')}
           loadingWalletData={loadingStxWalletData || loadingBtcWalletData}
         />
diff --git a/src/app/screens/listRune/index.tsx b/src/app/screens/listRune/index.tsx
index 4589a802e..910e3b3cb 100644
--- a/src/app/screens/listRune/index.tsx
+++ b/src/app/screens/listRune/index.tsx
@@ -71,7 +71,7 @@ export default function ListRuneScreen() {
   const { t } = useTranslation('translation', { keyPrefix: 'LIST_RUNE_SCREEN' });
   const navigate = useNavigate();
   const { runeId } = useParams();
-  const { visible: runesCoinsList } = useVisibleRuneFungibleTokens(false);
+  const { data: runesCoinsList } = useVisibleRuneFungibleTokens(false);
   const selectedRune = runesCoinsList.find((ft) => ft.principal === runeId);
   const { fiatCurrency } = useWalletSelector();
   const { btcFiatRate } = useSupportedCoinRates();
diff --git a/src/app/screens/manageTokens/index.tsx b/src/app/screens/manageTokens/index.tsx
index f9356edd9..54072b2d5 100644
--- a/src/app/screens/manageTokens/index.tsx
+++ b/src/app/screens/manageTokens/index.tsx
@@ -1,21 +1,18 @@
 import stacksIcon from '@assets/img/dashboard/stx_icon.svg';
-import runesComingSoon from '@assets/img/manageTokens/runes_coming_soon.svg';
 import OptionsDialog from '@components/optionsDialog/optionsDialog';
 import BottomBar from '@components/tabBar';
 import TopRow from '@components/topRow';
 import { useGetBrc20FungibleTokens } from '@hooks/queries/ordinals/useGetBrc20FungibleTokens';
 import { useRuneFungibleTokensQuery } from '@hooks/queries/runes/useRuneFungibleTokensQuery';
 import { useGetSip10FungibleTokens } from '@hooks/queries/stx/useGetSip10FungibleTokens';
-import useHasFeature from '@hooks/useHasFeature';
 import useSelectedAccount from '@hooks/useSelectedAccount';
 import useWalletReducer from '@hooks/useWalletReducer';
 import useWalletSelector from '@hooks/useWalletSelector';
 import { Eye, EyeSlash } from '@phosphor-icons/react';
 import CoinItem from '@screens/manageTokens/coinItem';
 import {
-  FeatureId,
-  type FungibleToken,
   type FungibleTokenProtocol,
+  type FungibleTokenWithStates,
 } from '@secretkeylabs/xverse-core';
 import {
   setBrc20ManageTokensAction,
@@ -25,7 +22,6 @@ import {
 } from '@stores/wallet/actions/actionCreators';
 import { StyledP } from '@ui-library/common.styled';
 import { SPAM_OPTIONS_WIDTH } from '@utils/constants';
-import BigNumber from 'bignumber.js';
 import { useState } from 'react';
 import { useTranslation } from 'react-i18next';
 import { useDispatch } from 'react-redux';
@@ -97,14 +93,6 @@ const Description = styled.h1((props) => ({
   marginBottom: props.theme.spacing(16),
 }));
 
-const RunesContainer = styled.div((props) => ({
-  marginTop: props.theme.spacing(24),
-  marginRight: props.theme.spacing(5),
-  display: 'flex',
-  flexDirection: 'row',
-  justifyContent: 'center',
-}));
-
 const ErrorsText = styled.p((props) => ({
   ...props.theme.typography.body_bold_m,
   color: props.theme.colors.white_200,
@@ -113,10 +101,6 @@ const ErrorsText = styled.p((props) => ({
   textAlign: 'center',
 }));
 
-const RunesComingSoon = styled.img({
-  width: '70%',
-});
-
 const ButtonRow = styled.button`
   display: flex;
   align-items: center;
@@ -161,16 +145,20 @@ function ManageTokens() {
   const { t } = useTranslation('translation', { keyPrefix: 'TOKEN_SCREEN' });
 
   const selectedAccount = useSelectedAccount();
-  const { sip10ManageTokens, brc20ManageTokens, runesManageTokens, showSpamTokens } =
-    useWalletSelector();
-  const { data: runesList, isError: runeError } = useRuneFungibleTokensQuery();
-  const { data: sip10List, isError: sip10Error } = useGetSip10FungibleTokens();
-  const { data: brc20List, isError: brc20Error } = useGetBrc20FungibleTokens();
+  const { showSpamTokens } = useWalletSelector();
+  const { data: runesList, isError: runeError } = useRuneFungibleTokensQuery((data) =>
+    data.filter((ft) => ft.showToggle),
+  );
+  const { data: sip10List, isError: sip10Error } = useGetSip10FungibleTokens((data) =>
+    data.filter((ft) => ft.showToggle),
+  );
+  const { data: brc20List, isError: brc20Error } = useGetBrc20FungibleTokens((data) =>
+    data.filter((ft) => ft.showToggle),
+  );
 
   const [selectedProtocol, setSelectedProtocol] = useState<FungibleTokenProtocol>(
     selectedAccount?.stxAddress ? 'stacks' : 'brc-20',
   );
-  const showRunes = useHasFeature(FeatureId.RUNES_SUPPORT);
   const [showOptionsDialog, setShowOptionsDialog] = useState(false);
 
   const [optionsDialogIndents, setOptionsDialogIndents] = useState<
@@ -193,9 +181,9 @@ function ManageTokens() {
   };
 
   const toggled = (isEnabled: boolean, _coinName: string, coinKey: string) => {
-    const runeFt = runesList?.find((ft) => ft.principal === coinKey);
-    const sip10Ft = sip10List?.find((ft) => ft.principal === coinKey);
-    const brc20Ft = brc20List?.find((ft) => ft.principal === coinKey);
+    const runeFt = runesList?.find((ft: FungibleTokenWithStates) => ft.principal === coinKey);
+    const sip10Ft = sip10List?.find((ft: FungibleTokenWithStates) => ft.principal === coinKey);
+    const brc20Ft = brc20List?.find((ft: FungibleTokenWithStates) => ft.principal === coinKey);
 
     const payload = { principal: coinKey, isEnabled };
 
@@ -211,29 +199,19 @@ function ManageTokens() {
   const handleBackButtonClick = () => navigate('/');
 
   const getCoinsList = () => {
-    let coins: FungibleToken[];
+    let coins: FungibleTokenWithStates[];
     let error: boolean;
     switch (selectedProtocol) {
       case 'stacks':
-        coins = (sip10List ?? []).map((ft) => ({
-          ...ft,
-          visible:
-            sip10ManageTokens[ft.principal] ?? (ft.supported && new BigNumber(ft.balance).gt(0)),
-        }));
+        coins = sip10List ?? [];
         error = sip10Error;
         break;
       case 'brc-20':
-        coins = (brc20List ?? []).map((ft) => ({
-          ...ft,
-          visible: brc20ManageTokens[ft.principal] ?? new BigNumber(ft.balance).gt(0),
-        }));
+        coins = brc20List ?? [];
         error = brc20Error;
         break;
       case 'runes':
-        coins = (runesList ?? []).map((ft) => ({
-          ...ft,
-          visible: runesManageTokens[ft.principal] ?? new BigNumber(ft.balance).gt(0),
-        }));
+        coins = runesList ?? [];
         error = runeError;
         break;
       default:
@@ -246,7 +224,7 @@ function ManageTokens() {
     return (
       <>
         {selectedProtocol === 'stacks' && <Stacks />}
-        {coins.map((coin: FungibleToken) => (
+        {coins.map((coin) => (
           <CoinItem
             id={coin.principal}
             key={coin.principal}
@@ -257,7 +235,7 @@ function ManageTokens() {
             runeSymbol={coin.runeSymbol}
             disabled={false}
             toggled={toggled}
-            enabled={coin.visible}
+            enabled={coin.isEnabled}
           />
         ))}
         {!coins.length && <ErrorsText>{t('NO_COINS')}</ErrorsText>}
@@ -316,15 +294,7 @@ function ManageTokens() {
               RUNES
             </Button>
           </FtInfoContainer>
-          <TokenContainer>
-            {selectedProtocol === 'runes' && !showRunes ? (
-              <RunesContainer>
-                <RunesComingSoon src={runesComingSoon} />
-              </RunesContainer>
-            ) : (
-              getCoinsList()
-            )}
-          </TokenContainer>
+          <TokenContainer>{getCoinsList()}</TokenContainer>
         </ScrollableContainer>
       </Container>
       <BottomBar tab="dashboard" />
diff --git a/src/app/screens/sendStx/index.tsx b/src/app/screens/sendStx/index.tsx
index b0be2cb2e..0d689ab52 100644
--- a/src/app/screens/sendStx/index.tsx
+++ b/src/app/screens/sendStx/index.tsx
@@ -60,7 +60,7 @@ function SendStxScreen() {
   // Will be used in the future when the summary screen is refactored
   const [, setRecipientDomain] = useState('');
   const [memo, setMemo] = useState(stxMemo ?? '');
-  const { visible: sip10CoinsList } = useVisibleSip10FungibleTokens();
+  const { data: sip10CoinsList } = useVisibleSip10FungibleTokens();
   const [searchParams] = useSearchParams();
   const principal = searchParams.get('principal');
   const fungibleToken = sip10CoinsList?.find((coin) => coin.principal === principal);
diff --git a/src/app/screens/swap/components/tokenFromBottomSheet/useFromTokens.ts b/src/app/screens/swap/components/tokenFromBottomSheet/useFromTokens.ts
index e886fc431..7091c0290 100644
--- a/src/app/screens/swap/components/tokenFromBottomSheet/useFromTokens.ts
+++ b/src/app/screens/swap/components/tokenFromBottomSheet/useFromTokens.ts
@@ -1,11 +1,11 @@
 import useSupportedCoinRates from '@hooks/queries/useSupportedCoinRates';
-import useMasterCoinsList from '@screens/swap/useMasterCoinsList';
+import useVisibleMasterCoinsList from '@screens/swap/useVisibleMasterCoinsList';
 import { mapSwapProtocolToFTProtocol } from '@screens/swap/utils';
 import { type Token } from '@secretkeylabs/xverse-core';
 import { sortFtByFiatBalance } from '@utils/tokens';
 
 const useFromTokens = (toToken?: Token) => {
-  const tokens = useMasterCoinsList();
+  const tokens = useVisibleMasterCoinsList();
   const { stxBtcRate, btcFiatRate } = useSupportedCoinRates();
 
   // Sort tokens, keeping BTC as the first element, and STX (if enabled) as the second
diff --git a/src/app/screens/swap/components/tokenToBottomSheet/useToTokens.ts b/src/app/screens/swap/components/tokenToBottomSheet/useToTokens.ts
index c3085aea6..122796ae3 100644
--- a/src/app/screens/swap/components/tokenToBottomSheet/useToTokens.ts
+++ b/src/app/screens/swap/components/tokenToBottomSheet/useToTokens.ts
@@ -1,13 +1,18 @@
 import useWalletSelector from '@hooks/useWalletSelector';
-import useVisibleMasterCoinsList from '@screens/swap/useVisibleMasterCoinsList';
+import useMasterCoinsList from '@screens/swap/useMasterCoinsList';
 import { mapFTProtocolToSwapProtocol } from '@screens/swap/utils';
-import { getXverseApiClient, type Protocol, type TokenBasic } from '@secretkeylabs/xverse-core';
+import {
+  getXverseApiClient,
+  type Protocol,
+  type Token,
+  type TokenBasic,
+} from '@secretkeylabs/xverse-core';
 import { useQuery } from '@tanstack/react-query';
 import { handleRetries } from '@utils/query';
 
 const useToTokens = (protocol: Protocol, from?: TokenBasic, query?: string) => {
-  const coinsMasterList = useVisibleMasterCoinsList();
-  const { network, spamTokens } = useWalletSelector();
+  const coinsMasterList = useMasterCoinsList();
+  const { network, spamTokens, runesManageTokens, sip10ManageTokens } = useWalletSelector();
   const spamTokenSet = new Set(spamTokens);
 
   const userTokens =
@@ -41,12 +46,20 @@ const useToTokens = (protocol: Protocol, from?: TokenBasic, query?: string) => {
     return filteredResponse;
   };
 
+  const select = (data: Token[]) =>
+    data.filter(
+      (token) =>
+        !spamTokenSet.has(token.ticker) ||
+        runesManageTokens[token.ticker] === true || // allow user to enable spam tokens
+        sip10ManageTokens[token.ticker] === true,
+    );
+
   return useQuery({
     enabled: userTokens.length > 0,
     retry: handleRetries,
     queryKey: ['swap-from-tokens', network.type, userTokens, protocol, from, search],
     queryFn,
-    select: (data) => data.filter((rune) => !spamTokenSet.has(rune.ticker)),
+    select,
   });
 };
 
diff --git a/src/app/screens/swap/index.tsx b/src/app/screens/swap/index.tsx
index 120a01708..b045d98c3 100644
--- a/src/app/screens/swap/index.tsx
+++ b/src/app/screens/swap/index.tsx
@@ -46,7 +46,7 @@ import trackSwapMixPanel from './mixpanel';
 import QuoteSummary from './quoteSummary';
 import QuotesModal from './quotesModal';
 import type { OrderInfo, Side, StxOrderInfo } from './types';
-import useMasterCoinsList from './useMasterCoinsList';
+import useVisibleMasterCoinsList from './useVisibleMasterCoinsList';
 import {
   getTrackingIdentifier,
   isStxTx,
@@ -138,7 +138,7 @@ export default function SwapScreen() {
   const defaultFrom = params.get('from');
   const { quotes, loading: quotesLoading, error: quotesError, fetchQuotes } = useGetQuotes();
   const { data: runeFloorPrice } = useRuneFloorPriceQuery(toToken?.name ?? '');
-  const coinsMasterList = useMasterCoinsList();
+  const coinsMasterList = useVisibleMasterCoinsList();
   const { tokenInfo: sip10FromTokenInfoUSD } = useGetSip10TokenInfo({
     principal: toToken?.ticker,
     fiatCurrency: 'USD',
@@ -149,7 +149,7 @@ export default function SwapScreen() {
       const token = coinsMasterList.find((coin) => coin.principal === defaultFrom);
       setFromToken(token);
     }
-  }, [defaultFrom, coinsMasterList.length]);
+  }, [defaultFrom, coinsMasterList]);
 
   const handleGoBack = () => {
     navigate('/');
diff --git a/src/app/screens/swap/useMasterCoinsList.tsx b/src/app/screens/swap/useMasterCoinsList.tsx
index 2beb12cb8..c0687ff79 100644
--- a/src/app/screens/swap/useMasterCoinsList.tsx
+++ b/src/app/screens/swap/useMasterCoinsList.tsx
@@ -31,7 +31,7 @@ export const stxFt: FungibleToken = {
 
 const useMasterCoinsList = () => {
   const { data: sip10FtList } = useGetSip10FungibleTokens();
-  const { unfilteredData: runesFtList } = useRuneFungibleTokensQuery();
+  const { data: runesFtList } = useRuneFungibleTokensQuery();
   const { hideStx } = useWalletSelector();
   const isStacksSwapsEnabled = useHasFeature(FeatureId.STACKS_SWAPS);
 
diff --git a/src/app/screens/swap/useVisibleMasterCoinsList.tsx b/src/app/screens/swap/useVisibleMasterCoinsList.tsx
index d8d0a0267..10f86af07 100644
--- a/src/app/screens/swap/useVisibleMasterCoinsList.tsx
+++ b/src/app/screens/swap/useVisibleMasterCoinsList.tsx
@@ -7,20 +7,18 @@ import { useMemo } from 'react';
 import { btcFt, stxFt } from './useMasterCoinsList';
 
 const useVisibleMasterCoinsList = () => {
-  const { visible: sip10FtList } = useVisibleSip10FungibleTokens();
-  const { visible: runesFtList } = useVisibleRuneFungibleTokens();
-  const isStacksSwapsEnabled = useHasFeature(FeatureId.STACKS_SWAPS);
-
+  const { data: sip10FtList } = useVisibleSip10FungibleTokens();
+  const { data: runesFtList } = useVisibleRuneFungibleTokens();
   const { hideStx } = useWalletSelector();
+  const isStacksSwapsEnabled = useHasFeature(FeatureId.STACKS_SWAPS);
 
   const coinsMasterList = useMemo(
     () => [
-      ...sip10FtList,
-      ...runesFtList,
+      ...(runesFtList || []),
       btcFt,
-      ...(!hideStx && isStacksSwapsEnabled ? [stxFt] : []),
+      ...(!hideStx && isStacksSwapsEnabled ? [stxFt, ...(sip10FtList ?? [])] : []),
     ],
-    [sip10FtList, runesFtList, hideStx, isStacksSwapsEnabled],
+    [runesFtList, hideStx, isStacksSwapsEnabled, sip10FtList],
   );
 
   return coinsMasterList;
diff --git a/src/app/screens/unlistRune/index.tsx b/src/app/screens/unlistRune/index.tsx
index 221777024..861c6916a 100644
--- a/src/app/screens/unlistRune/index.tsx
+++ b/src/app/screens/unlistRune/index.tsx
@@ -27,7 +27,7 @@ export default function UnlistRuneScreen() {
   const { t } = useTranslation('translation', { keyPrefix: 'LIST_RUNE_SCREEN' });
   const navigate = useNavigate();
   const { runeId } = useParams();
-  const { visible: runesCoinsList } = useVisibleRuneFungibleTokens();
+  const { data: runesCoinsList } = useVisibleRuneFungibleTokens();
   const selectedRune = runesCoinsList.find((ft) => ft.principal === runeId);
   const showRunesListing =
     useHasFeature(FeatureId.RUNES_LISTING) || process.env.NODE_ENV === 'development';
diff --git a/src/app/stores/index.ts b/src/app/stores/index.ts
index 61607e500..5eb2b25cc 100644
--- a/src/app/stores/index.ts
+++ b/src/app/stores/index.ts
@@ -29,8 +29,8 @@ const migrations = {
   },
   3: (
     state: WalletState & {
-      brcCoinsList: FungibleToken[] | null; // removed in v3
-      coinsList: FungibleToken[] | null; // removed in v3
+      brcCoinsList: (FungibleToken & { visible?: boolean })[] | null; // removed in v3
+      coinsList: (FungibleToken & { visible?: boolean })[] | null; // removed in v3
       coins: Coin[]; // removed in v3
     },
   ) => ({
diff --git a/src/app/utils/helper.ts b/src/app/utils/helper.ts
index 2a7671195..0550208d1 100644
--- a/src/app/utils/helper.ts
+++ b/src/app/utils/helper.ts
@@ -4,7 +4,7 @@ import {
   microstacksToStx,
   satsToBtc,
   type Account,
-  type FungibleToken,
+  type FungibleTokenWithStates,
   type NetworkType,
   type NftData,
   type SettingsNetwork,
@@ -252,9 +252,9 @@ export const calculateTotalBalance = ({
 }: {
   stxBalance?: string;
   btcBalance?: string;
-  sipCoinsList: FungibleToken[];
-  brcCoinsList: FungibleToken[];
-  runesCoinList: FungibleToken[];
+  sipCoinsList: FungibleTokenWithStates[];
+  brcCoinsList: FungibleTokenWithStates[];
+  runesCoinList: FungibleTokenWithStates[];
   stxBtcRate: string;
   btcFiatRate: string;
   hideStx: boolean;
@@ -277,7 +277,7 @@ export const calculateTotalBalance = ({
 
   if (sipCoinsList) {
     totalBalance = sipCoinsList.reduce((acc, coin) => {
-      if (coin.visible && coin.tokenFiatRate && coin.decimals) {
+      if (coin.isEnabled && coin.tokenFiatRate && coin.decimals) {
         const tokenUnits = new BigNumber(10).exponentiatedBy(new BigNumber(coin.decimals));
         const coinFiatValue = new BigNumber(coin.balance)
           .dividedBy(tokenUnits)
@@ -291,7 +291,7 @@ export const calculateTotalBalance = ({
 
   if (brcCoinsList) {
     totalBalance = brcCoinsList.reduce((acc, coin) => {
-      if (coin.visible && coin.tokenFiatRate) {
+      if (coin.isEnabled && coin.tokenFiatRate) {
         const coinFiatValue = new BigNumber(coin.balance).multipliedBy(
           new BigNumber(coin.tokenFiatRate),
         );
@@ -304,7 +304,7 @@ export const calculateTotalBalance = ({
 
   if (runesCoinList) {
     totalBalance = runesCoinList.reduce((acc, coin) => {
-      if (coin.visible && coin.tokenFiatRate) {
+      if (coin.isEnabled && coin.tokenFiatRate) {
         const coinFiatValue = new BigNumber(getFtBalance(coin)).multipliedBy(
           new BigNumber(coin.tokenFiatRate),
         );
diff --git a/tests/pages/wallet.ts b/tests/pages/wallet.ts
index 2fb0bfa9f..2929860c2 100644
--- a/tests/pages/wallet.ts
+++ b/tests/pages/wallet.ts
@@ -630,18 +630,18 @@ export default class Wallet {
 
     await expect(this.labelAccountName).toBeVisible();
     await expect(this.buttonMenu).toBeVisible();
-    await expect(await this.labelTokenSubtitle.count()).toBeGreaterThanOrEqual(2);
+    expect(await this.labelTokenSubtitle.count()).toBeGreaterThanOrEqual(2);
 
     await expect(this.navigationDashboard).toBeVisible();
     await expect(this.navigationNFT).toBeVisible();
     await expect(this.navigationStacking).toBeVisible();
     await expect(this.navigationExplore).toBeVisible();
     await expect(this.navigationSettings).toBeVisible();
-    await expect(await this.divTokenRow.count()).toBeGreaterThan(1);
+    expect(await this.divTokenRow.count()).toBeGreaterThan(1);
   }
 
   async checkVisualsSendSTXPage3() {
-    await expect(this.page.url()).toContain('confirm-stx-tx');
+    expect(this.page.url()).toContain('confirm-stx-tx');
     await expect(this.buttonConfirm).toBeVisible();
     await expect(this.buttonCancel).toBeVisible();
     await expect(this.receiveAddress).toBeVisible();
@@ -655,10 +655,10 @@ export default class Wallet {
    * Checks the visibility and state of UI elements state on first page in Send Flow
    *
    * @param {string} url - The expected URL to validate the correct page navigation.
-   * @param {boolean} isSTX - Optional flag to apply STX-specific element checks (default: false).
+   * @param {boolean} moreInputFields - (default: false).
    */
   async checkVisualsSendPage1(url: string, moreInputFields: boolean = false) {
-    await expect(this.page.url()).toContain(url);
+    expect(this.page.url()).toContain(url);
     await expect(this.buttonNext).toBeVisible();
     await expect(this.buttonNext).toBeDisabled();
 
@@ -682,7 +682,7 @@ export default class Wallet {
    * @param {boolean} isSTX - Indicates if the page is STX-specific; adjusts element checks accordingly (default: false).
    */
   async checkVisualsSendPage2(url: string, isSTX: boolean = false) {
-    await expect(this.page.url()).toContain(url);
+    expect(this.page.url()).toContain(url);
     await expect(this.buttonNext).toBeVisible();
     await expect(this.buttonNext).toBeDisabled();
 
@@ -722,7 +722,7 @@ export default class Wallet {
     tokenImageShown: boolean = true,
     ordinalNumber?: string,
   ) {
-    await expect(this.page.url()).toContain(url);
+    expect(this.page.url()).toContain(url);
     await expect(this.buttonExpand).toBeVisible();
     await expect(this.buttonCancel).toBeEnabled();
     await expect(this.buttonConfirm).toBeEnabled();
@@ -749,29 +749,27 @@ export default class Wallet {
     // Execute these checks only if sendAddress is provided
     if (sendAddress) {
       await expect(this.sendAddress.first()).toBeVisible();
-      await expect(await this.sendAddress.first().innerText()).toContain(sendAddress.slice(-4));
+      expect(await this.sendAddress.first().innerText()).toContain(sendAddress.slice(-4));
     }
 
     // Execute these checks only if recipientAddress is provided
     if (recipientAddress) {
       await expect(this.receiveAddress.first()).toBeVisible();
-      await expect(await this.receiveAddress.first().innerText()).toContain(
-        recipientAddress.slice(-4),
-      );
+      expect(await this.receiveAddress.first().innerText()).toContain(recipientAddress.slice(-4));
     }
     // Collection Inscriptions don't have the ordinal number displayed in the Review
     // Check if the right ordinal number is shown
     if (ordinalNumber) {
       const reviewNumberOrdinal = await this.numberInscription.first().innerText();
-      await expect(ordinalNumber).toMatch(reviewNumberOrdinal);
+      expect(ordinalNumber).toMatch(reviewNumberOrdinal);
     }
   }
 
   // Check Visuals of Rune Dashboard (without List button), return balance amount
-  async checkVisualsRunesDashboard(runeName) {
+  async checkVisualsRunesDashboard(runeName: string) {
     await expect(this.imageToken.first()).toBeVisible();
     await expect(this.textCoinTitle).toBeVisible();
-    await expect(await this.textCoinTitle).toContainText(runeName);
+    await expect(this.textCoinTitle).toContainText(runeName);
     await expect(this.coinBalance).toBeVisible();
     await expect(this.buttonReceive).toBeVisible();
     await expect(this.buttonSend).toBeVisible();
@@ -786,11 +784,11 @@ export default class Wallet {
     await expect(this.buttonSetPrice).toBeVisible();
     await expect(this.buttonSetPrice).toBeDisabled();
     await expect(this.runeItem.first()).toBeVisible();
-    await expect(await this.runeItem.count()).toBeGreaterThanOrEqual(1);
+    expect(await this.runeItem.count()).toBeGreaterThanOrEqual(1);
   }
 
   async checkVisualsSwapPage() {
-    await expect(this.page.url()).toContain('swap');
+    expect(this.page.url()).toContain('swap');
     await expect(this.buttonDownArrow.first()).toBeVisible();
     await expect(this.buttonGetQuotes.first()).toBeVisible();
     await expect(this.buttonGetQuotes.first()).toBeDisabled();
@@ -798,8 +796,8 @@ export default class Wallet {
     await expect(this.swapTokenBalance).toContainText('--');
     await expect(this.buttonBack).toBeVisible();
     await expect(this.nameToken.first()).toContainText('Select asset');
-    await expect(await this.nameToken).toHaveCount(2);
-    await expect(await this.buttonDownArrow).toHaveCount(2);
+    await expect(this.nameToken).toHaveCount(2);
+    await expect(this.buttonDownArrow).toHaveCount(2);
     await expect(this.buttonGetQuotes).toBeVisible();
     await expect(this.textUSD).toBeVisible();
     await expect(this.buttonSwapToken).toBeVisible();
@@ -813,7 +811,7 @@ export default class Wallet {
 
     const usdAmount = await this.textUSD.innerText();
     const numericUSDValue = parseFloat(usdAmount.replace(/[^0-9.]/g, ''));
-    await expect(numericUSDValue).toBeGreaterThan(0);
+    expect(numericUSDValue).toBeGreaterThan(0);
 
     return numericUSDValue;
   }
@@ -823,8 +821,8 @@ export default class Wallet {
   async checkVisualsQuotePage(
     tokenName: string,
     slippage: boolean,
-    numericQuoteValue,
-    numericUSDValue,
+    numericQuoteValue: number,
+    numericUSDValue: number,
   ) {
     await expect(this.buttonSwap).toBeVisible();
     await expect(this.buttonEditFee).toBeVisible();
@@ -832,7 +830,7 @@ export default class Wallet {
       await expect(this.buttonSlippage).toBeVisible();
     }
     // Only 2 token should be visible
-    await expect(await this.buttonSwapPlace.count()).toBe(2);
+    expect(await this.buttonSwapPlace.count()).toBe(2);
     // await expect(await this.imageToken.count()).toBe(2);
 
     // Check Rune token name
@@ -841,18 +839,18 @@ export default class Wallet {
     // Check if USD amount from quote page is the same as from th swap start flow page
     const usdAmountQuote = await this.textUSD.first().innerText();
     const numericUSDQuote = parseFloat(usdAmountQuote.replace(/[^0-9.]/g, ''));
-    await expect(numericUSDQuote).toEqual(numericUSDValue);
+    expect(numericUSDQuote).toEqual(numericUSDValue);
 
     // min-received-amount value should be the same as quoteAmount
     const minReceivedAmount = await this.minReceivedAmount.innerText();
     const numericMinReceivedAmount = parseFloat(minReceivedAmount.replace(/[^0-9.]/g, ''));
     const formattedNumericMinReceivedAmount = parseFloat(numericMinReceivedAmount.toFixed(3));
-    await expect(formattedNumericMinReceivedAmount).toEqual(numericQuoteValue);
+    expect(formattedNumericMinReceivedAmount).toEqual(numericQuoteValue);
 
     // check if quoteAmount is the same from the page before
     const quoteAmount2Page = await this.quoteAmount.last().innerText();
     const numericQuote2Page = parseFloat(quoteAmount2Page.replace(/[^0-9.]/g, ''));
-    await expect(numericQuote2Page).toEqual(numericQuoteValue);
+    expect(numericQuote2Page).toEqual(numericQuoteValue);
   }
 
   async checkVisualsListOnMEPage() {
@@ -879,7 +877,7 @@ export default class Wallet {
     // Save the current fee amount for comparison
     const originalFee = await this.feeAmount.innerText();
     const numericOriginalFee = parseFloat(originalFee.replace(/[^0-9.]/g, ''));
-    await expect(numericOriginalFee).toBeGreaterThan(0);
+    expect(numericOriginalFee).toBeGreaterThan(0);
     let feePriority = 'Medium';
     if (feePriorityShown) {
       feePriority = await this.labelFeePriority.innerText();
@@ -896,7 +894,7 @@ export default class Wallet {
       .locator(this.labelTotalFee)
       .innerText();
     const numericFee = parseFloat(fee.replace(/[^0-9.]/g, ''));
-    await expect(numericFee).toBe(numericOriginalFee);
+    expect(numericFee).toBe(numericOriginalFee);
 
     // Save high fee rate for comparison
     const highFee = await this.labelTotalFee.first().innerText();
@@ -907,12 +905,12 @@ export default class Wallet {
 
     const newFee = await this.feeAmount.innerText();
     const numericNewFee = parseFloat(newFee.replace(/[^0-9.]/g, ''));
-    await expect(numericNewFee).toBe(numericHighFee);
+    expect(numericNewFee).toBe(numericHighFee);
   }
 
   async navigateToCollectibles() {
     await this.navigationNFT.click();
-    await expect(this.page.url()).toContain('nft-dashboard');
+    expect(this.page.url()).toContain('nft-dashboard');
     // If 'enable' rare sats pop up is appearing
     if (await this.buttonEnable.isVisible()) {
       await this.buttonEnable.click();
@@ -923,32 +921,30 @@ export default class Wallet {
   }
 
   // had to disable this rule as my first assertion was always changed to a wrong assertion
-  /* eslint-disable playwright/prefer-web-first-assertions */
   async checkAmountsSendingSTX(amountSTXSend, STXTest, sendFee) {
-    await expect(await this.receiveAddress.first().innerText()).toContain(STXTest.slice(-4));
+    expect(await this.receiveAddress.first().innerText()).toContain(STXTest.slice(-4));
 
     // Sending amount without Fee
     const sendAmount = await this.confirmAmount.first().innerText();
     const numericValueSendAmount = parseFloat(sendAmount.replace(/[^0-9.]/g, ''));
 
-    await expect(numericValueSendAmount).toEqual(amountSTXSend);
+    expect(numericValueSendAmount).toEqual(amountSTXSend);
 
     // Fees
     const fee = await this.feeAmount.innerText();
     const numericValueFee = parseFloat(fee.replace(/[^0-9.]/g, ''));
-    await expect(numericValueFee).toEqual(sendFee);
+    expect(numericValueFee).toEqual(sendFee);
   }
 
-  /* eslint-disable playwright/prefer-web-first-assertions */
   async checkAmountsSendingBTC(selfBTCTest, BTCTest, amountBTCSend) {
     // Sending amount without Fee
     const amountText = await this.confirmAmount.first().innerText();
     const numericValueAmountText = parseFloat(amountText.replace(/[^0-9.]/g, ''));
-    await expect(numericValueAmountText).toEqual(amountBTCSend);
+    expect(numericValueAmountText).toEqual(amountBTCSend);
 
     // Address check sending and receiving
-    await expect(await this.sendAddress.innerText()).toContain(selfBTCTest.slice(-4));
-    await expect(await this.receiveAddress.first().innerText()).toContain(BTCTest.slice(-4));
+    expect(await this.sendAddress.innerText()).toContain(selfBTCTest.slice(-4));
+    expect(await this.receiveAddress.first().innerText()).toContain(BTCTest.slice(-4));
 
     const confirmAmountAfter = await this.confirmAmount.last().innerText();
     const originalFee = await this.feeAmount.innerText();
@@ -963,7 +959,7 @@ export default class Wallet {
     // Balance - fees - sending amount
     const roundedResult = Number((num3 - num2 - amountBTCSend).toFixed(9));
     // Check if Balance value after the transaction is the same as the calculated value
-    await expect(num1).toEqual(roundedResult);
+    expect(num1).toEqual(roundedResult);
   }
 
   async confirmSendTransaction(transactionIDShown: boolean = true) {
@@ -976,7 +972,7 @@ export default class Wallet {
     await this.buttonClose.click();
   }
 
-  async getAddress(whichAddress): Promise<string> {
+  async getAddress(whichAddress: string): Promise<string> {
     // click on 'Receive' button
     await this.allUpperButtons.nth(1).click();
 
@@ -994,7 +990,7 @@ export default class Wallet {
     return address;
   }
 
-  async getTokenBalance(tokenname) {
+  async getTokenBalance(tokenname: string) {
     const locator = this.page
       .getByRole('button')
       .filter({ has: this.labelTokenSubtitle.getByText(tokenname, { exact: true }) })
@@ -1005,14 +1001,14 @@ export default class Wallet {
     return numericValue;
   }
 
-  async clickOnSpecificToken(tokenname) {
+  async clickOnSpecificToken(tokenname: string) {
     const specificToken = this.page
       .getByRole('button')
       .filter({ has: this.labelTokenSubtitle.getByText(tokenname, { exact: true }) });
     await specificToken.last().click();
   }
 
-  async clickOnSpecificInscription(inscriptionName) {
+  async clickOnSpecificInscription(inscriptionName: string) {
     const specificToken = this.containersCollectibleItem
       .filter({
         has: this.nameInscription.getByText(inscriptionName, { exact: true }),
@@ -1022,7 +1018,7 @@ export default class Wallet {
   }
 
   // This function tries to click on a specific rune, if the rune is not enabled it will enable the test rune and then click on it
-  async checkAndClickOnSpecificRune(tokenname) {
+  async checkAndClickOnSpecificRune(tokenname: string) {
     // Check if test rune is enabled and if not enabled the test rune
     try {
       // click on the test rune
@@ -1066,7 +1062,7 @@ export default class Wallet {
     await expect(this.inputFallbackBTCURL).toBeVisible();
   }
 
-  async checkTestnetUrls(shouldContainTestnet) {
+  async checkTestnetUrls(shouldContainTestnet: boolean) {
     const inputsURL = [this.inputStacksURL, this.inputBTCURL, this.inputFallbackBTCURL];
     const checks = inputsURL.map(async (input) => {
       const inputValue = await input.inputValue();
@@ -1097,6 +1093,7 @@ export default class Wallet {
 
     await this.checkTestnetUrls(true);
 
+    // TODO think of a better way to do this
     // Wait for the network to be switched so that API doesn't fail because of the rate limiting
     await this.page.waitForTimeout(15000);
 
@@ -1119,6 +1116,7 @@ export default class Wallet {
 
     await this.checkTestnetUrls(false);
 
+    // TODO think of a better way to do this
     // Wait for the network to be switched so that API doesn't fail because of the rate limiting
     await this.page.waitForTimeout(15000);
 
@@ -1156,30 +1154,21 @@ export default class Wallet {
       const balanceText = await this.labelCoinBalanceCurrency.innerText();
       totalBalance = parseFloat(balanceText.replace(/[^\d.-]/g, ''));
     }
-    // Check if total balance of all tokens is the same as total wallet balance
-    const totalBalanceText = await this.balance.innerText();
-    const totalBalanceWallet = parseFloat(totalBalanceText.replace(/[^\d.-]/g, ''));
-    await expect(totalBalanceWallet).toBe(totalBalance);
     return totalBalance;
   }
 
-  // The enableRandomToken function takes a parameter tokenType which can either be ‘BRC20’ or ‘SIP10’. This parameter determines additional actions specific to BRC20 tokens.
-  async enableRandomToken(tokenType: 'BRC20' | 'SIP10'): Promise<string> {
+  async selectLastToken(tokenType: 'BRC20' | 'SIP10'): Promise<string> {
     await this.manageTokenButton.click();
-    await expect(this.page.url()).toContain('manage-tokens');
+    expect(this.page.url()).toContain('manage-tokens');
 
     // Click on the specific token type button if BRC20 is selected
     if (tokenType === 'BRC20') {
       await this.buttonBRC20.click();
     }
 
-    // Enable a random token
-    const tokenName = await this.toggleRandomToken(true);
-
-    // Navigate back and verify the token is visible
+    const chosenToken = this.divTokenRow.last();
+    const tokenName = (await chosenToken.getAttribute('data-testid')) || 'default-value';
     await this.buttonBack.click();
-    await expect(this.labelTokenSubtitle.getByText(tokenName, { exact: true })).toBeVisible();
-
     return tokenName;
   }
 
diff --git a/tests/specs/managementAccount.spec.ts b/tests/specs/managementAccount.spec.ts
index 03afbfded..20d8a5286 100644
--- a/tests/specs/managementAccount.spec.ts
+++ b/tests/specs/managementAccount.spec.ts
@@ -12,7 +12,7 @@ test.describe('Account Management', () => {
     await page.goto(`chrome-extension://${extensionId}/popup.html`);
     await wallet.checkVisualsStartpage();
     await wallet.labelAccountName.click();
-    await expect(page.url()).toContain('account-list');
+    expect(page.url()).toContain('account-list');
     await expect(wallet.labelAccountName).toHaveCount(1);
     await expect(wallet.buttonGenerateAccount).toBeVisible();
     await expect(wallet.buttonConnectHardwareWallet).toBeVisible();
@@ -32,7 +32,7 @@ test.describe('Account Management', () => {
     await page.goto(`chrome-extension://${extensionId}/popup.html`);
     await wallet.checkVisualsStartpage();
     await wallet.labelAccountName.click();
-    await expect(page.url()).toContain('account-list');
+    expect(page.url()).toContain('account-list');
     await expect(wallet.labelAccountName).toHaveCount(1);
     await wallet.buttonAccountOptions.click();
     await expect(wallet.buttonRenameAccount).toBeVisible();
@@ -65,7 +65,7 @@ test.describe('Account Management', () => {
     await page.goto(`chrome-extension://${extensionId}/popup.html`);
     await wallet.checkVisualsStartpage();
     await wallet.labelAccountName.click();
-    await expect(page.url()).toContain('account-list');
+    expect(page.url()).toContain('account-list');
     await expect(wallet.labelAccountName).toHaveCount(1);
     await wallet.buttonAccountOptions.click();
     await expect(wallet.buttonRenameAccount).toBeVisible();
@@ -93,14 +93,14 @@ test.describe('Account Management', () => {
     await page.goto(`chrome-extension://${extensionId}/popup.html`);
     await wallet.checkVisualsStartpage();
     await wallet.labelAccountName.click();
-    await expect(page.url()).toContain('account-list');
+    expect(page.url()).toContain('account-list');
     await expect(wallet.labelAccountName).toHaveCount(1);
     await wallet.buttonGenerateAccount.click();
     await expect(wallet.labelAccountName).toHaveCount(2);
     await expect(wallet.buttonAccountOptions).toHaveCount(2);
     await expect(wallet.accountBalance).toHaveCount(2);
     const balanceText = await wallet.getBalanceOfAllAccounts();
-    await expect(balanceText).toBe(0);
+    expect(balanceText).toBe(0);
   });
 
   test('Switch to another account and switch back', async ({ page, extensionId }) => {
@@ -111,12 +111,12 @@ test.describe('Account Management', () => {
     await wallet.checkVisualsStartpage();
     await expect(wallet.labelAccountName).toHaveText('Account 1');
     await wallet.labelAccountName.click();
-    await expect(page.url()).toContain('account-list');
+    expect(page.url()).toContain('account-list');
     await expect(wallet.labelAccountName).toHaveCount(1);
     await wallet.buttonGenerateAccount.click();
     await expect(wallet.labelAccountName).toHaveCount(2);
     const balanceText = await wallet.getBalanceOfAllAccounts();
-    await expect(balanceText).toBe(0);
+    expect(balanceText).toBe(0);
     await wallet.labelAccountName.last().click();
     await wallet.checkVisualsStartpage();
     await expect(wallet.labelAccountName).toHaveText('Account 2');
diff --git a/tests/specs/managementToken.spec.ts b/tests/specs/managementToken.spec.ts
index 0b559955f..69ded0ed7 100644
--- a/tests/specs/managementToken.spec.ts
+++ b/tests/specs/managementToken.spec.ts
@@ -13,278 +13,143 @@ test.describe('Token Management', () => {
     await wallet.checkVisualsStartpage();
     await expect(wallet.balance).toHaveText('$0.00');
     await wallet.manageTokenButton.click();
-    await expect(page.url()).toContain('manage-tokens');
+    expect(page.url()).toContain('manage-tokens');
     await expect(wallet.buttonBack).toBeVisible();
     await expect(wallet.buttonSip10).toBeVisible();
     await expect(wallet.buttonBRC20).toBeVisible();
     await expect(wallet.buttonRunes).toBeVisible();
     await expect(wallet.headingTokens).toBeVisible();
 
-    // Check SIP10 token
-    await expect(wallet.checkboxTokenInactive.first()).toBeVisible();
-    const amounttokenSIP = await wallet.labelCoinTitle.count();
-
-    await expect(amounttokenSIP).toBeGreaterThanOrEqual(15);
-    await expect(wallet.checkboxTokenInactive).toHaveCount(amounttokenSIP - 1);
+    // Check SIP10 token tab - only Stacks should be showing when user has no sip10 balances
+    await wallet.buttonSip10.click();
+    await expect(wallet.labelCoinTitle).toHaveCount(1);
+    await expect(wallet.checkboxToken).toHaveCount(1);
     await expect(wallet.checkboxTokenActive).toHaveCount(1);
-    await expect(wallet.checkboxToken).toHaveCount(amounttokenSIP);
+    await expect(wallet.checkboxTokenInactive).toHaveCount(0);
 
-    // Check BRC20 token
+    // Check BRC20 token tab - nothing shows when user has no brc20 balances
     await wallet.buttonBRC20.click();
-    await expect(wallet.checkboxTokenInactive.first()).toBeVisible();
-    const amounttokenBRC20 = await wallet.labelCoinTitle.count();
-    await expect(amounttokenBRC20).toBeGreaterThanOrEqual(8);
-    await expect(wallet.checkboxTokenInactive).toHaveCount(amounttokenBRC20);
+    await expect(wallet.labelCoinTitle).toHaveCount(0);
+    await expect(wallet.checkboxToken).toHaveCount(0);
+    await expect(wallet.checkboxTokenInactive).toHaveCount(0);
     await expect(wallet.checkboxTokenActive).toHaveCount(0);
-    await expect(wallet.checkboxToken).toHaveCount(amounttokenBRC20);
 
-    // Check rune token
+    // Check rune token tab - nothing shows when user has no runes balances
     await wallet.buttonRunes.click();
     await expect(wallet.labelCoinTitle).toHaveCount(0);
+    await expect(wallet.checkboxToken).toHaveCount(0);
     await expect(wallet.checkboxTokenInactive).toHaveCount(0);
     await expect(wallet.checkboxTokenActive).toHaveCount(0);
-    await expect(wallet.checkboxToken).toHaveCount(0);
   });
 
-  test('Enable and disable some BRC-20 token', async ({ page, extensionId }) => {
-    const onboardingPage = new Onboarding(page);
+  test('Toggle a BRC-20 token', async ({ page, extensionId }) => {
     const wallet = new Wallet(page);
-    await onboardingPage.createWalletSkipBackup(strongPW);
+    await wallet.setupTest(extensionId, 'SEED_WORDS1', false);
 
-    await test.step('Enable a random token', async () => {
-      await page.goto(`chrome-extension://${extensionId}/popup.html`);
-      await wallet.checkVisualsStartpage();
-      // Check balances
-      await expect(wallet.balance).toBeVisible();
-      await expect(wallet.balance).toHaveText('$0.00');
-      let balanceText = await wallet.getBalanceOfAllTokens();
-      await expect(balanceText).toBe(0);
+    await test.step('Toggle a random token', async () => {
       await wallet.manageTokenButton.click();
-      await expect(page.url()).toContain('manage-tokens');
       await wallet.buttonBRC20.click();
-      await expect(wallet.checkboxTokenInactive.first()).toBeVisible();
-      const amounttokenBRC20 = await wallet.labelCoinTitle.count();
-      // Enable random token
-      const tokenName = await wallet.toggleRandomToken(true);
-      // Check that amount of checkboxes changed
-      await expect(wallet.checkboxTokenActive).toHaveCount(1);
-      await expect(wallet.checkboxTokenInactive).toHaveCount(amounttokenBRC20 - 1);
-      await wallet.buttonBack.click();
-      // new enabled token should be visible on dashboard
-      await expect(wallet.labelTokenSubtitle.getByText(tokenName, { exact: true })).toBeVisible();
-      // Check balances
-      await expect(wallet.balance).toBeVisible();
-      await expect(wallet.balance).toHaveText('$0.00');
-      balanceText = await wallet.getBalanceOfAllTokens();
-      await expect(balanceText).toBe(0);
-    });
 
-    await test.step('Enable some more token', async () => {
-      await wallet.manageTokenButton.click();
-      await wallet.buttonBRC20.click();
-      await expect(wallet.checkboxTokenInactive.first()).toBeVisible();
-      const amounttokenBRC20 = await wallet.labelCoinTitle.count();
-      const tokenName1 = await wallet.toggleRandomToken(true);
-      const tokenName2 = await wallet.toggleRandomToken(true);
-      const tokenName3 = await wallet.toggleRandomToken(true);
-      await expect(wallet.checkboxTokenActive).toHaveCount(4);
-      await expect(wallet.checkboxTokenInactive).toHaveCount(amounttokenBRC20 - 4);
+      // NOTE: requires an account with at least 1 brc20 token with balance
+      await expect(wallet.checkboxTokenActive.first()).toBeVisible();
+
+      // disable a random token
+      const tokenName = await wallet.toggleRandomToken(false);
+
+      // expect token to be hidden on dashboard
+      const fetchTokens = page.waitForResponse((response) =>
+        response.url().includes('/brc20/tokens'),
+      );
       await wallet.buttonBack.click();
-      // new enabled tokens should be visible on dashboard
-      await expect(wallet.labelTokenSubtitle.getByText(tokenName1, { exact: true })).toBeVisible();
-      await expect(wallet.labelTokenSubtitle.getByText(tokenName2, { exact: true })).toBeVisible();
-      await expect(wallet.labelTokenSubtitle.getByText(tokenName3, { exact: true })).toBeVisible();
-    });
+      await fetchTokens;
+      await expect(wallet.labelTokenSubtitle.getByText(tokenName, { exact: true })).toBeHidden();
 
-    await test.step('Disable a random token', async () => {
-      await page.goto(`chrome-extension://${extensionId}/popup.html`);
-      await wallet.checkVisualsStartpage();
+      // enable the token again
       await wallet.manageTokenButton.click();
-      await expect(page.url()).toContain('manage-tokens');
       await wallet.buttonBRC20.click();
-      await expect(wallet.checkboxTokenInactive.first()).toBeVisible();
-      const amounttokenBRC20 = await wallet.labelCoinTitle.count();
-      const tokenName = await wallet.toggleRandomToken(false);
-      await expect(wallet.checkboxTokenActive).toHaveCount(3);
-      await expect(wallet.checkboxTokenInactive).toHaveCount(amounttokenBRC20 - 3);
+      await page.getByTestId(tokenName).locator('label').click();
+
+      // expect to be visible again on dashboard
+      const fetchTokensAgain = page.waitForResponse((response) =>
+        response.url().includes('/brc20/tokens'),
+      );
       await wallet.buttonBack.click();
-      // new enabled token should be visible on dashboard
-      await expect(wallet.labelTokenSubtitle.getByText(tokenName, { exact: true })).toBeHidden();
-      // Check balances
-      await expect(wallet.balance).toBeVisible();
-      await expect(wallet.balance).toHaveText('$0.00');
-      const balanceText = await wallet.getBalanceOfAllTokens();
-      await expect(balanceText).toBe(0);
+      await fetchTokensAgain;
+      await expect(wallet.labelTokenSubtitle.getByText(tokenName, { exact: true })).toBeVisible();
     });
   });
 
-  test('Enable and disable some SIP-10 token', async ({ page, extensionId }) => {
-    const onboardingPage = new Onboarding(page);
+  test('Toggle a SIP-10 token', async ({ page, extensionId }) => {
     const wallet = new Wallet(page);
-    await onboardingPage.createWalletSkipBackup(strongPW);
+    await wallet.setupTest(extensionId, 'SEED_WORDS1', false);
 
-    await test.step('Enable a random token', async () => {
-      await page.goto(`chrome-extension://${extensionId}/popup.html`);
-      await wallet.checkVisualsStartpage();
-      // Check balances
-      await expect(wallet.balance).toBeVisible();
-      await expect(wallet.balance).toHaveText('$0.00');
-      let balanceText = await wallet.getBalanceOfAllTokens();
-      await expect(balanceText).toBe(0);
+    await test.step('Toggle a random token', async () => {
       await wallet.manageTokenButton.click();
-      await expect(page.url()).toContain('manage-tokens');
-      await expect(wallet.checkboxTokenInactive.first()).toBeVisible();
-      const amounttokenSIP = await wallet.labelCoinTitle.count();
-      // Enable random token
-      const tokenName = await wallet.toggleRandomToken(true);
-      // Check that amount of checkboxes changed
-      await expect(wallet.checkboxTokenActive).toHaveCount(2);
-      await expect(wallet.checkboxTokenInactive).toHaveCount(amounttokenSIP - 2);
-      await wallet.buttonBack.click();
-      // new enabled token should be visible on dashboard
-      await expect(wallet.labelTokenSubtitle.getByText(tokenName, { exact: true })).toBeVisible();
-      // Check balances
-      await expect(wallet.balance).toBeVisible();
-      await expect(wallet.balance).toHaveText('$0.00');
-      balanceText = await wallet.getBalanceOfAllTokens();
-      await expect(balanceText).toBe(0);
-    });
+      await wallet.buttonSip10.click();
 
-    await test.step('Enable some more token', async () => {
-      await wallet.manageTokenButton.click();
-      await expect(wallet.checkboxTokenInactive.first()).toBeVisible();
-      const amounttokenSIP = await wallet.labelCoinTitle.count();
-      const tokenName1 = await wallet.toggleRandomToken(true);
-      const tokenName2 = await wallet.toggleRandomToken(true);
-      const tokenName3 = await wallet.toggleRandomToken(true);
-      await expect(wallet.checkboxTokenActive).toHaveCount(5);
-      await expect(wallet.checkboxTokenInactive).toHaveCount(amounttokenSIP - 5);
-      await wallet.buttonBack.click();
-      // new enabled tokens should be visible on dashboard
-      await expect(wallet.labelTokenSubtitle.getByText(tokenName1, { exact: true })).toBeVisible();
-      await expect(wallet.labelTokenSubtitle.getByText(tokenName2, { exact: true })).toBeVisible();
-      await expect(wallet.labelTokenSubtitle.getByText(tokenName3, { exact: true })).toBeVisible();
-    });
+      // NOTE: requires an account with at least 1 sip10 token with balance
+      await expect(wallet.checkboxTokenActive.first()).toBeVisible();
 
-    await test.step('Disable a random token', async () => {
-      await page.goto(`chrome-extension://${extensionId}/popup.html`);
-      await wallet.checkVisualsStartpage();
-      await wallet.manageTokenButton.click();
-      await expect(page.url()).toContain('manage-tokens');
-      await expect(wallet.checkboxTokenInactive.first()).toBeVisible();
-      const amounttokenSIP = await wallet.labelCoinTitle.count();
+      // disable a random token
       const tokenName = await wallet.toggleRandomToken(false);
-      await expect(wallet.checkboxTokenActive).toHaveCount(4);
-      await expect(wallet.checkboxTokenInactive).toHaveCount(amounttokenSIP - 4);
+
+      // expect token to be hidden on dashboard
+      const fetchTokens = page.waitForResponse((response) =>
+        response.url().includes('/sip10/tokens'),
+      );
       await wallet.buttonBack.click();
-      // new enabled token should be visible on dashboard
+      await fetchTokens;
       await expect(wallet.labelTokenSubtitle.getByText(tokenName, { exact: true })).toBeHidden();
-      // Check balances
-      await expect(wallet.balance).toBeVisible();
-      await expect(wallet.balance).toHaveText('$0.00');
-      const balanceText = await wallet.getBalanceOfAllTokens();
-      await expect(balanceText).toBe(0);
-    });
-  });
 
-  test('Enable and disable all SIP-10 token', async ({ page, extensionId }) => {
-    const onboardingPage = new Onboarding(page);
-    const wallet = new Wallet(page);
-    await onboardingPage.createWalletSkipBackup(strongPW);
-
-    await test.step('Enable a all tokens', async () => {
-      await page.goto(`chrome-extension://${extensionId}/popup.html`);
-      await wallet.checkVisualsStartpage();
-      // Check balances
-      await expect(wallet.balance).toBeVisible();
-      await expect(wallet.balance).toHaveText('$0.00');
-      let balanceText = await wallet.getBalanceOfAllTokens();
-      await expect(balanceText).toBe(0);
-      await expect(wallet.labelTokenSubtitle).toHaveCount(2);
+      // enable the token again
       await wallet.manageTokenButton.click();
-      await expect(wallet.checkboxTokenInactive.first()).toBeVisible();
-      const amounttokenSIP = await wallet.labelCoinTitle.count();
-      await expect(page.url()).toContain('manage-tokens');
-      await expect(wallet.checkboxToken).toHaveCount(amounttokenSIP);
-      await wallet.toggleAllTokens(true);
-      await expect(wallet.checkboxTokenActive).toHaveCount(amounttokenSIP);
-      await expect(wallet.checkboxTokenInactive).toHaveCount(0);
-      await wallet.buttonBack.click();
-      await expect(wallet.labelTokenSubtitle).toHaveCount(amounttokenSIP + 1);
-      await expect(wallet.balance).toBeVisible();
-      await expect(wallet.balance).toHaveText('$0.00');
-      balanceText = await wallet.getBalanceOfAllTokens();
-      await expect(balanceText).toBe(0);
-    });
+      await wallet.buttonSip10.click();
+      await page.getByTestId(tokenName).locator('label').click();
 
-    await test.step('Disable all tokens', async () => {
-      await page.goto(`chrome-extension://${extensionId}/popup.html`);
-      await wallet.checkVisualsStartpage();
-      await wallet.manageTokenButton.click();
-      await expect(page.url()).toContain('manage-tokens');
-      await wallet.toggleAllTokens(false);
-      await expect(wallet.checkboxTokenInactive.first()).toBeVisible();
-      const amounttokenSIP = await wallet.labelCoinTitle.count();
-      await expect(wallet.checkboxTokenActive).toHaveCount(0);
-      await expect(wallet.checkboxTokenInactive).toHaveCount(amounttokenSIP);
+      // expect to be visible again on dashboard
+      const fetchTokensAgain = page.waitForResponse((response) =>
+        response.url().includes('/sip10/tokens'),
+      );
       await wallet.buttonBack.click();
-      await expect(wallet.labelTokenSubtitle).toHaveCount(1);
-      // Check balances
-      await expect(wallet.balance).toBeVisible();
-      await expect(wallet.balance).toHaveText('$0.00');
-      const balanceText = await wallet.getBalanceOfAllTokens();
-      await expect(balanceText).toBe(0);
+      await fetchTokensAgain;
+      await expect(wallet.labelTokenSubtitle.getByText(tokenName, { exact: true })).toBeVisible();
     });
   });
-  test('Enable and disable all BRC-20 token', async ({ page, extensionId }) => {
-    const onboardingPage = new Onboarding(page);
+
+  test('Toggle a Runes token', async ({ page, extensionId }) => {
     const wallet = new Wallet(page);
-    await onboardingPage.createWalletSkipBackup(strongPW);
+    await wallet.setupTest(extensionId, 'SEED_WORDS1', false);
 
-    await test.step('Enable a all tokens', async () => {
-      await page.goto(`chrome-extension://${extensionId}/popup.html`);
-      await wallet.checkVisualsStartpage();
-      // Check balances
-      await expect(wallet.balance).toBeVisible();
-      await expect(wallet.balance).toHaveText('$0.00');
-      let balanceText = await wallet.getBalanceOfAllTokens();
-      await expect(balanceText).toBe(0);
-      await expect(wallet.labelTokenSubtitle).toHaveCount(2);
+    await test.step('Toggle a random token', async () => {
       await wallet.manageTokenButton.click();
-      await expect(page.url()).toContain('manage-tokens');
-      await wallet.buttonBRC20.click();
-      await expect(wallet.checkboxTokenInactive.first()).toBeVisible();
-      const amounttokenBRC20 = await wallet.labelCoinTitle.count();
-      await expect(wallet.checkboxToken).toHaveCount(amounttokenBRC20);
-      await wallet.toggleAllTokens(true);
-      await expect(wallet.checkboxTokenActive).toHaveCount(amounttokenBRC20);
-      await expect(wallet.checkboxTokenInactive).toHaveCount(0);
+      await wallet.buttonRunes.click();
+
+      // NOTE: requires an account with at least 1 runes token with balance
+      await expect(wallet.checkboxTokenActive.first()).toBeVisible();
+
+      // disable a random token
+      const tokenName = await wallet.toggleRandomToken(false);
+
+      // expect token to be hidden on dashboard
+      const fetchTokens = page.waitForResponse((response) =>
+        response.url().includes('/runes/fiat-rates'),
+      );
       await wallet.buttonBack.click();
-      await expect(wallet.labelTokenSubtitle).toHaveCount(amounttokenBRC20 + 2);
-      await expect(wallet.balance).toBeVisible();
-      await expect(wallet.balance).toHaveText('$0.00');
-      balanceText = await wallet.getBalanceOfAllTokens();
-      await expect(balanceText).toBe(0);
-    });
+      await fetchTokens;
+      await expect(wallet.labelTokenSubtitle.getByText(tokenName, { exact: true })).toBeHidden();
 
-    await test.step('Disable all tokens', async () => {
-      await page.goto(`chrome-extension://${extensionId}/popup.html`);
-      await wallet.checkVisualsStartpage();
+      // enable the token again
       await wallet.manageTokenButton.click();
-      await expect(page.url()).toContain('manage-tokens');
-      await wallet.buttonBRC20.click();
-      await expect(wallet.checkboxTokenActive.first()).toBeVisible();
-      const amounttokenBRC20 = await wallet.labelCoinTitle.count();
-      await wallet.toggleAllTokens(false);
-      await expect(wallet.checkboxTokenActive).toHaveCount(0);
-      await expect(wallet.checkboxTokenInactive).toHaveCount(amounttokenBRC20);
+      await wallet.buttonRunes.click();
+      await page.getByTestId(tokenName).locator('label').click();
+
+      // expect to be visible again on dashboard
+      const fetchTokensAgain = page.waitForResponse((response) =>
+        response.url().includes('/runes/fiat-rates'),
+      );
       await wallet.buttonBack.click();
-      await expect(wallet.labelTokenSubtitle).toHaveCount(2);
-      // Check balances
-      await expect(wallet.balance).toBeVisible();
-      await expect(wallet.balance).toHaveText('$0.00');
-      const balanceText = await wallet.getBalanceOfAllTokens();
-      await expect(balanceText).toBe(0);
+      await fetchTokensAgain;
+      await expect(wallet.labelTokenSubtitle.getByText(tokenName, { exact: true })).toBeVisible();
     });
   });
 });
diff --git a/tests/specs/transactionHistory.spec.ts b/tests/specs/transactionHistory.spec.ts
index 51b4918c2..3acaccbeb 100644
--- a/tests/specs/transactionHistory.spec.ts
+++ b/tests/specs/transactionHistory.spec.ts
@@ -5,12 +5,11 @@ test.describe('Transaction', () => {
   test('Visual Check SIP 10 Token Transaction history mainnet', async ({ page, extensionId }) => {
     const wallet = new Wallet(page);
     await wallet.setupTest(extensionId, 'SEED_WORDS1', false);
-
-    const tokenName = await wallet.enableRandomToken('SIP10');
+    const tokenName = await wallet.selectLastToken('SIP10');
 
     await wallet.clickOnSpecificToken(tokenName);
 
-    await expect(page.url()).toContain('coinDashboard');
+    expect(page.url()).toContain('coinDashboard');
     // Check token detail page for token image and coin title
     await expect(wallet.imageToken).toBeVisible();
     await expect(wallet.textCoinTitle).toBeVisible();
@@ -26,10 +25,10 @@ test.describe('Transaction', () => {
   test('Visual Check BRC 20 Token Transaction history mainnet', async ({ page, extensionId }) => {
     const wallet = new Wallet(page);
     await wallet.setupTest(extensionId, 'SEED_WORDS1', false);
-    const tokenName = await wallet.enableRandomToken('BRC20');
+    const tokenName = await wallet.selectLastToken('BRC20');
 
     await wallet.clickOnSpecificToken(tokenName);
-    await expect(page.url()).toContain('coinDashboard');
+    expect(page.url()).toContain('coinDashboard');
     // Check token detail page for coin title
     await expect(wallet.textCoinTitle).toBeVisible();
     await expect(wallet.textCoinTitle).toContainText(tokenName);

From c6cb8cf354358d6c55865e1204bd7f8c4332b7e4 Mon Sep 17 00:00:00 2001
From: Victor Kirov <victor.kirov@gmail.com>
Date: Wed, 16 Oct 2024 10:52:46 +0300
Subject: [PATCH 176/227] Add native segwit support (#608)

* Prep for native segwit

* Update ledger confirmation screen to be stx specific

* bump core

* Migrate to new Core structure for accounts

* Prep for native segwit

* Remove unused type lib

* Fix address type selector styling

* Fix styling

* Fix get address hook to use react query

* Add bitcoin address balance breakdown

* Fix label

* Update core

* Add preferred btc address changer in balance screen

* Add address type switcher to receive component

* Hide address type selectors on ledger

* Fix some issues around ledger address type

* Fix some ledger issues

* Fix rerender issue

* Fix xverse api call issue

* Fix issue with xverse api call

* Ensure address type selector is only shown if multiple addresses exist

* Add address type to selectedAddress compiler

* Bump core

* Address PR review comments

* Rename filterLedgerAccountsByNetwork

* Remove extra function definition

* Remove custom check circle SVG

* [ENG-5261, ENG-5290, ENG-5291] Add change account sats connect event on selected account type switch + [ENG-4984,ENG- 5361,ENG-4983,ENG-5259] (#611)

* Add change account sats connect event on selected account type switch

* [ENG-5259]Default to native segwit and disable nested segwit for new wallets + [ENG-4984,ENG- 5361,ENG-4983] (#615)

* Disable nested segwit for new wallets

* Add switchPaymentAddressTypeEnabled to store migrations

* rename variable as per PR review

* [ENG-4983] Add address selector on btc send + [ENG-4984, ENG- 5361] (#618)

* Add address selector on btc send

* [ENG-4984] Add native segwit flow to onboarding and refactor account regeneration (#623)

* Add native segwit flow to onboarding and refactor account regeneration

* Clean up

* Up the account checks to 20

* Add both addresses to txn history

* Removed stale time

* refactored click prop

* Use styledP

* [ENG-5361] Add native segwit callouts and tooltips (#666)

* Start on native segwit modal

* Add useStorage

* Add alert tracker

* Add type safe migrations and enable native segwit alert shower in migration

* Extract receive sheet into its own component

* Add callout to receive sheet

* Add bitcoin address is native callout

* Add callout tooltip

* Make casing consistent

* Extract crossbutton to own component

* knip fixes

* Sip 10 token list is no longer prepopulated

* Merge issue

* Fix merge issue

* Fix banner carousel button propagation
---
 package-lock.json                             |  92 ++---
 package.json                                  |  16 +-
 src/app/App.tsx                               | 111 +++---
 .../components/accountRow/accountAvatar.tsx   |   4 +-
 src/app/components/accountRow/index.tsx       |  23 +-
 .../components/accountRow/lazyAccountRow.tsx  |  15 +-
 .../components/btcAddressTypeLabel/index.tsx  |  59 +++
 .../txInOutput/transactionInput.tsx           |  11 +-
 .../txInOutput/transactionOutput.tsx          |  17 +-
 src/app/components/guards/auth.tsx            |   4 +-
 .../addressTypeSelector.tsx                   |  32 ++
 .../components/preferredBtcAddress/index.tsx  | 126 +++++++
 .../preferredBtcAddressItem/index.tsx         |  82 ++++
 .../components/receiveCardComponent/index.tsx | 106 ++++--
 src/app/components/seedPhraseInput/index.tsx  |   2 +-
 src/app/components/tokenTile/index.tsx        |   4 +-
 src/app/components/tooltip/context.ts         |   8 +
 src/app/components/tooltip/index.tsx          |  93 +++++
 src/app/components/tooltip/provider.tsx       |  29 ++
 src/app/components/topRow/index.tsx           |  12 +-
 src/app/hooks/queries/useAccountBalance.ts    |  36 +-
 .../queries/useSelectedAccountBtcBalance.tsx  |  39 ++
 src/app/hooks/queries/useTransactions.ts      |  20 +-
 src/app/hooks/useAvatarCleanup.ts             |  36 +-
 src/app/hooks/useBtcAddressBalance.ts         |  29 ++
 src/app/hooks/useCanUserSwitchPaymentType.ts  |  13 +
 src/app/hooks/useSanityCheck.ts               |  10 +-
 src/app/hooks/useSelectedAccount.ts           |  46 ++-
 src/app/hooks/useStorage.ts                   |  45 +++
 src/app/hooks/useTransactionContext.ts        |   7 +-
 src/app/hooks/useWalletReducer.ts             | 320 ++++++++++------
 src/app/hooks/useWalletSelector.ts            |   4 +-
 src/app/routes/index.tsx                      |   9 +
 src/app/routes/paths.ts                       |   1 +
 src/app/screens/accountList/index.tsx         |  10 +-
 src/app/screens/coinDashboard/coinHeader.tsx  |   8 +-
 .../coins/btc/addressBalance.tsx              | 117 ++++++
 .../coins/btc/balanceBreakdown.tsx            |  53 +++
 .../screens/coinDashboard/coins/btc/index.tsx |  77 ++++
 src/app/screens/coinDashboard/coins/other.tsx | 248 ++++++++++++
 src/app/screens/coinDashboard/index.styled.ts | 120 ++++++
 src/app/screens/coinDashboard/index.tsx       | 353 +-----------------
 .../screens/confirmNftTransaction/index.tsx   |  10 +-
 src/app/screens/connect/selectAccount.tsx     |   2 +-
 .../screens/home/announcementModal/index.tsx  |  43 +++
 .../home/announcementModal/nativeSegWit.tsx   |  66 ++++
 src/app/screens/home/balanceCard/index.tsx    |  16 +-
 src/app/screens/home/bannerCarousel.tsx       |  12 +-
 src/app/screens/home/index.styled.ts          |   8 +-
 src/app/screens/home/index.tsx                | 168 +--------
 src/app/screens/home/receiveSheet.tsx         | 204 ++++++++++
 src/app/screens/landing/index.tsx             |  51 ++-
 .../screens/ledger/addStxAddress/index.tsx    |  10 +-
 .../ledger/importLedgerAccount/index.tsx      |  28 +-
 src/app/screens/nftDetail/index.tsx           |  27 +-
 src/app/screens/ordinalDetail/index.tsx       |  28 +-
 src/app/screens/ordinalsCollection/index.tsx  |  12 +-
 src/app/screens/receive/index.tsx             |  96 ++++-
 .../screens/restoreWallet/enterSeedphrase.tsx |  14 +-
 src/app/screens/restoreWallet/index.tsx       |  62 +--
 .../paymentAddressTypeSelector.tsx            | 148 ++++++++
 src/app/screens/sendBtc/accountSelector.tsx   |  95 +++++
 src/app/screens/sendBtc/amountSelector.tsx    |  20 +-
 src/app/screens/sendBtc/index.tsx             |  33 +-
 src/app/screens/sendBtc/stepDisplay.tsx       |  68 ++--
 src/app/screens/sendBtc/steps.tsx             |  15 +-
 src/app/screens/sendBtc/title.tsx             |  29 ++
 src/app/screens/sendOrdinal/index.tsx         |  10 +-
 src/app/screens/settings/advanced/index.tsx   |  32 +-
 .../paymentAddressTypeSelector/index.tsx      |  63 ++++
 .../screens/settings/changeNetwork/index.tsx  |   4 +
 .../settings/changeNetwork/networkRow.tsx     |   4 +-
 .../settings/changeNetwork/nodeInput.tsx      |  10 +-
 .../useSignMessageRequest.ts                  |  22 +-
 src/app/stores/index.ts                       | 138 +++++--
 .../stores/wallet/actions/actionCreators.ts   |  20 +-
 .../stores/wallet/actions/migrationTypes.ts   | 162 ++++++++
 src/app/stores/wallet/actions/types.ts        |  20 +-
 src/app/stores/wallet/reducer.ts              |  23 +-
 src/app/ui-components/btcAmountSelector.tsx   |  11 +-
 src/app/ui-library/callout.tsx                |   9 +-
 src/app/ui-library/crossButton.tsx            |  44 +++
 src/app/ui-library/sheet.tsx                  |  47 +--
 src/app/utils/alertTracker.ts                 |  47 +++
 src/app/utils/gradient.ts                     |   5 +-
 src/app/utils/helper.ts                       |  12 +-
 src/assets/img/btcFlashy.svg                  |  41 ++
 src/common/utils/getSelectedAccount.ts        |  40 +-
 src/common/utils/ledger.ts                    |   6 +-
 .../dispatchEvent/index.ts                    |   4 +-
 .../extensionToContentScript/utils/index.ts   |  12 +-
 .../rpc/btc/getAddresses/getAddresses.ts      |   6 +-
 .../utils/rpc/btc/getAddresses/utils.ts       |   6 +-
 src/common/utils/rpc/btc/getBalance.ts        |   7 +-
 .../utils/rpc/ordinals/getInscriptions.ts     |   2 +-
 src/common/utils/rpc/runes/getBalance.ts      |   4 +-
 .../utils/rpc/wallet/requestPermissions.ts    |  18 +-
 src/locales/en.json                           |  60 ++-
 src/theme/index.ts                            |   3 +
 99 files changed, 3432 insertions(+), 1172 deletions(-)
 create mode 100644 src/app/components/btcAddressTypeLabel/index.tsx
 create mode 100644 src/app/components/preferredBtcAddress/addressTypeSelector.tsx
 create mode 100644 src/app/components/preferredBtcAddress/index.tsx
 create mode 100644 src/app/components/preferredBtcAddressItem/index.tsx
 create mode 100644 src/app/components/tooltip/context.ts
 create mode 100644 src/app/components/tooltip/index.tsx
 create mode 100644 src/app/components/tooltip/provider.tsx
 create mode 100644 src/app/hooks/queries/useSelectedAccountBtcBalance.tsx
 create mode 100644 src/app/hooks/useBtcAddressBalance.ts
 create mode 100644 src/app/hooks/useCanUserSwitchPaymentType.ts
 create mode 100644 src/app/hooks/useStorage.ts
 create mode 100644 src/app/screens/coinDashboard/coins/btc/addressBalance.tsx
 create mode 100644 src/app/screens/coinDashboard/coins/btc/balanceBreakdown.tsx
 create mode 100644 src/app/screens/coinDashboard/coins/btc/index.tsx
 create mode 100644 src/app/screens/coinDashboard/coins/other.tsx
 create mode 100644 src/app/screens/coinDashboard/index.styled.ts
 create mode 100644 src/app/screens/home/announcementModal/index.tsx
 create mode 100644 src/app/screens/home/announcementModal/nativeSegWit.tsx
 create mode 100644 src/app/screens/home/receiveSheet.tsx
 create mode 100644 src/app/screens/restoreWallet/paymentAddressTypeSelector.tsx
 create mode 100644 src/app/screens/sendBtc/accountSelector.tsx
 create mode 100644 src/app/screens/sendBtc/title.tsx
 create mode 100644 src/app/screens/settings/advanced/paymentAddressTypeSelector/index.tsx
 create mode 100644 src/app/stores/wallet/actions/migrationTypes.ts
 create mode 100644 src/app/ui-library/crossButton.tsx
 create mode 100644 src/app/utils/alertTracker.ts
 create mode 100644 src/assets/img/btcFlashy.svg

diff --git a/package-lock.json b/package-lock.json
index 7d7c77fb0..0d6b48d78 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -10,11 +10,13 @@
       "dependencies": {
         "@aryzing/superqs": "0.0.6",
         "@ledgerhq/hw-transport-webusb": "^6.27.13",
+        "@noble/hashes": "^1.5.0",
         "@phosphor-icons/react": "^2.1.0",
         "@playwright/test": "1.46.1",
         "@react-spring/web": "^9.6.1",
         "@sats-connect/core": "0.3.0",
-        "@secretkeylabs/xverse-core": "24.2.0",
+        "@scure/btc-signer": "1.2.1",
+        "@secretkeylabs/xverse-core": "26.0.0",
         "@stacks/connect": "7.4.1",
         "@stacks/stacks-blockchain-api-types": "6.1.1",
         "@stacks/transactions": "6.16.1",
@@ -938,7 +940,7 @@
         "url": "https://paulmillr.com/funding/"
       }
     },
-    "node_modules/@noble/hashes": {
+    "node_modules/@noble/curves/node_modules/@noble/hashes": {
       "version": "1.3.3",
       "resolved": "https://registry.npmjs.org/@noble/hashes/-/hashes-1.3.3.tgz",
       "integrity": "sha512-V7/fPHgl+jsVPXqqeOzT8egNj2iBIVt+ECeMMG8TdcnTikP3oaBtUVqpT/gYCR68aEBJSF+XbYUxStjbFMqIIA==",
@@ -949,6 +951,17 @@
         "url": "https://paulmillr.com/funding/"
       }
     },
+    "node_modules/@noble/hashes": {
+      "version": "1.5.0",
+      "resolved": "https://registry.npmjs.org/@noble/hashes/-/hashes-1.5.0.tgz",
+      "integrity": "sha512-1j6kQFb7QRru7eKN3ZDvRcP13rugwdxZqCjbiAVZfIJwgj2A65UmT4TgARXGlXgnRkORLTDTrO19ZErt7+QXgA==",
+      "engines": {
+        "node": "^14.21.3 || >=16"
+      },
+      "funding": {
+        "url": "https://paulmillr.com/funding/"
+      }
+    },
     "node_modules/@noble/secp256k1": {
       "version": "1.7.1",
       "resolved": "https://registry.npmjs.org/@noble/secp256k1/-/secp256k1-1.7.1.tgz",
@@ -1216,17 +1229,6 @@
         "url": "https://paulmillr.com/funding/"
       }
     },
-    "node_modules/@scure/bip32/node_modules/@noble/hashes": {
-      "version": "1.5.0",
-      "resolved": "https://registry.npmjs.org/@noble/hashes/-/hashes-1.5.0.tgz",
-      "integrity": "sha512-1j6kQFb7QRru7eKN3ZDvRcP13rugwdxZqCjbiAVZfIJwgj2A65UmT4TgARXGlXgnRkORLTDTrO19ZErt7+QXgA==",
-      "engines": {
-        "node": "^14.21.3 || >=16"
-      },
-      "funding": {
-        "url": "https://paulmillr.com/funding/"
-      }
-    },
     "node_modules/@scure/bip39": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/@scure/bip39/-/bip39-1.1.0.tgz",
@@ -1269,10 +1271,21 @@
         "url": "https://paulmillr.com/funding/"
       }
     },
+    "node_modules/@scure/btc-signer/node_modules/@noble/hashes": {
+      "version": "1.3.3",
+      "resolved": "https://registry.npmjs.org/@noble/hashes/-/hashes-1.3.3.tgz",
+      "integrity": "sha512-V7/fPHgl+jsVPXqqeOzT8egNj2iBIVt+ECeMMG8TdcnTikP3oaBtUVqpT/gYCR68aEBJSF+XbYUxStjbFMqIIA==",
+      "engines": {
+        "node": ">= 16"
+      },
+      "funding": {
+        "url": "https://paulmillr.com/funding/"
+      }
+    },
     "node_modules/@secretkeylabs/xverse-core": {
-      "version": "24.2.0",
-      "resolved": "https://npm.pkg.github.com/download/@secretkeylabs/xverse-core/24.2.0/67ae914442d4276dcfd0d1e3b8bdf623133557bb",
-      "integrity": "sha512-mBxIPL6jmGhRZLpUBL0ztTvBporCL/1CzTsz42/XZo7WFZIFfb1Arj2oQkeT+AngV+bf1CH60cV2vXnqH0mYkQ==",
+      "version": "26.0.0",
+      "resolved": "https://npm.pkg.github.com/download/@secretkeylabs/xverse-core/26.0.0/1ae56e20c7fc38d32cae5c38d51b708a88f17957",
+      "integrity": "sha512-PCcreXqcLCTMtgwCyVZT9EYKZgEWtPk3EAYBCw9dpIcqoFDywxvRyl70Sg1eiVs0YJPinEgW2/JJgmlZcDf/eA==",
       "license": "ISC",
       "dependencies": {
         "@bitcoinerlab/secp256k1": "^1.0.2",
@@ -1326,17 +1339,6 @@
         "react-dom": ">18.0.0"
       }
     },
-    "node_modules/@secretkeylabs/xverse-core/node_modules/@noble/hashes": {
-      "version": "1.5.0",
-      "resolved": "https://registry.npmjs.org/@noble/hashes/-/hashes-1.5.0.tgz",
-      "integrity": "sha512-1j6kQFb7QRru7eKN3ZDvRcP13rugwdxZqCjbiAVZfIJwgj2A65UmT4TgARXGlXgnRkORLTDTrO19ZErt7+QXgA==",
-      "engines": {
-        "node": "^14.21.3 || >=16"
-      },
-      "funding": {
-        "url": "https://paulmillr.com/funding/"
-      }
-    },
     "node_modules/@secretkeylabs/xverse-core/node_modules/@scure/bip39": {
       "version": "1.4.0",
       "resolved": "https://registry.npmjs.org/@scure/bip39/-/bip39-1.4.0.tgz",
@@ -13425,12 +13427,19 @@
       "integrity": "sha512-t01iSXPuN+Eqzb4eBX0S5oubSqXbK/xXa1Ne18Hj8f9pStxztHCE2gfboSp/dZRLSqfuLpRK2nDXDK+W9puocA==",
       "requires": {
         "@noble/hashes": "1.3.3"
+      },
+      "dependencies": {
+        "@noble/hashes": {
+          "version": "1.3.3",
+          "resolved": "https://registry.npmjs.org/@noble/hashes/-/hashes-1.3.3.tgz",
+          "integrity": "sha512-V7/fPHgl+jsVPXqqeOzT8egNj2iBIVt+ECeMMG8TdcnTikP3oaBtUVqpT/gYCR68aEBJSF+XbYUxStjbFMqIIA=="
+        }
       }
     },
     "@noble/hashes": {
-      "version": "1.3.3",
-      "resolved": "https://registry.npmjs.org/@noble/hashes/-/hashes-1.3.3.tgz",
-      "integrity": "sha512-V7/fPHgl+jsVPXqqeOzT8egNj2iBIVt+ECeMMG8TdcnTikP3oaBtUVqpT/gYCR68aEBJSF+XbYUxStjbFMqIIA=="
+      "version": "1.5.0",
+      "resolved": "https://registry.npmjs.org/@noble/hashes/-/hashes-1.5.0.tgz",
+      "integrity": "sha512-1j6kQFb7QRru7eKN3ZDvRcP13rugwdxZqCjbiAVZfIJwgj2A65UmT4TgARXGlXgnRkORLTDTrO19ZErt7+QXgA=="
     },
     "@noble/secp256k1": {
       "version": "1.7.1",
@@ -13599,11 +13608,6 @@
           "requires": {
             "@noble/hashes": "1.5.0"
           }
-        },
-        "@noble/hashes": {
-          "version": "1.5.0",
-          "resolved": "https://registry.npmjs.org/@noble/hashes/-/hashes-1.5.0.tgz",
-          "integrity": "sha512-1j6kQFb7QRru7eKN3ZDvRcP13rugwdxZqCjbiAVZfIJwgj2A65UmT4TgARXGlXgnRkORLTDTrO19ZErt7+QXgA=="
         }
       }
     },
@@ -13632,12 +13636,19 @@
         "@noble/hashes": "~1.3.3",
         "@scure/base": "~1.1.5",
         "micro-packed": "~0.5.1"
+      },
+      "dependencies": {
+        "@noble/hashes": {
+          "version": "1.3.3",
+          "resolved": "https://registry.npmjs.org/@noble/hashes/-/hashes-1.3.3.tgz",
+          "integrity": "sha512-V7/fPHgl+jsVPXqqeOzT8egNj2iBIVt+ECeMMG8TdcnTikP3oaBtUVqpT/gYCR68aEBJSF+XbYUxStjbFMqIIA=="
+        }
       }
     },
     "@secretkeylabs/xverse-core": {
-      "version": "24.2.0",
-      "resolved": "https://npm.pkg.github.com/download/@secretkeylabs/xverse-core/24.2.0/67ae914442d4276dcfd0d1e3b8bdf623133557bb",
-      "integrity": "sha512-mBxIPL6jmGhRZLpUBL0ztTvBporCL/1CzTsz42/XZo7WFZIFfb1Arj2oQkeT+AngV+bf1CH60cV2vXnqH0mYkQ==",
+      "version": "26.0.0",
+      "resolved": "https://npm.pkg.github.com/download/@secretkeylabs/xverse-core/26.0.0/1ae56e20c7fc38d32cae5c38d51b708a88f17957",
+      "integrity": "sha512-PCcreXqcLCTMtgwCyVZT9EYKZgEWtPk3EAYBCw9dpIcqoFDywxvRyl70Sg1eiVs0YJPinEgW2/JJgmlZcDf/eA==",
       "requires": {
         "@bitcoinerlab/secp256k1": "^1.0.2",
         "@noble/curves": "^1.2.0",
@@ -13681,11 +13692,6 @@
         "varuint-bitcoin": "^1.1.2"
       },
       "dependencies": {
-        "@noble/hashes": {
-          "version": "1.5.0",
-          "resolved": "https://registry.npmjs.org/@noble/hashes/-/hashes-1.5.0.tgz",
-          "integrity": "sha512-1j6kQFb7QRru7eKN3ZDvRcP13rugwdxZqCjbiAVZfIJwgj2A65UmT4TgARXGlXgnRkORLTDTrO19ZErt7+QXgA=="
-        },
         "@scure/bip39": {
           "version": "1.4.0",
           "resolved": "https://registry.npmjs.org/@scure/bip39/-/bip39-1.4.0.tgz",
diff --git a/package.json b/package.json
index a7ad4f339..7a308ca62 100644
--- a/package.json
+++ b/package.json
@@ -7,16 +7,16 @@
     "node": "^18.18.2"
   },
   "scripts": {
-    "build": "npm run clean && NODE_ENV=production npx node webpack/utils/build.js",
+    "build": "npm run clean && NODE_ENV=production node webpack/utils/build.js",
     "build-named": "npm run clean && NODE_ENV=production node scripts/build-named.js",
-    "start": "npx node webpack/utils/devServer.js",
+    "start": "node webpack/utils/devServer.js",
     "clean": "rimraf build",
     "style": "prettier --write \"src/**/*.{ts,tsx}\"",
     "prepare": "husky install",
-    "e2etest": "npx playwright test -g \"\" --grep-invert \"#localexecution\"",
-    "e2etest:ui": "npx playwright test --ui",
-    "e2etest:smoketest": "npx playwright test --grep \"#smoketest\"",
-    "e2etest:skipped": "npx playwright test --grep \"#localexecution\" --workers=1",
+    "e2etest": "playwright test -g \"\" --grep-invert \"#localexecution\"",
+    "e2etest:ui": "playwright test --ui",
+    "e2etest:smoketest": "playwright test --grep \"#smoketest\"",
+    "e2etest:skipped": "playwright test --grep \"#localexecution\" --workers=1",
     "e2etest:report": "playwright show-report",
     "knip": "knip",
     "ts-check": "tsc --noEmit",
@@ -38,11 +38,13 @@
   "dependencies": {
     "@aryzing/superqs": "0.0.6",
     "@ledgerhq/hw-transport-webusb": "^6.27.13",
+    "@noble/hashes": "^1.5.0",
     "@phosphor-icons/react": "^2.1.0",
     "@playwright/test": "1.46.1",
     "@react-spring/web": "^9.6.1",
     "@sats-connect/core": "0.3.0",
-    "@secretkeylabs/xverse-core": "24.2.0",
+    "@scure/btc-signer": "1.2.1",
+    "@secretkeylabs/xverse-core": "26.0.0",
     "@stacks/connect": "7.4.1",
     "@stacks/stacks-blockchain-api-types": "6.1.1",
     "@stacks/transactions": "6.16.1",
diff --git a/src/app/App.tsx b/src/app/App.tsx
index 97cd485a2..a323fc46c 100644
--- a/src/app/App.tsx
+++ b/src/app/App.tsx
@@ -1,6 +1,7 @@
 import { PermissionsProvider } from '@components/permissionsManager';
 import StartupLoadingScreen from '@components/startupLoadingScreen';
 import Toaster from '@components/toaster';
+import TooltipProvider from '@components/tooltip/provider';
 import { CheckCircle, XCircle } from '@phosphor-icons/react';
 import { setXClientVersion } from '@secretkeylabs/xverse-core';
 import rootStore from '@stores/index';
@@ -34,63 +35,65 @@ function App(): React.ReactNode {
     <>
       <GlobalStyle />
       <ThemeProvider theme={Theme}>
-        <QueryClientProvider client={queryClient}>
-          <ReactQueryDevtools initialIsOpen={false} />
-          <Provider store={rootStore.store}>
-            <PersistGate persistor={rootStore.persistor} loading={<StartupLoadingScreen />}>
-              <SessionGuard>
-                <PermissionsProvider>
-                  <RouterProvider router={router} />
-                  <Toaster
-                    max={1}
-                    position="bottom-center"
-                    containerStyle={{ bottom: 32 }}
-                    toastOptions={{
-                      duration: 2000,
-                      success: {
-                        icon: (
-                          <StyledIcon>
-                            <CheckCircle size={20} weight="bold" />
-                          </StyledIcon>
-                        ),
-                        style: {
-                          ...Theme.typography.body_medium_m,
-                          backgroundColor: Theme.colors.success_medium,
-                          borderRadius: Theme.radius(2),
-                          padding: Theme.space.s,
-                          color: Theme.colors.elevation0,
+        <TooltipProvider>
+          <QueryClientProvider client={queryClient}>
+            <ReactQueryDevtools initialIsOpen={false} />
+            <Provider store={rootStore.store}>
+              <PersistGate persistor={rootStore.persistor} loading={<StartupLoadingScreen />}>
+                <SessionGuard>
+                  <PermissionsProvider>
+                    <RouterProvider router={router} />
+                    <Toaster
+                      max={1}
+                      position="bottom-center"
+                      containerStyle={{ bottom: 32 }}
+                      toastOptions={{
+                        duration: 2000,
+                        success: {
+                          icon: (
+                            <StyledIcon>
+                              <CheckCircle size={20} weight="bold" />
+                            </StyledIcon>
+                          ),
+                          style: {
+                            ...Theme.typography.body_medium_m,
+                            backgroundColor: Theme.colors.success_medium,
+                            borderRadius: Theme.radius(2),
+                            padding: Theme.space.s,
+                            color: Theme.colors.elevation0,
+                          },
                         },
-                      },
-                      error: {
-                        icon: (
-                          <StyledIcon>
-                            <XCircle size={20} weight="bold" />
-                          </StyledIcon>
-                        ),
-                        style: {
-                          ...Theme.typography.body_medium_m,
-                          backgroundColor: Theme.colors.danger_dark,
-                          borderRadius: Theme.radius(2),
-                          padding: Theme.space.s,
-                          color: Theme.colors.white_0,
+                        error: {
+                          icon: (
+                            <StyledIcon>
+                              <XCircle size={20} weight="bold" />
+                            </StyledIcon>
+                          ),
+                          style: {
+                            ...Theme.typography.body_medium_m,
+                            backgroundColor: Theme.colors.danger_dark,
+                            borderRadius: Theme.radius(2),
+                            padding: Theme.space.s,
+                            color: Theme.colors.white_0,
+                          },
                         },
-                      },
-                      blank: {
-                        style: {
-                          ...Theme.typography.body_medium_m,
-                          backgroundColor: Theme.colors.white_0,
-                          borderRadius: Theme.radius(2),
-                          padding: Theme.space.s,
-                          color: Theme.colors.elevation0,
+                        blank: {
+                          style: {
+                            ...Theme.typography.body_medium_m,
+                            backgroundColor: Theme.colors.white_0,
+                            borderRadius: Theme.radius(2),
+                            padding: Theme.space.s,
+                            color: Theme.colors.elevation0,
+                          },
                         },
-                      },
-                    }}
-                  />
-                </PermissionsProvider>
-              </SessionGuard>
-            </PersistGate>
-          </Provider>
-        </QueryClientProvider>
+                      }}
+                    />
+                  </PermissionsProvider>
+                </SessionGuard>
+              </PersistGate>
+            </Provider>
+          </QueryClientProvider>
+        </TooltipProvider>
       </ThemeProvider>
     </>
   );
diff --git a/src/app/components/accountRow/accountAvatar.tsx b/src/app/components/accountRow/accountAvatar.tsx
index c8e28463c..5c678cbbd 100644
--- a/src/app/components/accountRow/accountAvatar.tsx
+++ b/src/app/components/accountRow/accountAvatar.tsx
@@ -10,7 +10,7 @@ type Props = {
   account: Account | null;
   isSelected: boolean;
   isAccountListView?: boolean;
-  avatar?: AvatarInfo | null;
+  avatar?: AvatarInfo;
 };
 
 function AccountAvatar({ account, avatar, isSelected, isAccountListView = false }: Props) {
@@ -30,7 +30,7 @@ function AccountAvatar({ account, avatar, isSelected, isAccountListView = false
     );
   }
 
-  const gradient = getAccountGradient(account?.stxAddress || account?.btcAddress!);
+  const gradient = getAccountGradient(account);
 
   return (
     <GradientCircle
diff --git a/src/app/components/accountRow/index.tsx b/src/app/components/accountRow/index.tsx
index 05d3743ce..579c3db7a 100644
--- a/src/app/components/accountRow/index.tsx
+++ b/src/app/components/accountRow/index.tsx
@@ -13,7 +13,7 @@ import Sheet from '@ui-library/sheet';
 import SnackBar from '@ui-library/snackBar';
 import Spinner from '@ui-library/spinner';
 import { EMPTY_LABEL, LoaderSize } from '@utils/constants';
-import { isLedgerAccount, validateAccountName } from '@utils/helper';
+import { getAccountBalanceKey, isLedgerAccount, validateAccountName } from '@utils/helper';
 import { useEffect, useRef, useState } from 'react';
 import toast from 'react-hot-toast';
 import { useTranslation } from 'react-i18next';
@@ -62,8 +62,10 @@ function AccountRow({
   });
   const { accountsList, ledgerAccountsList, fiatCurrency, accountBalances, avatarIds } =
     useWalletSelector();
-  const accountAvatar = avatarIds[account?.btcAddress ?? ''];
-  const totalBalance = accountBalances[account?.btcAddress ?? ''];
+  const selectedAvatar = avatarIds[account?.btcAddresses.taproot.address ?? ''];
+  // TODO: refactor this into a hook
+  const totalBalance = accountBalances[getAccountBalanceKey(account)];
+
   const btcCopiedTooltipTimeoutRef = useRef<NodeJS.Timeout | undefined>();
   const stxCopiedTooltipTimeoutRef = useRef<NodeJS.Timeout | undefined>();
   const [showRemoveAccountModal, setShowRemoveAccountModal] = useState(false);
@@ -71,7 +73,8 @@ function AccountRow({
   const [accountName, setAccountName] = useState('');
   const [accountNameError, setAccountNameError] = useState<string | null>(null);
   const [isAccountNameChangeLoading, setIsAccountNameChangeLoading] = useState(false);
-  const { removeLedgerAccount, renameAccount, updateLedgerAccounts } = useWalletReducer();
+
+  const { removeLedgerAccount, renameSoftwareAccount, updateLedgerAccounts } = useWalletReducer();
 
   useEffect(
     () => () => {
@@ -116,7 +119,9 @@ function AccountRow({
   };
 
   const handleRemoveAvatar = () => {
-    dispatch(removeAccountAvatarAction({ address: account?.btcAddress ?? '' }));
+    if (!account) return;
+
+    dispatch(removeAccountAvatarAction({ address: account?.btcAddresses.taproot.address }));
     toast.custom(
       <SnackBar text={optionsDialogTranslation('NFT_AVATAR.REMOVE_TOAST')} type="neutral" />,
     );
@@ -157,7 +162,7 @@ function AccountRow({
       if (isLedgerAccount(account)) {
         await updateLedgerAccounts({ ...account, accountName });
       } else {
-        await renameAccount({ ...account, accountName });
+        await renameSoftwareAccount({ ...account, accountName });
       }
       handleRenameAccountModalClose();
     } catch (err) {
@@ -177,7 +182,7 @@ function AccountRow({
       if (isLedgerAccount(account)) {
         updateLedgerAccounts({ ...account, accountName: undefined });
       } else {
-        renameAccount({ ...account, accountName: undefined });
+        renameSoftwareAccount({ ...account, accountName: undefined });
       }
       setAccountName('');
       handleRenameAccountModalClose();
@@ -193,7 +198,7 @@ function AccountRow({
       <AccountInfoContainer $disableClick={disabledAccountSelect} onClick={handleClick}>
         <AccountAvatar
           account={account}
-          avatar={accountAvatar}
+          avatar={selectedAvatar}
           isSelected={isSelected}
           isAccountListView={isAccountListView}
         />
@@ -253,7 +258,7 @@ function AccountRow({
           <ButtonRow onClick={handleRenameAccountModalOpen}>
             {optionsDialogTranslation('RENAME_ACCOUNT')}
           </ButtonRow>
-          {accountAvatar?.type && (
+          {selectedAvatar?.type && (
             <ButtonRow onClick={handleRemoveAvatar}>
               {optionsDialogTranslation('NFT_AVATAR.REMOVE_ACTION')}
             </ButtonRow>
diff --git a/src/app/components/accountRow/lazyAccountRow.tsx b/src/app/components/accountRow/lazyAccountRow.tsx
index 486b71d5f..b79353cf0 100644
--- a/src/app/components/accountRow/lazyAccountRow.tsx
+++ b/src/app/components/accountRow/lazyAccountRow.tsx
@@ -1,6 +1,7 @@
 import useIntersectionObserver from '@hooks/useIntersectionObserver';
 import useWalletSelector from '@hooks/useWalletSelector';
 import type { Account } from '@secretkeylabs/xverse-core';
+import { getAccountBalanceKey } from '@utils/helper';
 import { useEffect, useRef, useState } from 'react';
 import AccountRow from '.';
 
@@ -16,17 +17,23 @@ type Props = {
 function LazyAccountRow(props: Props) {
   const { fetchBalance, account } = props;
   const { accountBalances } = useWalletSelector();
-  const totalBalance = accountBalances[account?.btcAddress ?? ''];
   const [shouldFetch, setShouldFetch] = useState(false);
   const ref = useRef(null);
 
   useIntersectionObserver(ref, () => setShouldFetch(true), {});
 
   useEffect(() => {
-    if (fetchBalance && shouldFetch && !totalBalance) {
-      fetchBalance(account);
+    if (
+      !shouldFetch ||
+      !fetchBalance ||
+      !account ||
+      getAccountBalanceKey(account) in accountBalances
+    ) {
+      return;
     }
-  }, [shouldFetch, totalBalance]);
+
+    fetchBalance(account);
+  }, [account, shouldFetch]);
 
   return (
     <div ref={ref}>
diff --git a/src/app/components/btcAddressTypeLabel/index.tsx b/src/app/components/btcAddressTypeLabel/index.tsx
new file mode 100644
index 000000000..8e5d59b74
--- /dev/null
+++ b/src/app/components/btcAddressTypeLabel/index.tsx
@@ -0,0 +1,59 @@
+import * as btc from '@scure/btc-signer';
+import type { BtcAddressType, NetworkType } from '@secretkeylabs/xverse-core';
+import styled from 'styled-components';
+
+const LabelContainer = styled.div((props) => ({
+  backgroundColor: props.theme.colors.white_900,
+  borderRadius: '6px',
+  padding: '3px 8px',
+}));
+
+const labelMap: Record<BtcAddressType, string> = {
+  native: 'Native SegWit',
+  nested: 'Nested SegWit',
+  taproot: 'Taproot',
+};
+
+type BtcAddressTypeLabelProps = {
+  addressType: BtcAddressType;
+};
+
+export function BtcAddressTypeLabel({ addressType }: BtcAddressTypeLabelProps) {
+  return <LabelContainer>{labelMap[addressType]}</LabelContainer>;
+}
+
+type BtcAddressTypeForAddressLabelProps = {
+  address: string;
+  network: NetworkType;
+};
+
+export function BtcAddressTypeForAddressLabel({
+  address,
+  network,
+}: BtcAddressTypeForAddressLabelProps) {
+  try {
+    const addressMetadata = btc
+      .Address(network === 'Mainnet' ? btc.NETWORK : btc.TEST_NETWORK)
+      .decode(address);
+
+    let addressType: BtcAddressType;
+
+    switch (addressMetadata.type) {
+      case 'sh':
+        addressType = 'nested';
+        break;
+      case 'wpkh':
+        addressType = 'native';
+        break;
+      case 'tr':
+        addressType = 'taproot';
+        break;
+      default:
+        return null;
+    }
+
+    return <BtcAddressTypeLabel addressType={addressType} />;
+  } catch (e) {
+    return null;
+  }
+}
diff --git a/src/app/components/confirmBtcTransaction/txInOutput/transactionInput.tsx b/src/app/components/confirmBtcTransaction/txInOutput/transactionInput.tsx
index 438843d94..a89af0725 100644
--- a/src/app/components/confirmBtcTransaction/txInOutput/transactionInput.tsx
+++ b/src/app/components/confirmBtcTransaction/txInOutput/transactionInput.tsx
@@ -28,19 +28,18 @@ type Props = {
 };
 
 function TransactionInput({ input }: Props) {
-  const { btcAddress, ordinalsAddress } = useSelectedAccount();
+  const { btcAddresses } = useSelectedAccount();
   const { t } = useTranslation('translation', { keyPrefix: 'CONFIRM_TRANSACTION' });
 
-  const isPaymentsAddress = input.extendedUtxo.address === btcAddress;
-  const isOrdinalsAddress = input.extendedUtxo.address === ordinalsAddress;
-  const isExternalInput = !isPaymentsAddress && !isOrdinalsAddress;
+  const userAddresses = Object.values(btcAddresses).map((address) => address.address);
+  const isExternalInput = userAddresses.every((address) => address !== input.extendedUtxo.address);
 
   // TODO: show this in the UI?
   // const insecureInput =
   //   input.sigHash === btc.SigHash.NONE || input.sigHash === btc.SigHash.NONE_ANYONECANPAY;
 
   const renderAddress = (addressToBeDisplayed: string) =>
-    addressToBeDisplayed === btcAddress || addressToBeDisplayed === ordinalsAddress ? (
+    userAddresses.some((address) => address === addressToBeDisplayed) ? (
       <TxIdContainer>
         <SubValueText data-testid="address-send" typography="body_medium_s">
           {getTruncatedAddress(addressToBeDisplayed)}
@@ -59,7 +58,7 @@ function TransactionInput({ input }: Props) {
         icon={InputIcon}
         hideAddress
         dataTestID="confirm-balance"
-        hideCopyButton={isPaymentsAddress || isOrdinalsAddress}
+        hideCopyButton={!isExternalInput}
         amount={`${satsToBtc(
           new BigNumber(input.extendedUtxo.utxo.value.toString()),
         ).toFixed()} BTC`}
diff --git a/src/app/components/confirmBtcTransaction/txInOutput/transactionOutput.tsx b/src/app/components/confirmBtcTransaction/txInOutput/transactionOutput.tsx
index 7d466f7b6..ec18a8f8f 100644
--- a/src/app/components/confirmBtcTransaction/txInOutput/transactionOutput.tsx
+++ b/src/app/components/confirmBtcTransaction/txInOutput/transactionOutput.tsx
@@ -34,17 +34,24 @@ type Props = {
 };
 
 function TransactionOutput({ output, scriptOutputCount }: Props) {
-  const { btcAddress, ordinalsAddress, btcPublicKey, ordinalsPublicKey } = useSelectedAccount();
   const { t } = useTranslation('translation', { keyPrefix: 'CONFIRM_TRANSACTION' });
+
+  const { btcAddresses, btcPublicKey, ordinalsPublicKey } = useSelectedAccount();
+
+  const userAddresses = Object.values(btcAddresses).map((address) => address.address);
+
   const isOutputWithScript = output.type === 'script';
   const isOutputWithAddress = output.type === 'address';
   const isOutputWithPubKey = !isOutputWithScript && !isOutputWithAddress;
 
+  const isOutputToOwnAddress =
+    isOutputWithScript || isOutputWithPubKey
+      ? false
+      : userAddresses.some((address) => address === output.address);
+
   const detailViewIcon = isOutputWithScript ? ScriptIcon : OutputIcon;
   const detailViewHideCopyButton =
-    isOutputWithScript || isOutputWithPubKey
-      ? true
-      : btcAddress === output.address || ordinalsAddress === output.address;
+    isOutputWithScript || isOutputWithPubKey ? true : isOutputToOwnAddress;
 
   const detailView = () => {
     if (isOutputWithScript) {
@@ -67,7 +74,7 @@ function TransactionOutput({ output, scriptOutputCount }: Props) {
       );
     }
 
-    if (output.address === btcAddress || output.address === ordinalsAddress) {
+    if (isOutputToOwnAddress) {
       return (
         <TxIdContainer>
           <SubValueText data-testid="address-receive" typography="body_medium_s">
diff --git a/src/app/components/guards/auth.tsx b/src/app/components/guards/auth.tsx
index 9a8eac8c5..ec3251d96 100644
--- a/src/app/components/guards/auth.tsx
+++ b/src/app/components/guards/auth.tsx
@@ -66,7 +66,9 @@ function AuthGuard({ children }: PropsWithChildren) {
       navigate('/login');
     }
 
-    await loadWallet();
+    await loadWallet(() => {
+      isInitialised.current = true;
+    });
   };
 
   useEffect(() => {
diff --git a/src/app/components/preferredBtcAddress/addressTypeSelector.tsx b/src/app/components/preferredBtcAddress/addressTypeSelector.tsx
new file mode 100644
index 000000000..a40b09a29
--- /dev/null
+++ b/src/app/components/preferredBtcAddress/addressTypeSelector.tsx
@@ -0,0 +1,32 @@
+import PreferredBtcAddressItem from '@components/preferredBtcAddressItem';
+import useBtcAddressBalance from '@hooks/useBtcAddressBalance';
+import { satsToBtc } from '@secretkeylabs/xverse-core';
+import BigNumber from 'bignumber.js';
+
+type Props = {
+  title: string;
+  address?: string;
+  onClick: () => void;
+  isSelected: boolean;
+};
+
+function AddressTypeSelector({ title, onClick, address, isSelected }: Props) {
+  const { data } = useBtcAddressBalance(address ?? '');
+
+  const balance =
+    data?.confirmedBalance !== undefined
+      ? `${satsToBtc(BigNumber(data.confirmedBalance))} BTC`
+      : '';
+
+  return (
+    <PreferredBtcAddressItem
+      title={title}
+      onClick={onClick}
+      address={address}
+      isSelected={isSelected}
+      balance={balance}
+    />
+  );
+}
+
+export default AddressTypeSelector;
diff --git a/src/app/components/preferredBtcAddress/index.tsx b/src/app/components/preferredBtcAddress/index.tsx
new file mode 100644
index 000000000..14e75662d
--- /dev/null
+++ b/src/app/components/preferredBtcAddress/index.tsx
@@ -0,0 +1,126 @@
+import useSelectedAccount from '@hooks/useSelectedAccount';
+import useWalletReducer from '@hooks/useWalletReducer';
+import useWalletSelector from '@hooks/useWalletSelector';
+import type { BtcPaymentType } from '@secretkeylabs/xverse-core';
+import Button from '@ui-library/button';
+import { StyledP } from '@ui-library/common.styled';
+import Sheet from '@ui-library/sheet';
+import { useState } from 'react';
+import toast from 'react-hot-toast';
+import { useTranslation } from 'react-i18next';
+import styled from 'styled-components';
+import AddressTypeSelector from './addressTypeSelector';
+
+const AddressTypeContainer = styled.div((props) => ({
+  display: 'flex',
+  flexDirection: 'column',
+  gap: props.theme.space.xxs,
+  marginTop: props.theme.space.s,
+  marginBottom: props.theme.space.s,
+}));
+
+type AddressTypeSelectorProps = {
+  selectedType: BtcPaymentType;
+  setSelectedType: (type: BtcPaymentType) => void;
+};
+
+export function AddressTypeSelectors({ selectedType, setSelectedType }: AddressTypeSelectorProps) {
+  const { t } = useTranslation('translation', {
+    keyPrefix: 'SETTING_SCREEN.PREFERRED_BTC_ADDRESS',
+  });
+  const { btcAddresses } = useSelectedAccount();
+
+  return (
+    <>
+      <AddressTypeSelector
+        title={t('NATIVE_SEGWIT')}
+        address={btcAddresses.native?.address}
+        onClick={() => setSelectedType('native')}
+        isSelected={selectedType === 'native'}
+      />
+      <AddressTypeSelector
+        title={t('NESTED_SEGWIT')}
+        address={btcAddresses.nested?.address}
+        onClick={() => setSelectedType('nested')}
+        isSelected={selectedType === 'nested'}
+      />
+    </>
+  );
+}
+
+type PreferredAddressSheetProps = {
+  visible: boolean;
+  onSave: (newType: BtcPaymentType) => void;
+  onCancel: () => void;
+  currentType: BtcPaymentType;
+};
+
+function PreferredBtcAddressSheet({
+  visible,
+  onSave,
+  onCancel,
+  currentType,
+}: PreferredAddressSheetProps) {
+  const { t } = useTranslation('translation', {
+    keyPrefix: 'SETTING_SCREEN.PREFERRED_BTC_ADDRESS',
+  });
+  const { t: tSettings } = useTranslation('translation', {
+    keyPrefix: 'SETTING_SCREEN',
+  });
+  const [selectedType, setSelectedType] = useState(currentType);
+
+  const onSaveHandler = () => {
+    onSave(selectedType);
+  };
+
+  return (
+    <Sheet title={t('TITLE')} visible={visible} onClose={onCancel}>
+      <StyledP typography="body_m">{t('DESCRIPTION')}</StyledP>
+      <AddressTypeContainer>
+        <AddressTypeSelectors selectedType={selectedType} setSelectedType={setSelectedType} />
+      </AddressTypeContainer>
+      <Button
+        title={tSettings('SAVE')}
+        onClick={onSaveHandler}
+        disabled={selectedType === currentType}
+      />
+    </Sheet>
+  );
+}
+
+export function GlobalPreferredBtcAddressSheet({
+  visible,
+  onHide,
+}: {
+  visible: boolean;
+  onHide: () => void;
+}) {
+  const { t: tSettings } = useTranslation('translation', {
+    keyPrefix: 'SETTING_SCREEN.PREFERRED_BTC_ADDRESS',
+  });
+
+  const { changeBtcPaymentAddressType } = useWalletReducer();
+  const { btcPaymentAddressType, allowNestedSegWitAddress } = useWalletSelector();
+
+  const onSaveAddressType = (newType: BtcPaymentType) => {
+    if (newType !== btcPaymentAddressType) {
+      changeBtcPaymentAddressType(newType);
+      toast(tSettings('SUCCESS'));
+    }
+    onHide();
+  };
+
+  if (!allowNestedSegWitAddress) {
+    onHide();
+    return null;
+  }
+
+  return (
+    <PreferredBtcAddressSheet
+      currentType={btcPaymentAddressType}
+      onSave={onSaveAddressType}
+      onCancel={onHide}
+      visible={visible}
+    />
+  );
+}
diff --git a/src/app/components/preferredBtcAddressItem/index.tsx b/src/app/components/preferredBtcAddressItem/index.tsx
new file mode 100644
index 000000000..ad520158b
--- /dev/null
+++ b/src/app/components/preferredBtcAddressItem/index.tsx
@@ -0,0 +1,82 @@
+import IconBitcoin from '@assets/img/dashboard/bitcoin_icon.svg';
+import { CheckCircle } from '@phosphor-icons/react';
+import { StyledP } from '@ui-library/common.styled';
+import { getShortTruncatedAddress } from '@utils/helper';
+import styled from 'styled-components';
+
+const Button = styled.button<{ $isSelected: boolean }>((props) => ({
+  color: props.theme.colors.white_0,
+  backgroundColor: props.$isSelected
+    ? props.theme.colors.white_900
+    : props.theme.colors.transparent,
+  padding: props.theme.space.m,
+  margin: `${props.theme.space.xxs} 0`,
+  borderRadius: props.theme.space.s,
+  border: `solid 1px ${props.theme.colors.white_800}`,
+  display: 'flex',
+  flexDirection: 'row',
+  justifyContent: 'flex-start',
+  alignItems: 'center',
+  width: '100%',
+}));
+
+const BtcIcon = styled.img((props) => ({
+  height: props.theme.space.xl,
+  width: props.theme.space.xl,
+  borderRadius: '50%',
+  marginRight: props.theme.space.s,
+}));
+
+const TextContainer = styled.div((_) => ({
+  display: 'flex',
+  flexDirection: 'column',
+  flexGrow: 1,
+}));
+
+const RowContainer = styled.div((_) => ({
+  display: 'flex',
+  flexDirection: 'row',
+  justifyContent: 'space-between',
+}));
+
+const SelectedContainer = styled.div((props) => ({
+  width: 20,
+  marginLeft: props.theme.space.s,
+  display: 'flex',
+  flexDirection: 'row',
+  justifyContent: 'flex-end',
+}));
+
+type Props = {
+  title: string;
+  balance: string;
+  address?: string;
+  onClick: () => void;
+  isSelected: boolean;
+};
+
+export default function preferredBtcAddressItem({
+  title,
+  onClick,
+  address,
+  balance,
+  isSelected,
+}: Props) {
+  return (
+    <Button type="button" onClick={onClick} $isSelected={isSelected}>
+      <BtcIcon src={IconBitcoin} />
+      <TextContainer>
+        <RowContainer>
+          <StyledP typography="body_m">{title}</StyledP>
+          <StyledP typography="body_m">{balance}</StyledP>
+        </RowContainer>
+        <RowContainer>
+          <StyledP typography="body_m" color="white_400">
+            {address && getShortTruncatedAddress(address, 6)}
+          </StyledP>
+        </RowContainer>
+      </TextContainer>
+      <SelectedContainer>{isSelected && <CheckCircle size={20} weight="fill" />}</SelectedContainer>
+    </Button>
+  );
+}
diff --git a/src/app/components/receiveCardComponent/index.tsx b/src/app/components/receiveCardComponent/index.tsx
index 5cf14d3e0..099e25b18 100644
--- a/src/app/components/receiveCardComponent/index.tsx
+++ b/src/app/components/receiveCardComponent/index.tsx
@@ -1,7 +1,9 @@
 import Copy from '@assets/img/nftDashboard/Copy.svg';
 import QrCode from '@assets/img/nftDashboard/QrCode.svg';
 import Tick from '@assets/img/tick.svg';
+import { BtcAddressTypeForAddressLabel } from '@components/btcAddressTypeLabel';
 import ActionButton from '@components/button';
+import useWalletSelector from '@hooks/useWalletSelector';
 import { getShortTruncatedAddress } from '@utils/helper';
 import { useEffect, useState, type ReactNode } from 'react';
 import { useTranslation } from 'react-i18next';
@@ -12,13 +14,18 @@ import styled from 'styled-components';
 const ReceiveCard = styled.div((props) => ({
   background: props.theme.colors.elevation6_600,
   borderRadius: props.theme.radius(2),
-  width: 328,
-  height: 104,
+  width: '100%',
+  minHeight: 105,
   padding: props.theme.space.m,
+  display: 'flex',
+  flexDirection: 'column',
+}));
+
+const Container = styled.div({
   display: 'flex',
   flexDirection: 'row',
   alignItems: 'center',
-}));
+});
 
 const Button = styled.button((props) => ({
   background: props.theme.colors.elevation6,
@@ -52,6 +59,10 @@ const TitleText = styled.h1((props) => ({
   ...props.theme.typography.body_bold_m,
   marginTop: props.theme.spacing(3),
   color: props.theme.colors.white_0,
+  display: 'flex',
+  flexDirection: 'row',
+  gap: props.theme.space.xs,
+  alignItems: 'center',
 }));
 
 const AddressText = styled.h1((props) => ({
@@ -76,10 +87,11 @@ type Props = {
   title: string;
   address: string;
   onQrAddressClick: () => void;
-  children: ReactNode;
+  children?: ReactNode;
   onCopyAddressClick?: () => void;
   showVerifyButton?: boolean;
   currency?: string;
+  icon?: React.ReactNode;
 };
 
 function ReceiveCardComponent({
@@ -91,9 +103,13 @@ function ReceiveCardComponent({
   onCopyAddressClick,
   showVerifyButton,
   currency,
+  icon,
 }: Props) {
   const [isCopied, setIsCopied] = useState(false);
   const { t } = useTranslation('translation', { keyPrefix: 'NFT_DASHBOARD_SCREEN' });
+
+  const { network } = useWalletSelector();
+
   let addressText = 'Receive Ordinals, Runes & BRC20 tokens';
 
   if (currency === 'BTC') addressText = 'Receive payments in BTC';
@@ -115,43 +131,51 @@ function ReceiveCardComponent({
 
   return (
     <ReceiveCard data-testid="address-div" className={className}>
-      <ColumnContainer>
-        {children}
-        <TitleText>{title}</TitleText>
-        <AddressText data-testid="address-label">
-          {showVerifyButton ? addressText : getShortTruncatedAddress(address)}
-        </AddressText>
-      </ColumnContainer>
-      {showVerifyButton ? (
-        <VerifyButtonContainer>
-          <ActionButton
-            transparent
-            text="Verify"
-            onPress={async () => {
-              await chrome.tabs.create({
-                url: chrome.runtime.getURL(`options.html#/verify-ledger?currency=${currency}`),
-              });
-            }}
-          />
-        </VerifyButtonContainer>
-      ) : (
-        <RowContainer>
-          <Button id={`copy-address-${title}`} onClick={onCopyClick}>
-            {isCopied ? <ButtonIcon src={Tick} /> : <ButtonIcon src={Copy} />}
-          </Button>
-          <StyledTooltip
-            anchorId={`copy-address-${title}`}
-            variant="light"
-            content={t('COPIED')}
-            events={['click']}
-            place="top"
-            hidden={!isCopied}
-          />
-          <Button data-testid="qr-button" onClick={onQrAddressClick}>
-            <ButtonIcon src={QrCode} />
-          </Button>
-        </RowContainer>
-      )}
+      <Container>
+        <ColumnContainer>
+          {icon}
+          <TitleText>
+            {title}
+            {currency === 'BTC' && (
+              <BtcAddressTypeForAddressLabel address={address} network={network.type} />
+            )}
+          </TitleText>
+          <AddressText data-testid="address-label">
+            {showVerifyButton ? addressText : getShortTruncatedAddress(address)}
+          </AddressText>
+        </ColumnContainer>
+        {showVerifyButton ? (
+          <VerifyButtonContainer>
+            <ActionButton
+              transparent
+              text={t('VERIFY')}
+              onPress={async () => {
+                await chrome.tabs.create({
+                  url: chrome.runtime.getURL(`options.html#/verify-ledger?currency=${currency}`),
+                });
+              }}
+            />
+          </VerifyButtonContainer>
+        ) : (
+          <RowContainer>
+            <Button id={`copy-address-${title}`} onClick={onCopyClick}>
+              {isCopied ? <ButtonIcon src={Tick} /> : <ButtonIcon src={Copy} />}
+            </Button>
+            <StyledTooltip
+              anchorId={`copy-address-${title}`}
+              variant="light"
+              content={t('COPIED')}
+              events={['click']}
+              place="top"
+              hidden={!isCopied}
+            />
+            <Button data-testid="qr-button" onClick={onQrAddressClick}>
+              <ButtonIcon src={QrCode} />
+            </Button>
+          </RowContainer>
+        )}
+      </Container>
+      {children}
     </ReceiveCard>
   );
 }
diff --git a/src/app/components/seedPhraseInput/index.tsx b/src/app/components/seedPhraseInput/index.tsx
index fdcc03800..15938f3d2 100644
--- a/src/app/components/seedPhraseInput/index.tsx
+++ b/src/app/components/seedPhraseInput/index.tsx
@@ -245,7 +245,7 @@ export default function SeedPhraseInput({
       </InputGrid>
       <ErrorMessage visible={!!seedError}>{seedError}</ErrorMessage>
       <TransparentButton onClick={handleClickShow24Words} type="button">
-        {t('HAVE_A_24_WORDS_SEEDPHRASE?', { number: show24Words ? '12' : '24' })}
+        {t('HAVE_A_COUNT_WORDS_SEED_PHRASE', { number: show24Words ? '12' : '24' })}
       </TransparentButton>
     </InputContainer>
   );
diff --git a/src/app/components/tokenTile/index.tsx b/src/app/components/tokenTile/index.tsx
index 3e4b452e6..5181dc011 100644
--- a/src/app/components/tokenTile/index.tsx
+++ b/src/app/components/tokenTile/index.tsx
@@ -1,7 +1,7 @@
 import { BetterBarLoader } from '@components/barLoader';
 import { StyledFiatAmountText } from '@components/fiatAmountText';
 import TokenImage from '@components/tokenImage';
-import useBtcWalletData from '@hooks/queries/useBtcWalletData';
+import useSelectedAccountBtcBalance from '@hooks/queries/useSelectedAccountBtcBalance';
 import useStxWalletData from '@hooks/queries/useStxWalletData';
 import useSupportedCoinRates from '@hooks/queries/useSupportedCoinRates';
 import useWalletSelector from '@hooks/useWalletSelector';
@@ -121,7 +121,7 @@ function TokenTile({
   const { fiatCurrency } = useWalletSelector();
   const { btcFiatRate, stxBtcRate } = useSupportedCoinRates();
   const { data: stxData } = useStxWalletData();
-  const { data: btcBalance } = useBtcWalletData();
+  const { confirmedBalance: btcBalance } = useSelectedAccountBtcBalance();
 
   const getTickerTitle = () => {
     if (currency === 'STX' || currency === 'BTC') return `${currency}`;
diff --git a/src/app/components/tooltip/context.ts b/src/app/components/tooltip/context.ts
new file mode 100644
index 000000000..7688a3453
--- /dev/null
+++ b/src/app/components/tooltip/context.ts
@@ -0,0 +1,8 @@
+import { createContext } from 'react';
+
+export type TooltipContext = {
+  targetDiv?: HTMLDivElement;
+  initialised: boolean;
+};
+
+export const tooltipContext = createContext<TooltipContext>({ initialised: false });
diff --git a/src/app/components/tooltip/index.tsx b/src/app/components/tooltip/index.tsx
new file mode 100644
index 000000000..ec11c6def
--- /dev/null
+++ b/src/app/components/tooltip/index.tsx
@@ -0,0 +1,93 @@
+import Callout, { type CalloutProps } from '@ui-library/callout';
+import { useContext, useEffect, useState, type MutableRefObject } from 'react';
+import { createPortal } from 'react-dom';
+import styled from 'styled-components';
+import { tooltipContext } from './context';
+
+type Position = {
+  $left?: number;
+  $right?: number;
+  $top?: number;
+  $bottom?: number;
+};
+
+const TooltipContainer = styled.div<Position>`
+  position: absolute;
+  ${(props) => (props.$left !== undefined ? `left: ${props.$left}px` : '')};
+  ${(props) => (props.$right !== undefined ? `right: ${props.$right}px` : '')};
+  ${(props) => (props.$top !== undefined ? `top: ${props.$top}px` : '')};
+  ${(props) => (props.$bottom !== undefined ? `bottom: ${props.$bottom}px` : '')};
+
+  &::after {
+    content: '';
+    position: absolute;
+    ${(props) => (props.$left !== undefined ? `left: 10px` : '')};
+    ${(props) => (props.$right !== undefined ? `right: 10px` : '')};
+    ${(props) => (props.$top !== undefined ? `top: -5px` : '')};
+    ${(props) => (props.$bottom !== undefined ? `bottom: -5px` : '')};
+    border-width: 5px;
+    border-style: solid;
+    border-color: #2d2f34;
+    transform: rotate(45deg);
+  }
+`;
+
+const StyledCallout = styled(Callout)(() => ({
+  backgroundColor: '#2d2f34',
+}));
+
+type Props = CalloutProps & {
+  target: MutableRefObject<HTMLButtonElement | null>;
+  positionVertical?: 'top' | 'bottom';
+  positionHorizontal?: 'left' | 'right';
+};
+
+export default function TooltipCallout(props: Props) {
+  const tooltip = useContext(tooltipContext);
+
+  const [position, setPosition] = useState<Position>({});
+
+  const {
+    target,
+    className,
+    positionHorizontal = 'left',
+    positionVertical = 'bottom',
+    ...calloutProps
+  } = props;
+
+  const tooltipBody = (
+    <TooltipContainer className={className} {...position}>
+      <StyledCallout {...calloutProps} />
+    </TooltipContainer>
+  );
+
+  useEffect(() => {
+    if (!target.current) {
+      console.warn('Tooltip set without a target');
+      return;
+    }
+
+    const targetRect = target.current.getBoundingClientRect();
+    const newPosition: Position = {};
+
+    const spacer = 5;
+
+    if (positionVertical === 'bottom') {
+      newPosition.$top = targetRect.y + targetRect.height + spacer;
+    } else {
+      newPosition.$bottom = window.innerHeight - targetRect.y + spacer;
+    }
+
+    if (positionHorizontal === 'left') {
+      newPosition.$right = window.innerWidth - targetRect.x - targetRect.width;
+    } else {
+      newPosition.$left = targetRect.x;
+    }
+
+    setPosition(newPosition);
+  }, [positionHorizontal, positionVertical, target]);
+
+  if (tooltip.initialised && tooltip.targetDiv) {
+    return createPortal(tooltipBody, tooltip.targetDiv);
+  }
+}
diff --git a/src/app/components/tooltip/provider.tsx b/src/app/components/tooltip/provider.tsx
new file mode 100644
index 000000000..abfba93af
--- /dev/null
+++ b/src/app/components/tooltip/provider.tsx
@@ -0,0 +1,29 @@
+import { useEffect, useRef, useState } from 'react';
+import styled from 'styled-components';
+import { tooltipContext, type TooltipContext } from './context';
+
+const TooltipContainer = styled.div(() => ({
+  width: 0,
+  height: 0,
+  overflow: 'hidden',
+}));
+
+type Props = {
+  children: React.ReactNode;
+};
+
+export default function TooltipProvider({ children }: Props) {
+  const tooltipParentRef = useRef<HTMLDivElement | null>(null);
+  const [contextValue, setContextValue] = useState<TooltipContext>({ initialised: false });
+
+  useEffect(() => {
+    setContextValue({ initialised: true, targetDiv: tooltipParentRef.current ?? undefined });
+  }, []);
+
+  return (
+    <tooltipContext.Provider value={contextValue}>
+      {children}
+      <TooltipContainer ref={tooltipParentRef} />
+    </tooltipContext.Provider>
+  );
+}
diff --git a/src/app/components/topRow/index.tsx b/src/app/components/topRow/index.tsx
index f7cf1fec8..310d2d376 100644
--- a/src/app/components/topRow/index.tsx
+++ b/src/app/components/topRow/index.tsx
@@ -1,4 +1,5 @@
-import { ArrowLeft, DotsThreeVertical, Star } from '@phosphor-icons/react';
+import { ArrowLeft, DotsThreeVertical, FadersHorizontal, Star } from '@phosphor-icons/react';
+import type { MutableRefObject } from 'react';
 import styled from 'styled-components';
 import Theme from 'theme';
 
@@ -56,6 +57,8 @@ type Props = {
   showBackButton?: boolean;
   className?: string;
   onMenuClick?: (e: React.MouseEvent<HTMLButtonElement>) => void;
+  onSettingsClick?: (e: React.MouseEvent<HTMLButtonElement>) => void;
+  settingsRef?: MutableRefObject<HTMLButtonElement | null>;
   onStarClick?: (e: React.MouseEvent<HTMLButtonElement>) => void;
   isStarred?: boolean;
 };
@@ -66,6 +69,8 @@ function TopRow({
   showBackButton = true,
   className,
   onMenuClick,
+  onSettingsClick,
+  settingsRef,
   onStarClick,
   isStarred,
 }: Props) {
@@ -88,6 +93,11 @@ function TopRow({
           <DotsThreeVertical size={20} color={Theme.colors.white_0} weight="bold" />
         </MenuButton>
       )}
+      {onSettingsClick && (
+        <MenuButton onClick={onSettingsClick} ref={settingsRef}>
+          <FadersHorizontal size={20} color={Theme.colors.white_200} />
+        </MenuButton>
+      )}
     </TopSectionContainer>
   );
 }
diff --git a/src/app/hooks/queries/useAccountBalance.ts b/src/app/hooks/queries/useAccountBalance.ts
index 627bae3f7..e5790cc18 100644
--- a/src/app/hooks/queries/useAccountBalance.ts
+++ b/src/app/hooks/queries/useAccountBalance.ts
@@ -13,7 +13,7 @@ import {
   type TokensResponse,
 } from '@secretkeylabs/xverse-core';
 import { setAccountBalanceAction } from '@stores/wallet/actions/actionCreators';
-import { calculateTotalBalance } from '@utils/helper';
+import { calculateTotalBalance, getAccountBalanceKey } from '@utils/helper';
 import axios from 'axios';
 import BigNumber from 'bignumber.js';
 import { useEffect, useRef, useState } from 'react';
@@ -65,21 +65,35 @@ const useAccountBalance = () => {
     let finalRunesCoinsList: FungibleTokenWithStates[] = [];
 
     try {
-      if (account.btcAddress) {
-        const btcData: BtcAddressData = await btcClient.getBalance(account.btcAddress);
-        btcBalance = btcData.finalBalance.toString();
-      }
-
-      if (account.ordinalsAddress) {
+      const getBtcBalance = async (address?: string) => {
+        if (!address) {
+          return '0';
+        }
+        const btcData: BtcAddressData = await btcClient.getBalance(address);
+        return btcData.finalBalance.toString();
+      };
+
+      const [nativeBalance, nestedBalance, taprootBalance] = await Promise.all([
+        getBtcBalance(account.btcAddresses.native?.address),
+        getBtcBalance(account.btcAddresses.nested?.address),
+        getBtcBalance(account.btcAddresses.taproot.address),
+      ]);
+      btcBalance = BigNumber(nativeBalance).plus(nestedBalance).plus(taprootBalance).toString();
+
+      if (account.btcAddresses.taproot.address) {
         const fetchBrc20Balances = fetchBrc20FungibleTokens(
-          account.ordinalsAddress,
+          account.btcAddresses.taproot.address,
           fiatCurrency,
           network,
         );
         finalBrcCoinsList = (await fetchBrc20Balances())
           .map(withDerivedState)
           .filter((ft) => ft.isEnabled);
-        const runeBalances = fetchRuneBalances(runesApi, account.ordinalsAddress, fiatCurrency);
+        const runeBalances = fetchRuneBalances(
+          runesApi,
+          account.btcAddresses.taproot.address,
+          fiatCurrency,
+        );
         finalRunesCoinsList = (await runeBalances())
           .map(withDerivedState)
           .filter((ft) => ft.isEnabled);
@@ -119,7 +133,7 @@ const useAccountBalance = () => {
       btcFiatRate,
       hideStx,
     });
-    dispatch(setAccountBalanceAction(account.btcAddress, totalBalance));
+    dispatch(setAccountBalanceAction(getAccountBalanceKey(account), totalBalance));
     return totalBalance;
   };
 
@@ -158,7 +172,7 @@ const useAccountBalance = () => {
 
   const setAccountBalance = (account: Account | null, balance: string) => {
     if (account) {
-      dispatch(setAccountBalanceAction(account.btcAddress, balance));
+      dispatch(setAccountBalanceAction(getAccountBalanceKey(account), balance));
     }
   };
 
diff --git a/src/app/hooks/queries/useSelectedAccountBtcBalance.tsx b/src/app/hooks/queries/useSelectedAccountBtcBalance.tsx
new file mode 100644
index 000000000..8e059cefc
--- /dev/null
+++ b/src/app/hooks/queries/useSelectedAccountBtcBalance.tsx
@@ -0,0 +1,39 @@
+import useBtcAddressBalance from '@hooks/useBtcAddressBalance';
+import useSelectedAccount from '@hooks/useSelectedAccount';
+import BigNumber from 'bignumber.js';
+
+export default function useSelectedAccountBtcBalance() {
+  const selectedAccount = useSelectedAccount();
+  const { data: nativeBalance, isLoading: nativeLoading } = useBtcAddressBalance(
+    selectedAccount.btcAddresses.native?.address ?? '',
+  );
+  const { data: nestedBalance, isLoading: nestedLoading } = useBtcAddressBalance(
+    selectedAccount.btcAddresses.nested?.address ?? '',
+  );
+  const { data: taprootBalance, isLoading: taprootLoading } = useBtcAddressBalance(
+    selectedAccount.btcAddresses.taproot.address ?? '',
+  );
+
+  if (nativeLoading || nestedLoading || taprootLoading) {
+    return { isLoading: true };
+  }
+
+  const confirmedBalance = BigNumber(nativeBalance?.confirmedBalance ?? 0)
+    .plus(nestedBalance?.confirmedBalance ?? 0)
+    .plus(taprootBalance?.confirmedBalance ?? 0)
+    .toNumber();
+
+  const unconfirmedBalance = BigNumber(nativeBalance?.unconfirmedBalance ?? 0)
+    .plus(nestedBalance?.unconfirmedBalance ?? 0)
+    .plus(taprootBalance?.unconfirmedBalance ?? 0)
+    .toNumber();
+
+  return {
+    confirmedBalance,
+    unconfirmedBalance,
+    nativeBalance,
+    nestedBalance,
+    taprootBalance,
+    isLoading: false,
+  };
+}
diff --git a/src/app/hooks/queries/useTransactions.ts b/src/app/hooks/queries/useTransactions.ts
index 087653ff8..3410105a8 100644
--- a/src/app/hooks/queries/useTransactions.ts
+++ b/src/app/hooks/queries/useTransactions.ts
@@ -24,8 +24,9 @@ export default function useTransactions(
   brc20Token: string | null,
   runeToken: string | null,
 ) {
-  const { stxAddress, btcAddress, ordinalsAddress } = useSelectedAccount();
-  const { network, hasActivatedOrdinalsKey } = useWalletSelector();
+  const selectedAccount = useSelectedAccount();
+  const { network, hasActivatedOrdinalsKey, btcPaymentAddressType, allowNestedSegWitAddress } =
+    useWalletSelector();
   const selectedNetwork = useNetworkSelector();
   const btcClient = useBtcClient();
   const fetchTransactions = async (): Promise<
@@ -35,25 +36,30 @@ export default function useTransactions(
     | APIGetRunesActivityForAddressResponse
   > => {
     if (coinType === 'FT' && brc20Token) {
-      return getBrc20History(network.type, ordinalsAddress, brc20Token);
+      return getBrc20History(network.type, selectedAccount.ordinalsAddress, brc20Token);
     }
     if (coinType === 'FT' && runeToken) {
       return getXverseApiClient(network.type).getRuneTxHistory(
-        ordinalsAddress,
+        selectedAccount.ordinalsAddress,
         runeToken,
         0,
         PAGINATION_LIMIT,
       );
     }
     if (coinType === 'STX' || coinType === 'FT' || coinType === 'NFT') {
-      return getStxAddressTransactions(stxAddress, selectedNetwork, 0, PAGINATION_LIMIT);
+      return getStxAddressTransactions(
+        selectedAccount.stxAddress,
+        selectedNetwork,
+        0,
+        PAGINATION_LIMIT,
+      );
     }
     if (coinType === 'BTC') {
       return fetchBtcTransactionsData(
-        btcAddress,
-        ordinalsAddress,
+        selectedAccount,
         btcClient,
         hasActivatedOrdinalsKey as boolean,
+        allowNestedSegWitAddress ? undefined : btcPaymentAddressType,
       );
     }
     return [];
diff --git a/src/app/hooks/useAvatarCleanup.ts b/src/app/hooks/useAvatarCleanup.ts
index e9703c9c4..e166e1f29 100644
--- a/src/app/hooks/useAvatarCleanup.ts
+++ b/src/app/hooks/useAvatarCleanup.ts
@@ -1,6 +1,7 @@
 import {
-  getNftCollections,
+  getStacksApiClient,
   getXverseApiClient,
+  isNftOwnedByAccount,
   isOrdinalOwnedByAccount,
   type Account,
 } from '@secretkeylabs/xverse-core';
@@ -8,48 +9,49 @@ import { removeAccountAvatarAction } from '@stores/wallet/actions/actionCreators
 import type { AvatarInfo } from '@stores/wallet/actions/types';
 import { useCallback, useEffect } from 'react';
 import { useDispatch } from 'react-redux';
-import useNetworkSelector from './useNetwork';
 import useWalletSelector from './useWalletSelector';
 
 /* Check and clear NFT Avatar that being used, but no-longer belongs to this Wallet */
 export default function useAvatarCleanup() {
   const dispatch = useDispatch();
   const { avatarIds, network, accountsList } = useWalletSelector();
-  const selectedNetwork = useNetworkSelector();
   const xverseApi = getXverseApiClient(network.type);
+  const stacksApiClient = getStacksApiClient(network.type);
 
   const checkAndRemoveInvalidAvatar = useCallback(
-    async (account: Account, avatar: AvatarInfo | null) => {
+    async (account: Account, avatar: AvatarInfo) => {
+      const { address } = account.btcAddresses.taproot;
+
       if (avatar?.type === 'inscription') {
         const inscription = await xverseApi.getInscription(
-          account.ordinalsAddress,
+          account.btcAddresses.taproot.address,
           avatar.inscription.id,
         );
 
         if (!isOrdinalOwnedByAccount(inscription, account)) {
-          dispatch(removeAccountAvatarAction({ address: account.btcAddress }));
+          dispatch(removeAccountAvatarAction({ address }));
         }
       } else if (avatar?.type === 'stacks') {
-        const nftList = await getNftCollections(account.stxAddress, selectedNetwork);
-        const isNftOwnedByAccount = nftList.results.some((collection) =>
-          collection.all_nfts.some((nft) => {
-            const fullyQualifiedTokenId = `${nft.asset_identifier}:${nft.identifier.tokenId}`;
-            return fullyQualifiedTokenId === avatar.nft.fully_qualified_token_id;
-          }),
+        const isStacksOwnedByAccount = await isNftOwnedByAccount(
+          avatar.nft,
+          account,
+          stacksApiClient,
         );
 
-        if (!isNftOwnedByAccount) {
-          dispatch(removeAccountAvatarAction({ address: account.btcAddress }));
+        if (!isStacksOwnedByAccount) {
+          dispatch(removeAccountAvatarAction({ address }));
         }
       }
     },
-    [dispatch, selectedNetwork, xverseApi],
+    [dispatch, stacksApiClient, xverseApi],
   );
 
   useEffect(() => {
     if (!avatarIds) return;
     accountsList
-      .filter((account) => !!avatarIds[account.btcAddress])
-      .forEach((account) => checkAndRemoveInvalidAvatar(account, avatarIds[account.btcAddress]));
+      .filter((account) => !!avatarIds[account.btcAddresses.taproot.address])
+      .forEach((account) =>
+        checkAndRemoveInvalidAvatar(account, avatarIds[account.btcAddresses.taproot.address]),
+      );
   }, [checkAndRemoveInvalidAvatar, avatarIds, accountsList]);
 }
diff --git a/src/app/hooks/useBtcAddressBalance.ts b/src/app/hooks/useBtcAddressBalance.ts
new file mode 100644
index 000000000..b77c1dff0
--- /dev/null
+++ b/src/app/hooks/useBtcAddressBalance.ts
@@ -0,0 +1,29 @@
+import { useQuery } from '@tanstack/react-query';
+import BigNumber from 'bignumber.js';
+import useBtcClient from './apiClients/useBtcClient';
+
+export default function useBtcAddressBalance(address: string) {
+  const btcClient = useBtcClient();
+
+  const fetchBalance = async () => {
+    if (!address) {
+      return null;
+    }
+
+    const addressData = await btcClient.getAddressData(address);
+    const confirmedBalance = BigNumber(addressData.chain_stats.funded_txo_sum)
+      .minus(addressData.chain_stats.spent_txo_sum)
+      .toNumber();
+    const unconfirmedBalance = BigNumber(addressData.mempool_stats.funded_txo_sum)
+      .minus(addressData.mempool_stats.spent_txo_sum)
+      .toNumber();
+
+    return { address, confirmedBalance, unconfirmedBalance };
+  };
+
+  return useQuery({
+    queryKey: ['btc-address-balance', address],
+    queryFn: fetchBalance,
+    staleTime: 10 * 1000, // 10 secs
+  });
+}
diff --git a/src/app/hooks/useCanUserSwitchPaymentType.ts b/src/app/hooks/useCanUserSwitchPaymentType.ts
new file mode 100644
index 000000000..0eed33143
--- /dev/null
+++ b/src/app/hooks/useCanUserSwitchPaymentType.ts
@@ -0,0 +1,13 @@
+import useSelectedAccount from './useSelectedAccount';
+import useWalletSelector from './useWalletSelector';
+
+export default function useCanUserSwitchPaymentType() {
+  const selectedAccount = useSelectedAccount();
+  const { allowNestedSegWitAddress, selectedAccountType } = useWalletSelector();
+  return !!(
+    allowNestedSegWitAddress &&
+    selectedAccountType !== 'ledger' &&
+    selectedAccount.btcAddresses.native &&
+    selectedAccount.btcAddresses.nested
+  );
+}
diff --git a/src/app/hooks/useSanityCheck.ts b/src/app/hooks/useSanityCheck.ts
index ee0c7f955..6b2f25b9e 100644
--- a/src/app/hooks/useSanityCheck.ts
+++ b/src/app/hooks/useSanityCheck.ts
@@ -1,4 +1,4 @@
-import { getXverseApiClient, walletFromSeedPhrase } from '@secretkeylabs/xverse-core';
+import { getAccountFromSeedPhrase, getXverseApiClient } from '@secretkeylabs/xverse-core';
 import { useCallback } from 'react';
 import useSeedVault from './useSeedVault';
 import useWalletSelector from './useWalletSelector';
@@ -13,12 +13,14 @@ const useSanityCheck = () => {
     async (origin: string) => {
       const mnemonic = await getSeed();
 
-      const wallet = await walletFromSeedPhrase({ mnemonic, index: 0n, network: network.type });
+      const wallet = await getAccountFromSeedPhrase({ mnemonic, index: 0n, network: network.type });
       if (wallet.masterPubKey !== accountsList[0].masterPubKey) {
         await getXverseApiClient(network.type).getAppFeatures(
           {
-            ordinalsAddress: accountsList[0].ordinalsAddress,
-            paymentAddress: accountsList[0].btcAddress,
+            ordinalsAddress: accountsList[0].btcAddresses.taproot.address,
+            paymentAddress:
+              accountsList[0].btcAddresses.native?.address ||
+              accountsList[0].btcAddresses.nested?.address,
           },
           {
             [origin]: VERSION,
diff --git a/src/app/hooks/useSelectedAccount.ts b/src/app/hooks/useSelectedAccount.ts
index 8ba5f7d43..7af390a7e 100644
--- a/src/app/hooks/useSelectedAccount.ts
+++ b/src/app/hooks/useSelectedAccount.ts
@@ -1,39 +1,65 @@
-import getSelectedAccount from '@common/utils/getSelectedAccount';
+import getSelectedAccount, {
+  embellishAccountWithDetails,
+  type AccountWithDetails,
+} from '@common/utils/getSelectedAccount';
 import useWalletSelector from '@hooks/useWalletSelector';
-import type { Account } from '@secretkeylabs/xverse-core';
+import type { BtcPaymentType } from '@secretkeylabs/xverse-core';
 import { useMemo } from 'react';
 import useWalletReducer from './useWalletReducer';
 
-const useSelectedAccount = (): Account => {
+const useSelectedAccount = (overridePayAddressType?: BtcPaymentType): AccountWithDetails => {
   const { switchAccount } = useWalletReducer();
   const {
     selectedAccountIndex,
     selectedAccountType,
     accountsList: softwareAccountsList,
     ledgerAccountsList,
+    btcPaymentAddressType,
   } = useWalletSelector();
 
   return useMemo(() => {
-    const existingAccount = getSelectedAccount({
+    let account = getSelectedAccount({
       selectedAccountIndex,
       selectedAccountType,
       softwareAccountsList,
       ledgerAccountsList,
     });
-    if (existingAccount) {
-      return existingAccount;
+
+    if (!account) {
+      [account] = softwareAccountsList;
+      if (account) {
+        switchAccount(account);
+      }
     }
-    const fallbackAccount = softwareAccountsList[0];
-    if (fallbackAccount) {
-      switchAccount(fallbackAccount);
+
+    let accountType = btcPaymentAddressType;
+
+    if (overridePayAddressType) {
+      switch (overridePayAddressType) {
+        case 'nested':
+          if (account.btcAddresses.nested) {
+            accountType = overridePayAddressType;
+          }
+          break;
+        case 'native':
+          if (account.btcAddresses.native) {
+            accountType = overridePayAddressType;
+          }
+          break;
+        default:
+          break;
+      }
     }
-    return fallbackAccount;
+
+    return embellishAccountWithDetails(account, accountType);
   }, [
     selectedAccountIndex,
     selectedAccountType,
     softwareAccountsList,
     ledgerAccountsList,
     switchAccount,
+    btcPaymentAddressType,
+    overridePayAddressType,
   ]);
 };
 
diff --git a/src/app/hooks/useStorage.ts b/src/app/hooks/useStorage.ts
new file mode 100644
index 000000000..8b8a792e4
--- /dev/null
+++ b/src/app/hooks/useStorage.ts
@@ -0,0 +1,45 @@
+import { useCallback, useMemo, useState } from 'react';
+
+const tryParse = <T>(val: string | null | undefined, defaultValue?: T) => {
+  if (!val) return defaultValue;
+  try {
+    return JSON.parse(val) as T;
+  } catch (e) {
+    return defaultValue;
+  }
+};
+
+const useStorage = <T>(storageType: 'local' | 'session', key: string, defaultValue?: T) => {
+  const lookupKey = `useStorage:${key}`;
+
+  const storage = useMemo(() => {
+    if (storageType === 'local') return localStorage;
+    return sessionStorage;
+  }, [storageType]);
+
+  const [value, setValue] = useState(tryParse<T>(storage.getItem(lookupKey), defaultValue));
+
+  const set = useCallback(
+    (newValue: T | undefined) => {
+      if (newValue === undefined) {
+        storage.removeItem(lookupKey);
+        setValue(undefined);
+      } else {
+        storage.setItem(lookupKey, JSON.stringify(newValue));
+        setValue(newValue);
+      }
+    },
+    [lookupKey, storage],
+  );
+
+  return [value, set] as const;
+};
+
+// !NOTE: add localStorage if needed. Knip fails if it's added and unused.
+export function useSessionStorage<T>(
+  key: string,
+): [T | undefined, (newValue: T | undefined) => void];
+export function useSessionStorage<T>(key: string, defaultValue: T): [T, (newValue: T) => void];
+export function useSessionStorage<T>(key: string, defaultValue?: T) {
+  return useStorage('session', key, defaultValue);
+}
diff --git a/src/app/hooks/useTransactionContext.ts b/src/app/hooks/useTransactionContext.ts
index 1ef680760..85903626c 100644
--- a/src/app/hooks/useTransactionContext.ts
+++ b/src/app/hooks/useTransactionContext.ts
@@ -1,12 +1,12 @@
-import { btcTransaction, UtxoCache } from '@secretkeylabs/xverse-core';
+import { btcTransaction, UtxoCache, type BtcPaymentType } from '@secretkeylabs/xverse-core';
 import { useMemo } from 'react';
 import useBtcClient from './apiClients/useBtcClient';
 import useSeedVault from './useSeedVault';
 import useSelectedAccount from './useSelectedAccount';
 import useWalletSelector from './useWalletSelector';
 
-const useTransactionContext = () => {
-  const selectedAccount = useSelectedAccount();
+const useTransactionContext = (overridePayAddressType?: BtcPaymentType) => {
+  const selectedAccount = useSelectedAccount(overridePayAddressType);
   const { network } = useWalletSelector();
   const seedVault = useSeedVault();
   const btcClient = useBtcClient();
@@ -43,6 +43,7 @@ const useTransactionContext = () => {
       utxoCache,
       network: network.type,
       esploraApiProvider: btcClient,
+      btcPaymentAddressType: selectedAccount.btcAddressType,
     });
   }, [utxoCache, selectedAccount, network, seedVault, btcClient]);
 
diff --git a/src/app/hooks/useWalletReducer.ts b/src/app/hooks/useWalletReducer.ts
index 6dd40d5a4..011b31a28 100644
--- a/src/app/hooks/useWalletReducer.ts
+++ b/src/app/hooks/useWalletReducer.ts
@@ -1,25 +1,28 @@
+import getSelectedAccount from '@common/utils/getSelectedAccount';
 import { getDeviceAccountIndex } from '@common/utils/ledger';
 import { dispatchEventAuthorizedConnectedClients } from '@common/utils/messages/extensionToContentScript/dispatchEvent';
 import { makeAccountResourceId } from '@components/permissionsManager/resources';
+import type { Permission } from '@components/permissionsManager/schemas';
 import useNetworkSelector from '@hooks/useNetwork';
 import useWalletSelector from '@hooks/useWalletSelector';
 import {
   AnalyticsEvents,
-  StacksMainnet,
-  StacksNetwork,
-  StacksTestnet,
   createWalletAccount,
   decryptSeedPhraseCBC,
-  getBnsName,
+  getAccountFromSeedPhrase,
   restoreWalletWithAccounts,
-  walletFromSeedPhrase,
+  StacksMainnet,
+  StacksNetwork,
+  StacksTestnet,
   type Account,
   type NetworkType,
   type SettingsNetwork,
 } from '@secretkeylabs/xverse-core';
 import {
+  ChangeBtcPaymentAddressType,
   ChangeNetworkAction,
   changeShowDataCollectionAlertAction,
+  EnableNestedSegWitAddress,
   resetWalletAction,
   selectAccount,
   setWalletHideStxAction,
@@ -39,45 +42,22 @@ import {
 } from '@utils/mixpanel';
 import { useCallback } from 'react';
 import { useDispatch } from 'react-redux';
+import useBtcClient from './apiClients/useBtcClient';
 import useSeedVault from './useSeedVault';
 import useWalletSession from './useWalletSession';
 
-// TODO: move this to core as the primary way to create an account
 const createSingleAccount = async (
   seedPhrase: string,
   accountIndex: number,
   btcNetwork: NetworkType,
-  stacksNetwork: StacksNetwork,
   savedNames: { id: number; name?: string }[] = [],
 ) => {
-  const {
-    stxAddress,
-    btcAddress,
-    ordinalsAddress,
-    masterPubKey,
-    stxPublicKey,
-    btcPublicKey,
-    ordinalsPublicKey,
-  } = await walletFromSeedPhrase({
+  const account = await getAccountFromSeedPhrase({
     mnemonic: seedPhrase,
     index: BigInt(accountIndex),
     network: btcNetwork,
   });
-  const bnsName = await getBnsName(stxAddress, stacksNetwork);
-  const customName = savedNames.find((name) => name.id === accountIndex)?.name;
-  const account: Account = {
-    id: accountIndex,
-    stxAddress,
-    btcAddress,
-    ordinalsAddress,
-    masterPubKey,
-    stxPublicKey,
-    btcPublicKey,
-    ordinalsPublicKey,
-    bnsName,
-    accountName: customName,
-    accountType: 'software',
-  };
+  account.accountName = savedNames.find((name) => name.id === accountIndex)?.name;
 
   return account;
 };
@@ -88,7 +68,7 @@ const useWalletReducer = () => {
     encryptedSeed,
     selectedAccountIndex,
     selectedAccountType,
-    accountsList: accounts,
+    accountsList: softwareAccountsList,
     savedNames,
     ledgerAccountsList,
     showDataCollectionAlert,
@@ -96,6 +76,13 @@ const useWalletReducer = () => {
   } = useWalletSelector();
   const seedVault = useSeedVault();
   const selectedNetwork = useNetworkSelector();
+  const currentlySelectedAccount = getSelectedAccount({
+    selectedAccountIndex,
+    selectedAccountType,
+    softwareAccountsList,
+    ledgerAccountsList,
+  });
+  const btcClient = useBtcClient();
 
   const dispatch = useDispatch();
   const { setSessionStartTime, clearSessionTime, setSessionStartTimeAndMigrate } =
@@ -106,6 +93,7 @@ const useWalletReducer = () => {
     async (
       selectedType = selectedAccountType,
       selectedIndex = selectedAccountIndex,
+      accountsList = softwareAccountsList,
     ): Promise<void> => {
       if (selectedType === 'ledger') {
         // these accounts are created by Ledger, so we cannot regenerate them
@@ -117,11 +105,10 @@ const useWalletReducer = () => {
         seedPhrase,
         selectedIndex,
         network.type,
-        selectedNetwork,
         savedNames[network.type],
       );
 
-      const selectedAccount = accounts.find((account) => account.id === selectedIndex);
+      const selectedAccount = accountsList.find((account) => account.id === selectedIndex);
 
       if (!selectedAccount) {
         // if the selected account index does not exist, we cannot update it
@@ -130,11 +117,11 @@ const useWalletReducer = () => {
       }
 
       const accountsMatch = Object.keys(recreatedAccount).every(
-        (key) => selectedAccount[key] === recreatedAccount[key],
+        (key) => JSON.stringify(selectedAccount[key]) === JSON.stringify(recreatedAccount[key]),
       );
 
       if (!accountsMatch) {
-        const newAccountsList = accounts.map((account) =>
+        const newAccountsList = accountsList.map((account) =>
           account.id === selectedIndex ? recreatedAccount : account,
         );
 
@@ -147,8 +134,7 @@ const useWalletReducer = () => {
       seedVault,
       selectedAccountIndex,
       selectedAccountType,
-      selectedNetwork,
-      accounts,
+      softwareAccountsList,
       savedNames,
     ],
   );
@@ -156,28 +142,55 @@ const useWalletReducer = () => {
   const loadActiveAccounts = async (
     secretKey: string,
     currentNetwork: SettingsNetwork,
-    currentNetworkObject: StacksNetwork,
+    currentStacksNetwork: StacksNetwork,
     currentAccounts: Account[],
-    resetIndex?: boolean,
+    options?: {
+      resetIndex?: boolean;
+      checkForNewAccounts?: boolean;
+      accountLoadCallback?: (loadedAccounts: Account[]) => void;
+    },
   ) => {
-    const walletAccounts = await restoreWalletWithAccounts(
+    const newSoftwareAccountList: Account[] = [];
+
+    // Load custom account names for the new network
+    const savedCustomAccountNames = savedNames[currentNetwork.type];
+
+    const walletAccountsGenerator = restoreWalletWithAccounts(
+      btcClient,
       secretKey,
       currentNetwork,
-      currentNetworkObject,
+      currentStacksNetwork,
       currentAccounts,
+      options?.checkForNewAccounts ? 1 : 0,
+      true,
     );
 
-    // Load custom account names for the new network
-    const savedCustomAccountNames = savedNames[currentNetwork.type];
-    if (savedCustomAccountNames?.length) {
-      walletAccounts.forEach((account) => {
-        const savedAccount = savedCustomAccountNames.find((acc) => acc.id === account.id);
+    let newAccountResponse = await walletAccountsGenerator.next();
+
+    while (!newAccountResponse.done) {
+      const newAccount = newAccountResponse.value;
+      if (savedCustomAccountNames?.length) {
+        const savedAccount = savedCustomAccountNames.find((acc) => acc.id === newAccount.id);
         if (savedAccount) {
-          account.accountName = savedAccount.name;
+          newAccount.accountName = savedAccount.name;
         }
-      });
+      }
+      newSoftwareAccountList.push(newAccount);
+
+      if (newSoftwareAccountList.length >= currentAccounts.length) {
+        dispatch(updateSoftwareAccountsAction([...newSoftwareAccountList]));
+
+        if (options?.accountLoadCallback) {
+          await options.accountLoadCallback([...newSoftwareAccountList]);
+        }
+      }
+
+      newAccountResponse = await walletAccountsGenerator.next();
     }
 
+    const finalNewAccountsList = newAccountResponse.value;
+    dispatch(updateSoftwareAccountsAction(finalNewAccountsList));
+
     // ledger accounts initially didn't have a deviceAccountIndex
     // this is a migration to add the deviceAccountIndex to the ledger accounts without them
     // it should only fire once if ever
@@ -193,13 +206,9 @@ const useWalletReducer = () => {
       dispatch(updateLedgerAccountsAction(newLedgerAccountsList));
     }
 
-    dispatch(updateSoftwareAccountsAction(walletAccounts));
-
-    if (resetIndex) {
-      dispatch(selectAccount(walletAccounts[0]));
+    if (options?.resetIndex) {
+      dispatch(selectAccount(finalNewAccountsList[0]));
     }
-
-    return walletAccounts;
   };
 
   const migrateLegacySeedStorage = async (password: string) => {
@@ -212,18 +221,21 @@ const useWalletReducer = () => {
   };
 
   const loadAccountNames = () => {
-    const updatedSavedNames = accounts.reduce<{ id: number; name: string }[]>((acc, account) => {
-      if (account.accountName) {
-        acc.push({ id: account.id, name: account.accountName });
-      }
-      return acc;
-    }, []);
+    const updatedSavedNames = softwareAccountsList.reduce<{ id: number; name: string }[]>(
+      (acc, account) => {
+        if (account.accountName) {
+          acc.push({ id: account.id, name: account.accountName });
+        }
+        return acc;
+      },
+      [],
+    );
     dispatch(updateSavedNamesAction(network.type, updatedSavedNames));
   };
 
-  const loadWallet = async () => {
+  const loadWallet = async (onReady?: () => void) => {
     const seedPhrase = await seedVault.getSeed();
-    const currentAccounts = accounts || [];
+    let currentAccounts = softwareAccountsList || [];
 
     if (currentAccounts.length === 0) {
       // This will happen on first load after the wallet is created. We create the accounts here to ensure
@@ -234,25 +246,68 @@ const useWalletReducer = () => {
         seedPhrase,
         0,
         network.type,
-        selectedNetwork,
         savedNames[network.type],
       );
-      currentAccounts.push(account);
 
-      await loadActiveAccounts(seedPhrase, network, selectedNetwork, currentAccounts);
+      currentAccounts = [account];
     }
 
-    await ensureSelectedAccountValid();
+    // we need to generate the nested and native segwit address for each account if not yet generated
+    // this would happen on the first load after native segwit was added
+    const accountsHaveFullAddressData = currentAccounts.every(
+      (account) => account.btcAddresses.native && account.btcAddresses.nested,
+    );
+
+    if (!accountsHaveFullAddressData) {
+      currentAccounts = await Promise.all(
+        currentAccounts.map(async (account) => {
+          if (!account.btcAddresses.native || !account.btcAddresses.nested) {
+            const updatedAccount = await createSingleAccount(
+              seedPhrase,
+              account.id,
+              network.type,
+              savedNames[network.type],
+            );
+
+            return updatedAccount;
+          }
+
+          return account;
+        }),
+      );
+    }
 
-    if (!savedNames[network.type]?.length && accounts.some((account) => !!account.accountName)) {
+    if (
+      !savedNames[network.type]?.length &&
+      softwareAccountsList.some((account) => !!account.accountName)
+    ) {
       // there was no savedNames store object initially
       // this is a migration to add the savedNames if there are custom account names that are not saved
       // it should only fire once if ever
       loadAccountNames();
     }
 
-    dispatch(setWalletUnlockedAction(true));
-    setSessionStartTimeAndMigrate();
+    let initialised = false;
+    const initialise = () => {
+      if (initialised) return;
+
+      onReady?.();
+      dispatch(setWalletUnlockedAction(true));
+      setSessionStartTimeAndMigrate();
+      initialised = true;
+    };
+
+    await loadActiveAccounts(seedPhrase, network, selectedNetwork, currentAccounts, {
+      checkForNewAccounts: network.type === 'Mainnet',
+      accountLoadCallback: async (loadedAccounts) => {
+        if (loadedAccounts.length === currentAccounts.length) {
+          await ensureSelectedAccountValid(undefined, undefined, loadedAccounts);
+          initialise();
+        }
+      },
+    });
+
+    initialise();
   };
 
   const unlockWallet = async (password: string) => {
@@ -299,13 +354,7 @@ const useWalletReducer = () => {
     // We create an account to ensure that the seed phrase is valid, but we don't store it
     // The actual account creation is done on startup of the wallet
     // If the seed phrase is invalid, then this will throw an error
-    await createSingleAccount(
-      seedPhrase,
-      0,
-      network.type,
-      selectedNetwork,
-      savedNames[network.type],
-    );
+    await createSingleAccount(seedPhrase, 0, network.type, savedNames[network.type]);
 
     await chrome.storage.local.clear();
     await chrome.storage.session.clear();
@@ -322,12 +371,12 @@ const useWalletReducer = () => {
       // reinitialise with masterpubkey hash now that we have it
       if (hasOptedInMixPanelTracking()) {
         const seed = await seedVault.getSeed();
-        const wallet = await walletFromSeedPhrase({
+        const account = await getAccountFromSeedPhrase({
           mnemonic: seed,
           index: 0n,
           network: 'Mainnet',
         });
-        optInMixPanel(wallet.masterPubKey);
+        optInMixPanel(account.masterPubKey);
       }
     }
     localStorage.setItem('migrated', 'true');
@@ -348,7 +397,12 @@ const useWalletReducer = () => {
 
   const createAccount = async () => {
     const seedPhrase = await seedVault.getSeed();
-    const newAccounts = await createWalletAccount(seedPhrase, network, selectedNetwork, accounts);
+    const newAccounts = await createWalletAccount(
+      seedPhrase,
+      network,
+      selectedNetwork,
+      softwareAccountsList,
+    );
     dispatch(updateSoftwareAccountsAction(newAccounts));
   };
 
@@ -362,32 +416,36 @@ const useWalletReducer = () => {
 
       dispatch(selectAccount(nextAccount));
 
-      dispatchEventAuthorizedConnectedClients(
+      const changeEventPermissions: Omit<Permission, 'clientId'>[] = [
         {
           resourceId: makeAccountResourceId({
-            accountId: accounts[selectedAccountIndex].id,
-            masterPubKey: accounts[selectedAccountIndex].masterPubKey,
+            accountId: nextAccount.id,
+            masterPubKey: nextAccount.masterPubKey,
             networkType: network.type,
           }),
           actions: new Set(['read']),
         },
-        { type: 'accountChange' },
-      );
+      ];
+      if (currentlySelectedAccount) {
+        changeEventPermissions.push({
+          resourceId: makeAccountResourceId({
+            accountId: currentlySelectedAccount.id,
+            masterPubKey: currentlySelectedAccount.masterPubKey,
+            networkType: network.type,
+          }),
+          actions: new Set(['read']),
+        });
+      }
+
+      dispatchEventAuthorizedConnectedClients(changeEventPermissions, { type: 'accountChange' });
     },
-    [
-      accounts,
-      dispatch,
-      ensureSelectedAccountValid,
-      network.type,
-      queryClient,
-      selectedAccountIndex,
-    ],
+    [dispatch, ensureSelectedAccountValid, network.type, queryClient, currentlySelectedAccount],
   );
 
   const changeNetwork = async (changedNetwork: SettingsNetwork) => {
     // Save current custom account names
     const currentNetworkType = network.type;
-    const customAccountNames = accounts.map((account) => ({
+    const customAccountNames = softwareAccountsList.map((account) => ({
       id: account.id,
       name: account.accountName,
     }));
@@ -399,17 +457,29 @@ const useWalletReducer = () => {
 
     dispatch(ChangeNetworkAction(changedNetwork));
 
-    dispatchEventAuthorizedConnectedClients(
-      {
-        resourceId: makeAccountResourceId({
-          accountId: accounts[selectedAccountIndex].id,
-          masterPubKey: accounts[selectedAccountIndex].masterPubKey,
-          networkType: network.type,
-        }),
-        actions: new Set(['read']),
-      },
-      { type: 'networkChange' },
-    );
+    if (currentlySelectedAccount) {
+      dispatchEventAuthorizedConnectedClients(
+        [
+          {
+            resourceId: makeAccountResourceId({
+              accountId: currentlySelectedAccount.id,
+              masterPubKey: currentlySelectedAccount.masterPubKey,
+              networkType: network.type,
+            }),
+            actions: new Set(['read']),
+          },
+          {
+            resourceId: makeAccountResourceId({
+              accountId: currentlySelectedAccount.id,
+              masterPubKey: currentlySelectedAccount.masterPubKey,
+              networkType: changedNetwork.type,
+            }),
+            actions: new Set(['read']),
+          },
+        ],
+        { type: 'networkChange' },
+      );
+    }
 
     const seedPhrase = await seedVault.getSeed();
     const changedStacksNetwork =
@@ -420,18 +490,19 @@ const useWalletReducer = () => {
     const nextAccounts: Account[] = [];
 
     // we recreate the same number of accounts on the new network
-    for (let i = 0; i < accounts.length; i++) {
+    for (let i = 0; i < softwareAccountsList.length; i++) {
       const account = await createSingleAccount(
         seedPhrase,
         i,
         changedNetwork.type,
-        changedStacksNetwork,
         savedNames[changedNetwork.type],
       );
       nextAccounts.push(account);
     }
 
-    await loadActiveAccounts(seedPhrase, changedNetwork, changedStacksNetwork, nextAccounts, true);
+    await loadActiveAccounts(seedPhrase, changedNetwork, changedStacksNetwork, nextAccounts, {
+      resetIndex: true,
+    });
   };
 
   const addLedgerAccount = async (ledgerAccount: Account) => {
@@ -458,12 +529,11 @@ const useWalletReducer = () => {
     dispatch(updateLedgerAccountsAction(newLedgerAccountsList));
   };
 
-  // TODO: refactor this to be more specific to renaming software accounts
-  const renameAccount = async (updatedAccount: Account) => {
+  const renameSoftwareAccount = async (updatedAccount: Account) => {
     if (updatedAccount.accountType !== 'software') {
       throw new Error('Expected software account. Renaming cancelled.');
     }
-    const newAccountsList = accounts.map((account) =>
+    const newAccountsList = softwareAccountsList.map((account) =>
       account.id === updatedAccount.id ? updatedAccount : account,
     );
 
@@ -481,6 +551,30 @@ const useWalletReducer = () => {
     dispatch(updateSavedNamesAction(network.type, updatedSavedNames));
   };
 
+  const enableNestedSegWitAddress = () => {
+    dispatch(EnableNestedSegWitAddress());
+  };
+
+  const changeBtcPaymentAddressType = async (btcPaymentAddressType: 'native' | 'nested') => {
+    dispatch(ChangeBtcPaymentAddressType(btcPaymentAddressType));
+
+    if (currentlySelectedAccount) {
+      dispatchEventAuthorizedConnectedClients(
+        [
+          {
+            resourceId: makeAccountResourceId({
+              accountId: currentlySelectedAccount.id,
+              masterPubKey: currentlySelectedAccount.masterPubKey,
+              networkType: network.type,
+            }),
+            actions: new Set(['read']),
+          },
+        ],
+        { type: 'accountChange' },
+      );
+    }
+  };
+
   return {
     unlockWallet,
     loadWallet,
@@ -494,9 +588,11 @@ const useWalletReducer = () => {
     addLedgerAccount,
     removeLedgerAccount,
     updateLedgerAccounts,
-    renameAccount,
+    renameSoftwareAccount,
     toggleStxVisibility,
     changeShowDataCollectionAlert,
+    enableNestedSegWitAddress,
+    changeBtcPaymentAddressType,
   };
 };
 
diff --git a/src/app/hooks/useWalletSelector.ts b/src/app/hooks/useWalletSelector.ts
index 69cb74569..489d00ef9 100644
--- a/src/app/hooks/useWalletSelector.ts
+++ b/src/app/hooks/useWalletSelector.ts
@@ -2,9 +2,7 @@ import type { StoreState } from '@stores/index';
 import { useSelector } from 'react-redux';
 
 const useWalletSelector = () => {
-  const walletState = useSelector((state: StoreState) => ({
-    ...state.walletState,
-  }));
+  const walletState = useSelector((state: StoreState) => state.walletState);
 
   return {
     ...walletState,
diff --git a/src/app/routes/index.tsx b/src/app/routes/index.tsx
index 5c4d20d74..a6cbdee70 100644
--- a/src/app/routes/index.tsx
+++ b/src/app/routes/index.tsx
@@ -58,6 +58,7 @@ import SendStxScreen from '@screens/sendStx';
 import Setting from '@screens/settings';
 import About from '@screens/settings/about';
 import AdvancedSettings from '@screens/settings/advanced';
+import PaymentAddressTypeSelector from '@screens/settings/advanced/paymentAddressTypeSelector';
 import RestoreFunds from '@screens/settings/advanced/restoreFunds';
 import RecoverRunes from '@screens/settings/advanced/restoreFunds/recoverRunes';
 import RestoreOrdinals from '@screens/settings/advanced/restoreFunds/restoreOrdinals';
@@ -372,6 +373,14 @@ const router = createHashRouter([
           </AuthGuard>
         ),
       },
+      {
+        path: RoutePaths.PreferredAddress,
+        element: (
+          <AuthGuard>
+            <PaymentAddressTypeSelector />
+          </AuthGuard>
+        ),
+      },
       {
         path: 'restore-funds',
         element: <RestoreFunds />,
diff --git a/src/app/routes/paths.ts b/src/app/routes/paths.ts
index fc938663d..786801b18 100644
--- a/src/app/routes/paths.ts
+++ b/src/app/routes/paths.ts
@@ -8,6 +8,7 @@ enum RoutePaths {
   Preferences = '/preferences',
   Security = '/security',
   AdvancedSettings = '/advanced-settings',
+  PreferredAddress = '/preferred-address',
   TransferRunesRequest = '/transfer-runes-request',
   AccountList = '/account-list',
 }
diff --git a/src/app/screens/accountList/index.tsx b/src/app/screens/accountList/index.tsx
index 1fb8a50ff..5688219a9 100644
--- a/src/app/screens/accountList/index.tsx
+++ b/src/app/screens/accountList/index.tsx
@@ -1,5 +1,5 @@
 import ConnectLedger from '@assets/img/dashboard/connect_ledger.svg';
-import { filterLedgerAccounts } from '@common/utils/ledger';
+import { filterLedgerAccountsByNetwork } from '@common/utils/ledger';
 import LazyAccountRow from '@components/accountRow/lazyAccountRow';
 import Separator from '@components/separator';
 import TopRow from '@components/topRow';
@@ -67,7 +67,7 @@ function AccountList(): JSX.Element {
   const hideListActions = Boolean(params.get('hideListActions')) || false;
 
   const displayedAccountsList = useMemo(() => {
-    const networkLedgerAccounts = filterLedgerAccounts(ledgerAccountsList, network.type);
+    const networkLedgerAccounts = filterLedgerAccountsByNetwork(ledgerAccountsList, network.type);
     return [...networkLedgerAccounts, ...accountsList];
   }, [accountsList, ledgerAccountsList, network]);
 
@@ -84,8 +84,8 @@ function AccountList(): JSX.Element {
   };
 
   const isAccountSelected = (account: Account) =>
-    account.btcAddress === selectedAccount?.btcAddress &&
-    account.stxAddress === selectedAccount?.stxAddress;
+    account.btcAddresses.taproot.address === selectedAccount.ordinalsAddress &&
+    account.stxAddress === selectedAccount.stxAddress;
 
   const onCreateAccount = async () => {
     await createAccount();
@@ -105,7 +105,7 @@ function AccountList(): JSX.Element {
           <AccountContainer>
             <Title>{t('TITLE')}</Title>
             {displayedAccountsList.map((account) => (
-              <div key={account.btcAddress}>
+              <div key={account.btcAddresses.taproot.address}>
                 <LazyAccountRow
                   account={account}
                   isSelected={isAccountSelected(account)}
diff --git a/src/app/screens/coinDashboard/coinHeader.tsx b/src/app/screens/coinDashboard/coinHeader.tsx
index 15f677265..1fb725184 100644
--- a/src/app/screens/coinDashboard/coinHeader.tsx
+++ b/src/app/screens/coinDashboard/coinHeader.tsx
@@ -8,7 +8,7 @@ import BottomModal from '@components/bottomModal';
 import ActionButton from '@components/button';
 import SmallActionButton from '@components/smallActionButton';
 import TokenImage from '@components/tokenImage';
-import useBtcWalletData from '@hooks/queries/useBtcWalletData';
+import useSelectedAccountBtcBalance from '@hooks/queries/useSelectedAccountBtcBalance';
 import useStxWalletData from '@hooks/queries/useStxWalletData';
 import useSupportedCoinRates from '@hooks/queries/useSupportedCoinRates';
 import useHasFeature from '@hooks/useHasFeature';
@@ -59,7 +59,11 @@ type Props = {
 export default function CoinHeader({ currency, fungibleToken }: Props) {
   const selectedAccount = useSelectedAccount();
   const { fiatCurrency, network } = useWalletSelector();
-  const { data: btcBalance } = useBtcWalletData();
+
+  // TODO: this should be a dumb component, move the logic to the parent
+  // TODO: currently, we get btc and stx balances here for all currencies and FTs, but we should get them in
+  // TODO: the relevant parent and pass them as props
+  const { confirmedBalance: btcBalance } = useSelectedAccountBtcBalance();
   const { data: stxData } = useStxWalletData();
   const { btcFiatRate, stxBtcRate } = useSupportedCoinRates();
   const navigate = useNavigate();
diff --git a/src/app/screens/coinDashboard/coins/btc/addressBalance.tsx b/src/app/screens/coinDashboard/coins/btc/addressBalance.tsx
new file mode 100644
index 000000000..481f6a0d3
--- /dev/null
+++ b/src/app/screens/coinDashboard/coins/btc/addressBalance.tsx
@@ -0,0 +1,117 @@
+import { BtcAddressTypeLabel } from '@components/btcAddressTypeLabel';
+import FiatAmountText from '@components/fiatAmountText';
+import TokenImage from '@components/tokenImage';
+import useSupportedCoinRates from '@hooks/queries/useSupportedCoinRates';
+import useWalletSelector from '@hooks/useWalletSelector';
+import { Star } from '@phosphor-icons/react';
+import { getBtcFiatEquivalent, satsToBtc, type BtcAddressType } from '@secretkeylabs/xverse-core';
+import { StyledP } from '@ui-library/common.styled';
+import BigNumber from 'bignumber.js';
+import styled from 'styled-components';
+
+const Container = styled.div((props) => ({
+  display: 'flex',
+  flexDirection: 'row',
+  width: '100%',
+  marginBottom: props.theme.space.m,
+}));
+
+const IconOuterContainer = styled.div((_) => ({
+  display: 'flex',
+  alignItems: 'center',
+  justifyContent: 'center',
+}));
+
+const IconContainer = styled.div((_) => ({
+  position: 'relative',
+}));
+
+const TitleContainer = styled.div((props) => ({
+  display: 'flex',
+  flexDirection: 'column',
+  justifyContent: 'space-between',
+  margin: `${props.theme.space.s} ${props.theme.space.m}`,
+}));
+
+const AddressTypeContainer = styled.div((_) => ({
+  display: 'flex',
+  flexDirection: 'row',
+  alignItems: 'center',
+  gap: '4px',
+}));
+
+const BalanceContainer = styled.div((props) => ({
+  display: 'flex',
+  flexDirection: 'column',
+  alignItems: 'flex-end',
+  margin: `${props.theme.space.s} ${props.theme.space.m}`,
+  flexGrow: 1,
+}));
+
+const StarIconContainer = styled.div((props) => ({
+  position: 'absolute',
+  right: '-8px',
+  bottom: '4px',
+  backgroundColor: props.theme.colors.elevation0,
+  borderRadius: '50%',
+  padding: '2.2px',
+  display: 'flex',
+  alignItems: 'center',
+}));
+
+type AddressBalanceProps = {
+  balance: number | undefined;
+  addressType: BtcAddressType | undefined;
+  totalBalance: number | undefined;
+};
+
+export default function AddressBalance({
+  balance,
+  addressType,
+  totalBalance,
+}: AddressBalanceProps) {
+  const { fiatCurrency, btcPaymentAddressType } = useWalletSelector();
+  const { btcFiatRate } = useSupportedCoinRates();
+
+  if (balance === undefined) {
+    return null;
+  }
+
+  const balancePercentage =
+    balance && totalBalance
+      ? BigNumber(balance).div(totalBalance).multipliedBy(100).toFixed(2)
+      : '0.00';
+
+  const isCurrentPaymentAddress = addressType === btcPaymentAddressType;
+
+  return (
+    <Container>
+      <IconOuterContainer>
+        <IconContainer>
+          <TokenImage size={32} currency="BTC" />
+          {isCurrentPaymentAddress && (
+            <StarIconContainer>
+              <Star weight="fill" fill="white" size={12} />
+            </StarIconContainer>
+          )}
+        </IconContainer>
+      </IconOuterContainer>
+      <TitleContainer>
+        <AddressTypeContainer>
+          <StyledP typography="body_bold_m">BTC</StyledP>
+          {addressType && <BtcAddressTypeLabel addressType={addressType} />}
+        </AddressTypeContainer>
+        <StyledP typography="body_m" color="white_200">{`${balancePercentage}%`}</StyledP>
+      </TitleContainer>
+      <BalanceContainer>
+        <StyledP typography="body_bold_m">{satsToBtc(BigNumber(balance)).toString()}</StyledP>
+        <StyledP typography="body_m" color="white_200">
+          <FiatAmountText
+            fiatAmount={getBtcFiatEquivalent(BigNumber(balance), BigNumber(btcFiatRate))}
+            fiatCurrency={fiatCurrency}
+          />
+        </StyledP>
+      </BalanceContainer>
+    </Container>
+  );
+}
diff --git a/src/app/screens/coinDashboard/coins/btc/balanceBreakdown.tsx b/src/app/screens/coinDashboard/coins/btc/balanceBreakdown.tsx
new file mode 100644
index 000000000..b13c4cc77
--- /dev/null
+++ b/src/app/screens/coinDashboard/coins/btc/balanceBreakdown.tsx
@@ -0,0 +1,53 @@
+import useSelectedAccountBtcBalance from '@hooks/queries/useSelectedAccountBtcBalance';
+import useWalletSelector from '@hooks/useWalletSelector';
+import Spinner from '@ui-library/spinner';
+import styled from 'styled-components';
+import { SecondaryContainer } from '../../index.styled';
+import AddressBalance from './addressBalance';
+
+const SpinnerContainer = styled.div`
+  width: 100%;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+`;
+
+export default function BalanceBreakdown() {
+  const { btcPaymentAddressType } = useWalletSelector();
+  const { confirmedBalance, nativeBalance, nestedBalance, taprootBalance, isLoading } =
+    useSelectedAccountBtcBalance();
+
+  if (isLoading) {
+    return (
+      <SecondaryContainer data-testid="btc-secondary-container">
+        <SpinnerContainer>
+          <Spinner color="white" size={25} />
+        </SpinnerContainer>
+      </SecondaryContainer>
+    );
+  }
+
+  const showNested = btcPaymentAddressType === 'nested' || nestedBalance?.confirmedBalance !== 0;
+
+  return (
+    <SecondaryContainer data-testid="btc-secondary-container">
+      <AddressBalance
+        balance={nativeBalance?.confirmedBalance}
+        addressType="native"
+        totalBalance={confirmedBalance}
+      />
+      {showNested && (
+        <AddressBalance
+          balance={nestedBalance?.confirmedBalance}
+          addressType="nested"
+          totalBalance={confirmedBalance}
+        />
+      )}
+      <AddressBalance
+        balance={taprootBalance?.confirmedBalance}
+        addressType="taproot"
+        totalBalance={confirmedBalance}
+      />
+    </SecondaryContainer>
+  );
+}
diff --git a/src/app/screens/coinDashboard/coins/btc/index.tsx b/src/app/screens/coinDashboard/coins/btc/index.tsx
new file mode 100644
index 000000000..489dc71f3
--- /dev/null
+++ b/src/app/screens/coinDashboard/coins/btc/index.tsx
@@ -0,0 +1,77 @@
+import { GlobalPreferredBtcAddressSheet } from '@components/preferredBtcAddress';
+import BottomBar from '@components/tabBar';
+import TopRow from '@components/topRow';
+import useCanUserSwitchPaymentType from '@hooks/useCanUserSwitchPaymentType';
+import { broadcastResetUserFlow, useResetUserFlow } from '@hooks/useResetUserFlow';
+import useTrackMixPanelPageViewed from '@hooks/useTrackMixPanelPageViewed';
+import { useState } from 'react';
+import { useTranslation } from 'react-i18next';
+import { useSearchParams } from 'react-router-dom';
+import CoinHeader from '../../coinHeader';
+import { Button, Container, FtInfoContainer } from '../../index.styled';
+import TransactionsHistoryList from '../../transactionsHistoryList';
+import BalanceBreakdown from './balanceBreakdown';
+
+export default function CoinDashboard() {
+  const [searchParams] = useSearchParams();
+  const { t } = useTranslation('translation', { keyPrefix: 'COIN_DASHBOARD_SCREEN' });
+  const fromSecondaryTab = searchParams.get('secondaryTab') === 'true' ? 'secondary' : 'primary';
+
+  const [currentTab, setCurrentTab] = useState<'primary' | 'secondary'>(fromSecondaryTab);
+  const [showPreferredBtcAddressSheet, setShowPreferredBtcAddressSheet] = useState(false);
+
+  useResetUserFlow('/coinDashboard');
+
+  const showBtcAddressTypeSelector = useCanUserSwitchPaymentType();
+
+  const handleGoBack = () => broadcastResetUserFlow();
+  const handleChangeAddressTypeClick = showBtcAddressTypeSelector
+    ? () => setShowPreferredBtcAddressSheet(true)
+    : undefined;
+
+  useTrackMixPanelPageViewed({});
+
+  const onCancelAddressType = () => setShowPreferredBtcAddressSheet(false);
+
+  return (
+    <>
+      <TopRow onClick={handleGoBack} onSettingsClick={handleChangeAddressTypeClick} />
+      <Container>
+        <CoinHeader currency="BTC" />
+        {/* TODO: import { Tabs } from ui-library/tabs.tsx */}
+        <FtInfoContainer>
+          <Button
+            disabled={currentTab === 'primary'}
+            isSelected={currentTab === 'primary'}
+            onClick={() => setCurrentTab('primary')}
+          >
+            {t('TRANSACTIONS')}
+          </Button>
+          <Button
+            data-testid="coin-secondary-button"
+            disabled={currentTab === 'secondary'}
+            isSelected={currentTab === 'secondary'}
+            onClick={() => setCurrentTab('secondary')}
+          >
+            {t('BREAKDOWN')}
+          </Button>
+        </FtInfoContainer>
+        {currentTab === 'primary' && (
+          <TransactionsHistoryList
+            coin="BTC"
+            stxTxFilter={null}
+            brc20Token={null}
+            runeToken={null}
+            runeSymbol={null}
+          />
+        )}
+        {currentTab === 'secondary' && <BalanceBreakdown />}
+      </Container>
+      <BottomBar tab="dashboard" />
+      <GlobalPreferredBtcAddressSheet
+        onHide={onCancelAddressType}
+        visible={showPreferredBtcAddressSheet}
+      />
+    </>
+  );
+}
diff --git a/src/app/screens/coinDashboard/coins/other.tsx b/src/app/screens/coinDashboard/coins/other.tsx
new file mode 100644
index 000000000..b6d5c09ad
--- /dev/null
+++ b/src/app/screens/coinDashboard/coins/other.tsx
@@ -0,0 +1,248 @@
+import linkIcon from '@assets/img/linkIcon.svg';
+import CopyButton from '@components/copyButton';
+import OptionsDialog from '@components/optionsDialog/optionsDialog';
+import BottomBar from '@components/tabBar';
+import TopRow from '@components/topRow';
+import { useVisibleBrc20FungibleTokens } from '@hooks/queries/ordinals/useGetBrc20FungibleTokens';
+import { useVisibleRuneFungibleTokens } from '@hooks/queries/runes/useRuneFungibleTokensQuery';
+import useRuneUtxosQuery from '@hooks/queries/runes/useRuneUtxosQuery';
+import { useVisibleSip10FungibleTokens } from '@hooks/queries/stx/useGetSip10FungibleTokens';
+import useSpamTokens from '@hooks/queries/useSpamTokens';
+import { broadcastResetUserFlow, useResetUserFlow } from '@hooks/useResetUserFlow';
+import useTrackMixPanelPageViewed from '@hooks/useTrackMixPanelPageViewed';
+import { Flag } from '@phosphor-icons/react';
+import RuneBundleRow from '@screens/coinDashboard/runes/bundleRow';
+import type { FungibleToken } from '@secretkeylabs/xverse-core';
+import { mapRareSatsAPIResponseToBundle } from '@secretkeylabs/xverse-core';
+import {
+  setBrc20ManageTokensAction,
+  setRunesManageTokensAction,
+  setSip10ManageTokensAction,
+  setSpamTokenAction,
+} from '@stores/wallet/actions/actionCreators';
+import { SPAM_OPTIONS_WIDTH, type CurrencyTypes } from '@utils/constants';
+import { ftDecimals, getExplorerUrl, getTruncatedAddress } from '@utils/helper';
+import { getFullTxId, getTxIdFromFullTxId, getVoutFromFullTxId } from '@utils/runes';
+import BigNumber from 'bignumber.js';
+import { useState } from 'react';
+import { useTranslation } from 'react-i18next';
+import { useDispatch } from 'react-redux';
+import { useParams, useSearchParams } from 'react-router-dom';
+import Theme from 'theme';
+import CoinHeader from '../coinHeader';
+import {
+  Button,
+  ButtonRow,
+  Container,
+  ContractAddressCopyButton,
+  ContractDeploymentButton,
+  CopyButtonContainer,
+  FtInfoContainer,
+  RuneBundlesContainer,
+  SecondaryContainer,
+  ShareIcon,
+  TokenContractAddress,
+  TokenText,
+} from '../index.styled';
+import TransactionsHistoryList from '../transactionsHistoryList';
+
+// TODO: This should be refactored into separate components for each protocol/coin as needed
+// TODO: with a shared component for the common parts
+
+export default function CoinDashboard() {
+  const [searchParams] = useSearchParams();
+  const ftKey = searchParams.get('ftKey') ?? '';
+  const protocol = searchParams.get('protocol') ?? '';
+  const { t } = useTranslation('translation', { keyPrefix: 'COIN_DASHBOARD_SCREEN' });
+  const fromSecondaryTab = searchParams.get('secondaryTab') === 'true' ? 'secondary' : 'primary';
+  const [currentTab, setCurrentTab] = useState<'primary' | 'secondary'>(fromSecondaryTab);
+  const [showOptionsDialog, setShowOptionsDialog] = useState(false);
+  const [optionsDialogIndents, setOptionsDialogIndents] = useState<
+    { top: string; left: string } | undefined
+  >();
+  const { addToSpamTokens } = useSpamTokens();
+  const dispatch = useDispatch();
+  const { currency } = useParams();
+  const { data: runesCoinsList } = useVisibleRuneFungibleTokens();
+  const { data: sip10CoinsList } = useVisibleSip10FungibleTokens();
+  const { data: brc20CoinsList } = useVisibleBrc20FungibleTokens();
+
+  let selectedFt: FungibleToken | undefined;
+
+  if (ftKey && protocol) {
+    switch (protocol) {
+      case 'stacks':
+        selectedFt = sip10CoinsList.find((ft) => ft.principal === ftKey);
+        break;
+      case 'brc-20':
+        selectedFt = brc20CoinsList.find((ft) => ft.principal === ftKey);
+        break;
+      case 'runes':
+        selectedFt = runesCoinsList.find((ft) => ft.principal === ftKey);
+        break;
+      default:
+        selectedFt = undefined;
+    }
+  }
+  const { data: runeUtxos } = useRuneUtxosQuery(
+    selectedFt?.protocol === 'runes' ? selectedFt?.name : '',
+  );
+
+  const showTxHistory = currentTab === 'primary';
+  const displayTabs = ['stacks', 'runes'].includes(protocol);
+  const showStxContract = currentTab === 'secondary' && selectedFt && protocol === 'stacks';
+  const showRuneBundles = currentTab === 'secondary' && selectedFt && protocol === 'runes';
+
+  useResetUserFlow('/coinDashboard');
+
+  const handleGoBack = () => broadcastResetUserFlow();
+
+  useTrackMixPanelPageViewed(
+    protocol
+      ? {
+          protocol,
+        }
+      : {},
+  );
+
+  const openOptionsDialog = (event: React.MouseEvent<HTMLButtonElement>) => {
+    setShowOptionsDialog(true);
+    setOptionsDialogIndents({
+      top: `${(event.target as HTMLElement).parentElement?.getBoundingClientRect().top}px`,
+      left: `calc(100% - ${SPAM_OPTIONS_WIDTH}px)`,
+    });
+  };
+
+  const closeOptionsDialog = () => setShowOptionsDialog(false);
+
+  return (
+    <>
+      <TopRow
+        onClick={handleGoBack}
+        onMenuClick={currency !== 'STX' ? openOptionsDialog : undefined}
+      />
+      {showOptionsDialog && (
+        <OptionsDialog
+          closeDialog={closeOptionsDialog}
+          optionsDialogIndents={optionsDialogIndents}
+          width={SPAM_OPTIONS_WIDTH}
+        >
+          <ButtonRow
+            onClick={() => {
+              if (!selectedFt) {
+                handleGoBack();
+                return;
+              }
+              // set the visibility to false
+              const payload = {
+                principal: selectedFt.principal,
+                isEnabled: false,
+              };
+              if (protocol === 'runes') {
+                dispatch(setRunesManageTokensAction(payload));
+              } else if (protocol === 'stacks') {
+                dispatch(setSip10ManageTokensAction(payload));
+              } else if (protocol === 'brc-20') {
+                dispatch(setBrc20ManageTokensAction(payload));
+              }
+
+              addToSpamTokens(selectedFt.principal);
+              dispatch(setSpamTokenAction(selectedFt));
+
+              handleGoBack();
+            }}
+          >
+            <Flag size={24} color={Theme.colors.danger_light} />
+            <TokenText color="danger_light" typography="body_medium_l">
+              {t('HIDE_AND_REPORT')}
+            </TokenText>
+          </ButtonRow>
+        </OptionsDialog>
+      )}
+      <Container>
+        <CoinHeader currency={currency as CurrencyTypes} fungibleToken={selectedFt} />
+        {/* TODO: import { Tabs } from ui-library/tabs.tsx */}
+        {displayTabs && (
+          <FtInfoContainer>
+            <Button
+              disabled={currentTab === 'primary'}
+              isSelected={currentTab === 'primary'}
+              onClick={() => setCurrentTab('primary')}
+            >
+              {t('TRANSACTIONS')}
+            </Button>
+            <Button
+              data-testid="coin-secondary-button"
+              disabled={currentTab === 'secondary'}
+              isSelected={currentTab === 'secondary'}
+              onClick={() => setCurrentTab('secondary')}
+            >
+              {protocol === 'stacks' && t('CONTRACT')}
+              {protocol === 'runes' && t('BUNDLES')}
+            </Button>
+          </FtInfoContainer>
+        )}
+        {showTxHistory && (
+          <TransactionsHistoryList
+            coin={currency as CurrencyTypes}
+            stxTxFilter={
+              selectedFt?.protocol === 'runes'
+                ? selectedFt?.name
+                : `${selectedFt?.principal}::${selectedFt?.assetName}`
+            }
+            brc20Token={protocol === 'brc-20' ? selectedFt?.principal || null : null}
+            runeToken={protocol === 'runes' ? selectedFt?.name || null : null}
+            runeSymbol={protocol === 'runes' ? selectedFt?.runeSymbol || null : null}
+            withTitle={!displayTabs}
+          />
+        )}
+        {showStxContract && (
+          <SecondaryContainer data-testid="coin-secondary-container">
+            <h1>{t('FT_CONTRACT_PREFIX')}</h1>
+            <ContractAddressCopyButton
+              onClick={() => navigator.clipboard.writeText(selectedFt?.principal as string)}
+            >
+              <TokenContractAddress data-testid="coin-contract-address">
+                {getTruncatedAddress(selectedFt?.principal as string, 20)}
+              </TokenContractAddress>
+              <CopyButtonContainer>
+                <CopyButton text={selectedFt?.principal as string} />
+              </CopyButtonContainer>
+            </ContractAddressCopyButton>
+            <ContractDeploymentButton
+              onClick={() => window.open(getExplorerUrl(selectedFt?.principal as string), '_blank')}
+            >
+              {t('OPEN_FT_CONTRACT_DEPLOYMENT')}
+              <span>{t('STACKS_EXPLORER')}</span>
+              <ShareIcon src={linkIcon} alt="link" />
+            </ContractDeploymentButton>
+          </SecondaryContainer>
+        )}
+        {showRuneBundles && (
+          <SecondaryContainer data-testid="coin-secondary-container">
+            <RuneBundlesContainer>
+              {runeUtxos?.map((utxo) => {
+                const fullTxId = getFullTxId(utxo);
+                const runeAmount = utxo.runes?.filter((rune) => rune[0] === selectedFt?.name)[0][1]
+                  .amount;
+                return (
+                  <RuneBundleRow
+                    key={fullTxId}
+                    txId={getTxIdFromFullTxId(fullTxId)}
+                    vout={getVoutFromFullTxId(fullTxId)}
+                    runeAmount={String(ftDecimals(runeAmount ?? 0, selectedFt?.decimals ?? 0))}
+                    runeId={selectedFt?.principal ?? ''}
+                    runeSymbol={selectedFt?.runeSymbol ?? ''}
+                    satAmount={BigNumber(utxo.value).toNumber()}
+                    bundle={mapRareSatsAPIResponseToBundle(utxo)}
+                  />
+                );
+              })}
+            </RuneBundlesContainer>
+          </SecondaryContainer>
+        )}
+      </Container>
+      <BottomBar tab="dashboard" />
+    </>
+  );
+}
diff --git a/src/app/screens/coinDashboard/index.styled.ts b/src/app/screens/coinDashboard/index.styled.ts
new file mode 100644
index 000000000..f38341537
--- /dev/null
+++ b/src/app/screens/coinDashboard/index.styled.ts
@@ -0,0 +1,120 @@
+import { StyledP } from '@ui-library/common.styled';
+import styled from 'styled-components';
+
+export const Container = styled.div((props) => ({
+  display: 'flex',
+  flex: 1,
+  marginTop: props.theme.space.xs,
+  flexDirection: 'column',
+  overflowY: 'auto',
+  '&::-webkit-scrollbar': {
+    display: 'none',
+  },
+}));
+
+export const SecondaryContainer = styled.div((props) => ({
+  display: 'flex',
+  flexDirection: 'column',
+  paddingLeft: props.theme.space.m,
+  paddingRight: props.theme.space.m,
+  marginTop: props.theme.space.l,
+  marginBottom: props.theme.space.xl,
+  h1: {
+    ...props.theme.typography.body_medium_m,
+    color: props.theme.colors.white_400,
+  },
+}));
+
+export const ContractAddressCopyButton = styled.button((props) => ({
+  display: 'flex',
+  marginTop: props.theme.space.xxs,
+  background: 'transparent',
+}));
+
+export const TokenContractAddress = styled.p((props) => ({
+  ...props.theme.typography.body_medium_l,
+  color: props.theme.colors.white_0,
+  textAlign: 'left',
+  overflowWrap: 'break-word',
+  width: 300,
+}));
+
+export const FtInfoContainer = styled.div((props) => ({
+  display: 'flex',
+  flexDirection: 'row',
+  borderTop: `1px solid ${props.theme.colors.elevation2}`,
+  paddingTop: props.theme.space.l,
+  marginTop: props.theme.space.xl,
+  paddingLeft: props.theme.space.m,
+}));
+
+export const ShareIcon = styled.img({
+  width: 18,
+  height: 18,
+});
+
+export const CopyButtonContainer = styled.div((props) => ({
+  marginRight: props.theme.space.xxs,
+}));
+
+export const ContractDeploymentButton = styled.button((props) => ({
+  ...props.theme.typography.body_m,
+  display: 'flex',
+  alignItems: 'center',
+  marginTop: props.theme.space.l,
+  background: 'none',
+  color: props.theme.colors.white_400,
+  span: {
+    color: props.theme.colors.white_0,
+    marginLeft: props.theme.space.xs,
+  },
+  img: {
+    marginLeft: props.theme.space.xs,
+  },
+}));
+
+export const Button = styled.button<{
+  isSelected: boolean;
+}>((props) => ({
+  ...props.theme.typography.body_bold_l,
+  fontSize: 11,
+  display: 'flex',
+  justifyContent: 'center',
+  alignItems: 'center',
+  height: 31,
+  paddingLeft: props.theme.space.s,
+  paddingRight: props.theme.space.s,
+  marginRight: props.theme.space.xxs,
+  borderRadius: 44,
+  background: props.isSelected ? props.theme.colors.elevation2 : 'transparent',
+  color: props.theme.colors.white_0,
+  opacity: props.isSelected ? 1 : 0.6,
+}));
+
+export const ButtonRow = styled.button`
+  display: flex;
+  align-items: center;
+  background-color: transparent;
+  flex-direction: row;
+  padding-left: ${(props) => props.theme.space.m};
+  padding-right: ${(props) => props.theme.space.m};
+  padding-top: ${(props) => props.theme.space.s};
+  padding-bottom: ${(props) => props.theme.space.s};
+  transition: background-color 0.2s ease;
+  :hover {
+    background-color: ${(props) => props.theme.colors.elevation3};
+  }
+  :active {
+    background-color: ${(props) => props.theme.colors.elevation3};
+  }
+`;
+
+export const TokenText = styled(StyledP)`
+  margin-left: ${(props) => props.theme.space.m};
+`;
+
+export const RuneBundlesContainer = styled.div`
+  display: flex;
+  flex-direction: column;
+  gap: ${(props) => props.theme.space.s};
+`;
diff --git a/src/app/screens/coinDashboard/index.tsx b/src/app/screens/coinDashboard/index.tsx
index 490ba015b..a89395893 100644
--- a/src/app/screens/coinDashboard/index.tsx
+++ b/src/app/screens/coinDashboard/index.tsx
@@ -1,350 +1,15 @@
-import linkIcon from '@assets/img/linkIcon.svg';
-import CopyButton from '@components/copyButton';
-import OptionsDialog from '@components/optionsDialog/optionsDialog';
-import BottomBar from '@components/tabBar';
-import TopRow from '@components/topRow';
-import { useVisibleBrc20FungibleTokens } from '@hooks/queries/ordinals/useGetBrc20FungibleTokens';
-import { useVisibleRuneFungibleTokens } from '@hooks/queries/runes/useRuneFungibleTokensQuery';
-import useRuneUtxosQuery from '@hooks/queries/runes/useRuneUtxosQuery';
-import { useVisibleSip10FungibleTokens } from '@hooks/queries/stx/useGetSip10FungibleTokens';
-import useSpamTokens from '@hooks/queries/useSpamTokens';
-import { broadcastResetUserFlow, useResetUserFlow } from '@hooks/useResetUserFlow';
-import useTrackMixPanelPageViewed from '@hooks/useTrackMixPanelPageViewed';
-import { Flag } from '@phosphor-icons/react';
-import RuneBundleRow from '@screens/coinDashboard/runes/bundleRow';
-import type { FungibleToken } from '@secretkeylabs/xverse-core';
-import { mapRareSatsAPIResponseToBundle } from '@secretkeylabs/xverse-core';
-import {
-  setBrc20ManageTokensAction,
-  setRunesManageTokensAction,
-  setSip10ManageTokensAction,
-  setSpamTokenAction,
-} from '@stores/wallet/actions/actionCreators';
-import { StyledP } from '@ui-library/common.styled';
-import { SPAM_OPTIONS_WIDTH, type CurrencyTypes } from '@utils/constants';
-import { ftDecimals, getExplorerUrl, getTruncatedAddress } from '@utils/helper';
-import { getFullTxId, getTxIdFromFullTxId, getVoutFromFullTxId } from '@utils/runes';
-import BigNumber from 'bignumber.js';
-import { useState } from 'react';
-import { useTranslation } from 'react-i18next';
-import { useDispatch } from 'react-redux';
-import { useParams, useSearchParams } from 'react-router-dom';
-import styled from 'styled-components';
-import Theme from 'theme';
-import CoinHeader from './coinHeader';
-import TransactionsHistoryList from './transactionsHistoryList';
-
-const Container = styled.div((props) => ({
-  display: 'flex',
-  flex: 1,
-  marginTop: props.theme.space.xs,
-  flexDirection: 'column',
-  overflowY: 'auto',
-  '&::-webkit-scrollbar': {
-    display: 'none',
-  },
-}));
-
-const SecondaryContainer = styled.div((props) => ({
-  display: 'flex',
-  flexDirection: 'column',
-  paddingLeft: props.theme.space.m,
-  paddingRight: props.theme.space.m,
-  marginTop: props.theme.space.l,
-  marginBottom: props.theme.space.xl,
-  h1: {
-    ...props.theme.typography.body_medium_m,
-    color: props.theme.colors.white_400,
-  },
-}));
-
-const ContractAddressCopyButton = styled.button((props) => ({
-  display: 'flex',
-  marginTop: props.theme.space.xxs,
-  background: 'transparent',
-}));
-
-const TokenContractAddress = styled.p((props) => ({
-  ...props.theme.typography.body_medium_l,
-  color: props.theme.colors.white_0,
-  textAlign: 'left',
-  overflowWrap: 'break-word',
-  width: 300,
-}));
-
-const FtInfoContainer = styled.div((props) => ({
-  display: 'flex',
-  flexDirection: 'row',
-  borderTop: `1px solid ${props.theme.colors.elevation2}`,
-  paddingTop: props.theme.space.l,
-  marginTop: props.theme.space.xl,
-  paddingLeft: props.theme.space.m,
-}));
-
-const ShareIcon = styled.img({
-  width: 18,
-  height: 18,
-});
-
-const CopyButtonContainer = styled.div((props) => ({
-  marginRight: props.theme.space.xxs,
-}));
-
-const ContractDeploymentButton = styled.button((props) => ({
-  ...props.theme.typography.body_m,
-  display: 'flex',
-  alignItems: 'center',
-  marginTop: props.theme.space.l,
-  background: 'none',
-  color: props.theme.colors.white_400,
-  span: {
-    color: props.theme.colors.white_0,
-    marginLeft: props.theme.space.xs,
-  },
-  img: {
-    marginLeft: props.theme.space.xs,
-  },
-}));
-
-const Button = styled.button<{
-  isSelected: boolean;
-}>((props) => ({
-  ...props.theme.typography.body_bold_l,
-  fontSize: 11,
-  display: 'flex',
-  justifyContent: 'center',
-  alignItems: 'center',
-  height: 31,
-  paddingLeft: props.theme.space.s,
-  paddingRight: props.theme.space.s,
-  marginRight: props.theme.space.xxs,
-  borderRadius: 44,
-  background: props.isSelected ? props.theme.colors.elevation2 : 'transparent',
-  color: props.theme.colors.white_0,
-  opacity: props.isSelected ? 1 : 0.6,
-}));
-
-const ButtonRow = styled.button`
-  display: flex;
-  align-items: center;
-  background-color: transparent;
-  flex-direction: row;
-  padding-left: ${(props) => props.theme.space.m};
-  padding-right: ${(props) => props.theme.space.m};
-  padding-top: ${(props) => props.theme.space.s};
-  padding-bottom: ${(props) => props.theme.space.s};
-  transition: background-color 0.2s ease;
-  :hover {
-    background-color: ${(props) => props.theme.colors.elevation3};
-  }
-  :active {
-    background-color: ${(props) => props.theme.colors.elevation3};
-  }
-`;
-
-const TokenText = styled(StyledP)`
-  margin-left: ${(props) => props.theme.space.m};
-`;
-
-const RuneBundlesContainer = styled.div`
-  display: flex;
-  flex-direction: column;
-  gap: ${(props) => props.theme.space.s};
-`;
+import { useParams } from 'react-router-dom';
+import Btc from './coins/btc';
+import Other from './coins/other';
 
 export default function CoinDashboard() {
-  const [searchParams] = useSearchParams();
-  const ftKey = searchParams.get('ftKey') ?? '';
-  const protocol = searchParams.get('protocol') ?? '';
-  const { t } = useTranslation('translation', { keyPrefix: 'COIN_DASHBOARD_SCREEN' });
-  const fromSecondaryTab = searchParams.get('secondaryTab') === 'true' ? 'secondary' : 'primary';
-  const [currentTab, setCurrentTab] = useState<'primary' | 'secondary'>(fromSecondaryTab);
-  const [showOptionsDialog, setShowOptionsDialog] = useState(false);
-  const [optionsDialogIndents, setOptionsDialogIndents] = useState<
-    { top: string; left: string } | undefined
-  >();
-  const { addToSpamTokens } = useSpamTokens();
-  const dispatch = useDispatch();
   const { currency } = useParams();
-  const { data: runesCoinsList } = useVisibleRuneFungibleTokens();
-  const { data: sip10CoinsList } = useVisibleSip10FungibleTokens();
-  const { data: brc20CoinsList } = useVisibleBrc20FungibleTokens();
-
-  let selectedFt: FungibleToken | undefined;
 
-  if (ftKey && protocol) {
-    switch (protocol) {
-      case 'stacks':
-        selectedFt = sip10CoinsList.find((ft) => ft.principal === ftKey);
-        break;
-      case 'brc-20':
-        selectedFt = brc20CoinsList.find((ft) => ft.principal === ftKey);
-        break;
-      case 'runes':
-        selectedFt = runesCoinsList.find((ft) => ft.principal === ftKey);
-        break;
-      default:
-        selectedFt = undefined;
-    }
+  switch (currency) {
+    case 'BTC':
+      return <Btc />;
+    default:
+      // TODO: split this more. Other is currently doing too much
+      return <Other />;
   }
-  const { data: runeUtxos } = useRuneUtxosQuery(
-    selectedFt?.protocol === 'runes' ? selectedFt?.name : '',
-  );
-
-  const showTxHistory = currentTab === 'primary';
-  const displayTabs = ['stacks', 'runes'].includes(protocol);
-  const showStxContract = currentTab === 'secondary' && selectedFt && protocol === 'stacks';
-  const showRuneBundles = currentTab === 'secondary' && selectedFt && protocol === 'runes';
-
-  useResetUserFlow('/coinDashboard');
-
-  const handleGoBack = () => broadcastResetUserFlow();
-
-  useTrackMixPanelPageViewed(
-    protocol
-      ? {
-          protocol,
-        }
-      : {},
-  );
-
-  const openOptionsDialog = (event: React.MouseEvent<HTMLButtonElement>) => {
-    setShowOptionsDialog(true);
-    setOptionsDialogIndents({
-      top: `${(event.target as HTMLElement).parentElement?.getBoundingClientRect().top}px`,
-      left: `calc(100% - ${SPAM_OPTIONS_WIDTH}px)`,
-    });
-  };
-
-  const closeOptionsDialog = () => setShowOptionsDialog(false);
-
-  return (
-    <>
-      <TopRow
-        onClick={handleGoBack}
-        onMenuClick={currency !== 'STX' && currency !== 'BTC' ? openOptionsDialog : undefined}
-      />
-      {showOptionsDialog && (
-        <OptionsDialog
-          closeDialog={closeOptionsDialog}
-          optionsDialogIndents={optionsDialogIndents}
-          width={SPAM_OPTIONS_WIDTH}
-        >
-          <ButtonRow
-            onClick={() => {
-              if (!selectedFt) {
-                handleGoBack();
-                return;
-              }
-              // set the visibility to false
-              const payload = {
-                principal: selectedFt.principal,
-                isEnabled: false,
-              };
-              if (protocol === 'runes') {
-                dispatch(setRunesManageTokensAction(payload));
-              } else if (protocol === 'stacks') {
-                dispatch(setSip10ManageTokensAction(payload));
-              } else if (protocol === 'brc-20') {
-                dispatch(setBrc20ManageTokensAction(payload));
-              }
-
-              addToSpamTokens(selectedFt.principal);
-              dispatch(setSpamTokenAction(selectedFt));
-
-              handleGoBack();
-            }}
-          >
-            <Flag size={24} color={Theme.colors.danger_light} />
-            <TokenText color="danger_light" typography="body_medium_l">
-              {t('HIDE_AND_REPORT')}
-            </TokenText>
-          </ButtonRow>
-        </OptionsDialog>
-      )}
-      <Container>
-        <CoinHeader currency={currency as CurrencyTypes} fungibleToken={selectedFt} />
-        {displayTabs && (
-          <FtInfoContainer>
-            <Button
-              disabled={currentTab === 'primary'}
-              isSelected={currentTab === 'primary'}
-              onClick={() => setCurrentTab('primary')}
-            >
-              {t('TRANSACTIONS')}
-            </Button>
-            <Button
-              data-testid="coin-secondary-button"
-              disabled={currentTab === 'secondary'}
-              isSelected={currentTab === 'secondary'}
-              onClick={() => setCurrentTab('secondary')}
-            >
-              {protocol === 'stacks' && t('CONTRACT')}
-              {protocol === 'runes' && t('BUNDLES')}
-            </Button>
-          </FtInfoContainer>
-        )}
-        {showTxHistory && (
-          <TransactionsHistoryList
-            coin={currency as CurrencyTypes}
-            stxTxFilter={
-              selectedFt?.protocol === 'runes'
-                ? selectedFt?.name
-                : `${selectedFt?.principal}::${selectedFt?.assetName}`
-            }
-            brc20Token={protocol === 'brc-20' ? selectedFt?.principal || null : null}
-            runeToken={protocol === 'runes' ? selectedFt?.name || null : null}
-            runeSymbol={protocol === 'runes' ? selectedFt?.runeSymbol || null : null}
-            withTitle={!displayTabs}
-          />
-        )}
-        {showStxContract && (
-          <SecondaryContainer data-testid="coin-secondary-container">
-            <h1>{t('FT_CONTRACT_PREFIX')}</h1>
-            <ContractAddressCopyButton
-              onClick={() => navigator.clipboard.writeText(selectedFt?.principal as string)}
-            >
-              <TokenContractAddress data-testid="coin-contract-address">
-                {getTruncatedAddress(selectedFt?.principal as string, 20)}
-              </TokenContractAddress>
-              <CopyButtonContainer>
-                <CopyButton text={selectedFt?.principal as string} />
-              </CopyButtonContainer>
-            </ContractAddressCopyButton>
-            <ContractDeploymentButton
-              onClick={() => window.open(getExplorerUrl(selectedFt?.principal as string), '_blank')}
-            >
-              {t('OPEN_FT_CONTRACT_DEPLOYMENT')}
-              <span>{t('STACKS_EXPLORER')}</span>
-              <ShareIcon src={linkIcon} alt="link" />
-            </ContractDeploymentButton>
-          </SecondaryContainer>
-        )}
-        {showRuneBundles && (
-          <SecondaryContainer data-testid="coin-secondary-container">
-            <RuneBundlesContainer>
-              {runeUtxos?.map((utxo) => {
-                const fullTxId = getFullTxId(utxo);
-                const runeAmount = utxo.runes?.filter((rune) => rune[0] === selectedFt?.name)[0][1]
-                  .amount;
-                return (
-                  <RuneBundleRow
-                    key={fullTxId}
-                    txId={getTxIdFromFullTxId(fullTxId)}
-                    vout={getVoutFromFullTxId(fullTxId)}
-                    runeAmount={String(ftDecimals(runeAmount ?? 0, selectedFt?.decimals ?? 0))}
-                    runeId={selectedFt?.principal ?? ''}
-                    runeSymbol={selectedFt?.runeSymbol ?? ''}
-                    satAmount={BigNumber(utxo.value).toNumber()}
-                    bundle={mapRareSatsAPIResponseToBundle(utxo)}
-                  />
-                );
-              })}
-            </RuneBundlesContainer>
-          </SecondaryContainer>
-        )}
-      </Container>
-      <BottomBar tab="dashboard" />
-    </>
-  );
 }
diff --git a/src/app/screens/confirmNftTransaction/index.tsx b/src/app/screens/confirmNftTransaction/index.tsx
index f6638aeb6..37d3357fc 100644
--- a/src/app/screens/confirmNftTransaction/index.tsx
+++ b/src/app/screens/confirmNftTransaction/index.tsx
@@ -78,7 +78,7 @@ function ConfirmNftTransaction() {
   const isGalleryOpen: boolean = document.documentElement.clientWidth > 360;
   const selectedAccount = useSelectedAccount();
   const { avatarIds } = useWalletSelector();
-  const currentAvatar = avatarIds[selectedAccount.btcAddress];
+  const selectedAvatar = avatarIds[selectedAccount.ordinalsAddress];
   const [fee, setFee] = useState<BigNumber>();
   const navigate = useNavigate();
   const location = useLocation();
@@ -117,8 +117,8 @@ function ConfirmNftTransaction() {
         refetch();
       }, 1000);
 
-      if (currentAvatar?.type === 'stacks' && currentAvatar.nft?.token_id === nft?.token_id) {
-        dispatch(removeAccountAvatarAction({ address: selectedAccount.btcAddress }));
+      if (selectedAvatar?.type === 'stacks' && selectedAvatar.nft?.token_id === nft?.token_id) {
+        dispatch(removeAccountAvatarAction({ address: selectedAccount.ordinalsAddress }));
       }
     }
   }, [
@@ -126,9 +126,9 @@ function ConfirmNftTransaction() {
     navigate,
     refetch,
     stxTxBroadcastData,
-    selectedAccount.btcAddress,
+    selectedAccount.ordinalsAddress,
     nft,
-    currentAvatar,
+    selectedAvatar,
   ]);
 
   useEffect(() => {
diff --git a/src/app/screens/connect/selectAccount.tsx b/src/app/screens/connect/selectAccount.tsx
index ba98ddab3..dcdb969e3 100644
--- a/src/app/screens/connect/selectAccount.tsx
+++ b/src/app/screens/connect/selectAccount.tsx
@@ -74,7 +74,7 @@ type Props = {
 };
 
 function SelectAccount({ account, handlePressAccount }: Props) {
-  const gradient = getAccountGradient(account?.stxAddress || account?.btcAddress!);
+  const gradient = getAccountGradient(account);
   const { t } = useTranslation('translation', { keyPrefix: 'SELECT_BTC_ADDRESS_SCREEN' });
   const theme = useTheme();
 
diff --git a/src/app/screens/home/announcementModal/index.tsx b/src/app/screens/home/announcementModal/index.tsx
new file mode 100644
index 000000000..47d2fa1b2
--- /dev/null
+++ b/src/app/screens/home/announcementModal/index.tsx
@@ -0,0 +1,43 @@
+import { useSessionStorage } from '@hooks/useStorage';
+import { markAlertSeen, shouldShowAlert, type AnnouncementKey } from '@utils/alertTracker';
+import { useEffect, useRef, useState } from 'react';
+import NativeSegWit from './nativeSegWit';
+
+const getAnnouncementToShow = () => {
+  if (shouldShowAlert('native_segwit_intro')) {
+    return 'native_segwit_intro';
+  }
+  return undefined;
+};
+
+export default function AnnouncementModal() {
+  const [hasShown, setHasShown] = useSessionStorage('announceShown', false);
+  const stickyShown = useRef(hasShown);
+  const [announcementToShow, setAnnouncementToShow] = useState<AnnouncementKey | undefined>();
+  const [isVisible, setIsVisible] = useState(true);
+
+  useEffect(() => {
+    setHasShown(true);
+
+    if (stickyShown.current) {
+      // we've already shown the announcement modal on this load, so don't show it again
+      return;
+    }
+
+    const announcement = getAnnouncementToShow();
+    setAnnouncementToShow(announcement);
+    // eslint-disable-next-line react-hooks/exhaustive-deps -- we only want to run this once
+  }, []);
+
+  const onClose = (announcementKey: AnnouncementKey) => () => {
+    setIsVisible(false);
+    markAlertSeen(announcementKey);
+  };
+
+  switch (announcementToShow) {
+    case 'native_segwit_intro':
+      return <NativeSegWit isVisible={isVisible} onClose={onClose('native_segwit_intro')} />;
+    default:
+      return null;
+  }
+}
diff --git a/src/app/screens/home/announcementModal/nativeSegWit.tsx b/src/app/screens/home/announcementModal/nativeSegWit.tsx
new file mode 100644
index 000000000..e04d1f10d
--- /dev/null
+++ b/src/app/screens/home/announcementModal/nativeSegWit.tsx
@@ -0,0 +1,66 @@
+import BtcLogo from '@assets/img/btcFlashy.svg';
+import Button from '@ui-library/button';
+import Sheet from '@ui-library/sheet';
+import { useTranslation } from 'react-i18next';
+import { useNavigate } from 'react-router-dom';
+import styled from 'styled-components';
+
+const LogoContainer = styled.div(() => ({
+  display: 'flex',
+  justifyContent: 'center',
+}));
+
+const LogoImg = styled.img(() => ({
+  height: '135px',
+}));
+
+const DescriptionItem = styled.div<{ $bottomSpacer?: boolean }>((props) => ({
+  ...props.theme.typography.body_m,
+  marginBottom: props.$bottomSpacer ? props.theme.space.m : 0,
+}));
+
+const ButtonContainer = styled.div((props) => ({
+  display: 'flex',
+  flexDirection: 'column',
+  justifyContent: 'space-between',
+  gap: props.theme.space.s,
+  marginTop: props.theme.space.xl,
+}));
+
+type Props = {
+  isVisible: boolean;
+  onClose: () => void;
+};
+
+export default function NativeSegWit({ isVisible, onClose }: Props) {
+  const { t } = useTranslation('translation', {
+    keyPrefix: 'DASHBOARD_SCREEN.ANNOUNCEMENTS.NATIVE_SEGWIT',
+  });
+  const navigate = useNavigate();
+
+  const onNavigate = () => {
+    navigate('/preferred-address');
+    onClose();
+  };
+
+  return (
+    <Sheet
+      title={t('TITLE')}
+      logo={
+        <LogoContainer>
+          <LogoImg src={BtcLogo} alt="BTC" />
+        </LogoContainer>
+      }
+      onClose={onClose}
+      visible={isVisible}
+    >
+      <DescriptionItem $bottomSpacer>{t('DESCRIPTION_1')}</DescriptionItem>
+      <DescriptionItem $bottomSpacer>{t('DESCRIPTION_2')}</DescriptionItem>
+      <DescriptionItem>{t('DESCRIPTION_3')}</DescriptionItem>
+      <ButtonContainer>
+        <Button title={t('SELECT')} onClick={onNavigate} />
+        <Button title={t('LATER')} onClick={onClose} variant="secondary" />
+      </ButtonContainer>
+    </Sheet>
+  );
+}
diff --git a/src/app/screens/home/balanceCard/index.tsx b/src/app/screens/home/balanceCard/index.tsx
index be2e94dd8..d36875c1a 100644
--- a/src/app/screens/home/balanceCard/index.tsx
+++ b/src/app/screens/home/balanceCard/index.tsx
@@ -3,7 +3,7 @@ import { useVisibleBrc20FungibleTokens } from '@hooks/queries/ordinals/useGetBrc
 import { useVisibleRuneFungibleTokens } from '@hooks/queries/runes/useRuneFungibleTokensQuery';
 import { useVisibleSip10FungibleTokens } from '@hooks/queries/stx/useGetSip10FungibleTokens';
 import useAccountBalance from '@hooks/queries/useAccountBalance';
-import useBtcWalletData from '@hooks/queries/useBtcWalletData';
+import useSelectedAccountBtcBalance from '@hooks/queries/useSelectedAccountBtcBalance';
 import useStxWalletData from '@hooks/queries/useStxWalletData';
 import useSupportedCoinRates from '@hooks/queries/useSupportedCoinRates';
 import useSelectedAccount from '@hooks/useSelectedAccount';
@@ -11,7 +11,7 @@ import useWalletSelector from '@hooks/useWalletSelector';
 import { currencySymbolMap } from '@secretkeylabs/xverse-core';
 import Spinner from '@ui-library/spinner';
 import { LoaderSize } from '@utils/constants';
-import { calculateTotalBalance } from '@utils/helper';
+import { calculateTotalBalance, getAccountBalanceKey } from '@utils/helper';
 import { useEffect } from 'react';
 import { useTranslation } from 'react-i18next';
 import { NumericFormat } from 'react-number-format';
@@ -74,19 +74,21 @@ function BalanceCard(props: BalanceCardProps) {
   const { t } = useTranslation('translation', { keyPrefix: 'DASHBOARD_SCREEN' });
   const selectedAccount = useSelectedAccount();
   const { fiatCurrency, hideStx, accountBalances } = useWalletSelector();
-  const { data: btcBalance } = useBtcWalletData();
+  const { confirmedBalance: btcBalance, isLoading: btcBalanceLoading } =
+    useSelectedAccountBtcBalance();
   const { data: stxData } = useStxWalletData();
   const { btcFiatRate, stxBtcRate } = useSupportedCoinRates();
   const { setAccountBalance } = useAccountBalance();
   const { isLoading, isRefetching } = props;
-  const oldTotalBalance = accountBalances[selectedAccount.btcAddress];
+  // TODO: refactor this into a hook
+  const oldTotalBalance = accountBalances[getAccountBalanceKey(selectedAccount)];
   const { data: sip10CoinsList } = useVisibleSip10FungibleTokens();
   const { data: brc20CoinsList } = useVisibleBrc20FungibleTokens();
   const { data: runesCoinList } = useVisibleRuneFungibleTokens();
 
   const balance = calculateTotalBalance({
     stxBalance: stxData?.balance.toString() ?? '0',
-    btcBalance: btcBalance?.toString() ?? '0',
+    btcBalance: (btcBalance ?? 0).toString(),
     sipCoinsList: sip10CoinsList,
     brcCoinsList: brc20CoinsList,
     runesCoinList,
@@ -96,14 +98,14 @@ function BalanceCard(props: BalanceCardProps) {
   });
 
   useEffect(() => {
-    if (!balance || !selectedAccount || isLoading || isRefetching) {
+    if (!balance || !selectedAccount || isLoading || btcBalanceLoading || isRefetching) {
       return;
     }
 
     if (oldTotalBalance !== balance) {
       setAccountBalance(selectedAccount, balance);
     }
-  }, [balance, oldTotalBalance, selectedAccount, isLoading, isRefetching]);
+  }, [balance, oldTotalBalance, selectedAccount, isLoading, isRefetching, btcBalanceLoading]);
 
   useEffect(() => {
     (() => {
diff --git a/src/app/screens/home/bannerCarousel.tsx b/src/app/screens/home/bannerCarousel.tsx
index a1f565ec2..47d978c99 100644
--- a/src/app/screens/home/bannerCarousel.tsx
+++ b/src/app/screens/home/bannerCarousel.tsx
@@ -1,7 +1,7 @@
-import { CaretLeft, CaretRight, XCircle } from '@phosphor-icons/react';
+import { CaretLeft, CaretRight } from '@phosphor-icons/react';
 import type { NotificationBanner } from '@secretkeylabs/xverse-core';
 import { setNotificationBannersAction } from '@stores/wallet/actions/actionCreators';
-import { CrossButton } from '@ui-library/sheet';
+import CrossButton from '@ui-library/crossButton';
 import { useState } from 'react';
 import { useDispatch } from 'react-redux';
 import styled from 'styled-components';
@@ -9,7 +9,6 @@ import 'swiper/css';
 import 'swiper/css/pagination';
 import { Navigation, Pagination } from 'swiper/modules';
 import { Swiper, SwiperSlide } from 'swiper/react';
-import Theme from 'theme';
 import Banner from './banner';
 
 const CarouselContainer = styled.div`
@@ -88,10 +87,9 @@ const PaginationContainer = styled.div`
 `;
 
 const StyledCrossButton = styled(CrossButton)`
-  z-index: 1;
-  position: absolute;
   top: -8px;
   right: -6px;
+  z-index: 1;
 `;
 
 type Props = {
@@ -108,9 +106,7 @@ function BannerCarousel({ items }: Props) {
 
   return (
     <CarouselContainer>
-      <StyledCrossButton onClick={dismissBanner}>
-        <XCircle size={24} weight="fill" color={Theme.colors.white_200} />
-      </StyledCrossButton>
+      <StyledCrossButton onClick={dismissBanner} />
       <Swiper
         slidesPerView="auto"
         spaceBetween={16}
diff --git a/src/app/screens/home/index.styled.ts b/src/app/screens/home/index.styled.ts
index ac6a1426f..bebc02d64 100644
--- a/src/app/screens/home/index.styled.ts
+++ b/src/app/screens/home/index.styled.ts
@@ -1,5 +1,5 @@
 import TokenTile from '@components/tokenTile';
-import { animated } from '@react-spring/web';
+import Callout from '@ui-library/callout';
 import Divider from '@ui-library/divider';
 import styled from 'styled-components';
 
@@ -23,8 +23,6 @@ export const ColumnContainer = styled.div((props) => ({
 export const ReceiveContainer = styled.div((props) => ({
   display: 'flex',
   flexDirection: 'column',
-  marginTop: props.theme.space.l,
-  marginBottom: props.theme.space.xl,
   gap: props.theme.space.m,
 }));
 
@@ -173,3 +171,7 @@ export const StyledDivider = styled(Divider)<{ $noMarginBottom?: boolean }>`
 export const StyledDividerSingle = styled(StyledDivider)`
   margin-bottom: 0;
 `;
+
+export const SpacedCallout = styled(Callout)((props) => ({
+  marginTop: props.theme.space.s,
+}));
diff --git a/src/app/screens/home/index.tsx b/src/app/screens/home/index.tsx
index 455a2f3f5..12c256a12 100644
--- a/src/app/screens/home/index.tsx
+++ b/src/app/screens/home/index.tsx
@@ -1,14 +1,8 @@
 import dashboardIcon from '@assets/img/dashboard-icon.svg';
-import BitcoinToken from '@assets/img/dashboard/bitcoin_token.svg';
 import ListDashes from '@assets/img/dashboard/list_dashes.svg';
-import ordinalsIcon from '@assets/img/dashboard/ordinalBRC20.svg';
-import stacksIcon from '@assets/img/dashboard/stx_icon.svg';
 import ArrowSwap from '@assets/img/icons/ArrowSwap.svg';
 import AccountHeaderComponent from '@components/accountHeader';
 import BottomModal from '@components/bottomModal';
-import ReceiveCardComponent from '@components/receiveCardComponent';
-import ShowBtcReceiveAlert from '@components/showBtcReceiveAlert';
-import ShowOrdinalReceiveAlert from '@components/showOrdinalReceiveAlert';
 import BottomBar from '@components/tabBar';
 import {
   useGetBrc20FungibleTokens,
@@ -51,7 +45,6 @@ import {
   setSpamTokenAction,
 } from '@stores/wallet/actions/actionCreators';
 import Button from '@ui-library/button';
-import Sheet from '@ui-library/sheet';
 import SnackBar from '@ui-library/snackBar';
 import type { CurrencyTypes } from '@utils/constants';
 import { isInOptions, isLedgerAccount } from '@utils/helper';
@@ -64,6 +57,7 @@ import { useDispatch } from 'react-redux';
 import { useNavigate } from 'react-router-dom';
 import { useTheme } from 'styled-components';
 import SquareButton from '../../components/squareButton';
+import AnnouncementModal from './announcementModal';
 import BalanceCard from './balanceCard';
 import BannerCarousel from './bannerCarousel';
 import {
@@ -71,54 +65,34 @@ import {
   ButtonText,
   ColumnContainer,
   Container,
-  Icon,
-  IconBackground,
-  MergedIcon,
-  MergedOrdinalsIcon,
   ModalButtonContainer,
   ModalContent,
   ModalControlsContainer,
   ModalDescription,
   ModalIcon,
   ModalTitle,
-  ReceiveContainer,
   RowButtonContainer,
-  StacksIcon,
   StyledDivider,
   StyledDividerSingle,
   StyledTokenTile,
   TokenListButton,
   TokenListButtonContainer,
-  VerifyButtonContainer,
-  VerifyOrViewContainer,
 } from './index.styled';
+import ReceiveSheet from './receiveSheet';
 
 function Home() {
   const { t } = useTranslation('translation', {
     keyPrefix: 'DASHBOARD_SCREEN',
   });
   const selectedAccount = useSelectedAccount();
-  const { stxAddress, btcAddress, ordinalsAddress } = selectedAccount;
-  const {
-    showBtcReceiveAlert,
-    showOrdinalReceiveAlert,
-    showDataCollectionAlert,
-    hideStx,
-    spamToken,
-    notificationBanners,
-  } = useWalletSelector();
+  const { stxAddress, btcAddress } = selectedAccount;
+  const { showDataCollectionAlert, hideStx, spamToken, notificationBanners } = useWalletSelector();
   const theme = useTheme();
   const navigate = useNavigate();
   const dispatch = useDispatch();
   const [openReceiveModal, setOpenReceiveModal] = useState(false);
   const [openSendModal, setOpenSendModal] = useState(false);
   const [openBuyModal, setOpenBuyModal] = useState(false);
-  const [isBtcReceiveAlertVisible, setIsBtcReceiveAlertVisible] = useState(false);
-  const [isOrdinalReceiveAlertVisible, setIsOrdinalReceiveAlertVisible] = useState(false);
-  const [areReceivingAddressesVisible, setAreReceivingAddressesVisible] = useState(
-    !isLedgerAccount(selectedAccount),
-  );
-  const [choseToVerifyAddresses, setChoseToVerifyAddresses] = useState(false);
   const { isInitialLoading: loadingBtcWalletData, isRefetching: refetchingBtcWalletData } =
     useBtcWalletData();
   const { isInitialLoading: loadingStxWalletData, isRefetching: refetchingStxWalletData } =
@@ -224,15 +198,6 @@ function Home() {
     setOpenReceiveModal(true);
   };
 
-  const onReceiveModalClose = () => {
-    setOpenReceiveModal(false);
-
-    if (isLedgerAccount(selectedAccount)) {
-      setAreReceivingAddressesVisible(false);
-      setChoseToVerifyAddresses(false);
-    }
-  };
-
   const onSendModalOpen = () => {
     setOpenSendModal(true);
   };
@@ -273,14 +238,6 @@ function Home() {
     navigate('/send-btc');
   };
 
-  const onBTCReceiveSelect = () => {
-    navigate('/receive/BTC');
-  };
-
-  const onSTXReceiveSelect = () => {
-    navigate('/receive/STX');
-  };
-
   const onSendFtSelect = async (fungibleToken: FungibleToken) => {
     let route = '';
     switch (fungibleToken?.protocol) {
@@ -314,22 +271,6 @@ function Home() {
     navigate('/buy/BTC');
   };
 
-  const onOrdinalReceiveAlertOpen = () => {
-    if (showOrdinalReceiveAlert) setIsOrdinalReceiveAlertVisible(true);
-  };
-
-  const onOrdinalReceiveAlertClose = () => {
-    setIsOrdinalReceiveAlertVisible(false);
-  };
-
-  const onReceiveAlertClose = () => {
-    setIsBtcReceiveAlertVisible(false);
-  };
-
-  const onReceiveAlertOpen = () => {
-    if (showBtcReceiveAlert) setIsBtcReceiveAlertVisible(true);
-  };
-
   const handleTokenPressed = (currency: CurrencyTypes, fungibleToken?: FungibleToken) => {
     if (fungibleToken) {
       navigate(
@@ -340,99 +281,11 @@ function Home() {
     }
   };
 
-  const onOrdinalsReceivePress = () => {
-    navigate('/receive/ORD');
-  };
-
   const onSwapPressed = () => {
     trackMixPanel(AnalyticsEvents.InitiateSwapFlow, {});
     navigate('/swap');
   };
 
-  const receiveContent = (
-    <ReceiveContainer>
-      <ReceiveCardComponent
-        title={t('BITCOIN')}
-        address={btcAddress}
-        onQrAddressClick={onBTCReceiveSelect}
-        onCopyAddressClick={onReceiveAlertOpen}
-        showVerifyButton={choseToVerifyAddresses}
-        currency="BTC"
-      >
-        <Icon src={BitcoinToken} />
-      </ReceiveCardComponent>
-
-      <ReceiveCardComponent
-        title={t('ORDINALS_AND_BRC20')}
-        address={ordinalsAddress}
-        onQrAddressClick={onOrdinalsReceivePress}
-        onCopyAddressClick={onOrdinalReceiveAlertOpen}
-        showVerifyButton={choseToVerifyAddresses}
-        currency="ORD"
-      >
-        <MergedOrdinalsIcon src={ordinalsIcon} />
-      </ReceiveCardComponent>
-
-      {stxAddress && (
-        <ReceiveCardComponent
-          title={t('STACKS_AND_TOKEN')}
-          address={stxAddress}
-          onQrAddressClick={onSTXReceiveSelect}
-          showVerifyButton={choseToVerifyAddresses}
-          currency="STX"
-        >
-          <MergedIcon>
-            <StacksIcon src={stacksIcon} />
-            <IconBackground>
-              <Plus weight="bold" size={12} />
-            </IconBackground>
-          </MergedIcon>
-        </ReceiveCardComponent>
-      )}
-
-      {isLedgerAccount(selectedAccount) && !stxAddress && (
-        <Button
-          variant="secondary"
-          icon={<Plus color="white" size={16} />}
-          title={t('ADD_STACKS_ADDRESS')}
-          onClick={async () => {
-            if (!isInOptions()) {
-              await chrome.tabs.create({
-                url: chrome.runtime.getURL(`options.html#/add-stx-address-ledger`),
-              });
-            } else {
-              navigate('/add-stx-address-ledger');
-            }
-          }}
-        />
-      )}
-    </ReceiveContainer>
-  );
-
-  const verifyOrViewAddresses = (
-    <VerifyOrViewContainer>
-      <VerifyButtonContainer>
-        <Button
-          title={t('VERIFY_ADDRESSES_ON_LEDGER')}
-          onClick={() => {
-            setChoseToVerifyAddresses(true);
-            setAreReceivingAddressesVisible(true);
-          }}
-        />
-      </VerifyButtonContainer>
-      <Button
-        variant="secondary"
-        title={t('VIEW_ADDRESSES')}
-        onClick={() => {
-          if (choseToVerifyAddresses) {
-            setChoseToVerifyAddresses(false);
-          }
-          setAreReceivingAddressesVisible(true);
-        }}
-      />
-    </VerifyOrViewContainer>
-  );
-
   const handleDataCollectionDeny = () => {
     optOutMixPanel();
     dispatch(changeShowDataCollectionAlertAction(false));
@@ -464,12 +317,6 @@ function Home() {
   return (
     <>
       <AccountHeaderComponent />
-      {isBtcReceiveAlertVisible && (
-        <ShowBtcReceiveAlert onReceiveAlertClose={onReceiveAlertClose} />
-      )}
-      {isOrdinalReceiveAlertVisible && (
-        <ShowOrdinalReceiveAlert onOrdinalReceiveAlertClose={onOrdinalReceiveAlertClose} />
-      )}
       <Container>
         <BalanceCard
           isLoading={loadingStxWalletData || loadingBtcWalletData}
@@ -558,9 +405,9 @@ function Home() {
             </>
           </TokenListButton>
         </TokenListButtonContainer>
-        <Sheet visible={openReceiveModal} title={t('RECEIVE')} onClose={onReceiveModalClose}>
-          {areReceivingAddressesVisible ? receiveContent : verifyOrViewAddresses}
-        </Sheet>
+
+        <ReceiveSheet visible={openReceiveModal} onClose={() => setOpenReceiveModal(false)} />
+
         <CoinSelectModal
           onSelectBitcoin={onBtcSendClick}
           onSelectStacks={onStxSendClick}
@@ -581,6 +428,7 @@ function Home() {
           title={t('BUY')}
           loadingWalletData={loadingStxWalletData || loadingBtcWalletData}
         />
+        <AnnouncementModal />
       </Container>
       <BottomBar tab="dashboard" />
 
diff --git a/src/app/screens/home/receiveSheet.tsx b/src/app/screens/home/receiveSheet.tsx
new file mode 100644
index 000000000..2d7630f5a
--- /dev/null
+++ b/src/app/screens/home/receiveSheet.tsx
@@ -0,0 +1,204 @@
+import BitcoinToken from '@assets/img/dashboard/bitcoin_token.svg';
+import ordinalsIcon from '@assets/img/dashboard/ordinalBRC20.svg';
+import stacksIcon from '@assets/img/dashboard/stx_icon.svg';
+import ReceiveCardComponent from '@components/receiveCardComponent';
+import ShowBtcReceiveAlert from '@components/showBtcReceiveAlert';
+import ShowOrdinalReceiveAlert from '@components/showOrdinalReceiveAlert';
+import useSelectedAccount from '@hooks/useSelectedAccount';
+import useWalletSelector from '@hooks/useWalletSelector';
+import { Plus } from '@phosphor-icons/react';
+import Button from '@ui-library/button';
+import Sheet from '@ui-library/sheet';
+import { markAlertSeen, shouldShowAlert } from '@utils/alertTracker';
+import { isInOptions, isLedgerAccount } from '@utils/helper';
+import { useState } from 'react';
+import { useTranslation } from 'react-i18next';
+import { useNavigate } from 'react-router-dom';
+import {
+  Icon,
+  IconBackground,
+  MergedIcon,
+  MergedOrdinalsIcon,
+  ReceiveContainer,
+  SpacedCallout,
+  StacksIcon,
+  VerifyButtonContainer,
+  VerifyOrViewContainer,
+} from './index.styled';
+
+type Props = {
+  visible: boolean;
+  onClose: () => void;
+};
+
+function ReceiveSheet({ visible, onClose }: Props) {
+  const { t } = useTranslation('translation', {
+    keyPrefix: 'DASHBOARD_SCREEN',
+  });
+
+  const selectedAccount = useSelectedAccount();
+  const { stxAddress, btcAddress, ordinalsAddress } = selectedAccount;
+  const { showBtcReceiveAlert, showOrdinalReceiveAlert, btcPaymentAddressType } =
+    useWalletSelector();
+  const navigate = useNavigate();
+
+  const [isBtcReceiveAlertVisible, setIsBtcReceiveAlertVisible] = useState(false);
+  const [isOrdinalReceiveAlertVisible, setIsOrdinalReceiveAlertVisible] = useState(false);
+  const [areReceivingAddressesVisible, setAreReceivingAddressesVisible] = useState(
+    !isLedgerAccount(selectedAccount),
+  );
+  const [choseToVerifyAddresses, setChoseToVerifyAddresses] = useState(false);
+  const [showNativeSegWitCallout, setShowNativeSegWitCallout] = useState(
+    shouldShowAlert('co:panel:address_changed_to_native'),
+  );
+
+  const onReceiveModalClose = () => {
+    onClose();
+
+    if (isLedgerAccount(selectedAccount)) {
+      setAreReceivingAddressesVisible(false);
+      setChoseToVerifyAddresses(false);
+    }
+  };
+
+  const onBTCReceiveSelect = () => {
+    navigate('/receive/BTC');
+  };
+
+  const onSTXReceiveSelect = () => {
+    navigate('/receive/STX');
+  };
+
+  const onOrdinalReceiveAlertOpen = () => {
+    if (showOrdinalReceiveAlert) setIsOrdinalReceiveAlertVisible(true);
+  };
+
+  const onOrdinalReceiveAlertClose = () => {
+    setIsOrdinalReceiveAlertVisible(false);
+  };
+
+  const onReceiveAlertClose = () => {
+    setIsBtcReceiveAlertVisible(false);
+  };
+
+  const onReceiveAlertOpen = () => {
+    if (showBtcReceiveAlert) setIsBtcReceiveAlertVisible(true);
+  };
+
+  const onOrdinalsReceivePress = () => {
+    navigate('/receive/ORD');
+  };
+
+  const onNativeSegWitPanelClose = () => {
+    setShowNativeSegWitCallout(false);
+    markAlertSeen('co:panel:address_changed_to_native');
+  };
+
+  const receiveContent = (
+    <ReceiveContainer>
+      <ReceiveCardComponent
+        title={t('BITCOIN')}
+        address={btcAddress}
+        onQrAddressClick={onBTCReceiveSelect}
+        onCopyAddressClick={onReceiveAlertOpen}
+        showVerifyButton={choseToVerifyAddresses}
+        currency="BTC"
+        icon={<Icon src={BitcoinToken} />}
+      >
+        {showNativeSegWitCallout && btcPaymentAddressType === 'native' && (
+          <SpacedCallout
+            titleText={t('CALLOUTS.NATIVE_SEGWIT.TITLE')}
+            bodyText={t('CALLOUTS.NATIVE_SEGWIT.DESCRIPTION')}
+            onClose={onNativeSegWitPanelClose}
+            hideIcon
+          />
+        )}
+      </ReceiveCardComponent>
+
+      <ReceiveCardComponent
+        title={t('ORDINALS_AND_BRC20')}
+        address={ordinalsAddress}
+        onQrAddressClick={onOrdinalsReceivePress}
+        onCopyAddressClick={onOrdinalReceiveAlertOpen}
+        showVerifyButton={choseToVerifyAddresses}
+        currency="ORD"
+        icon={<MergedOrdinalsIcon src={ordinalsIcon} />}
+      />
+
+      {stxAddress && (
+        <ReceiveCardComponent
+          title={t('STACKS_AND_TOKEN')}
+          address={stxAddress}
+          onQrAddressClick={onSTXReceiveSelect}
+          showVerifyButton={choseToVerifyAddresses}
+          currency="STX"
+          icon={
+            <MergedIcon>
+              <StacksIcon src={stacksIcon} />
+              <IconBackground>
+                <Plus weight="bold" size={12} />
+              </IconBackground>
+            </MergedIcon>
+          }
+        />
+      )}
+
+      {isLedgerAccount(selectedAccount) && !stxAddress && (
+        <Button
+          variant="secondary"
+          icon={<Plus color="white" size={16} />}
+          title={t('ADD_STACKS_ADDRESS')}
+          onClick={async () => {
+            if (!isInOptions()) {
+              await chrome.tabs.create({
+                url: chrome.runtime.getURL(`options.html#/add-stx-address-ledger`),
+              });
+            } else {
+              navigate('/add-stx-address-ledger');
+            }
+          }}
+        />
+      )}
+    </ReceiveContainer>
+  );
+
+  const verifyOrViewAddresses = (
+    <VerifyOrViewContainer>
+      <VerifyButtonContainer>
+        <Button
+          title={t('VERIFY_ADDRESSES_ON_LEDGER')}
+          onClick={() => {
+            setChoseToVerifyAddresses(true);
+            setAreReceivingAddressesVisible(true);
+          }}
+        />
+      </VerifyButtonContainer>
+      <Button
+        variant="secondary"
+        title={t('VIEW_ADDRESSES')}
+        onClick={() => {
+          if (choseToVerifyAddresses) {
+            setChoseToVerifyAddresses(false);
+          }
+          setAreReceivingAddressesVisible(true);
+        }}
+      />
+    </VerifyOrViewContainer>
+  );
+
+  return (
+    <>
+      {isBtcReceiveAlertVisible && (
+        <ShowBtcReceiveAlert onReceiveAlertClose={onReceiveAlertClose} />
+      )}
+      {isOrdinalReceiveAlertVisible && (
+        <ShowOrdinalReceiveAlert onOrdinalReceiveAlertClose={onOrdinalReceiveAlertClose} />
+      )}
+      <Sheet visible={visible} title={t('RECEIVE')} onClose={onReceiveModalClose}>
+        {areReceivingAddressesVisible ? receiveContent : verifyOrViewAddresses}
+      </Sheet>
+    </>
+  );
+}
+
+export default ReceiveSheet;
diff --git a/src/app/screens/landing/index.tsx b/src/app/screens/landing/index.tsx
index c7e4c35f0..5eb6936cb 100644
--- a/src/app/screens/landing/index.tsx
+++ b/src/app/screens/landing/index.tsx
@@ -131,13 +131,13 @@ const InitialTransitionLandingSectionContainer = styled(LandingSectionContainer)
   animation: ${() => slideY} 0.2s ease-out;
 `;
 
-const TransitionLeftLandingSectionContainer = styled(LandingSectionContainer)`
-  animation: ${slideLeftAnimation} 0.3s cubic-bezier(0, 0, 0.58, 1) forwards;
-`;
-
-const TransitionRightLandingSectionContainer = styled(LandingSectionContainer)`
-  animation: ${() => slideRightAnimation} 0.3s cubic-bezier(0, 0, 0.58, 1) forwards;
-`;
+const TransitionLandingSectionContainer = styled(LandingSectionContainer)<{
+  $direction: 'left' | 'right';
+}>((props) => ({
+  animation: `${
+    props.$direction === 'left' ? slideLeftAnimation : slideRightAnimation
+  } 0.3s cubic-bezier(0, 0, 0.58, 1) forwards`,
+}));
 
 const Logo = styled.img`
   width: 135px;
@@ -155,13 +155,13 @@ const OnboardingContainer = styled.div((props) => ({
   marginBottom: props.theme.space.l,
 }));
 
-const TransitionLeftOnboardingContainer = styled(OnboardingContainer)`
-  animation: ${() => slideLeftAnimation} 0.3s cubic-bezier(0, 0, 0.58, 1) forwards;
-`;
-
-const TransitionRightOnboardingContainer = styled(OnboardingContainer)`
-  animation: ${() => slideRightAnimation} 0.3s cubic-bezier(0, 0, 0.58, 1) forwards;
-`;
+const TransitionOnboardingContainer = styled(OnboardingContainer)<{
+  $direction: 'left' | 'right';
+}>((props) => ({
+  animation: `${
+    props.$direction === 'left' ? slideLeftAnimation : slideRightAnimation
+  } 0.3s cubic-bezier(0, 0, 0.58, 1) forwards`,
+}));
 
 const OnBoardingImage = styled.img(() => ({
   marginTop: -26,
@@ -307,24 +307,19 @@ function Landing() {
     if (slideTransitions) {
       switch (currentStepIndex) {
         case 0:
-          return transitionDirection === 'left' ? (
-            <TransitionLeftLandingSectionContainer key={currentStepIndex}>
-              {renderLandingSection()}
-            </TransitionLeftLandingSectionContainer>
-          ) : (
-            <TransitionRightLandingSectionContainer key={currentStepIndex}>
+          return (
+            <TransitionLandingSectionContainer
+              key={currentStepIndex}
+              $direction={transitionDirection}
+            >
               {renderLandingSection()}
-            </TransitionRightLandingSectionContainer>
+            </TransitionLandingSectionContainer>
           );
         default:
-          return transitionDirection === 'left' ? (
-            <TransitionLeftOnboardingContainer key={currentStepIndex}>
-              {renderOnboardingContent(currentStepIndex)}
-            </TransitionLeftOnboardingContainer>
-          ) : (
-            <TransitionRightOnboardingContainer key={currentStepIndex}>
+          return (
+            <TransitionOnboardingContainer key={currentStepIndex} $direction={transitionDirection}>
               {renderOnboardingContent(currentStepIndex)}
-            </TransitionRightOnboardingContainer>
+            </TransitionOnboardingContainer>
           );
       }
     } else {
diff --git a/src/app/screens/ledger/addStxAddress/index.tsx b/src/app/screens/ledger/addStxAddress/index.tsx
index 04f6b67e8..343448175 100644
--- a/src/app/screens/ledger/addStxAddress/index.tsx
+++ b/src/app/screens/ledger/addStxAddress/index.tsx
@@ -56,7 +56,7 @@ function AddStxAddress(): JSX.Element {
   const [isAddressRejected, setIsAddressRejected] = useState(false);
   const [stacksCredentials, setStacksCredentials] = useState<Credential | undefined>(undefined);
   const selectedAccount = useSelectedAccount();
-  const { network } = useWalletSelector();
+  const { network, ledgerAccountsList } = useWalletSelector();
   const { updateLedgerAccounts } = useWalletReducer();
   const { search } = useLocation();
   const params = new URLSearchParams(search);
@@ -74,8 +74,14 @@ function AddStxAddress(): JSX.Element {
       return;
     }
 
+    const existingAccount = ledgerAccountsList.find((account) => account.id === selectedAccount.id);
+
+    if (!existingAccount) {
+      return;
+    }
+
     const ledgerAccount: Account = {
-      ...selectedAccount,
+      ...existingAccount,
       stxAddress: stacksCreds?.address || '',
       stxPublicKey: stacksCreds?.publicKey || '',
     };
diff --git a/src/app/screens/ledger/importLedgerAccount/index.tsx b/src/app/screens/ledger/importLedgerAccount/index.tsx
index 00dadcffd..3ceb5db79 100644
--- a/src/app/screens/ledger/importLedgerAccount/index.tsx
+++ b/src/app/screens/ledger/importLedgerAccount/index.tsx
@@ -200,12 +200,8 @@ function ImportLedger(): JSX.Element {
         const ledgerAccount: Account = {
           id: newAccountId,
           stxAddress: stacksCreds?.address || '',
-          btcAddress: btcCreds?.address || '',
-          ordinalsAddress: ordinalsCreds?.address || '',
           masterPubKey: masterPubKey || masterFingerPrint || '',
           stxPublicKey: stacksCreds?.publicKey || '',
-          btcPublicKey: btcCreds?.publicKey || '',
-          ordinalsPublicKey: ordinalsCreds?.publicKey || '',
           accountType: 'ledger',
           accountName: `Ledger Account ${newAccountId + 1}`,
           deviceAccountIndex: getDeviceNewAccountIndex(
@@ -213,6 +209,16 @@ function ImportLedger(): JSX.Element {
             network.type,
             masterPubKey || masterFingerPrint,
           ),
+          btcAddresses: {
+            native: {
+              address: btcCreds?.address || '',
+              publicKey: btcCreds?.publicKey || '',
+            },
+            taproot: {
+              address: ordinalsCreds?.address || '',
+              publicKey: ordinalsCreds?.publicKey || '',
+            },
+          },
         };
         await addLedgerAccount(ledgerAccount);
         await delay(1000);
@@ -224,10 +230,16 @@ function ImportLedger(): JSX.Element {
       if (currentAccount && isBitcoinSelected) {
         const ledgerAccount: Account = {
           ...currentAccount,
-          btcAddress: btcCreds?.address || '',
-          btcPublicKey: btcCreds?.publicKey || '',
-          ordinalsAddress: ordinalsCreds?.address || '',
-          ordinalsPublicKey: ordinalsCreds?.publicKey || '',
+          btcAddresses: {
+            native: {
+              address: btcCreds?.address || '',
+              publicKey: btcCreds?.publicKey || '',
+            },
+            taproot: {
+              address: ordinalsCreds?.address || '',
+              publicKey: ordinalsCreds?.publicKey || '',
+            },
+          },
         };
         await updateLedgerAccounts(ledgerAccount);
         await delay(1000);
diff --git a/src/app/screens/nftDetail/index.tsx b/src/app/screens/nftDetail/index.tsx
index 8330afc55..b9398fb79 100644
--- a/src/app/screens/nftDetail/index.tsx
+++ b/src/app/screens/nftDetail/index.tsx
@@ -99,19 +99,17 @@ function NftDetailScreen() {
     handleOnSendClick,
     galleryTitle,
   } = useNftDetailScreen();
-  const selectedAccount = useSelectedAccount();
+  const { ordinalsAddress } = useSelectedAccount();
   const { avatarIds } = useWalletSelector();
-  const currentAvatar = avatarIds[selectedAccount.btcAddress];
+  const selectedAvatar = avatarIds[ordinalsAddress];
   const isNftSelectedAsAvatar =
-    currentAvatar?.type === 'stacks' && currentAvatar.nft.token_id === nftData?.token_id;
+    selectedAvatar?.type === 'stacks' && selectedAvatar.nft.token_id === nftData?.token_id;
 
   const handleSetAvatar = useCallback(() => {
-    const address = selectedAccount.btcAddress;
-
-    if (address && nftData?.token_id) {
+    if (ordinalsAddress && nftData?.token_id) {
       dispatch(
         setAccountAvatarAction({
-          address,
+          address: ordinalsAddress,
           avatar: { type: 'stacks', nft: nftData },
         }),
       );
@@ -123,13 +121,16 @@ function NftDetailScreen() {
           action={{
             text: commonT('UNDO'),
             onClick: () => {
-              if (currentAvatar?.type) {
-                dispatch(setAccountAvatarAction({ address, avatar: currentAvatar }));
+              if (selectedAvatar?.type) {
+                dispatch(
+                  setAccountAvatarAction({ address: ordinalsAddress, avatar: selectedAvatar }),
+                );
               } else {
-                dispatch(removeAccountAvatarAction({ address }));
+                dispatch(removeAccountAvatarAction({ address: ordinalsAddress }));
               }
 
               toast.remove(toastId);
+              toast.custom(<SnackBar text={optionsDialogT('NFT_AVATAR.UNDO')} type="neutral" />);
             },
           }}
         />,
@@ -137,13 +138,13 @@ function NftDetailScreen() {
     }
 
     optionsSheet.close();
-  }, [dispatch, optionsDialogT, commonT, selectedAccount, nftData, optionsSheet, currentAvatar]);
+  }, [dispatch, optionsDialogT, commonT, ordinalsAddress, nftData, optionsSheet, selectedAvatar]);
 
   const handleRemoveAvatar = useCallback(() => {
-    dispatch(removeAccountAvatarAction({ address: selectedAccount.btcAddress }));
+    dispatch(removeAccountAvatarAction({ address: ordinalsAddress }));
     toast.custom(<SnackBar text={optionsDialogT('NFT_AVATAR.REMOVE_TOAST')} type="neutral" />);
     optionsSheet.close();
-  }, [dispatch, optionsDialogT, selectedAccount, optionsSheet]);
+  }, [dispatch, optionsDialogT, ordinalsAddress, optionsSheet]);
 
   const nftAttributes = nftData?.nft_token_attributes?.length !== 0 && (
     <>
diff --git a/src/app/screens/ordinalDetail/index.tsx b/src/app/screens/ordinalDetail/index.tsx
index 22bd4c6bb..9491bfd05 100644
--- a/src/app/screens/ordinalDetail/index.tsx
+++ b/src/app/screens/ordinalDetail/index.tsx
@@ -119,11 +119,10 @@ function OrdinalDetailScreen() {
     onCopyClick,
     backButtonText,
   } = ordinalDetails;
-  const selectedAccount = useSelectedAccount();
   const { starredCollectibleIds, hiddenCollectibleIds, avatarIds } = useWalletSelector();
-  const currentAvatar = avatarIds[selectedAccount.btcAddress];
+  const selectedAvatar = avatarIds[ordinalsAddress];
   const isInscriptionSelectedAsAvatar =
-    currentAvatar?.type === 'inscription' && currentAvatar.inscription.id === ordinal?.id;
+    selectedAvatar?.type === 'inscription' && selectedAvatar.inscription.id === ordinal?.id;
   const inscriptionStarred = starredCollectibleIds[ordinalsAddress]?.some(
     ({ id }) => id === ordinal?.id,
   );
@@ -180,7 +179,7 @@ function OrdinalDetailScreen() {
     dispatch(addToHideCollectiblesAction({ address: ordinalsAddress, id: ordinal?.id ?? '' }));
 
     if (isInscriptionSelectedAsAvatar) {
-      dispatch(removeAccountAvatarAction({ address: selectedAccount.btcAddress }));
+      dispatch(removeAccountAvatarAction({ address: ordinalsAddress }));
     }
 
     optionsSheet.close();
@@ -207,12 +206,10 @@ function OrdinalDetailScreen() {
   };
 
   const handleSetAvatar = useCallback(() => {
-    const address = selectedAccount.btcAddress;
-
-    if (address && ordinal?.id) {
+    if (ordinalsAddress && ordinal?.id) {
       dispatch(
         setAccountAvatarAction({
-          address,
+          address: ordinalsAddress,
           avatar: { type: 'inscription', inscription: ordinal },
         }),
       );
@@ -224,13 +221,16 @@ function OrdinalDetailScreen() {
           action={{
             text: commonT('UNDO'),
             onClick: () => {
-              if (currentAvatar?.type) {
-                dispatch(setAccountAvatarAction({ address, avatar: currentAvatar }));
+              if (selectedAvatar?.type) {
+                dispatch(
+                  setAccountAvatarAction({ address: ordinalsAddress, avatar: selectedAvatar }),
+                );
               } else {
-                dispatch(removeAccountAvatarAction({ address }));
+                dispatch(removeAccountAvatarAction({ address: ordinalsAddress }));
               }
 
               toast.remove(toastId);
+              toast.custom(<SnackBar text={optionsDialogT('NFT_AVATAR.UNDO')} type="neutral" />);
             },
           }}
         />,
@@ -238,13 +238,13 @@ function OrdinalDetailScreen() {
     }
 
     optionsSheet.close();
-  }, [dispatch, optionsDialogT, commonT, selectedAccount, ordinal, optionsSheet, currentAvatar]);
+  }, [dispatch, optionsDialogT, commonT, ordinalsAddress, ordinal, optionsSheet, selectedAvatar]);
 
   const handleRemoveAvatar = useCallback(() => {
-    dispatch(removeAccountAvatarAction({ address: selectedAccount.btcAddress }));
+    dispatch(removeAccountAvatarAction({ address: ordinalsAddress }));
     toast.custom(<SnackBar text={optionsDialogT('NFT_AVATAR.REMOVE_TOAST')} type="neutral" />);
     optionsSheet.close();
-  }, [dispatch, selectedAccount.btcAddress, optionsDialogT, optionsSheet]);
+  }, [dispatch, ordinalsAddress, optionsDialogT, optionsSheet]);
 
   const ordinalDetailAttributes = (
     <OrdinalDetailsContainer isGallery={isGalleryOpen}>
diff --git a/src/app/screens/ordinalsCollection/index.tsx b/src/app/screens/ordinalsCollection/index.tsx
index 828fcf92d..db4d7c193 100644
--- a/src/app/screens/ordinalsCollection/index.tsx
+++ b/src/app/screens/ordinalsCollection/index.tsx
@@ -36,7 +36,7 @@ import {
   getInscriptionsCollectionGridItemSubText,
   getInscriptionsCollectionGridItemSubTextColor,
 } from '@utils/inscriptions';
-import { useMemo, useState } from 'react';
+import { useMemo } from 'react';
 import toast from 'react-hot-toast';
 import { useTranslation } from 'react-i18next';
 import { useDispatch } from 'react-redux';
@@ -65,10 +65,10 @@ function OrdinalsCollection() {
   const { t } = useTranslation('translation', { keyPrefix: 'COLLECTIBLE_COLLECTION_SCREEN' });
   const { t: tCommon } = useTranslation('translation', { keyPrefix: 'COMMON' });
   const navigate = useNavigate();
-  const { btcAddress, ordinalsAddress } = useSelectedAccount();
+  const { ordinalsAddress } = useSelectedAccount();
   const { id: collectionId, from } = useParams();
   const { starredCollectibleIds, hiddenCollectibleIds, avatarIds } = useWalletSelector();
-  const currentAvatar = avatarIds[btcAddress];
+  const selectedAvatar = avatarIds[ordinalsAddress];
   const optionsSheet = useOptionsSheet();
   const { data, error, isLoading, hasNextPage, isFetchingNextPage, fetchNextPage } =
     useAddressCollectionInscriptions(collectionId);
@@ -110,14 +110,14 @@ function OrdinalsCollection() {
   const handleHideCollection = () => {
     dispatch(addToHideCollectiblesAction({ address: ordinalsAddress, id: collectionId ?? '' }));
 
-    if (currentAvatar?.type === 'inscription') {
+    if (selectedAvatar?.type === 'inscription') {
       const shouldHideAvatar = data?.pages
         ?.map((page) => page?.data)
         .flat()
-        .some((inscription) => inscription.id === currentAvatar.inscription.id);
+        .some((inscription) => inscription.id === selectedAvatar.inscription.id);
 
       if (shouldHideAvatar) {
-        dispatch(removeAccountAvatarAction({ address: btcAddress }));
+        dispatch(removeAccountAvatarAction({ address: ordinalsAddress }));
       }
     }
 
diff --git a/src/app/screens/receive/index.tsx b/src/app/screens/receive/index.tsx
index 71429e5bd..7b9ec72e6 100644
--- a/src/app/screens/receive/index.tsx
+++ b/src/app/screens/receive/index.tsx
@@ -1,15 +1,21 @@
 import StxIcon from '@assets/img/dashboard/stx_icon.svg';
 import BtcIcon from '@assets/img/receive_btc_image.svg';
 import OrdinalIcon from '@assets/img/receive_ordinals_image.svg';
+import { BtcAddressTypeForAddressLabel } from '@components/btcAddressTypeLabel';
+import { GlobalPreferredBtcAddressSheet } from '@components/preferredBtcAddress';
 import ShowBtcReceiveAlert from '@components/showBtcReceiveAlert';
 import ShowOrdinalReceiveAlert from '@components/showOrdinalReceiveAlert';
 import BottomTabBar from '@components/tabBar';
+import TooltipCalloutRaw from '@components/tooltip';
 import TopRow from '@components/topRow';
+import useCanUserSwitchPaymentType from '@hooks/useCanUserSwitchPaymentType';
 import useSelectedAccount from '@hooks/useSelectedAccount';
 import useWalletSelector from '@hooks/useWalletSelector';
 import { Check, Copy } from '@phosphor-icons/react';
 import QrCode from '@screens/receive/qrCode';
-import { useState } from 'react';
+import Callout from '@ui-library/callout';
+import { markAlertSeen, shouldShowAlert } from '@utils/alertTracker';
+import { useRef, useState } from 'react';
 import { useTranslation } from 'react-i18next';
 import { useNavigate, useParams } from 'react-router-dom';
 import { Tooltip } from 'react-tooltip';
@@ -32,6 +38,11 @@ const AddressContainer = styled.div({
   columnGap: 16,
 });
 
+const AddressTypeContainer = styled.div((props) => ({
+  display: 'flex',
+  marginBottom: props.theme.space.xs,
+}));
+
 const Button = styled.button((props) => ({
   display: 'flex',
   justifyContent: 'center',
@@ -47,7 +58,6 @@ const Button = styled.button((props) => ({
 const TopTitleText = styled.h1((props) => ({
   ...props.theme.typography.headline_s,
   textAlign: 'center',
-  marginTop: props.theme.spacing(12),
 }));
 
 const DescriptionText = styled.p((props) => ({
@@ -67,7 +77,7 @@ const BnsNameText = styled.h1((props) => ({
   marginBottom: 4,
 }));
 
-const QRCodeContainer = styled.div<{ marginBottom: number }>((props) => ({
+const QRCodeContainer = styled.div<{ $marginBottom: number }>((props) => ({
   display: 'flex',
   backgroundColor: props.theme.colors.white['0'],
   justifyContent: 'center',
@@ -77,7 +87,7 @@ const QRCodeContainer = styled.div<{ marginBottom: number }>((props) => ({
   height: 159,
   alignSelf: 'center',
   marginTop: props.theme.spacing(15),
-  marginBottom: props.marginBottom,
+  marginBottom: props.$marginBottom,
 }));
 
 const AddressText = styled.h1((props) => ({
@@ -91,18 +101,37 @@ const BottomBarContainer = styled.div({
   marginTop: 22,
 });
 
+const SpacedCallout = styled(Callout)((props) => ({
+  marginTop: props.theme.space.s,
+}));
+
+const TooltipCallout = styled(TooltipCalloutRaw)(() => ({
+  maxWidth: 300,
+}));
+
 type SupportedAddresses = 'BTC' | 'STX' | 'ORD';
 const validAddresses: SupportedAddresses[] = ['BTC', 'STX', 'ORD'];
 
 function Receive() {
+  const navigate = useNavigate();
+  const selectedAccount = useSelectedAccount();
+  const { stxAddress, btcAddress, ordinalsAddress } = selectedAccount;
+  const { showBtcReceiveAlert, showOrdinalReceiveAlert, network, btcPaymentAddressType } =
+    useWalletSelector();
+  const userCanSwitchPaymentType = useCanUserSwitchPaymentType();
+
   const { t } = useTranslation('translation', { keyPrefix: 'RECEIVE' });
   const [addressCopied, setAddressCopied] = useState(false);
   const [isBtcReceiveAlertVisible, setIsBtcReceiveAlertVisible] = useState(false);
   const [isOrdinalReceiveAlertVisible, setIsOrdinalReceiveAlertVisible] = useState(false);
-  const navigate = useNavigate();
-  const selectedAccount = useSelectedAccount();
-  const { stxAddress, btcAddress, ordinalsAddress } = selectedAccount;
-  const { showBtcReceiveAlert, showOrdinalReceiveAlert } = useWalletSelector();
+  const [showBtcAddressTypeSelectorSheet, setShowBtcAddressTypeSelectorSheet] = useState(false);
+  const [showNativeSegWitCallout, setShowNativeSegWitCallout] = useState(
+    shouldShowAlert('co:receive:address_changed_to_native'),
+  );
+  const [showAddressChangeTooltip, setShowAddressChangeTooltip] = useState(
+    shouldShowAlert('co:receive:address_change_button'),
+  );
+  const topBarSettingsRef = useRef<HTMLButtonElement | null>(null);
 
   const { currency } = useParams<{ currency: SupportedAddresses }>();
 
@@ -156,13 +185,38 @@ function Receive() {
     if (currency === 'ORD' && showOrdinalReceiveAlert) setIsOrdinalReceiveAlertVisible(true);
   };
 
+  const onNativeSegWitCalloutClose = () => {
+    setShowNativeSegWitCallout(false);
+    markAlertSeen('co:receive:address_changed_to_native');
+  };
+  const onAddressChangeTooltipClose = () => {
+    setShowAddressChangeTooltip(false);
+    markAlertSeen('co:receive:address_change_button');
+  };
+  const showBtcAddressTypeSelector = userCanSwitchPaymentType && currency === 'BTC';
+
   return (
     <>
-      <TopRow title={t('RECEIVE')} onClick={handleBackButtonClick} />
+      <TopRow
+        onClick={handleBackButtonClick}
+        onSettingsClick={
+          showBtcAddressTypeSelector ? () => setShowBtcAddressTypeSelectorSheet(true) : undefined
+        }
+        settingsRef={topBarSettingsRef}
+      />
+      {showBtcAddressTypeSelector && showAddressChangeTooltip && (
+        <TooltipCallout
+          titleText={t('CALLOUTS.ADDRESS_CHANGE_TOOLTIP.TITLE')}
+          bodyText={t('CALLOUTS.ADDRESS_CHANGE_TOOLTIP.DESCRIPTION')}
+          onClose={onAddressChangeTooltipClose}
+          target={topBarSettingsRef}
+          hideIcon
+        />
+      )}
       <OuterContainer>
         <TopTitleText>{renderData[currency].title}</TopTitleText>
         <DescriptionText>{renderData[currency].desc}</DescriptionText>
-        <QRCodeContainer data-testid="qr-container" marginBottom={showBnsName ? 24 : 50}>
+        <QRCodeContainer data-testid="qr-container" $marginBottom={showBnsName ? 24 : 30}>
           <QrCode
             image={renderData[currency].icon}
             data={renderData[currency].address}
@@ -170,6 +224,14 @@ function Receive() {
           />
         </QRCodeContainer>
         {showBnsName && <BnsNameText>{selectedAccount?.bnsName}</BnsNameText>}
+        {currency === 'BTC' && (
+          <AddressTypeContainer>
+            <BtcAddressTypeForAddressLabel
+              address={renderData[currency].address}
+              network={network.type}
+            />
+          </AddressTypeContainer>
+        )}
         <AddressContainer>
           <AddressText data-testid="address-label">{renderData[currency].address}</AddressText>
           <Button id={`copy-${renderData[currency].address}`} onClick={handleOnClick}>
@@ -183,6 +245,14 @@ function Receive() {
             place="top"
           />
         </AddressContainer>
+        {currency === 'BTC' && showNativeSegWitCallout && btcPaymentAddressType === 'native' && (
+          <SpacedCallout
+            titleText={t('CALLOUTS.NATIVE_SEGWIT.TITLE')}
+            bodyText={t('CALLOUTS.NATIVE_SEGWIT.DESCRIPTION')}
+            onClose={onNativeSegWitCalloutClose}
+            hideIcon
+          />
+        )}
       </OuterContainer>
       <BottomBarContainer>
         <BottomTabBar tab="dashboard" />
@@ -195,6 +265,12 @@ function Receive() {
           onOrdinalReceiveAlertClose={() => setIsOrdinalReceiveAlertVisible(false)}
         />
       )}
+      {showBtcAddressTypeSelector && (
+        <GlobalPreferredBtcAddressSheet
+          visible={showBtcAddressTypeSelectorSheet}
+          onHide={() => setShowBtcAddressTypeSelectorSheet(false)}
+        />
+      )}
     </>
   );
 }
diff --git a/src/app/screens/restoreWallet/enterSeedphrase.tsx b/src/app/screens/restoreWallet/enterSeedphrase.tsx
index b6b683ace..da8f844bb 100644
--- a/src/app/screens/restoreWallet/enterSeedphrase.tsx
+++ b/src/app/screens/restoreWallet/enterSeedphrase.tsx
@@ -3,7 +3,7 @@ import Button from '@ui-library/button';
 import { useTranslation } from 'react-i18next';
 import styled from 'styled-components';
 
-const Form = styled.form({
+const Container = styled.div({
   display: 'flex',
   flexDirection: 'column',
   flex: 1,
@@ -21,7 +21,7 @@ const Title = styled.h1((props) => ({
 const ButtonContainer = styled.div((props) => ({
   width: '100%',
   marginTop: 'auto',
-  marginBottom: props.theme.spacing(30),
+  marginBottom: props.theme.spacing(15),
 }));
 
 interface Props {
@@ -38,19 +38,13 @@ function EnterSeedPhrase(props: Props): JSX.Element {
   const { t } = useTranslation('translation', { keyPrefix: 'RESTORE_WALLET_SCREEN' });
 
   return (
-    <Form
-      onSubmit={(e) => {
-        e.preventDefault();
-
-        onContinue();
-      }}
-    >
+    <Container>
       <Title>{t('ENTER_SEED_HEADER')}</Title>
       <SeedPhraseInput onSeedChange={setSeed} seedError={seedError} setSeedError={setSeedError} />
       <ButtonContainer>
         <Button onClick={onContinue} disabled={seed === ''} title={t('CONTINUE_BUTTON')} />
       </ButtonContainer>
-    </Form>
+    </Container>
   );
 }
 
diff --git a/src/app/screens/restoreWallet/index.tsx b/src/app/screens/restoreWallet/index.tsx
index daedef490..2a2b84269 100644
--- a/src/app/screens/restoreWallet/index.tsx
+++ b/src/app/screens/restoreWallet/index.tsx
@@ -2,12 +2,14 @@ import Dots from '@components/dots';
 import { useWalletExistsContext } from '@components/guards/onboarding';
 import PasswordInput from '@components/passwordInput';
 import useWalletReducer from '@hooks/useWalletReducer';
+import type { BtcPaymentType } from '@secretkeylabs/xverse-core';
 import * as bip39 from 'bip39';
 import { useState } from 'react';
 import { useTranslation } from 'react-i18next';
 import { useNavigate } from 'react-router-dom';
 import styled from 'styled-components';
 import EnterSeedPhrase from './enterSeedphrase';
+import PaymentAddressTypeSelector from './paymentAddressTypeSelector';
 
 const Body = styled.div(() => ({
   display: 'flex',
@@ -37,7 +39,8 @@ const PasswordContainer = styled.div((props) => ({
 
 function RestoreWallet(): JSX.Element {
   const { t } = useTranslation('translation');
-  const { restoreWallet } = useWalletReducer();
+  const { restoreWallet, enableNestedSegWitAddress, changeBtcPaymentAddressType } =
+    useWalletReducer();
   const [isRestoring, setIsRestoring] = useState(false);
   const [currentStepIndex, setCurrentStepIndex] = useState(0);
   const [password, setPassword] = useState('');
@@ -45,30 +48,16 @@ function RestoreWallet(): JSX.Element {
   const [seedPhrase, setSeedPhrase] = useState('');
   const [seedError, setSeedError] = useState('');
   const [error, setError] = useState('');
+  const [btcPayAddressType, setBtcPayAddressType] = useState<BtcPaymentType>('native');
   const navigate = useNavigate();
   const { disableWalletExistsGuard } = useWalletExistsContext();
 
   const cleanMnemonic = (rawSeed: string): string =>
     rawSeed.replace(/\s\s+/g, ' ').replace(/\n/g, ' ').trim();
 
-  const handleNewPasswordBack = () => {
-    setCurrentStepIndex(0);
-  };
-
-  const handleConfirmPasswordBack = () => {
-    setCurrentStepIndex(1);
-  };
-
-  function validateMnemonic(seed: string) {
-    if (bip39.validateMnemonic(seed)) {
-      return true;
-    }
-    return false;
-  }
-
   const onSeedPhraseContinue = () => {
     const seed = cleanMnemonic(seedPhrase);
-    if (validateMnemonic(seed)) {
+    if (bip39.validateMnemonic(seed)) {
       setSeedError('');
       setCurrentStepIndex(1);
     } else {
@@ -76,11 +65,23 @@ function RestoreWallet(): JSX.Element {
     }
   };
 
-  const handleContinuePasswordCreation = () => {
+  const onAccountTypeContinue = () => {
     setCurrentStepIndex(2);
   };
 
-  const handleConfirmPassword = async () => {
+  const onNewPasswordBack = () => {
+    setCurrentStepIndex(1);
+  };
+
+  const onNewPasswordContinue = () => {
+    setCurrentStepIndex(3);
+  };
+
+  const handleConfirmPasswordBack = () => {
+    setCurrentStepIndex(2);
+  };
+
+  const onConfirmPasswordContinue = async () => {
     setIsRestoring(true);
     if (confirmPassword === password) {
       setError('');
@@ -91,6 +92,11 @@ function RestoreWallet(): JSX.Element {
       await restoreWallet(seed, password);
       setIsRestoring(false);
 
+      // we allow the user to switch between address types if restoring the wallet
+      // this disabled by default for new wallets
+      enableNestedSegWitAddress();
+      changeBtcPaymentAddressType(btcPayAddressType);
+
       navigate('/wallet-success/restore', { replace: true });
     } else {
       setIsRestoring(false);
@@ -100,32 +106,40 @@ function RestoreWallet(): JSX.Element {
 
   const restoreSteps = [
     <EnterSeedPhrase
+      key="seed"
       seed={seedPhrase}
       setSeed={setSeedPhrase}
       onContinue={onSeedPhraseContinue}
       seedError={seedError}
       setSeedError={setSeedError}
     />,
-    <PasswordContainer>
+    <PaymentAddressTypeSelector
+      key="addressType"
+      seedPhrase={seedPhrase}
+      selectedType={btcPayAddressType}
+      onSelectedTypeChange={setBtcPayAddressType}
+      onContinue={onAccountTypeContinue}
+    />,
+    <PasswordContainer key="password">
       <PasswordInput
         title={t('CREATE_PASSWORD_SCREEN.CREATE_PASSWORD_TITLE')}
         inputLabel={t('CREATE_PASSWORD_SCREEN.TEXT_INPUT_NEW_PASSWORD_LABEL')}
         enteredPassword={password}
         setEnteredPassword={setPassword}
-        handleContinue={handleContinuePasswordCreation}
-        handleBack={handleNewPasswordBack}
+        handleContinue={onNewPasswordContinue}
+        handleBack={onNewPasswordBack}
         checkPasswordStrength
         createPasswordFlow
         autoFocus
       />
     </PasswordContainer>,
-    <PasswordContainer>
+    <PasswordContainer key="confirmPassword">
       <PasswordInput
         title={t('CREATE_PASSWORD_SCREEN.CONFIRM_PASSWORD_TITLE')}
         inputLabel={t('CREATE_PASSWORD_SCREEN.TEXT_INPUT_NEW_PASSWORD_LABEL')}
         enteredPassword={confirmPassword}
         setEnteredPassword={setConfirmPassword}
-        handleContinue={handleConfirmPassword}
+        handleContinue={onConfirmPasswordContinue}
         handleBack={handleConfirmPasswordBack}
         passwordError={error}
         loading={isRestoring}
diff --git a/src/app/screens/restoreWallet/paymentAddressTypeSelector.tsx b/src/app/screens/restoreWallet/paymentAddressTypeSelector.tsx
new file mode 100644
index 000000000..59dba3ff3
--- /dev/null
+++ b/src/app/screens/restoreWallet/paymentAddressTypeSelector.tsx
@@ -0,0 +1,148 @@
+import PreferredBtcAddressItem from '@components/preferredBtcAddressItem';
+import useBtcClient from '@hooks/apiClients/useBtcClient';
+import { sha256 } from '@noble/hashes/sha256';
+import type { BtcPaymentType } from '@secretkeylabs/xverse-core';
+import { getPaymentAccountSummaryForSeedPhrase } from '@secretkeylabs/xverse-core';
+import { useQuery } from '@tanstack/react-query';
+import Button from '@ui-library/button';
+import Spinner from '@ui-library/spinner';
+import { useEffect } from 'react';
+import { useTranslation } from 'react-i18next';
+import styled from 'styled-components';
+
+const SpinnerContainer = styled.div({
+  display: 'flex',
+  flexDirection: 'column',
+  alignItems: 'center',
+  justifyContent: 'center',
+  minWidth: 300,
+  minHeight: 550,
+});
+
+const Container = styled.div({
+  display: 'flex',
+  flexDirection: 'column',
+  flex: 1,
+  maxWidth: 320,
+  minHeight: 550,
+});
+
+const Title = styled.h1((props) => ({
+  ...props.theme.typography.headline_xs,
+  color: props.theme.colors.white_200,
+  marginTop: props.theme.spacing(21),
+  marginBottom: props.theme.spacing(16),
+  textAlign: 'center',
+}));
+
+const BodyContainer = styled.div({
+  display: 'flex',
+  flexDirection: 'column',
+  flexGrow: 1,
+});
+
+const SummaryContainer = styled.div({
+  display: 'flex',
+  flexDirection: 'column',
+  flexGrow: 1,
+  margin: '18px 0',
+});
+
+const TypesContainer = styled.div({
+  display: 'flex',
+  flexDirection: 'column',
+  margin: '4px 0',
+});
+
+const Text = styled.p((props) => ({
+  ...props.theme.typography.body_m,
+  color: props.theme.colors.white_200,
+}));
+
+const BoldText = styled.p((props) => ({
+  ...props.theme.typography.body_bold_m,
+  color: props.theme.colors.white_200,
+}));
+
+const ButtonContainer = styled.div((props) => ({
+  width: '100%',
+  marginBottom: props.theme.spacing(15),
+}));
+
+type Props = {
+  seedPhrase: string;
+  selectedType: BtcPaymentType;
+  onSelectedTypeChange: (type: BtcPaymentType) => void;
+  onContinue: () => void;
+};
+
+export default function PaymentAddressTypeSelector({
+  seedPhrase,
+  selectedType,
+  onSelectedTypeChange,
+  onContinue,
+}: Props) {
+  const btcClient = useBtcClient();
+  const { t } = useTranslation('translation', {
+    keyPrefix: 'RESTORE_WALLET_SCREEN.SELECT_ADDRESS_TYPE',
+  });
+  const { t: tRestore } = useTranslation('translation', {
+    keyPrefix: 'RESTORE_WALLET_SCREEN',
+  });
+
+  const { data, isLoading } = useQuery({
+    // eslint-disable-next-line @tanstack/query/exhaustive-deps
+    queryKey: ['onboardingBtcAddressBalance', sha256(seedPhrase.substring(0, 20)).toString()],
+    queryFn: () => getPaymentAccountSummaryForSeedPhrase(btcClient, seedPhrase, 'Mainnet', 20),
+  });
+
+  useEffect(() => {
+    if (isLoading || !data) return;
+    const preferredType = data.nativeTotalSats > data.nestedTotalSats ? 'native' : 'nested';
+    onSelectedTypeChange(preferredType);
+  }, [data, isLoading]);
+
+  if (isLoading || !data) {
+    return (
+      <SpinnerContainer>
+        <Spinner size={50} />
+      </SpinnerContainer>
+    );
+  }
+
+  const onClickType = (type: BtcPaymentType) => () => onSelectedTypeChange(type);
+
+  return (
+    <Container>
+      <Title>{t('TITLE')}</Title>
+      <BodyContainer>
+        <Text>{t('DESCRIPTION')}</Text>
+        <SummaryContainer>
+          <BoldText>
+            {t('ACCOUNT_COUNT', {
+              accounts: `${data.accountCount}${data.hasMoreAccounts ? '+' : ''}`,
+            })}
+          </BoldText>
+          <TypesContainer>
+            <PreferredBtcAddressItem
+              title="Native SegWit"
+              balance={data.nativeTotalSats?.toString()}
+              isSelected={selectedType === 'native'}
+              onClick={onClickType('native')}
+            />
+            <PreferredBtcAddressItem
+              title="Nested SegWit"
+              balance={data.nestedTotalSats?.toString()}
+              isSelected={selectedType === 'nested'}
+              onClick={onClickType('nested')}
+            />
+          </TypesContainer>
+          <Text>{t('ACCOUNT_SUMMARY_DESCRIPTION')}</Text>
+        </SummaryContainer>
+      </BodyContainer>
+      <ButtonContainer>
+        <Button onClick={onContinue} title={tRestore('CONTINUE_BUTTON')} />
+      </ButtonContainer>
+    </Container>
+  );
+}
diff --git a/src/app/screens/sendBtc/accountSelector.tsx b/src/app/screens/sendBtc/accountSelector.tsx
new file mode 100644
index 000000000..e23c517a3
--- /dev/null
+++ b/src/app/screens/sendBtc/accountSelector.tsx
@@ -0,0 +1,95 @@
+import { AddressTypeSelectors } from '@components/preferredBtcAddress';
+import useBtcAddressBalance from '@hooks/useBtcAddressBalance';
+import useSelectedAccount from '@hooks/useSelectedAccount';
+import useWalletSelector from '@hooks/useWalletSelector';
+import type { BtcPaymentType } from '@secretkeylabs/xverse-core';
+import Button from '@ui-library/button';
+import Spinner from '@ui-library/spinner';
+import { useTranslation } from 'react-i18next';
+import styled from 'styled-components';
+
+const SpinnerContainer = styled.div`
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  width: 100%;
+`;
+
+const Container = styled.div`
+  flex: 1 1 100%;
+
+  display: flex;
+  flex-direction: column;
+  justify-content: space-between;
+`;
+
+const Title = styled.div`
+  ${(props) => props.theme.typography.headline_xs}
+  margin-bottom: ${(props) => props.theme.space.l};
+`;
+
+const Description = styled.div`
+  color: ${(props) => props.theme.colors.white_200};
+  margin-bottom: ${(props) => props.theme.space.l};
+`;
+
+const Buttons = styled.div`
+  margin: ${(props) => props.theme.space.l} 0;
+`;
+
+type Props = {
+  overridePaymentType: BtcPaymentType;
+  setOverridePaymentType: (paymentType: BtcPaymentType) => void;
+  onNext: () => void;
+  onSkipDetected: () => void;
+};
+
+export default function AccountSelector({
+  overridePaymentType,
+  setOverridePaymentType,
+  onNext,
+  onSkipDetected,
+}: Props) {
+  const { t } = useTranslation('translation', { keyPrefix: 'SEND' });
+
+  const { btcPaymentAddressType } = useWalletSelector();
+  const selectedAccount = useSelectedAccount();
+  const { isLoading, data } = useBtcAddressBalance(
+    selectedAccount.btcAddresses.nested?.address || '',
+  );
+
+  const showLoader = btcPaymentAddressType === 'native' && isLoading;
+
+  if (showLoader) {
+    return (
+      <SpinnerContainer>
+        <Spinner />
+      </SpinnerContainer>
+    );
+  }
+
+  const shouldSkip =
+    btcPaymentAddressType === 'native' && !isLoading && data?.confirmedBalance === 0;
+
+  if (shouldSkip) {
+    onSkipDetected();
+    onNext();
+    return null;
+  }
+
+  return (
+    <Container>
+      <div>
+        <Title>{t('BTC.SELECT_ADDRESS_TYPE')}</Title>
+        <Description>{t('BTC.SELECT_ADDRESS_TYPE_DESCRIPTION')}</Description>
+        <AddressTypeSelectors
+          selectedType={overridePaymentType}
+          setSelectedType={setOverridePaymentType}
+        />
+      </div>
+      <Buttons>
+        <Button title={t('NEXT')} onClick={onNext} />
+      </Buttons>
+    </Container>
+  );
+}
diff --git a/src/app/screens/sendBtc/amountSelector.tsx b/src/app/screens/sendBtc/amountSelector.tsx
index 35474742b..2456229a7 100644
--- a/src/app/screens/sendBtc/amountSelector.tsx
+++ b/src/app/screens/sendBtc/amountSelector.tsx
@@ -1,8 +1,9 @@
-import useBtcWalletData from '@hooks/queries/useBtcWalletData';
 import useSupportedCoinRates from '@hooks/queries/useSupportedCoinRates';
+import useBtcAddressBalance from '@hooks/useBtcAddressBalance';
 import useBtcFeeRate from '@hooks/useBtcFeeRate';
+import useSelectedAccount from '@hooks/useSelectedAccount';
 import useWalletSelector from '@hooks/useWalletSelector';
-import { getBtcFiatEquivalent } from '@secretkeylabs/xverse-core';
+import { getBtcFiatEquivalent, type BtcPaymentType } from '@secretkeylabs/xverse-core';
 import BtcAmountSelector from '@ui-components/btcAmountSelector';
 import SelectFeeRate from '@ui-components/selectFeeRate';
 import Button from '@ui-library/button';
@@ -11,6 +12,7 @@ import BigNumber from 'bignumber.js';
 import { useTranslation } from 'react-i18next';
 import { useNavigate } from 'react-router-dom';
 import styled from 'styled-components';
+import Title from './title';
 
 const Container = styled.div`
   flex: 1 1 100%;
@@ -31,6 +33,7 @@ const Buttons = styled.div`
 
 type Props = {
   amountSats: string;
+  overridePaymentType: BtcPaymentType;
   setAmountSats: (amount: string) => void;
   feeRate: string;
   setFeeRate: (feeRate: string) => void;
@@ -42,11 +45,11 @@ type Props = {
   dustFiltered: boolean;
   hasSufficientFunds: boolean;
   isLoading?: boolean;
-  header?: React.ReactNode;
 };
 
 function AmountSelector({
   amountSats,
+  overridePaymentType,
   setAmountSats,
   feeRate,
   setFeeRate,
@@ -58,14 +61,16 @@ function AmountSelector({
   isLoading,
   dustFiltered,
   hasSufficientFunds,
-  header,
 }: Props) {
   const { t } = useTranslation('translation', { keyPrefix: 'SEND' });
   const { t: tUnits } = useTranslation('translation', { keyPrefix: 'UNITS' });
   const navigate = useNavigate();
 
   const { fiatCurrency } = useWalletSelector();
-  const { data: btcBalance, isLoading: btcBalanceLoading } = useBtcWalletData();
+  const selectedAccount = useSelectedAccount(overridePaymentType);
+  const { data: btcBalance, isLoading: btcBalanceLoading } = useBtcAddressBalance(
+    selectedAccount.btcAddress,
+  );
   const { btcFiatRate } = useSupportedCoinRates();
 
   const { data: recommendedFees } = useBtcFeeRate();
@@ -77,17 +82,18 @@ function AmountSelector({
     return null;
   }
 
-  const hasBtc = +btcBalance > 0;
+  const hasBtc = (btcBalance?.confirmedBalance ?? 0) > 0;
   return (
     <Container>
       <div>
-        {header}
+        <Title title={t('SEND')} showBtcIcon />
         <BtcAmountSelector
           data-testid="test-container"
           amountSats={amountSats}
           setAmountSats={setAmountSats}
           sendMax={sendMax}
           setSendMax={setSendMax}
+          overridePaymentType={overridePaymentType}
           disabled={!hasBtc}
         />
         {hasBtc && (
diff --git a/src/app/screens/sendBtc/index.tsx b/src/app/screens/sendBtc/index.tsx
index 66596e0f0..be105bb9a 100644
--- a/src/app/screens/sendBtc/index.tsx
+++ b/src/app/screens/sendBtc/index.tsx
@@ -1,10 +1,11 @@
 import useBtcFeeRate from '@hooks/useBtcFeeRate';
+import useCanUserSwitchPaymentType from '@hooks/useCanUserSwitchPaymentType';
 import useDebounce from '@hooks/useDebounce';
 import { useResetUserFlow } from '@hooks/useResetUserFlow';
-import useSelectedAccount from '@hooks/useSelectedAccount';
 import useTransactionContext from '@hooks/useTransactionContext';
+import useWalletSelector from '@hooks/useWalletSelector';
 import { AnalyticsEvents, btcTransaction, type Transport } from '@secretkeylabs/xverse-core';
-import { isInOptions, isLedgerAccount } from '@utils/helper';
+import { isInOptions } from '@utils/helper';
 import { trackMixPanel } from '@utils/mixpanel';
 import { useEffect, useState } from 'react';
 import { useNavigate } from 'react-router-dom';
@@ -14,7 +15,7 @@ import {
   type TransactionSummary,
 } from './helpers';
 import StepDisplay from './stepDisplay';
-import { getPreviousStep, Step } from './steps';
+import { Step } from './steps';
 
 function SendBtcScreen() {
   const navigate = useNavigate();
@@ -23,9 +24,13 @@ function SendBtcScreen() {
 
   useResetUserFlow('/send-btc');
 
+  const { selectedAccountType, btcPaymentAddressType } = useWalletSelector();
+  const [overridePaymentType, setOverridePaymentType] = useState(btcPaymentAddressType);
+
   const { data: btcFeeRate, isLoading: feeRatesLoading } = useBtcFeeRate();
-  const selectedAccount = useSelectedAccount();
-  const transactionContext = useTransactionContext();
+  const transactionContext = useTransactionContext(overridePaymentType);
+  const userCanSwitchPayType = useCanUserSwitchPaymentType();
+
   const [recipientAddress, setRecipientAddress] = useState<string>('');
   const [isLoading, setIsLoading] = useState(false);
   const [isSubmitting, setIsSubmitting] = useState(false);
@@ -44,6 +49,7 @@ function SendBtcScreen() {
     if (!feeRate && btcFeeRate && !feeRatesLoading) {
       setFeeRate(btcFeeRate.regular.toString());
     }
+    // eslint-disable-next-line react-hooks/exhaustive-deps -- specifically don't care if feeRate changes
   }, [btcFeeRate, feeRatesLoading]);
 
   const generateTransactionAndSummary = async (feeRateOverride?: number) => {
@@ -107,24 +113,17 @@ function SendBtcScreen() {
     return () => {
       isCancelled.current = true;
     };
+    // eslint-disable-next-line react-hooks/exhaustive-deps -- don't care if generateTxnAndSummary changes
   }, [transactionContext, debouncedRecipient, amountSats, feeRate, sendMax]);
 
   const handleCancel = () => {
-    if (isLedgerAccount(selectedAccount) && isInOption) {
+    if (selectedAccountType === 'ledger' && isInOption) {
       window.close();
       return;
     }
     navigate('/');
   };
 
-  const handleBackButtonClick = () => {
-    if (currentStep > 0) {
-      setCurrentStep(getPreviousStep(currentStep));
-    } else {
-      handleCancel();
-    }
-  };
-
   const calculateFeeForFeeRate = async (desiredFeeRate: number): Promise<number | undefined> => {
     const { summary: tempSummary } = await generateTransactionAndSummary(desiredFeeRate);
     if (tempSummary) return Number(tempSummary.fee);
@@ -139,7 +138,7 @@ function SendBtcScreen() {
       trackMixPanel(AnalyticsEvents.TransactionConfirmed, {
         protocol: 'bitcoin',
         action: 'transfer',
-        wallet_type: selectedAccount.accountType || 'software',
+        wallet_type: selectedAccountType,
       });
 
       navigate('/tx-status', {
@@ -185,6 +184,8 @@ function SendBtcScreen() {
       setCurrentStep={setCurrentStep}
       recipientAddress={recipientAddress}
       setRecipientAddress={setRecipientAddress}
+      overridePaymentType={overridePaymentType}
+      setOverridePaymentType={setOverridePaymentType}
       amountSats={amountSats}
       setAmountSats={setAmountSatsSafe}
       feeRate={feeRate}
@@ -192,11 +193,11 @@ function SendBtcScreen() {
       getFeeForFeeRate={calculateFeeForFeeRate}
       sendMax={sendMax}
       setSendMax={setSendMax}
-      onBack={handleBackButtonClick}
       onCancel={handleCancel}
       onConfirm={handleSubmit}
       isLoading={isLoading}
       isSubmitting={isSubmitting}
+      userCanSwitchPayType={userCanSwitchPayType}
     />
   );
 }
diff --git a/src/app/screens/sendBtc/stepDisplay.tsx b/src/app/screens/sendBtc/stepDisplay.tsx
index 1292c8a6d..5c7e09711 100644
--- a/src/app/screens/sendBtc/stepDisplay.tsx
+++ b/src/app/screens/sendBtc/stepDisplay.tsx
@@ -1,25 +1,15 @@
 import RecipientSelector from '@components/recipientSelector';
-import TokenImage from '@components/tokenImage';
+import type { BtcPaymentType } from '@secretkeylabs/xverse-core';
 import ConfirmBtcTransaction from 'app/components/confirmBtcTransaction';
+import { useState } from 'react';
 import { useTranslation } from 'react-i18next';
 import styled from 'styled-components';
 import SendLayout from '../../layouts/sendLayout';
+import AccountSelector from './accountSelector';
 import AmountSelector from './amountSelector';
 import type { TransactionSummary } from './helpers';
-import { Step, getNextStep } from './steps';
-
-const TitleContainer = styled.div`
-  display: flex;
-  flex-direction: column;
-  align-items: center;
-  flex: 0 0;
-`;
-
-const Title = styled.div`
-  ${(props) => props.theme.typography.headline_xs}
-  margin-top: ${(props) => props.theme.spacing(6)}px;
-  margin-bottom: ${(props) => props.theme.spacing(12)}px;
-`;
+import { Step, getNextStep, getPreviousStep } from './steps';
+import Title from './title';
 
 const Container = styled.div`
   display: flex;
@@ -33,6 +23,8 @@ type Props = {
   setCurrentStep: (step: Step) => void;
   recipientAddress: string;
   setRecipientAddress: (address: string) => void;
+  overridePaymentType: BtcPaymentType;
+  setOverridePaymentType: (paymentType: BtcPaymentType) => void;
   amountSats: string;
   setAmountSats: (amount: string) => void;
   feeRate: string;
@@ -41,10 +33,10 @@ type Props = {
   setSendMax: (sendMax: boolean) => void;
   getFeeForFeeRate: (feeRate: number, useEffectiveFeeRate?: boolean) => Promise<number | undefined>;
   onConfirm: () => void;
-  onBack: () => void;
   onCancel: () => void;
   isLoading: boolean;
   isSubmitting: boolean;
+  userCanSwitchPayType: boolean;
 };
 
 function StepDisplay({
@@ -53,6 +45,8 @@ function StepDisplay({
   setCurrentStep,
   recipientAddress,
   setRecipientAddress,
+  overridePaymentType,
+  setOverridePaymentType,
   amountSats,
   setAmountSats,
   feeRate,
@@ -61,40 +55,60 @@ function StepDisplay({
   setSendMax,
   getFeeForFeeRate,
   onConfirm,
-  onBack,
   onCancel,
   isLoading,
   isSubmitting,
+  userCanSwitchPayType,
 }: Props) {
   const { t } = useTranslation('translation');
-  const header = (
-    <TitleContainer>
-      <TokenImage currency="BTC" />
-      <Title>{t('SEND.SEND')}</Title>
-    </TitleContainer>
-  );
+
+  const [shouldSkipAccountSelect, setShouldSkipAccountSelect] = useState(false);
+
+  const showAccountSelect = !shouldSkipAccountSelect && userCanSwitchPayType;
+
+  const onBack = () => {
+    if (currentStep > 0) {
+      setCurrentStep(getPreviousStep(currentStep, showAccountSelect));
+    } else {
+      onCancel();
+    }
+  };
+
   switch (currentStep) {
     case Step.SelectRecipient:
       return (
         <SendLayout selectedBottomTab="dashboard" onClickBack={onBack}>
           <Container>
             <RecipientSelector
-              header={header}
+              header={<Title title={t('SEND.SEND')} showBtcIcon />}
               recipientAddress={recipientAddress}
               setRecipientAddress={setRecipientAddress}
-              onNext={() => setCurrentStep(getNextStep(Step.SelectRecipient))}
+              onNext={() => setCurrentStep(getNextStep(Step.SelectRecipient, showAccountSelect))}
               isLoading={isLoading}
             />
           </Container>
         </SendLayout>
       );
+    case Step.SelectAccount:
+      return (
+        <SendLayout selectedBottomTab="dashboard" onClickBack={onBack}>
+          <Container>
+            <AccountSelector
+              overridePaymentType={overridePaymentType}
+              setOverridePaymentType={setOverridePaymentType}
+              onNext={() => setCurrentStep(getNextStep(Step.SelectAccount, showAccountSelect))}
+              onSkipDetected={() => setShouldSkipAccountSelect(true)}
+            />
+          </Container>
+        </SendLayout>
+      );
     case Step.SelectAmount:
       return (
         <SendLayout selectedBottomTab="dashboard" onClickBack={onBack}>
           <Container>
             <AmountSelector
-              header={header}
               amountSats={amountSats}
+              overridePaymentType={overridePaymentType}
               setAmountSats={setAmountSats}
               feeRate={feeRate}
               setFeeRate={setFeeRate}
@@ -103,7 +117,7 @@ function StepDisplay({
               fee={(summary as TransactionSummary)?.fee.toString()}
               getFeeForFeeRate={getFeeForFeeRate}
               dustFiltered={(summary as TransactionSummary)?.dustFiltered ?? false}
-              onNext={() => setCurrentStep(getNextStep(Step.SelectAmount))}
+              onNext={() => setCurrentStep(getNextStep(Step.SelectAmount, showAccountSelect))}
               hasSufficientFunds={!!summary || isLoading}
               isLoading={isLoading}
             />
diff --git a/src/app/screens/sendBtc/steps.tsx b/src/app/screens/sendBtc/steps.tsx
index 2d464b7b1..dce28a668 100644
--- a/src/app/screens/sendBtc/steps.tsx
+++ b/src/app/screens/sendBtc/steps.tsx
@@ -1,12 +1,15 @@
 export enum Step {
   SelectRecipient = 0,
-  SelectAmount = 1,
-  Confirm = 2,
+  SelectAccount = 1,
+  SelectAmount = 2,
+  Confirm = 3,
 }
 
-export const getNextStep = (currentStep: Step) => {
+export const getNextStep = (currentStep: Step, canSelectAccount: boolean) => {
   switch (currentStep) {
     case Step.SelectRecipient:
+      return canSelectAccount ? Step.SelectAccount : Step.SelectAmount;
+    case Step.SelectAccount:
       return Step.SelectAmount;
     case Step.SelectAmount:
       return Step.Confirm;
@@ -17,12 +20,14 @@ export const getNextStep = (currentStep: Step) => {
   }
 };
 
-export const getPreviousStep = (currentStep: Step) => {
+export const getPreviousStep = (currentStep: Step, canSelectAccount: boolean) => {
   switch (currentStep) {
     case Step.SelectRecipient:
       return Step.SelectRecipient;
-    case Step.SelectAmount:
+    case Step.SelectAccount:
       return Step.SelectRecipient;
+    case Step.SelectAmount:
+      return canSelectAccount ? Step.SelectAccount : Step.SelectRecipient;
     case Step.Confirm:
       return Step.SelectAmount;
     default:
diff --git a/src/app/screens/sendBtc/title.tsx b/src/app/screens/sendBtc/title.tsx
new file mode 100644
index 000000000..4858ef1d8
--- /dev/null
+++ b/src/app/screens/sendBtc/title.tsx
@@ -0,0 +1,29 @@
+import TokenImage from '@components/tokenImage';
+import styled from 'styled-components';
+
+const TitleContainer = styled.div`
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  flex: 0 0;
+`;
+
+const TitleText = styled.div`
+  ${(props) => props.theme.typography.headline_xs}
+  margin-top: ${(props) => props.theme.spacing(6)}px;
+  margin-bottom: ${(props) => props.theme.spacing(12)}px;
+`;
+
+type Props = {
+  title: string;
+  showBtcIcon?: boolean;
+};
+
+export default function Title({ title, showBtcIcon = false }: Props) {
+  return (
+    <TitleContainer>
+      {showBtcIcon && <TokenImage currency="BTC" />}
+      <TitleText>{title}</TitleText>
+    </TitleContainer>
+  );
+}
diff --git a/src/app/screens/sendOrdinal/index.tsx b/src/app/screens/sendOrdinal/index.tsx
index f4325f6f8..54619df05 100644
--- a/src/app/screens/sendOrdinal/index.tsx
+++ b/src/app/screens/sendOrdinal/index.tsx
@@ -27,13 +27,13 @@ function SendOrdinalScreen() {
   const isRareSatParam = params.get('isRareSat');
   const vout = params.get('vout');
   const isRareSat = isRareSatParam === 'true';
-  const fromRune = params.get('fromRune');
 
   const context = useTransactionContext();
   const { data: selectedOrdinal } = useAddressInscription(isRareSat ? undefined : id);
   const selectedAccount = useSelectedAccount();
   const { avatarIds } = useWalletSelector();
-  const currentAvatar = avatarIds[selectedAccount.btcAddress];
+
+  const selectedAvatar = avatarIds[selectedAccount.ordinalsAddress];
   const { data: btcFeeRate, isLoading: feeRatesLoading } = useBtcFeeRate();
   const [currentStep, setCurrentStep] = useState<Step>(Step.SelectRecipient);
   const [feeRate, setFeeRate] = useState('');
@@ -171,10 +171,10 @@ function SendOrdinalScreen() {
       });
 
       if (
-        currentAvatar?.type === 'inscription' &&
-        currentAvatar.inscription?.id === selectedOrdinal?.id
+        selectedAvatar?.type === 'inscription' &&
+        selectedAvatar.inscription?.id === selectedOrdinal?.id
       ) {
-        dispatch(removeAccountAvatarAction({ address: selectedAccount.btcAddress }));
+        dispatch(removeAccountAvatarAction({ address: selectedAccount.ordinalsAddress }));
       }
     } catch (e) {
       console.error(e);
diff --git a/src/app/screens/settings/advanced/index.tsx b/src/app/screens/settings/advanced/index.tsx
index 51089fb93..0931b5a02 100644
--- a/src/app/screens/settings/advanced/index.tsx
+++ b/src/app/screens/settings/advanced/index.tsx
@@ -1,4 +1,5 @@
 import TopRow from '@components/topRow';
+import useCanUserSwitchPaymentType from '@hooks/useCanUserSwitchPaymentType';
 import useSelectedAccount from '@hooks/useSelectedAccount';
 import useWalletSelector from '@hooks/useWalletSelector';
 import {
@@ -17,9 +18,20 @@ function AdvancedSettings() {
   const { t } = useTranslation('translation', { keyPrefix: 'SETTING_SCREEN' });
   const dispatch = useDispatch();
   const navigate = useNavigate();
-  const { hasActivatedOrdinalsKey, hasActivatedRareSatsKey, hasActivatedRBFKey } =
-    useWalletSelector();
+  const {
+    hasActivatedOrdinalsKey,
+    hasActivatedRareSatsKey,
+    hasActivatedRBFKey,
+    btcPaymentAddressType,
+  } = useWalletSelector();
   const selectedAccount = useSelectedAccount();
+  const showBtcAddressTypeSelector = useCanUserSwitchPaymentType();
+
+  const isLedgerAccountSelected = isLedgerAccount(selectedAccount);
+
+  const onPreferredAddressClick = () => {
+    navigate('/preferred-address');
+  };
 
   const switchActivateOrdinalState = () => {
     dispatch(ChangeActivateOrdinalsAction(!hasActivatedOrdinalsKey));
@@ -36,7 +48,7 @@ function AdvancedSettings() {
   };
 
   const onRestoreFundClick = async () => {
-    if (isLedgerAccount(selectedAccount) && !isInOptions()) {
+    if (isLedgerAccountSelected && !isInOptions()) {
       await chrome.tabs.create({
         url: chrome.runtime.getURL('options.html#/restore-funds'),
       });
@@ -49,11 +61,25 @@ function AdvancedSettings() {
   const handleBackButtonClick = () => {
     navigate(-1);
   };
+
+  const payAddressType =
+    btcPaymentAddressType === 'native'
+      ? t('PREFERRED_BTC_ADDRESS.NATIVE_SEGWIT')
+      : t('PREFERRED_BTC_ADDRESS.NESTED_SEGWIT');
+
   return (
     <>
       <TopRow onClick={handleBackButtonClick} />
       <Container>
         <Title>{t('ADVANCED')}</Title>
+        {showBtcAddressTypeSelector && (
+          <SettingComponent
+            text={t('PREFERRED_BTC_ADDRESS.TITLE')}
+            textDetail={payAddressType}
+            onClick={onPreferredAddressClick}
+            showDivider
+          />
+        )}
         <SettingComponent
           text={t('ENABLE_SPEED_UP_TRANSACTIONS')}
           description={t('ENABLE_SPEED_UP_TRANSACTIONS_DETAIL')}
diff --git a/src/app/screens/settings/advanced/paymentAddressTypeSelector/index.tsx b/src/app/screens/settings/advanced/paymentAddressTypeSelector/index.tsx
new file mode 100644
index 000000000..057acb568
--- /dev/null
+++ b/src/app/screens/settings/advanced/paymentAddressTypeSelector/index.tsx
@@ -0,0 +1,63 @@
+import { AddressTypeSelectors } from '@components/preferredBtcAddress';
+import BottomTabBar from '@components/tabBar';
+import TopRow from '@components/topRow';
+import useWalletReducer from '@hooks/useWalletReducer';
+import useWalletSelector from '@hooks/useWalletSelector';
+import { Container, SubTitle, Title } from '@screens/settings/index.styles';
+import Button from '@ui-library/button';
+import { useState } from 'react';
+import toast from 'react-hot-toast';
+import { useTranslation } from 'react-i18next';
+import { useNavigate } from 'react-router-dom';
+import styled from 'styled-components';
+
+const ButtonContainer = styled.div`
+  margin: ${(props) => props.theme.space.m};
+`;
+
+function PaymentAddressTypeSelector() {
+  const { t } = useTranslation('translation', {
+    keyPrefix: 'SETTING_SCREEN.PREFERRED_BTC_ADDRESS',
+  });
+  const { t: tSettings } = useTranslation('translation', {
+    keyPrefix: 'SETTING_SCREEN',
+  });
+  const { btcPaymentAddressType } = useWalletSelector();
+  const { changeBtcPaymentAddressType } = useWalletReducer();
+  const navigate = useNavigate();
+
+  const [selectedType, setSelectedType] = useState(btcPaymentAddressType);
+
+  const handleOnCancelClick = () => {
+    navigate(-1);
+  };
+
+  const onSave = () => {
+    if (selectedType !== btcPaymentAddressType) {
+      changeBtcPaymentAddressType(selectedType);
+      toast(t('SUCCESS'));
+    }
+    navigate(-1);
+  };
+
+  return (
+    <>
+      <TopRow onClick={handleOnCancelClick} />
+      <Container>
+        <Title>{t('TITLE')} </Title>
+        <SubTitle>{t('DESCRIPTION')}</SubTitle>
+        <AddressTypeSelectors selectedType={selectedType} setSelectedType={setSelectedType} />
+      </Container>
+      <ButtonContainer>
+        <Button
+          title={tSettings('SAVE')}
+          onClick={onSave}
+          disabled={selectedType === btcPaymentAddressType}
+        />
+      </ButtonContainer>
+      <BottomTabBar tab="settings" />
+    </>
+  );
+}
+
+export default PaymentAddressTypeSelector;
diff --git a/src/app/screens/settings/changeNetwork/index.tsx b/src/app/screens/settings/changeNetwork/index.tsx
index bf76b7b36..bbb36ec30 100644
--- a/src/app/screens/settings/changeNetwork/index.tsx
+++ b/src/app/screens/settings/changeNetwork/index.tsx
@@ -180,18 +180,21 @@ function ChangeNetworkScreen() {
           network={savedMainnet || defaultMainnet}
           isSelected={formInputs.type === 'Mainnet'}
           onNetworkSelected={onNetworkSelected}
+          disabled={isChangingNetwork}
           showDivider
         />
         <NetworkRow
           network={savedTestnet || defaultTestnet}
           isSelected={formInputs.type === 'Testnet'}
           onNetworkSelected={onNetworkSelected}
+          disabled={isChangingNetwork}
           showDivider
         />
         <NetworkRow
           network={savedSignet || defaultSignet}
           isSelected={formInputs.type === 'Signet'}
           onNetworkSelected={onNetworkSelected}
+          disabled={isChangingNetwork}
           showDivider={false}
         />
         <NodeInputsContainer>
@@ -204,6 +207,7 @@ function ChangeNetworkScreen() {
               onClear={onClearCreator(key)}
               onReset={onResetCreator(key)}
               error={formErrors[key]}
+              disabled={isChangingNetwork}
             />
           ))}
         </NodeInputsContainer>
diff --git a/src/app/screens/settings/changeNetwork/networkRow.tsx b/src/app/screens/settings/changeNetwork/networkRow.tsx
index 03356d38f..b76cfb5b0 100644
--- a/src/app/screens/settings/changeNetwork/networkRow.tsx
+++ b/src/app/screens/settings/changeNetwork/networkRow.tsx
@@ -32,9 +32,10 @@ interface Props {
   isSelected: boolean;
   onNetworkSelected: (network: SettingsNetwork) => void;
   showDivider: boolean;
+  disabled?: boolean;
 }
 
-function NetworkRow({ network, isSelected, onNetworkSelected, showDivider }: Props) {
+function NetworkRow({ network, isSelected, onNetworkSelected, showDivider, disabled }: Props) {
   const theme = useTheme();
   const onClick = () => {
     onNetworkSelected(network);
@@ -44,6 +45,7 @@ function NetworkRow({ network, isSelected, onNetworkSelected, showDivider }: Pro
     <Button
       onClick={onClick}
       border={showDivider ? `1px solid ${theme.colors.white_900}` : 'transparent'}
+      disabled={disabled}
     >
       <Text
         isActive={isSelected}
diff --git a/src/app/screens/settings/changeNetwork/nodeInput.tsx b/src/app/screens/settings/changeNetwork/nodeInput.tsx
index 2a34d42b3..d578cdd79 100644
--- a/src/app/screens/settings/changeNetwork/nodeInput.tsx
+++ b/src/app/screens/settings/changeNetwork/nodeInput.tsx
@@ -59,6 +59,7 @@ function NodeInput({
   onClear,
   onReset,
   error,
+  disabled,
 }: {
   label: string;
   onChange: (event: React.ChangeEvent<HTMLInputElement>) => void;
@@ -66,6 +67,7 @@ function NodeInput({
   onClear: () => void;
   onReset: () => void;
   error: string;
+  disabled?: boolean;
 }) {
   const { t } = useTranslation('translation', { keyPrefix: 'SETTING_SCREEN' });
   const theme = useTheme();
@@ -74,12 +76,14 @@ function NodeInput({
     <div>
       <NodeInputHeader>
         <NodeText>{label}</NodeText>
-        <NodeResetButton onClick={onReset}>{t('RESET_TO_DEFAULT')}</NodeResetButton>
+        <NodeResetButton onClick={onReset} disabled={disabled}>
+          {t('RESET_TO_DEFAULT')}
+        </NodeResetButton>
       </NodeInputHeader>
       <InputContainer>
-        <Input data-testid={label} onChange={onChange} value={value} />
+        <Input data-testid={label} onChange={onChange} value={value} disabled={disabled} />
         {value && (
-          <Button onClick={onClear}>
+          <Button onClick={onClear} disabled={disabled}>
             <XCircle size={18} weight="fill" color={theme.colors.white_200} />
           </Button>
         )}
diff --git a/src/app/screens/signMessageRequest/useSignMessageRequest.ts b/src/app/screens/signMessageRequest/useSignMessageRequest.ts
index 6bbfec52e..06376c521 100644
--- a/src/app/screens/signMessageRequest/useSignMessageRequest.ts
+++ b/src/app/screens/signMessageRequest/useSignMessageRequest.ts
@@ -57,19 +57,15 @@ export const useSignMessageValidation = (requestPayload: SignMessagePayload | un
   const { t } = useTranslation('translation', { keyPrefix: 'REQUEST_ERRORS' });
   const selectedAccount = useSelectedAccount();
   const { accountsList, network } = useWalletSelector();
-  const { btcAddress } = useSelectedAccount();
   const { switchAccount } = useWalletReducer();
 
   const checkAddressAvailability = () => {
-    const account = accountsList.filter((acc) => {
-      if (acc.btcAddress === requestPayload?.address) {
-        return true;
-      }
-      if (acc.ordinalsAddress === requestPayload?.address) {
-        return true;
-      }
-      return false;
-    });
+    const account = accountsList.filter(
+      (acc) =>
+        selectedAccount.btcAddress === acc.btcAddresses.native?.address ||
+        selectedAccount.btcAddress === acc.btcAddresses.nested?.address ||
+        selectedAccount.btcAddress === acc.btcAddresses.taproot.address,
+    );
     return isHardwareAccount(selectedAccount) ? account[0] || selectedAccount : account[0];
   };
 
@@ -90,7 +86,11 @@ export const useSignMessageValidation = (requestPayload: SignMessagePayload | un
       return;
     }
 
-    if (btcAddress === account.btcAddress) return;
+    if (
+      selectedAccount.btcAddress === account.btcAddresses.native?.address ||
+      selectedAccount.btcAddress === account.btcAddresses.nested?.address
+    )
+      return;
 
     switchAccount(account);
   };
diff --git a/src/app/stores/index.ts b/src/app/stores/index.ts
index 5eb2b25cc..6e5a77af2 100644
--- a/src/app/stores/index.ts
+++ b/src/app/stores/index.ts
@@ -1,10 +1,21 @@
-import type { Account, AccountType, Coin, FungibleToken } from '@secretkeylabs/xverse-core';
+/* eslint-disable no-underscore-dangle */
+import { markAlertsForShow } from '@utils/alertTracker';
 import chromeStorage from '@utils/chromeStorage';
 import { applyMiddleware, combineReducers, createStore } from 'redux';
 import { createMigrate, persistReducer, persistStore, type PersistConfig } from 'redux-persist';
 import { createStateSyncMiddleware, initMessageListener } from 'redux-state-sync';
 import NftDataStateReducer from './nftData/reducer';
-import type { WalletState } from './wallet/actions/types';
+import type {
+  AccountBtcAddressesV5,
+  AccountV1,
+  AccountV5,
+  WalletStateV1,
+  WalletStateV2,
+  WalletStateV3,
+  WalletStateV4,
+  WalletStateV5,
+} from './wallet/actions/migrationTypes';
+import { type AvatarInfo, type WalletState } from './wallet/actions/types';
 import walletReducer, { initialWalletState, rehydrateError } from './wallet/reducer';
 
 const rootPersistConfig = {
@@ -15,9 +26,9 @@ const rootPersistConfig = {
 };
 
 const migrations = {
-  2: (state: WalletState) => {
+  2: (state: WalletStateV1): WalletStateV2 => {
     if (state.network.type !== 'Mainnet') {
-      return state;
+      return state as WalletStateV2;
     }
     return {
       ...state,
@@ -28,12 +39,8 @@ const migrations = {
     };
   },
   3: (
-    state: WalletState & {
-      brcCoinsList: (FungibleToken & { visible?: boolean })[] | null; // removed in v3
-      coinsList: (FungibleToken & { visible?: boolean })[] | null; // removed in v3
-      coins: Coin[]; // removed in v3
-    },
-  ) => ({
+    state: WalletStateV2,
+  ): WalletStateV3 & { coins: undefined; coinsList: undefined; brcCoinsList: undefined } => ({
     ...state,
     brc20ManageTokens:
       state.brcCoinsList?.reduce((acc, coin) => {
@@ -49,33 +56,114 @@ const migrations = {
         }
         return acc;
       }, {}) ?? {},
+    runesManageTokens: {},
     coins: undefined,
     coinsList: undefined,
     brcCoinsList: undefined,
   }),
-  4: (
-    state: WalletState & {
-      stxAddress: string;
-      btcAddress: string;
-      ordinalsAddress: string;
-      masterPubKey: string;
-      stxPublicKey: string;
-      btcPublicKey: string;
-      ordinalsPublicKey: string;
-      selectedAccount: Account | null;
-      accountType: AccountType | undefined;
-      accountName: string | undefined;
-    },
-  ) => ({
+  4: (state: WalletStateV3): WalletStateV4 => ({
     ...state,
     selectedAccountIndex:
       state.selectedAccount?.deviceAccountIndex ?? state.selectedAccount?.id ?? 0,
     selectedAccountType: state.selectedAccount?.accountType ?? 'software',
   }),
+  5: (state: WalletStateV4): WalletState => {
+    const migrateAccount =
+      (accountType: 'software' | 'ledger') =>
+      (account: AccountV1 & { btcAddresses?: AccountBtcAddressesV5 }): AccountV5 => {
+        const {
+          btcAddress,
+          btcPublicKey,
+          ordinalsAddress,
+          ordinalsPublicKey,
+          btcAddresses,
+          ...rest
+        } = account;
+
+        if (account.btcAddresses?.taproot.address) {
+          return { ...account, accountType, btcAddresses: account.btcAddresses };
+        }
+
+        const paymentAddress = { address: btcAddress, publicKey: btcPublicKey };
+
+        if (accountType === 'ledger') {
+          return {
+            ...rest,
+            accountType,
+            btcAddresses: {
+              native: paymentAddress,
+              taproot: { address: ordinalsAddress, publicKey: ordinalsPublicKey },
+            },
+          };
+        }
+
+        return {
+          ...rest,
+          accountType,
+          btcAddresses: {
+            nested: paymentAddress,
+            taproot: { address: ordinalsAddress, publicKey: ordinalsPublicKey },
+          },
+        };
+      };
+
+    const migrateAvatarIds = (existingIds: Record<string, AvatarInfo>) => {
+      const migratedIds: Record<string, AvatarInfo> = {};
+      const { accountsList } = state;
+
+      Object.keys(existingIds).forEach((btcAddress) => {
+        if (!existingIds[btcAddress]) return;
+
+        const legacyAccount = accountsList.find((account) => account.btcAddress === btcAddress);
+
+        if (legacyAccount?.ordinalsAddress) {
+          migratedIds[legacyAccount.ordinalsAddress] = existingIds[legacyAccount.btcAddress];
+        } else {
+          migratedIds[btcAddress] = existingIds[btcAddress];
+        }
+      });
+
+      return migratedIds;
+    };
+
+    markAlertsForShow(
+      'native_segwit_intro',
+      'co:panel:address_changed_to_native',
+      'co:receive:address_change_button',
+      'co:receive:address_changed_to_native',
+    );
+
+    return {
+      ...state,
+      btcPaymentAddressType: 'nested',
+      accountsList: state.accountsList.map(migrateAccount('software')),
+      ledgerAccountsList: state.ledgerAccountsList.map(migrateAccount('ledger')),
+      allowNestedSegWitAddress: true,
+
+      // we cast state to v5 as the below went live without a migration
+      hiddenCollectibleIds: (state as unknown as WalletStateV5).hiddenCollectibleIds || {},
+      starredCollectibleIds: (state as unknown as WalletStateV5).starredCollectibleIds || {},
+      avatarIds: migrateAvatarIds((state as unknown as WalletStateV5).avatarIds),
+    };
+  },
+  /* *
+   * When adding a new migration, add the new wallet state type to the migrationTypes file
+   * and add the migration here. Update the previous head migration's output type to be the versioned wallet state.
+   * The last migration should be a function that takes the previous state and returns the current WalletState type.
+   *
+   * e.g. if the current head is this:
+   * 6: (state: WalletStateV5): WalletState => ({
+   *
+   * Then update it to this:
+   * 6: (state: WalletStateV5): WalletStateV6 => ({
+   *
+   * And add this:
+   * 7: (state: WalletStateV6): WalletState => ({
+   * */
 };
 
 const WalletPersistConfig: PersistConfig<WalletState> = {
-  version: 4,
+  version: 5,
   key: 'walletState',
   storage: chromeStorage.local,
   migrate: createMigrate(migrations as any, { debug: false }),
diff --git a/src/app/stores/wallet/actions/actionCreators.ts b/src/app/stores/wallet/actions/actionCreators.ts
index bcc9a2c29..930e65e7f 100644
--- a/src/app/stores/wallet/actions/actionCreators.ts
+++ b/src/app/stores/wallet/actions/actionCreators.ts
@@ -3,6 +3,7 @@ import type {
   Account,
   AccountType,
   AppInfo,
+  BtcPaymentType,
   FungibleToken,
   NetworkType,
   SettingsNetwork,
@@ -90,6 +91,21 @@ export function ChangeNetworkAction(network: SettingsNetwork): actions.ChangeNet
   };
 }
 
+export function EnableNestedSegWitAddress(): actions.EnableNestedSegWitAddress {
+  return {
+    type: actions.EnableNestedSegWitAddressKey,
+  };
+}
+
+export function ChangeBtcPaymentAddressType(
+  newType: BtcPaymentType,
+): actions.ChangeBtcPaymentAddressType {
+  return {
+    type: actions.ChangeBtcPaymentAddressTypeKey,
+    btcPaymentType: newType,
+  };
+}
+
 export function ChangeActivateOrdinalsAction(
   hasActivatedOrdinalsKey: boolean,
 ): actions.ChangeActivateOrdinals {
@@ -200,12 +216,12 @@ export function setWalletUnlockedAction(isUnlocked: boolean): actions.SetWalletU
 }
 
 export function setAccountBalanceAction(
-  btcAddress: string,
+  accountKey: string,
   totalBalance: string,
 ): actions.SetAccountBalance {
   return {
     type: actions.SetAccountBalanceKey,
-    btcAddress,
+    accountKey,
     totalBalance,
   };
 }
diff --git a/src/app/stores/wallet/actions/migrationTypes.ts b/src/app/stores/wallet/actions/migrationTypes.ts
new file mode 100644
index 000000000..253954a90
--- /dev/null
+++ b/src/app/stores/wallet/actions/migrationTypes.ts
@@ -0,0 +1,162 @@
+import type {
+  AccountType,
+  AppInfo,
+  BtcPaymentType,
+  Coin,
+  FungibleToken,
+  NetworkType,
+  SettingsNetwork,
+  SupportedCurrency,
+} from '@secretkeylabs/xverse-core';
+import type { AvatarInfo, WalletSessionPeriods } from './types';
+
+/**
+ * Initial wallet state (V1)
+ */
+type SettingsNetworkV1 = {
+  type: NetworkType;
+  address: string;
+  btcApiUrl: string;
+};
+
+export type AccountV1 = {
+  id: number;
+  stxAddress: string;
+  btcAddress: string;
+  ordinalsAddress: string;
+  masterPubKey: string;
+  stxPublicKey: string;
+  btcPublicKey: string;
+  ordinalsPublicKey: string;
+  bnsName?: string;
+  accountType?: AccountType;
+  accountName?: string;
+  deviceAccountIndex?: number;
+};
+
+export type WalletStateV1 = {
+  stxAddress: string;
+  btcAddress: string;
+  ordinalsAddress: string;
+  masterPubKey: string;
+  stxPublicKey: string;
+  btcPublicKey: string;
+  ordinalsPublicKey: string;
+  accountsList: AccountV1[];
+  ledgerAccountsList: AccountV1[];
+  selectedAccount: AccountV1 | null;
+  network: SettingsNetworkV1;
+  savedNetworks: SettingsNetwork[];
+  encryptedSeed: string;
+  fiatCurrency: SupportedCurrency;
+  coinsList: FungibleToken[] | null;
+  coins: Coin[];
+  brcCoinsList: FungibleToken[] | null;
+  notificationBanners: Record<string, boolean>;
+  feeMultipliers: AppInfo | null;
+  hasActivatedOrdinalsKey: boolean | undefined;
+  hasActivatedRareSatsKey: boolean | undefined;
+  hasActivatedRBFKey: boolean | undefined;
+  rareSatsNoticeDismissed: boolean | undefined;
+  showBtcReceiveAlert: boolean | null;
+  showOrdinalReceiveAlert: boolean | null;
+  showDataCollectionAlert: boolean | null;
+  accountType: AccountType | undefined;
+  accountName: string | undefined;
+  walletLockPeriod: WalletSessionPeriods;
+  isUnlocked: boolean;
+  accountBalances: {
+    [key: string]: string;
+  };
+  hideStx: boolean;
+  showSpamTokens: boolean;
+  spamToken: FungibleToken | null;
+  spamTokens: string[];
+  savedNames: {
+    [key in NetworkType]?: { id: number; name?: string }[];
+  };
+};
+
+/**
+ * =========V2=========
+ */
+type SettingsNetworkV2 = {
+  type: NetworkType;
+  address: string;
+  btcApiUrl: string;
+  fallbackBtcApiUrl: string;
+};
+export type WalletStateV2 = Omit<WalletStateV1, 'network'> & { network: SettingsNetworkV2 };
+
+/**
+ * =========V3=========
+ */
+export type WalletStateV3 = Omit<WalletStateV2, 'coinsList' | 'coins' | 'brcCoinsList'> & {
+  sip10ManageTokens: Record<string, boolean>;
+  brc20ManageTokens: Record<string, boolean>;
+  runesManageTokens: Record<string, boolean>;
+};
+
+/**
+ * =========V4=========
+ */
+export type WalletStateV4 = Omit<
+  WalletStateV3,
+  | 'selectedAccount'
+  | 'stxAddress'
+  | 'btcAddress'
+  | 'ordinalsAddress'
+  | 'masterPubKey'
+  | 'stxPublicKey'
+  | 'btcPublicKey'
+  | 'ordinalsPublicKey'
+  | 'bnsName'
+  | 'accountType'
+  | 'accountName'
+> & {
+  selectedAccountIndex: number;
+  selectedAccountType: AccountType;
+};
+
+/**
+ * =========V5=========
+ */
+type BtcAddressV5 = {
+  address: string;
+  publicKey: string;
+};
+export type AccountBtcAddressesV5 = {
+  nested?: BtcAddressV5;
+  native?: BtcAddressV5;
+  taproot: BtcAddressV5;
+};
+export type AccountV5 = {
+  id: number;
+  deviceAccountIndex?: number;
+  masterPubKey: string;
+  accountType: AccountType;
+  accountName?: string;
+  stxAddress: string;
+  stxPublicKey: string;
+  bnsName?: string;
+  btcAddresses: AccountBtcAddressesV5;
+};
+
+export type WalletStateV5 = Omit<
+  WalletStateV4,
+  | 'btcAddress'
+  | 'btcPublicKey'
+  | 'ordinalsAddress'
+  | 'ordinalsPublicKey'
+  | 'accountsList'
+  | 'ledgerAccountsList'
+> & {
+  accountsList: AccountV5[];
+  ledgerAccountsList: AccountV5[];
+  btcPaymentAddressType: BtcPaymentType;
+  switchPaymentAddressTypeEnabled: boolean;
+
+  hiddenCollectibleIds: Record<string, Record<string, string>>;
+  starredCollectibleIds: Record<string, Array<{ id: string; collectionId: string }>>;
+  avatarIds: Record<string, AvatarInfo>;
+};
diff --git a/src/app/stores/wallet/actions/types.ts b/src/app/stores/wallet/actions/types.ts
index 280c7b2ae..ced01601a 100644
--- a/src/app/stores/wallet/actions/types.ts
+++ b/src/app/stores/wallet/actions/types.ts
@@ -2,6 +2,7 @@ import type {
   Account,
   AccountType,
   AppInfo,
+  BtcPaymentType,
   FungibleToken,
   Inscription,
   NetworkType,
@@ -17,6 +18,8 @@ export const UpdateSoftwareAccountsKey = 'UpdateSoftwareAccountsKey';
 export const SetFeeMultiplierKey = 'SetFeeMultiplierKey';
 export const ChangeFiatCurrencyKey = 'ChangeFiatCurrency';
 export const ChangeNetworkKey = 'ChangeNetwork';
+export const ChangeBtcPaymentAddressTypeKey = 'ChangeBtcPaymentAddressTypeKey';
+export const EnableNestedSegWitAddressKey = 'EnableNestedSegWitAddressKey';
 export const ChangeHasActivatedOrdinalsKey = 'ChangeHasActivatedOrdinalsKey';
 export const RareSatsNoticeDismissedKey = 'RareSatsNoticeDismissedKey';
 export const ChangeHasActivatedRareSatsKey = 'ChangeHasActivatedRareSatsKey';
@@ -57,6 +60,8 @@ export interface WalletState {
   ledgerAccountsList: Account[];
   selectedAccountIndex: number;
   selectedAccountType: AccountType;
+  btcPaymentAddressType: BtcPaymentType;
+  allowNestedSegWitAddress: boolean;
   network: SettingsNetwork; // currently selected network urls and type
   savedNetworks: SettingsNetwork[]; // previously set network urls for type
   encryptedSeed: string;
@@ -87,7 +92,7 @@ export interface WalletState {
   };
   hiddenCollectibleIds: Record<string, Record<string, string>>;
   starredCollectibleIds: Record<string, Array<{ id: string; collectionId: string }>>;
-  avatarIds: Record<string, AvatarInfo | null>;
+  avatarIds: Record<string, AvatarInfo>;
 }
 
 export interface StoreEncryptedSeed {
@@ -126,6 +131,15 @@ export interface ChangeNetwork {
   network: SettingsNetwork;
 }
 
+export interface EnableNestedSegWitAddress {
+  type: typeof EnableNestedSegWitAddressKey;
+}
+
+export interface ChangeBtcPaymentAddressType {
+  type: typeof ChangeBtcPaymentAddressTypeKey;
+  btcPaymentType: BtcPaymentType;
+}
+
 export interface ChangeActivateOrdinals {
   type: typeof ChangeHasActivatedOrdinalsKey;
   hasActivatedOrdinalsKey: boolean;
@@ -197,7 +211,7 @@ export interface SetWalletUnlocked {
 
 export interface SetAccountBalance {
   type: typeof SetAccountBalanceKey;
-  btcAddress: string;
+  accountKey: string;
   totalBalance: string;
 }
 
@@ -288,6 +302,8 @@ export type WalletActions =
   | SetFeeMultiplier
   | ChangeFiatCurrency
   | ChangeNetwork
+  | EnableNestedSegWitAddress
+  | ChangeBtcPaymentAddressType
   | ChangeActivateOrdinals
   | ChangeActivateRareSats
   | ChangeActivateRBF
diff --git a/src/app/stores/wallet/reducer.ts b/src/app/stores/wallet/reducer.ts
index 64883909e..19b532b84 100644
--- a/src/app/stores/wallet/reducer.ts
+++ b/src/app/stores/wallet/reducer.ts
@@ -3,6 +3,7 @@ import { REHYDRATE } from 'redux-persist';
 import {
   AddToHideCollectiblesKey,
   AddToStarCollectiblesKey,
+  ChangeBtcPaymentAddressTypeKey,
   ChangeFiatCurrencyKey,
   ChangeHasActivatedOrdinalsKey,
   ChangeHasActivatedRareSatsKey,
@@ -11,6 +12,7 @@ import {
   ChangeShowBtcReceiveAlertKey,
   ChangeShowDataCollectionAlertKey,
   ChangeShowOrdinalReceiveAlertKey,
+  EnableNestedSegWitAddressKey,
   RareSatsNoticeDismissedKey,
   RemoveAccountAvatarKey,
   RemoveAllFromHideCollectiblesKey,
@@ -70,6 +72,8 @@ export const initialWalletState: WalletState = {
   ledgerAccountsList: [],
   selectedAccountIndex: 0,
   selectedAccountType: 'software',
+  btcPaymentAddressType: 'native',
+  allowNestedSegWitAddress: false,
   encryptedSeed: '',
   fiatCurrency: 'USD',
   sip10ManageTokens: {},
@@ -169,6 +173,16 @@ const walletReducer = (
         accountsList: [],
         accountBalances: {},
       };
+    case EnableNestedSegWitAddressKey:
+      return {
+        ...state,
+        allowNestedSegWitAddress: true,
+      };
+    case ChangeBtcPaymentAddressTypeKey:
+      return {
+        ...state,
+        btcPaymentAddressType: action.btcPaymentType,
+      };
     case ChangeHasActivatedOrdinalsKey:
       return {
         ...state,
@@ -251,7 +265,7 @@ const walletReducer = (
         ...state,
         accountBalances: {
           ...state.accountBalances,
-          [action.btcAddress]: action.totalBalance,
+          [action.accountKey]: action.totalBalance,
         },
       };
     case SetWalletHideStxKey:
@@ -355,12 +369,11 @@ const walletReducer = (
         },
       };
     case RemoveAccountAvatarKey: {
+      const clonedAvatarIds = { ...state.avatarIds };
+      delete clonedAvatarIds[action.address];
       return {
         ...state,
-        avatarIds: {
-          ...state.avatarIds,
-          [action.address]: null,
-        },
+        avatarIds: clonedAvatarIds,
       };
     }
     default:
diff --git a/src/app/ui-components/btcAmountSelector.tsx b/src/app/ui-components/btcAmountSelector.tsx
index 9c2438801..fb795b7a3 100644
--- a/src/app/ui-components/btcAmountSelector.tsx
+++ b/src/app/ui-components/btcAmountSelector.tsx
@@ -1,5 +1,6 @@
-import useBtcWalletData from '@hooks/queries/useBtcWalletData';
 import useSupportedCoinRates from '@hooks/queries/useSupportedCoinRates';
+import useBtcAddressBalance from '@hooks/useBtcAddressBalance';
+import useSelectedAccount from '@hooks/useSelectedAccount';
 import useWalletSelector from '@hooks/useWalletSelector';
 import { ArrowsDownUp } from '@phosphor-icons/react';
 import {
@@ -7,6 +8,7 @@ import {
   currencySymbolMap,
   getBtcFiatEquivalent,
   getFiatBtcEquivalent,
+  type BtcPaymentType,
 } from '@secretkeylabs/xverse-core';
 import Input, { ConvertComplication, MaxButton, VertRule } from '@ui-library/input';
 import { satsToBtcString } from '@utils/helper';
@@ -45,6 +47,7 @@ type Props = {
   sendMax: boolean;
   setSendMax: (sendMax: boolean) => void;
   disabled?: boolean;
+  overridePaymentType?: BtcPaymentType;
 };
 
 function AmountSelector({
@@ -52,12 +55,14 @@ function AmountSelector({
   setAmountSats,
   sendMax,
   setSendMax,
+  overridePaymentType,
   disabled = false,
 }: Props) {
   const { t } = useTranslation('translation', { keyPrefix: 'SEND' });
   const { fiatCurrency } = useWalletSelector();
-  const { data: btcBalanceSats } = useBtcWalletData();
   const { btcFiatRate } = useSupportedCoinRates();
+  const selectedAccount = useSelectedAccount(overridePaymentType);
+  const { data: addressBtcBalance } = useBtcAddressBalance(selectedAccount.btcAddress);
 
   const [amountDisplay, setAmountDisplay] = useState(
     amountSats && satsToBtcString(new BigNumber(amountSats)),
@@ -79,7 +84,7 @@ function AmountSelector({
     // eslint-disable-next-line react-hooks/exhaustive-deps -- We specifically only want to run this on these 2 deps
   }, [sendMax, amountSats]);
 
-  const btcBalance = new BigNumber(btcBalanceSats ?? 0);
+  const btcBalance = new BigNumber(addressBtcBalance?.confirmedBalance ?? 0);
   const balance = useBtcValue
     ? satsToBtcString(btcBalance)
     : getBtcFiatEquivalent(btcBalance, new BigNumber(btcFiatRate)).toFixed(2);
diff --git a/src/app/ui-library/callout.tsx b/src/app/ui-library/callout.tsx
index 1c1e84238..25e0abdf8 100644
--- a/src/app/ui-library/callout.tsx
+++ b/src/app/ui-library/callout.tsx
@@ -9,6 +9,7 @@ import {
 import styled from 'styled-components';
 import Theme from 'theme';
 import { StyledHeading, StyledP } from './common.styled';
+import CrossButton from './crossButton';
 
 type CalloutVariant = 'info' | 'warning' | 'danger' | 'success';
 
@@ -33,6 +34,7 @@ const icons = {
 };
 
 const Container = styled.div<{ variant: CalloutVariant }>`
+  position: relative;
   display: flex;
   flex-direction: row;
   border-radius: ${(props) => props.theme.radius(2)}px;
@@ -82,7 +84,9 @@ export type CalloutProps = {
   variant?: CalloutVariant;
   redirectText?: string;
   onClickRedirect?: () => void;
+  onClose?: () => void;
   anchorRedirect?: string;
+  hideIcon?: boolean;
 };
 
 function Callout({
@@ -93,12 +97,14 @@ function Callout({
   variant = 'info',
   redirectText,
   onClickRedirect,
+  onClose,
   anchorRedirect,
+  hideIcon = false,
 }: CalloutProps) {
   const StyledIcon = icons[variant];
   return (
     <Container className={className} variant={variant}>
-      <StyledIcon size={24} weight="fill" color="currentColor" />
+      {!hideIcon && <StyledIcon size={24} weight="fill" color="currentColor" />}
       <TextContainer data-testid={dataTestID}>
         {titleText && (
           <StyledHeading typography="body_bold_m" color="white_0">
@@ -127,6 +133,7 @@ function Callout({
           </>
         )}
       </TextContainer>
+      {onClose && <CrossButton onClick={onClose} />}
     </Container>
   );
 }
diff --git a/src/app/ui-library/crossButton.tsx b/src/app/ui-library/crossButton.tsx
new file mode 100644
index 000000000..7454d04f5
--- /dev/null
+++ b/src/app/ui-library/crossButton.tsx
@@ -0,0 +1,44 @@
+import { XCircle } from '@phosphor-icons/react';
+import styled, { useTheme } from 'styled-components';
+import Theme from 'theme';
+
+const Button = styled.button`
+  position: absolute;
+  top: 12px;
+  right: 12px;
+  background-color: transparent;
+  cursor: pointer;
+  display: flex;
+  transition: opacity 0.1s ease;
+
+  &:hover {
+    opacity: 0.8;
+  }
+
+  &:active {
+    opacity: 0.6;
+  }
+`;
+
+type Props = {
+  onClick: () => void;
+  size?: keyof typeof Theme.space;
+  className?: string;
+};
+
+function CrossButton({ onClick, size = 'l', className }: Props) {
+  const theme = useTheme();
+
+  const internalOnClick = (e) => {
+    e.stopPropagation();
+    onClick();
+  };
+
+  return (
+    <Button onClick={internalOnClick} className={className}>
+      <XCircle color={theme.colors.white_200} weight="fill" size={Theme.space[size]} />
+    </Button>
+  );
+}
+
+export default CrossButton;
diff --git a/src/app/ui-library/sheet.tsx b/src/app/ui-library/sheet.tsx
index 45f89f1bf..ba90e26c0 100644
--- a/src/app/ui-library/sheet.tsx
+++ b/src/app/ui-library/sheet.tsx
@@ -1,51 +1,42 @@
-import { XCircle } from '@phosphor-icons/react';
 import { isInOptions } from '@utils/helper';
 import Modal from 'react-modal';
 import styled, { useTheme } from 'styled-components';
-
-export const CrossButton = styled.button`
-  background-color: transparent;
-  cursor: pointer;
-  display: flex;
-  transition: opacity 0.1s ease;
-
-  &:hover {
-    opacity: 0.8;
-  }
-
-  &:active {
-    opacity: 0.6;
-  }
-`;
+import CrossButton from './crossButton';
 
 const Title = styled.h1((props) => ({
   ...props.theme.typography.body_bold_l,
   flex: 1,
+  width: '100%',
 }));
 
-const RowContainer = styled.div((props) => ({
+const HeaderContainer = styled.div((props) => ({
   display: 'flex',
-  flexDirection: 'row',
+  flexDirection: 'column',
   alignItems: 'center',
   justifyContent: 'space-between',
   margin: props.theme.space.m,
+  gap: props.theme.space.m,
 }));
 
 const CustomisedModal = styled(Modal)`
-  overflow-y: auto;
   position: absolute;
-  &::-webkit-scrollbar {
-    display: none;
-  }
+  max-height: 100%;
+  display: flex;
+  flex-direction: column;
 `;
 
 const BodyContainer = styled.div`
+  position: relative;
+  flex: 1;
+  overflow-y: auto;
   margin: ${(props) => props.theme.space.m};
+  margin-top: 0;
 `;
 
 type Props = {
   title?: string;
   visible: boolean;
+  logo?: React.ReactNode;
   children: React.ReactNode;
   onClose?: () => void;
   overlayStylesOverriding?: {};
@@ -56,6 +47,7 @@ type Props = {
 
 function Sheet({
   title,
+  logo,
   children,
   visible,
   onClose,
@@ -104,14 +96,11 @@ function Sheet({
       shouldCloseOnOverlayClick={shouldCloseOnOverlayClick}
       onRequestClose={onClose}
     >
-      <RowContainer>
+      {onClose && <CrossButton onClick={onClose} />}
+      <HeaderContainer>
+        {logo}
         <Title>{title}</Title>
-        {onClose && (
-          <CrossButton onClick={onClose}>
-            <XCircle color={theme.colors.white_200} weight="fill" size="28" />
-          </CrossButton>
-        )}
-      </RowContainer>
+      </HeaderContainer>
       <BodyContainer>{children}</BodyContainer>
     </CustomisedModal>
   );
diff --git a/src/app/utils/alertTracker.ts b/src/app/utils/alertTracker.ts
new file mode 100644
index 000000000..d8829b2f3
--- /dev/null
+++ b/src/app/utils/alertTracker.ts
@@ -0,0 +1,47 @@
+export type AnnouncementKey = 'native_segwit_intro';
+type CalloutKey =
+  | 'co:panel:address_changed_to_native'
+  | 'co:receive:address_changed_to_native'
+  | 'co:receive:address_change_button';
+
+const alertTrackerStorageKey = 'alertTracker:alertsToShow';
+
+const getAlertData = () => {
+  try {
+    const alertsToShow = localStorage.getItem(alertTrackerStorageKey);
+    const alertsToShowParsed = alertsToShow && JSON.parse(alertsToShow);
+    return Array.isArray(alertsToShowParsed) ? alertsToShowParsed : [];
+  } catch (e) {
+    return [];
+  }
+};
+
+export const shouldShowAlert = (callout: AnnouncementKey | CalloutKey): boolean => {
+  const alertsToShow = getAlertData();
+  return alertsToShow.includes(callout);
+};
+
+export const markAlertSeen = (alertType: AnnouncementKey | CalloutKey): void => {
+  const alertsToShow = getAlertData();
+
+  if (alertsToShow.includes(alertType)) {
+    const newAlertsToShow = alertsToShow.filter((alert) => alert !== alertType);
+    localStorage.setItem(alertTrackerStorageKey, JSON.stringify(newAlertsToShow));
+  }
+};
+
+export const markAlertsForShow = (...alertTypes: (AnnouncementKey | CalloutKey)[]): void => {
+  const alertsToShow = getAlertData();
+
+  let changed = false;
+  alertTypes.forEach((alertType) => {
+    if (!alertsToShow.includes(alertType)) {
+      alertsToShow.push(alertType);
+      changed = true;
+    }
+  });
+
+  if (changed) {
+    localStorage.setItem(alertTrackerStorageKey, JSON.stringify(alertsToShow));
+  }
+};
diff --git a/src/app/utils/gradient.ts b/src/app/utils/gradient.ts
index 802f2269e..9b0f988c5 100644
--- a/src/app/utils/gradient.ts
+++ b/src/app/utils/gradient.ts
@@ -1,3 +1,5 @@
+import type { Account } from '@secretkeylabs/xverse-core';
+
 /* eslint-disable import/prefer-default-export */
 function toHex(str: string) {
   let result = '';
@@ -35,7 +37,8 @@ function stringToHslColor(str: string, saturation: number, lightness: number): s
   return `hsl(${hue}, ${saturation}%, ${lightness}%)`;
 }
 
-export function getAccountGradient(text: string): string[] {
+export function getAccountGradient(account: Account | null | undefined): string[] {
+  const text = account?.stxAddress || account?.btcAddresses.taproot.address || '';
   const pubKeyLikeString = toHex(text);
 
   const bg = stringToHslColor(text, 50, 60);
diff --git a/src/app/utils/helper.ts b/src/app/utils/helper.ts
index 0550208d1..3934e3c62 100644
--- a/src/app/utils/helper.ts
+++ b/src/app/utils/helper.ts
@@ -82,9 +82,12 @@ export const getTruncatedAddress = (address: string, lengthToShow = 4) =>
     address.length,
   )}`;
 
-export const getShortTruncatedAddress = (address: string) => {
+export const getShortTruncatedAddress = (address: string, charCount = 8) => {
   if (address) {
-    return `${address.substring(0, 8)}...${address.substring(address.length - 8, address.length)}`;
+    return `${address.substring(0, charCount)}...${address.substring(
+      address.length - charCount,
+      address.length,
+    )}`;
   }
 };
 
@@ -240,6 +243,11 @@ export const validateAccountName = (
   return null;
 };
 
+export const getAccountBalanceKey = (account: Account | null) => {
+  if (!account) return '';
+  return `${account.accountType}-${account.deviceAccountIndex || account.id}`;
+};
+
 export const calculateTotalBalance = ({
   stxBalance,
   btcBalance,
diff --git a/src/assets/img/btcFlashy.svg b/src/assets/img/btcFlashy.svg
new file mode 100644
index 000000000..0a60887b6
--- /dev/null
+++ b/src/assets/img/btcFlashy.svg
@@ -0,0 +1,41 @@
+<svg width="271" height="196" viewBox="0 0 271 196" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g clip-path="url(#clip0_19683_24103)">
+<path d="M213.615 32.8075L206.764 34.1084C205.924 34.2677 205.268 34.9241 205.109 35.7634L203.808 42.6151L202.507 35.7634C202.348 34.9241 201.691 34.2677 200.852 34.1084L194 32.8075L200.852 31.5067C201.691 31.3474 202.348 30.6909 202.507 29.8517L203.808 23L205.109 29.8517C205.268 30.6909 205.924 31.3474 206.764 31.5067L213.615 32.8075Z" fill="white"/>
+<path d="M70.6152 158.808L63.7635 160.108C62.9243 160.268 62.2679 160.924 62.1085 161.763L60.8077 168.615L59.5069 161.763C59.3475 160.924 58.6911 160.268 57.8519 160.108L51.0002 158.808L57.8519 157.507C58.6911 157.347 59.3475 156.691 59.5069 155.852L60.8077 149L62.1085 155.852C62.2679 156.691 62.9243 157.347 63.7635 157.507L70.6152 158.808Z" fill="white"/>
+<path d="M198 12L194.348 12.6933C193.509 12.8526 192.853 13.509 192.693 14.3483L192 18L191.307 14.3483C191.147 13.509 190.491 12.8526 189.652 12.6933L186 12L189.652 11.3067C190.491 11.1474 191.147 10.491 191.307 9.65171L192 6L192.693 9.65171C192.853 10.491 193.509 11.1474 194.348 11.3067L198 12Z" fill="white"/>
+<path opacity="0.4" d="M267 6L263.348 6.6933C262.509 6.85264 261.853 7.50905 261.693 8.34829L261 12L260.307 8.34829C260.147 7.50905 259.491 6.85263 258.652 6.6933L255 6L258.652 5.3067C259.491 5.14736 260.147 4.49095 260.307 3.65171L261 -2.62268e-07L261.693 3.65171C261.853 4.49095 262.509 5.14736 263.348 5.3067L267 6Z" fill="white"/>
+<path opacity="0.4" d="M12 182L8.34829 182.693C7.50905 182.853 6.85264 183.509 6.6933 184.348L6 188L5.3067 184.348C5.14737 183.509 4.49095 182.853 3.65171 182.693L6.91406e-07 182L3.65171 181.307C4.49096 181.147 5.14737 180.491 5.3067 179.652L6 176L6.6933 179.652C6.85264 180.491 7.50905 181.147 8.34829 181.307L12 182Z" fill="white"/>
+<g opacity="0.05">
+<rect x="39" y="3" width="193" height="193" rx="90.6706" fill="url(#paint0_linear_19683_24103)"/>
+</g>
+<g opacity="0.1">
+<rect x="56" y="20" width="159" height="159" rx="79.5" fill="url(#paint1_linear_19683_24103)"/>
+</g>
+<g opacity="0.2">
+<rect x="71" y="35" width="129" height="129" rx="64.5" fill="url(#paint2_linear_19683_24103)"/>
+</g>
+<rect x="81" y="45" width="109" height="109" rx="54.5" fill="url(#paint3_linear_19683_24103)"/>
+<path d="M154.252 93.7338C155.193 88.11 150.953 85.0046 145.113 82.8782L147.152 75.2701L142.524 74.0301L140.54 81.4351C139.325 81.1096 138.074 80.799 136.833 80.4944L138.83 73.0403L134.202 71.8003L132.162 79.4009C131.155 79.152 130.164 78.9075 129.204 78.6504L129.21 78.6275L122.828 76.9138L121.503 81.8592C121.503 81.8592 124.939 82.7099 124.864 82.7563C126.74 83.2592 127.058 84.5097 126.983 85.4971L124.661 94.163C124.792 94.1981 124.958 94.2494 125.14 94.3265L124.652 94.1957L121.396 106.336C121.156 106.903 120.557 107.75 119.246 107.402C119.291 107.471 115.883 106.501 115.883 106.501L113.481 111.783L119.507 113.398C120.627 113.698 121.726 114.013 122.805 114.309L120.747 122.003L125.371 123.242L127.411 115.631C128.671 115.997 129.897 116.336 131.099 116.658L129.066 124.232L133.693 125.472L135.75 117.796C143.651 119.435 149.63 118.935 152.263 111.805C154.387 106.067 152.324 102.695 148.191 100.45C151.245 99.8081 153.57 97.8511 154.252 93.7338ZM143.366 108.446C141.826 114.193 132.159 110.905 129.019 110.063L131.75 99.8676C134.889 100.716 144.972 102.452 143.366 108.446ZM145.065 93.4872C143.663 98.7175 135.614 95.9041 132.999 95.2071L135.476 85.9648C138.092 86.666 146.529 88.035 145.065 93.4872Z" fill="white" fill-opacity="0.5"/>
+</g>
+<defs>
+<linearGradient id="paint0_linear_19683_24103" x1="207.655" y1="2.16531" x2="168.764" y2="202.459" gradientUnits="userSpaceOnUse">
+<stop stop-color="#E57D33"/>
+<stop offset="1" stop-color="#FA601E"/>
+</linearGradient>
+<linearGradient id="paint1_linear_19683_24103" x1="194.943" y1="19.3124" x2="162.904" y2="184.321" gradientUnits="userSpaceOnUse">
+<stop stop-color="#E57D33"/>
+<stop offset="1" stop-color="#FA601E"/>
+</linearGradient>
+<linearGradient id="paint2_linear_19683_24103" x1="183.728" y1="34.4421" x2="157.734" y2="168.317" gradientUnits="userSpaceOnUse">
+<stop stop-color="#E57D33"/>
+<stop offset="1" stop-color="#FA601E"/>
+</linearGradient>
+<linearGradient id="paint3_linear_19683_24103" x1="176.251" y1="44.5286" x2="154.286" y2="157.648" gradientUnits="userSpaceOnUse">
+<stop stop-color="#E57D33"/>
+<stop offset="1" stop-color="#FA601E"/>
+</linearGradient>
+<clipPath id="clip0_19683_24103">
+<rect width="271" height="196" fill="white"/>
+</clipPath>
+</defs>
+</svg>
diff --git a/src/common/utils/getSelectedAccount.ts b/src/common/utils/getSelectedAccount.ts
index 6304c8853..7149ec3ae 100644
--- a/src/common/utils/getSelectedAccount.ts
+++ b/src/common/utils/getSelectedAccount.ts
@@ -1,4 +1,5 @@
-import type { Account, AccountType } from '@secretkeylabs/xverse-core';
+import type { Account, AccountType, BtcPaymentType } from '@secretkeylabs/xverse-core';
+import { getAccountAddressDetails } from '@secretkeylabs/xverse-core';
 
 type GetSelectedAccountProps = {
   selectedAccountType: AccountType;
@@ -7,7 +8,42 @@ type GetSelectedAccountProps = {
   softwareAccountsList: Account[];
 };
 
-const getSelectedAccount = (props: GetSelectedAccountProps) => {
+export type AccountWithDetails = Account & {
+  btcAddress: string;
+  btcPublicKey: string;
+  btcAddressType: BtcPaymentType;
+  ordinalsAddress: string;
+  ordinalsPublicKey: string;
+};
+
+export function embellishAccountWithDetails(
+  account: Account,
+  btcPaymentType: BtcPaymentType,
+): AccountWithDetails;
+export function embellishAccountWithDetails(
+  account: undefined,
+  btcPaymentType: BtcPaymentType,
+): undefined;
+export function embellishAccountWithDetails(
+  account: Account | undefined,
+  btcPaymentType: BtcPaymentType,
+): AccountWithDetails | undefined {
+  if (!account) {
+    return undefined;
+  }
+
+  if (account.accountType === 'ledger') {
+    return { ...account, ...getAccountAddressDetails(account, 'native'), btcAddressType: 'native' };
+  }
+
+  return {
+    ...account,
+    ...getAccountAddressDetails(account, btcPaymentType),
+    btcAddressType: btcPaymentType,
+  };
+}
+
+const getSelectedAccount = (props: GetSelectedAccountProps): Account | undefined => {
   const { selectedAccountType, selectedAccountIndex, ledgerAccountsList, softwareAccountsList } =
     props;
 
diff --git a/src/common/utils/ledger.ts b/src/common/utils/ledger.ts
index 4aa8de115..88d0c38e8 100644
--- a/src/common/utils/ledger.ts
+++ b/src/common/utils/ledger.ts
@@ -5,9 +5,9 @@ export const delay = (ms: number) =>
     setTimeout(res, ms);
   });
 
-export const filterLedgerAccounts = (accounts: Account[], network: NetworkType) =>
+export const filterLedgerAccountsByNetwork = (accounts: Account[], network: NetworkType) =>
   accounts.filter((account) =>
-    account.ordinalsAddress?.startsWith(network === 'Mainnet' ? 'bc1' : 'tb1'),
+    account.btcAddresses.taproot.address.startsWith(network === 'Mainnet' ? 'bc1' : 'tb1'),
   );
 
 // this is used for migrating the old ledger accounts to the new format
@@ -43,7 +43,7 @@ export const getDeviceNewAccountIndex = (
   network: NetworkType,
   masterKey?: string,
 ) => {
-  const networkLedgerAccounts = filterLedgerAccounts(ledgerAccountsList, network);
+  const networkLedgerAccounts = filterLedgerAccountsByNetwork(ledgerAccountsList, network);
 
   const ledgerAccountsIndexList = networkLedgerAccounts
     .filter((account) => masterKey === account.masterPubKey)
diff --git a/src/common/utils/messages/extensionToContentScript/dispatchEvent/index.ts b/src/common/utils/messages/extensionToContentScript/dispatchEvent/index.ts
index 94bc504ec..609508629 100644
--- a/src/common/utils/messages/extensionToContentScript/dispatchEvent/index.ts
+++ b/src/common/utils/messages/extensionToContentScript/dispatchEvent/index.ts
@@ -39,10 +39,10 @@ export async function dispatchEventConnectedClients(data: WalletEvent) {
  * @public
  */
 export async function dispatchEventAuthorizedConnectedClients(
-  permission: Omit<Permission, 'clientId'>,
+  permissions: Omit<Permission, 'clientId'>[],
   data: WalletEvent,
 ) {
-  sendMessageAuthorizedConnectedClients(permission, {
+  sendMessageAuthorizedConnectedClients(permissions, {
     type: contentScriptWalletEventMessageName,
     data,
   });
diff --git a/src/common/utils/messages/extensionToContentScript/utils/index.ts b/src/common/utils/messages/extensionToContentScript/utils/index.ts
index e233c6bd2..01ea31764 100644
--- a/src/common/utils/messages/extensionToContentScript/utils/index.ts
+++ b/src/common/utils/messages/extensionToContentScript/utils/index.ts
@@ -108,7 +108,7 @@ export async function sendMessageConnectedClients(message: ContentScriptMessage)
  * @public
  */
 export async function sendMessageAuthorizedConnectedClients(
-  permission: Omit<Permission, 'clientId'>,
+  permissions: Omit<Permission, 'clientId'>[],
   message: ContentScriptMessage,
 ) {
   const [error, store] = await getPermissionsStore();
@@ -125,10 +125,12 @@ export async function sendMessageAuthorizedConnectedClients(
   }
 
   const authorizedClientIds = [...store.permissions]
-    .filter(
-      (p) =>
-        p.resourceId === permission.resourceId &&
-        [...permission.actions].every((action) => p.actions.has(action)),
+    .filter((p) =>
+      permissions.some(
+        (permission) =>
+          p.resourceId === permission.resourceId &&
+          [...permission.actions].every((action) => p.actions.has(action)),
+      ),
     )
     .map((p) => p.clientId);
 
diff --git a/src/common/utils/rpc/btc/getAddresses/getAddresses.ts b/src/common/utils/rpc/btc/getAddresses/getAddresses.ts
index 7483c78a6..3c67c7643 100644
--- a/src/common/utils/rpc/btc/getAddresses/getAddresses.ts
+++ b/src/common/utils/rpc/btc/getAddresses/getAddresses.ts
@@ -1,6 +1,6 @@
 /* eslint-disable import/prefer-default-export */
 import { getTabIdFromPort } from '@common/utils';
-import getSelectedAccount from '@common/utils/getSelectedAccount';
+import getSelectedAccount, { embellishAccountWithDetails } from '@common/utils/getSelectedAccount';
 import { makeContext, openPopup } from '@common/utils/popup';
 import * as utils from '@components/permissionsManager/utils';
 import { getAddressesRequestMessageSchema, type RpcRequestMessage } from '@sats-connect/core';
@@ -50,6 +50,7 @@ export const handleGetAddresses = async (message: RpcRequestMessage, port: chrom
     selectedAccountType,
     accountsList: softwareAccountsList,
     ledgerAccountsList,
+    btcPaymentAddressType,
   } = rootStore.store.getState().walletState;
 
   const account = getSelectedAccount({
@@ -64,7 +65,8 @@ export const handleGetAddresses = async (message: RpcRequestMessage, port: chrom
     return;
   }
 
-  const addresses = accountPurposeAddresses(account, parseResult.output.params.purposes);
+  const embellishedAccount = embellishAccountWithDetails(account, btcPaymentAddressType);
+  const addresses = accountPurposeAddresses(embellishedAccount, parseResult.output.params.purposes);
   sendGetAddressesSuccessResponseMessage({
     tabId,
     messageId: message.id,
diff --git a/src/common/utils/rpc/btc/getAddresses/utils.ts b/src/common/utils/rpc/btc/getAddresses/utils.ts
index 9793e41ca..32d61b73c 100644
--- a/src/common/utils/rpc/btc/getAddresses/utils.ts
+++ b/src/common/utils/rpc/btc/getAddresses/utils.ts
@@ -1,8 +1,8 @@
 /* eslint-disable import/prefer-default-export */
+import type { AccountWithDetails } from '@common/utils/getSelectedAccount';
 import { AddressPurpose, AddressType } from '@sats-connect/core';
-import type { Account } from '@secretkeylabs/xverse-core';
 
-export function accountPurposeAddresses(account: Account, purposes: AddressPurpose[]) {
+export function accountPurposeAddresses(account: AccountWithDetails, purposes: AddressPurpose[]) {
   return purposes.map((purpose) => {
     if (purpose === AddressPurpose.Ordinals) {
       return {
@@ -24,7 +24,7 @@ export function accountPurposeAddresses(account: Account, purposes: AddressPurpo
       address: account.btcAddress,
       publicKey: account.btcPublicKey,
       purpose: AddressPurpose.Payment,
-      addressType: account.accountType === 'ledger' ? AddressType.p2wpkh : AddressType.p2sh,
+      addressType: account.btcAddressType === 'native' ? AddressType.p2wpkh : AddressType.p2sh,
     };
   });
 }
diff --git a/src/common/utils/rpc/btc/getBalance.ts b/src/common/utils/rpc/btc/getBalance.ts
index ce1271791..c497fac89 100644
--- a/src/common/utils/rpc/btc/getBalance.ts
+++ b/src/common/utils/rpc/btc/getBalance.ts
@@ -1,5 +1,5 @@
 import { getTabIdFromPort } from '@common/utils';
-import getSelectedAccount from '@common/utils/getSelectedAccount';
+import getSelectedAccount, { embellishAccountWithDetails } from '@common/utils/getSelectedAccount';
 import { makeContext } from '@common/utils/popup';
 import { safePromise, type Result } from '@common/utils/safe';
 import * as utils from '@components/permissionsManager/utils';
@@ -81,6 +81,7 @@ const handleGetBalance = async (message: RpcRequestMessage, port: chrome.runtime
     accountsList: softwareAccountsList,
     ledgerAccountsList,
     network,
+    btcPaymentAddressType,
   } = rootStore.store.getState().walletState;
 
   const account = getSelectedAccount({
@@ -95,7 +96,9 @@ const handleGetBalance = async (message: RpcRequestMessage, port: chrome.runtime
     return;
   }
 
-  const address = account.btcAddress;
+  const detailedAccount = embellishAccountWithDetails(account, btcPaymentAddressType);
+
+  const address = detailedAccount.btcAddress;
   const [getBalanceError, balances] = await getBalance(address, network.type);
   if (getBalanceError) {
     sendInternalErrorMessage({
diff --git a/src/common/utils/rpc/ordinals/getInscriptions.ts b/src/common/utils/rpc/ordinals/getInscriptions.ts
index c3dd42a2f..05688f367 100644
--- a/src/common/utils/rpc/ordinals/getInscriptions.ts
+++ b/src/common/utils/rpc/ordinals/getInscriptions.ts
@@ -94,7 +94,7 @@ const handleGetInscriptions = async (message: RpcRequestMessage, port: chrome.ru
 
   try {
     const inscriptionsList = await ordinalsApi.getInscriptions(
-      existingAccount.ordinalsAddress,
+      existingAccount.btcAddresses.taproot.address,
       parseResult.output.params.offset,
       parseResult.output.params.limit,
     );
diff --git a/src/common/utils/rpc/runes/getBalance.ts b/src/common/utils/rpc/runes/getBalance.ts
index 876dfbde1..b45c8f6fd 100644
--- a/src/common/utils/rpc/runes/getBalance.ts
+++ b/src/common/utils/rpc/runes/getBalance.ts
@@ -97,7 +97,9 @@ const handleGetRunesBalance = async (message: RpcRequestMessage, port: chrome.ru
   const runesApi = getRunesClient(network.type);
 
   try {
-    const runesBalances = await runesApi.getRuneBalances(existingAccount.ordinalsAddress);
+    const runesBalances = await runesApi.getRuneBalances(
+      existingAccount.btcAddresses.taproot.address,
+    );
     sendRpcResponse(
       tabId,
       makeRpcSuccessResponse<'runes_getBalance'>(message.id, {
diff --git a/src/common/utils/rpc/wallet/requestPermissions.ts b/src/common/utils/rpc/wallet/requestPermissions.ts
index bb38eed8b..d59eb1292 100644
--- a/src/common/utils/rpc/wallet/requestPermissions.ts
+++ b/src/common/utils/rpc/wallet/requestPermissions.ts
@@ -1,11 +1,13 @@
 /* eslint-disable import/prefer-default-export */
 import { getTabIdFromPort } from '@common/utils';
 import { makeContext, openPopup } from '@common/utils/popup';
+import * as utils from '@components/permissionsManager/utils';
 import { requestPermissionsRequestMessageSchema, type RpcRequestMessage } from '@sats-connect/core';
 import * as v from 'valibot';
 import RequestsRoutes from '../../route-urls';
 import { handleInvalidMessage } from '../handle-invalid-message';
-import { makeSendPopupClosedUserRejectionMessage } from '../helpers';
+import { hasAccountReadPermissions, makeSendPopupClosedUserRejectionMessage } from '../helpers';
+import { sendRequestPermissionsSuccessResponseMessage } from '../responseMessages/wallet';
 
 export const handleRequestPermissions = async (
   message: RpcRequestMessage,
@@ -18,10 +20,22 @@ export const handleRequestPermissions = async (
     return;
   }
 
+  const requestContext = makeContext(port);
+
+  const [error, store] = await utils.getPermissionsStore();
+  if (!error && hasAccountReadPermissions(requestContext.origin, store)) {
+    sendRequestPermissionsSuccessResponseMessage({
+      messageId: parseResult.output.id,
+      tabId: requestContext.tabId,
+      result: true,
+    });
+    return;
+  }
+
   await openPopup({
     path: RequestsRoutes.ConnectionRequest,
     data: parseResult.output,
-    context: makeContext(port),
+    context: requestContext,
     onClose: makeSendPopupClosedUserRejectionMessage({
       tabId: getTabIdFromPort(port),
       messageId: parseResult.output.id,
diff --git a/src/locales/en.json b/src/locales/en.json
index 470eec381..a203ba8b8 100644
--- a/src/locales/en.json
+++ b/src/locales/en.json
@@ -229,7 +229,23 @@
       "ALLOW": "Allow"
     },
     "TOKEN_HIDDEN": "Token hidden and reported",
-    "UNDO": "Undo"
+    "UNDO": "Undo",
+    "ANNOUNCEMENTS": {
+      "NATIVE_SEGWIT": {
+        "TITLE": "Native SegWit is here!",
+        "DESCRIPTION_1": "Xverse now supports Native SegWit for lower fees and better performance!",
+        "DESCRIPTION_2": "You can select your preferred Bitcoin payment address (native or nested) used for sending, receiving, and connecting with apps.",
+        "DESCRIPTION_3": "Your Bitcoin balance includes funds from both addresses, and you can switch back anytime.",
+        "SELECT": "Select my Preferred Bitcoin Address",
+        "LATER": "Maybe later"
+      }
+    },
+    "CALLOUTS": {
+      "NATIVE_SEGWIT": {
+        "TITLE": "Now using Native SegWit!",
+        "DESCRIPTION": "Your new Native SegWit address is set as preferred. Switch back to legacy (Nested SegWit) in Settings."
+      }
+    }
   },
   "TOKEN_SCREEN": {
     "ADD_COINS": "Manage tokens",
@@ -254,7 +270,17 @@
     "ORDINAL_ADDRESS": "Ordinal, Runes & BRC-20 address",
     "ORDINALS_RECEIVE_MESSAGE": "Only use this address to receive Ordinals, Runes, and BRC-20 tokens.",
     "STX_RECEIVE_MESSAGE": "Only use this address to receive SIP-10 tokens.",
-    "BTC_RECEIVE_MESSAGE": "Only use this address to receive Bitcoin."
+    "BTC_RECEIVE_MESSAGE": "Only use this address to receive Bitcoin.",
+    "CALLOUTS": {
+      "NATIVE_SEGWIT": {
+        "TITLE": "Now using Native SegWit!",
+        "DESCRIPTION": "Your new Native SegWit address is set as preferred address."
+      },
+      "ADDRESS_CHANGE_TOOLTIP": {
+        "TITLE": "Switch Preferred Bitcoin Address",
+        "DESCRIPTION": "You can switch between Native SegWit and legacy (Nested SegWit)"
+      }
+    }
   },
   "SEND": {
     "BTC": {
@@ -263,7 +289,9 @@
       "MAX_IGNORING_DUST_UTXO_MSG": "Small amounts may remain in your wallet, as sending them costs more in fees than their value.",
       "NO_FUNDS_TITLE": "Your balance is empty",
       "NO_FUNDS": "You don't have any funds to send. You can purchase crypto quickly and deposit directly into your Xverse wallet.",
-      "BUY_BTC": "Buy Bitcoin"
+      "BUY_BTC": "Buy Bitcoin",
+      "SELECT_ADDRESS_TYPE": "Select address type",
+      "SELECT_ADDRESS_TYPE_DESCRIPTION": "Select your preferred address to send BTC. Using Native SegWit is recommended for reduced fees and better performance."
     },
     "STX": {
       "BUY_STX": "Buy Stacks"
@@ -644,17 +672,23 @@
   },
   "FORGOT_PASSWORD_SCREEN": {
     "TITLE": "Forgot Password",
-    "PARAGRAPH1": "Xverse does not keep a copy of your password. If you're unable to access your account, you will need to reset your wallet and input the seedphrase you used when you generated your wallet.",
+    "PARAGRAPH1": "Xverse does not keep a copy of your password. If you're unable to access your account, you will need to reset your wallet and input the seed phrase you used when you generated your wallet.",
     "PARAGRAPH2": "This will reset your wallet from this browser. Make sure you have your seed phrase backed up.",
-    "BACKUP_CHECKBOX_LABEL": "I backed up my seedphrase",
+    "BACKUP_CHECKBOX_LABEL": "I backed up my seed phrase",
     "CANCEL": "Cancel",
     "RESET": "Reset"
   },
   "RESTORE_WALLET_SCREEN": {
-    "ENTER_SEED_HEADER": "Enter your seedphrase to restore your wallet.",
+    "ENTER_SEED_HEADER": "Enter your seed phrase to restore your wallet.",
     "SEED_INPUT_ERROR": "Invalid seed phrase, please try again",
     "CONTINUE_BUTTON": "Continue",
-    "HAVE_A_24_WORDS_SEEDPHRASE?": "Have a {{number}} words seedphrase?"
+    "HAVE_A_COUNT_WORDS_SEED_PHRASE": "Have a {{number}} words seed phrase?",
+    "SELECT_ADDRESS_TYPE": {
+      "TITLE": "Default address type selection",
+      "DESCRIPTION": "Select the address type to set as your default; Native SegWit (more efficient) or Nested SegWit (legacy). You can switch back any time from settings.",
+      "ACCOUNT_COUNT": "Accounts: {{accounts}}",
+      "ACCOUNT_SUMMARY_DESCRIPTION": "The balances shown above are cumulated BTC holdings for each type of address across the detected accounts."
+    }
   },
   "STACKING_SCREEN": {
     "STACK_AND_EARN": "Stack STX, earn BTC",
@@ -705,6 +739,7 @@
     "MINT": "Mint",
     "TRANSFER": "Transfer",
     "DEPLOY": "Deploy",
+    "VERIFY": "Verify",
     "VERIFY_ADDRESS_ON_LEDGER": "Verify address on Ledger",
     "VIEW_ADDRESS": "View address",
     "ADD_STACKS_ADDRESS": "Add a Stacks address",
@@ -897,6 +932,13 @@
     "ENABLE_RARE_SATS_DETAIL": "Automatically scan your ordinal address for rare sats and display them in your collectibles and transaction review screens",
     "ENABLE_SPEED_UP_TRANSACTIONS": "Enable speed up transactions",
     "ENABLE_SPEED_UP_TRANSACTIONS_DETAIL": "Allows you to speed up unconfirmed transactions by paying a higher fee.",
+    "PREFERRED_BTC_ADDRESS": {
+      "TITLE": "Preferred Bitcoin Address",
+      "DESCRIPTION": "You can switch between Native SegWit (more efficient) and  Nested SegWit (legacy) for your transactions. The selected address will be used for sending, receiving, and connecting with dapps. Your total balance includes funds from both addresses, and you can switch back anytime.",
+      "NESTED_SEGWIT": "Nested SegWit",
+      "NATIVE_SEGWIT": "Native SegWit",
+      "SUCCESS": "Preferred Bitcoin address changed"
+    },
     "ADVANCED": "Advanced",
     "XVERSE_DEFAULT": "Use Xverse as default wallet",
     "XVERSE_DEFAULT_DESCRIPTION": "Allow apps to prioritize Xverse when looking for a wallet with which to connect."
@@ -938,7 +980,8 @@
       "SET_ACTION": "Set as avatar",
       "SET_TOAST": "Item set as avatar",
       "REMOVE_ACTION": "Remove avatar",
-      "REMOVE_TOAST": "Avatar removed"
+      "REMOVE_TOAST": "Avatar removed",
+      "UNDO": "Avatar reverted"
     }
   },
   "BUY_SCREEN": {
@@ -1043,6 +1086,7 @@
     "TRANSACTIONS": "TRANSACTIONS",
     "CONTRACT": "CONTRACT",
     "BUNDLES": "BUNDLES",
+    "BREAKDOWN": "BREAKDOWN",
     "COMING_SOON": "Coming soon",
     "VERIFY_ADDRESS_ON_LEDGER": "Verify address on Ledger",
     "VIEW_ADDRESS": "View address",
diff --git a/src/theme/index.ts b/src/theme/index.ts
index 3e01d0118..c02cb0907 100644
--- a/src/theme/index.ts
+++ b/src/theme/index.ts
@@ -95,6 +95,9 @@ const Theme = {
     lilac: '#5E41C5',
     lilac_dark: '#4F34BA',
 
+    // utility
+    transparent: 'rgba(0, 0, 0, 0)',
+
     action: {
       /**
        * @deprecated

From ab896c80569e7ea0d9fee46a788fbd36cf0bfe90 Mon Sep 17 00:00:00 2001
From: GitHub Actions Bot <>
Date: Wed, 16 Oct 2024 08:24:29 +0000
Subject: [PATCH 177/227] release: v0.43.3

---
 package-lock.json | 4 ++--
 package.json      | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 16ff10803..d6a786dc1 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "xverse-web-extension",
-  "version": "0.43.2",
+  "version": "0.43.3",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "xverse-web-extension",
-      "version": "0.43.2",
+      "version": "0.43.3",
       "dependencies": {
         "@aryzing/superqs": "0.0.6",
         "@ledgerhq/hw-transport-webusb": "^6.27.13",
diff --git a/package.json b/package.json
index ce7f76e91..3d0767e07 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "xverse-web-extension",
   "description": "A Bitcoin wallet for Web3",
-  "version": "0.43.2",
+  "version": "0.43.3",
   "private": true,
   "engines": {
     "node": "^18.18.2"

From 935d695eea68924ff58bde68faf731f5c93ba13b Mon Sep 17 00:00:00 2001
From: Den <36603049+dhriaznov@users.noreply.github.com>
Date: Wed, 16 Oct 2024 10:55:32 +0200
Subject: [PATCH 178/227] [ENG-3578][ENG-3638] Star/hide/unhide Stacks
 NFT/collection (#595)

* feat: star/unstar collections, standalone inscriptions, and inscriptions in a collection (#569)

* commit initial draft

* use latest core

* use latest core and support inscription in collection

* complete UI work

* fix final touchups

* fix standalone inscription not handled

* touchup namings

* touchup namings

* typo

* commit lock

* use latest UI

* touchup

* fix keys

* fix conditionals

* use latest core

* use release core

* code review

* [ENG-3634][ENG-3635] Inscriptions - hide a collection / manage hidden collections (#567)

* [ENG-3634][ENG-3635] Inscriptions - hide a collection / manage hidden collections

* Add a todo

* commit initial draft

* use latest core

* use latest core and support inscription in collection

* Update the three dots menu button to match Figma and be consistent on different screens

* complete UI work

* Add HiddenCollectibles screen, upgrade `@phosphor-icons/react` package

* fix final touchups

* fix standalone inscription not handled

* touchup namings

* touchup namings

* typo

* commit lock

* use latest UI

* touchup

* fix errors

* touchup (incomplete)

* update naming

* fix keys

* fix conditionals

* use latest core

* fix logics

* chore: add dedicated route for hidden items and fix logic and ui issues founded

* chore: update core version and fix small issue and copy improvements

* chore: update core to v19.2.1

* fix: toast message right margin when no action is present

* chore: change starredCollectibleIds back to array to keep the order in which id were added and fix some ui issues found during testing

* chore: remove unused comments, use dynamic tab params in hidden dashboard and remove unnecessary check

* chore: DRY

---------

Co-authored-by: Terence Ng <ngtere@live.com.sg>
Co-authored-by: fede erbes <fedeerbes@gmail.com>

* fix bug (#593)

* feat: star/unstar collections, standalone inscriptions, and inscriptions in a collection (#569)

* commit initial draft

* use latest core

* use latest core and support inscription in collection

* complete UI work

* fix final touchups

* fix standalone inscription not handled

* touchup namings

* touchup namings

* typo

* commit lock

* use latest UI

* touchup

* fix keys

* fix conditionals

* use latest core

* use release core

* code review

* [ENG-3634][ENG-3635] Inscriptions - hide a collection / manage hidden collections (#567)

* [ENG-3634][ENG-3635] Inscriptions - hide a collection / manage hidden collections

* Add a todo

* commit initial draft

* use latest core

* use latest core and support inscription in collection

* Update the three dots menu button to match Figma and be consistent on different screens

* complete UI work

* Add HiddenCollectibles screen, upgrade `@phosphor-icons/react` package

* fix final touchups

* fix standalone inscription not handled

* touchup namings

* touchup namings

* typo

* commit lock

* use latest UI

* touchup

* fix errors

* touchup (incomplete)

* update naming

* fix keys

* fix conditionals

* use latest core

* fix logics

* chore: add dedicated route for hidden items and fix logic and ui issues founded

* chore: update core version and fix small issue and copy improvements

* chore: update core to v19.2.1

* fix: toast message right margin when no action is present

* chore: change starredCollectibleIds back to array to keep the order in which id were added and fix some ui issues found during testing

* chore: remove unused comments, use dynamic tab params in hidden dashboard and remove unnecessary check

* chore: DRY

---------

Co-authored-by: Terence Ng <ngtere@live.com.sg>
Co-authored-by: fede erbes <fedeerbes@gmail.com>

* fix bug

---------

Co-authored-by: Den <36603049+dhriaznov@users.noreply.github.com>
Co-authored-by: fede erbes <fedeerbes@gmail.com>

* [ENG-3578][ENG-3638] Star/hide Stacks NFT/collection

* remove collectibleId from hiddenCollectible (not needed)

* add new lock

* Move ordinal details loaders to a separate file

* Add options dialog for the nft collection screen

* Fix back button redirect for ordinals

* Add NFTs tab to the Hidden collectibles screen, integrate new logic for filtering hidden/starred items

* Make some code tweaks, fix redirect to the hidden nft collectible

* Fix the useStacksCollectibles hook caching

* Add unhide all for stacks nfts

* upgrade the xverse-core version

* feat: nft as avatar feature (#597)

feat: accept NFT as Avatar source
Co-authored-by: Cloud Le <fluctlight-kayaba@users.noreply.github.com>

* Add stacks NFT starring functionality

* Move NftDetailScreen loaders to a separate file

* Rearrange NftDetailScreen imports

* Fix Stacks NFT starring logic

* Add the $ sign for the isGalleryOpen style property on the ordinalsCollecion screen

* Add star and three dots menu on the Stacks NFT collection gallery screen

* Show the Unhide all button on the Hidden collectibles gallery page

* Redirect to the hidden collectibles from the Stacks NFT hidden collection screen

* Fix stacks nft go back function & button copy

* Make some code tweaks, fix the button indents for Stacks nft screen

* Remove the Stacks NFT avatar when hiding its collection

* update new lock

* feat: clean-up invalid Avatar on launch (#607)

* feat: clean-up invalid Avatar on launch

* feat: conditionally remove avatar when hide collection

* feat: disable SetAvatar action for hidden collection

* Update src/app/screens/ordinalsCollection/index.tsx

* Make some code tweaks

* chore: better naming for conditional that not click instantly

* chore: use stacks instead of stack for avatar related feature

* feat: optimize avatarCleanup hook, better network performance

* chore: optimize accountList loop

---------

Co-authored-by: Cloud Le <fluctlight-kayaba@users.noreply.github.com>
Co-authored-by: Den <36603049+dhriaznov@users.noreply.github.com>
Co-authored-by: Denys Hriaznov <hriaznov.dev@gmail.com>

* chore: fix style check warning

* Update stacks nft check logic

* Update the nft check

* Update the NftDashboardHidden screen

* Add snackbar for the unhide all, with Undo button

* Remove the redundant dismissToast prop

* Improve the check for hiding stacks collection

* Fix the nft starred logic

* Remove the old TODO comment

* Update xverse core version, fix the horizontal scroll on the Collectible details

---------

Co-authored-by: Terence Ng <ngtere@live.com.sg>
Co-authored-by: fede erbes <fedeerbes@gmail.com>
Co-authored-by: Kayaba Akihiko <kayaba.fluctlight@gmail.com>
Co-authored-by: Cloud Le <fluctlight-kayaba@users.noreply.github.com>
---
 .../collectibleCollectionGridItem/index.tsx   |   9 +-
 .../hooks/queries/useStacksCollectibles.ts    |  14 +-
 src/app/routes/index.tsx                      |   6 +-
 .../screens/confirmNftTransaction/index.tsx   |   3 +-
 src/app/screens/nftCollection/index.styled.ts |  99 +++++
 src/app/screens/nftCollection/index.tsx       | 353 ++++++++++++------
 .../screens/nftCollection/useNftCollection.ts |  23 +-
 .../collectiblesTabs/index.styled.ts          |  12 +
 .../nftDashboard/collectiblesTabs/index.tsx   |  48 +--
 src/app/screens/nftDashboard/hidden/index.tsx | 222 ++++++++---
 .../nftDashboard/inscriptionsTabGridItem.tsx  |  10 +-
 src/app/screens/nftDashboard/nft.tsx          |  23 +-
 .../screens/nftDashboard/nftTabGridItem.tsx   |  46 ++-
 .../screens/nftDashboard/useNftDashboard.tsx  |  45 ++-
 src/app/screens/nftDetail/index.styled.ts     | 124 ++----
 src/app/screens/nftDetail/index.tsx           | 221 ++++++-----
 src/app/screens/nftDetail/loaders.tsx         | 113 ++++++
 src/app/screens/nftDetail/useNftDetail.ts     |  10 +-
 src/app/screens/ordinalDetail/index.styled.ts |  44 +--
 src/app/screens/ordinalDetail/index.tsx       |  87 +----
 src/app/screens/ordinalDetail/loaders.tsx     | 101 +++++
 .../ordinalsCollection/index.styled.ts        |  13 +-
 src/app/screens/ordinalsCollection/index.tsx  |  50 +--
 .../stores/wallet/actions/actionCreators.ts   |   9 +
 src/app/stores/wallet/actions/types.ts        |   7 +
 src/app/stores/wallet/reducer.ts              |   9 +
 src/app/utils/constants.ts                    |   1 +
 src/locales/en.json                           |   4 +-
 28 files changed, 1139 insertions(+), 567 deletions(-)
 create mode 100644 src/app/screens/nftCollection/index.styled.ts
 create mode 100644 src/app/screens/nftDetail/loaders.tsx
 create mode 100644 src/app/screens/ordinalDetail/loaders.tsx

diff --git a/src/app/components/collectibleCollectionGridItem/index.tsx b/src/app/components/collectibleCollectionGridItem/index.tsx
index b788ad74c..b6bafc120 100644
--- a/src/app/components/collectibleCollectionGridItem/index.tsx
+++ b/src/app/components/collectibleCollectionGridItem/index.tsx
@@ -89,17 +89,22 @@ function CollectibleCollectionGridItem({
         }
       : undefined;
 
-  const { ordinalsAddress } = useSelectedAccount();
+  const { ordinalsAddress, stxAddress } = useSelectedAccount();
   const { starredCollectibleIds } = useWalletSelector();
   const inscriptionStarred =
     isInscription(item) && starredCollectibleIds[ordinalsAddress]?.some(({ id }) => id === item.id);
+  const nftStarred =
+    !isInscription(item) &&
+    starredCollectibleIds[stxAddress]?.some(
+      ({ id }) => id === `${item?.asset_identifier}:${item?.identifier.tokenId}`,
+    );
 
   return (
     <GridItemContainer data-testid="collection-item" onClick={handleOnClick}>
       <ImageContainer>{children}</ImageContainer>
       <InfoContainer>
         <StyledItemIdContainer>
-          {inscriptionStarred && (
+          {(inscriptionStarred || nftStarred) && (
             <StyledStar size={14} color={Theme.colors.white_0} weight="fill" />
           )}
           <StyledItemId typography="body_bold_m" color="white_0">
diff --git a/src/app/hooks/queries/useStacksCollectibles.ts b/src/app/hooks/queries/useStacksCollectibles.ts
index b8f21ae35..da1a70d77 100644
--- a/src/app/hooks/queries/useStacksCollectibles.ts
+++ b/src/app/hooks/queries/useStacksCollectibles.ts
@@ -1,20 +1,28 @@
 import useNetworkSelector from '@hooks/useNetwork';
 import useSelectedAccount from '@hooks/useSelectedAccount';
+import useWalletSelector from '@hooks/useWalletSelector';
 import { getNftCollections, type StacksCollectionList } from '@secretkeylabs/xverse-core';
 import { useQuery } from '@tanstack/react-query';
 import { handleRetries } from '@utils/query';
 
-const useStacksCollectibles = () => {
+const useStacksCollectibles = (showHiddenOnly?: boolean) => {
   const { stxAddress } = useSelectedAccount();
   const selectedNetwork = useNetworkSelector();
+  const { hiddenCollectibleIds, starredCollectibleIds } = useWalletSelector();
+  const hiddenIds = Object.keys(hiddenCollectibleIds[stxAddress] ?? {});
+  const starredIds = starredCollectibleIds[stxAddress]?.map(({ id }) => id);
 
   const fetchNftCollections = (): Promise<StacksCollectionList> =>
-    getNftCollections(stxAddress, selectedNetwork);
+    getNftCollections(stxAddress, selectedNetwork, {
+      hiddenCollectibleIds: hiddenIds,
+      starredCollectibleIds: starredIds,
+      showHiddenOnly,
+    });
 
   return useQuery({
     enabled: !!stxAddress,
     retry: handleRetries,
-    queryKey: ['nft-collection-data', stxAddress],
+    queryKey: ['nft-collection-data', stxAddress, hiddenIds, starredIds, showHiddenOnly],
     queryFn: fetchNftCollections,
     staleTime: 5 * 60 * 1000, // 5mins
   });
diff --git a/src/app/routes/index.tsx b/src/app/routes/index.tsx
index a6cbdee70..10072848e 100644
--- a/src/app/routes/index.tsx
+++ b/src/app/routes/index.tsx
@@ -38,7 +38,7 @@ import ManageTokens from '@screens/manageTokens';
 import MintRune from '@screens/mintRune';
 import NftCollection from '@screens/nftCollection';
 import NftDashboard from '@screens/nftDashboard';
-import Index from '@screens/nftDashboard/hidden';
+import NftDashboardHidden from '@screens/nftDashboard/hidden';
 import SupportedRarities from '@screens/nftDashboard/supportedRarities';
 import NftDetailScreen from '@screens/nftDetail';
 import OrdinalDetailScreen from '@screens/ordinalDetail';
@@ -574,7 +574,7 @@ const router = createHashRouter([
         path: 'nft-dashboard/hidden',
         element: (
           <AuthGuard>
-            <Index />
+            <NftDashboardHidden />
           </AuthGuard>
         ),
       },
@@ -611,7 +611,7 @@ const router = createHashRouter([
         element: <SendNft />,
       },
       {
-        path: 'nft-dashboard/nft-collection/:id',
+        path: 'nft-dashboard/nft-collection/:id/:from?',
         element: (
           <AuthGuard>
             <NftCollection />
diff --git a/src/app/screens/confirmNftTransaction/index.tsx b/src/app/screens/confirmNftTransaction/index.tsx
index 37d3357fc..3c39993f8 100644
--- a/src/app/screens/confirmNftTransaction/index.tsx
+++ b/src/app/screens/confirmNftTransaction/index.tsx
@@ -77,7 +77,7 @@ function ConfirmNftTransaction() {
   const { t } = useTranslation('translation', { keyPrefix: 'CONFIRM_TRANSACTION' });
   const isGalleryOpen: boolean = document.documentElement.clientWidth > 360;
   const selectedAccount = useSelectedAccount();
-  const { avatarIds } = useWalletSelector();
+  const { avatarIds, network } = useWalletSelector();
   const selectedAvatar = avatarIds[selectedAccount.ordinalsAddress];
   const [fee, setFee] = useState<BigNumber>();
   const navigate = useNavigate();
@@ -89,7 +89,6 @@ function ConfirmNftTransaction() {
 
   const { unsignedTx: unsignedTxHex, recipientAddress } = location.state;
   const unsignedTx = useMemo(() => deserializeTransaction(unsignedTxHex), [unsignedTxHex]);
-  const { network } = useWalletSelector();
   const { refetch } = useStxWalletData();
   const selectedNetwork = useNetworkSelector();
   const {
diff --git a/src/app/screens/nftCollection/index.styled.ts b/src/app/screens/nftCollection/index.styled.ts
new file mode 100644
index 000000000..552e0c923
--- /dev/null
+++ b/src/app/screens/nftCollection/index.styled.ts
@@ -0,0 +1,99 @@
+import { GridContainer } from '@screens/nftDashboard/collectiblesTabs/index.styled';
+import styled from 'styled-components';
+
+interface Props {
+  $isGalleryOpen?: boolean;
+}
+
+export const Container = styled.div((props) => ({
+  ...props.theme.scrollbar,
+  display: 'flex',
+  flexDirection: 'column',
+  flex: 1,
+}));
+
+export const NoCollectiblesText = styled.p((props) => ({
+  ...props.theme.typography.body_bold_m,
+  color: props.theme.colors.white_200,
+  marginTop: props.theme.space.xl,
+  marginBottom: 'auto',
+  textAlign: 'center',
+}));
+
+export const HeadingText = styled.p((props) => ({
+  ...props.theme.typography.body_bold_m,
+  color: props.theme.colors.white_400,
+}));
+
+export const CollectionText = styled.p((props) => ({
+  ...props.theme.typography.headline_s,
+  color: props.theme.colors.white_0,
+  marginTop: props.theme.space.xxxs,
+  marginBottom: props.theme.space.xs,
+  wordBreak: 'break-word',
+}));
+
+export const BottomBarContainer = styled.div({
+  marginTop: 'auto',
+});
+
+export const PageHeader = styled.div<Props>`
+  padding: ${(props) => props.theme.space.xs};
+  padding-top: 0;
+  max-width: 1224px;
+  margin-top: ${(props) => (props.$isGalleryOpen ? props.theme.space.xxl : props.theme.space.l)};
+  margin-left: auto;
+  margin-right: auto;
+  width: 100%;
+`;
+
+export const PageHeaderContent = styled.div<Props>`
+  display: flex;
+  flex-direction: ${(props) => (props.$isGalleryOpen ? 'row' : 'column')};
+  justify-content: ${(props) => (props.$isGalleryOpen ? 'space-between' : 'initial')};
+  row-gap: ${(props) => props.theme.space.xl};
+`;
+
+export const NftContainer = styled.div<Props>`
+  display: flex;
+  flex-direction: ${(props) => (props.$isGalleryOpen ? 'column' : 'row')};
+  justify-content: ${(props) => (props.$isGalleryOpen ? 'space-between' : 'initial')};
+  column-gap: ${(props) => props.theme.space.m};
+`;
+
+export const BackButtonContainer = styled.div((props) => ({
+  display: 'flex',
+  marginBottom: props.theme.space.xxl,
+}));
+
+export const BackButton = styled.button((props) => ({
+  display: 'flex',
+  flexDirection: 'row',
+  justifyContent: 'flex-start',
+  alignItems: 'center',
+  background: 'transparent',
+  marginBottom: props.theme.space.l,
+}));
+
+export const AssetDetailButtonText = styled.div((props) => ({
+  ...props.theme.typography.body_m,
+  marginLeft: props.theme.space.xxxs,
+  color: props.theme.colors.white_0,
+  textAlign: 'center',
+}));
+
+export const StyledGridContainer = styled(GridContainer)`
+  margin-top: ${(props) => props.theme.space.s};
+  padding: 0 ${(props) => props.theme.space.xs};
+  padding-bottom: ${(props) => props.theme.space.xl};
+  max-width: 1224px;
+  margin-left: auto;
+  margin-right: auto;
+  width: 100%;
+`;
+
+export const CollectionNameDiv = styled.div`
+  display: flex;
+  align-items: center;
+  gap: ${(props) => props.theme.space.s};
+`;
diff --git a/src/app/screens/nftCollection/index.tsx b/src/app/screens/nftCollection/index.tsx
index 38ff17e39..5eb7d96f0 100644
--- a/src/app/screens/nftCollection/index.tsx
+++ b/src/app/screens/nftCollection/index.tsx
@@ -1,121 +1,55 @@
 import AccountHeaderComponent from '@components/accountHeader';
 import CollectibleCollectionGridItem from '@components/collectibleCollectionGridItem';
 import CollectibleDetailTile from '@components/collectibleDetailTile';
+import SquareButton from '@components/squareButton';
 import BottomTabBar from '@components/tabBar';
 import { StyledBarLoader, TilesSkeletonLoader } from '@components/tilesSkeletonLoader';
 import TopRow from '@components/topRow';
 import WebGalleryButton from '@components/webGalleryButton';
 import WrenchErrorMessage from '@components/wrenchErrorMessage';
 import useNftDetail from '@hooks/queries/useNftDetail';
-import { ArrowLeft } from '@phosphor-icons/react';
-import { GridContainer } from '@screens/nftDashboard/collectiblesTabs/index.styled';
+import useSelectedAccount from '@hooks/useSelectedAccount';
+import useWalletSelector from '@hooks/useWalletSelector';
+import { ArchiveTray, ArrowLeft, DotsThreeVertical, Star } from '@phosphor-icons/react';
 import Nft from '@screens/nftDashboard/nft';
 import NftImage from '@screens/nftDashboard/nftImage';
+import { StyledButton } from '@screens/ordinalsCollection/index.styled';
 import type { NonFungibleToken, StacksCollectionData } from '@secretkeylabs/xverse-core';
-import { EMPTY_LABEL } from '@utils/constants';
+import {
+  addToHideCollectiblesAction,
+  addToStarCollectiblesAction,
+  removeAccountAvatarAction,
+  removeFromHideCollectiblesAction,
+  removeFromStarCollectiblesAction,
+} from '@stores/wallet/actions/actionCreators';
+import Sheet from '@ui-library/sheet';
+import SnackBar from '@ui-library/snackBar';
+import { EMPTY_LABEL, LONG_TOAST_DURATION } from '@utils/constants';
 import { getFullyQualifiedKey, getNftCollectionsGridItemId, isBnsCollection } from '@utils/nfts';
-import { useRef, type PropsWithChildren } from 'react';
+import { useRef, useState, type PropsWithChildren } from 'react';
 import toast from 'react-hot-toast';
 import { useTranslation } from 'react-i18next';
 import { useIsVisible } from 'react-is-visible';
+import { useDispatch } from 'react-redux';
 import { useNavigate } from 'react-router-dom';
-import styled from 'styled-components';
+import Theme from 'theme';
+import {
+  AssetDetailButtonText,
+  BackButton,
+  BackButtonContainer,
+  BottomBarContainer,
+  CollectionNameDiv,
+  CollectionText,
+  Container,
+  HeadingText,
+  NftContainer,
+  NoCollectiblesText,
+  PageHeader,
+  PageHeaderContent,
+  StyledGridContainer,
+} from './index.styled';
 import useNftCollection from './useNftCollection';
 
-interface Props {
-  isGalleryOpen?: boolean;
-}
-const Container = styled.div((props) => ({
-  ...props.theme.scrollbar,
-  display: 'flex',
-  flexDirection: 'column',
-  flex: 1,
-}));
-
-const NoCollectiblesText = styled.p((props) => ({
-  ...props.theme.typography.body_bold_m,
-  color: props.theme.colors.white_200,
-  marginTop: props.theme.spacing(16),
-  marginBottom: 'auto',
-  textAlign: 'center',
-}));
-
-const HeadingText = styled.p((props) => ({
-  ...props.theme.typography.body_bold_m,
-  color: props.theme.colors.white_400,
-}));
-
-const CollectionText = styled.p((props) => ({
-  ...props.theme.typography.headline_s,
-  color: props.theme.colors.white_0,
-  marginTop: props.theme.spacing(1),
-  marginBottom: props.theme.spacing(4),
-  wordBreak: 'break-word',
-}));
-
-const BottomBarContainer = styled.div({
-  marginTop: 'auto',
-});
-
-const PageHeader = styled.div<Props>`
-  padding: ${(props) => props.theme.space.xs};
-  padding-top: 0;
-  max-width: 1224px;
-  margin-top: ${(props) => (props.isGalleryOpen ? props.theme.space.xxl : props.theme.space.l)};
-  margin-left: auto;
-  margin-right: auto;
-  width: 100%;
-`;
-
-const PageHeaderContent = styled.div<Props>`
-  display: flex;
-  flex-direction: ${(props) => (props.isGalleryOpen ? 'row' : 'column')};
-  justify-content: ${(props) => (props.isGalleryOpen ? 'space-between' : 'initial')};
-  row-gap: ${(props) => props.theme.space.xl};
-`;
-
-const NftContainer = styled.div<Props>`
-  display: flex;
-  flex-direction: ${(props) => (props.isGalleryOpen ? 'column' : 'row')};
-  justify-content: ${(props) => (props.isGalleryOpen ? 'space-between' : 'initial')};
-  column-gap: ${(props) => props.theme.space.m};
-`;
-
-const BackButtonContainer = styled.div((props) => ({
-  display: 'flex',
-  flexDirection: 'row',
-  width: 800,
-  marginTop: props.theme.spacing(40),
-}));
-
-const BackButton = styled.button((props) => ({
-  display: 'flex',
-  flexDirection: 'row',
-  justifyContent: 'flex-start',
-  alignItems: 'center',
-  background: 'transparent',
-  marginBottom: props.theme.spacing(12),
-}));
-
-const AssetDetailButtonText = styled.div((props) => ({
-  ...props.theme.typography.body_m,
-  fontWeight: 400,
-  fontSize: 14,
-  marginLeft: 2,
-  color: props.theme.colors.white_0,
-  textAlign: 'center',
-}));
-
-const StyledGridContainer = styled(GridContainer)`
-  margin-top: ${(props) => props.theme.space.s};
-  padding: 0 ${(props) => props.theme.space.xs};
-  padding-bottom: ${(props) => props.theme.space.xl};
-  max-width: 1224px;
-  margin-left: auto;
-  margin-right: auto;
-  width: 100%;
-`;
-
 /*
  * component to virtualise the grid item if not in window
  * placeholder is required to match grid item size, in order to negate scroll jank
@@ -176,6 +110,12 @@ function CollectionGridItemWithData({
 
 function NftCollection() {
   const { t } = useTranslation('translation', { keyPrefix: 'COLLECTIBLE_COLLECTION_SCREEN' });
+  const { t: commonT } = useTranslation('translation', { keyPrefix: 'COMMON' });
+  const selectedAccount = useSelectedAccount();
+  const { starredCollectibleIds, hiddenCollectibleIds, avatarIds } = useWalletSelector();
+  const dispatch = useDispatch();
+  const navigate = useNavigate();
+  const [isOptionsModalVisible, setIsOptionsModalVisible] = useState(false);
   const {
     collectionData,
     portfolioValue,
@@ -186,37 +126,193 @@ function NftCollection() {
     handleBackButtonClick,
     openInGalleryView,
   } = useNftCollection();
+  const currentAvatar = avatarIds[selectedAccount.btcAddress];
+
+  const openOptionsDialog = () => {
+    setIsOptionsModalVisible(true);
+  };
+
+  const closeOptionsDialog = () => {
+    setIsOptionsModalVisible(false);
+  };
+
+  const collectionStarred = starredCollectibleIds[selectedAccount.stxAddress]?.some(
+    ({ id }) => id === collectionData?.collection_id,
+  );
+  const collectionHidden = Object.keys(hiddenCollectibleIds[selectedAccount.stxAddress] ?? {}).some(
+    (id) => id === collectionData?.collection_id,
+  );
+
+  const handleUnHideCollection = () => {
+    const isLastHiddenItem =
+      Object.keys(hiddenCollectibleIds[selectedAccount.stxAddress] ?? {}).length === 1;
+    dispatch(
+      removeFromHideCollectiblesAction({
+        address: selectedAccount.stxAddress,
+        id: collectionData?.collection_id ?? '',
+      }),
+    );
+    closeOptionsDialog();
+    toast.custom(<SnackBar text={t('COLLECTION_UNHIDDEN')} type="neutral" />);
+    navigate(`/nft-dashboard/${isLastHiddenItem ? '' : 'hidden'}?tab=nfts`);
+  };
+
+  const handleClickUndoHiding = (toastId: string) => {
+    dispatch(
+      removeFromHideCollectiblesAction({
+        address: selectedAccount.stxAddress,
+        id: collectionData?.collection_id ?? '',
+      }),
+    );
+    toast.remove(toastId);
+    toast.custom(<SnackBar text={t('COLLECTION_UNHIDDEN')} type="neutral" />, {
+      duration: LONG_TOAST_DURATION,
+    });
+  };
+
+  const handleHideCollection = () => {
+    dispatch(
+      addToHideCollectiblesAction({
+        address: selectedAccount.stxAddress,
+        id: collectionData?.collection_id ?? '',
+      }),
+    );
+
+    if (currentAvatar?.type === 'stacks') {
+      const isHidingUsedAvatar = collectionData?.all_nfts.some(
+        (nft) =>
+          `${nft.asset_identifier}:${nft.identifier.tokenId}` ===
+          currentAvatar.nft.fully_qualified_token_id,
+      );
+
+      if (isHidingUsedAvatar) {
+        dispatch(removeAccountAvatarAction({ address: selectedAccount.btcAddress }));
+      }
+    }
+
+    closeOptionsDialog();
+    navigate('/nft-dashboard?tab=nfts');
+    const toastId = toast.custom(
+      <SnackBar
+        text={t('COLLECTION_HIDDEN')}
+        type="neutral"
+        action={{
+          text: commonT('UNDO'),
+          onClick: () => handleClickUndoHiding(toastId),
+        }}
+      />,
+      { duration: LONG_TOAST_DURATION },
+    );
+  };
+
+  const handleClickUndoStarring = (toastId: string) => {
+    dispatch(
+      removeFromStarCollectiblesAction({
+        address: selectedAccount.stxAddress,
+        id: collectionData?.collection_id ?? '',
+      }),
+    );
+    toast.remove(toastId);
+    toast.custom(<SnackBar text={t('UNSTAR_COLLECTION')} type="neutral" />);
+  };
+
+  const handleStarClick = () => {
+    if (collectionStarred) {
+      dispatch(
+        removeFromStarCollectiblesAction({
+          address: selectedAccount.stxAddress,
+          id: collectionData?.collection_id ?? '',
+        }),
+      );
+      toast.custom(<SnackBar text={t('UNSTAR_COLLECTION')} type="neutral" />, {
+        duration: LONG_TOAST_DURATION,
+      });
+    } else {
+      dispatch(
+        addToStarCollectiblesAction({
+          address: selectedAccount.stxAddress,
+          id: collectionData?.collection_id ?? '',
+        }),
+      );
+      const toastId = toast.custom(
+        <SnackBar
+          text={t('STAR_COLLECTION')}
+          type="neutral"
+          action={{
+            text: commonT('UNDO'),
+            onClick: () => handleClickUndoStarring(toastId),
+          }}
+        />,
+        { duration: LONG_TOAST_DURATION },
+      );
+    }
+  };
 
   return (
     <>
       {isGalleryOpen ? (
         <AccountHeaderComponent disableMenuOption={isGalleryOpen} disableAccountSwitch />
       ) : (
-        <TopRow onClick={handleBackButtonClick} />
+        <TopRow
+          onClick={handleBackButtonClick}
+          onMenuClick={openOptionsDialog}
+          onStarClick={collectionHidden ? undefined : handleStarClick}
+          isStarred={collectionStarred}
+        />
       )}
       <Container>
-        <PageHeader isGalleryOpen={isGalleryOpen}>
+        <PageHeader $isGalleryOpen={isGalleryOpen}>
           {isGalleryOpen && (
             <BackButtonContainer>
               <BackButton data-testid="back-button" onClick={handleBackButtonClick}>
                 <>
                   <ArrowLeft weight="regular" size="20" color="white" />
                   <AssetDetailButtonText data-testid="back">
-                    {t('BACK_TO_GALLERY')}
+                    {t(collectionHidden ? 'BACK_TO_HIDDEN_COLLECTIBLES' : 'BACK_TO_GALLERY')}
                   </AssetDetailButtonText>
                 </>
               </BackButton>
             </BackButtonContainer>
           )}
-          <PageHeaderContent isGalleryOpen={isGalleryOpen}>
+          <PageHeaderContent $isGalleryOpen={isGalleryOpen}>
             <div>
               <HeadingText>{t('COLLECTION')}</HeadingText>
-              <CollectionText>
-                {collectionData?.collection_name || <StyledBarLoader width={200} height={28} />}
-              </CollectionText>
+              <CollectionNameDiv>
+                <CollectionText>
+                  {collectionData?.collection_name || <StyledBarLoader width={200} height={28} />}
+                </CollectionText>
+                {isGalleryOpen && (
+                  <>
+                    {collectionHidden ? null : (
+                      <SquareButton
+                        icon={
+                          collectionStarred ? (
+                            <Star size={16} color={Theme.colors.tangerine} weight="fill" />
+                          ) : (
+                            <Star size={16} color={Theme.colors.white_0} weight="bold" />
+                          )
+                        }
+                        onPress={handleStarClick}
+                        isTransparent
+                        size={44}
+                        radiusSize={12}
+                      />
+                    )}
+                    <SquareButton
+                      icon={
+                        <DotsThreeVertical size={20} color={Theme.colors.white_0} weight="bold" />
+                      }
+                      onPress={openOptionsDialog}
+                      isTransparent
+                      size={44}
+                      radiusSize={12}
+                    />
+                  </>
+                )}
+              </CollectionNameDiv>
               {!isGalleryOpen && <WebGalleryButton onClick={openInGalleryView} />}
             </div>
-            <NftContainer isGalleryOpen={isGalleryOpen}>
+            <NftContainer $isGalleryOpen={isGalleryOpen}>
               <CollectibleDetailTile
                 title={t('COLLECTION_FLOOR_PRICE')}
                 value={
@@ -246,17 +342,15 @@ function NftCollection() {
                 tileSize={isGalleryOpen ? 276 : 151}
               />
             ) : (
-              collectionData?.all_nfts
-                .sort((a, b) => (a.value.repr > b.value.repr ? 1 : -1))
-                .map((nft) => (
-                  <IsVisibleOrPlaceholder key={getFullyQualifiedKey(nft.identifier)}>
-                    <CollectionGridItemWithData
-                      nft={nft}
-                      collectionData={collectionData}
-                      isGalleryOpen={isGalleryOpen}
-                    />
-                  </IsVisibleOrPlaceholder>
-                ))
+              collectionData?.all_nfts.map((nft) => (
+                <IsVisibleOrPlaceholder key={getFullyQualifiedKey(nft.identifier)}>
+                  <CollectionGridItemWithData
+                    nft={nft}
+                    collectionData={collectionData}
+                    isGalleryOpen={isGalleryOpen}
+                  />
+                </IsVisibleOrPlaceholder>
+              ))
             )}
           </StyledGridContainer>
         </>
@@ -266,6 +360,29 @@ function NftCollection() {
           <BottomTabBar tab="nft" />
         </BottomBarContainer>
       )}
+      {isOptionsModalVisible && (
+        <Sheet
+          title={commonT('OPTIONS')}
+          visible={isOptionsModalVisible}
+          onClose={closeOptionsDialog}
+        >
+          {collectionHidden ? (
+            <StyledButton
+              variant="tertiary"
+              icon={<ArchiveTray size={24} color={Theme.colors.white_200} />}
+              title={t('UNHIDE_COLLECTION')}
+              onClick={handleUnHideCollection}
+            />
+          ) : (
+            <StyledButton
+              variant="tertiary"
+              icon={<ArchiveTray size={24} color={Theme.colors.white_200} />}
+              title={t('HIDE_COLLECTION')}
+              onClick={handleHideCollection}
+            />
+          )}
+        </Sheet>
+      )}
     </>
   );
 }
diff --git a/src/app/screens/nftCollection/useNftCollection.ts b/src/app/screens/nftCollection/useNftCollection.ts
index 37e64bc07..cf74fa48b 100644
--- a/src/app/screens/nftCollection/useNftCollection.ts
+++ b/src/app/screens/nftCollection/useNftCollection.ts
@@ -1,5 +1,7 @@
 import useStacksCollectibles from '@hooks/queries/useStacksCollectibles';
 import { useResetUserFlow } from '@hooks/useResetUserFlow';
+import useSelectedAccount from '@hooks/useSelectedAccount';
+import useWalletSelector from '@hooks/useWalletSelector';
 import { useMemo } from 'react';
 import { useNavigate, useParams } from 'react-router-dom';
 
@@ -7,12 +9,18 @@ export default function useNftCollection() {
   const navigate = useNavigate();
   useResetUserFlow('/nft-collection');
 
-  const { id: collectionId } = useParams();
-  const { data, isLoading, error } = useStacksCollectibles();
+  const { id: collectionId, from } = useParams();
+  const comesFromHidden = from === 'hidden';
+  const { data, isLoading, error } = useStacksCollectibles(comesFromHidden);
+  const { hiddenCollectibleIds } = useWalletSelector();
+  const { stxAddress } = useSelectedAccount();
 
   const collectionData = data?.results.find(
     (collection) => collection.collection_id === collectionId,
   );
+  const collectionHidden = Object.keys(hiddenCollectibleIds[stxAddress] ?? {}).some(
+    (id) => id === collectionId,
+  );
 
   const portfolioValue =
     collectionData?.floor_price && !Number.isNaN(collectionData?.all_nfts?.length)
@@ -21,13 +29,16 @@ export default function useNftCollection() {
 
   const isGalleryOpen: boolean = useMemo(() => document.documentElement.clientWidth > 360, []);
 
-  const handleBackButtonClick = () => {
-    navigate('/nft-dashboard?tab=nfts');
-  };
+  const handleBackButtonClick = () =>
+    navigate(`/nft-dashboard${comesFromHidden || collectionHidden ? '/hidden' : ''}?tab=nfts`);
 
   const openInGalleryView = async () => {
     await chrome.tabs.create({
-      url: chrome.runtime.getURL(`options.html#/nft-dashboard/nft-collection/${collectionId}`),
+      url: chrome.runtime.getURL(
+        `options.html#/nft-dashboard/nft-collection/${collectionId}${
+          comesFromHidden || collectionHidden ? '/hidden' : ''
+        }`,
+      ),
     });
   };
 
diff --git a/src/app/screens/nftDashboard/collectiblesTabs/index.styled.ts b/src/app/screens/nftDashboard/collectiblesTabs/index.styled.ts
index 50af867c7..ec0bd8425 100644
--- a/src/app/screens/nftDashboard/collectiblesTabs/index.styled.ts
+++ b/src/app/screens/nftDashboard/collectiblesTabs/index.styled.ts
@@ -83,6 +83,18 @@ export const StyledButton = styled(Button)`
   }
 `;
 
+export const StyledSheetButton = styled(Button)`
+  &.tertiary {
+    justify-content: flex-start;
+    color: ${(props) => props.theme.colors.white_200};
+    padding-left: 0;
+
+    &:hover:enabled {
+      opacity: 0.8;
+    }
+  }
+`;
+
 export const TopBarContainer = styled.div((props) => ({
   display: 'flex',
   justifyContent: 'space-between',
diff --git a/src/app/screens/nftDashboard/collectiblesTabs/index.tsx b/src/app/screens/nftDashboard/collectiblesTabs/index.tsx
index 412e37ddf..4a8eec173 100644
--- a/src/app/screens/nftDashboard/collectiblesTabs/index.tsx
+++ b/src/app/screens/nftDashboard/collectiblesTabs/index.tsx
@@ -1,5 +1,5 @@
 import useTrackMixPanelPageViewed from '@hooks/useTrackMixPanelPageViewed';
-import { TrayArrowDown } from '@phosphor-icons/react';
+import { ArchiveTray } from '@phosphor-icons/react';
 import { mapRareSatsAPIResponseToBundle, type Bundle } from '@secretkeylabs/xverse-core';
 import Button from '@ui-library/button';
 import { StyledP } from '@ui-library/common.styled';
@@ -134,25 +134,23 @@ export default function CollectiblesTabs({
               <SkeletonLoader isGalleryOpen={isGalleryOpen} />
             ) : (
               <>
-                <TopBarContainer>
-                  {totalInscriptions > 0 ? (
+                {totalInscriptions > 0 && (
+                  <TopBarContainer>
                     <StyledP data-testid="total-items" typography="body_medium_m" color="white_200">
                       {totalInscriptions === 1
                         ? t('TOTAL_ITEMS_ONE')
                         : t('TOTAL_ITEMS', { count: totalInscriptions })}
                     </StyledP>
-                  ) : (
-                    <div />
-                  )}
-                  <StyledButton
-                    variant="tertiary"
-                    icon={<TrayArrowDown size={20} color={Theme.colors.white_200} />}
-                    title={t('HIDDEN_COLLECTIBLES')}
-                    onClick={() => {
-                      navigate(`/nft-dashboard/hidden?tab=${tabs[tabIndex]?.key}`);
-                    }}
-                  />
-                </TopBarContainer>
+                    <StyledButton
+                      variant="tertiary"
+                      icon={<ArchiveTray size={20} color={Theme.colors.white_200} />}
+                      title={t('HIDDEN_COLLECTIBLES')}
+                      onClick={() => {
+                        navigate(`/nft-dashboard/hidden?tab=${tabs[tabIndex]?.key}`);
+                      }}
+                    />
+                  </TopBarContainer>
+                )}
                 {inscriptionListView}
               </>
             )}
@@ -165,13 +163,19 @@ export default function CollectiblesTabs({
         ) : (
           <>
             {totalNfts > 0 && (
-              <StyledTotalItems
-                data-testid="total-items"
-                typography="body_medium_m"
-                color="white_200"
-              >
-                {totalNfts === 1 ? t('TOTAL_ITEMS_ONE') : t('TOTAL_ITEMS', { count: totalNfts })}
-              </StyledTotalItems>
+              <TopBarContainer>
+                <StyledP data-testid="total-items" typography="body_medium_m" color="white_200">
+                  {totalNfts === 1 ? t('TOTAL_ITEMS_ONE') : t('TOTAL_ITEMS', { count: totalNfts })}
+                </StyledP>
+                <StyledButton
+                  variant="tertiary"
+                  icon={<ArchiveTray size={20} color={Theme.colors.white_200} />}
+                  title={t('HIDDEN_COLLECTIBLES')}
+                  onClick={() => {
+                    navigate('/nft-dashboard/hidden?tab=nfts');
+                  }}
+                />
+              </TopBarContainer>
             )}
             {nftListView}
           </>
diff --git a/src/app/screens/nftDashboard/hidden/index.tsx b/src/app/screens/nftDashboard/hidden/index.tsx
index 32b3a0dd6..abc8942ab 100644
--- a/src/app/screens/nftDashboard/hidden/index.tsx
+++ b/src/app/screens/nftDashboard/hidden/index.tsx
@@ -2,18 +2,30 @@ import AccountHeaderComponent from '@components/accountHeader';
 import BottomTabBar from '@components/tabBar';
 import TopRow from '@components/topRow';
 import useSelectedAccount from '@hooks/useSelectedAccount';
+import useWalletSelector from '@hooks/useWalletSelector';
 import { ArrowLeft, TrayArrowUp } from '@phosphor-icons/react';
-import { removeAllFromHideCollectiblesAction } from '@stores/wallet/actions/actionCreators';
+import {
+  removeAllFromHideCollectiblesAction,
+  setHiddenCollectiblesAction,
+} from '@stores/wallet/actions/actionCreators';
 import { StyledHeading, StyledP } from '@ui-library/common.styled';
 import Sheet from '@ui-library/sheet';
+import SnackBar from '@ui-library/snackBar';
+import { TabItem } from '@ui-library/tabs';
+import { LONG_TOAST_DURATION } from '@utils/constants';
 import { useState } from 'react';
+import toast from 'react-hot-toast';
 import { useTranslation } from 'react-i18next';
 import { useDispatch } from 'react-redux';
 import { useNavigate, useSearchParams } from 'react-router-dom';
 import { TabPanel, Tabs } from 'react-tabs';
 import styled from 'styled-components';
-import Theme from '../../../../theme';
-import { StyledButton } from '../collectiblesTabs/index.styled';
+import Theme from 'theme';
+import {
+  StickyStyledTabList,
+  StyledButton,
+  StyledSheetButton,
+} from '../collectiblesTabs/index.styled';
 import SkeletonLoader from '../collectiblesTabs/skeletonLoader';
 import useNftDashboard from '../useNftDashboard';
 
@@ -62,11 +74,32 @@ const BackButton = styled.button`
   color: ${(props) => props.theme.colors.white_0};
 `;
 
-const ItemCountContainer = styled.div<{ isGalleryOpen: boolean }>`
-  margin-top: ${(props) => (props.isGalleryOpen ? props.theme.space.l : props.theme.space.m)};
+const ItemCountContainer = styled.div<{ $isGalleryOpen: boolean }>`
+  margin-top: ${(props) => (props.$isGalleryOpen ? props.theme.space.l : props.theme.space.m)};
 `;
 
-function Index() {
+type TabButton = {
+  key: string;
+  label: string;
+};
+
+const tabs: TabButton[] = [
+  {
+    key: 'inscriptions',
+    label: 'INSCRIPTIONS',
+  },
+  {
+    key: 'nfts',
+    label: 'NFTS',
+  },
+];
+
+const tabKeyToIndex = (key?: string | null) => {
+  if (!key) return 0;
+  return tabs.findIndex((tab) => tab.key === key);
+};
+
+function NftDashboardHidden() {
   const { t } = useTranslation('translation', { keyPrefix: 'NFT_DASHBOARD_SCREEN' });
   const { t: tCommon } = useTranslation('translation', { keyPrefix: 'COMMON' });
   const { t: tCollectibles } = useTranslation('translation', {
@@ -74,28 +107,89 @@ function Index() {
   });
   const [searchParams] = useSearchParams();
   const tab = searchParams?.get('tab');
-  const nftDashboard = useNftDashboard();
-  const { ordinalsAddress } = useSelectedAccount();
-  const navigate = useNavigate();
-  const dispatch = useDispatch();
   const {
     isGalleryOpen,
     hiddenInscriptionsQuery,
     totalHiddenInscriptions,
     HiddenInscriptionListView,
-  } = nftDashboard;
-
+    hiddenStacksNftsQuery,
+    totalHiddenNfts,
+    HiddenNftListView,
+    hasActivatedOrdinalsKey,
+  } = useNftDashboard();
+  const { ordinalsAddress, stxAddress } = useSelectedAccount();
+  const navigate = useNavigate();
+  const dispatch = useDispatch();
+  const { hiddenCollectibleIds } = useWalletSelector();
   const [isOptionsModalVisible, setIsOptionsModalVisible] = useState(false);
+  const [tabIndex, setTabIndex] = useState(tabKeyToIndex(tab));
+
+  const visibleTabButtons = tabs.filter((tabItem: TabButton) => {
+    if (tabItem.key === 'inscriptions' && !hasActivatedOrdinalsKey) {
+      return false;
+    }
+    return true;
+  });
 
   const handleBackButtonClick = () => {
     navigate(`/nft-dashboard?tab=${tab}`);
   };
 
+  const handleClickUndoHidingAll = ({
+    toastId,
+    currentInscriptionsHidden,
+    currentStacksNftsHidden,
+  }: {
+    toastId: string;
+    currentInscriptionsHidden: Record<string, string>;
+    currentStacksNftsHidden: Record<string, string>;
+  }) => {
+    dispatch(
+      setHiddenCollectiblesAction({
+        collectibleIds: {
+          [ordinalsAddress]: currentInscriptionsHidden,
+          [stxAddress]: currentStacksNftsHidden,
+        },
+      }),
+    );
+    toast.remove(toastId);
+    toast.custom(<SnackBar text={t('ITEMS_RETURNED_TO_HIDDEN')} type="neutral" />, {
+      duration: LONG_TOAST_DURATION,
+    });
+  };
+
   const handleUnHideAll = () => {
+    const currentInscriptionsHidden = {
+      ...(hiddenCollectibleIds[ordinalsAddress] ?? {}),
+    };
+    const currentStacksNftsHidden = {
+      ...(hiddenCollectibleIds[stxAddress] ?? {}),
+    };
+
     dispatch(removeAllFromHideCollectiblesAction({ address: ordinalsAddress }));
+    dispatch(removeAllFromHideCollectiblesAction({ address: stxAddress }));
     handleBackButtonClick();
+
+    const toastId = toast.custom(
+      <SnackBar
+        text={t('HIDDEN_ITEMS_RESTORED')}
+        type="neutral"
+        action={{
+          text: tCommon('UNDO'),
+          onClick: () =>
+            handleClickUndoHidingAll({
+              toastId,
+              currentInscriptionsHidden,
+              currentStacksNftsHidden,
+            }),
+        }}
+      />,
+      { duration: LONG_TOAST_DURATION },
+    );
   };
 
+  const handleSelectTab = (index: number) => setTabIndex(index);
+
   const openOptionsDialog = () => {
     setIsOptionsModalVisible(true);
   };
@@ -111,7 +205,9 @@ function Index() {
       ) : (
         <TopRow
           onClick={handleBackButtonClick}
-          onMenuClick={totalHiddenInscriptions > 0 ? openOptionsDialog : undefined}
+          onMenuClick={
+            totalHiddenInscriptions > 0 || totalHiddenNfts > 0 ? openOptionsDialog : undefined
+          }
         />
       )}
       <Container>
@@ -128,7 +224,7 @@ function Index() {
             <StyledHeading typography={isGalleryOpen ? 'headline_xl' : 'headline_s'}>
               {t('HIDDEN_COLLECTIBLES')}
             </StyledHeading>
-            {isGalleryOpen && totalHiddenInscriptions > 0 ? (
+            {isGalleryOpen && (totalHiddenInscriptions > 0 || totalHiddenNfts > 0) ? (
               <StyledButton
                 variant="tertiary"
                 icon={<TrayArrowUp size={20} color={Theme.colors.white_200} />}
@@ -139,35 +235,74 @@ function Index() {
           </RowCenterSpaceBetween>
         </PageHeader>
         <CollectiblesContainer>
-          <Tabs>
-            {/* TODO: add tab selector once we support nft */}
-            <TabPanel>
-              <div>
+          {/* TODO: replace with Tabs component from `src/app/ui-library/tabs.tsx` */}
+          <Tabs selectedIndex={tabIndex} onSelect={handleSelectTab}>
+            {visibleTabButtons.length > 1 && (
+              <StickyStyledTabList data-testid="tab-list">
+                {visibleTabButtons.map(({ key, label }) => (
+                  <TabItem
+                    key={key}
+                    $active={tabIndex === tabKeyToIndex(key)}
+                    onClick={() => handleSelectTab(tabKeyToIndex(key))}
+                  >
+                    {t(label)}
+                  </TabItem>
+                ))}
+              </StickyStyledTabList>
+            )}
+            {hasActivatedOrdinalsKey && (
+              <TabPanel>
                 <div>
-                  {hiddenInscriptionsQuery.isInitialLoading ? (
-                    <SkeletonLoader isGalleryOpen={isGalleryOpen} />
-                  ) : (
-                    <>
-                      <ItemCountContainer isGalleryOpen={isGalleryOpen}>
-                        {totalHiddenInscriptions > 0 ? (
-                          <StyledP
-                            data-testid="total-items"
-                            typography="body_medium_m"
-                            color="white_200"
-                          >
-                            {totalHiddenInscriptions === 1
-                              ? t('TOTAL_ITEMS_ONE')
-                              : t('TOTAL_ITEMS', { count: totalHiddenInscriptions })}
-                          </StyledP>
-                        ) : (
-                          <div />
-                        )}
-                      </ItemCountContainer>
-                      <HiddenInscriptionListView />
-                    </>
-                  )}
+                  <div>
+                    {hiddenInscriptionsQuery.isInitialLoading ? (
+                      <SkeletonLoader isGalleryOpen={isGalleryOpen} />
+                    ) : (
+                      <>
+                        <ItemCountContainer $isGalleryOpen={isGalleryOpen}>
+                          {totalHiddenInscriptions > 0 ? (
+                            <StyledP
+                              data-testid="total-items"
+                              typography="body_medium_m"
+                              color="white_200"
+                            >
+                              {totalHiddenInscriptions === 1
+                                ? t('TOTAL_ITEMS_ONE')
+                                : t('TOTAL_ITEMS', { count: totalHiddenInscriptions })}
+                            </StyledP>
+                          ) : (
+                            <div />
+                          )}
+                        </ItemCountContainer>
+                        <HiddenInscriptionListView />
+                      </>
+                    )}
+                  </div>
                 </div>
-              </div>
+              </TabPanel>
+            )}
+            <TabPanel>
+              {hiddenStacksNftsQuery.isInitialLoading ? (
+                <SkeletonLoader isGalleryOpen={isGalleryOpen} />
+              ) : (
+                <>
+                  <ItemCountContainer $isGalleryOpen={isGalleryOpen}>
+                    {totalHiddenNfts > 0 ? (
+                      <StyledP
+                        data-testid="total-items"
+                        typography="body_medium_m"
+                        color="white_200"
+                      >
+                        {totalHiddenNfts === 1
+                          ? t('TOTAL_ITEMS_ONE')
+                          : t('TOTAL_ITEMS', { count: totalHiddenNfts })}
+                      </StyledP>
+                    ) : (
+                      <div />
+                    )}
+                  </ItemCountContainer>
+                  <HiddenNftListView />
+                </>
+              )}
             </TabPanel>
           </Tabs>
         </CollectiblesContainer>
@@ -179,7 +314,7 @@ function Index() {
           visible={isOptionsModalVisible}
           onClose={closeOptionsDialog}
         >
-          <StyledButton
+          <StyledSheetButton
             variant="tertiary"
             icon={<TrayArrowUp size={24} color={Theme.colors.white_200} />}
             title={t('UNHIDE_ALL')}
@@ -190,4 +325,5 @@ function Index() {
     </>
   );
 }
-export default Index;
+
+export default NftDashboardHidden;
diff --git a/src/app/screens/nftDashboard/inscriptionsTabGridItem.tsx b/src/app/screens/nftDashboard/inscriptionsTabGridItem.tsx
index 2d9701bb1..74d384f0b 100644
--- a/src/app/screens/nftDashboard/inscriptionsTabGridItem.tsx
+++ b/src/app/screens/nftDashboard/inscriptionsTabGridItem.tsx
@@ -34,12 +34,12 @@ const InfoContainer = styled.div`
 
 const StyledItemIdContainer = styled.div`
   display: flex;
-  gap: 4px;
+  gap: ${(props) => props.theme.space.xxs};
   width: 100%;
 `;
 
 const StyledStar = styled(Star)`
-  margin-top: 2px;
+  margin-top: ${(props) => props.theme.space.xxxs};
 `;
 
 const StyledItemId = styled(StyledP)`
@@ -76,12 +76,12 @@ function InscriptionsTabGridItem({ item: collection }: { item: InscriptionCollec
     (id) => id === getCollectionKey(collection),
   );
 
-  const handleClickCollectionId = (e: React.MouseEvent<HTMLButtonElement>) => {
+  const handleClickCollection = (e: React.MouseEvent<HTMLButtonElement>) => {
     const collectionId = e.currentTarget.value;
     navigate(`/nft-dashboard/ordinals-collection/${collectionId}/${isItemHidden ? 'hidden' : ''}`);
   };
 
-  const handleClickInscriptionId = (e: React.MouseEvent<HTMLButtonElement>) => {
+  const handleClickInscription = (e: React.MouseEvent<HTMLButtonElement>) => {
     const inscriptionId = e.currentTarget.value;
     navigate(`/nft-dashboard/ordinal-detail/${inscriptionId}/${isItemHidden ? 'hidden' : ''}`);
   };
@@ -95,7 +95,7 @@ function InscriptionsTabGridItem({ item: collection }: { item: InscriptionCollec
         data-testid="inscription-container"
         type="button"
         value={getCollectionKey(collection)}
-        onClick={isCollection(collection) ? handleClickCollectionId : handleClickInscriptionId}
+        onClick={isCollection(collection) ? handleClickCollection : handleClickInscription}
       >
         {!collection.thumbnail_inscriptions ? ( // eslint-disable-line no-nested-ternary
           <OrdinalImage ordinal={{ id: '', content_type: 'unknown', number: 0 }} />
diff --git a/src/app/screens/nftDashboard/nft.tsx b/src/app/screens/nftDashboard/nft.tsx
index 31ba8f8f2..95cb4c251 100644
--- a/src/app/screens/nftDashboard/nft.tsx
+++ b/src/app/screens/nftDashboard/nft.tsx
@@ -5,15 +5,9 @@ import { isBnsContract } from '@utils/nfts';
 import styled from 'styled-components';
 import NftImage from './nftImage';
 
-interface Props {
-  asset: NonFungibleToken;
-  isGalleryOpen: boolean;
-}
-interface ContainerProps {
-  isGalleryView: boolean;
-}
-
-const NftImageContainer = styled.div<ContainerProps>((props) => ({
+const NftImageContainer = styled.div<{
+  $isGalleryView: boolean;
+}>((props) => ({
   display: 'flex',
   justifyContent: 'center',
   alignItems: 'flex-start',
@@ -25,7 +19,7 @@ const NftImageContainer = styled.div<ContainerProps>((props) => ({
   '> img': {
     width: '100%',
   },
-  flexGrow: props.isGalleryView ? 1 : 'initial',
+  flexGrow: props.$isGalleryView ? 1 : 'initial',
 }));
 
 const GridItemContainer = styled.div((props) => ({
@@ -43,11 +37,17 @@ const BnsImage = styled.img({
   height: '100%',
 });
 
+type Props = {
+  asset: NonFungibleToken;
+  isGalleryOpen: boolean;
+};
+
 function Nft({ asset, isGalleryOpen }: Props) {
   const { data } = useNftDetail(asset.identifier);
+
   return (
     <GridItemContainer>
-      <NftImageContainer isGalleryView={isGalleryOpen}>
+      <NftImageContainer $isGalleryView={isGalleryOpen}>
         {isBnsContract(asset?.asset_identifier) ? (
           <BnsImage src={NftUser} alt="user" />
         ) : (
@@ -57,4 +57,5 @@ function Nft({ asset, isGalleryOpen }: Props) {
     </GridItemContainer>
   );
 }
+
 export default Nft;
diff --git a/src/app/screens/nftDashboard/nftTabGridItem.tsx b/src/app/screens/nftDashboard/nftTabGridItem.tsx
index ee3ee663f..5fd1c8c15 100644
--- a/src/app/screens/nftDashboard/nftTabGridItem.tsx
+++ b/src/app/screens/nftDashboard/nftTabGridItem.tsx
@@ -1,9 +1,13 @@
 import CollectibleCollage from '@components/collectibleCollage/collectibleCollage';
+import useSelectedAccount from '@hooks/useSelectedAccount';
+import useWalletSelector from '@hooks/useWalletSelector';
+import { Star } from '@phosphor-icons/react';
 import type { StacksCollectionData } from '@secretkeylabs/xverse-core';
 import { StyledP } from '@ui-library/common.styled';
 import { getNftsTabGridItemSubText } from '@utils/nfts';
 import { useNavigate } from 'react-router-dom';
 import styled from 'styled-components';
+import Theme from 'theme';
 import Nft from './nft';
 import NftImage from './nftImage';
 
@@ -24,6 +28,12 @@ const InfoContainer = styled.div`
   width: 100%;
 `;
 
+const TitleContainer = styled.div`
+  display: flex;
+  gap: 4px;
+  width: 100%;
+`;
+
 const StyledItemId = styled(StyledP)`
   text-align: left;
   text-wrap: nowrap;
@@ -40,17 +50,32 @@ const StyledItemSub = styled(StyledP)`
   width: 100%;
 `;
 
-function NftTabGridItem({
-  item: collection,
-  isLoading = false,
-}: {
+const StyledStar = styled(Star)`
+  margin-top: ${(props) => props.theme.space.xxxs};
+`;
+
+type Props = {
   item: StacksCollectionData;
   isLoading?: boolean;
-}) {
+};
+
+function NftTabGridItem({ item: collection, isLoading = false }: Props) {
   const navigate = useNavigate();
+  const { stxAddress } = useSelectedAccount();
+  const { hiddenCollectibleIds, starredCollectibleIds } = useWalletSelector();
+
+  const isItemHidden = Object.keys(hiddenCollectibleIds[stxAddress] ?? {}).some(
+    (id) => id === collection.collection_id,
+  );
+
+  const collectionStarred = starredCollectibleIds[stxAddress]?.some(
+    ({ id }) => id === collection.collection_id,
+  );
 
   const handleClickCollection = () => {
-    navigate(`nft-collection/${collection.collection_id}`);
+    navigate(
+      `/nft-dashboard/nft-collection/${collection.collection_id}/${isItemHidden ? 'hidden' : ''}`,
+    );
   };
 
   const itemId = collection.collection_name;
@@ -68,9 +93,12 @@ function NftTabGridItem({
         )}
       </ThumbnailContainer>
       <InfoContainer>
-        <StyledItemId typography="body_bold_m" color="white_0">
-          {itemId}
-        </StyledItemId>
+        <TitleContainer>
+          {collectionStarred && <StyledStar size={14} color={Theme.colors.white_0} weight="fill" />}
+          <StyledItemId typography="body_bold_m" color="white_0">
+            {itemId}
+          </StyledItemId>
+        </TitleContainer>
         <StyledItemSub typography="body_medium_m" color="white_400">
           {itemSubText}
         </StyledItemSub>
diff --git a/src/app/screens/nftDashboard/useNftDashboard.tsx b/src/app/screens/nftDashboard/useNftDashboard.tsx
index 5b43a8f04..67427cb19 100644
--- a/src/app/screens/nftDashboard/useNftDashboard.tsx
+++ b/src/app/screens/nftDashboard/useNftDashboard.tsx
@@ -24,20 +24,20 @@ import NftTabGridItem from './nftTabGridItem';
 const NoCollectiblesText = styled.h1((props) => ({
   ...props.theme.typography.body_bold_m,
   color: props.theme.colors.white_200,
-  marginTop: props.theme.spacing(16),
+  marginTop: props.theme.space.xl,
   marginBottom: 'auto',
   textAlign: 'center',
 }));
 
 const ErrorContainer = styled.div((props) => ({
-  marginTop: props.theme.spacing(20),
+  marginTop: props.theme.space.xxl,
   display: 'flex',
   flexDirection: 'column',
   alignItems: 'center',
 }));
 
 const ErrorTextContainer = styled.div((props) => ({
-  marginTop: props.theme.spacing(8),
+  marginTop: props.theme.space.m,
   display: 'flex',
   flexDirection: 'column',
   alignItems: 'center',
@@ -77,6 +77,7 @@ export type NftDashboardState = {
   stacksNftsQuery: ReturnType<typeof useStacksCollectibles>;
   inscriptionsQuery: ReturnType<typeof useAddressInscriptions>;
   hiddenInscriptionsQuery: ReturnType<typeof useAddressInscriptions>;
+  hiddenStacksNftsQuery: ReturnType<typeof useStacksCollectibles>;
   rareSatsQuery: ReturnType<typeof useAddressRareSats>;
   openInGalleryView: () => void;
   onReceiveModalOpen: () => void;
@@ -86,6 +87,7 @@ export type NftDashboardState = {
   InscriptionListView: () => JSX.Element;
   HiddenInscriptionListView: () => JSX.Element;
   NftListView: () => JSX.Element;
+  HiddenNftListView: () => JSX.Element;
   onActivateRareSatsAlertCrossPress: () => void;
   onActivateRareSatsAlertDenyPress: () => void;
   onActivateRareSatsAlertEnablePress: () => void;
@@ -95,6 +97,7 @@ export type NftDashboardState = {
   hasActivatedRareSatsKey?: boolean;
   showNoticeAlert?: boolean;
   totalNfts: number;
+  totalHiddenNfts: number;
   totalInscriptions: number;
   totalHiddenInscriptions: number;
 };
@@ -109,6 +112,7 @@ const useNftDashboard = (): NftDashboardState => {
   const [showNoticeAlert, setShowNoticeAlert] = useState(false);
   const [isOrdinalReceiveAlertVisible, setIsOrdinalReceiveAlertVisible] = useState(false);
   const stacksNftsQuery = useStacksCollectibles();
+  const hiddenStacksNftsQuery = useStacksCollectibles(true);
   const inscriptionsQuery = useAddressInscriptions();
   const hiddenInscriptionsQuery = useAddressInscriptions(true);
   const rareSatsQuery = useAddressRareSats();
@@ -117,6 +121,7 @@ const useNftDashboard = (): NftDashboardState => {
   const totalHiddenInscriptions = hiddenInscriptionsQuery.data?.pages?.[0]?.total_inscriptions ?? 0;
 
   const totalNfts = stacksNftsQuery.data?.total_nfts ?? 0;
+  const totalHiddenNfts = hiddenStacksNftsQuery.data?.total_nfts ?? 0;
 
   const isGalleryOpen: boolean = useMemo(() => document.documentElement.clientWidth > 360, []);
 
@@ -270,6 +275,37 @@ const useNftDashboard = (): NftDashboardState => {
     );
   }, [stacksNftsQuery, isGalleryOpen, totalNfts, t]);
 
+  const HiddenNftListView = useCallback(() => {
+    if (
+      hiddenStacksNftsQuery.error &&
+      !(hiddenStacksNftsQuery.error instanceof InvalidParamsError)
+    ) {
+      return (
+        <ErrorContainer>
+          <Wrench size={48} />
+          <ErrorTextContainer>
+            <ErrorText>{t('ERROR_RETRIEVING')}</ErrorText>
+            <ErrorText>{t('TRY_AGAIN')}</ErrorText>
+          </ErrorTextContainer>
+        </ErrorContainer>
+      );
+    }
+
+    if (totalHiddenNfts === 0) {
+      return <NoCollectiblesText>{t('NO_COLLECTIBLES')}</NoCollectiblesText>;
+    }
+
+    return (
+      <GridContainer $isGalleryOpen={isGalleryOpen}>
+        {hiddenStacksNftsQuery.data?.results.map((collection: StacksCollectionData) => (
+          <IsVisibleOrPlaceholder key={collection.collection_id}>
+            <NftTabGridItem item={collection} />
+          </IsVisibleOrPlaceholder>
+        ))}
+      </GridContainer>
+    );
+  }, [hiddenStacksNftsQuery, isGalleryOpen, totalHiddenNfts, t]);
+
   const onActivateRareSatsAlertCrossPress = () => {
     setShowNewFeatureAlert(false);
   };
@@ -296,6 +332,7 @@ const useNftDashboard = (): NftDashboardState => {
     showNewFeatureAlert,
     isOrdinalReceiveAlertVisible,
     stacksNftsQuery,
+    hiddenStacksNftsQuery,
     inscriptionsQuery,
     hiddenInscriptionsQuery,
     openInGalleryView,
@@ -306,6 +343,7 @@ const useNftDashboard = (): NftDashboardState => {
     InscriptionListView,
     HiddenInscriptionListView,
     NftListView,
+    HiddenNftListView,
     onActivateRareSatsAlertCrossPress,
     onActivateRareSatsAlertDenyPress,
     onActivateRareSatsAlertEnablePress,
@@ -316,6 +354,7 @@ const useNftDashboard = (): NftDashboardState => {
     showNoticeAlert,
     rareSatsQuery,
     totalNfts,
+    totalHiddenNfts,
     totalInscriptions,
     totalHiddenInscriptions,
   };
diff --git a/src/app/screens/nftDetail/index.styled.ts b/src/app/screens/nftDetail/index.styled.ts
index f9b546b94..49865ab83 100644
--- a/src/app/screens/nftDetail/index.styled.ts
+++ b/src/app/screens/nftDetail/index.styled.ts
@@ -1,22 +1,19 @@
-import { BetterBarLoader } from '@components/barLoader';
-import Separator from '@components/separator';
 import { Tooltip } from 'react-tooltip';
 import styled from 'styled-components';
 
+interface DetailSectionProps {
+  $isGallery: boolean;
+}
+
 export const ExtensionContainer = styled.div((props) => ({
   ...props.theme.scrollbar,
   display: 'flex',
   flexDirection: 'column',
-  marginTop: props.theme.spacing(4),
+  marginTop: props.theme.space.xs,
   alignItems: 'center',
   flex: 1,
-  paddingLeft: props.theme.spacing(4),
-  paddingRight: props.theme.spacing(4),
-}));
-
-export const GalleryReceiveButtonContainer = styled.div((props) => ({
-  marginRight: props.theme.spacing(6),
-  width: '100%',
+  paddingLeft: props.theme.space.xs,
+  paddingRight: props.theme.space.xs,
 }));
 
 export const BackButtonContainer = styled.div((props) => ({
@@ -32,8 +29,8 @@ export const ButtonContainer = styled.div((props) => ({
   justifyContent: 'center',
   columnGap: props.theme.spacing(11),
   paddingBottom: props.theme.spacing(16),
-  marginBottom: props.theme.spacing(4),
-  marginTop: props.theme.spacing(4),
+  marginBottom: props.theme.space.xs,
+  marginTop: props.theme.space.xs,
   width: '100%',
   borderBottom: `1px solid ${props.theme.colors.elevation3}`,
 }));
@@ -52,7 +49,7 @@ export const NftContainer = styled.div((props) => ({
   justifyContent: 'flex-start',
   alignItems: 'flex-start',
   borderRadius: 8,
-  marginBottom: props.theme.spacing(12),
+  marginBottom: props.theme.space.l,
 }));
 
 export const ExtensionNftContainer = styled.div((props) => ({
@@ -63,13 +60,14 @@ export const ExtensionNftContainer = styled.div((props) => ({
   justifyContent: 'center',
   alignItems: 'center',
   borderRadius: 8,
-  marginBottom: props.theme.spacing(12),
+  marginBottom: props.theme.space.l,
 }));
 
 export const NftTitleText = styled.h1((props) => ({
   ...props.theme.typography.headline_m,
   color: props.theme.colors.white_0,
   textAlign: 'center',
+  wordBreak: 'break-word',
 }));
 
 export const CollectibleText = styled.p((props) => ({
@@ -81,7 +79,7 @@ export const CollectibleText = styled.p((props) => ({
 export const NftGalleryTitleText = styled.h1((props) => ({
   ...props.theme.typography.headline_l,
   color: props.theme.colors.white_0,
-  marginBottom: props.theme.spacing(4),
+  marginBottom: props.theme.space.xs,
 }));
 
 export const NftOwnedByText = styled.p((props) => ({
@@ -109,20 +107,15 @@ export const GridContainer = styled.div((props) => ({
   display: 'grid',
   width: '100%',
   marginTop: props.theme.spacing(6),
-  columnGap: props.theme.spacing(4),
-  rowGap: props.theme.spacing(4),
+  columnGap: props.theme.space.xs,
+  rowGap: props.theme.space.xs,
   gridTemplateColumns: 'repeat(auto-fit,minmax(150px,1fr))',
-  marginBottom: props.theme.spacing(8),
-}));
-
-export const ShareButtonContainer = styled.div((props) => ({
-  marginRight: props.theme.spacing(6),
-  width: '100%',
+  marginBottom: props.theme.space.m,
 }));
 
 export const DescriptionContainer = styled.div((props) => ({
   display: 'flex',
-  marginLeft: props.theme.spacing(20),
+  marginLeft: props.theme.space.xxl,
   flexDirection: 'column',
   marginBottom: props.theme.spacing(30),
 }));
@@ -140,8 +133,8 @@ export const WebGalleryButton = styled.button((props) => ({
   borderRadius: props.theme.radius(1),
   backgroundColor: 'transparent',
   width: '100%',
-  marginTop: props.theme.spacing(4),
-  marginBottom: props.theme.spacing(12),
+  marginTop: props.theme.space.xs,
+  marginBottom: props.theme.space.l,
 }));
 
 export const WebGalleryButtonText = styled.div((props) => ({
@@ -162,20 +155,12 @@ export const BackButton = styled.button((props) => ({
   justifyContent: 'flex-start',
   alignItems: 'center',
   background: 'transparent',
-  marginBottom: props.theme.spacing(12),
+  marginBottom: props.theme.space.l,
 }));
 
-export const ExtensionLoaderContainer = styled.div({
-  height: '100%',
-  display: 'flex',
-  flexDirection: 'column',
-  justifyContent: 'space-around',
-  alignItems: 'center',
-});
-
 export const SeeDetailsButtonContainer = styled.div((props) => ({
   marginBottom: props.theme.spacing(27),
-  marginTop: props.theme.spacing(4),
+  marginTop: props.theme.space.xs,
 }));
 
 export const Button = styled.button<DetailSectionProps>((props) => ({
@@ -184,7 +169,7 @@ export const Button = styled.button<DetailSectionProps>((props) => ({
   justifyContent: 'center',
   alignItems: 'center',
   backgroundColor: 'transparent',
-  width: props.isGallery ? 400 : 328,
+  width: props.$isGallery ? 400 : 328,
   height: 44,
   padding: 12,
   borderRadius: 12,
@@ -220,19 +205,19 @@ export const GalleryScrollContainer = styled.div((props) => ({
 export const ButtonHiglightedText = styled.p((props) => ({
   ...props.theme.typography.body_m,
   color: props.theme.colors.white_0,
-  marginLeft: props.theme.spacing(2),
-  marginRight: props.theme.spacing(2),
+  marginLeft: props.theme.space.xxs,
+  marginRight: props.theme.space.xxs,
 }));
 
 export const GalleryRowContainer = styled.div<{
-  withGap?: boolean;
+  $withGap?: boolean;
 }>((props) => ({
   display: 'flex',
   alignItems: 'flex-start',
-  marginTop: props.theme.spacing(8),
-  marginBottom: props.theme.spacing(12),
+  marginTop: props.theme.space.m,
+  marginBottom: props.theme.space.l,
   flexDirection: 'row',
-  columnGap: props.withGap ? props.theme.spacing(20) : 0,
+  columnGap: props.$withGap ? props.theme.space.m : 0,
 }));
 
 export const StyledTooltip = styled(Tooltip)`
@@ -245,14 +230,6 @@ export const StyledTooltip = styled(Tooltip)`
   }
 `;
 
-export const StyledBarLoader = styled(BetterBarLoader)<{
-  withMarginBottom?: boolean;
-}>((props) => ({
-  padding: 0,
-  borderRadius: props.theme.radius(1),
-  marginBottom: props.withMarginBottom ? props.theme.spacing(6) : 0,
-}));
-
 export const GalleryContainer = styled.div({
   marginLeft: 'auto',
   marginRight: 'auto',
@@ -264,57 +241,20 @@ export const GalleryContainer = styled.div({
   maxWidth: 1224,
 });
 
-export const ActionButtonLoader = styled.div((props) => ({
-  display: 'flex',
-  flexDirection: 'column',
-  alignItems: 'center',
-  rowGap: props.theme.spacing(4),
-}));
-
-export const ActionButtonsLoader = styled.div((props) => ({
-  display: 'flex',
-  justifyContent: 'center',
-  columnGap: props.theme.spacing(11),
-}));
-
-export const GalleryLoaderContainer = styled.div({
-  display: 'flex',
-  flexDirection: 'column',
-});
-
-export const StyledSeparator = styled(Separator)`
-  width: 100%;
-`;
-
-export const TitleLoader = styled.div`
-  display: flex;
-  flex-direction: column;
-`;
-interface DetailSectionProps {
-  isGallery: boolean;
-}
-
 export const NftDetailsContainer = styled.div<DetailSectionProps>((props) => ({
   display: 'flex',
   alignItems: 'flex-start',
   flexDirection: 'column',
   wordBreak: 'break-all',
   whiteSpace: 'pre-wrap',
-  width: props.isGallery ? 400 : '100%',
-  marginTop: props.theme.spacing(8),
+  width: props.$isGallery ? 400 : '100%',
+  marginTop: props.theme.space.m,
 }));
 
 export const DetailSection = styled.div<DetailSectionProps>((props) => ({
   display: 'flex',
-  flexDirection: !props.isGallery ? 'row' : 'column',
+  flexDirection: !props.$isGallery ? 'row' : 'column',
   justifyContent: 'center',
   width: '100%',
-  columnGap: props.theme.spacing(8),
-}));
-
-export const InfoContainer = styled.div((props) => ({
-  width: '100%',
-  display: 'flex',
-  justifyContent: 'space-between',
-  padding: `0 ${props.theme.spacing(8)}px`,
+  columnGap: props.theme.space.m,
 }));
diff --git a/src/app/screens/nftDetail/index.tsx b/src/app/screens/nftDetail/index.tsx
index b9398fb79..9b19f7d60 100644
--- a/src/app/screens/nftDetail/index.tsx
+++ b/src/app/screens/nftDetail/index.tsx
@@ -12,6 +12,7 @@ import {
   ArrowUp,
   DotsThreeVertical,
   Share,
+  Star,
   UserCircleCheck,
   UserCircleMinus,
 } from '@phosphor-icons/react';
@@ -19,21 +20,25 @@ import NftImage from '@screens/nftDashboard/nftImage';
 import { StyledButton } from '@screens/ordinalsCollection/index.styled';
 import type { Attribute } from '@secretkeylabs/xverse-core';
 import {
+  addToStarCollectiblesAction,
   removeAccountAvatarAction,
+  removeFromStarCollectiblesAction,
   setAccountAvatarAction,
 } from '@stores/wallet/actions/actionCreators';
 import ActionButton from '@ui-library/button';
 import Sheet from '@ui-library/sheet';
 import SnackBar from '@ui-library/snackBar';
-import { EMPTY_LABEL } from '@utils/constants';
+import { EMPTY_LABEL, LONG_TOAST_DURATION } from '@utils/constants';
 import { useCallback } from 'react';
 import toast from 'react-hot-toast';
 import { useTranslation } from 'react-i18next';
 import { useDispatch } from 'react-redux';
 import Theme from '../../../theme';
+import { ExtensionLoader, GalleryLoader } from './loaders';
+import NftAttribute from './nftAttribute';
+import useNftDetailScreen from './useNftDetail';
+
 import {
-  ActionButtonLoader,
-  ActionButtonsLoader,
   AssetDeatilButtonText,
   AttributeText,
   BackButton,
@@ -49,16 +54,12 @@ import {
   DescriptionContainer,
   DetailSection,
   ExtensionContainer,
-  ExtensionLoaderContainer,
   ExtensionNftContainer,
   GalleryCollectibleText,
   GalleryContainer,
-  GalleryLoaderContainer,
-  GalleryReceiveButtonContainer,
   GalleryRowContainer,
   GalleryScrollContainer,
   GridContainer,
-  InfoContainer,
   NftContainer,
   NftDetailsContainer,
   NftGalleryTitleText,
@@ -67,16 +68,10 @@ import {
   OwnerAddressText,
   RowContainer,
   SeeDetailsButtonContainer,
-  ShareButtonContainer,
-  StyledBarLoader,
-  StyledSeparator,
   StyledTooltip,
-  TitleLoader,
   WebGalleryButton,
   WebGalleryButtonText,
 } from './index.styled';
-import NftAttribute from './nftAttribute';
-import useNftDetailScreen from './useNftDetail';
 
 function NftDetailScreen() {
   const dispatch = useDispatch();
@@ -100,7 +95,7 @@ function NftDetailScreen() {
     galleryTitle,
   } = useNftDetailScreen();
   const { ordinalsAddress } = useSelectedAccount();
-  const { avatarIds } = useWalletSelector();
+  const { avatarIds, hiddenCollectibleIds, starredCollectibleIds } = useWalletSelector();
   const selectedAvatar = avatarIds[ordinalsAddress];
   const isNftSelectedAsAvatar =
     selectedAvatar?.type === 'stacks' && selectedAvatar.nft.token_id === nftData?.token_id;
@@ -146,6 +141,53 @@ function NftDetailScreen() {
     optionsSheet.close();
   }, [dispatch, optionsDialogT, ordinalsAddress, optionsSheet]);
 
+  const isNftCollectionHidden = Object.keys(hiddenCollectibleIds[stxAddress] ?? {}).some(
+    (id) => id === collection?.collection_id,
+  );
+  const nftId = nftData?.fully_qualified_token_id ?? '';
+  const nftStarred = starredCollectibleIds[stxAddress]?.some(({ id }) => id === nftId);
+
+  const handleClickUndoStarring = (toastId: string) => {
+    dispatch(
+      removeFromStarCollectiblesAction({
+        address: stxAddress,
+        id: nftId,
+      }),
+    );
+    toast.remove(toastId);
+    toast.custom(<SnackBar text={t('UNSTAR_INSCRIPTION')} type="neutral" />);
+  };
+
+  const handleStarClick = () => {
+    if (nftStarred) {
+      dispatch(
+        removeFromStarCollectiblesAction({
+          address: stxAddress,
+          id: nftId,
+        }),
+      );
+      toast.custom(<SnackBar text={t('UNSTAR_INSCRIPTION')} type="neutral" />);
+    } else {
+      dispatch(
+        addToStarCollectiblesAction({
+          address: stxAddress,
+          id: nftId,
+        }),
+      );
+      const toastId = toast.custom(
+        <SnackBar
+          text={t('STAR_INSCRIPTION')}
+          type="neutral"
+          action={{
+            text: commonT('UNDO'),
+            onClick: () => handleClickUndoStarring(toastId),
+          }}
+        />,
+        { duration: LONG_TOAST_DURATION },
+      );
+    }
+  };
+
   const nftAttributes = nftData?.nft_token_attributes?.length !== 0 && (
     <>
       <AttributeText>{t('ATTRIBUTES')}</AttributeText>
@@ -161,9 +203,9 @@ function NftDetailScreen() {
     </>
   );
   const nftDetails = (
-    <NftDetailsContainer isGallery={isGalleryOpen}>
+    <NftDetailsContainer $isGallery={isGalleryOpen}>
       {collection?.collection_name && (
-        <DetailSection isGallery={isGalleryOpen}>
+        <DetailSection $isGallery={isGalleryOpen}>
           <CollectibleDetailTile title={t('COLLECTION')} value={collection?.collection_name} />
           <CollectibleDetailTile
             title={t('COLLECTION_FLOOR_PRICE')}
@@ -174,7 +216,7 @@ function NftDetailScreen() {
         </DetailSection>
       )}
       {!isGalleryOpen && nftAttributes}
-      <DetailSection isGallery={isGalleryOpen}>
+      <DetailSection $isGallery={isGalleryOpen}>
         <CollectibleDetailTile title={t('NAME')} value={nftData?.token_metadata?.name!} />
         {nftData?.rarity_score && (
           <CollectibleDetailTile title={t('RARITY')} value={nftData?.rarity_score} />
@@ -188,35 +230,7 @@ function NftDetailScreen() {
   );
 
   const extensionView = isLoading ? (
-    <ExtensionLoaderContainer>
-      <TitleLoader>
-        <StyledBarLoader width={100} height={18.5} withMarginBottom />
-        <StyledBarLoader width={100} height={30} />
-      </TitleLoader>
-      <StyledBarLoader width={100} height={18.5} />
-      <StyledBarLoader width={136} height={136} />
-      <ActionButtonsLoader>
-        <ActionButtonLoader>
-          <StyledBarLoader width={48} height={48} />
-          <StyledBarLoader width={30} height={15.5} />
-        </ActionButtonLoader>
-        <ActionButtonLoader>
-          <StyledBarLoader width={48} height={48} />
-          <StyledBarLoader width={30} height={15.5} />
-        </ActionButtonLoader>
-      </ActionButtonsLoader>
-      <StyledSeparator />
-      <InfoContainer>
-        <div>
-          <StyledBarLoader width={100} height={18.5} />
-          <StyledBarLoader width={80} height={18.5} />
-        </div>
-        <div>
-          <StyledBarLoader width={100} height={18.5} />
-          <StyledBarLoader width={80} height={18.5} />
-        </div>
-      </InfoContainer>
-    </ExtensionLoaderContainer>
+    <ExtensionLoader />
   ) : (
     <ExtensionContainer>
       <CollectibleText>{t('COLLECTIBLE')}</CollectibleText>
@@ -253,11 +267,11 @@ function NftDetailScreen() {
       </ButtonContainer>
       {nftDetails}
       <SeeDetailsButtonContainer>
-        <Button isGallery={isGalleryOpen} onClick={onExplorerPress}>
+        <Button $isGallery={isGalleryOpen} onClick={onExplorerPress}>
           <ButtonText>{t('VIEW_CONTRACT')}</ButtonText>
           <ButtonHiglightedText>{t('STACKS_EXPLORER')}</ButtonHiglightedText>
         </Button>
-        <Button isGallery={isGalleryOpen} onClick={onGammaPress}>
+        <Button $isGallery={isGalleryOpen} onClick={onGammaPress}>
           <ButtonText>{t('DETAILS')}</ButtonText>
           <ButtonHiglightedText>{t('GAMMA')}</ButtonHiglightedText>
         </Button>
@@ -272,31 +286,12 @@ function NftDetailScreen() {
           <BackButton data-testid="back-button" onClick={handleBackButtonClick}>
             <>
               <ArrowLeft weight="regular" size="20" color="white" />
-              <AssetDeatilButtonText>{t('MOVE_TO_ASSET_DETAIL')}</AssetDeatilButtonText>
+              <AssetDeatilButtonText>{t('BACK_TO_COLLECTION')}</AssetDeatilButtonText>
             </>
           </BackButton>
         </BackButtonContainer>
 
-        <GalleryRowContainer withGap>
-          <StyledBarLoader width={376.5} height={376.5} />
-          <GalleryLoaderContainer>
-            <StyledBarLoader width={120} height={21} withMarginBottom />
-            <StyledBarLoader width={180} height={40} withMarginBottom />
-            <StyledBarLoader width={100} height={18.5} withMarginBottom />
-            <ButtonContainer>
-              <StyledBarLoader width={190} height={44} />
-              <StyledBarLoader width={190} height={44} />
-            </ButtonContainer>
-            <StyledBarLoader width={100} height={31} withMarginBottom />
-            <StyledBarLoader width={400} height={18.5} withMarginBottom />
-            <StyledBarLoader width={400} height={18.5} withMarginBottom />
-            <StyledBarLoader width={400} height={18.5} withMarginBottom />
-            <StyledBarLoader width={400} height={18.5} withMarginBottom />
-            <StyledBarLoader width={400} height={18.5} withMarginBottom />
-            <StyledBarLoader width={400} height={18.5} withMarginBottom />
-            <StyledBarLoader width={392} height={44} />
-          </GalleryLoaderContainer>
-        </GalleryRowContainer>
+        <GalleryLoader />
       </GalleryContainer>
     </GalleryScrollContainer>
   ) : (
@@ -305,7 +300,7 @@ function NftDetailScreen() {
         <BackButtonContainer>
           <BackButton data-testid="back-button" onClick={handleBackButtonClick}>
             <ArrowLeft weight="regular" size="20" color="white" />
-            <AssetDeatilButtonText>{t('MOVE_TO_ASSET_DETAIL')}</AssetDeatilButtonText>
+            <AssetDeatilButtonText>{t('BACK_TO_COLLECTION')}</AssetDeatilButtonText>
           </BackButton>
         </BackButtonContainer>
         <GalleryRowContainer>
@@ -325,44 +320,59 @@ function NftDetailScreen() {
                 )}`}
               </OwnerAddressText>
             </RowContainer>
-            <GalleryRowContainer>
-              <GalleryReceiveButtonContainer>
-                <ActionButton
-                  icon={<ArrowUp weight="bold" size="16" />}
-                  title={t('SEND')}
-                  onClick={handleOnSendClick}
-                />
-              </GalleryReceiveButtonContainer>
-              <ShareButtonContainer>
-                <ActionButton
-                  id={`copy-nft-url-${nftData?.asset_id}`}
-                  icon={<Share weight="bold" color="white" size="16" />}
-                  title={t('SHARE')}
-                  onClick={onSharePress}
-                  variant="secondary"
-                />
-                <StyledTooltip
-                  anchorId={`copy-nft-url-${nftData?.asset_id}`}
-                  variant="light"
-                  content={t('COPIED')}
-                  events={['click']}
-                  place="top"
-                />
-              </ShareButtonContainer>
-              <SquareButton
-                icon={<DotsThreeVertical size={20} color={Theme.colors.white_0} weight="bold" />}
-                onPress={optionsSheet.open}
-                isTransparent
-                size={44}
-                radiusSize={12}
+            <GalleryRowContainer $withGap>
+              <ActionButton
+                icon={<ArrowUp weight="bold" size="16" />}
+                title={t('SEND')}
+                onClick={handleOnSendClick}
               />
+              <ActionButton
+                id={`copy-nft-url-${nftData?.asset_id}`}
+                icon={<Share weight="bold" color="white" size="16" />}
+                title={t('SHARE')}
+                onClick={onSharePress}
+                variant="secondary"
+              />
+              <StyledTooltip
+                anchorId={`copy-nft-url-${nftData?.asset_id}`}
+                variant="light"
+                content={t('COPIED')}
+                events={['click']}
+                place="top"
+              />
+              {isNftCollectionHidden ? null : (
+                <>
+                  <SquareButton
+                    icon={
+                      nftStarred ? (
+                        <Star size={16} color={Theme.colors.tangerine} weight="fill" />
+                      ) : (
+                        <Star size={16} color={Theme.colors.white_0} weight="bold" />
+                      )
+                    }
+                    onPress={handleStarClick}
+                    isTransparent
+                    size={44}
+                    radiusSize={12}
+                  />
+                  <SquareButton
+                    icon={
+                      <DotsThreeVertical size={20} color={Theme.colors.white_0} weight="bold" />
+                    }
+                    onPress={optionsSheet.open}
+                    isTransparent
+                    size={44}
+                    radiusSize={12}
+                  />
+                </>
+              )}
             </GalleryRowContainer>
             {nftDetails}
-            <Button isGallery={isGalleryOpen} onClick={onExplorerPress}>
+            <Button $isGallery={isGalleryOpen} onClick={onExplorerPress}>
               <ButtonText>{t('VIEW_CONTRACT')}</ButtonText>
               <ButtonHiglightedText>{t('STACKS_EXPLORER')}</ButtonHiglightedText>
             </Button>
-            <Button isGallery={isGalleryOpen} onClick={onGammaPress}>
+            <Button $isGallery={isGalleryOpen} onClick={onGammaPress}>
               <ButtonText>{t('DETAILS')}</ButtonText>
               <ButtonHiglightedText>{t('GAMMA')}</ButtonHiglightedText>
             </Button>
@@ -377,7 +387,12 @@ function NftDetailScreen() {
       {isGalleryOpen ? (
         <AccountHeaderComponent disableMenuOption={isGalleryOpen} disableAccountSwitch />
       ) : (
-        <TopRow onClick={handleBackButtonClick} onMenuClick={optionsSheet.open} />
+        <TopRow
+          onClick={handleBackButtonClick}
+          onStarClick={isNftCollectionHidden ? undefined : handleStarClick}
+          isStarred={nftStarred}
+          onMenuClick={isNftCollectionHidden ? undefined : optionsSheet.open}
+        />
       )}
       {isGalleryOpen ? galleryView : extensionView}
       {!isGalleryOpen && (
diff --git a/src/app/screens/nftDetail/loaders.tsx b/src/app/screens/nftDetail/loaders.tsx
new file mode 100644
index 000000000..f816cfd89
--- /dev/null
+++ b/src/app/screens/nftDetail/loaders.tsx
@@ -0,0 +1,113 @@
+import { BetterBarLoader } from '@components/barLoader';
+import Separator from '@components/separator';
+import styled from 'styled-components';
+import { ButtonContainer, GalleryRowContainer } from './index.styled';
+
+const ActionButtonLoader = styled.div((props) => ({
+  display: 'flex',
+  flexDirection: 'column',
+  alignItems: 'center',
+  rowGap: props.theme.space.xs,
+}));
+
+const ActionButtonsLoader = styled.div((props) => ({
+  display: 'flex',
+  justifyContent: 'center',
+  columnGap: props.theme.spacing(11),
+}));
+
+const ExtensionLoaderContainer = styled.div({
+  height: '100%',
+  display: 'flex',
+  flexDirection: 'column',
+  justifyContent: 'space-around',
+  alignItems: 'center',
+});
+
+const GalleryLoaderContainer = styled.div({
+  display: 'flex',
+  flexDirection: 'column',
+});
+
+const InfoContainer = styled.div((props) => ({
+  width: '100%',
+  display: 'flex',
+  justifyContent: 'space-between',
+  padding: `0 ${props.theme.space.m}`,
+}));
+
+const StyledBarLoader = styled(BetterBarLoader)<{
+  withMarginBottom?: boolean;
+}>((props) => ({
+  padding: 0,
+  borderRadius: props.theme.radius(1),
+  marginBottom: props.withMarginBottom ? props.theme.space.s : 0,
+}));
+
+const StyledSeparator = styled(Separator)`
+  width: 100%;
+`;
+
+const TitleLoader = styled.div`
+  display: flex;
+  flex-direction: column;
+`;
+
+export function GalleryLoader() {
+  return (
+    <GalleryRowContainer $withGap>
+      <StyledBarLoader width={376.5} height={376.5} />
+      <GalleryLoaderContainer>
+        <StyledBarLoader width={120} height={21} withMarginBottom />
+        <StyledBarLoader width={180} height={40} withMarginBottom />
+        <StyledBarLoader width={100} height={18.5} withMarginBottom />
+        <ButtonContainer>
+          <StyledBarLoader width={190} height={44} />
+          <StyledBarLoader width={190} height={44} />
+        </ButtonContainer>
+        <StyledBarLoader width={100} height={31} withMarginBottom />
+        <StyledBarLoader width={400} height={18.5} withMarginBottom />
+        <StyledBarLoader width={400} height={18.5} withMarginBottom />
+        <StyledBarLoader width={400} height={18.5} withMarginBottom />
+        <StyledBarLoader width={400} height={18.5} withMarginBottom />
+        <StyledBarLoader width={400} height={18.5} withMarginBottom />
+        <StyledBarLoader width={400} height={18.5} withMarginBottom />
+        <StyledBarLoader width={392} height={44} />
+      </GalleryLoaderContainer>
+    </GalleryRowContainer>
+  );
+}
+
+export function ExtensionLoader() {
+  return (
+    <ExtensionLoaderContainer>
+      <TitleLoader>
+        <StyledBarLoader width={100} height={18.5} withMarginBottom />
+        <StyledBarLoader width={100} height={30} />
+      </TitleLoader>
+      <StyledBarLoader width={100} height={18.5} />
+      <StyledBarLoader width={136} height={136} />
+      <ActionButtonsLoader>
+        <ActionButtonLoader>
+          <StyledBarLoader width={48} height={48} />
+          <StyledBarLoader width={30} height={15.5} />
+        </ActionButtonLoader>
+        <ActionButtonLoader>
+          <StyledBarLoader width={48} height={48} />
+          <StyledBarLoader width={30} height={15.5} />
+        </ActionButtonLoader>
+      </ActionButtonsLoader>
+      <StyledSeparator />
+      <InfoContainer>
+        <div>
+          <StyledBarLoader width={100} height={18.5} />
+          <StyledBarLoader width={80} height={18.5} />
+        </div>
+        <div>
+          <StyledBarLoader width={100} height={18.5} />
+          <StyledBarLoader width={80} height={18.5} />
+        </div>
+      </InfoContainer>
+    </ExtensionLoaderContainer>
+  );
+}
diff --git a/src/app/screens/nftDetail/useNftDetail.ts b/src/app/screens/nftDetail/useNftDetail.ts
index d8817b04f..c211ad327 100644
--- a/src/app/screens/nftDetail/useNftDetail.ts
+++ b/src/app/screens/nftDetail/useNftDetail.ts
@@ -2,6 +2,7 @@ import useNftDetail from '@hooks/queries/useNftDetail';
 import useStacksCollectibles from '@hooks/queries/useStacksCollectibles';
 import { useResetUserFlow } from '@hooks/useResetUserFlow';
 import useSelectedAccount from '@hooks/useSelectedAccount';
+import useWalletSelector from '@hooks/useWalletSelector';
 import { GAMMA_URL } from '@utils/constants';
 import { getExplorerUrl, isInOptions, isLedgerAccount } from '@utils/helper';
 import { useMemo } from 'react';
@@ -11,10 +12,13 @@ export default function useNftDetailScreen() {
   const navigate = useNavigate();
   const selectedAccount = useSelectedAccount();
   const { id } = useParams();
-
+  const { hiddenCollectibleIds } = useWalletSelector();
   const nftDetailQuery = useNftDetail(id!);
-  const nftCollectionsQuery = useStacksCollectibles();
   const collectionId = nftDetailQuery.data?.data.collection_contract_id;
+  const collectionHidden = Object.keys(hiddenCollectibleIds[selectedAccount.stxAddress] ?? {}).some(
+    (itemId) => itemId === collectionId,
+  );
+  const nftCollectionsQuery = useStacksCollectibles(collectionHidden);
   const collection = nftCollectionsQuery.data?.results.find(
     (c) => c.collection_id === collectionId,
   );
@@ -32,7 +36,7 @@ export default function useNftDetailScreen() {
   };
 
   const handleBackButtonClick = () => {
-    navigate(`/nft-dashboard/nft-collection/${collectionId}`);
+    navigate(`/nft-dashboard/nft-collection/${collectionId}${collectionHidden ? '/hidden' : ''}`);
   };
 
   const onGammaPress = () => {
diff --git a/src/app/screens/ordinalDetail/index.styled.ts b/src/app/screens/ordinalDetail/index.styled.ts
index e691812eb..fea6707a7 100644
--- a/src/app/screens/ordinalDetail/index.styled.ts
+++ b/src/app/screens/ordinalDetail/index.styled.ts
@@ -227,54 +227,12 @@ export const DetailSection = styled.div<DetailSectionProps>((props) => ({
   width: '100%',
 }));
 
-export const ExtensionLoaderContainer = styled.div({
-  height: '100%',
-  display: 'flex',
-  flexDirection: 'column',
-  justifyContent: 'space-around',
-  alignItems: 'center',
-});
-
-export const GalleryLoaderContainer = styled.div({
-  display: 'flex',
-  flexDirection: 'column',
-});
-
 export const StyledBarLoader = styled(BetterBarLoader)<{
   withMarginBottom?: boolean;
 }>((props) => ({
   padding: 0,
   borderRadius: props.theme.radius(1),
-  marginBottom: props.withMarginBottom ? props.theme.spacing(6) : 0,
-}));
-
-export const StyledSeparator = styled(Separator)`
-  width: 100%;
-`;
-
-export const TitleLoader = styled.div`
-  display: flex;
-  flex-direction: column;
-`;
-
-export const ActionButtonsLoader = styled.div((props) => ({
-  display: 'flex',
-  justifyContent: 'center',
-  columnGap: props.theme.spacing(11),
-}));
-
-export const ActionButtonLoader = styled.div((props) => ({
-  display: 'flex',
-  flexDirection: 'column',
-  alignItems: 'center',
-  rowGap: props.theme.space.xs,
-}));
-
-export const InfoContainer = styled.div((props) => ({
-  width: '100%',
-  display: 'flex',
-  justifyContent: 'space-between',
-  padding: `0 ${props.theme.space.m}`,
+  marginBottom: props.withMarginBottom ? props.theme.space.s : 0,
 }));
 
 export const RareSatsBundleCallout = styled(Callout)<DetailSectionProps>((props) => ({
diff --git a/src/app/screens/ordinalDetail/index.tsx b/src/app/screens/ordinalDetail/index.tsx
index 9491bfd05..8780cb8bc 100644
--- a/src/app/screens/ordinalDetail/index.tsx
+++ b/src/app/screens/ordinalDetail/index.tsx
@@ -11,12 +11,11 @@ import { useResetUserFlow } from '@hooks/useResetUserFlow';
 import useSelectedAccount from '@hooks/useSelectedAccount';
 import useWalletSelector from '@hooks/useWalletSelector';
 import {
+  ArchiveTray,
   ArrowUp,
   DotsThreeVertical,
   Share,
   Star,
-  TrayArrowDown,
-  TrayArrowUp,
   UserCircleCheck,
   UserCircleMinus,
 } from '@phosphor-icons/react';
@@ -34,7 +33,7 @@ import Button from '@ui-library/button';
 import { StyledP } from '@ui-library/common.styled';
 import Sheet from '@ui-library/sheet';
 import SnackBar from '@ui-library/snackBar';
-import { EMPTY_LABEL } from '@utils/constants';
+import { EMPTY_LABEL, LONG_TOAST_DURATION } from '@utils/constants';
 import { getRareSatsColorsByRareSatsType, getRareSatsLabelByType } from '@utils/rareSats';
 import { useCallback } from 'react';
 import toast from 'react-hot-toast';
@@ -43,8 +42,6 @@ import { useDispatch } from 'react-redux';
 import { useNavigate } from 'react-router-dom';
 import Theme from '../../../theme';
 import {
-  ActionButtonLoader,
-  ActionButtonsLoader,
   BackButtonContainer,
   Badge,
   BottomBarContainer,
@@ -59,14 +56,11 @@ import {
   DetailSection,
   Divider,
   ExtensionContainer,
-  ExtensionLoaderContainer,
   ExtensionOrdinalsContainer,
   GalleryButtonContainer,
   GalleryCollectibleText,
   GalleryContainer,
-  GalleryLoaderContainer,
   GalleryScrollContainer,
-  InfoContainer,
   OrdinalDetailsContainer,
   OrdinalGalleryTitleText,
   OrdinalsContainer,
@@ -80,12 +74,11 @@ import {
   SatributesBadges,
   SatributesIconsContainer,
   StyledBarLoader,
-  StyledSeparator,
   StyledTooltip,
   StyledWebGalleryButton,
-  TitleLoader,
   ViewInExplorerButton,
 } from './index.styled';
+import { ExtensionLoader, GalleryLoader } from './loaders';
 import OrdinalAttributeComponent from './ordinalAttributeComponent';
 import useOrdinalDetail from './useOrdinalDetail';
 
@@ -139,25 +132,29 @@ function OrdinalDetailScreen() {
 
   useResetUserFlow('/ordinal-detail');
 
+  const handleUnstarClick = (toastId: string) => {
+    dispatch(removeFromStarCollectiblesAction({ address: ordinalsAddress, id: ordinal?.id ?? '' }));
+    toast.remove(toastId);
+    toast.custom(<SnackBar text={t('UNSTAR_INSCRIPTION')} type="neutral" />);
+  };
+
   const handleStarClick = () => {
     if (inscriptionStarred) {
-      const toastId = toast.custom(
-        <SnackBar
-          text={t('UNSTAR_INSCRIPTION')}
-          type="neutral"
-          dismissToast={() => toast.remove(toastId)}
-        />,
-      );
       dispatch(
         removeFromStarCollectiblesAction({ address: ordinalsAddress, id: ordinal?.id ?? '' }),
       );
+      toast.custom(<SnackBar text={t('UNSTAR_INSCRIPTION')} type="neutral" />);
     } else {
       const toastId = toast.custom(
         <SnackBar
           text={t('STAR_INSCRIPTION')}
           type="neutral"
-          dismissToast={() => toast.remove(toastId)}
+          action={{
+            text: commonT('UNDO'),
+            onClick: () => handleUnstarClick(toastId),
+          }}
         />,
+        { duration: LONG_TOAST_DURATION },
       );
       dispatch(
         addToStarCollectiblesAction({
@@ -193,7 +190,7 @@ function OrdinalDetailScreen() {
           onClick: () => handleClickUndoHiding(toastId),
         }}
       />,
-      { duration: 4000 },
+      { duration: LONG_TOAST_DURATION },
     );
   };
 
@@ -447,35 +444,7 @@ function OrdinalDetailScreen() {
   );
 
   const extensionView = isLoading ? (
-    <ExtensionLoaderContainer>
-      <TitleLoader>
-        <StyledBarLoader width={100} height={18.5} withMarginBottom />
-        <StyledBarLoader width={100} height={30} />
-      </TitleLoader>
-      <StyledBarLoader width={100} height={18.5} />
-      <StyledBarLoader width={136} height={136} />
-      <ActionButtonsLoader>
-        <ActionButtonLoader>
-          <StyledBarLoader width={48} height={48} />
-          <StyledBarLoader width={30} height={15.5} />
-        </ActionButtonLoader>
-        <ActionButtonLoader>
-          <StyledBarLoader width={48} height={48} />
-          <StyledBarLoader width={30} height={15.5} />
-        </ActionButtonLoader>
-      </ActionButtonsLoader>
-      <StyledSeparator />
-      <InfoContainer>
-        <div>
-          <StyledBarLoader width={100} height={18.5} />
-          <StyledBarLoader width={80} height={18.5} />
-        </div>
-        <div>
-          <StyledBarLoader width={100} height={18.5} />
-          <StyledBarLoader width={80} height={18.5} />
-        </div>
-      </InfoContainer>
-    </ExtensionLoaderContainer>
+    <ExtensionLoader />
   ) : (
     <ExtensionContainer>
       <CollectibleText>
@@ -534,23 +503,7 @@ function OrdinalDetailScreen() {
 
         <RowContainer withGap>
           <StyledBarLoader width={376.5} height={376.5} />
-          <GalleryLoaderContainer>
-            <StyledBarLoader width={120} height={21} withMarginBottom />
-            <StyledBarLoader width={180} height={40} withMarginBottom />
-            <StyledBarLoader width={100} height={18.5} withMarginBottom />
-            <ButtonContainer>
-              <StyledBarLoader width={190} height={44} />
-              <StyledBarLoader width={190} height={44} />
-            </ButtonContainer>
-            <StyledBarLoader width={100} height={31} withMarginBottom />
-            <StyledBarLoader width={400} height={18.5} withMarginBottom />
-            <StyledBarLoader width={400} height={18.5} withMarginBottom />
-            <StyledBarLoader width={400} height={18.5} withMarginBottom />
-            <StyledBarLoader width={400} height={18.5} withMarginBottom />
-            <StyledBarLoader width={400} height={18.5} withMarginBottom />
-            <StyledBarLoader width={400} height={18.5} withMarginBottom />
-            <StyledBarLoader width={392} height={44} />
-          </GalleryLoaderContainer>
+          <GalleryLoader />
         </RowContainer>
       </GalleryContainer>
     </GalleryScrollContainer>
@@ -712,14 +665,14 @@ function OrdinalDetailScreen() {
             (isInscriptionHidden ? (
               <StyledButton
                 variant="tertiary"
-                icon={<TrayArrowUp size={24} color={Theme.colors.white_200} />}
+                icon={<ArchiveTray size={24} color={Theme.colors.white_200} />}
                 title={t('UNHIDE_INSCRIPTION')}
                 onClick={handleUnHideStandaloneInscription}
               />
             ) : (
               <StyledButton
                 variant="tertiary"
-                icon={<TrayArrowDown size={24} color={Theme.colors.white_200} />}
+                icon={<ArchiveTray size={24} color={Theme.colors.white_200} />}
                 title={t('HIDE_INSCRIPTION')}
                 onClick={handleHideStandaloneInscription}
               />
diff --git a/src/app/screens/ordinalDetail/loaders.tsx b/src/app/screens/ordinalDetail/loaders.tsx
new file mode 100644
index 000000000..5d1e247f2
--- /dev/null
+++ b/src/app/screens/ordinalDetail/loaders.tsx
@@ -0,0 +1,101 @@
+import Separator from '@components/separator';
+import styled from 'styled-components';
+import { ButtonContainer, StyledBarLoader } from './index.styled';
+
+const ActionButtonsLoader = styled.div((props) => ({
+  display: 'flex',
+  justifyContent: 'center',
+  columnGap: props.theme.spacing(11),
+}));
+
+const ActionButtonLoader = styled.div((props) => ({
+  display: 'flex',
+  flexDirection: 'column',
+  alignItems: 'center',
+  rowGap: props.theme.space.xs,
+}));
+
+const ExtensionLoaderContainer = styled.div({
+  height: '100%',
+  display: 'flex',
+  flexDirection: 'column',
+  justifyContent: 'space-around',
+  alignItems: 'center',
+});
+
+const InfoContainer = styled.div((props) => ({
+  width: '100%',
+  display: 'flex',
+  justifyContent: 'space-between',
+  padding: `0 ${props.theme.space.m}`,
+}));
+
+const StyledSeparator = styled(Separator)`
+  width: 100%;
+`;
+
+const TitleLoader = styled.div`
+  display: flex;
+  flex-direction: column;
+`;
+
+const GalleryLoaderContainer = styled.div({
+  display: 'flex',
+  flexDirection: 'column',
+});
+
+export function ExtensionLoader() {
+  return (
+    <ExtensionLoaderContainer>
+      <TitleLoader>
+        <StyledBarLoader width={100} height={18.5} withMarginBottom />
+        <StyledBarLoader width={100} height={30} />
+      </TitleLoader>
+      <StyledBarLoader width={100} height={18.5} />
+      <StyledBarLoader width={136} height={136} />
+      <ActionButtonsLoader>
+        <ActionButtonLoader>
+          <StyledBarLoader width={48} height={48} />
+          <StyledBarLoader width={30} height={15.5} />
+        </ActionButtonLoader>
+        <ActionButtonLoader>
+          <StyledBarLoader width={48} height={48} />
+          <StyledBarLoader width={30} height={15.5} />
+        </ActionButtonLoader>
+      </ActionButtonsLoader>
+      <StyledSeparator />
+      <InfoContainer>
+        <div>
+          <StyledBarLoader width={100} height={18.5} />
+          <StyledBarLoader width={80} height={18.5} />
+        </div>
+        <div>
+          <StyledBarLoader width={100} height={18.5} />
+          <StyledBarLoader width={80} height={18.5} />
+        </div>
+      </InfoContainer>
+    </ExtensionLoaderContainer>
+  );
+}
+
+export function GalleryLoader() {
+  return (
+    <GalleryLoaderContainer>
+      <StyledBarLoader width={120} height={21} withMarginBottom />
+      <StyledBarLoader width={180} height={40} withMarginBottom />
+      <StyledBarLoader width={100} height={18.5} withMarginBottom />
+      <ButtonContainer>
+        <StyledBarLoader width={190} height={44} />
+        <StyledBarLoader width={190} height={44} />
+      </ButtonContainer>
+      <StyledBarLoader width={100} height={31} withMarginBottom />
+      <StyledBarLoader width={400} height={18.5} withMarginBottom />
+      <StyledBarLoader width={400} height={18.5} withMarginBottom />
+      <StyledBarLoader width={400} height={18.5} withMarginBottom />
+      <StyledBarLoader width={400} height={18.5} withMarginBottom />
+      <StyledBarLoader width={400} height={18.5} withMarginBottom />
+      <StyledBarLoader width={400} height={18.5} withMarginBottom />
+      <StyledBarLoader width={392} height={44} />
+    </GalleryLoaderContainer>
+  );
+}
diff --git a/src/app/screens/ordinalsCollection/index.styled.ts b/src/app/screens/ordinalsCollection/index.styled.ts
index 8fe290c2c..4f78ee844 100644
--- a/src/app/screens/ordinalsCollection/index.styled.ts
+++ b/src/app/screens/ordinalsCollection/index.styled.ts
@@ -7,7 +7,7 @@ import Button from '@ui-library/button';
 import styled from 'styled-components';
 
 interface DetailSectionProps {
-  isGalleryOpen?: boolean;
+  $isGalleryOpen?: boolean;
 }
 
 /* layout */
@@ -23,7 +23,7 @@ export const PageHeader = styled.div<DetailSectionProps>`
   padding: ${(props) => props.theme.space.xs};
   padding-top: 0;
   max-width: 1224px;
-  margin-top: ${(props) => (props.isGalleryOpen ? props.theme.space.xxl : props.theme.space.l)};
+  margin-top: ${(props) => (props.$isGalleryOpen ? props.theme.space.xxl : props.theme.space.l)};
   margin-left: auto;
   margin-right: auto;
   width: 100%;
@@ -32,15 +32,15 @@ export const PageHeader = styled.div<DetailSectionProps>`
 // TODO tim: use media queries for this once we get responsive layouts with breakpoints
 export const PageHeaderContent = styled.div<DetailSectionProps>`
   display: flex;
-  flex-direction: ${(props) => (props.isGalleryOpen ? 'row' : 'column')};
-  justify-content: ${(props) => (props.isGalleryOpen ? 'space-between' : 'initial')};
+  flex-direction: ${(props) => (props.$isGalleryOpen ? 'row' : 'column')};
+  justify-content: ${(props) => (props.$isGalleryOpen ? 'space-between' : 'initial')};
   row-gap: ${(props) => props.theme.space.xl};
 `;
 
 export const AttributesContainer = styled.div<DetailSectionProps>`
   display: flex;
-  flex-direction: ${(props) => (props.isGalleryOpen ? 'column' : 'row')};
-  justify-content: ${(props) => (props.isGalleryOpen ? 'space-between' : 'initial')};
+  flex-direction: ${(props) => (props.$isGalleryOpen ? 'column' : 'row')};
+  justify-content: ${(props) => (props.$isGalleryOpen ? 'space-between' : 'initial')};
   column-gap: ${(props) => props.theme.space.m};
 `;
 
@@ -74,7 +74,6 @@ export const StyledWrenchErrorMessage = styled(WrenchErrorMessage)`
 
 export const BackButtonContainer = styled.div`
   display: flex;
-  flex-direction: row;
   margin-bottom: ${(props) => props.theme.space.xxl};
 `;
 
diff --git a/src/app/screens/ordinalsCollection/index.tsx b/src/app/screens/ordinalsCollection/index.tsx
index db4d7c193..841c32cff 100644
--- a/src/app/screens/ordinalsCollection/index.tsx
+++ b/src/app/screens/ordinalsCollection/index.tsx
@@ -11,13 +11,7 @@ import useOptionsSheet from '@hooks/useOptionsSheet';
 import { useResetUserFlow } from '@hooks/useResetUserFlow';
 import useSelectedAccount from '@hooks/useSelectedAccount';
 import useWalletSelector from '@hooks/useWalletSelector';
-import {
-  ArrowLeft,
-  DotsThreeVertical,
-  Star,
-  TrayArrowDown,
-  TrayArrowUp,
-} from '@phosphor-icons/react';
+import { ArchiveTray, ArrowLeft, DotsThreeVertical, Star } from '@phosphor-icons/react';
 import OrdinalImage from '@screens/ordinals/ordinalImage';
 import {
   addToHideCollectiblesAction,
@@ -30,7 +24,7 @@ import Button from '@ui-library/button';
 import { StyledHeading, StyledP } from '@ui-library/common.styled';
 import Sheet from '@ui-library/sheet';
 import SnackBar from '@ui-library/snackBar';
-import { EMPTY_LABEL } from '@utils/constants';
+import { EMPTY_LABEL, LONG_TOAST_DURATION } from '@utils/constants';
 import {
   getInscriptionsCollectionGridItemId,
   getInscriptionsCollectionGridItemSubText,
@@ -104,7 +98,9 @@ function OrdinalsCollection() {
       removeFromHideCollectiblesAction({ address: ordinalsAddress, id: collectionId ?? '' }),
     );
     toast.remove(toastId);
-    toast.custom(<SnackBar text={t('COLLECTION_UNHIDDEN')} type="neutral" />, { duration: 4000 });
+    toast.custom(<SnackBar text={t('COLLECTION_UNHIDDEN')} type="neutral" />, {
+      duration: LONG_TOAST_DURATION,
+    });
   };
 
   const handleHideCollection = () => {
@@ -132,7 +128,7 @@ function OrdinalsCollection() {
           onClick: () => handleClickUndoHiding(toastId),
         }}
       />,
-      { duration: 4000 },
+      { duration: LONG_TOAST_DURATION },
     );
   };
 
@@ -156,27 +152,33 @@ function OrdinalsCollection() {
     ? `${collectionMarketData?.floor_price?.toFixed(8)} BTC`
     : EMPTY_LABEL;
 
+  const handleClickUndoStarring = (toastId: string) => {
+    dispatch(
+      removeFromStarCollectiblesAction({ address: ordinalsAddress, id: collectionId ?? '' }),
+    );
+    toast.remove(toastId);
+    toast.custom(<SnackBar text={t('UNSTAR_COLLECTION')} type="neutral" />);
+  };
+
   const handleStarClick = () => {
     if (collectionStarred) {
-      const toastId = toast.custom(
-        <SnackBar
-          text={t('UNSTAR_COLLECTION')}
-          type="neutral"
-          dismissToast={() => toast.remove(toastId)}
-        />,
-      );
       dispatch(
         removeFromStarCollectiblesAction({ address: ordinalsAddress, id: collectionId ?? '' }),
       );
+      toast.custom(<SnackBar text={t('UNSTAR_COLLECTION')} type="neutral" />);
     } else {
+      dispatch(addToStarCollectiblesAction({ address: ordinalsAddress, id: collectionId ?? '' }));
       const toastId = toast.custom(
         <SnackBar
           text={t('STAR_COLLECTION')}
           type="neutral"
-          dismissToast={() => toast.remove(toastId)}
+          action={{
+            text: tCommon('UNDO'),
+            onClick: () => handleClickUndoStarring(toastId),
+          }}
         />,
+        { duration: LONG_TOAST_DURATION },
       );
-      dispatch(addToStarCollectiblesAction({ address: ordinalsAddress, id: collectionId ?? '' }));
     }
   };
 
@@ -193,7 +195,7 @@ function OrdinalsCollection() {
         />
       )}
       <Container>
-        <PageHeader isGalleryOpen={isGalleryOpen}>
+        <PageHeader $isGalleryOpen={isGalleryOpen}>
           {isGalleryOpen && (
             <BackButtonContainer>
               <BackButton onClick={handleBackButtonClick}>
@@ -204,7 +206,7 @@ function OrdinalsCollection() {
               </BackButton>
             </BackButtonContainer>
           )}
-          <PageHeaderContent isGalleryOpen={isGalleryOpen}>
+          <PageHeaderContent $isGalleryOpen={isGalleryOpen}>
             <div>
               <StyledP typography="body_bold_m" color="white_400">
                 {t('COLLECTION')}
@@ -244,7 +246,7 @@ function OrdinalsCollection() {
               </CollectionNameDiv>
               {!isGalleryOpen && <StyledWebGalleryButton onClick={openInGalleryView} />}
             </div>
-            <AttributesContainer isGalleryOpen={isGalleryOpen}>
+            <AttributesContainer $isGalleryOpen={isGalleryOpen}>
               <CollectibleDetailTile
                 title={t('COLLECTION_FLOOR_PRICE')}
                 value={collectionFloorPrice}
@@ -315,14 +317,14 @@ function OrdinalsCollection() {
           {collectionHidden ? (
             <StyledButton
               variant="tertiary"
-              icon={<TrayArrowUp size={24} color={Theme.colors.white_200} />}
+              icon={<ArchiveTray size={24} color={Theme.colors.white_200} />}
               title={t('UNHIDE_COLLECTION')}
               onClick={handleUnHideCollection}
             />
           ) : (
             <StyledButton
               variant="tertiary"
-              icon={<TrayArrowDown size={24} color={Theme.colors.white_200} />}
+              icon={<ArchiveTray size={24} color={Theme.colors.white_200} />}
               title={t('HIDE_COLLECTION')}
               onClick={handleHideCollection}
             />
diff --git a/src/app/stores/wallet/actions/actionCreators.ts b/src/app/stores/wallet/actions/actionCreators.ts
index 930e65e7f..da18c5f96 100644
--- a/src/app/stores/wallet/actions/actionCreators.ts
+++ b/src/app/stores/wallet/actions/actionCreators.ts
@@ -313,6 +313,15 @@ export function removeAllFromHideCollectiblesAction(params: {
   };
 }
 
+export function setHiddenCollectiblesAction(params: {
+  collectibleIds: Record<string, Record<string, string>>;
+}): actions.SetHiddenCollectibles {
+  return {
+    type: actions.SetHiddenCollectiblesKey,
+    ...params,
+  };
+}
+
 export function setAccountAvatarAction(params: {
   address: string;
   avatar: actions.AvatarInfo;
diff --git a/src/app/stores/wallet/actions/types.ts b/src/app/stores/wallet/actions/types.ts
index ced01601a..b1a388efe 100644
--- a/src/app/stores/wallet/actions/types.ts
+++ b/src/app/stores/wallet/actions/types.ts
@@ -43,6 +43,7 @@ export const UpdateSavedNamesKey = 'UpdateSavedNamesKey';
 export const AddToStarCollectiblesKey = 'AddToStarCollectiblesKey';
 export const RemoveFromStarCollectiblesKey = 'RemoveFromStarCollectiblesKey';
 export const AddToHideCollectiblesKey = 'AddToHideCollectiblesKey';
+export const SetHiddenCollectiblesKey = 'SetHiddenCollectiblesKey';
 export const RemoveFromHideCollectiblesKey = 'RemoveFromHideCollectiblesKey';
 export const RemoveAllFromHideCollectiblesKey = 'RemoveAllFromHideCollectiblesKey';
 export const SetAccountAvatarKey = 'SetAccountAvatarKey';
@@ -272,6 +273,11 @@ export interface RemoveAllFromHideCollectibles {
   address: string;
 }
 
+export interface SetHiddenCollectibles {
+  type: typeof SetHiddenCollectiblesKey;
+  collectibleIds: Record<string, Record<string, string>>;
+}
+
 export interface SetAccountAvatar {
   type: typeof SetAccountAvatarKey;
   address: string;
@@ -328,5 +334,6 @@ export type WalletActions =
   | AddToHideCollectibles
   | RemoveFromHideCollectibles
   | RemoveAllFromHideCollectibles
+  | SetHiddenCollectibles
   | SetAccountAvatar
   | RemoveAccountAvatar;
diff --git a/src/app/stores/wallet/reducer.ts b/src/app/stores/wallet/reducer.ts
index 19b532b84..b1f390c73 100644
--- a/src/app/stores/wallet/reducer.ts
+++ b/src/app/stores/wallet/reducer.ts
@@ -24,6 +24,7 @@ import {
   SetAccountBalanceKey,
   SetBrc20ManageTokensKey,
   SetFeeMultiplierKey,
+  SetHiddenCollectiblesKey,
   SetNotificationBannersKey,
   SetRunesManageTokensKey,
   SetShowSpamTokensKey,
@@ -360,6 +361,14 @@ const walletReducer = (
           [action.address]: {},
         },
       };
+    case SetHiddenCollectiblesKey:
+      return {
+        ...state,
+        hiddenCollectibleIds: {
+          ...state.hiddenCollectibleIds,
+          ...action.collectibleIds,
+        },
+      };
     case SetAccountAvatarKey:
       return {
         ...state,
diff --git a/src/app/utils/constants.ts b/src/app/utils/constants.ts
index 971e2eff7..2350dddb7 100644
--- a/src/app/utils/constants.ts
+++ b/src/app/utils/constants.ts
@@ -70,6 +70,7 @@ export const MAX_ACC_NAME_LENGTH = 20;
 export const EMPTY_LABEL = '--';
 export const OPTIONS_DIALOG_WIDTH = 179;
 export const SPAM_OPTIONS_WIDTH = 244;
+export const LONG_TOAST_DURATION = 4000;
 
 export const XverseProviderInfo: Provider = {
   id: 'XverseProviders.BitcoinProvider',
diff --git a/src/locales/en.json b/src/locales/en.json
index a203ba8b8..0224d45db 100644
--- a/src/locales/en.json
+++ b/src/locales/en.json
@@ -757,7 +757,9 @@
     "FROM_RARE_SAT_BUNDLE": "This inscription belongs to the same bundle as other assets. Transferring it will involve transferring the full bundle.",
     "HOLDS_RARE_SAT": "This inscription holds a rare sat.",
     "HIDDEN_COLLECTIBLES": "Hidden collectibles",
-    "UNHIDE_ALL": "Unhide all"
+    "UNHIDE_ALL": "Unhide all",
+    "HIDDEN_ITEMS_RESTORED": "Hidden items restored",
+    "ITEMS_RETURNED_TO_HIDDEN": "Items returned to hidden"
   },
   "RESTORE_FUND_SCREEN": {
     "TITLE": "Recover assets",

From 22d4658cdf62bd1b80ab1f0116240f308c3e7ea3 Mon Sep 17 00:00:00 2001
From: Terence Ng <ngtere@live.com.sg>
Date: Wed, 16 Oct 2024 10:56:59 +0200
Subject: [PATCH 179/227] Terence/fix back nav (#673)

* remove duplicate

* fixup back flows from send
---
 src/app/screens/sendBrc20OneStep/index.tsx |  4 +---
 src/app/screens/sendBtc/index.tsx          |  2 +-
 src/app/screens/sendRune/index.tsx         |  5 +++--
 src/app/screens/sendStx/index.tsx          | 12 +++++++-----
 4 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/src/app/screens/sendBrc20OneStep/index.tsx b/src/app/screens/sendBrc20OneStep/index.tsx
index 327df29ef..fe679b2ee 100644
--- a/src/app/screens/sendBrc20OneStep/index.tsx
+++ b/src/app/screens/sendBrc20OneStep/index.tsx
@@ -37,8 +37,6 @@ function SendBrc20Screen() {
   const [processing, setProcessing] = useState(false);
   const transactionContext = useTransactionContext();
 
-  const isFullScreen = isInOptions();
-
   useResetUserFlow('/send-brc20-one-step');
 
   const principal = searchParams.get('principal');
@@ -165,7 +163,7 @@ function SendBrc20Screen() {
 
   return (
     <>
-      <TopRow title={t('SEND')} onClick={handleBackButtonClick} showBackButton={!isFullScreen} />
+      <TopRow title={t('SEND')} onClick={handleBackButtonClick} showBackButton />
       <Brc20TransferForm
         amountToSend={amountToSend}
         onAmountChange={onInputChange}
diff --git a/src/app/screens/sendBtc/index.tsx b/src/app/screens/sendBtc/index.tsx
index be105bb9a..4aec0c5e2 100644
--- a/src/app/screens/sendBtc/index.tsx
+++ b/src/app/screens/sendBtc/index.tsx
@@ -121,7 +121,7 @@ function SendBtcScreen() {
       window.close();
       return;
     }
-    navigate('/');
+    navigate(`/coinDashboard/BTC`);
   };
 
   const calculateFeeForFeeRate = async (desiredFeeRate: number): Promise<number | undefined> => {
diff --git a/src/app/screens/sendRune/index.tsx b/src/app/screens/sendRune/index.tsx
index 8c67e4cdd..5ce01e29e 100644
--- a/src/app/screens/sendRune/index.tsx
+++ b/src/app/screens/sendRune/index.tsx
@@ -4,7 +4,6 @@ import useHasFeature from '@hooks/useHasFeature';
 import { useResetUserFlow } from '@hooks/useResetUserFlow';
 import useSelectedAccount from '@hooks/useSelectedAccount';
 import useTransactionContext from '@hooks/useTransactionContext';
-import useWalletSelector from '@hooks/useWalletSelector';
 import {
   AnalyticsEvents,
   FeatureId,
@@ -144,7 +143,9 @@ function SendRuneScreen() {
       window.close();
       return;
     }
-    navigate('/');
+    navigate(
+      `/coinDashboard/FT?ftKey=${fungibleToken.principal}&protocol=${fungibleToken.protocol}`,
+    );
   };
 
   const handleBackButtonClick = () => {
diff --git a/src/app/screens/sendStx/index.tsx b/src/app/screens/sendStx/index.tsx
index 0d689ab52..e91d18c2d 100644
--- a/src/app/screens/sendStx/index.tsx
+++ b/src/app/screens/sendStx/index.tsx
@@ -2,7 +2,7 @@ import TokenImage from '@components/tokenImage';
 import { useVisibleSip10FungibleTokens } from '@hooks/queries/stx/useGetSip10FungibleTokens';
 import { useResetUserFlow } from '@hooks/useResetUserFlow';
 import { microstacksToStx, stxToMicrostacks } from '@secretkeylabs/xverse-core';
-import { isInOptions } from '@utils/helper';
+import { isInOptions, isLedgerAccount } from '@utils/helper';
 import SendLayout from 'app/layouts/sendLayout';
 import BigNumber from 'bignumber.js';
 import { useState } from 'react';
@@ -78,11 +78,13 @@ function SendStxScreen() {
   const [unsignedSendStxTx, setUnsignedSendStxTx] = useState('');
 
   const handleCancel = () => {
-    if (isInOption) {
-      window.close();
-      return;
+    if (fungibleToken) {
+      navigate(
+        `/coinDashboard/FT?ftKey=${fungibleToken.principal}&protocol=${fungibleToken.protocol}`,
+      );
+    } else {
+      navigate(`/coinDashboard/STX`);
     }
-    navigate('/');
   };
 
   const handleBackButtonClick = () => {

From f275b4050ea0a4cad59533e6f543ffa2d5fa6eca Mon Sep 17 00:00:00 2001
From: Terence Ng <ngtere@live.com.sg>
Date: Wed, 16 Oct 2024 14:43:52 +0200
Subject: [PATCH 180/227] Terence/fix pw screen (#676)

* remove duplicate

* remove error message

* remove unnecessary props

* fix boolean logic

* remove e2e logic check

* restore message (opps)

* fixup button jumping

* Update src/app/components/passwordInput/index.styled.ts

Co-authored-by: Den <36603049+dhriaznov@users.noreply.github.com>

* remove

---------

Co-authored-by: Den <36603049+dhriaznov@users.noreply.github.com>
---
 .../components/passwordInput/index.styled.ts  |   5 +-
 src/app/components/passwordInput/index.tsx    | 140 ++++++------------
 src/app/screens/createPassword/index.tsx      |   1 -
 src/app/screens/restoreWallet/index.tsx       |   1 -
 .../security/changePassword/index.tsx         |   1 -
 src/locales/en.json                           |   1 -
 tests/pages/onboarding.ts                     |  13 --
 7 files changed, 50 insertions(+), 112 deletions(-)

diff --git a/src/app/components/passwordInput/index.styled.ts b/src/app/components/passwordInput/index.styled.ts
index dfdca4914..d65daf440 100644
--- a/src/app/components/passwordInput/index.styled.ts
+++ b/src/app/components/passwordInput/index.styled.ts
@@ -34,7 +34,7 @@ export const ButtonsContainer = styled.div<{
   flexDirection: props.$stackButtonAlignment ? 'column-reverse' : 'row',
   alignItems: props.$stackButtonAlignment ? 'center' : 'flex-end',
   flex: 1,
-  marginTop: props.$ifError ? props.theme.spacing(30) : props.theme.spacing(40),
+  marginTop: props.$ifError ? props.theme.space.xxxl : props.theme.space.xxxxl,
   marginBottom: props.theme.space.m,
 }));
 
@@ -47,8 +47,9 @@ export const StyledButton = styled.button({
   },
 });
 
-export const PasswordStrengthContainer = styled.div((props) => ({
+export const PasswordStrengthContainer = styled.div<{ $visibility: boolean }>((props) => ({
   ...props.theme.typography.body_medium_m,
+  visibility: props.$visibility ? 'visible' : 'hidden',
   display: 'flex',
   alignItems: 'center',
   width: '100%',
diff --git a/src/app/components/passwordInput/index.tsx b/src/app/components/passwordInput/index.tsx
index dfbeab673..22cdd640b 100644
--- a/src/app/components/passwordInput/index.tsx
+++ b/src/app/components/passwordInput/index.tsx
@@ -20,8 +20,6 @@ import {
   StyledButton,
 } from './index.styled';
 
-const REQUIRED_PASSWORD_LENGTH = 5;
-
 enum PasswordStrength {
   NoScore,
   PoorScore,
@@ -43,7 +41,6 @@ type Props = {
   checkPasswordStrength?: boolean;
   stackButtonAlignment?: boolean;
   loading?: boolean;
-  createPasswordFlow?: boolean;
   autoFocus?: boolean;
 };
 
@@ -59,18 +56,16 @@ function PasswordInput({
   checkPasswordStrength,
   stackButtonAlignment = false,
   loading,
-  createPasswordFlow,
   autoFocus = false,
 }: Props): JSX.Element {
-  const { t } = useTranslation('translation', { keyPrefix: 'CREATE_PASSWORD_SCREEN' });
   const theme = useTheme();
+  const { t } = useTranslation('translation', { keyPrefix: 'CREATE_PASSWORD_SCREEN' });
   const [isPasswordVisible, setIsPasswordVisible] = useState(false);
   const [passwordStrength, setPasswordStrength] = useState<PasswordStrength>(
     PasswordStrength.NoScore,
   );
+
   const { score } = zxcvbn(enteredPassword);
-  const enteredPasswordLength = enteredPassword.length;
-  const [error, setError] = useState<string>(passwordError ?? '');
   const transition = useTransition(passwordStrength, {
     from: {
       opacity: 0,
@@ -79,6 +74,33 @@ function PasswordInput({
       opacity: 1,
     },
   });
+  const enteredPasswordLength = enteredPassword.length;
+  let passwordStrengthLabel;
+  if (!enteredPassword) {
+    passwordStrengthLabel = {
+      color: theme.colors.white_600,
+      width: '0',
+      message: '',
+    };
+  } else if (score <= PasswordStrength.WeakScore) {
+    passwordStrengthLabel = {
+      color: theme.colors.feedback.error,
+      width: '20%',
+      message: <p style={{ color: theme.colors.feedback.error }}>{t('PASSWORD_STRENGTH_WEAK')}</p>,
+    };
+  } else if (score <= PasswordStrength.AverageScore) {
+    passwordStrengthLabel = {
+      color: theme.colors.feedback.caution,
+      width: '50%',
+      message: <p>{t('PASSWORD_STRENGTH_MEDIUM')}</p>,
+    };
+  } else {
+    passwordStrengthLabel = {
+      color: theme.colors.feedback.success,
+      width: '100%',
+      message: <p>{t('PASSWORD_STRENGTH_STRONG')}</p>,
+    };
+  }
 
   useEffect(() => {
     const keyDownHandler = (event) => {
@@ -86,7 +108,6 @@ function PasswordInput({
         event.key === 'Enter' &&
         document.activeElement?.id === 'password-input' &&
         !!enteredPassword &&
-        enteredPasswordLength >= REQUIRED_PASSWORD_LENGTH &&
         (checkPasswordStrength ? score >= PasswordStrength.AverageScore : true)
       ) {
         event.preventDefault();
@@ -97,94 +118,16 @@ function PasswordInput({
     return () => {
       document.removeEventListener('keydown', keyDownHandler);
     };
-  }, [enteredPassword]);
-
-  useEffect(() => {
-    if (passwordError) {
-      setError(passwordError);
-      return;
-    }
-    if (enteredPassword && !!createPasswordFlow && score <= PasswordStrength.WeakScore) {
-      setError(t('PASSWORD_STRENGTH_ERROR'));
-      return;
-    }
-    setError('');
-  }, [passwordError, enteredPassword]);
+  }, [checkPasswordStrength, enteredPassword, enteredPasswordLength, handleContinue, score]);
 
   useEffect(() => {
     if (enteredPassword !== '') {
       setPasswordStrength(score);
     }
-
     return () => {
       setPasswordStrength(PasswordStrength.NoScore);
     };
-  }, [enteredPassword, setPasswordStrength]);
-
-  const handleTogglePasswordView = () => {
-    setIsPasswordVisible(!isPasswordVisible);
-  };
-
-  const handlePasswordChange = (event: React.FormEvent<HTMLInputElement>) => {
-    setEnteredPassword(event.currentTarget.value);
-  };
-
-  const renderStrengthBar = () => {
-    if (enteredPassword !== '') {
-      if (
-        enteredPasswordLength <= REQUIRED_PASSWORD_LENGTH ||
-        score <= PasswordStrength.WeakScore
-      ) {
-        return (
-          <PasswordStrengthContainer>
-            <span>{t('PASSWORD_STRENGTH_LABEL')}</span>
-            <StrengthBar $strengthColor={theme.colors.feedback.error} $strengthWidth="20%">
-              {transition((style) => (
-                <animated.div style={style} />
-              ))}
-            </StrengthBar>
-            <p style={{ color: theme.colors.feedback.error }}>{t('PASSWORD_STRENGTH_WEAK')}</p>
-          </PasswordStrengthContainer>
-        );
-      }
-
-      if (score <= PasswordStrength.AverageScore) {
-        return (
-          <PasswordStrengthContainer>
-            <span>{t('PASSWORD_STRENGTH_LABEL')}</span>
-            {transition((style) => (
-              <StrengthBar $strengthColor={theme.colors.feedback.caution} $strengthWidth="50%">
-                <animated.div style={style} />
-              </StrengthBar>
-            ))}
-            <p>{t('PASSWORD_STRENGTH_MEDIUM')}</p>
-          </PasswordStrengthContainer>
-        );
-      }
-
-      return (
-        <PasswordStrengthContainer>
-          <span>{t('PASSWORD_STRENGTH_LABEL')}</span>
-          {transition((style) => (
-            <StrengthBar $strengthColor={theme.colors.feedback.success} $strengthWidth="100%">
-              <animated.div style={style} />
-            </StrengthBar>
-          ))}
-          <p>{t('PASSWORD_STRENGTH_STRONG')}</p>
-        </PasswordStrengthContainer>
-      );
-    }
-    return (
-      <PasswordStrengthContainer>
-        <span>{t('PASSWORD_STRENGTH_LABEL')}</span>
-        <StrengthBar $strengthColor={theme.colors.white_600} $strengthWidth="0">
-          {transition((style) => (
-            <animated.div style={style} />
-          ))}
-        </StrengthBar>
-      </PasswordStrengthContainer>
-    );
-  };
+  }, [enteredPassword, score, setPasswordStrength]);
 
   return (
     <Container>
@@ -198,10 +141,10 @@ function PasswordInput({
         id="password-input"
         type={isPasswordVisible ? 'text' : 'password'}
         value={enteredPassword}
-        onChange={handlePasswordChange}
+        onChange={(e) => setEnteredPassword(e.currentTarget.value)}
         autoFocus={autoFocus}
         complications={
-          <StyledButton onClick={handleTogglePasswordView}>
+          <StyledButton onClick={() => setIsPasswordVisible(!isPasswordVisible)}>
             <img
               src={isPasswordVisible ? Eye : EyeSlash}
               alt="toggle password visibility"
@@ -209,11 +152,22 @@ function PasswordInput({
             />
           </StyledButton>
         }
-        feedback={error !== '' ? [{ message: error, variant: 'danger' }] : undefined}
+        feedback={passwordError ? [{ message: passwordError, variant: 'danger' }] : undefined}
         hideClear
       />
-      {checkPasswordStrength ? renderStrengthBar() : null}
-      <ButtonsContainer $stackButtonAlignment={stackButtonAlignment} $ifError={error !== ''}>
+      <PasswordStrengthContainer $visibility={!!checkPasswordStrength}>
+        <span>{t('PASSWORD_STRENGTH_LABEL')}</span>
+        <StrengthBar
+          $strengthColor={passwordStrengthLabel.color}
+          $strengthWidth={passwordStrengthLabel.width}
+        >
+          {transition((style) => (
+            <animated.div style={style} />
+          ))}
+        </StrengthBar>
+        {passwordStrengthLabel.message}
+      </PasswordStrengthContainer>
+      <ButtonsContainer $stackButtonAlignment={stackButtonAlignment} $ifError={!!passwordError}>
         <ButtonContainer $stackButtonAlignment={stackButtonAlignment}>
           <Button title={t('BACK_BUTTON')} onClick={handleBack} variant="secondary" type="button" />
         </ButtonContainer>
diff --git a/src/app/screens/createPassword/index.tsx b/src/app/screens/createPassword/index.tsx
index 572c78b7e..29b01c37e 100644
--- a/src/app/screens/createPassword/index.tsx
+++ b/src/app/screens/createPassword/index.tsx
@@ -101,7 +101,6 @@ function CreatePassword(): JSX.Element {
             handleContinue={handleContinuePasswordCreation}
             handleBack={handleNewPasswordBack}
             checkPasswordStrength
-            createPasswordFlow
             autoFocus
           />
         ) : (
diff --git a/src/app/screens/restoreWallet/index.tsx b/src/app/screens/restoreWallet/index.tsx
index 2a2b84269..d7ba30c2a 100644
--- a/src/app/screens/restoreWallet/index.tsx
+++ b/src/app/screens/restoreWallet/index.tsx
@@ -129,7 +129,6 @@ function RestoreWallet(): JSX.Element {
         handleContinue={onNewPasswordContinue}
         handleBack={onNewPasswordBack}
         checkPasswordStrength
-        createPasswordFlow
         autoFocus
       />
     </PasswordContainer>,
diff --git a/src/app/screens/settings/security/changePassword/index.tsx b/src/app/screens/settings/security/changePassword/index.tsx
index b99d64f9a..ef7c96fc6 100644
--- a/src/app/screens/settings/security/changePassword/index.tsx
+++ b/src/app/screens/settings/security/changePassword/index.tsx
@@ -93,7 +93,6 @@ function ChangePasswordScreen() {
             handleBack={handleBackButtonClick}
             checkPasswordStrength
             stackButtonAlignment
-            createPasswordFlow
             autoFocus
           />
         )}
diff --git a/src/locales/en.json b/src/locales/en.json
index 0224d45db..6d2c69ecd 100644
--- a/src/locales/en.json
+++ b/src/locales/en.json
@@ -594,7 +594,6 @@
     "PASSWORD_STRENGTH_WEAK": "Weak",
     "PASSWORD_STRENGTH_MEDIUM": "Medium",
     "PASSWORD_STRENGTH_STRONG": "Strong",
-    "PASSWORD_STRENGTH_ERROR": "Your password should be at least 9 characters long. Use a mix of uppercase letters, lowercase letters, numbers, and symbols",
     "CONFIRM_PASSWORD_MATCH_ERROR": "Please make sure your passwords match",
     "INCORRECT_PASSWORD_ERROR": "Incorrect password"
   },
diff --git a/tests/pages/onboarding.ts b/tests/pages/onboarding.ts
index a7ee1fa93..4db035c5b 100644
--- a/tests/pages/onboarding.ts
+++ b/tests/pages/onboarding.ts
@@ -26,8 +26,6 @@ export default class Onboarding {
 
   readonly inputPassword: Locator;
 
-  readonly errorMessage: Locator;
-
   readonly errorMessage2: Locator;
 
   readonly errorMessageSeedPhrase: Locator;
@@ -89,7 +87,6 @@ export default class Onboarding {
     this.buttonSeedWords = page.locator('button[value]:not([value=""])');
     this.header = page.locator('#app h3');
     this.inputPassword = page.locator('input[type="password"]');
-    this.errorMessage = page.locator('p').filter({ hasText: 'Your password should be at' });
     this.errorMessage2 = page.locator('p').filter({ hasText: 'Please make sure your' });
     this.errorMessageSeedPhrase = page.locator('p').filter({ hasText: 'Invalid seed phrase' });
     this.labelSecurityLevelWeak = page.locator('p').filter({ hasText: 'Weak' });
@@ -186,7 +183,6 @@ export default class Onboarding {
     await expect(this.inputPassword).toBeVisible();
     await expect(this.buttonContinue).toBeVisible();
     await expect(this.buttonContinue).toBeDisabled();
-    await expect(this.errorMessage).toBeHidden();
     await expect(this.labelSecurityLevelWeak).toBeHidden();
     await expect(this.labelSecurityLevelMedium).toBeHidden();
     await expect(this.labelSecurityLevelStrong).toBeHidden();
@@ -263,15 +259,6 @@ export default class Onboarding {
     // Fill in the password input field with the specified password.
     await this.inputPassword.fill(password);
 
-    // Check if an error message is expected to be visible.
-    if (expectations.errorMessageVisible) {
-      // If yes, verify that the error message element is visible.
-      await expect(this.errorMessage).toBeVisible();
-    } else {
-      // If not, verify that the error message element is hidden.
-      await expect(this.errorMessage).toBeHidden();
-    }
-
     // Define a mapping of security levels to their corresponding label elements.
     const visibilityChecks = {
       Weak: this.labelSecurityLevelWeak,

From 4e4b0e6447a41d00b440627f2ca35f4db9007722 Mon Sep 17 00:00:00 2001
From: Terence Ng <ngtere@live.com.sg>
Date: Wed, 16 Oct 2024 15:43:20 +0200
Subject: [PATCH 181/227] hide account balances (#655)

* add hide balances feature

* touchup styling

* revert testing

* increase dots to 6

* hide tx history as well

* export const

* allow toggle hide balance from token dashboard

* rename constant

* resolve issues

* update v5 state

* Update src/app/screens/coinDashboard/runes/bundleRow.tsx

Co-authored-by: Den <36603049+dhriaznov@users.noreply.github.com>

* hide btc breakdown tab

---------

Co-authored-by: Den <36603049+dhriaznov@users.noreply.github.com>
---
 src/app/components/accountRow/index.tsx       | 23 ++++---
 src/app/components/tokenTile/index.tsx        | 54 ++++++++++-----
 .../transactions/transactionAmount.tsx        |  6 ++
 .../components/transactions/txTransfers.tsx   | 39 ++++++-----
 .../coinDashboard/coinHeader.styled.ts        |  2 +
 src/app/screens/coinDashboard/coinHeader.tsx  | 65 ++++++++++++++-----
 .../coins/btc/addressBalance.tsx              | 19 ++++--
 .../screens/coinDashboard/runes/bundleRow.tsx | 31 +++++----
 src/app/screens/home/balanceCard/index.tsx    | 55 +++++++++++-----
 .../sendBrc20OneStep/brc20TransferForm.tsx    | 16 +++--
 .../screens/sendRune/runeAmountSelector.tsx   |  8 ++-
 src/app/screens/sendStx/ftAmountSelector.tsx  |  8 ++-
 src/app/screens/sendStx/stxAmountSelector.tsx |  7 +-
 .../components/tokenToBottomSheet/index.tsx   |  6 +-
 src/app/stores/index.ts                       |  1 +
 .../stores/wallet/actions/actionCreators.ts   |  9 +++
 .../stores/wallet/actions/migrationTypes.ts   |  1 +
 src/app/stores/wallet/actions/types.ts        | 10 ++-
 src/app/stores/wallet/reducer.ts              |  8 +++
 src/app/ui-components/btcAmountSelector.tsx   | 10 +--
 src/app/utils/constants.ts                    |  2 +-
 21 files changed, 260 insertions(+), 120 deletions(-)

diff --git a/src/app/components/accountRow/index.tsx b/src/app/components/accountRow/index.tsx
index 579c3db7a..d4b25018a 100644
--- a/src/app/components/accountRow/index.tsx
+++ b/src/app/components/accountRow/index.tsx
@@ -12,7 +12,7 @@ import Input from '@ui-library/input';
 import Sheet from '@ui-library/sheet';
 import SnackBar from '@ui-library/snackBar';
 import Spinner from '@ui-library/spinner';
-import { EMPTY_LABEL, LoaderSize } from '@utils/constants';
+import { EMPTY_LABEL, HIDDEN_BALANCE_LABEL, LoaderSize } from '@utils/constants';
 import { getAccountBalanceKey, isLedgerAccount, validateAccountName } from '@utils/helper';
 import { useEffect, useRef, useState } from 'react';
 import toast from 'react-hot-toast';
@@ -60,12 +60,17 @@ function AccountRow({
   const { t: optionsDialogTranslation } = useTranslation('translation', {
     keyPrefix: 'OPTIONS_DIALOG',
   });
-  const { accountsList, ledgerAccountsList, fiatCurrency, accountBalances, avatarIds } =
-    useWalletSelector();
-  const selectedAvatar = avatarIds[account?.btcAddresses.taproot.address ?? ''];
+  const {
+    accountsList,
+    ledgerAccountsList,
+    fiatCurrency,
+    accountBalances,
+    avatarIds,
+    balanceHidden,
+  } = useWalletSelector();
+  const accountAvatar = avatarIds[account?.btcAddresses.taproot.address ?? ''];
   // TODO: refactor this into a hook
   const totalBalance = accountBalances[getAccountBalanceKey(account)];
-
   const btcCopiedTooltipTimeoutRef = useRef<NodeJS.Timeout | undefined>();
   const stxCopiedTooltipTimeoutRef = useRef<NodeJS.Timeout | undefined>();
   const [showRemoveAccountModal, setShowRemoveAccountModal] = useState(false);
@@ -73,7 +78,6 @@ function AccountRow({
   const [accountName, setAccountName] = useState('');
   const [accountNameError, setAccountNameError] = useState<string | null>(null);
   const [isAccountNameChangeLoading, setIsAccountNameChangeLoading] = useState(false);
-
   const { removeLedgerAccount, renameSoftwareAccount, updateLedgerAccounts } = useWalletReducer();
 
   useEffect(
@@ -120,7 +124,6 @@ function AccountRow({
 
   const handleRemoveAvatar = () => {
     if (!account) return;
-
     dispatch(removeAccountAvatarAction({ address: account?.btcAddresses.taproot.address }));
     toast.custom(
       <SnackBar text={optionsDialogTranslation('NFT_AVATAR.REMOVE_TOAST')} type="neutral" />,
@@ -198,7 +201,7 @@ function AccountRow({
       <AccountInfoContainer $disableClick={disabledAccountSelect} onClick={handleClick}>
         <AccountAvatar
           account={account}
-          avatar={selectedAvatar}
+          avatar={accountAvatar}
           isSelected={isSelected}
           isAccountListView={isAccountListView}
         />
@@ -224,7 +227,7 @@ function AccountRow({
                   thousandSeparator
                   renderText={(value: string) => (
                     <Balance data-testid="account-balance" $isSelected={isSelected}>
-                      {value}
+                      {balanceHidden ? HIDDEN_BALANCE_LABEL : value}
                     </Balance>
                   )}
                 />
@@ -258,7 +261,7 @@ function AccountRow({
           <ButtonRow onClick={handleRenameAccountModalOpen}>
             {optionsDialogTranslation('RENAME_ACCOUNT')}
           </ButtonRow>
-          {selectedAvatar?.type && (
+          {accountAvatar?.type && (
             <ButtonRow onClick={handleRemoveAvatar}>
               {optionsDialogTranslation('NFT_AVATAR.REMOVE_ACTION')}
             </ButtonRow>
diff --git a/src/app/components/tokenTile/index.tsx b/src/app/components/tokenTile/index.tsx
index 5181dc011..615b933ef 100644
--- a/src/app/components/tokenTile/index.tsx
+++ b/src/app/components/tokenTile/index.tsx
@@ -7,6 +7,7 @@ import useSupportedCoinRates from '@hooks/queries/useSupportedCoinRates';
 import useWalletSelector from '@hooks/useWalletSelector';
 import { getFiatEquivalent, type FungibleToken } from '@secretkeylabs/xverse-core';
 import type { CurrencyTypes } from '@utils/constants';
+import { HIDDEN_BALANCE_LABEL } from '@utils/constants';
 import { getBalanceAmount, getFtTicker } from '@utils/tokens';
 import BigNumber from 'bignumber.js';
 import { NumericFormat } from 'react-number-format';
@@ -86,6 +87,16 @@ const StyledBarLoader = styled(BetterBarLoader)<{
   marginBottom: props.withMarginBottom ? props.theme.space.xxs : 0,
 }));
 
+const CoinBalanceContainer = styled.div`
+  ${(props) => props.theme.typography.body_medium_m}
+  color: ${(props) => props.theme.colors.white_0};
+`;
+
+const FiatAmountContainer = styled.div`
+  ${(props) => props.theme.typography.body_medium_s}
+  color: ${(props) => props.theme.colors.white_400};
+`;
+
 function TokenLoader() {
   return (
     <LoaderMainContainer>
@@ -104,7 +115,7 @@ type Props = {
   enlargeTicker?: boolean;
   className?: string;
   showProtocolIcon?: boolean;
-  hideBalance?: boolean;
+  hideSwapBalance?: boolean;
 };
 
 function TokenTile({
@@ -116,9 +127,9 @@ function TokenTile({
   enlargeTicker = false,
   className,
   showProtocolIcon = true,
-  hideBalance = false,
+  hideSwapBalance = false,
 }: Props) {
-  const { fiatCurrency } = useWalletSelector();
+  const { fiatCurrency, balanceHidden } = useWalletSelector();
   const { btcFiatRate, stxBtcRate } = useSupportedCoinRates();
   const { data: stxData } = useStxWalletData();
   const { confirmedBalance: btcBalance } = useSelectedAccountBtcBalance();
@@ -157,26 +168,33 @@ function TokenTile({
         <TextContainer>
           <CoinTickerText>{getTickerTitle()}</CoinTickerText>
           <TokenTitleContainer>
-            <SubText aria-label="Token SubTitle" fullWidth={hideBalance}>
+            <SubText aria-label="Token SubTitle" fullWidth={hideSwapBalance}>
               {title}
             </SubText>
           </TokenTitleContainer>
         </TextContainer>
       </RowContainer>
-      {loading ? (
-        <TokenLoader />
-      ) : (
-        !hideBalance && (
-          <AmountContainer aria-label="CoinBalance Container">
-            <NumericFormat
-              value={getBalanceAmount(currency, fungibleToken, stxData, btcBalance)}
-              displayType="text"
-              thousandSeparator
-              renderText={(value: string) => <CoinBalanceText>{value}</CoinBalanceText>}
-            />
-            <StyledFiatAmountText fiatAmount={getFiatAmount()} fiatCurrency={fiatCurrency} />
-          </AmountContainer>
-        )
+      {loading && <TokenLoader />}
+      {!loading && !hideSwapBalance && (
+        <AmountContainer aria-label="CoinBalance Container">
+          <CoinBalanceContainer>
+            {balanceHidden && HIDDEN_BALANCE_LABEL}
+            {!balanceHidden && (
+              <NumericFormat
+                value={getBalanceAmount(currency, fungibleToken, stxData, btcBalance)}
+                displayType="text"
+                thousandSeparator
+                renderText={(value: string) => <CoinBalanceText>{value}</CoinBalanceText>}
+              />
+            )}
+          </CoinBalanceContainer>
+          <FiatAmountContainer>
+            {balanceHidden && HIDDEN_BALANCE_LABEL}
+            {!balanceHidden && (
+              <StyledFiatAmountText fiatAmount={getFiatAmount()} fiatCurrency={fiatCurrency} />
+            )}
+          </FiatAmountContainer>
+        </AmountContainer>
       )}
     </TileContainer>
   );
diff --git a/src/app/components/transactions/transactionAmount.tsx b/src/app/components/transactions/transactionAmount.tsx
index 7911eaa03..f911e8bd6 100644
--- a/src/app/components/transactions/transactionAmount.tsx
+++ b/src/app/components/transactions/transactionAmount.tsx
@@ -1,4 +1,5 @@
 import { useVisibleSip10FungibleTokens } from '@hooks/queries/stx/useGetSip10FungibleTokens';
+import useWalletSelector from '@hooks/useWalletSelector';
 import {
   microstacksToStx,
   satsToBtc,
@@ -10,6 +11,7 @@ import {
   type StxTransactionData,
 } from '@secretkeylabs/xverse-core';
 import type { CurrencyTypes } from '@utils/constants';
+import { HIDDEN_BALANCE_LABEL } from '@utils/constants';
 import { getFtBalance, getFtTicker } from '@utils/tokens';
 import BigNumber from 'bignumber.js';
 import { NumericFormat } from 'react-number-format';
@@ -34,6 +36,10 @@ const TransactionValue = styled.p((props) => ({
 export default function TransactionAmount(props: TransactionAmountProps): JSX.Element | null {
   const { transaction, currency, protocol, tokenSymbol } = props;
   const { data: sip10CoinsList } = useVisibleSip10FungibleTokens();
+  const { balanceHidden } = useWalletSelector();
+  if (balanceHidden) {
+    return <TransactionValue>{HIDDEN_BALANCE_LABEL}</TransactionValue>;
+  }
   if (currency === 'STX' || (currency === 'FT' && protocol === 'stacks')) {
     const stxTransaction = transaction as StxTransactionData;
     if (stxTransaction.txType === 'token_transfer') {
diff --git a/src/app/components/transactions/txTransfers.tsx b/src/app/components/transactions/txTransfers.tsx
index 34cb6edda..b93efc43b 100644
--- a/src/app/components/transactions/txTransfers.tsx
+++ b/src/app/components/transactions/txTransfers.tsx
@@ -2,9 +2,11 @@ import ReceiveIcon from '@assets/img/transactions/received.svg';
 import SendIcon from '@assets/img/transactions/sent.svg';
 import { useVisibleSip10FungibleTokens } from '@hooks/queries/stx/useGetSip10FungibleTokens';
 import useSelectedAccount from '@hooks/useSelectedAccount';
+import useWalletSelector from '@hooks/useWalletSelector';
 import { microstacksToStx } from '@secretkeylabs/xverse-core';
 import type { AddressTransactionWithTransfers } from '@stacks/stacks-blockchain-api-types';
 import type { CurrencyTypes } from '@utils/constants';
+import { HIDDEN_BALANCE_LABEL } from '@utils/constants';
 import { ftDecimals } from '@utils/helper';
 import { getFtTicker } from '@utils/tokens';
 import BigNumber from 'bignumber.js';
@@ -59,6 +61,7 @@ interface TxTransfersProps {
 
 export default function TxTransfers(props: TxTransfersProps) {
   const { transaction, coin, txFilter } = props;
+  const { balanceHidden } = useWalletSelector();
   const selectedAccount = useSelectedAccount();
   const { data: sip10CoinsList } = useVisibleSip10FungibleTokens();
   const { t } = useTranslation('translation', { keyPrefix: 'COIN_DASHBOARD_SCREEN' });
@@ -87,29 +90,31 @@ export default function TxTransfers(props: TxTransfersProps) {
       if (isFT && transfer.asset_identifier !== txFilter) {
         return null;
       }
-
       return (
         <TransactionContainer key={nanoid()}>
           {renderTransactionIcon(transfer)}
           <TransactionInfoContainer>
             <TransactionRow>
               <TransactionTitleText>{getTokenTransferTitle(transfer)}</TransactionTitleText>
-              <NumericFormat
-                value={
-                  isFT
-                    ? ftDecimals(BigNumber(transfer.amount), ft?.decimals ?? 0)
-                    : microstacksToStx(BigNumber(transfer.amount)).toString()
-                }
-                displayType="text"
-                thousandSeparator
-                allowNegative={false}
-                prefix={isSentTransaction ? '-' : ''}
-                renderText={(value: string) => (
-                  <TransactionValue>
-                    {`${value} ${isFT && ft ? getFtTicker(ft) : coin}`}
-                  </TransactionValue>
-                )}
-              />
+              {balanceHidden && <TransactionValue>{HIDDEN_BALANCE_LABEL}</TransactionValue>}
+              {!balanceHidden && (
+                <NumericFormat
+                  value={
+                    isFT
+                      ? ftDecimals(BigNumber(transfer.amount), ft?.decimals ?? 0)
+                      : microstacksToStx(BigNumber(transfer.amount)).toString()
+                  }
+                  displayType="text"
+                  thousandSeparator
+                  allowNegative={false}
+                  prefix={isSentTransaction ? '-' : ''}
+                  renderText={(value: string) => (
+                    <TransactionValue>
+                      {`${value} ${isFT && ft ? getFtTicker(ft) : coin}`}
+                    </TransactionValue>
+                  )}
+                />
+              )}
             </TransactionRow>
             <RecipientAddress>{formatAddress(transfer.recipient as string)}</RecipientAddress>
           </TransactionInfoContainer>
diff --git a/src/app/screens/coinDashboard/coinHeader.styled.ts b/src/app/screens/coinDashboard/coinHeader.styled.ts
index f5a0721d6..01b91c7cb 100644
--- a/src/app/screens/coinDashboard/coinHeader.styled.ts
+++ b/src/app/screens/coinDashboard/coinHeader.styled.ts
@@ -44,6 +44,7 @@ export const CoinBalanceText = styled.p((props) => ({
   color: props.theme.colors.white_0,
   textAlign: 'center',
   wordBreak: 'break-all',
+  cursor: 'pointer',
 }));
 
 export const FiatAmountText = styled.p((props) => ({
@@ -52,6 +53,7 @@ export const FiatAmountText = styled.p((props) => ({
   fontSize: '0.875rem',
   marginTop: props.theme.spacing(2),
   textAlign: 'center',
+  cursor: 'pointer',
 }));
 
 export const BalanceTitleText = styled.p((props) => ({
diff --git a/src/app/screens/coinDashboard/coinHeader.tsx b/src/app/screens/coinDashboard/coinHeader.tsx
index 1fb725184..b5252727f 100644
--- a/src/app/screens/coinDashboard/coinHeader.tsx
+++ b/src/app/screens/coinDashboard/coinHeader.tsx
@@ -23,7 +23,9 @@ import {
   microstacksToStx,
   type FungibleToken,
 } from '@secretkeylabs/xverse-core';
+import { setBalanceHiddenToggleAction } from '@stores/wallet/actions/actionCreators';
 import type { CurrencyTypes } from '@utils/constants';
+import { HIDDEN_BALANCE_LABEL } from '@utils/constants';
 import { isInOptions, isLedgerAccount } from '@utils/helper';
 import { trackMixPanel } from '@utils/mixpanel';
 import { getBalanceAmount, getFtTicker } from '@utils/tokens';
@@ -31,6 +33,7 @@ import BigNumber from 'bignumber.js';
 import { useState } from 'react';
 import { useTranslation } from 'react-i18next';
 import { NumericFormat } from 'react-number-format';
+import { useDispatch } from 'react-redux';
 import { useNavigate } from 'react-router-dom';
 import {
   AvailableStxContainer,
@@ -58,7 +61,7 @@ type Props = {
 
 export default function CoinHeader({ currency, fungibleToken }: Props) {
   const selectedAccount = useSelectedAccount();
-  const { fiatCurrency, network } = useWalletSelector();
+  const { fiatCurrency, network, balanceHidden } = useWalletSelector();
 
   // TODO: this should be a dumb component, move the logic to the parent
   // TODO: currently, we get btc and stx balances here for all currencies and FTs, but we should get them in
@@ -70,6 +73,7 @@ export default function CoinHeader({ currency, fungibleToken }: Props) {
   const { t } = useTranslation('translation', { keyPrefix: 'COIN_DASHBOARD_SCREEN' });
   const [openReceiveModal, setOpenReceiveModal] = useState(false);
   const isReceivingAddressesVisible = !isLedgerAccount(selectedAccount);
+  const dispatch = useDispatch();
 
   const showRunesListing =
     (useHasFeature(FeatureId.RUNES_LISTING) || process.env.NODE_ENV === 'development') &&
@@ -107,7 +111,12 @@ export default function CoinHeader({ currency, fungibleToken }: Props) {
                 value={microstacksToStx(new BigNumber(stxData?.locked ?? '0')).toString()}
                 displayType="text"
                 thousandSeparator
-                renderText={(value: string) => <StxLockedText>{`${value} STX`}</StxLockedText>}
+                renderText={(value: string) => (
+                  <StxLockedText>
+                    {balanceHidden && HIDDEN_BALANCE_LABEL}
+                    {!balanceHidden && `${value} STX`}
+                  </StxLockedText>
+                )}
               />
             </LockedStxContainer>
             <AvailableStxContainer>
@@ -116,7 +125,12 @@ export default function CoinHeader({ currency, fungibleToken }: Props) {
                 value={microstacksToStx(new BigNumber(stxData?.availableBalance ?? 0)).toString()}
                 displayType="text"
                 thousandSeparator
-                renderText={(value: string) => <StxLockedText>{`${value} STX`}</StxLockedText>}
+                renderText={(value: string) => (
+                  <StxLockedText>
+                    {balanceHidden && HIDDEN_BALANCE_LABEL}
+                    {!balanceHidden && `${value} STX`}
+                  </StxLockedText>
+                )}
               />
             </AvailableStxContainer>
           </Container>
@@ -183,6 +197,14 @@ export default function CoinHeader({ currency, fungibleToken }: Props) {
     (currency === 'STX' && isStacksSwapsEnabled);
   const showSwaps = isCrossChainSwapsEnabled && isSwapEligibleCurrency;
 
+  const fiatValue = getFiatEquivalent(
+    Number(getBalanceAmount(currency, fungibleToken, stxData, btcBalance)),
+    currency,
+    BigNumber(stxBtcRate),
+    BigNumber(btcFiatRate),
+    fungibleToken,
+  );
+
   const navigateToSwaps = () => {
     if (!showSwaps) {
       return;
@@ -207,6 +229,9 @@ export default function CoinHeader({ currency, fungibleToken }: Props) {
     handleReceiveModalOpen();
   };
 
+  const toggleHideBalance = () =>
+    dispatch(setBalanceHiddenToggleAction({ toggle: !balanceHidden }));
+
   return (
     <Container>
       <BalanceInfoContainer>
@@ -231,23 +256,27 @@ export default function CoinHeader({ currency, fungibleToken }: Props) {
             displayType="text"
             thousandSeparator
             renderText={(value: string) => (
-              <CoinBalanceText data-testid="coin-balance">{`${value} ${getTokenTicker()}`}</CoinBalanceText>
-            )}
-          />
-          <NumericFormat
-            value={getFiatEquivalent(
-              Number(getBalanceAmount(currency, fungibleToken, stxData, btcBalance)),
-              currency,
-              BigNumber(stxBtcRate),
-              BigNumber(btcFiatRate),
-              fungibleToken,
+              <CoinBalanceText data-testid="coin-balance" onClick={toggleHideBalance}>
+                {balanceHidden && HIDDEN_BALANCE_LABEL}
+                {!balanceHidden && `${value} ${getTokenTicker()}`}
+              </CoinBalanceText>
             )}
-            displayType="text"
-            thousandSeparator
-            prefix={`${currencySymbolMap[fiatCurrency]}`}
-            suffix={` ${fiatCurrency}`}
-            renderText={(value) => <FiatAmountText>{value}</FiatAmountText>}
           />
+          {fiatValue && (
+            <NumericFormat
+              value={fiatValue}
+              displayType="text"
+              thousandSeparator
+              prefix={`${currencySymbolMap[fiatCurrency]}`}
+              suffix={` ${fiatCurrency}`}
+              renderText={(value) => (
+                <FiatAmountText onClick={toggleHideBalance}>
+                  {balanceHidden && HIDDEN_BALANCE_LABEL}
+                  {!balanceHidden && value}
+                </FiatAmountText>
+              )}
+            />
+          )}
         </BalanceValuesContainer>
       </BalanceInfoContainer>
       {renderStackingBalances()}
diff --git a/src/app/screens/coinDashboard/coins/btc/addressBalance.tsx b/src/app/screens/coinDashboard/coins/btc/addressBalance.tsx
index 481f6a0d3..9cdf8c211 100644
--- a/src/app/screens/coinDashboard/coins/btc/addressBalance.tsx
+++ b/src/app/screens/coinDashboard/coins/btc/addressBalance.tsx
@@ -6,6 +6,7 @@ import useWalletSelector from '@hooks/useWalletSelector';
 import { Star } from '@phosphor-icons/react';
 import { getBtcFiatEquivalent, satsToBtc, type BtcAddressType } from '@secretkeylabs/xverse-core';
 import { StyledP } from '@ui-library/common.styled';
+import { HIDDEN_BALANCE_LABEL } from '@utils/constants';
 import BigNumber from 'bignumber.js';
 import styled from 'styled-components';
 
@@ -70,7 +71,7 @@ export default function AddressBalance({
   addressType,
   totalBalance,
 }: AddressBalanceProps) {
-  const { fiatCurrency, btcPaymentAddressType } = useWalletSelector();
+  const { fiatCurrency, btcPaymentAddressType, balanceHidden } = useWalletSelector();
   const { btcFiatRate } = useSupportedCoinRates();
 
   if (balance === undefined) {
@@ -104,12 +105,18 @@ export default function AddressBalance({
         <StyledP typography="body_m" color="white_200">{`${balancePercentage}%`}</StyledP>
       </TitleContainer>
       <BalanceContainer>
-        <StyledP typography="body_bold_m">{satsToBtc(BigNumber(balance)).toString()}</StyledP>
+        <StyledP typography="body_bold_m">
+          {balanceHidden ? HIDDEN_BALANCE_LABEL : satsToBtc(BigNumber(balance)).toString()}
+        </StyledP>
         <StyledP typography="body_m" color="white_200">
-          <FiatAmountText
-            fiatAmount={getBtcFiatEquivalent(BigNumber(balance), BigNumber(btcFiatRate))}
-            fiatCurrency={fiatCurrency}
-          />
+          {balanceHidden ? (
+            HIDDEN_BALANCE_LABEL
+          ) : (
+            <FiatAmountText
+              fiatAmount={getBtcFiatEquivalent(BigNumber(balance), BigNumber(btcFiatRate))}
+              fiatCurrency={fiatCurrency}
+            />
+          )}
         </StyledP>
       </BalanceContainer>
     </Container>
diff --git a/src/app/screens/coinDashboard/runes/bundleRow.tsx b/src/app/screens/coinDashboard/runes/bundleRow.tsx
index 6caa33587..8492595e5 100644
--- a/src/app/screens/coinDashboard/runes/bundleRow.tsx
+++ b/src/app/screens/coinDashboard/runes/bundleRow.tsx
@@ -1,7 +1,9 @@
 import RareSatIcon from '@components/rareSatIcon/rareSatIcon';
 import useSatBundleDataReducer from '@hooks/stores/useSatBundleReducer';
+import useWalletSelector from '@hooks/useWalletSelector';
 import type { Bundle } from '@secretkeylabs/xverse-core';
 import { StyledP } from '@ui-library/common.styled';
+import { HIDDEN_BALANCE_LABEL } from '@utils/constants';
 import { getTruncatedAddress } from '@utils/helper';
 import { useTranslation } from 'react-i18next';
 import { NumericFormat } from 'react-number-format';
@@ -81,6 +83,7 @@ type Props = {
 
 function RuneBundleRow({ runeAmount, runeSymbol, runeId, txId, vout, satAmount, bundle }: Props) {
   const { t } = useTranslation('translation', { keyPrefix: 'COMMON' });
+  const { balanceHidden } = useWalletSelector();
   const navigate = useNavigate();
   const satributesArr = bundle.satributes.flatMap((item) => item);
   const { setSelectedSatBundleDetails } = useSatBundleDataReducer();
@@ -113,17 +116,23 @@ function RuneBundleRow({ runeAmount, runeSymbol, runeId, txId, vout, satAmount,
         </Range>
       </RangeContainer>
       <InfoContainer>
-        <NumericFormat
-          value={runeAmount}
-          displayType="text"
-          suffix={` ${runeSymbol}`}
-          thousandSeparator
-          renderText={(value: string) => (
-            <RuneTitle typography="body_medium_m" color="white_0">
-              {value}
-            </RuneTitle>
-          )}
-        />
+        {balanceHidden ? (
+          <RuneTitle typography="body_medium_m" color="white_0">
+            {HIDDEN_BALANCE_LABEL}
+          </RuneTitle>
+        ) : (
+          <NumericFormat
+            value={runeAmount}
+            displayType="text"
+            suffix={` ${runeSymbol}`}
+            thousandSeparator
+            renderText={(value: string) => (
+              <RuneTitle typography="body_medium_m" color="white_0">
+                {value}
+              </RuneTitle>
+            )}
+          />
+        )}
         <SubContainer>
           <StyledP typography="body_medium_s" color="white_400">
             {`${getTruncatedAddress(txId, 6)}:${vout}`}
diff --git a/src/app/screens/home/balanceCard/index.tsx b/src/app/screens/home/balanceCard/index.tsx
index d36875c1a..857f30222 100644
--- a/src/app/screens/home/balanceCard/index.tsx
+++ b/src/app/screens/home/balanceCard/index.tsx
@@ -9,12 +9,14 @@ import useSupportedCoinRates from '@hooks/queries/useSupportedCoinRates';
 import useSelectedAccount from '@hooks/useSelectedAccount';
 import useWalletSelector from '@hooks/useWalletSelector';
 import { currencySymbolMap } from '@secretkeylabs/xverse-core';
+import { setBalanceHiddenToggleAction } from '@stores/wallet/actions/actionCreators';
 import Spinner from '@ui-library/spinner';
-import { LoaderSize } from '@utils/constants';
+import { HIDDEN_BALANCE_LABEL, LoaderSize } from '@utils/constants';
 import { calculateTotalBalance, getAccountBalanceKey } from '@utils/helper';
 import { useEffect } from 'react';
 import { useTranslation } from 'react-i18next';
 import { NumericFormat } from 'react-number-format';
+import { useDispatch } from 'react-redux';
 import styled from 'styled-components';
 
 const RowContainer = styled.div((props) => ({
@@ -61,8 +63,10 @@ const BalanceContainer = styled.div((props) => ({
   display: 'flex',
   flexDirection: 'row',
   justifyContent: 'flex-start',
+  width: 'fit-content',
   alignItems: 'center',
   gap: props.theme.spacing(5),
+  cursor: 'pointer',
 }));
 
 interface BalanceCardProps {
@@ -73,10 +77,10 @@ interface BalanceCardProps {
 function BalanceCard(props: BalanceCardProps) {
   const { t } = useTranslation('translation', { keyPrefix: 'DASHBOARD_SCREEN' });
   const selectedAccount = useSelectedAccount();
-  const { fiatCurrency, hideStx, accountBalances } = useWalletSelector();
+  const dispatch = useDispatch();
+  const { fiatCurrency, hideStx, accountBalances, balanceHidden } = useWalletSelector();
   const { confirmedBalance: btcBalance, isLoading: btcBalanceLoading } =
-    useSelectedAccountBtcBalance();
-  const { data: stxData } = useStxWalletData();
+    useSelectedAccountBtcBalance();  const { data: stxData } = useStxWalletData();
   const { btcFiatRate, stxBtcRate } = useSupportedCoinRates();
   const { setAccountBalance } = useAccountBalance();
   const { isLoading, isRefetching } = props;
@@ -127,6 +131,12 @@ function BalanceCard(props: BalanceCardProps) {
     })();
   });
 
+  const onClickBalance = () => dispatch(setBalanceHiddenToggleAction({ toggle: !balanceHidden }));
+
+  const onKeyDown = (event: React.KeyboardEvent) => {
+    if (event.key === 'Enter') onClickBalance();
+  };
+
   return (
     <>
       <RowContainer>
@@ -140,20 +150,29 @@ function BalanceCard(props: BalanceCardProps) {
           <BarLoader loaderSize={LoaderSize.LARGE} />
         </BarLoaderContainer>
       ) : (
-        <BalanceContainer>
-          <NumericFormat
-            value={balance}
-            displayType="text"
-            prefix={`${currencySymbolMap[fiatCurrency]}`}
-            thousandSeparator
-            renderText={(value: string) => (
-              <BalanceAmountText data-testid="total-balance-value">{value}</BalanceAmountText>
-            )}
-          />
-          {isRefetching && (
-            <div>
-              <Spinner color="white" size={16} />
-            </div>
+        <BalanceContainer onClick={onClickBalance} role="button" tabIndex={0} onKeyDown={onKeyDown}>
+          {balanceHidden && (
+            <BalanceAmountText data-testid="total-balance-value">
+              {HIDDEN_BALANCE_LABEL}
+            </BalanceAmountText>
+          )}
+          {!balanceHidden && (
+            <>
+              <NumericFormat
+                value={balance}
+                displayType="text"
+                prefix={`${currencySymbolMap[fiatCurrency]}`}
+                thousandSeparator
+                renderText={(value: string) => (
+                  <BalanceAmountText data-testid="total-balance-value">{value}</BalanceAmountText>
+                )}
+              />
+              {isRefetching && (
+                <div>
+                  <Spinner color="white" size={16} />
+                </div>
+              )}
+            </>
           )}
         </BalanceContainer>
       )}
diff --git a/src/app/screens/sendBrc20OneStep/brc20TransferForm.tsx b/src/app/screens/sendBrc20OneStep/brc20TransferForm.tsx
index eafe9889a..036a8d91f 100644
--- a/src/app/screens/sendBrc20OneStep/brc20TransferForm.tsx
+++ b/src/app/screens/sendBrc20OneStep/brc20TransferForm.tsx
@@ -1,5 +1,6 @@
 import ActionButton from '@components/button';
 import TokenImage from '@components/tokenImage';
+import useWalletSelector from '@hooks/useWalletSelector';
 import type { FungibleToken } from '@secretkeylabs/xverse-core';
 import Callout from '@ui-library/callout';
 import { StickyButtonContainer } from '@ui-library/common.styled';
@@ -8,6 +9,7 @@ import {
   isDangerFeedback,
   type InputFeedbackProps,
 } from '@ui-library/inputFeedback';
+import { HIDDEN_BALANCE_LABEL } from '@utils/constants';
 import { getFtTicker } from '@utils/tokens';
 import { useTranslation } from 'react-i18next';
 import { NumericFormat } from 'react-number-format';
@@ -147,6 +149,7 @@ function Brc20TransferForm(props: Props) {
   } = props;
 
   const tokenCurrency = getFtTicker(token);
+  const { balanceHidden } = useWalletSelector();
 
   return (
     <Container>
@@ -164,11 +167,14 @@ function Brc20TransferForm(props: Props) {
             <Label>{t('AMOUNT')}</Label>
             <BalanceText>{t('BALANCE')}:</BalanceText>
             <Text>
-              <NumericFormat
-                value={token.balance.toString()}
-                displayType="text"
-                thousandSeparator
-              />
+              {balanceHidden && HIDDEN_BALANCE_LABEL}
+              {!balanceHidden && (
+                <NumericFormat
+                  value={token.balance.toString()}
+                  displayType="text"
+                  thousandSeparator
+                />
+              )}
             </Text>
           </RowContainer>
           <AmountInputContainer error={isDangerFeedback(amountError)}>
diff --git a/src/app/screens/sendRune/runeAmountSelector.tsx b/src/app/screens/sendRune/runeAmountSelector.tsx
index 86b36c135..84212ef89 100644
--- a/src/app/screens/sendRune/runeAmountSelector.tsx
+++ b/src/app/screens/sendRune/runeAmountSelector.tsx
@@ -4,6 +4,7 @@ import { ArrowsDownUp } from '@phosphor-icons/react';
 import { currencySymbolMap, type FungibleToken } from '@secretkeylabs/xverse-core';
 import { StyledP } from '@ui-library/common.styled';
 import Input, { ConvertComplication, MaxButton, VertRule } from '@ui-library/input';
+import { HIDDEN_BALANCE_LABEL } from '@utils/constants';
 import { ftDecimals } from '@utils/helper';
 import { getFtTicker } from '@utils/tokens';
 import BigNumber from 'bignumber.js';
@@ -69,7 +70,7 @@ function RuneAmountSelector({
   amountError,
 }: Props) {
   const { t } = useTranslation('translation', { keyPrefix: 'SEND' });
-  const { fiatCurrency } = useWalletSelector();
+  const { fiatCurrency, balanceHidden } = useWalletSelector();
   const [displayAmount, setDisplayAmount] = useState(amountToSend);
   const tokenDecimals = Number(token.decimals ?? 0);
   const tokenBalance = new BigNumber(ftDecimals(token.balance, tokenDecimals));
@@ -144,8 +145,9 @@ function RuneAmountSelector({
           prefix={useTokenValue ? '' : `~ ${currencySymbolMap[fiatCurrency]}`}
           renderText={(value: string) => (
             <BalanceTextWrapper data-testid="balance-label">
-              <BalanceText>{t('BALANCE')}</BalanceText> {value}{' '}
-              {useTokenValue ? getFtTicker(token) : fiatCurrency}
+              <BalanceText>{t('BALANCE')}</BalanceText>
+              {balanceHidden && ` ${HIDDEN_BALANCE_LABEL}`}
+              {!balanceHidden && ` ${value} ${useTokenValue ? getFtTicker(token) : fiatCurrency}`}
             </BalanceTextWrapper>
           )}
         />
diff --git a/src/app/screens/sendStx/ftAmountSelector.tsx b/src/app/screens/sendStx/ftAmountSelector.tsx
index 522df841a..f854692fe 100644
--- a/src/app/screens/sendStx/ftAmountSelector.tsx
+++ b/src/app/screens/sendStx/ftAmountSelector.tsx
@@ -4,6 +4,7 @@ import { ArrowsDownUp } from '@phosphor-icons/react';
 import { currencySymbolMap, type FungibleToken } from '@secretkeylabs/xverse-core';
 import { StyledP } from '@ui-library/common.styled';
 import Input, { ConvertComplication, MaxButton } from '@ui-library/input';
+import { HIDDEN_BALANCE_LABEL } from '@utils/constants';
 import { ftDecimals } from '@utils/helper';
 import { getFtTicker } from '@utils/tokens';
 import BigNumber from 'bignumber.js';
@@ -69,7 +70,7 @@ function FtAmountSelector({
   fungibleToken,
 }: Props) {
   const { t } = useTranslation('translation', { keyPrefix: 'SEND' });
-  const { fiatCurrency } = useWalletSelector();
+  const { fiatCurrency, balanceHidden } = useWalletSelector();
   const tokenDecimals = fungibleToken.decimals ?? 0;
   const tokenSymbol = getFtTicker(fungibleToken);
 
@@ -180,8 +181,9 @@ function FtAmountSelector({
           prefix={useTokenValue ? '' : `~ ${currencySymbolMap[fiatCurrency]}`}
           renderText={(value: string) => (
             <BalanceTextWrapper data-testid="balance-label">
-              <BalanceText>{t('BALANCE')}</BalanceText> {value}{' '}
-              {useTokenValue ? tokenSymbol : fiatCurrency}
+              <BalanceText>{t('BALANCE')}</BalanceText>
+              {balanceHidden && ` ${HIDDEN_BALANCE_LABEL}`}
+              {!balanceHidden && ` ${value} ${useTokenValue ? tokenSymbol : fiatCurrency}`}
             </BalanceTextWrapper>
           )}
         />
diff --git a/src/app/screens/sendStx/stxAmountSelector.tsx b/src/app/screens/sendStx/stxAmountSelector.tsx
index 21df7e4b2..a6f7def5c 100644
--- a/src/app/screens/sendStx/stxAmountSelector.tsx
+++ b/src/app/screens/sendStx/stxAmountSelector.tsx
@@ -12,6 +12,7 @@ import {
 } from '@secretkeylabs/xverse-core';
 import { StyledP } from '@ui-library/common.styled';
 import Input, { ConvertComplication, MaxButton } from '@ui-library/input';
+import { HIDDEN_BALANCE_LABEL } from '@utils/constants';
 import BigNumber from 'bignumber.js';
 import { useEffect, useState } from 'react';
 import { useTranslation } from 'react-i18next';
@@ -68,7 +69,7 @@ type Props = {
 
 function StxAmountSelector({ amount, setAmount, sendMax, setSendMax, disabled = false }: Props) {
   const { t } = useTranslation('translation', { keyPrefix: 'SEND' });
-  const { fiatCurrency } = useWalletSelector();
+  const { fiatCurrency, balanceHidden } = useWalletSelector();
   const { data: stxData } = useStxWalletData();
   const { btcFiatRate, stxBtcRate } = useSupportedCoinRates();
   const stxBalanceStr = stxData?.availableBalance.toString() ?? '0';
@@ -187,7 +188,9 @@ function StxAmountSelector({ amount, setAmount, sendMax, setSendMax, disabled =
           prefix={useStxValue ? '' : `~ ${currencySymbolMap[fiatCurrency]}`}
           renderText={(value: string) => (
             <div data-testid="balance-label">
-              <BalanceText>{t('BALANCE')}</BalanceText> {value} {useStxValue ? 'STX' : fiatCurrency}
+              <BalanceText>{t('BALANCE')}</BalanceText>
+              {balanceHidden && ` ${HIDDEN_BALANCE_LABEL}`}
+              {!balanceHidden && ` ${value} ${useStxValue ? 'STX' : fiatCurrency}`}
             </div>
           )}
         />
diff --git a/src/app/screens/swap/components/tokenToBottomSheet/index.tsx b/src/app/screens/swap/components/tokenToBottomSheet/index.tsx
index 5a0830d88..571efe710 100644
--- a/src/app/screens/swap/components/tokenToBottomSheet/index.tsx
+++ b/src/app/screens/swap/components/tokenToBottomSheet/index.tsx
@@ -182,7 +182,7 @@ export default function TokenToBottomSheet({
                     });
                     handleClose();
                   }}
-                  hideBalance
+                  hideSwapBalance
                 />
               );
             }
@@ -200,7 +200,7 @@ export default function TokenToBottomSheet({
                     });
                     handleClose();
                   }}
-                  hideBalance
+                  hideSwapBalance
                 />
               );
             }
@@ -219,7 +219,7 @@ export default function TokenToBottomSheet({
                     handleClose();
                   }}
                   fungibleToken={mapSwapTokenToFT(token)}
-                  hideBalance
+                  hideSwapBalance
                 />
               );
             }
diff --git a/src/app/stores/index.ts b/src/app/stores/index.ts
index 6e5a77af2..452d5024c 100644
--- a/src/app/stores/index.ts
+++ b/src/app/stores/index.ts
@@ -144,6 +144,7 @@ const migrations = {
       hiddenCollectibleIds: (state as unknown as WalletStateV5).hiddenCollectibleIds || {},
       starredCollectibleIds: (state as unknown as WalletStateV5).starredCollectibleIds || {},
       avatarIds: migrateAvatarIds((state as unknown as WalletStateV5).avatarIds),
+      balanceHidden: false,
     };
   },
   /* *
diff --git a/src/app/stores/wallet/actions/actionCreators.ts b/src/app/stores/wallet/actions/actionCreators.ts
index da18c5f96..f9243c29d 100644
--- a/src/app/stores/wallet/actions/actionCreators.ts
+++ b/src/app/stores/wallet/actions/actionCreators.ts
@@ -340,3 +340,12 @@ export function removeAccountAvatarAction(params: {
     ...params,
   };
 }
+
+export function setBalanceHiddenToggleAction(params: {
+  toggle: boolean;
+}): actions.SetBalanceHiddenToggle {
+  return {
+    type: actions.SetBalanceHiddenToggleKey,
+    ...params,
+  };
+}
diff --git a/src/app/stores/wallet/actions/migrationTypes.ts b/src/app/stores/wallet/actions/migrationTypes.ts
index 253954a90..7d5725c9c 100644
--- a/src/app/stores/wallet/actions/migrationTypes.ts
+++ b/src/app/stores/wallet/actions/migrationTypes.ts
@@ -159,4 +159,5 @@ export type WalletStateV5 = Omit<
   hiddenCollectibleIds: Record<string, Record<string, string>>;
   starredCollectibleIds: Record<string, Array<{ id: string; collectionId: string }>>;
   avatarIds: Record<string, AvatarInfo>;
+  balanceHidden: boolean;
 };
diff --git a/src/app/stores/wallet/actions/types.ts b/src/app/stores/wallet/actions/types.ts
index b1a388efe..0572b8c1a 100644
--- a/src/app/stores/wallet/actions/types.ts
+++ b/src/app/stores/wallet/actions/types.ts
@@ -48,6 +48,7 @@ export const RemoveFromHideCollectiblesKey = 'RemoveFromHideCollectiblesKey';
 export const RemoveAllFromHideCollectiblesKey = 'RemoveAllFromHideCollectiblesKey';
 export const SetAccountAvatarKey = 'SetAccountAvatarKey';
 export const RemoveAccountAvatarKey = 'RemoveAccountAvatarKey';
+export const SetBalanceHiddenToggleKey = 'SetBalanceHiddenToggleKey';
 
 export enum WalletSessionPeriods {
   LOW = 15,
@@ -94,6 +95,7 @@ export interface WalletState {
   hiddenCollectibleIds: Record<string, Record<string, string>>;
   starredCollectibleIds: Record<string, Array<{ id: string; collectionId: string }>>;
   avatarIds: Record<string, AvatarInfo>;
+  balanceHidden: boolean;
 }
 
 export interface StoreEncryptedSeed {
@@ -299,6 +301,11 @@ export type AvatarInfo =
       nft: NftData;
     };
 
+export interface SetBalanceHiddenToggle {
+  type: typeof SetBalanceHiddenToggleKey;
+  toggle: boolean;
+}
+
 export type WalletActions =
   | ResetWallet
   | UpdateSoftwareAccounts
@@ -336,4 +343,5 @@ export type WalletActions =
   | RemoveAllFromHideCollectibles
   | SetHiddenCollectibles
   | SetAccountAvatar
-  | RemoveAccountAvatar;
+  | RemoveAccountAvatar
+  | SetBalanceHiddenToggle;
diff --git a/src/app/stores/wallet/reducer.ts b/src/app/stores/wallet/reducer.ts
index b1f390c73..29923f5c7 100644
--- a/src/app/stores/wallet/reducer.ts
+++ b/src/app/stores/wallet/reducer.ts
@@ -22,6 +22,7 @@ import {
   SelectAccountKey,
   SetAccountAvatarKey,
   SetAccountBalanceKey,
+  SetBalanceHiddenToggleKey,
   SetBrc20ManageTokensKey,
   SetFeeMultiplierKey,
   SetHiddenCollectiblesKey,
@@ -100,6 +101,7 @@ export const initialWalletState: WalletState = {
   hiddenCollectibleIds: {},
   starredCollectibleIds: {},
   avatarIds: {},
+  balanceHidden: false,
 };
 
 /**
@@ -385,6 +387,12 @@ const walletReducer = (
         avatarIds: clonedAvatarIds,
       };
     }
+    case SetBalanceHiddenToggleKey: {
+      return {
+        ...state,
+        balanceHidden: action.toggle,
+      };
+    }
     default:
       return state;
   }
diff --git a/src/app/ui-components/btcAmountSelector.tsx b/src/app/ui-components/btcAmountSelector.tsx
index fb795b7a3..3d2f491b0 100644
--- a/src/app/ui-components/btcAmountSelector.tsx
+++ b/src/app/ui-components/btcAmountSelector.tsx
@@ -4,13 +4,14 @@ import useSelectedAccount from '@hooks/useSelectedAccount';
 import useWalletSelector from '@hooks/useWalletSelector';
 import { ArrowsDownUp } from '@phosphor-icons/react';
 import {
+  type BtcPaymentType,
   btcToSats,
   currencySymbolMap,
   getBtcFiatEquivalent,
   getFiatBtcEquivalent,
-  type BtcPaymentType,
 } from '@secretkeylabs/xverse-core';
 import Input, { ConvertComplication, MaxButton, VertRule } from '@ui-library/input';
+import { HIDDEN_BALANCE_LABEL } from '@utils/constants';
 import { satsToBtcString } from '@utils/helper';
 import BigNumber from 'bignumber.js';
 import { useEffect, useState } from 'react';
@@ -59,7 +60,7 @@ function AmountSelector({
   disabled = false,
 }: Props) {
   const { t } = useTranslation('translation', { keyPrefix: 'SEND' });
-  const { fiatCurrency } = useWalletSelector();
+  const { fiatCurrency, balanceHidden } = useWalletSelector();
   const { btcFiatRate } = useSupportedCoinRates();
   const selectedAccount = useSelectedAccount(overridePaymentType);
   const { data: addressBtcBalance } = useBtcAddressBalance(selectedAccount.btcAddress);
@@ -179,8 +180,9 @@ function AmountSelector({
           prefix={useBtcValue ? '' : `~${currencySymbolMap[fiatCurrency]}`}
           renderText={(value: string) => (
             <BalanceDiv data-testid="balance-label">
-              <BalanceText>{t('BALANCE')} </BalanceText> {value}{' '}
-              {useBtcValue ? 'BTC' : fiatCurrency}
+              <BalanceText>{t('BALANCE')}</BalanceText>
+              {balanceHidden && ` ${HIDDEN_BALANCE_LABEL}`}
+              {!balanceHidden && ` ${value} ${useBtcValue ? 'BTC' : fiatCurrency}`}
             </BalanceDiv>
           )}
         />
diff --git a/src/app/utils/constants.ts b/src/app/utils/constants.ts
index 2350dddb7..57743f118 100644
--- a/src/app/utils/constants.ts
+++ b/src/app/utils/constants.ts
@@ -65,9 +65,9 @@ export const DEFAULT_TRANSITION_OPTIONS = {
 };
 
 export const MAX_ACC_NAME_LENGTH = 20;
-
 // UI
 export const EMPTY_LABEL = '--';
+export const HIDDEN_BALANCE_LABEL = '●●●●●●';
 export const OPTIONS_DIALOG_WIDTH = 179;
 export const SPAM_OPTIONS_WIDTH = 244;
 export const LONG_TOAST_DURATION = 4000;

From f9453ceb0208a876c15718cf0028ce91dfc5bffd Mon Sep 17 00:00:00 2001
From: Terence Ng <ngtere@live.com.sg>
Date: Wed, 16 Oct 2024 16:05:30 +0200
Subject: [PATCH 182/227] Terence/shorten coin header (#681)

* remove duplicate

* remove balance text
---
 src/app/screens/coinDashboard/coinHeader.tsx | 11 +++++------
 src/locales/en.json                          |  2 ++
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/src/app/screens/coinDashboard/coinHeader.tsx b/src/app/screens/coinDashboard/coinHeader.tsx
index b5252727f..320d21e89 100644
--- a/src/app/screens/coinDashboard/coinHeader.tsx
+++ b/src/app/screens/coinDashboard/coinHeader.tsx
@@ -71,6 +71,7 @@ export default function CoinHeader({ currency, fungibleToken }: Props) {
   const { btcFiatRate, stxBtcRate } = useSupportedCoinRates();
   const navigate = useNavigate();
   const { t } = useTranslation('translation', { keyPrefix: 'COIN_DASHBOARD_SCREEN' });
+  const { t: commonT } = useTranslation('translation', { keyPrefix: 'COMMON' });
   const [openReceiveModal, setOpenReceiveModal] = useState(false);
   const isReceivingAddressesVisible = !isLedgerAccount(selectedAccount);
   const dispatch = useDispatch();
@@ -170,20 +171,18 @@ export default function CoinHeader({ currency, fungibleToken }: Props) {
 
   const getDashboardTitle = () => {
     if (fungibleToken?.name) {
-      return `${fungibleToken.name} ${t('BALANCE')}`;
+      return fungibleToken.name;
     }
-
     if (!currency) {
       return '';
     }
-
     if (currency === 'STX') {
-      return `Stacks ${t('BALANCE')}`;
+      return commonT('STACKS');
     }
     if (currency === 'BTC') {
-      return `Bitcoin ${t('BALANCE')}`;
+      return commonT('BITCOIN');
     }
-    return `${currency} ${t('BALANCE')}`;
+    return `${currency}`;
   };
 
   const isCrossChainSwapsEnabled = useHasFeature(FeatureId.CROSS_CHAIN_SWAPS);
diff --git a/src/locales/en.json b/src/locales/en.json
index 6d2c69ecd..ca6d97e02 100644
--- a/src/locales/en.json
+++ b/src/locales/en.json
@@ -5,6 +5,8 @@
     "COMBO": "Combo",
     "SATS": "Sats",
     "BTC": "BTC",
+    "BITCOIN": "Bitcoin",
+    "STACKS": "Stacks",
     "SATRIBUTES": "Satributes",
     "INPUT": "Input",
     "SIZE": "Size",

From 01cca1941496236ec0a0b7609bb3b56847d7679d Mon Sep 17 00:00:00 2001
From: Terence Ng <ngtere@live.com.sg>
Date: Wed, 16 Oct 2024 16:26:27 +0200
Subject: [PATCH 183/227] Terence/fix stx header (#682)

* remove duplicate

* fix header

* fix stx header
---
 src/app/screens/coinDashboard/coinHeader.tsx | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/app/screens/coinDashboard/coinHeader.tsx b/src/app/screens/coinDashboard/coinHeader.tsx
index 320d21e89..bc813abec 100644
--- a/src/app/screens/coinDashboard/coinHeader.tsx
+++ b/src/app/screens/coinDashboard/coinHeader.tsx
@@ -177,6 +177,9 @@ export default function CoinHeader({ currency, fungibleToken }: Props) {
       return '';
     }
     if (currency === 'STX') {
+      if (new BigNumber(stxData?.locked ?? 0).gt(0)) {
+        return `Available ${commonT('STACKS')} Balance`;
+      }
       return commonT('STACKS');
     }
     if (currency === 'BTC') {

From e36f456745b5a2ad28ca43a347ade7d4ef439c36 Mon Sep 17 00:00:00 2001
From: Tim Man <tim@secretkeylabs.com>
Date: Thu, 17 Oct 2024 20:34:17 +0800
Subject: [PATCH 184/227] fix: app fee should be number (#686)

---
 src/common/utils/rpc/runes/mint.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/common/utils/rpc/runes/mint.ts b/src/common/utils/rpc/runes/mint.ts
index 35713f5f7..0942f0318 100644
--- a/src/common/utils/rpc/runes/mint.ts
+++ b/src/common/utils/rpc/runes/mint.ts
@@ -14,7 +14,7 @@ import RequestsRoutes from '../../route-urls';
 import { makeRPCError, sendRpcResponse } from '../helpers';
 
 const MintRuneParamsSchema = z.object({
-  appServiceFee: z.string().optional(),
+  appServiceFee: z.number().optional(),
   appServiceFeeAddress: z.string().optional(),
   destinationAddress: z.string(),
   feeRate: z.number(),

From 82daf265aef314ea8257eb7a4a2bdf48509f615b Mon Sep 17 00:00:00 2001
From: Victor Kirov <victor.kirov@gmail.com>
Date: Thu, 17 Oct 2024 15:41:48 +0300
Subject: [PATCH 185/227] [ENG-5456] Restyle batch sign psbt (to RC) (#678)

* Restyle batch sign psbt

* Improve container styling

* Bypass custom arrow icon styles
---
 .../batchPsbtSigning/index.styled.ts          |  31 +++--
 src/app/components/batchPsbtSigning/index.tsx | 113 ++++++++++++------
 src/app/components/bottomModal/index.tsx      |  10 +-
 src/app/ui-library/button.tsx                 |   2 +-
 4 files changed, 100 insertions(+), 56 deletions(-)

diff --git a/src/app/components/batchPsbtSigning/index.styled.ts b/src/app/components/batchPsbtSigning/index.styled.ts
index 79c35ffb1..c5e46a2f6 100644
--- a/src/app/components/batchPsbtSigning/index.styled.ts
+++ b/src/app/components/batchPsbtSigning/index.styled.ts
@@ -1,5 +1,5 @@
 import BottomModal from '@components/bottomModal';
-import { StickyHorizontalSplitButtonContainer } from '@ui-library/common.styled';
+import Button from '@ui-library/button';
 import styled from 'styled-components';
 
 export const OuterContainer = styled.div`
@@ -25,6 +25,14 @@ export const ModalContainer = styled(Container)({
   marginTop: 0,
 });
 
+export const HeaderContainer = styled.div((props) => ({
+  display: 'flex',
+  flexDirection: 'row',
+  justifyContent: 'space-between',
+  marginBottom: props.theme.space.l,
+  alignItems: 'center',
+}));
+
 export const LoaderContainer = styled.div((props) => ({
   display: 'flex',
   flex: 1,
@@ -33,15 +41,9 @@ export const LoaderContainer = styled.div((props) => ({
   marginTop: props.theme.space.l,
 }));
 
-export const TransparentButtonContainer = styled.div((props) => ({
-  marginRight: props.theme.space.s,
-  width: '100%',
-}));
-
 export const ReviewTransactionText = styled.h1((props) => ({
   ...props.theme.headline_s,
   color: props.theme.colors.white_0,
-  marginBottom: props.theme.space.l,
   textAlign: 'left',
 }));
 
@@ -70,13 +72,18 @@ export const StyledSheet = styled(BottomModal)`
   background-color: #181818 !important;
 `;
 
-export const TxReviewModalControls = styled.div((props) => ({
+export const ButtonsContainer = styled.div((props) => ({
   display: 'flex',
   columnGap: props.theme.space.s,
   padding: `${props.theme.space.l} ${props.theme.space.m}`,
 }));
 
-export const ButtonsContainer = styled(StickyHorizontalSplitButtonContainer)`
-  padding-left: ${(props) => props.theme.space.m};
-  padding-right: ${(props) => props.theme.space.m};
-`;
+export const InlineButtonsContainer = styled(ButtonsContainer)((props) => ({
+  columnGap: props.theme.space.xs,
+  padding: 'inherit',
+}));
+
+export const SmallButton = styled(Button)(() => ({
+  minWidth: 44,
+  padding: 'initial',
+}));
diff --git a/src/app/components/batchPsbtSigning/index.tsx b/src/app/components/batchPsbtSigning/index.tsx
index b88f46822..791766320 100644
--- a/src/app/components/batchPsbtSigning/index.tsx
+++ b/src/app/components/batchPsbtSigning/index.tsx
@@ -32,13 +32,14 @@ import {
   BundleLinkText,
   ButtonsContainer,
   Container,
+  HeaderContainer,
+  InlineButtonsContainer,
   LoaderContainer,
   ModalContainer,
   OuterContainer,
   ReviewTransactionText,
+  SmallButton,
   StyledSheet,
-  TransparentButtonContainer,
-  TxReviewModalControls,
 } from './index.styled';
 
 type ParsedPsbt = {
@@ -223,9 +224,7 @@ function BatchPsbtSigning({ onSigned, psbts, onCancel, onPostSignDone }: BatchPs
             </Container>
           </OuterContainer>
           <ButtonsContainer>
-            <TransparentButtonContainer>
-              <Button title={t('CANCEL')} variant="secondary" onClick={onCancel} />
-            </TransparentButtonContainer>
+            <Button title={t('CANCEL')} variant="secondary" onClick={onCancel} />
             <Button
               title={t('CONFIRM_ALL')}
               onClick={() => onSignPsbtConfirmed()}
@@ -236,24 +235,50 @@ function BatchPsbtSigning({ onSigned, psbts, onCancel, onPostSignDone }: BatchPs
       );
     };
 
-    const reviewDoneText = hasDuplicateInputs ? t('CONFIRM_ALL') : t('DONE');
-    const onReviewDone = hasDuplicateInputs
-      ? () => onSignPsbtConfirmed()
-      : () => {
-          setReviewTransaction(false);
-          setCurrentPsbtIndex(0);
-        };
+    const onReviewDone = () => {
+      setReviewTransaction(false);
+      setCurrentPsbtIndex(0);
+    };
 
     return (
       <>
         <AccountHeaderComponent disableMenuOption disableAccountSwitch />
         {renderBody()}
-        <StyledSheet header="" visible={reviewTransaction || hasDuplicateInputs} onClose={onCancel}>
+        <StyledSheet
+          header=""
+          visible={reviewTransaction || hasDuplicateInputs}
+          onClose={hasDuplicateInputs ? undefined : onReviewDone}
+        >
           <OuterContainer>
             <ModalContainer>
-              <ReviewTransactionText>
-                {t('TRANSACTION')} {currentPsbtIndex + 1}/{parsedPsbts.length}
-              </ReviewTransactionText>
+              <HeaderContainer>
+                <ReviewTransactionText>
+                  {t('TRANSACTION')} {currentPsbtIndex + 1}/{parsedPsbts.length}
+                </ReviewTransactionText>
+                {hasDuplicateInputs && (
+                  <InlineButtonsContainer>
+                    <SmallButton
+                      title=""
+                      variant="secondary"
+                      onClick={() => {
+                        setCurrentPsbtIndex((prevIndex) => prevIndex - 1);
+                      }}
+                      icon={<ArrowLeft size={16} weight="bold" />}
+                      disabled={currentPsbtIndex === 0}
+                    />
+                    <SmallButton
+                      title=""
+                      variant="secondary"
+                      onClick={() => {
+                        setCurrentPsbtIndex((prevIndex) => prevIndex + 1);
+                      }}
+                      icon={<ArrowRight size={16} weight="bold" />}
+                      iconPosition="right"
+                      disabled={currentPsbtIndex === parsedPsbts.length - 1}
+                    />
+                  </InlineButtonsContainer>
+                )}
+              </HeaderContainer>
               {!!parsedPsbts[currentPsbtIndex] && (
                 <TxSummaryContext.Provider value={individualTxSummaryContext}>
                   <TransactionSummary />
@@ -261,31 +286,41 @@ function BatchPsbtSigning({ onSigned, psbts, onCancel, onPostSignDone }: BatchPs
               )}
             </ModalContainer>
           </OuterContainer>
-          <TxReviewModalControls>
-            <Button
-              title={t('PREVIOUS')}
-              variant="secondary"
-              onClick={() => {
-                setCurrentPsbtIndex((prevIndex) => prevIndex - 1);
-              }}
-              icon={<ArrowLeft color="white" size={16} weight="bold" />}
-              disabled={currentPsbtIndex === 0}
-            />
-            {currentPsbtIndex < parsedPsbts.length - 1 && (
-              <Button
-                title={t('NEXT')}
-                variant="secondary"
-                onClick={() => {
-                  setCurrentPsbtIndex((prevIndex) => prevIndex + 1);
-                }}
-                icon={<ArrowRight color="white" size={16} weight="bold" />}
-                iconPosition="right"
-              />
+          <ButtonsContainer>
+            {hasDuplicateInputs && (
+              <>
+                <Button title={t('CANCEL')} variant="secondary" onClick={onCancel} />
+                <Button
+                  title={t('CONFIRM_ALL')}
+                  onClick={() => onSignPsbtConfirmed()}
+                  loading={isSigning}
+                />
+              </>
             )}
-            {currentPsbtIndex === parsedPsbts.length - 1 && (
-              <Button title={reviewDoneText} onClick={onReviewDone} />
+            {!hasDuplicateInputs && (
+              <>
+                <Button
+                  title={t('PREVIOUS')}
+                  variant="secondary"
+                  onClick={() => {
+                    setCurrentPsbtIndex((prevIndex) => prevIndex - 1);
+                  }}
+                  icon={<ArrowLeft size={16} weight="bold" />}
+                  disabled={currentPsbtIndex === 0}
+                />
+                <Button
+                  title={t('NEXT')}
+                  variant="secondary"
+                  onClick={() => {
+                    setCurrentPsbtIndex((prevIndex) => prevIndex + 1);
+                  }}
+                  icon={<ArrowRight size={16} weight="bold" />}
+                  iconPosition="right"
+                  disabled={currentPsbtIndex === parsedPsbts.length - 1}
+                />
+              </>
             )}
-          </TxReviewModalControls>
+          </ButtonsContainer>
         </StyledSheet>
       </>
     );
diff --git a/src/app/components/bottomModal/index.tsx b/src/app/components/bottomModal/index.tsx
index 4e27454c1..724522c74 100644
--- a/src/app/components/bottomModal/index.tsx
+++ b/src/app/components/bottomModal/index.tsx
@@ -32,7 +32,7 @@ type Props = {
   header: string;
   visible: boolean;
   children: React.ReactNode;
-  onClose: () => void;
+  onClose?: () => void;
   overlayStylesOverriding?: {};
   contentStylesOverriding?: {};
   className?: string;
@@ -86,9 +86,11 @@ function BottomModal({
     >
       <RowContainer>
         <BottomModalHeaderText>{header}</BottomModalHeaderText>
-        <ButtonImage onClick={onClose}>
-          <XCircle color={theme.colors.white_200} weight="fill" size="28" />
-        </ButtonImage>
+        {onClose && (
+          <ButtonImage onClick={onClose}>
+            <XCircle color={theme.colors.white_200} weight="fill" size="28" />
+          </ButtonImage>
+        )}
       </RowContainer>
       {children}
     </CustomisedModal>
diff --git a/src/app/ui-library/button.tsx b/src/app/ui-library/button.tsx
index 47f130f79..402fc0018 100644
--- a/src/app/ui-library/button.tsx
+++ b/src/app/ui-library/button.tsx
@@ -147,7 +147,7 @@ function Button({
       ) : (
         <>
           {icon && iconPosition === 'left' && <CenterDiv>{icon}</CenterDiv>}
-          <div>{title}</div>
+          {title && <div>{title}</div>}
           {icon && iconPosition === 'right' && <CenterDiv>{icon}</CenterDiv>}
         </>
       )}

From 34ec65e76f90d62dd221b44cee7475795b9cf1cc Mon Sep 17 00:00:00 2001
From: Victor Kirov <victor.kirov@gmail.com>
Date: Mon, 21 Oct 2024 10:20:50 +0300
Subject: [PATCH 186/227] Fix empty avatarIds in migration

---
 src/app/stores/index.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/app/stores/index.ts b/src/app/stores/index.ts
index 452d5024c..d12bae4c3 100644
--- a/src/app/stores/index.ts
+++ b/src/app/stores/index.ts
@@ -143,7 +143,7 @@ const migrations = {
       // we cast state to v5 as the below went live without a migration
       hiddenCollectibleIds: (state as unknown as WalletStateV5).hiddenCollectibleIds || {},
       starredCollectibleIds: (state as unknown as WalletStateV5).starredCollectibleIds || {},
-      avatarIds: migrateAvatarIds((state as unknown as WalletStateV5).avatarIds),
+      avatarIds: migrateAvatarIds((state as unknown as WalletStateV5).avatarIds || {}),
       balanceHidden: false,
     };
   },

From 06c34081bd4d0e08b2705587767e69d07cebce39 Mon Sep 17 00:00:00 2001
From: Victor Kirov <victor.kirov@gmail.com>
Date: Mon, 21 Oct 2024 13:40:31 +0300
Subject: [PATCH 187/227] Fix a few issues from testing native segwit

---
 .../preferredBtcAddress/addressTypeSelector.tsx  |  9 +--------
 .../components/preferredBtcAddressItem/index.tsx |  8 ++++++--
 src/app/hooks/useWalletReducer.ts                | 16 ++++++++++++----
 .../restoreWallet/paymentAddressTypeSelector.tsx |  6 +++---
 src/app/screens/settings/index.styles.ts         |  2 +-
 src/app/ui-library/sheet.tsx                     |  5 +++++
 src/locales/en.json                              |  8 ++++----
 7 files changed, 32 insertions(+), 22 deletions(-)

diff --git a/src/app/components/preferredBtcAddress/addressTypeSelector.tsx b/src/app/components/preferredBtcAddress/addressTypeSelector.tsx
index a40b09a29..360d58734 100644
--- a/src/app/components/preferredBtcAddress/addressTypeSelector.tsx
+++ b/src/app/components/preferredBtcAddress/addressTypeSelector.tsx
@@ -1,7 +1,5 @@
 import PreferredBtcAddressItem from '@components/preferredBtcAddressItem';
 import useBtcAddressBalance from '@hooks/useBtcAddressBalance';
-import { satsToBtc } from '@secretkeylabs/xverse-core';
-import BigNumber from 'bignumber.js';
 
 type Props = {
   title: string;
@@ -13,18 +11,13 @@ type Props = {
 function AddressTypeSelector({ title, onClick, address, isSelected }: Props) {
   const { data } = useBtcAddressBalance(address ?? '');
 
-  const balance =
-    data?.confirmedBalance !== undefined
-      ? `${satsToBtc(BigNumber(data.confirmedBalance))} BTC`
-      : '';
-
   return (
     <PreferredBtcAddressItem
       title={title}
       onClick={onClick}
       address={address}
       isSelected={isSelected}
-      balance={balance}
+      balanceSats={data?.confirmedBalance}
     />
   );
 }
diff --git a/src/app/components/preferredBtcAddressItem/index.tsx b/src/app/components/preferredBtcAddressItem/index.tsx
index ad520158b..7011ffa2d 100644
--- a/src/app/components/preferredBtcAddressItem/index.tsx
+++ b/src/app/components/preferredBtcAddressItem/index.tsx
@@ -1,7 +1,9 @@
 import IconBitcoin from '@assets/img/dashboard/bitcoin_icon.svg';
 import { CheckCircle } from '@phosphor-icons/react';
+import { satsToBtc } from '@secretkeylabs/xverse-core';
 import { StyledP } from '@ui-library/common.styled';
 import { getShortTruncatedAddress } from '@utils/helper';
+import BigNumber from 'bignumber.js';
 import styled from 'styled-components';
 
 const Button = styled.button<{ $isSelected: boolean }>((props) => ({
@@ -49,7 +51,7 @@ const SelectedContainer = styled.div((props) => ({
 
 type Props = {
   title: string;
-  balance: string;
+  balanceSats?: number | bigint;
   address?: string;
   onClick: () => void;
   isSelected: boolean;
@@ -59,9 +61,11 @@ export default function preferredBtcAddressItem({
   title,
   onClick,
   address,
-  balance,
+  balanceSats,
   isSelected,
 }: Props) {
+  const balance =
+    balanceSats !== undefined ? `${satsToBtc(BigNumber(balanceSats.toString()))} BTC` : '';
   return (
     <Button type="button" onClick={onClick} $isSelected={isSelected}>
       <BtcIcon src={IconBitcoin} />
diff --git a/src/app/hooks/useWalletReducer.ts b/src/app/hooks/useWalletReducer.ts
index 011b31a28..6aa9b8f0a 100644
--- a/src/app/hooks/useWalletReducer.ts
+++ b/src/app/hooks/useWalletReducer.ts
@@ -10,6 +10,7 @@ import {
   createWalletAccount,
   decryptSeedPhraseCBC,
   getAccountFromSeedPhrase,
+  getBnsName,
   restoreWalletWithAccounts,
   StacksMainnet,
   StacksNetwork,
@@ -50,6 +51,7 @@ const createSingleAccount = async (
   seedPhrase: string,
   accountIndex: number,
   btcNetwork: NetworkType,
+  stacksNetwork: StacksNetwork,
   savedNames: { id: number; name?: string }[] = [],
 ) => {
   const account = await getAccountFromSeedPhrase({
@@ -58,6 +60,7 @@ const createSingleAccount = async (
     network: btcNetwork,
   });
   account.accountName = savedNames.find((name) => name.id === accountIndex)?.name;
+  account.bnsName = await getBnsName(account.stxAddress, stacksNetwork);
 
   return account;
 };
@@ -75,7 +78,7 @@ const useWalletReducer = () => {
     hideStx,
   } = useWalletSelector();
   const seedVault = useSeedVault();
-  const selectedNetwork = useNetworkSelector();
+  const stacksNetwork = useNetworkSelector();
   const currentlySelectedAccount = getSelectedAccount({
     selectedAccountIndex,
     selectedAccountType,
@@ -105,6 +108,7 @@ const useWalletReducer = () => {
         seedPhrase,
         selectedIndex,
         network.type,
+        stacksNetwork,
         savedNames[network.type],
       );
 
@@ -131,6 +135,7 @@ const useWalletReducer = () => {
     [
       dispatch,
       network.type,
+      stacksNetwork,
       seedVault,
       selectedAccountIndex,
       selectedAccountType,
@@ -246,6 +251,7 @@ const useWalletReducer = () => {
         seedPhrase,
         0,
         network.type,
+        stacksNetwork,
         savedNames[network.type],
       );
 
@@ -266,6 +272,7 @@ const useWalletReducer = () => {
               seedPhrase,
               account.id,
               network.type,
+              stacksNetwork,
               savedNames[network.type],
             );
 
@@ -297,7 +304,7 @@ const useWalletReducer = () => {
       initialised = true;
     };
 
-    await loadActiveAccounts(seedPhrase, network, selectedNetwork, currentAccounts, {
+    await loadActiveAccounts(seedPhrase, network, stacksNetwork, currentAccounts, {
       checkForNewAccounts: network.type === 'Mainnet',
       accountLoadCallback: async (loadedAccounts) => {
         if (loadedAccounts.length === currentAccounts.length) {
@@ -354,7 +361,7 @@ const useWalletReducer = () => {
     // We create an account to ensure that the seed phrase is valid, but we don't store it
     // The actual account creation is done on startup of the wallet
     // If the seed phrase is invalid, then this will throw an error
-    await createSingleAccount(seedPhrase, 0, network.type, savedNames[network.type]);
+    await createSingleAccount(seedPhrase, 0, network.type, stacksNetwork, savedNames[network.type]);
 
     await chrome.storage.local.clear();
     await chrome.storage.session.clear();
@@ -400,7 +407,7 @@ const useWalletReducer = () => {
     const newAccounts = await createWalletAccount(
       seedPhrase,
       network,
-      selectedNetwork,
+      stacksNetwork,
       softwareAccountsList,
     );
     dispatch(updateSoftwareAccountsAction(newAccounts));
@@ -495,6 +502,7 @@ const useWalletReducer = () => {
         seedPhrase,
         i,
         changedNetwork.type,
+        changedStacksNetwork,
         savedNames[changedNetwork.type],
       );
       nextAccounts.push(account);
diff --git a/src/app/screens/restoreWallet/paymentAddressTypeSelector.tsx b/src/app/screens/restoreWallet/paymentAddressTypeSelector.tsx
index 59dba3ff3..05e9ee408 100644
--- a/src/app/screens/restoreWallet/paymentAddressTypeSelector.tsx
+++ b/src/app/screens/restoreWallet/paymentAddressTypeSelector.tsx
@@ -23,7 +23,7 @@ const Container = styled.div({
   display: 'flex',
   flexDirection: 'column',
   flex: 1,
-  maxWidth: 320,
+  maxWidth: 330,
   minHeight: 550,
 });
 
@@ -126,13 +126,13 @@ export default function PaymentAddressTypeSelector({
           <TypesContainer>
             <PreferredBtcAddressItem
               title="Native SegWit"
-              balance={data.nativeTotalSats?.toString()}
+              balanceSats={data.nativeTotalSats}
               isSelected={selectedType === 'native'}
               onClick={onClickType('native')}
             />
             <PreferredBtcAddressItem
               title="Nested SegWit"
-              balance={data.nestedTotalSats?.toString()}
+              balanceSats={data.nestedTotalSats}
               isSelected={selectedType === 'nested'}
               onClick={onClickType('nested')}
             />
diff --git a/src/app/screens/settings/index.styles.ts b/src/app/screens/settings/index.styles.ts
index 718399e32..8a2dd50e9 100644
--- a/src/app/screens/settings/index.styles.ts
+++ b/src/app/screens/settings/index.styles.ts
@@ -4,7 +4,7 @@ export const Container = styled.div((props) => ({
   display: 'flex',
   flexDirection: 'column',
   flex: 1,
-  padding: `0 ${props.theme.space.s}`,
+  padding: `0 ${props.theme.space.xs}`,
   ...props.theme.scrollbar,
 }));
 
diff --git a/src/app/ui-library/sheet.tsx b/src/app/ui-library/sheet.tsx
index ba90e26c0..e4855c6e6 100644
--- a/src/app/ui-library/sheet.tsx
+++ b/src/app/ui-library/sheet.tsx
@@ -23,6 +23,11 @@ const CustomisedModal = styled(Modal)`
   max-height: 100%;
   display: flex;
   flex-direction: column;
+
+  &:focus-visible::after {
+    border: none;
+    outline: none;
+  }
 `;
 
 const BodyContainer = styled.div`
diff --git a/src/locales/en.json b/src/locales/en.json
index ca6d97e02..7b41c47ee 100644
--- a/src/locales/en.json
+++ b/src/locales/en.json
@@ -235,7 +235,7 @@
     "ANNOUNCEMENTS": {
       "NATIVE_SEGWIT": {
         "TITLE": "Native SegWit is here!",
-        "DESCRIPTION_1": "Xverse now supports Native SegWit for lower fees and better performance!",
+        "DESCRIPTION_1": "Xverse now supports Native SegWit addresses for lower fees and better performance!",
         "DESCRIPTION_2": "You can select your preferred Bitcoin payment address (native or nested) used for sending, receiving, and connecting with apps.",
         "DESCRIPTION_3": "Your Bitcoin balance includes funds from both addresses, and you can switch back anytime.",
         "SELECT": "Select my Preferred Bitcoin Address",
@@ -685,10 +685,10 @@
     "CONTINUE_BUTTON": "Continue",
     "HAVE_A_COUNT_WORDS_SEED_PHRASE": "Have a {{number}} words seed phrase?",
     "SELECT_ADDRESS_TYPE": {
-      "TITLE": "Default address type selection",
-      "DESCRIPTION": "Select the address type to set as your default; Native SegWit (more efficient) or Nested SegWit (legacy). You can switch back any time from settings.",
+      "TITLE": "Preferred Address Type",
+      "DESCRIPTION": "Select the default address type you would like to use for all accounts. You can switch at any time from settings.",
       "ACCOUNT_COUNT": "Accounts: {{accounts}}",
-      "ACCOUNT_SUMMARY_DESCRIPTION": "The balances shown above are cumulated BTC holdings for each type of address across the detected accounts."
+      "ACCOUNT_SUMMARY_DESCRIPTION": "The balances shown are cumulative across all accounts for each address type."
     }
   },
   "STACKING_SCREEN": {

From 5a6f71e5fceba4073dcd2895e2811fe9f3a793ea Mon Sep 17 00:00:00 2001
From: Victor Kirov <victor.kirov@gmail.com>
Date: Mon, 21 Oct 2024 15:01:08 +0300
Subject: [PATCH 188/227] Fix error and txn confirmation styling and add better
 msg for mismatch of address

---
 src/app/components/requests/requestError.tsx  | 53 ++++++++++++-----
 src/app/screens/btcSendRequest/index.tsx      |  7 ++-
 .../paymentAddressTypeSelector.tsx            | 30 +++++-----
 .../screens/signBatchPsbtRequest/index.tsx    |  3 +-
 src/app/screens/signPsbtRequest/index.tsx     |  1 +
 .../useSignPsbtValidationGate.ts              |  2 +
 src/app/screens/signatureRequest/index.tsx    |  4 +-
 src/app/screens/transactionRequest/index.tsx  |  2 +-
 src/app/screens/transactionStatus/index.tsx   | 59 +++++++++++--------
 src/locales/en.json                           | 14 ++---
 10 files changed, 107 insertions(+), 68 deletions(-)

diff --git a/src/app/components/requests/requestError.tsx b/src/app/components/requests/requestError.tsx
index f7030dea7..52627c1b6 100644
--- a/src/app/components/requests/requestError.tsx
+++ b/src/app/components/requests/requestError.tsx
@@ -11,9 +11,8 @@ const Container = styled.div((props) => ({
   display: 'flex',
   flexDirection: 'column',
   height: '100%',
-  paddingLeft: props.theme.spacing(8),
-  paddingRight: props.theme.spacing(8),
-  paddingTop: props.theme.spacing(60),
+  paddingLeft: props.theme.space.m,
+  paddingRight: props.theme.space.m,
 }));
 
 const Image = styled.img({
@@ -26,31 +25,48 @@ const HeadingText = styled.h1((props) => ({
   ...props.theme.typography.headline_xs,
   color: props.theme.colors.white_0,
   textAlign: 'center',
-  marginTop: props.theme.spacing(8),
+  marginTop: props.theme.space.m,
 }));
 
-const BodyText = styled.h1((props) => ({
+const BodyText = styled.h1<{ $textAlignment: 'center' | 'left' }>((props) => ({
   ...props.theme.typography.body_l,
   color: props.theme.colors.white_200,
-  marginTop: props.theme.spacing(8),
-  textAlign: 'center',
+  marginTop: props.theme.space.m,
+  textAlign: props.$textAlignment,
   overflowWrap: 'break-word',
   wordWrap: 'break-word',
   wordBreak: 'break-word',
-  marginBottom: props.theme.spacing(42),
+  whiteSpace: 'pre-line',
+}));
+
+const OuterContainer = styled.div((_props) => ({
+  display: 'flex',
+  flexDirection: 'column',
+  justifyContent: 'center',
+  flex: 1,
 }));
 
-const CloseButton = styled(Button)((props) => ({
-  marginBottom: props.theme.spacing(42),
+const BodyContainer = styled.div({
+  display: 'flex',
+  flexDirection: 'column',
+  justifyContent: 'center',
+});
+
+const ButtonContainer = styled.div((props) => ({
+  display: 'flex',
+  flexDirection: 'column',
+  marginTop: props.theme.space.xl,
+  marginBottom: props.theme.space.xl,
 }));
 
 interface RequestErrorProps {
   errorTitle?: string;
   error: string;
+  textAlignment?: 'center' | 'left';
   onClose?: () => void;
 }
 
-function RequestError({ error, errorTitle, onClose }: RequestErrorProps) {
+function RequestError({ error, errorTitle, onClose, textAlignment = 'center' }: RequestErrorProps) {
   const { t } = useTranslation('translation', { keyPrefix: 'REQUEST_ERRORS' });
 
   const handleClose = () => {
@@ -60,12 +76,19 @@ function RequestError({ error, errorTitle, onClose }: RequestErrorProps) {
       window.close();
     }
   };
+
   return (
     <Container>
-      <Image src={Failure} />
-      <HeadingText>{errorTitle || t('INVALID_REQUEST')}</HeadingText>
-      <BodyText>{error}</BodyText>
-      <CloseButton onClick={handleClose} title="Close" variant="primary" />
+      <OuterContainer>
+        <BodyContainer>
+          <Image src={Failure} />
+          <HeadingText>{errorTitle || t('INVALID_REQUEST')}</HeadingText>
+          <BodyText $textAlignment={textAlignment}>{error}</BodyText>
+        </BodyContainer>
+      </OuterContainer>
+      <ButtonContainer>
+        <Button onClick={handleClose} title="Close" variant="primary" />
+      </ButtonContainer>
     </Container>
   );
 }
diff --git a/src/app/screens/btcSendRequest/index.tsx b/src/app/screens/btcSendRequest/index.tsx
index 0f8870221..d3e72ce32 100644
--- a/src/app/screens/btcSendRequest/index.tsx
+++ b/src/app/screens/btcSendRequest/index.tsx
@@ -109,9 +109,10 @@ function BtcSendRequest() {
         navigate('/tx-status', {
           state: {
             txid: '',
-            currency: 'STX',
-            error: t('CONFIRM_TRANSACTION.ADDRESS_MISMATCH'),
+            currency: 'BTC',
+            error: t('REQUEST_ERRORS.ADDRESS_MISMATCH'),
             browserTx: true,
+            textAlignment: 'left',
           },
         });
       }
@@ -120,7 +121,7 @@ function BtcSendRequest() {
           state: {
             txid: '',
             currency: 'BTC',
-            error: t('CONFIRM_TRANSACTION.NETWORK_MISMATCH'),
+            error: t('REQUEST_ERRORS.NETWORK_MISMATCH'),
             browserTx: true,
           },
         });
diff --git a/src/app/screens/restoreWallet/paymentAddressTypeSelector.tsx b/src/app/screens/restoreWallet/paymentAddressTypeSelector.tsx
index 05e9ee408..ecf456cbe 100644
--- a/src/app/screens/restoreWallet/paymentAddressTypeSelector.tsx
+++ b/src/app/screens/restoreWallet/paymentAddressTypeSelector.tsx
@@ -5,6 +5,7 @@ import type { BtcPaymentType } from '@secretkeylabs/xverse-core';
 import { getPaymentAccountSummaryForSeedPhrase } from '@secretkeylabs/xverse-core';
 import { useQuery } from '@tanstack/react-query';
 import Button from '@ui-library/button';
+import { StyledP } from '@ui-library/common.styled';
 import Spinner from '@ui-library/spinner';
 import { useEffect } from 'react';
 import { useTranslation } from 'react-i18next';
@@ -54,16 +55,6 @@ const TypesContainer = styled.div({
   margin: '4px 0',
 });
 
-const Text = styled.p((props) => ({
-  ...props.theme.typography.body_m,
-  color: props.theme.colors.white_200,
-}));
-
-const BoldText = styled.p((props) => ({
-  ...props.theme.typography.body_bold_m,
-  color: props.theme.colors.white_200,
-}));
-
 const ButtonContainer = styled.div((props) => ({
   width: '100%',
   marginBottom: props.theme.spacing(15),
@@ -116,13 +107,22 @@ export default function PaymentAddressTypeSelector({
     <Container>
       <Title>{t('TITLE')}</Title>
       <BodyContainer>
-        <Text>{t('DESCRIPTION')}</Text>
+        <StyledP typography="body_m" color="white_200">
+          {t('DESCRIPTION')}{' '}
+          <a
+            href="https://www.xverse.app/blog/segwit-vs-native-segwit-addresses"
+            target="_blank"
+            rel="noreferrer"
+          >
+            {t('LEARN_MORE')}
+          </a>
+        </StyledP>
         <SummaryContainer>
-          <BoldText>
+          <StyledP typography="body_bold_m" color="white_200">
             {t('ACCOUNT_COUNT', {
               accounts: `${data.accountCount}${data.hasMoreAccounts ? '+' : ''}`,
             })}
-          </BoldText>
+          </StyledP>
           <TypesContainer>
             <PreferredBtcAddressItem
               title="Native SegWit"
@@ -137,7 +137,9 @@ export default function PaymentAddressTypeSelector({
               onClick={onClickType('nested')}
             />
           </TypesContainer>
-          <Text>{t('ACCOUNT_SUMMARY_DESCRIPTION')}</Text>
+          <StyledP typography="body_m" color="white_200">
+            {t('ACCOUNT_SUMMARY_DESCRIPTION')}
+          </StyledP>
         </SummaryContainer>
       </BodyContainer>
       <ButtonContainer>
diff --git a/src/app/screens/signBatchPsbtRequest/index.tsx b/src/app/screens/signBatchPsbtRequest/index.tsx
index 6700ffb9c..23ebfcc36 100644
--- a/src/app/screens/signBatchPsbtRequest/index.tsx
+++ b/src/app/screens/signBatchPsbtRequest/index.tsx
@@ -11,7 +11,7 @@ import { useLocation, useNavigate } from 'react-router-dom';
 function SignBatchPsbtRequest() {
   const navigate = useNavigate();
   const selectedAccount = useSelectedAccount();
-  const { t } = useTranslation('translation', { keyPrefix: 'CONFIRM_TRANSACTION' });
+  const { t } = useTranslation('translation', { keyPrefix: 'REQUEST_ERRORS' });
   const { network } = useWalletSelector();
   const { search } = useLocation();
   const params = new URLSearchParams(search);
@@ -71,6 +71,7 @@ function SignBatchPsbtRequest() {
             currency: 'BTC',
             error: t('ADDRESS_MISMATCH'),
             browserTx: true,
+            textAlignment: 'left',
           },
         });
         return true;
diff --git a/src/app/screens/signPsbtRequest/index.tsx b/src/app/screens/signPsbtRequest/index.tsx
index 4622f1c3f..b67f33080 100644
--- a/src/app/screens/signPsbtRequest/index.tsx
+++ b/src/app/screens/signPsbtRequest/index.tsx
@@ -151,6 +151,7 @@ function SignPsbtRequest() {
         error={validationError.error}
         errorTitle={validationError.errorTitle}
         onClose={onCloseClick}
+        textAlignment={validationError.alignment}
       />
     );
   }
diff --git a/src/app/screens/signPsbtRequest/useSignPsbtValidationGate.ts b/src/app/screens/signPsbtRequest/useSignPsbtValidationGate.ts
index 119204c32..66e19b240 100644
--- a/src/app/screens/signPsbtRequest/useSignPsbtValidationGate.ts
+++ b/src/app/screens/signPsbtRequest/useSignPsbtValidationGate.ts
@@ -13,6 +13,7 @@ type Props = {
 type ValidationError = {
   error: string;
   errorTitle?: string;
+  alignment?: 'center' | 'left';
 };
 
 const useSignPsbtValidationGate = ({ payload, parsedPsbt }: Props) => {
@@ -41,6 +42,7 @@ const useSignPsbtValidationGate = ({ payload, parsedPsbt }: Props) => {
         if (input.address !== btcAddress && input.address !== ordinalsAddress) {
           setValidationError({
             error: t('ADDRESS_MISMATCH'),
+            alignment: 'left',
           });
         }
       });
diff --git a/src/app/screens/signatureRequest/index.tsx b/src/app/screens/signatureRequest/index.tsx
index be92a7704..468e16099 100644
--- a/src/app/screens/signatureRequest/index.tsx
+++ b/src/app/screens/signatureRequest/index.tsx
@@ -89,7 +89,7 @@ function SignatureRequest(): JSX.Element {
           txid: '',
           currency: 'STX',
           errorTitle: t('SIGNATURE_REQUEST.SIGNATURE_ERROR_TITLE'),
-          error: t('CONFIRM_TRANSACTION.NETWORK_MISMATCH'),
+          error: t('REQUEST_ERRORS.NETWORK_MISMATCH'),
           browserTx: true,
         },
       });
@@ -104,7 +104,7 @@ function SignatureRequest(): JSX.Element {
           txid: '',
           currency: 'STX',
           errorTitle: t('SIGNATURE_REQUEST.SIGNATURE_ERROR_TITLE'),
-          error: t('CONFIRM_TRANSACTION.ADDRESS_MISMATCH'),
+          error: t('REQUEST_ERRORS.ADDRESS_MISMATCH_STX'),
           browserTx: true,
         },
       });
diff --git a/src/app/screens/transactionRequest/index.tsx b/src/app/screens/transactionRequest/index.tsx
index 784b8e7ec..3a6e906f5 100644
--- a/src/app/screens/transactionRequest/index.tsx
+++ b/src/app/screens/transactionRequest/index.tsx
@@ -231,7 +231,7 @@ function TransactionRequest() {
           state: {
             txid: '',
             currency: 'STX',
-            error: t('ADDRESS_MISMATCH'),
+            error: t('ADDRESS_MISMATCH_STX'),
             browserTx: true,
             tabId,
             messageId,
diff --git a/src/app/screens/transactionStatus/index.tsx b/src/app/screens/transactionStatus/index.tsx
index c832373b3..1af2a7453 100644
--- a/src/app/screens/transactionStatus/index.tsx
+++ b/src/app/screens/transactionStatus/index.tsx
@@ -27,18 +27,19 @@ const TxStatusContainer = styled.div((props) => ({
   height: '100%',
 }));
 
-const Container = styled.div({
+const OuterContainer = styled.div((_props) => ({
   display: 'flex',
   flexDirection: 'column',
   justifyContent: 'center',
-});
-const OuterContainer = styled.div((props) => ({
+  flex: 1,
+  whiteSpace: 'pre-line',
+}));
+
+const Container = styled.div({
   display: 'flex',
   flexDirection: 'column',
   justifyContent: 'center',
-  marginTop: props.theme.spacing(46),
-  flex: 1,
-}));
+});
 
 const TransactionIDContainer = styled.div((props) => ({
   display: 'flex',
@@ -46,20 +47,19 @@ const TransactionIDContainer = styled.div((props) => ({
   justifyContent: 'flex-start',
   alignItems: 'flex-start',
   marginTop: props.theme.spacing(15),
-  marginLeft: props.theme.spacing(8),
-  marginRight: props.theme.spacing(8),
+  marginLeft: props.theme.space.m,
+  marginRight: props.theme.space.m,
 }));
 
 const ButtonContainer = styled.div((props) => ({
-  flex: 1,
   display: 'flex',
   flexDirection: 'column',
   alignItems: 'flex-end',
-  gap: props.theme.spacing(6),
-  marginTop: props.theme.spacing(15),
-  marginBottom: props.theme.spacing(32),
-  marginLeft: props.theme.spacing(8),
-  marginRight: props.theme.spacing(8),
+  gap: props.theme.space.s,
+  marginTop: props.theme.space.xl,
+  marginBottom: props.theme.space.xl,
+  marginLeft: props.theme.space.m,
+  marginRight: props.theme.space.m,
 }));
 
 const RowContainer = styled.div((props) => ({
@@ -95,25 +95,25 @@ const HeadingText = styled.h1((props) => ({
   ...props.theme.typography.headline_s,
   color: props.theme.colors.white_0,
   textAlign: 'center',
-  marginTop: props.theme.spacing(8),
+  marginTop: props.theme.space.m,
 }));
 
-const BodyText = styled.h1((props) => ({
+const BodyText = styled.h1<{ $textAlignment: 'center' | 'left' }>((props) => ({
   ...props.theme.typography.body_m,
   color: props.theme.colors.white_400,
-  marginTop: props.theme.spacing(8),
-  textAlign: 'center',
+  marginTop: props.theme.space.m,
+  textAlign: props.$textAlignment,
   overflowWrap: 'break-word',
   wordWrap: 'break-word',
   wordBreak: 'break-word',
-  marginLeft: props.theme.spacing(5),
-  marginRight: props.theme.spacing(5),
+  marginLeft: props.theme.space.m,
+  marginRight: props.theme.space.m,
 }));
 
 const TxIDText = styled.h1((props) => ({
   ...props.theme.headline_category_s,
   color: props.theme.colors.white_400,
-  marginTop: props.theme.spacing(8),
+  marginTop: props.theme.space.m,
   textTransform: 'uppercase',
 }));
 
@@ -171,6 +171,7 @@ function TransactionStatus() {
     messageId,
     orders,
     minPriceSats,
+    textAlignment = 'center',
   } = location.state as {
     tabId?: chrome.tabs.Tab['id'];
     messageId?: string;
@@ -193,7 +194,7 @@ function TransactionStatus() {
         {failedMultipleOrders ? t('BROADCASTED_MULTIPLE_PARTIALLY') : t('BROADCASTED_MULTIPLE')}
       </HeadingText>
       {failedMultipleOrders ? (
-        <BodyText style={{ fontSize: '16px' }}>
+        <BodyText style={{ fontSize: '16px' }} $textAlignment={textAlignment}>
           {t('BROADCASTED_MULTIPLE_PARTIALLY_SUBTITLE', {
             failedTranscations: failedMultipleOrders,
             totalTranscations: orders?.length,
@@ -205,7 +206,9 @@ function TransactionStatus() {
     <Container>
       <Image src={Success} />
       <HeadingText>{sponsored ? t('SPONSORED_SUCCESS_MSG') : t('BROADCASTED')}</HeadingText>
-      <BodyText>{sponsored ? t('SPONSORED_MSG') : t('SUCCESS_MSG')}</BodyText>
+      <BodyText $textAlignment={textAlignment}>
+        {sponsored ? t('SPONSORED_MSG') : t('SUCCESS_MSG')}
+      </BodyText>
     </Container>
   );
   /* eslint-enable no-inline-styles/no-inline-styles */
@@ -214,7 +217,7 @@ function TransactionStatus() {
     <Container>
       <Image src={Failure} />
       <HeadingText>{errorTitle || t('FAILED')}</HeadingText>
-      <BodyText>{error}</BodyText>
+      <BodyText $textAlignment={textAlignment}>{error}</BodyText>
     </Container>
   );
 
@@ -230,9 +233,15 @@ function TransactionStatus() {
 
   const onCloseClick = () => {
     if (browserTx) {
+      // TODO: refactor this to not use the error label. Needs to be something more explicit.
       if (error === tReqErrors('NETWORK_MISMATCH') && tabId && messageId)
         sendNetworkMismatchMessage({ tabId, messageId });
-      if (error === tReqErrors('ADDRESS_MISMATCH') && tabId && messageId)
+      if (
+        (error === tReqErrors('ADDRESS_MISMATCH') ||
+          error === tReqErrors('ADDRESS_MISMATCH_STX')) &&
+        tabId &&
+        messageId
+      )
         sendAddressMismatchMessage({ tabId, messageId });
       if (error === tReqErrors('MISSING_ARGUMENTS') && tabId && messageId)
         sendMissingFunctionArgumentsMessage({ tabId, messageId });
diff --git a/src/locales/en.json b/src/locales/en.json
index 7b41c47ee..a94a732d8 100644
--- a/src/locales/en.json
+++ b/src/locales/en.json
@@ -40,7 +40,7 @@
     "LEDGER_IMPORT_1_BUTTON": "Get started",
     "LEDGER_IMPORT_2_TITLE": "Select assets",
     "LEDGER_IMPORT_2_SUBTITLE": "Choose the assets you want to manage with this wallet.",
-    "LEDGER_IMPORT_2_FOOTNOTE": "If you don’t want to set a Stacks address now, you have the possibility to set it up later.",
+    "LEDGER_IMPORT_2_FOOTNOTE": "If you don't want to set a Stacks address now, you have the possibility to set it up later.",
     "LEDGER_IMPORT_2_SELECT": {
       "BTC_TITLE": "Bitcoin, Runes & Ordinals (default)",
       "BTC_SUBTITLE": "Native SegWit and Taproot addresses",
@@ -123,7 +123,7 @@
         "UNDERSTAND_SHOULD_NOT_USE_LEDGER_LIVE": "I understand I should not use Ledger Live or other Bitcoin wallets with the same hardware device"
       }
     },
-    "ADDRESS_MISMATCH": "There’s a mismatch between your signing address and the address you’re logged with.",
+    "ADDRESS_MISMATCH": "There's a mismatch between your signing address and the address you're logged in with.",
     "CLOSE_BUTTON": "Close",
     "TITLE_FAILED": "Connection failed"
   },
@@ -151,7 +151,7 @@
     "ORDINALS_TITLE_VERIFIED": "Ordinals address verified successfully",
     "STACKS_TITLE_VERIFIED": "Stacks address verified successfully",
     "WRONG_DEVICE_ERROR_SUBTITLE": "The public key of the connected device did not match the wallet public key. Make sure you have the correct device connected.",
-    "ADDRESS_MISMATCH": "There’s a mismatch between the address you’re verifying and the address you’re logged with.",
+    "ADDRESS_MISMATCH": "There's a mismatch between the address you're verifying and the address you're logged with.",
     "LEDGER_CONNECT": {
       "BTC_TITLE": "Connect Your Ledger",
       "BTC_SUBTITLE": "To continue, connect your Ledger device, make sure it's unlocked, and open the Bitcoin app.",
@@ -408,8 +408,6 @@
     "TRANSACTIONS_FAILED_TO_BROADCAST": "{{failed}}/{{total}} transactions failed to broadcast",
     "CHECK_THE_APP_YOU_USE": "Please check the app you are using.",
     "TRANSACTIONS_SIGNED": "Transactions signed",
-    "NETWORK_MISMATCH": "There’s a mismatch between your active network and the network you’re logged with.",
-    "ADDRESS_MISMATCH": "There’s a mismatch between your signing address and the address you’re logged with.",
     "PSBT_NO_BROADCAST_DISCLAIMER": "This transaction will not be broadcasted from your wallet. It may be broadcasted later by a third party.",
     "PSBTS_NO_BROADCAST_DISCLAIMER": "These transactions will not be broadcasted from your wallet. They may be broadcasted later by a third party.",
     "PSBT_SIG_HASH_NONE_DISCLAIMER_TITLE": "Transaction uses SIGHASH_NONE",
@@ -687,6 +685,7 @@
     "SELECT_ADDRESS_TYPE": {
       "TITLE": "Preferred Address Type",
       "DESCRIPTION": "Select the default address type you would like to use for all accounts. You can switch at any time from settings.",
+      "LEARN_MORE": "Learn more about address types.",
       "ACCOUNT_COUNT": "Accounts: {{accounts}}",
       "ACCOUNT_SUMMARY_DESCRIPTION": "The balances shown are cumulative across all accounts for each address type."
     }
@@ -1594,8 +1593,9 @@
   "REQUEST_ERRORS": {
     "INVALID_REQUEST": "Invalid request",
     "MISSING_ARGUMENTS": "Contract function call missing arguments",
-    "ADDRESS_MISMATCH": "There’s a mismatch between your signing address and the address you’re logged with.",
-    "NETWORK_MISMATCH": "There’s a mismatch between your active network and the network you’re logged with.",
+    "ADDRESS_MISMATCH": "The app is requesting a signature from an address that doesn't match the one currently active in your Xverse wallet.\n\nTo fix this:\n - Ensure that the account you're using in Xverse matches the account you're logged in with on the app.\n- Confirm that the address type in Xverse matches the one required by the app (Native SegWit or Nested SegWit).",
+    "ADDRESS_MISMATCH_STX": "The app is requesting a signature from an address that doesn't match the one currently active in your Xverse wallet.",
+    "NETWORK_MISMATCH": "There's a mismatch between your active network and the network you're logged in with on the app.",
     "PSBT_CANT_PARSE_ERROR_TITLE": "Transaction Error",
     "PSBT_CANT_PARSE_ERROR_DESCRIPTION": "The requested transaction is invalid and cannot be processed. Please contact the developer of the requesting app for support."
   }

From b03f42194b08b98fa0f6b659ea1056e6474e946c Mon Sep 17 00:00:00 2001
From: Victor Kirov <victor.kirov@gmail.com>
Date: Mon, 21 Oct 2024 15:11:09 +0300
Subject: [PATCH 189/227] Fix learn more styling

---
 .../paymentAddressTypeSelector.tsx            | 21 ++++++++++++-------
 1 file changed, 13 insertions(+), 8 deletions(-)

diff --git a/src/app/screens/restoreWallet/paymentAddressTypeSelector.tsx b/src/app/screens/restoreWallet/paymentAddressTypeSelector.tsx
index ecf456cbe..38c32e3a4 100644
--- a/src/app/screens/restoreWallet/paymentAddressTypeSelector.tsx
+++ b/src/app/screens/restoreWallet/paymentAddressTypeSelector.tsx
@@ -6,6 +6,7 @@ import { getPaymentAccountSummaryForSeedPhrase } from '@secretkeylabs/xverse-cor
 import { useQuery } from '@tanstack/react-query';
 import Button from '@ui-library/button';
 import { StyledP } from '@ui-library/common.styled';
+import { InputFeedback } from '@ui-library/inputFeedback';
 import Spinner from '@ui-library/spinner';
 import { useEffect } from 'react';
 import { useTranslation } from 'react-i18next';
@@ -60,6 +61,10 @@ const ButtonContainer = styled.div((props) => ({
   marginBottom: props.theme.spacing(15),
 }));
 
+const LearnMoreLink = styled.a((props) => ({
+  marginTop: props.theme.space.xs,
+}));
+
 type Props = {
   seedPhrase: string;
   selectedType: BtcPaymentType;
@@ -108,15 +113,15 @@ export default function PaymentAddressTypeSelector({
       <Title>{t('TITLE')}</Title>
       <BodyContainer>
         <StyledP typography="body_m" color="white_200">
-          {t('DESCRIPTION')}{' '}
-          <a
-            href="https://www.xverse.app/blog/segwit-vs-native-segwit-addresses"
-            target="_blank"
-            rel="noreferrer"
-          >
-            {t('LEARN_MORE')}
-          </a>
+          {t('DESCRIPTION')}
         </StyledP>
+        <LearnMoreLink
+          href="https://www.xverse.app/blog/segwit-vs-native-segwit-addresses"
+          target="_blank"
+          rel="noreferrer"
+        >
+          <InputFeedback message={t('LEARN_MORE')} />
+        </LearnMoreLink>
         <SummaryContainer>
           <StyledP typography="body_bold_m" color="white_200">
             {t('ACCOUNT_COUNT', {

From fa46dc9ed24a8fdc1c0423d270b21e8c52dd96a8 Mon Sep 17 00:00:00 2001
From: GitHub Actions Bot <>
Date: Mon, 21 Oct 2024 12:59:16 +0000
Subject: [PATCH 190/227] release: v0.44.0

---
 package-lock.json | 4 ++--
 package.json      | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 143cad4a3..331162bab 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "xverse-web-extension",
-  "version": "0.43.3",
+  "version": "0.44.0",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "xverse-web-extension",
-      "version": "0.43.3",
+      "version": "0.44.0",
       "dependencies": {
         "@aryzing/superqs": "0.0.6",
         "@ledgerhq/hw-transport-webusb": "^6.27.13",
diff --git a/package.json b/package.json
index 843704b91..ba8029552 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "xverse-web-extension",
   "description": "A Bitcoin wallet for Web3",
-  "version": "0.43.3",
+  "version": "0.44.0",
   "private": true,
   "engines": {
     "node": "^18.18.2"

From 04a2e97754151d0e91a26d5c50f5865fb4ea634b Mon Sep 17 00:00:00 2001
From: Tim Man <tim@secretkeylabs.com>
Date: Tue, 22 Oct 2024 01:33:49 +0800
Subject: [PATCH 191/227] chore: remove sanity check from seed vault migration
 path (#679)

---
 src/app/hooks/useSanityCheck.ts | 39 ---------------------------------
 src/app/screens/login/index.tsx |  5 +----
 2 files changed, 1 insertion(+), 43 deletions(-)
 delete mode 100644 src/app/hooks/useSanityCheck.ts

diff --git a/src/app/hooks/useSanityCheck.ts b/src/app/hooks/useSanityCheck.ts
deleted file mode 100644
index 6b2f25b9e..000000000
--- a/src/app/hooks/useSanityCheck.ts
+++ /dev/null
@@ -1,39 +0,0 @@
-import { getAccountFromSeedPhrase, getXverseApiClient } from '@secretkeylabs/xverse-core';
-import { useCallback } from 'react';
-import useSeedVault from './useSeedVault';
-import useWalletSelector from './useWalletSelector';
-
-declare const VERSION: string;
-
-const useSanityCheck = () => {
-  const { network, accountsList } = useWalletSelector();
-  const { getSeed } = useSeedVault();
-
-  const getSanityCheck = useCallback(
-    async (origin: string) => {
-      const mnemonic = await getSeed();
-
-      const wallet = await getAccountFromSeedPhrase({ mnemonic, index: 0n, network: network.type });
-      if (wallet.masterPubKey !== accountsList[0].masterPubKey) {
-        await getXverseApiClient(network.type).getAppFeatures(
-          {
-            ordinalsAddress: accountsList[0].btcAddresses.taproot.address,
-            paymentAddress:
-              accountsList[0].btcAddresses.native?.address ||
-              accountsList[0].btcAddresses.nested?.address,
-          },
-          {
-            [origin]: VERSION,
-          },
-        );
-        return false;
-      }
-      return true;
-    },
-    [network.type, getSeed],
-  );
-
-  return { getSanityCheck };
-};
-
-export default useSanityCheck;
diff --git a/src/app/screens/login/index.tsx b/src/app/screens/login/index.tsx
index dd600763a..1cc685dce 100644
--- a/src/app/screens/login/index.tsx
+++ b/src/app/screens/login/index.tsx
@@ -1,7 +1,6 @@
 import Eye from '@assets/img/createPassword/Eye.svg';
 import EyeSlash from '@assets/img/createPassword/EyeSlash.svg';
 import logo from '@assets/img/xverse_logo.svg';
-import useSanityCheck from '@hooks/useSanityCheck';
 import useSeedVault from '@hooks/useSeedVault';
 import useSeedVaultMigration from '@hooks/useSeedVaultMigration';
 import useWalletReducer from '@hooks/useWalletReducer';
@@ -122,7 +121,6 @@ function Login(): JSX.Element {
   const navigate = useNavigate();
   const { unlockWallet } = useWalletReducer();
   const { hasSeed } = useSeedVault();
-  const { getSanityCheck } = useSanityCheck();
   const { migrateCachedStorage, isVaultUpdated } = useSeedVaultMigration();
   const [isPasswordVisible, setIsPasswordVisible] = useState(false);
   const [password, setPassword] = useState('');
@@ -173,8 +171,7 @@ function Login(): JSX.Element {
     // Check for SeedVault Migrations
     try {
       const hasMigrated = await isVaultUpdated();
-      const sanityCheck = await getSanityCheck('X-Current-Version');
-      if (!hasMigrated && sanityCheck) {
+      if (!hasMigrated) {
         setShowMigration(true);
       } else {
         setIsVerifying(false);

From c787027893d75a94f00ae422f7b0f1dca0d1824a Mon Sep 17 00:00:00 2001
From: Victor Kirov <victor.kirov@gmail.com>
Date: Tue, 22 Oct 2024 16:42:56 +0300
Subject: [PATCH 192/227] RC Fixes for native segwit [ENG-5472, ENG-5473,
 ENG-5474] (#693)

* Don't call nested segwit legacy

* Fix txn history uniqueness and order

* Fix icon container on receive

* Fix missing txns
---
 .../coinDashboard/transactionsHistoryList.tsx | 186 +++++++++++++-----
 .../screens/nftDashboard/receiveNft/index.tsx |  36 ++--
 src/app/utils/date.ts                         |   4 +-
 src/locales/en.json                           |   6 +-
 4 files changed, 159 insertions(+), 73 deletions(-)

diff --git a/src/app/screens/coinDashboard/transactionsHistoryList.tsx b/src/app/screens/coinDashboard/transactionsHistoryList.tsx
index a2bf69848..ccc976e4e 100644
--- a/src/app/screens/coinDashboard/transactionsHistoryList.tsx
+++ b/src/app/screens/coinDashboard/transactionsHistoryList.tsx
@@ -18,7 +18,7 @@ import type {
 } from '@stacks/stacks-blockchain-api-types';
 import Spinner from '@ui-library/spinner';
 import type { CurrencyTypes } from '@utils/constants';
-import { formatDate } from '@utils/date';
+import { formatDate, formatDateKey } from '@utils/date';
 import { isLedgerAccount } from '@utils/helper';
 import {
   isAddressTransactionWithTransfers,
@@ -89,76 +89,158 @@ const SectionTitle = styled.p((props) => ({
   marginRight: props.theme.space.xs,
 }));
 
-const sortTransactionsByBlockHeight = (transactions: BtcTransactionData[]) =>
-  transactions.sort((txA, txB) => {
-    if (txB.blockHeight > txA.blockHeight) {
-      return 1;
-    }
-    return -1;
-  });
-
 const groupBtcTxsByDate = (
   transactions: BtcTransactionData[],
-): { [x: string]: BtcTransactionData[] } => {
+): [Date, string, BtcTransactionData[]][] => {
   const pendingTransactions: BtcTransactionData[] = [];
   const processedTransactions: { [x: string]: BtcTransactionData[] } = {};
 
   transactions.forEach((transaction) => {
-    const txDate = formatDate(new Date(transaction.seenTime));
     if (transaction.txStatus === 'pending') {
       pendingTransactions.push(transaction);
     } else {
-      if (!processedTransactions[txDate]) processedTransactions[txDate] = [transaction];
-      else processedTransactions[txDate].push(transaction);
-
-      sortTransactionsByBlockHeight(processedTransactions[txDate]);
+      const txDateKey = formatDateKey(new Date(transaction.seenTime));
+      if (!processedTransactions[txDateKey]) {
+        processedTransactions[txDateKey] = [];
+      }
+      processedTransactions[txDateKey].push(transaction);
     }
   });
-  sortTransactionsByBlockHeight(pendingTransactions);
+
+  const result: [Date, string, BtcTransactionData[]][] = [];
+
   if (pendingTransactions.length > 0) {
-    const result = { Pending: pendingTransactions, ...processedTransactions };
-    return result;
+    result.push([new Date(), 'Pending', pendingTransactions]);
   }
-  return processedTransactions;
+
+  Object.values(processedTransactions).forEach((grp) => {
+    if (grp.length === 0) {
+      return;
+    }
+
+    grp.sort((txA, txB) => {
+      // sort by block height first
+      const blockHeightDiff = txB.blockHeight - txA.blockHeight;
+      if (blockHeightDiff !== 0) {
+        return blockHeightDiff;
+      }
+
+      // if block height is the same, sort by txid for consistency
+      return txB.txid.localeCompare(txA.txid);
+    });
+
+    result.push([new Date(grp[0].seenTime), formatDate(new Date(grp[0].seenTime)), grp]);
+  });
+
+  result.sort((a, b) => b[0].getTime() - a[0].getTime());
+
+  return result;
 };
 
 const groupRuneTxsByDate = (
   transactions: GetRunesActivityForAddressEvent[],
-): Record<string, GetRunesActivityForAddressEvent[]> => {
-  const mappedTransactions = {};
+): [Date, string, GetRunesActivityForAddressEvent[]][] => {
+  const processedTransactions: { [x: string]: GetRunesActivityForAddressEvent[] } = {};
+
   transactions.forEach((transaction) => {
-    const txDate = formatDate(new Date(transaction.blockTimestamp));
-    if (!mappedTransactions[txDate]) {
-      mappedTransactions[txDate] = [transaction];
-    } else {
-      mappedTransactions[txDate].push(transaction);
+    const txDateKey = formatDateKey(new Date(transaction.blockTimestamp));
+    if (!processedTransactions[txDateKey]) {
+      processedTransactions[txDateKey] = [];
+    }
+    processedTransactions[txDateKey].push(transaction);
+  });
+
+  const result: [Date, string, GetRunesActivityForAddressEvent[]][] = [];
+
+  Object.values(processedTransactions).forEach((grp) => {
+    if (grp.length === 0) {
+      return;
     }
+
+    grp.sort((txA, txB) => {
+      // sort by block height first
+      const blockHeightDiff = txB.blockHeight - txA.blockHeight;
+      if (blockHeightDiff !== 0) {
+        return blockHeightDiff;
+      }
+
+      // if block height is the same, sort by txid for consistency
+      return txB.txid.localeCompare(txA.txid);
+    });
+
+    result.push([
+      new Date(grp[0].blockTimestamp),
+      formatDate(new Date(grp[0].blockTimestamp)),
+      grp,
+    ]);
   });
-  return mappedTransactions;
+
+  result.sort((a, b) => b[0].getTime() - a[0].getTime());
+
+  return result;
 };
 
-const groupedTxsByDateMap = (txs: (AddressTransactionWithTransfers | MempoolTransaction)[]) =>
-  txs.reduce(
-    (
-      all: { [x: string]: (AddressTransactionWithTransfers | Tx)[] },
-      transaction: AddressTransactionWithTransfers | Tx,
-    ) => {
-      const date = formatDate(
-        new Date(
-          isAddressTransactionWithTransfers(transaction) && transaction.tx?.burn_block_time_iso
-            ? transaction.tx.burn_block_time_iso
-            : Date.now(),
-        ),
-      );
-      if (!all[date]) {
-        all[date] = [transaction];
-      } else {
-        all[date].push(transaction);
+const groupedTxsByDateMap = (
+  transactions: (AddressTransactionWithTransfers | MempoolTransaction)[],
+): [Date, string, (AddressTransactionWithTransfers | Tx)[]][] => {
+  const getBlockTimestamp = (tx: AddressTransactionWithTransfers | Tx): Date => {
+    let dateStr: string;
+
+    if (isAddressTransactionWithTransfers(tx)) {
+      dateStr = tx.tx.burn_block_time_iso;
+    } else if ('receipt_time_iso' in tx) {
+      dateStr = tx.receipt_time_iso;
+    } else {
+      dateStr = '';
+    }
+
+    return dateStr ? new Date(dateStr) : new Date();
+  };
+
+  const getTxid = (tx: AddressTransactionWithTransfers | Tx): string => {
+    if (isAddressTransactionWithTransfers(tx)) {
+      return tx.tx.tx_id;
+    }
+    return tx.tx_id;
+  };
+
+  const processedTransactions: { [x: string]: (AddressTransactionWithTransfers | Tx)[] } = {};
+
+  transactions.forEach((transaction) => {
+    const txDate = getBlockTimestamp(transaction);
+    const txDateKey = formatDateKey(txDate);
+
+    if (!processedTransactions[txDateKey]) {
+      processedTransactions[txDateKey] = [];
+    }
+    processedTransactions[txDateKey].push(transaction);
+  });
+
+  const result: [Date, string, (AddressTransactionWithTransfers | Tx)[]][] = [];
+
+  Object.values(processedTransactions).forEach((grp) => {
+    if (grp.length === 0) {
+      return;
+    }
+
+    grp.sort((txA, txB) => {
+      // sort by block height first
+      const blockHeightDiff = getBlockTimestamp(txB).getTime() - getBlockTimestamp(txA).getTime();
+      if (blockHeightDiff !== 0) {
+        return blockHeightDiff;
       }
-      return all;
-    },
-    {},
-  );
+
+      // if block height is the same, sort by txid for consistency
+      return getTxid(txB).localeCompare(getTxid(txA));
+    });
+
+    result.push([getBlockTimestamp(grp[0]), formatDate(new Date(getBlockTimestamp(grp[0]))), grp]);
+  });
+
+  result.sort((a, b) => b[0].getTime() - a[0].getTime());
+
+  return result;
+};
 
 const filterStxTxs = (
   txs: (AddressTransactionWithTransfers | MempoolTransaction)[],
@@ -203,7 +285,7 @@ function TransactionsHistoryList({
   const { network, selectedAccountType } = useWalletSelector();
   const btcClient = useBtcClient();
   const seedVault = useSeedVault();
-  const { data, isLoading, isFetching, error } = useTransactions(
+  const { data, isLoading, error } = useTransactions(
     (coin as CurrencyTypes) || 'STX',
     brc20Token,
     runeToken,
@@ -252,20 +334,20 @@ function TransactionsHistoryList({
       return groupedTxsByDateMap(filteredTxs);
     }
     return groupedTxsByDateMap(data as (AddressTransactionWithTransfers | MempoolTransaction)[]);
-  }, [data, isLoading, isFetching]);
+  }, [data, coin, stxTxFilter]);
 
   return (
     <ListItemsContainer>
       {withTitle && <ListHeader>{t('TRANSACTION_HISTORY_TITLE')}</ListHeader>}
       {groupedTxs &&
         !isLoading &&
-        Object.keys(groupedTxs).map((group) => (
+        groupedTxs.map(([, group, items]) => (
           <GroupContainer key={group} style={styles}>
             <SectionHeader>
               <SectionTitle>{group}</SectionTitle>
               <SectionSeparator />
             </SectionHeader>
-            {groupedTxs[group].map((transaction) => {
+            {items.map((transaction) => {
               if (wallet && isRuneTransaction(transaction)) {
                 return (
                   <RuneTransactionHistoryItem
diff --git a/src/app/screens/nftDashboard/receiveNft/index.tsx b/src/app/screens/nftDashboard/receiveNft/index.tsx
index a2dedb402..16a5d4c91 100644
--- a/src/app/screens/nftDashboard/receiveNft/index.tsx
+++ b/src/app/screens/nftDashboard/receiveNft/index.tsx
@@ -3,6 +3,7 @@ import plusIcon from '@assets/img/dashboard/plus.svg';
 import stacksIcon from '@assets/img/dashboard/stx_icon.svg';
 import ordinalsIcon from '@assets/img/nftDashboard/ordinals_icon.svg';
 import ActionButton from '@components/button';
+import ReceiveCardComponent from '@components/receiveCardComponent';
 import useSelectedAccount from '@hooks/useSelectedAccount';
 import useWalletSelector from '@hooks/useWalletSelector';
 import { Plus } from '@phosphor-icons/react';
@@ -12,7 +13,6 @@ import { useState } from 'react';
 import { useTranslation } from 'react-i18next';
 import { useNavigate } from 'react-router-dom';
 import styled from 'styled-components';
-import ReceiveCardComponent from '../../../components/receiveCardComponent';
 
 const GalleryModalContainer = styled.div((props) => ({
   padding: `0 ${props.theme.space.m}`,
@@ -142,14 +142,15 @@ function ReceiveNftModal({ visible, onClose, isGalleryOpen, setOrdinalReceiveAle
           onQrAddressClick={onOrdinalsReceivePress}
           showVerifyButton={choseToVerifyAddresses}
           currency="ORD"
-        >
-          <IconContainer>
-            <Icon src={ordinalsIcon} />
-            <IconBackground>
-              <Plus weight="bold" size={12} />
-            </IconBackground>
-          </IconContainer>
-        </ReceiveCardComponent>
+          icon={
+            <IconContainer>
+              <Icon src={ordinalsIcon} />
+              <IconBackground>
+                <Plus weight="bold" size={12} />
+              </IconBackground>
+            </IconContainer>
+          }
+        />
       )}
 
       {stxAddress && (
@@ -159,14 +160,15 @@ function ReceiveNftModal({ visible, onClose, isGalleryOpen, setOrdinalReceiveAle
           onQrAddressClick={onReceivePress}
           showVerifyButton={choseToVerifyAddresses}
           currency="STX"
-        >
-          <IconContainer>
-            <Icon src={stacksIcon} />
-            <IconBackground>
-              <Plus weight="bold" size={12} />
-            </IconBackground>
-          </IconContainer>
-        </ReceiveCardComponent>
+          icon={
+            <IconContainer>
+              <Icon src={stacksIcon} />
+              <IconBackground>
+                <Plus weight="bold" size={12} />
+              </IconBackground>
+            </IconContainer>
+          }
+        />
       )}
 
       {isLedgerAccount(selectedAccount) && !stxAddress && (
diff --git a/src/app/utils/date.ts b/src/app/utils/date.ts
index 87da8b5f5..c0062f288 100644
--- a/src/app/utils/date.ts
+++ b/src/app/utils/date.ts
@@ -1,4 +1,4 @@
-import { format, isYesterday, isToday } from 'date-fns';
+import { format, isToday, isYesterday } from 'date-fns';
 
 // eslint-disable-next-line import/prefer-default-export
 export const formatDate = (date: Date) => {
@@ -10,3 +10,5 @@ export const formatDate = (date: Date) => {
   }
   return format(date, 'MMMM dd, yyyy');
 };
+
+export const formatDateKey = (date: Date) => format(date, 'yyyy-MM-dd');
diff --git a/src/locales/en.json b/src/locales/en.json
index a94a732d8..c22aa89c6 100644
--- a/src/locales/en.json
+++ b/src/locales/en.json
@@ -245,7 +245,7 @@
     "CALLOUTS": {
       "NATIVE_SEGWIT": {
         "TITLE": "Now using Native SegWit!",
-        "DESCRIPTION": "Your new Native SegWit address is set as preferred. Switch back to legacy (Nested SegWit) in Settings."
+        "DESCRIPTION": "Your new Native SegWit address is set as preferred. Switch back to Nested SegWit in Settings."
       }
     }
   },
@@ -280,7 +280,7 @@
       },
       "ADDRESS_CHANGE_TOOLTIP": {
         "TITLE": "Switch Preferred Bitcoin Address",
-        "DESCRIPTION": "You can switch between Native SegWit and legacy (Nested SegWit)"
+        "DESCRIPTION": "You can switch between Native SegWit and Nested SegWit."
       }
     }
   },
@@ -936,7 +936,7 @@
     "ENABLE_SPEED_UP_TRANSACTIONS_DETAIL": "Allows you to speed up unconfirmed transactions by paying a higher fee.",
     "PREFERRED_BTC_ADDRESS": {
       "TITLE": "Preferred Bitcoin Address",
-      "DESCRIPTION": "You can switch between Native SegWit (more efficient) and  Nested SegWit (legacy) for your transactions. The selected address will be used for sending, receiving, and connecting with dapps. Your total balance includes funds from both addresses, and you can switch back anytime.",
+      "DESCRIPTION": "You can switch between Native SegWit (more efficient) and  Nested SegWit for your transactions. The selected address will be used for sending, receiving, and connecting with dapps. Your total balance includes funds from both addresses, and you can switch back anytime.",
       "NESTED_SEGWIT": "Nested SegWit",
       "NATIVE_SEGWIT": "Native SegWit",
       "SUCCESS": "Preferred Bitcoin address changed"

From 06974f407502bb704b4b62f03dd592beb7bd67dd Mon Sep 17 00:00:00 2001
From: Victor Kirov <victor.kirov@gmail.com>
Date: Wed, 23 Oct 2024 08:32:14 +0300
Subject: [PATCH 193/227] Fix broadcast txn on sign PSBT request (#695)

---
 package-lock.json                              | 13 +++++++------
 package.json                                   |  1 +
 src/app/screens/signPsbtRequest/useSignPsbt.ts | 12 +++++-------
 3 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 331162bab..649781f95 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -15,6 +15,7 @@
         "@playwright/test": "1.46.1",
         "@react-spring/web": "^9.6.1",
         "@sats-connect/core": "0.3.0",
+        "@scure/base": "^1.1.9",
         "@scure/btc-signer": "1.2.1",
         "@secretkeylabs/xverse-core": "26.0.0",
         "@stacks/connect": "7.4.1",
@@ -1195,9 +1196,9 @@
       }
     },
     "node_modules/@scure/base": {
-      "version": "1.1.8",
-      "resolved": "https://registry.npmjs.org/@scure/base/-/base-1.1.8.tgz",
-      "integrity": "sha512-6CyAclxj3Nb0XT7GHK6K4zK6k2xJm6E4Ft0Ohjt4WgegiFUHEtFb2CGzmPmGBwoIhrLsqNLYfLr04Y1GePrzZg==",
+      "version": "1.1.9",
+      "resolved": "https://registry.npmjs.org/@scure/base/-/base-1.1.9.tgz",
+      "integrity": "sha512-8YKhl8GHiNI/pU2VMaofa2Tor7PJRAjwQLBBuilkJ9L5+13yVbC7JO/wS7piioAvPSwR3JKM1IJ/u4xQzbcXKg==",
       "funding": {
         "url": "https://paulmillr.com/funding/"
       }
@@ -13587,9 +13588,9 @@
       }
     },
     "@scure/base": {
-      "version": "1.1.8",
-      "resolved": "https://registry.npmjs.org/@scure/base/-/base-1.1.8.tgz",
-      "integrity": "sha512-6CyAclxj3Nb0XT7GHK6K4zK6k2xJm6E4Ft0Ohjt4WgegiFUHEtFb2CGzmPmGBwoIhrLsqNLYfLr04Y1GePrzZg=="
+      "version": "1.1.9",
+      "resolved": "https://registry.npmjs.org/@scure/base/-/base-1.1.9.tgz",
+      "integrity": "sha512-8YKhl8GHiNI/pU2VMaofa2Tor7PJRAjwQLBBuilkJ9L5+13yVbC7JO/wS7piioAvPSwR3JKM1IJ/u4xQzbcXKg=="
     },
     "@scure/bip32": {
       "version": "1.5.0",
diff --git a/package.json b/package.json
index ba8029552..48db4f9e8 100644
--- a/package.json
+++ b/package.json
@@ -43,6 +43,7 @@
     "@playwright/test": "1.46.1",
     "@react-spring/web": "^9.6.1",
     "@sats-connect/core": "0.3.0",
+    "@scure/base": "^1.1.9",
     "@scure/btc-signer": "1.2.1",
     "@secretkeylabs/xverse-core": "26.0.0",
     "@stacks/connect": "7.4.1",
diff --git a/src/app/screens/signPsbtRequest/useSignPsbt.ts b/src/app/screens/signPsbtRequest/useSignPsbt.ts
index 6a73e6e49..38f2f6703 100644
--- a/src/app/screens/signPsbtRequest/useSignPsbt.ts
+++ b/src/app/screens/signPsbtRequest/useSignPsbt.ts
@@ -9,12 +9,9 @@ import {
   type SignTransactionOptions,
   type SignTransactionPayload,
 } from '@sats-connect/core';
-import {
-  base64ToHex,
-  btcTransaction,
-  type InputToSign,
-  type SettingsNetwork,
-} from '@secretkeylabs/xverse-core';
+import { base64 } from '@scure/base';
+import * as btc from '@scure/btc-signer';
+import { btcTransaction, type InputToSign, type SettingsNetwork } from '@secretkeylabs/xverse-core';
 import { decodeToken } from 'jsontokens';
 import { useMemo } from 'react';
 import { useLocation } from 'react-router-dom';
@@ -89,7 +86,8 @@ const useSignPsbt = () => {
     let txId: string = '';
 
     if (payload.broadcast && signingResponse) {
-      const txHex = base64ToHex(signingResponse);
+      const txn = btc.Transaction.fromPSBT(base64.decode(signingResponse));
+      const txHex = txn.hex;
       const response = await btcClient.sendRawTransaction(txHex);
       txId = response.tx.hash;
     }

From a9390e85e4661112ff80cbacef6f6b800de92018 Mon Sep 17 00:00:00 2001
From: Victor Kirov <victor.kirov@gmail.com>
Date: Wed, 23 Oct 2024 08:33:30 +0300
Subject: [PATCH 194/227] Prefer native over nested if no balance on restore
 [ENG-5478] (#697)

* Prefer native over nested if no balance on restore

* Show no funds message if no accounts found
---
 .../screens/restoreWallet/paymentAddressTypeSelector.tsx   | 7 +++++--
 src/locales/en.json                                        | 3 ++-
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/src/app/screens/restoreWallet/paymentAddressTypeSelector.tsx b/src/app/screens/restoreWallet/paymentAddressTypeSelector.tsx
index 38c32e3a4..8fbf4a2e1 100644
--- a/src/app/screens/restoreWallet/paymentAddressTypeSelector.tsx
+++ b/src/app/screens/restoreWallet/paymentAddressTypeSelector.tsx
@@ -94,7 +94,7 @@ export default function PaymentAddressTypeSelector({
 
   useEffect(() => {
     if (isLoading || !data) return;
-    const preferredType = data.nativeTotalSats > data.nestedTotalSats ? 'native' : 'nested';
+    const preferredType = data.nestedTotalSats > data.nativeTotalSats ? 'nested' : 'native';
     onSelectedTypeChange(preferredType);
   }, [data, isLoading]);
 
@@ -108,6 +108,8 @@ export default function PaymentAddressTypeSelector({
 
   const onClickType = (type: BtcPaymentType) => () => onSelectedTypeChange(type);
 
+  const totalFunds = data.nativeTotalSats + data.nestedTotalSats;
+
   return (
     <Container>
       <Title>{t('TITLE')}</Title>
@@ -143,7 +145,8 @@ export default function PaymentAddressTypeSelector({
             />
           </TypesContainer>
           <StyledP typography="body_m" color="white_200">
-            {t('ACCOUNT_SUMMARY_DESCRIPTION')}
+            {totalFunds !== 0n && t('ACCOUNT_SUMMARY_DESCRIPTION')}
+            {totalFunds === 0n && t('ACCOUNT_SUMMARY_DESCRIPTION_NO_FUNDS')}
           </StyledP>
         </SummaryContainer>
       </BodyContainer>
diff --git a/src/locales/en.json b/src/locales/en.json
index c22aa89c6..e478c8abc 100644
--- a/src/locales/en.json
+++ b/src/locales/en.json
@@ -687,7 +687,8 @@
       "DESCRIPTION": "Select the default address type you would like to use for all accounts. You can switch at any time from settings.",
       "LEARN_MORE": "Learn more about address types.",
       "ACCOUNT_COUNT": "Accounts: {{accounts}}",
-      "ACCOUNT_SUMMARY_DESCRIPTION": "The balances shown are cumulative across all accounts for each address type."
+      "ACCOUNT_SUMMARY_DESCRIPTION": "The balances shown are cumulative across all accounts for each address type.",
+      "ACCOUNT_SUMMARY_DESCRIPTION_NO_FUNDS": "No balances found for this seed phrase."
     }
   },
   "STACKING_SCREEN": {

From 7f73b1e6f322df136c7360f9e337f55f624107aa Mon Sep 17 00:00:00 2001
From: Victor Kirov <victor.kirov@gmail.com>
Date: Wed, 23 Oct 2024 10:36:17 +0300
Subject: [PATCH 195/227] Fix balance breakdown label for ordinals and tooltip,
 batch sign loader for listing

---
 src/app/components/batchPsbtSigning/index.tsx | 17 +++++++------
 .../components/btcAddressTypeLabel/index.tsx  | 24 ++++++++++++++++++-
 src/app/components/tooltip/index.tsx          |  2 +-
 src/locales/en.json                           |  3 +++
 4 files changed, 35 insertions(+), 11 deletions(-)

diff --git a/src/app/components/batchPsbtSigning/index.tsx b/src/app/components/batchPsbtSigning/index.tsx
index 83d2f8d05..f3cc46c65 100644
--- a/src/app/components/batchPsbtSigning/index.tsx
+++ b/src/app/components/batchPsbtSigning/index.tsx
@@ -66,8 +66,7 @@ function BatchPsbtSigning({ onSigned, psbts, onCancel, onPostSignDone }: BatchPs
   const [isSigningComplete, setIsSigningComplete] = useState(false);
   const [signingPsbtIndex, setSigningPsbtIndex] = useState(1);
   const [currentPsbtIndex, setCurrentPsbtIndex] = useState(0);
-  const singlePsbt = psbts.length === 1;
-  const [reviewTransaction, setReviewTransaction] = useState(singlePsbt);
+  const [reviewTransaction, setReviewTransaction] = useState(false);
   const [isLoading, setIsLoading] = useState(true);
   const [parsedPsbts, setParsedPsbts] = useState<ParsedPsbt[]>([]);
   const [isLedgerModalVisible, setIsLedgerModalVisible] = useState(false);
@@ -196,12 +195,6 @@ function BatchPsbtSigning({ onSigned, psbts, onCancel, onPostSignDone }: BatchPs
     });
 
     const renderBody = () => {
-      if (hasDuplicateInputs) {
-        // if there are duplicate inputs on the individual transactions, we won't show a summary
-        // and will have to ask the user to review each txn individually
-        return null;
-      }
-
       if (isLoading) {
         return (
           <LoaderContainer>
@@ -210,6 +203,12 @@ function BatchPsbtSigning({ onSigned, psbts, onCancel, onPostSignDone }: BatchPs
         );
       }
 
+      if (hasDuplicateInputs) {
+        // if there are duplicate inputs on the individual transactions, we won't show a summary
+        // and will have to ask the user to review each txn individually
+        return null;
+      }
+
       return (
         <>
           <OuterContainer>
@@ -247,7 +246,7 @@ function BatchPsbtSigning({ onSigned, psbts, onCancel, onPostSignDone }: BatchPs
         {renderBody()}
         <StyledSheet
           header=""
-          visible={reviewTransaction || hasDuplicateInputs}
+          visible={(reviewTransaction || hasDuplicateInputs) && !isLoading}
           onClose={hasDuplicateInputs ? undefined : onReviewDone}
         >
           <OuterContainer>
diff --git a/src/app/components/btcAddressTypeLabel/index.tsx b/src/app/components/btcAddressTypeLabel/index.tsx
index 8e5d59b74..cf02c4065 100644
--- a/src/app/components/btcAddressTypeLabel/index.tsx
+++ b/src/app/components/btcAddressTypeLabel/index.tsx
@@ -1,5 +1,7 @@
 import * as btc from '@scure/btc-signer';
 import type { BtcAddressType, NetworkType } from '@secretkeylabs/xverse-core';
+import { useTranslation } from 'react-i18next';
+import { Tooltip } from 'react-tooltip';
 import styled from 'styled-components';
 
 const LabelContainer = styled.div((props) => ({
@@ -11,14 +13,34 @@ const LabelContainer = styled.div((props) => ({
 const labelMap: Record<BtcAddressType, string> = {
   native: 'Native SegWit',
   nested: 'Nested SegWit',
-  taproot: 'Taproot',
+  taproot: 'Ordinals',
 };
 
+// TODO: centralize this tooltip with the styles
+const StyledTooltip = styled(Tooltip)`
+  max-width: 200px;
+  background-color: ${(props) => props.theme.colors.white_0};
+  color: #12151e;
+  border-radius: 8px;
+  padding: 7px;
+`;
+
 type BtcAddressTypeLabelProps = {
   addressType: BtcAddressType;
 };
 
 export function BtcAddressTypeLabel({ addressType }: BtcAddressTypeLabelProps) {
+  const { t } = useTranslation('translation', { keyPrefix: 'INFORMATION' });
+  if (addressType === 'taproot') {
+    return (
+      <>
+        <LabelContainer id="ordinals_address_anchor">{labelMap[addressType]}</LabelContainer>
+        <StyledTooltip anchorId="ordinals_address_anchor" variant="light">
+          {t('ORDINALS_ADDRESS_TOOLTIP')}
+        </StyledTooltip>
+      </>
+    );
+  }
   return <LabelContainer>{labelMap[addressType]}</LabelContainer>;
 }
 
diff --git a/src/app/components/tooltip/index.tsx b/src/app/components/tooltip/index.tsx
index ec11c6def..517949008 100644
--- a/src/app/components/tooltip/index.tsx
+++ b/src/app/components/tooltip/index.tsx
@@ -37,7 +37,7 @@ const StyledCallout = styled(Callout)(() => ({
 }));
 
 type Props = CalloutProps & {
-  target: MutableRefObject<HTMLButtonElement | null>;
+  target: MutableRefObject<HTMLElement | null>;
   positionVertical?: 'top' | 'bottom';
   positionHorizontal?: 'left' | 'right';
 };
diff --git a/src/locales/en.json b/src/locales/en.json
index a94a732d8..cf237c127 100644
--- a/src/locales/en.json
+++ b/src/locales/en.json
@@ -23,6 +23,9 @@
     "OPTIONS": "Options",
     "UNDO": "Undo"
   },
+  "INFORMATION": {
+    "ORDINALS_ADDRESS_TOOLTIP": "These sats are used for your ordinals and runes. They cannot be spent with Xverse wallet."
+  },
   "UNITS": {
     "SATS_PER_VB": "sats/vB"
   },

From 743ae3247d2a7a3d1f4b01a5313b4bd17433a3a7 Mon Sep 17 00:00:00 2001
From: Victor Kirov <victor.kirov@gmail.com>
Date: Wed, 23 Oct 2024 10:54:17 +0300
Subject: [PATCH 196/227] Improve tooltip styling

---
 src/app/components/btcAddressTypeLabel/index.tsx | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/app/components/btcAddressTypeLabel/index.tsx b/src/app/components/btcAddressTypeLabel/index.tsx
index cf02c4065..8584f9f24 100644
--- a/src/app/components/btcAddressTypeLabel/index.tsx
+++ b/src/app/components/btcAddressTypeLabel/index.tsx
@@ -18,11 +18,12 @@ const labelMap: Record<BtcAddressType, string> = {
 
 // TODO: centralize this tooltip with the styles
 const StyledTooltip = styled(Tooltip)`
+  ${(props) => props.theme.typography.body_bold_m}
   max-width: 200px;
   background-color: ${(props) => props.theme.colors.white_0};
   color: #12151e;
-  border-radius: 8px;
-  padding: 7px;
+  border-radius: ${(props) => props.theme.space.s};
+  padding: 10px 12px;
 `;
 
 type BtcAddressTypeLabelProps = {

From 4085ddde619728c82bfbc86908f0c0bc5aeace41 Mon Sep 17 00:00:00 2001
From: Tim Man <tim@secretkeylabs.com>
Date: Wed, 23 Oct 2024 17:18:33 +0800
Subject: [PATCH 197/227] fix: btc address type label font family and color

---
 src/app/components/btcAddressTypeLabel/index.tsx | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/app/components/btcAddressTypeLabel/index.tsx b/src/app/components/btcAddressTypeLabel/index.tsx
index 8584f9f24..6126bc00d 100644
--- a/src/app/components/btcAddressTypeLabel/index.tsx
+++ b/src/app/components/btcAddressTypeLabel/index.tsx
@@ -4,7 +4,9 @@ import { useTranslation } from 'react-i18next';
 import { Tooltip } from 'react-tooltip';
 import styled from 'styled-components';
 
-const LabelContainer = styled.div((props) => ({
+const LabelContainer = styled.p((props) => ({
+  ...props.theme.typography.body_medium_s,
+  color: 'white_0',
   backgroundColor: props.theme.colors.white_900,
   borderRadius: '6px',
   padding: '3px 8px',

From 15f2946175c8121422ba958e932b28e4904f8a17 Mon Sep 17 00:00:00 2001
From: Tim Man <tim@secretkeylabs.com>
Date: Wed, 23 Oct 2024 17:28:08 +0800
Subject: [PATCH 198/227] fix: styling on tab buttons, hide transactions title

---
 .../screens/coinDashboard/coins/btc/index.tsx | 36 ++++++++++---------
 src/app/screens/coinDashboard/index.styled.ts |  2 +-
 src/app/ui-library/tabs.tsx                   |  8 +++--
 3 files changed, 25 insertions(+), 21 deletions(-)

diff --git a/src/app/screens/coinDashboard/coins/btc/index.tsx b/src/app/screens/coinDashboard/coins/btc/index.tsx
index 489dc71f3..fd8f20044 100644
--- a/src/app/screens/coinDashboard/coins/btc/index.tsx
+++ b/src/app/screens/coinDashboard/coins/btc/index.tsx
@@ -4,11 +4,12 @@ import TopRow from '@components/topRow';
 import useCanUserSwitchPaymentType from '@hooks/useCanUserSwitchPaymentType';
 import { broadcastResetUserFlow, useResetUserFlow } from '@hooks/useResetUserFlow';
 import useTrackMixPanelPageViewed from '@hooks/useTrackMixPanelPageViewed';
+import { Tabs, type TabProp } from '@ui-library/tabs';
 import { useState } from 'react';
 import { useTranslation } from 'react-i18next';
 import { useSearchParams } from 'react-router-dom';
 import CoinHeader from '../../coinHeader';
-import { Button, Container, FtInfoContainer } from '../../index.styled';
+import { Container, FtInfoContainer } from '../../index.styled';
 import TransactionsHistoryList from '../../transactionsHistoryList';
 import BalanceBreakdown from './balanceBreakdown';
 
@@ -33,31 +34,32 @@ export default function CoinDashboard() {
 
   const onCancelAddressType = () => setShowPreferredBtcAddressSheet(false);
 
+  const tabs: TabProp<'primary' | 'secondary'>[] = [
+    {
+      label: t('TRANSACTIONS'),
+      value: 'primary',
+    },
+    {
+      label: t('BREAKDOWN'),
+      value: 'secondary',
+    },
+  ];
+
   return (
     <>
       <TopRow onClick={handleGoBack} onSettingsClick={handleChangeAddressTypeClick} />
       <Container>
         <CoinHeader currency="BTC" />
-        {/* TODO: import { Tabs } from ui-library/tabs.tsx */}
         <FtInfoContainer>
-          <Button
-            disabled={currentTab === 'primary'}
-            isSelected={currentTab === 'primary'}
-            onClick={() => setCurrentTab('primary')}
-          >
-            {t('TRANSACTIONS')}
-          </Button>
-          <Button
-            data-testid="coin-secondary-button"
-            disabled={currentTab === 'secondary'}
-            isSelected={currentTab === 'secondary'}
-            onClick={() => setCurrentTab('secondary')}
-          >
-            {t('BREAKDOWN')}
-          </Button>
+          <Tabs
+            tabs={tabs}
+            activeTab={currentTab}
+            onTabClick={(tabClicked: 'primary' | 'secondary') => setCurrentTab(tabClicked)}
+          />
         </FtInfoContainer>
         {currentTab === 'primary' && (
           <TransactionsHistoryList
+            withTitle={false}
             coin="BTC"
             stxTxFilter={null}
             brc20Token={null}
diff --git a/src/app/screens/coinDashboard/index.styled.ts b/src/app/screens/coinDashboard/index.styled.ts
index f38341537..d77300c26 100644
--- a/src/app/screens/coinDashboard/index.styled.ts
+++ b/src/app/screens/coinDashboard/index.styled.ts
@@ -17,7 +17,7 @@ export const SecondaryContainer = styled.div((props) => ({
   flexDirection: 'column',
   paddingLeft: props.theme.space.m,
   paddingRight: props.theme.space.m,
-  marginTop: props.theme.space.l,
+  marginTop: props.theme.space.m,
   marginBottom: props.theme.space.xl,
   h1: {
     ...props.theme.typography.body_medium_m,
diff --git a/src/app/ui-library/tabs.tsx b/src/app/ui-library/tabs.tsx
index 28a8cb7b6..002eb9202 100644
--- a/src/app/ui-library/tabs.tsx
+++ b/src/app/ui-library/tabs.tsx
@@ -30,14 +30,16 @@ export const TabItem = styled.button<{ $active?: boolean }>`
         `}
 `;
 
-type TabProps<T> = {
-  tabs: { label: string; value: T }[];
+export type TabProp<T> = { label: string; value: T };
+
+export type TabsProps<T> = {
+  tabs: TabProp<T>[];
   activeTab: T;
   onTabClick: (value: T) => void;
   className?: string;
 };
 
-function Tabs<T extends unknown>({ tabs, activeTab, onTabClick, className }: TabProps<T>) {
+export function Tabs<T extends unknown>({ tabs, activeTab, onTabClick, className }: TabsProps<T>) {
   return (
     <TabContainer className={className}>
       {tabs.map((tab) => (

From 6b06fc52c49ad710f910415312d8e2df1b83ed49 Mon Sep 17 00:00:00 2001
From: Tim Man <tim@secretkeylabs.com>
Date: Wed, 23 Oct 2024 17:28:39 +0800
Subject: [PATCH 199/227] fix: style the no runes to list message

---
 src/app/screens/listRune/index.styled.ts | 5 +++--
 src/app/screens/listRune/index.tsx       | 4 +++-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/app/screens/listRune/index.styled.ts b/src/app/screens/listRune/index.styled.ts
index 3e7e79b35..c9454d423 100644
--- a/src/app/screens/listRune/index.styled.ts
+++ b/src/app/screens/listRune/index.styled.ts
@@ -134,6 +134,7 @@ export const RightAlignStyledP = styled(StyledP)`
   text-align: right;
 `;
 
-export const NoItemsContainer = styled.div((props) => ({
-  padding: `${props.theme.space.m} ${props.theme.space.s}`,
+export const NoItemsContainer = styled(StyledP)((props) => ({
+  marginTop: props.theme.space.xxxl,
+  textAlign: 'center',
 }));
diff --git a/src/app/screens/listRune/index.tsx b/src/app/screens/listRune/index.tsx
index 910e3b3cb..a405011cb 100644
--- a/src/app/screens/listRune/index.tsx
+++ b/src/app/screens/listRune/index.tsx
@@ -327,7 +327,9 @@ export default function ListRuneScreen() {
         selectedRuneId={selectedRune?.principal ?? ''}
         getDesc={getDesc}
       >
-        <NoItemsContainer>{t('NO_UNLISTED_ITEMS')}</NoItemsContainer>
+        <NoItemsContainer typography="body_medium_s" color="white_200">
+          {t('NO_UNLISTED_ITEMS')}
+        </NoItemsContainer>
       </WrapperComponent>
     );
   }

From fe59428f206fddce16efdeb0dfbd6673c75b9270 Mon Sep 17 00:00:00 2001
From: Victor Kirov <victor.kirov@gmail.com>
Date: Wed, 23 Oct 2024 12:56:02 +0300
Subject: [PATCH 200/227] Fix copy nit

---
 src/locales/en.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/locales/en.json b/src/locales/en.json
index c47cb4e9e..d62eb2e41 100644
--- a/src/locales/en.json
+++ b/src/locales/en.json
@@ -690,7 +690,7 @@
       "DESCRIPTION": "Select the default address type you would like to use for all accounts. You can switch at any time from settings.",
       "LEARN_MORE": "Learn more about address types.",
       "ACCOUNT_COUNT": "Accounts: {{accounts}}",
-      "ACCOUNT_SUMMARY_DESCRIPTION": "The balances shown are cumulative across all accounts for each address type.",
+      "ACCOUNT_SUMMARY_DESCRIPTION": "The balances shown are cumulative across all found accounts for each address type.",
       "ACCOUNT_SUMMARY_DESCRIPTION_NO_FUNDS": "No balances found for this seed phrase."
     }
   },

From 755deeb0df85cfa7addcb921d789b7c76346631d Mon Sep 17 00:00:00 2001
From: Tim Man <tim@secretkeylabs.com>
Date: Wed, 23 Oct 2024 17:52:44 +0800
Subject: [PATCH 201/227] fix: preferred btc address sheet description color
 and selector spacing

---
 .../components/preferredBtcAddress/index.tsx  | 21 ++++++++++++-------
 .../preferredBtcAddressItem/index.tsx         |  1 -
 .../paymentAddressTypeSelector.tsx            |  5 +++--
 3 files changed, 16 insertions(+), 11 deletions(-)

diff --git a/src/app/components/preferredBtcAddress/index.tsx b/src/app/components/preferredBtcAddress/index.tsx
index 14e75662d..2889b8136 100644
--- a/src/app/components/preferredBtcAddress/index.tsx
+++ b/src/app/components/preferredBtcAddress/index.tsx
@@ -12,11 +12,8 @@ import styled from 'styled-components';
 import AddressTypeSelector from './addressTypeSelector';
 
 const AddressTypeContainer = styled.div((props) => ({
-  display: 'flex',
-  flexDirection: 'column',
-  gap: props.theme.space.xxs,
-  marginTop: props.theme.space.s,
-  marginBottom: props.theme.space.s,
+  marginTop: props.theme.space.l,
+  marginBottom: props.theme.space.l,
 }));
 
 type AddressTypeSelectorProps = {
@@ -24,6 +21,12 @@ type AddressTypeSelectorProps = {
   setSelectedType: (type: BtcPaymentType) => void;
 };
 
+const AddressTypeSelectorsContainer = styled.div`
+  display: flex;
+  flex-direction: column;
+  gap: ${(props) => props.theme.space.s};
+`;
+
 export function AddressTypeSelectors({ selectedType, setSelectedType }: AddressTypeSelectorProps) {
   const { t } = useTranslation('translation', {
     keyPrefix: 'SETTING_SCREEN.PREFERRED_BTC_ADDRESS',
@@ -31,7 +34,7 @@ export function AddressTypeSelectors({ selectedType, setSelectedType }: AddressT
   const { btcAddresses } = useSelectedAccount();
 
   return (
-    <>
+    <AddressTypeSelectorsContainer>
       <AddressTypeSelector
         title={t('NATIVE_SEGWIT')}
         address={btcAddresses.native?.address}
@@ -44,7 +47,7 @@ export function AddressTypeSelectors({ selectedType, setSelectedType }: AddressT
         onClick={() => setSelectedType('nested')}
         isSelected={selectedType === 'nested'}
       />
-    </>
+    </AddressTypeSelectorsContainer>
   );
 }
 
@@ -75,7 +78,9 @@ function PreferredBtcAddressSheet({
 
   return (
     <Sheet title={t('TITLE')} visible={visible} onClose={onCancel}>
-      <StyledP typography="body_m">{t('DESCRIPTION')}</StyledP>
+      <StyledP typography="body_m" color="white_200">
+        {t('DESCRIPTION')}
+      </StyledP>
       <AddressTypeContainer>
         <AddressTypeSelectors selectedType={selectedType} setSelectedType={setSelectedType} />
       </AddressTypeContainer>
diff --git a/src/app/components/preferredBtcAddressItem/index.tsx b/src/app/components/preferredBtcAddressItem/index.tsx
index 7011ffa2d..175afc307 100644
--- a/src/app/components/preferredBtcAddressItem/index.tsx
+++ b/src/app/components/preferredBtcAddressItem/index.tsx
@@ -12,7 +12,6 @@ const Button = styled.button<{ $isSelected: boolean }>((props) => ({
     ? props.theme.colors.white_900
     : props.theme.colors.transparent,
   padding: props.theme.space.m,
-  margin: `${props.theme.space.xxs} 0`,
   borderRadius: props.theme.space.s,
   border: `solid 1px ${props.theme.colors.white_800}`,
   display: 'flex',
diff --git a/src/app/screens/restoreWallet/paymentAddressTypeSelector.tsx b/src/app/screens/restoreWallet/paymentAddressTypeSelector.tsx
index 8fbf4a2e1..3b721bfca 100644
--- a/src/app/screens/restoreWallet/paymentAddressTypeSelector.tsx
+++ b/src/app/screens/restoreWallet/paymentAddressTypeSelector.tsx
@@ -50,11 +50,12 @@ const SummaryContainer = styled.div({
   margin: '18px 0',
 });
 
-const TypesContainer = styled.div({
+const TypesContainer = styled.div((props) => ({
   display: 'flex',
   flexDirection: 'column',
   margin: '4px 0',
-});
+  gap: props.theme.space.s,
+}));
 
 const ButtonContainer = styled.div((props) => ({
   width: '100%',

From ab10a381e3959b81f62ba2110ee72f7ca28a5686 Mon Sep 17 00:00:00 2001
From: Tim Man <tim@secretkeylabs.com>
Date: Wed, 23 Oct 2024 18:11:57 +0800
Subject: [PATCH 202/227] fix: ledger learn more link

---
 src/app/screens/ledger/importLedgerAccount/steps/index.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/app/screens/ledger/importLedgerAccount/steps/index.tsx b/src/app/screens/ledger/importLedgerAccount/steps/index.tsx
index 52a7e30b1..4a22e8ba0 100644
--- a/src/app/screens/ledger/importLedgerAccount/steps/index.tsx
+++ b/src/app/screens/ledger/importLedgerAccount/steps/index.tsx
@@ -52,7 +52,7 @@ import {
 } from './index.styled';
 
 const LINK_TO_LEDGER_ACCOUNT_ISSUE_GUIDE =
-  'https://support.xverse.app/hc/en-us/articles/17901278165773';
+  'https://support.xverse.app/hc/en-us/articles/17898446492557';
 const LINK_TO_LEDGER_PASSPHRASE_GUIDE =
   'https://support.xverse.app/hc/en-us/articles/17901278165773';
 

From b5eaaff7db4b525afda0c31df4cb450930ae036c Mon Sep 17 00:00:00 2001
From: Tim Man <tim@secretkeylabs.com>
Date: Wed, 23 Oct 2024 18:43:02 +0800
Subject: [PATCH 203/227] fix: font styling on announcement modal

---
 .../screens/home/announcementModal/nativeSegWit.tsx  | 12 +++++++++++-
 src/locales/en.json                                  |  4 +++-
 2 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/src/app/screens/home/announcementModal/nativeSegWit.tsx b/src/app/screens/home/announcementModal/nativeSegWit.tsx
index e04d1f10d..9cb60f664 100644
--- a/src/app/screens/home/announcementModal/nativeSegWit.tsx
+++ b/src/app/screens/home/announcementModal/nativeSegWit.tsx
@@ -16,9 +16,15 @@ const LogoImg = styled.img(() => ({
 
 const DescriptionItem = styled.div<{ $bottomSpacer?: boolean }>((props) => ({
   ...props.theme.typography.body_m,
+  color: props.theme.colors.white_200,
   marginBottom: props.$bottomSpacer ? props.theme.space.m : 0,
 }));
 
+const HighlightSpan = styled.span`
+  ${(props) => props.theme.typography.body_medium_m};
+  color: ${(props) => props.theme.colors.white_0};
+`;
+
 const ButtonContainer = styled.div((props) => ({
   display: 'flex',
   flexDirection: 'column',
@@ -54,7 +60,11 @@ export default function NativeSegWit({ isVisible, onClose }: Props) {
       onClose={onClose}
       visible={isVisible}
     >
-      <DescriptionItem $bottomSpacer>{t('DESCRIPTION_1')}</DescriptionItem>
+      <DescriptionItem $bottomSpacer>
+        {t('DESCRIPTION_1a')}
+        <HighlightSpan>{t('DESCRIPTION_1b')}</HighlightSpan>
+        {t('DESCRIPTION_1c')}
+      </DescriptionItem>
       <DescriptionItem $bottomSpacer>{t('DESCRIPTION_2')}</DescriptionItem>
       <DescriptionItem>{t('DESCRIPTION_3')}</DescriptionItem>
       <ButtonContainer>
diff --git a/src/locales/en.json b/src/locales/en.json
index c47cb4e9e..c43862b98 100644
--- a/src/locales/en.json
+++ b/src/locales/en.json
@@ -238,7 +238,9 @@
     "ANNOUNCEMENTS": {
       "NATIVE_SEGWIT": {
         "TITLE": "Native SegWit is here!",
-        "DESCRIPTION_1": "Xverse now supports Native SegWit addresses for lower fees and better performance!",
+        "DESCRIPTION_1a": "Xverse now supports ",
+        "DESCRIPTION_1b": "Native SegWit",
+        "DESCRIPTION_1c": " addresses for lower fees and better performance!",
         "DESCRIPTION_2": "You can select your preferred Bitcoin payment address (native or nested) used for sending, receiving, and connecting with apps.",
         "DESCRIPTION_3": "Your Bitcoin balance includes funds from both addresses, and you can switch back anytime.",
         "SELECT": "Select my Preferred Bitcoin Address",

From c421a00a56ebd9038ad02eb3cb0225dd85557dc8 Mon Sep 17 00:00:00 2001
From: Tim Man <tim@secretkeylabs.com>
Date: Wed, 23 Oct 2024 18:45:16 +0800
Subject: [PATCH 204/227] fix: add min height back to sheet after cross button
 was changed to position absolute

---
 src/app/ui-library/sheet.tsx | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/app/ui-library/sheet.tsx b/src/app/ui-library/sheet.tsx
index e4855c6e6..856ac8c12 100644
--- a/src/app/ui-library/sheet.tsx
+++ b/src/app/ui-library/sheet.tsx
@@ -16,6 +16,7 @@ const HeaderContainer = styled.div((props) => ({
   justifyContent: 'space-between',
   margin: props.theme.space.m,
   gap: props.theme.space.m,
+  minHeight: props.theme.space.m,
 }));
 
 const CustomisedModal = styled(Modal)`

From 1d5cad98dbca3fe5c743cea83324915521082571 Mon Sep 17 00:00:00 2001
From: Tim Man <tim@secretkeylabs.com>
Date: Wed, 23 Oct 2024 18:50:49 +0800
Subject: [PATCH 205/227] fix: larger min height on Sheet

---
 src/app/ui-library/sheet.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/app/ui-library/sheet.tsx b/src/app/ui-library/sheet.tsx
index 856ac8c12..6ba1efa7c 100644
--- a/src/app/ui-library/sheet.tsx
+++ b/src/app/ui-library/sheet.tsx
@@ -16,7 +16,7 @@ const HeaderContainer = styled.div((props) => ({
   justifyContent: 'space-between',
   margin: props.theme.space.m,
   gap: props.theme.space.m,
-  minHeight: props.theme.space.m,
+  minHeight: props.theme.space.l,
 }));
 
 const CustomisedModal = styled(Modal)`

From 155d27e410ce88a809dfcdb842e864b928758ec1 Mon Sep 17 00:00:00 2001
From: Tim Man <tim@secretkeylabs.com>
Date: Wed, 23 Oct 2024 18:59:35 +0800
Subject: [PATCH 206/227] fix: tx status screen needs a min height after
 margintop was removed

---
 src/app/screens/transactionStatus/index.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/app/screens/transactionStatus/index.tsx b/src/app/screens/transactionStatus/index.tsx
index 1af2a7453..b8560a634 100644
--- a/src/app/screens/transactionStatus/index.tsx
+++ b/src/app/screens/transactionStatus/index.tsx
@@ -24,7 +24,7 @@ const TxStatusContainer = styled.div((props) => ({
   background: props.theme.colors.elevation0,
   display: 'flex',
   flexDirection: 'column',
-  height: '100%',
+  minHeight: 600,
 }));
 
 const OuterContainer = styled.div((_props) => ({

From c1b361898c3dcb4da7bcfa6f3b9afcecfa682e5e Mon Sep 17 00:00:00 2001
From: Victor Kirov <victor.kirov@gmail.com>
Date: Wed, 23 Oct 2024 14:31:40 +0300
Subject: [PATCH 207/227] Fix knip issues (#708)

---
 src/app/screens/explore/index.tsx | 2 +-
 src/app/ui-library/tabs.tsx       | 4 +---
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/src/app/screens/explore/index.tsx b/src/app/screens/explore/index.tsx
index 924b9dabb..35d78932c 100644
--- a/src/app/screens/explore/index.tsx
+++ b/src/app/screens/explore/index.tsx
@@ -6,7 +6,7 @@ import useFeaturedDapps from '@hooks/useFeaturedDapps';
 import { ArrowsOut } from '@phosphor-icons/react';
 import { StyledHeading } from '@ui-library/common.styled';
 import Spinner from '@ui-library/spinner';
-import Tabs from '@ui-library/tabs';
+import { Tabs } from '@ui-library/tabs';
 import { XVERSE_EXPLORE_URL } from '@utils/constants';
 import { useEffect, useState } from 'react';
 import { useTranslation } from 'react-i18next';
diff --git a/src/app/ui-library/tabs.tsx b/src/app/ui-library/tabs.tsx
index 002eb9202..41a148b82 100644
--- a/src/app/ui-library/tabs.tsx
+++ b/src/app/ui-library/tabs.tsx
@@ -32,7 +32,7 @@ export const TabItem = styled.button<{ $active?: boolean }>`
 
 export type TabProp<T> = { label: string; value: T };
 
-export type TabsProps<T> = {
+type TabsProps<T> = {
   tabs: TabProp<T>[];
   activeTab: T;
   onTabClick: (value: T) => void;
@@ -54,5 +54,3 @@ export function Tabs<T extends unknown>({ tabs, activeTab, onTabClick, className
     </TabContainer>
   );
 }
-
-export default Tabs;

From 0715a704f321ee10e1e6867655c242ea4af79ed4 Mon Sep 17 00:00:00 2001
From: Victor Kirov <victor.kirov@gmail.com>
Date: Thu, 24 Oct 2024 09:31:41 +0300
Subject: [PATCH 208/227] Add errors specific to address and address type
 mismatch

---
 src/app/screens/btcSendRequest/index.tsx      | 33 ++++++++++++-------
 src/app/screens/mintRune/useMintRequest.ts    | 24 +++++++++++---
 .../screens/signBatchPsbtRequest/index.tsx    | 17 +++++++++-
 .../useSignMessageRequest.ts                  | 30 ++++++++++++-----
 .../useSignPsbtValidationGate.ts              | 22 ++++++++++---
 src/app/screens/transactionStatus/index.tsx   |  4 ++-
 src/app/stores/index.ts                       | 16 +++++----
 src/locales/en.json                           |  5 ++-
 8 files changed, 111 insertions(+), 40 deletions(-)

diff --git a/src/app/screens/btcSendRequest/index.tsx b/src/app/screens/btcSendRequest/index.tsx
index d3e72ce32..b01680774 100644
--- a/src/app/screens/btcSendRequest/index.tsx
+++ b/src/app/screens/btcSendRequest/index.tsx
@@ -105,24 +105,35 @@ function BtcSendRequest() {
 
   useEffect(() => {
     const checkIfMismatch = () => {
+      let errorTitle = '';
+      let error = '';
+      let textAlignment = 'center';
+
       if (payload.senderAddress !== selectedAccount.btcAddress) {
-        navigate('/tx-status', {
-          state: {
-            txid: '',
-            currency: 'BTC',
-            error: t('REQUEST_ERRORS.ADDRESS_MISMATCH'),
-            browserTx: true,
-            textAlignment: 'left',
-          },
-        });
+        if (
+          selectedAccount.btcAddresses.native?.address === payload.senderAddress ||
+          selectedAccount.btcAddresses.nested?.address === payload.senderAddress
+        ) {
+          errorTitle = t('REQUEST_ERRORS.ADDRESS_TYPE_MISMATCH_TITLE');
+          error = t('REQUEST_ERRORS.ADDRESS_TYPE_MISMATCH');
+        } else {
+          errorTitle = t('REQUEST_ERRORS.ADDRESS_MISMATCH_TITLE');
+          error = t('REQUEST_ERRORS.ADDRESS_MISMATCH');
+        }
+        textAlignment = 'left';
+      } else if (payload.network.type !== network.type) {
+        error = t('REQUEST_ERRORS.NETWORK_MISMATCH');
       }
-      if (payload.network.type !== network.type) {
+
+      if (error) {
         navigate('/tx-status', {
           state: {
             txid: '',
             currency: 'BTC',
-            error: t('REQUEST_ERRORS.NETWORK_MISMATCH'),
+            errorTitle,
+            error,
             browserTx: true,
+            textAlignment,
           },
         });
       }
diff --git a/src/app/screens/mintRune/useMintRequest.ts b/src/app/screens/mintRune/useMintRequest.ts
index 52c203847..0c5a2266c 100644
--- a/src/app/screens/mintRune/useMintRequest.ts
+++ b/src/app/screens/mintRune/useMintRequest.ts
@@ -1,4 +1,5 @@
 import { makeRPCError, makeRpcSuccessResponse, sendRpcResponse } from '@common/utils/rpc/helpers';
+import useBtcClient from '@hooks/apiClients/useBtcClient';
 import useOrdinalsServiceApi from '@hooks/apiClients/useOrdinalsServiceApi';
 import useRunesApi from '@hooks/apiClients/useRunesApi';
 import useTransactionContext from '@hooks/useTransactionContext';
@@ -40,6 +41,7 @@ const useMintRequest = (): {
   const txContext = useTransactionContext();
   const ordinalsServiceApi = useOrdinalsServiceApi();
   const runesApi = useRunesApi();
+  const btcClient = useBtcClient();
 
   const [mintError, setMintError] = useState<{
     code: number | undefined;
@@ -139,11 +141,8 @@ const useMintRequest = (): {
   const payAndConfirmMintRequest = async (ledgerTransport?: Transport) => {
     try {
       setIsExecuting(true);
-      const txid = await orderTx?.transaction.broadcast({
-        ledgerTransport,
-        rbfEnabled: false,
-      });
-      if (!txid) {
+
+      if (!orderTx) {
         const response = makeRPCError(requestId, {
           code: RpcErrorCode.INTERNAL_ERROR,
           message: 'Failed to broadcast transaction',
@@ -151,6 +150,21 @@ const useMintRequest = (): {
         sendRpcResponse(+tabId, response);
         return;
       }
+
+      // TODO: make enhancedTransaction class use a passed in btcClient and use:
+      /*
+      orderTx.transaction.broadcast({
+        ledgerTransport,
+        rbfEnabled: false,
+      });
+      */
+
+      const { hex: transactionHex, id: txid } = await orderTx.transaction.getTransactionHexAndId({
+        ledgerTransport,
+        rbfEnabled: false,
+      });
+      await btcClient.sendRawTransaction(transactionHex);
+
       await ordinalsServiceApi.executeMint(orderId, txid);
       const mintRequestResponse = makeRpcSuccessResponse<'runes_mint'>(requestId, {
         fundingAddress: txContext.paymentAddress.address,
diff --git a/src/app/screens/signBatchPsbtRequest/index.tsx b/src/app/screens/signBatchPsbtRequest/index.tsx
index 23ebfcc36..fcadbddf3 100644
--- a/src/app/screens/signBatchPsbtRequest/index.tsx
+++ b/src/app/screens/signBatchPsbtRequest/index.tsx
@@ -65,15 +65,30 @@ function SignBatchPsbtRequest() {
         input.address !== selectedAccount.btcAddress &&
         input.address !== selectedAccount.ordinalsAddress
       ) {
+        let errorTitle = '';
+        let error = '';
+        if (
+          selectedAccount.btcAddresses.native?.address === input.address ||
+          selectedAccount.btcAddresses.nested?.address === input.address
+        ) {
+          errorTitle = t('ADDRESS_TYPE_MISMATCH_TITLE');
+          error = t('ADDRESS_TYPE_MISMATCH');
+        } else {
+          errorTitle = t('ADDRESS_MISMATCH_TITLE');
+          error = t('ADDRESS_MISMATCH');
+        }
+
         navigate('/tx-status', {
           state: {
             txid: '',
             currency: 'BTC',
-            error: t('ADDRESS_MISMATCH'),
+            errorTitle,
+            error,
             browserTx: true,
             textAlignment: 'left',
           },
         });
+
         return true;
       }
       return false;
diff --git a/src/app/screens/signMessageRequest/useSignMessageRequest.ts b/src/app/screens/signMessageRequest/useSignMessageRequest.ts
index 06376c521..155bf0a05 100644
--- a/src/app/screens/signMessageRequest/useSignMessageRequest.ts
+++ b/src/app/screens/signMessageRequest/useSignMessageRequest.ts
@@ -56,15 +56,15 @@ export const useSignMessageValidation = (requestPayload: SignMessagePayload | un
   const [validationError, setValidationError] = useState<ValidationError | null>(null);
   const { t } = useTranslation('translation', { keyPrefix: 'REQUEST_ERRORS' });
   const selectedAccount = useSelectedAccount();
-  const { accountsList, network } = useWalletSelector();
+  const { accountsList, network, btcPaymentAddressType } = useWalletSelector();
   const { switchAccount } = useWalletReducer();
 
   const checkAddressAvailability = () => {
     const account = accountsList.filter(
       (acc) =>
-        selectedAccount.btcAddress === acc.btcAddresses.native?.address ||
-        selectedAccount.btcAddress === acc.btcAddresses.nested?.address ||
-        selectedAccount.btcAddress === acc.btcAddresses.taproot.address,
+        requestPayload?.address === acc.btcAddresses.native?.address ||
+        requestPayload?.address === acc.btcAddresses.nested?.address ||
+        requestPayload?.address === acc.btcAddresses.taproot.address,
     );
     return isHardwareAccount(selectedAccount) ? account[0] || selectedAccount : account[0];
   };
@@ -86,13 +86,25 @@ export const useSignMessageValidation = (requestPayload: SignMessagePayload | un
       return;
     }
 
-    if (
-      selectedAccount.btcAddress === account.btcAddresses.native?.address ||
-      selectedAccount.btcAddress === account.btcAddresses.nested?.address
-    )
+    if (selectedAccount.ordinalsAddress !== account.btcAddresses.taproot.address) {
+      switchAccount(account);
+    }
+
+    if (requestPayload?.address === account.btcAddresses.taproot.address) {
       return;
+    }
 
-    switchAccount(account);
+    // ensure we have the correct address type signing on payment address
+    if (
+      (btcPaymentAddressType === 'native' &&
+        requestPayload?.address !== account.btcAddresses.native?.address) ||
+      (btcPaymentAddressType === 'nested' &&
+        requestPayload?.address !== account.btcAddresses.nested?.address)
+    ) {
+      setValidationError({
+        error: t('ADDRESS_TYPE_MISMATCH'),
+      });
+    }
   };
 
   useEffect(() => {
diff --git a/src/app/screens/signPsbtRequest/useSignPsbtValidationGate.ts b/src/app/screens/signPsbtRequest/useSignPsbtValidationGate.ts
index 66e19b240..2558f8062 100644
--- a/src/app/screens/signPsbtRequest/useSignPsbtValidationGate.ts
+++ b/src/app/screens/signPsbtRequest/useSignPsbtValidationGate.ts
@@ -17,7 +17,7 @@ type ValidationError = {
 };
 
 const useSignPsbtValidationGate = ({ payload, parsedPsbt }: Props) => {
-  const { btcAddress, ordinalsAddress } = useSelectedAccount();
+  const { btcAddress, btcAddresses, ordinalsAddress } = useSelectedAccount();
   const { network } = useWalletSelector();
   const { t } = useTranslation('translation', { keyPrefix: 'REQUEST_ERRORS' });
   const [validationError, setValidationError] = useState<ValidationError | null>(null);
@@ -40,10 +40,22 @@ const useSignPsbtValidationGate = ({ payload, parsedPsbt }: Props) => {
     if (payload.inputsToSign) {
       payload.inputsToSign.forEach((input) => {
         if (input.address !== btcAddress && input.address !== ordinalsAddress) {
-          setValidationError({
-            error: t('ADDRESS_MISMATCH'),
-            alignment: 'left',
-          });
+          if (
+            input.address === btcAddresses.native?.address ||
+            input.address === btcAddresses.nested?.address
+          ) {
+            setValidationError({
+              errorTitle: t('ADDRESS_TYPE_MISMATCH_TITLE'),
+              error: t('ADDRESS_TYPE_MISMATCH'),
+              alignment: 'left',
+            });
+          } else {
+            setValidationError({
+              error: t('ADDRESS_MISMATCH'),
+              errorTitle: t('ADDRESS_MISMATCH_TITLE'),
+              alignment: 'left',
+            });
+          }
         }
       });
       return;
diff --git a/src/app/screens/transactionStatus/index.tsx b/src/app/screens/transactionStatus/index.tsx
index b8560a634..0862199f6 100644
--- a/src/app/screens/transactionStatus/index.tsx
+++ b/src/app/screens/transactionStatus/index.tsx
@@ -24,7 +24,8 @@ const TxStatusContainer = styled.div((props) => ({
   background: props.theme.colors.elevation0,
   display: 'flex',
   flexDirection: 'column',
-  minHeight: 600,
+  minHeight: 570,
+  height: '100%',
 }));
 
 const OuterContainer = styled.div((_props) => ({
@@ -238,6 +239,7 @@ function TransactionStatus() {
         sendNetworkMismatchMessage({ tabId, messageId });
       if (
         (error === tReqErrors('ADDRESS_MISMATCH') ||
+          error === tReqErrors('ADDRESS_TYPE_MISMATCH') ||
           error === tReqErrors('ADDRESS_MISMATCH_STX')) &&
         tabId &&
         messageId
diff --git a/src/app/stores/index.ts b/src/app/stores/index.ts
index d12bae4c3..d60e32185 100644
--- a/src/app/stores/index.ts
+++ b/src/app/stores/index.ts
@@ -126,16 +126,18 @@ const migrations = {
       return migratedIds;
     };
 
-    markAlertsForShow(
-      'native_segwit_intro',
-      'co:panel:address_changed_to_native',
-      'co:receive:address_change_button',
-      'co:receive:address_changed_to_native',
-    );
+    if ((state as unknown as WalletStateV5).btcPaymentAddressType === undefined) {
+      markAlertsForShow(
+        'native_segwit_intro',
+        'co:panel:address_changed_to_native',
+        'co:receive:address_change_button',
+        'co:receive:address_changed_to_native',
+      );
+    }
 
     return {
       ...state,
-      btcPaymentAddressType: 'nested',
+      btcPaymentAddressType: (state as unknown as WalletStateV5).btcPaymentAddressType || 'nested',
       accountsList: state.accountsList.map(migrateAccount('software')),
       ledgerAccountsList: state.ledgerAccountsList.map(migrateAccount('ledger')),
       allowNestedSegWitAddress: true,
diff --git a/src/locales/en.json b/src/locales/en.json
index 1fe7ae463..c10d7298a 100644
--- a/src/locales/en.json
+++ b/src/locales/en.json
@@ -1599,7 +1599,10 @@
   "REQUEST_ERRORS": {
     "INVALID_REQUEST": "Invalid request",
     "MISSING_ARGUMENTS": "Contract function call missing arguments",
-    "ADDRESS_MISMATCH": "The app is requesting a signature from an address that doesn't match the one currently active in your Xverse wallet.\n\nTo fix this:\n - Ensure that the account you're using in Xverse matches the account you're logged in with on the app.\n- Confirm that the address type in Xverse matches the one required by the app (Native SegWit or Nested SegWit).",
+    "ADDRESS_MISMATCH_TITLE": "Address Mismatch",
+    "ADDRESS_MISMATCH": "The app is requesting a signature from an address that doesn't match the account currently active in your wallet.\n\nTo fix this:\n- Make sure the account in Xverse matches the one connected to the app\n- Try reconnecting to the app",
+    "ADDRESS_TYPE_MISMATCH_TITLE": "Address Type Mismatch",
+    "ADDRESS_TYPE_MISMATCH": "The app is requesting a signature from a Bitcoin payment address type that doesn't match the one currently active in your wallet.\n\nTo fix this:\n- Make sure the Bitcoin payment address type (Native SegWit or Nested SegWit) selected in Xverse matches the app\n- Try reconnecting to the app",
     "ADDRESS_MISMATCH_STX": "The app is requesting a signature from an address that doesn't match the one currently active in your Xverse wallet.",
     "NETWORK_MISMATCH": "There's a mismatch between your active network and the network you're logged in with on the app.",
     "PSBT_CANT_PARSE_ERROR_TITLE": "Transaction Error",

From e59f18ff85edb4da43d8c938a2c898b5a6a746f2 Mon Sep 17 00:00:00 2001
From: Victor Kirov <victor.kirov@gmail.com>
Date: Thu, 24 Oct 2024 10:01:15 +0300
Subject: [PATCH 209/227] Fix styling

---
 src/app/components/batchPsbtSigning/index.styled.ts | 2 +-
 src/app/components/requests/requestError.tsx        | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/app/components/batchPsbtSigning/index.styled.ts b/src/app/components/batchPsbtSigning/index.styled.ts
index c5e46a2f6..efcd21c01 100644
--- a/src/app/components/batchPsbtSigning/index.styled.ts
+++ b/src/app/components/batchPsbtSigning/index.styled.ts
@@ -69,7 +69,7 @@ export const StyledSheet = styled(BottomModal)`
   flex-direction: column;
   height: 100%;
   max-height: 100% !important;
-  background-color: #181818 !important;
+  background-color: ${(props) => props.theme.colors.elevation0} !important;
 `;
 
 export const ButtonsContainer = styled.div((props) => ({
diff --git a/src/app/components/requests/requestError.tsx b/src/app/components/requests/requestError.tsx
index 52627c1b6..3076095eb 100644
--- a/src/app/components/requests/requestError.tsx
+++ b/src/app/components/requests/requestError.tsx
@@ -11,8 +11,8 @@ const Container = styled.div((props) => ({
   display: 'flex',
   flexDirection: 'column',
   height: '100%',
-  paddingLeft: props.theme.space.m,
-  paddingRight: props.theme.space.m,
+  marginLeft: props.theme.space.m,
+  marginRight: props.theme.space.m,
 }));
 
 const Image = styled.img({

From cbc0fad46897f8d801c5b09d8f99e24f9831a1af Mon Sep 17 00:00:00 2001
From: Victor Kirov <victor.kirov@gmail.com>
Date: Thu, 24 Oct 2024 10:27:34 +0300
Subject: [PATCH 210/227] Make styling consistent

---
 src/app/components/requests/requestError.tsx | 4 ++--
 src/app/screens/transactionStatus/index.tsx  | 9 ++++-----
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/src/app/components/requests/requestError.tsx b/src/app/components/requests/requestError.tsx
index 3076095eb..2e13c5770 100644
--- a/src/app/components/requests/requestError.tsx
+++ b/src/app/components/requests/requestError.tsx
@@ -22,14 +22,14 @@ const Image = styled.img({
 });
 
 const HeadingText = styled.h1((props) => ({
-  ...props.theme.typography.headline_xs,
+  ...props.theme.typography.headline_s,
   color: props.theme.colors.white_0,
   textAlign: 'center',
   marginTop: props.theme.space.m,
 }));
 
 const BodyText = styled.h1<{ $textAlignment: 'center' | 'left' }>((props) => ({
-  ...props.theme.typography.body_l,
+  ...props.theme.typography.body_m,
   color: props.theme.colors.white_200,
   marginTop: props.theme.space.m,
   textAlign: props.$textAlignment,
diff --git a/src/app/screens/transactionStatus/index.tsx b/src/app/screens/transactionStatus/index.tsx
index 0862199f6..e8693020d 100644
--- a/src/app/screens/transactionStatus/index.tsx
+++ b/src/app/screens/transactionStatus/index.tsx
@@ -7,7 +7,6 @@ import {
   sendMissingFunctionArgumentsMessage,
   sendNetworkMismatchMessage,
 } from '@common/utils/rpc/responseMessages/errors';
-import ActionButton from '@components/button';
 import CopyButton from '@components/copyButton';
 import InfoContainer from '@components/infoContainer';
 import useWalletSelector from '@hooks/useWalletSelector';
@@ -112,7 +111,7 @@ const BodyText = styled.h1<{ $textAlignment: 'center' | 'left' }>((props) => ({
 }));
 
 const TxIDText = styled.h1((props) => ({
-  ...props.theme.headline_category_s,
+  ...props.theme.typography.body_medium_s,
   color: props.theme.colors.white_400,
   marginTop: props.theme.space.m,
   textTransform: 'uppercase',
@@ -343,12 +342,12 @@ function TransactionStatus() {
       </OuterContainer>
       {isSwapTransaction && isSponsorServiceError ? (
         <ButtonContainer>
-          <ActionButton text={t('RETRY')} onPress={handleClickTrySwapAgain} />
-          <ActionButton text={t('CLOSE')} onPress={onCloseClick} transparent />
+          <Button title={t('RETRY')} onClick={handleClickTrySwapAgain} />
+          <Button title={t('CLOSE')} onClick={onCloseClick} variant="secondary" />
         </ButtonContainer>
       ) : (
         <ButtonContainer>
-          <ActionButton text={t('CLOSE')} onPress={onCloseClick} />
+          <Button title={t('CLOSE')} onClick={onCloseClick} />
         </ButtonContainer>
       )}
     </TxStatusContainer>

From db8d1e2ef9c5027a6f90cd1315af7e45988162b7 Mon Sep 17 00:00:00 2001
From: Victor Kirov <victor.kirov@gmail.com>
Date: Thu, 24 Oct 2024 10:32:45 +0300
Subject: [PATCH 211/227] remove bg color to prevent corner overflow issue

---
 src/app/components/requests/requestError.tsx | 1 -
 src/app/screens/transactionStatus/index.tsx  | 3 +--
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/app/components/requests/requestError.tsx b/src/app/components/requests/requestError.tsx
index 2e13c5770..3f0ecab39 100644
--- a/src/app/components/requests/requestError.tsx
+++ b/src/app/components/requests/requestError.tsx
@@ -7,7 +7,6 @@ import styled from 'styled-components';
  */
 
 const Container = styled.div((props) => ({
-  background: props.theme.colors.elevation0,
   display: 'flex',
   flexDirection: 'column',
   height: '100%',
diff --git a/src/app/screens/transactionStatus/index.tsx b/src/app/screens/transactionStatus/index.tsx
index e8693020d..a1d413076 100644
--- a/src/app/screens/transactionStatus/index.tsx
+++ b/src/app/screens/transactionStatus/index.tsx
@@ -19,8 +19,7 @@ import { useTranslation } from 'react-i18next';
 import { useLocation, useNavigate } from 'react-router-dom';
 import styled from 'styled-components';
 
-const TxStatusContainer = styled.div((props) => ({
-  background: props.theme.colors.elevation0,
+const TxStatusContainer = styled.div((_props) => ({
   display: 'flex',
   flexDirection: 'column',
   minHeight: 570,

From 8e55f9cc8ba17498b846b0e27866d68881ce59f5 Mon Sep 17 00:00:00 2001
From: Tim Man <tim@secretkeylabs.com>
Date: Thu, 24 Oct 2024 17:29:42 +0800
Subject: [PATCH 212/227] fix: account balance key should not use
 deviceAccountIndex, as they are not unique across ledger devices (#712)

---
 src/app/utils/helper.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/app/utils/helper.ts b/src/app/utils/helper.ts
index 3934e3c62..67e28b3d2 100644
--- a/src/app/utils/helper.ts
+++ b/src/app/utils/helper.ts
@@ -245,7 +245,7 @@ export const validateAccountName = (
 
 export const getAccountBalanceKey = (account: Account | null) => {
   if (!account) return '';
-  return `${account.accountType}-${account.deviceAccountIndex || account.id}`;
+  return `${account.accountType}-${account.id}`;
 };
 
 export const calculateTotalBalance = ({

From a4dac6e3a2fcdfb6275bdc7c84a724a0e011c005 Mon Sep 17 00:00:00 2001
From: Victor Kirov <victor.kirov@gmail.com>
Date: Thu, 24 Oct 2024 13:32:47 +0300
Subject: [PATCH 213/227] Update core for API updates

---
 package-lock.json                             | 72 +++++++++++++++++--
 package.json                                  |  2 +-
 .../paymentAddressTypeSelector.tsx            |  2 +-
 3 files changed, 67 insertions(+), 9 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 649781f95..c2955c798 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -17,7 +17,7 @@
         "@sats-connect/core": "0.3.0",
         "@scure/base": "^1.1.9",
         "@scure/btc-signer": "1.2.1",
-        "@secretkeylabs/xverse-core": "26.0.0",
+        "@secretkeylabs/xverse-core": "26.0.0-4023acd",
         "@stacks/connect": "7.4.1",
         "@stacks/stacks-blockchain-api-types": "6.1.1",
         "@stacks/transactions": "6.16.1",
@@ -1284,9 +1284,9 @@
       }
     },
     "node_modules/@secretkeylabs/xverse-core": {
-      "version": "26.0.0",
-      "resolved": "https://npm.pkg.github.com/download/@secretkeylabs/xverse-core/26.0.0/1ae56e20c7fc38d32cae5c38d51b708a88f17957",
-      "integrity": "sha512-PCcreXqcLCTMtgwCyVZT9EYKZgEWtPk3EAYBCw9dpIcqoFDywxvRyl70Sg1eiVs0YJPinEgW2/JJgmlZcDf/eA==",
+      "version": "26.0.0-4023acd",
+      "resolved": "https://npm.pkg.github.com/download/@secretkeylabs/xverse-core/26.0.0-4023acd/e4d6ee8e372673474d213172a3aeaba0ae1d0989",
+      "integrity": "sha512-NM+GAu7FOoO1tFnS1HJkaV2g40y/DfPXfNILA1uZwKii9TUfO2S3wpUMSCaRzrD8lHi8tMdzERrfdxsjcoXx3A==",
       "license": "ISC",
       "dependencies": {
         "@bitcoinerlab/secp256k1": "^1.0.2",
@@ -1309,6 +1309,8 @@
         "@zondax/ledger-stacks": "^1.0.4",
         "async-mutex": "^0.4.0",
         "axios": "1.7.0",
+        "axios-rate-limit": "^1.4.0",
+        "axios-retry": "^4.5.0",
         "base64url": "^3.0.1",
         "bip32": "^4.0.0",
         "bip39": "3.0.3",
@@ -3216,6 +3218,28 @@
         "proxy-from-env": "^1.1.0"
       }
     },
+    "node_modules/axios-rate-limit": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/axios-rate-limit/-/axios-rate-limit-1.4.0.tgz",
+      "integrity": "sha512-uM5PbmSUdSle1I+59Av/wpLuNRobfatIR+FyylSoHcVHT20ohjflNnLMEHZQr7N2QVG/Wlt8jekIPhWwoKtpXQ==",
+      "dependencies": {
+        "axios": ">=0.18.0"
+      },
+      "peerDependencies": {
+        "axios": "*"
+      }
+    },
+    "node_modules/axios-retry": {
+      "version": "4.5.0",
+      "resolved": "https://registry.npmjs.org/axios-retry/-/axios-retry-4.5.0.tgz",
+      "integrity": "sha512-aR99oXhpEDGo0UuAlYcn2iGRds30k366Zfa05XWScR9QaQD4JYiP3/1Qt1u7YlefUOK+cn0CcwoL1oefavQUlQ==",
+      "dependencies": {
+        "is-retry-allowed": "^2.2.0"
+      },
+      "peerDependencies": {
+        "axios": "0.x || 1.x"
+      }
+    },
     "node_modules/axobject-query": {
       "version": "3.2.1",
       "resolved": "https://registry.npmjs.org/axobject-query/-/axobject-query-3.2.1.tgz",
@@ -7633,6 +7657,17 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
+    "node_modules/is-retry-allowed": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/is-retry-allowed/-/is-retry-allowed-2.2.0.tgz",
+      "integrity": "sha512-XVm7LOeLpTW4jV19QSH38vkswxoLud8sQ57YwJVTPWdiaI9I8keEhGFpBlslyVsgdQy4Opg8QOLb8YRgsyZiQg==",
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
     "node_modules/is-set": {
       "version": "2.0.2",
       "resolved": "https://registry.npmjs.org/is-set/-/is-set-2.0.2.tgz",
@@ -13647,9 +13682,9 @@
       }
     },
     "@secretkeylabs/xverse-core": {
-      "version": "26.0.0",
-      "resolved": "https://npm.pkg.github.com/download/@secretkeylabs/xverse-core/26.0.0/1ae56e20c7fc38d32cae5c38d51b708a88f17957",
-      "integrity": "sha512-PCcreXqcLCTMtgwCyVZT9EYKZgEWtPk3EAYBCw9dpIcqoFDywxvRyl70Sg1eiVs0YJPinEgW2/JJgmlZcDf/eA==",
+      "version": "26.0.0-4023acd",
+      "resolved": "https://npm.pkg.github.com/download/@secretkeylabs/xverse-core/26.0.0-4023acd/e4d6ee8e372673474d213172a3aeaba0ae1d0989",
+      "integrity": "sha512-NM+GAu7FOoO1tFnS1HJkaV2g40y/DfPXfNILA1uZwKii9TUfO2S3wpUMSCaRzrD8lHi8tMdzERrfdxsjcoXx3A==",
       "requires": {
         "@bitcoinerlab/secp256k1": "^1.0.2",
         "@noble/curves": "^1.2.0",
@@ -13671,6 +13706,8 @@
         "@zondax/ledger-stacks": "^1.0.4",
         "async-mutex": "^0.4.0",
         "axios": "1.7.0",
+        "axios-rate-limit": "^1.4.0",
+        "axios-retry": "^4.5.0",
         "base64url": "^3.0.1",
         "bip32": "^4.0.0",
         "bip39": "3.0.3",
@@ -15236,6 +15273,22 @@
         "proxy-from-env": "^1.1.0"
       }
     },
+    "axios-rate-limit": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/axios-rate-limit/-/axios-rate-limit-1.4.0.tgz",
+      "integrity": "sha512-uM5PbmSUdSle1I+59Av/wpLuNRobfatIR+FyylSoHcVHT20ohjflNnLMEHZQr7N2QVG/Wlt8jekIPhWwoKtpXQ==",
+      "requires": {
+        "axios": ">=0.18.0"
+      }
+    },
+    "axios-retry": {
+      "version": "4.5.0",
+      "resolved": "https://registry.npmjs.org/axios-retry/-/axios-retry-4.5.0.tgz",
+      "integrity": "sha512-aR99oXhpEDGo0UuAlYcn2iGRds30k366Zfa05XWScR9QaQD4JYiP3/1Qt1u7YlefUOK+cn0CcwoL1oefavQUlQ==",
+      "requires": {
+        "is-retry-allowed": "^2.2.0"
+      }
+    },
     "axobject-query": {
       "version": "3.2.1",
       "resolved": "https://registry.npmjs.org/axobject-query/-/axobject-query-3.2.1.tgz",
@@ -18547,6 +18600,11 @@
         "has-tostringtag": "^1.0.0"
       }
     },
+    "is-retry-allowed": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/is-retry-allowed/-/is-retry-allowed-2.2.0.tgz",
+      "integrity": "sha512-XVm7LOeLpTW4jV19QSH38vkswxoLud8sQ57YwJVTPWdiaI9I8keEhGFpBlslyVsgdQy4Opg8QOLb8YRgsyZiQg=="
+    },
     "is-set": {
       "version": "2.0.2",
       "resolved": "https://registry.npmjs.org/is-set/-/is-set-2.0.2.tgz",
diff --git a/package.json b/package.json
index 48db4f9e8..075002899 100644
--- a/package.json
+++ b/package.json
@@ -45,7 +45,7 @@
     "@sats-connect/core": "0.3.0",
     "@scure/base": "^1.1.9",
     "@scure/btc-signer": "1.2.1",
-    "@secretkeylabs/xverse-core": "26.0.0",
+    "@secretkeylabs/xverse-core": "26.0.0-4023acd",
     "@stacks/connect": "7.4.1",
     "@stacks/stacks-blockchain-api-types": "6.1.1",
     "@stacks/transactions": "6.16.1",
diff --git a/src/app/screens/restoreWallet/paymentAddressTypeSelector.tsx b/src/app/screens/restoreWallet/paymentAddressTypeSelector.tsx
index 3b721bfca..0dc876b8a 100644
--- a/src/app/screens/restoreWallet/paymentAddressTypeSelector.tsx
+++ b/src/app/screens/restoreWallet/paymentAddressTypeSelector.tsx
@@ -90,7 +90,7 @@ export default function PaymentAddressTypeSelector({
   const { data, isLoading } = useQuery({
     // eslint-disable-next-line @tanstack/query/exhaustive-deps
     queryKey: ['onboardingBtcAddressBalance', sha256(seedPhrase.substring(0, 20)).toString()],
-    queryFn: () => getPaymentAccountSummaryForSeedPhrase(btcClient, seedPhrase, 'Mainnet', 20),
+    queryFn: () => getPaymentAccountSummaryForSeedPhrase(btcClient, seedPhrase, 'Mainnet', 10),
   });
 
   useEffect(() => {

From d72c9c7af591839f8714371b9b7879ea29a3ef92 Mon Sep 17 00:00:00 2001
From: Victor Kirov <victor.kirov@gmail.com>
Date: Thu, 24 Oct 2024 14:01:28 +0300
Subject: [PATCH 214/227] Bump core

---
 package-lock.json | 46 +++++++++++++---------------------------------
 package.json      |  2 +-
 2 files changed, 14 insertions(+), 34 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index c2955c798..664b4505f 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -17,7 +17,7 @@
         "@sats-connect/core": "0.3.0",
         "@scure/base": "^1.1.9",
         "@scure/btc-signer": "1.2.1",
-        "@secretkeylabs/xverse-core": "26.0.0-4023acd",
+        "@secretkeylabs/xverse-core": "27.0.0",
         "@stacks/connect": "7.4.1",
         "@stacks/stacks-blockchain-api-types": "6.1.1",
         "@stacks/transactions": "6.16.1",
@@ -1284,9 +1284,9 @@
       }
     },
     "node_modules/@secretkeylabs/xverse-core": {
-      "version": "26.0.0-4023acd",
-      "resolved": "https://npm.pkg.github.com/download/@secretkeylabs/xverse-core/26.0.0-4023acd/e4d6ee8e372673474d213172a3aeaba0ae1d0989",
-      "integrity": "sha512-NM+GAu7FOoO1tFnS1HJkaV2g40y/DfPXfNILA1uZwKii9TUfO2S3wpUMSCaRzrD8lHi8tMdzERrfdxsjcoXx3A==",
+      "version": "27.0.0",
+      "resolved": "https://npm.pkg.github.com/download/@secretkeylabs/xverse-core/27.0.0/71a2345e4e49a65359370b26459efa86d8e31cd1",
+      "integrity": "sha512-fspQl0C/Svr64ATs88rQFI+pl0Bq3UDtXVWyxAjITzsrJ9Oq9mcQivE/1JOulSqgg+uqOwy1T4RbMEVyXK5A/A==",
       "license": "ISC",
       "dependencies": {
         "@bitcoinerlab/secp256k1": "^1.0.2",
@@ -1308,9 +1308,9 @@
         "@tanstack/react-query": "^4.29.3",
         "@zondax/ledger-stacks": "^1.0.4",
         "async-mutex": "^0.4.0",
-        "axios": "1.7.0",
-        "axios-rate-limit": "^1.4.0",
-        "axios-retry": "^4.5.0",
+        "axios": "1.7.7",
+        "axios-rate-limit": "1.4.0",
+        "axios-retry": "4.5.0",
         "base64url": "^3.0.1",
         "bip32": "^4.0.0",
         "bip39": "3.0.3",
@@ -1393,16 +1393,6 @@
         "tslib": "^2.4.0"
       }
     },
-    "node_modules/@secretkeylabs/xverse-core/node_modules/axios": {
-      "version": "1.7.0",
-      "resolved": "https://registry.npmjs.org/axios/-/axios-1.7.0.tgz",
-      "integrity": "sha512-IiB0wQeKyPRdsFVhBgIo31FbzOyf2M6wYl7/NVutFwFBRMiAbjNiydJIHKeLmPugF4kJLfA1uWZ82Is2QzqqFA==",
-      "dependencies": {
-        "follow-redirects": "^1.15.6",
-        "form-data": "^4.0.0",
-        "proxy-from-env": "^1.1.0"
-      }
-    },
     "node_modules/@secretkeylabs/xverse-core/node_modules/bip39": {
       "version": "3.0.3",
       "resolved": "https://registry.npmjs.org/bip39/-/bip39-3.0.3.tgz",
@@ -13682,9 +13672,9 @@
       }
     },
     "@secretkeylabs/xverse-core": {
-      "version": "26.0.0-4023acd",
-      "resolved": "https://npm.pkg.github.com/download/@secretkeylabs/xverse-core/26.0.0-4023acd/e4d6ee8e372673474d213172a3aeaba0ae1d0989",
-      "integrity": "sha512-NM+GAu7FOoO1tFnS1HJkaV2g40y/DfPXfNILA1uZwKii9TUfO2S3wpUMSCaRzrD8lHi8tMdzERrfdxsjcoXx3A==",
+      "version": "27.0.0",
+      "resolved": "https://npm.pkg.github.com/download/@secretkeylabs/xverse-core/27.0.0/71a2345e4e49a65359370b26459efa86d8e31cd1",
+      "integrity": "sha512-fspQl0C/Svr64ATs88rQFI+pl0Bq3UDtXVWyxAjITzsrJ9Oq9mcQivE/1JOulSqgg+uqOwy1T4RbMEVyXK5A/A==",
       "requires": {
         "@bitcoinerlab/secp256k1": "^1.0.2",
         "@noble/curves": "^1.2.0",
@@ -13705,9 +13695,9 @@
         "@tanstack/react-query": "^4.29.3",
         "@zondax/ledger-stacks": "^1.0.4",
         "async-mutex": "^0.4.0",
-        "axios": "1.7.0",
-        "axios-rate-limit": "^1.4.0",
-        "axios-retry": "^4.5.0",
+        "axios": "1.7.7",
+        "axios-rate-limit": "1.4.0",
+        "axios-retry": "4.5.0",
         "base64url": "^3.0.1",
         "bip32": "^4.0.0",
         "bip39": "3.0.3",
@@ -13778,16 +13768,6 @@
             "tslib": "^2.4.0"
           }
         },
-        "axios": {
-          "version": "1.7.0",
-          "resolved": "https://registry.npmjs.org/axios/-/axios-1.7.0.tgz",
-          "integrity": "sha512-IiB0wQeKyPRdsFVhBgIo31FbzOyf2M6wYl7/NVutFwFBRMiAbjNiydJIHKeLmPugF4kJLfA1uWZ82Is2QzqqFA==",
-          "requires": {
-            "follow-redirects": "^1.15.6",
-            "form-data": "^4.0.0",
-            "proxy-from-env": "^1.1.0"
-          }
-        },
         "bip39": {
           "version": "3.0.3",
           "resolved": "https://registry.npmjs.org/bip39/-/bip39-3.0.3.tgz",
diff --git a/package.json b/package.json
index 075002899..c103b96c0 100644
--- a/package.json
+++ b/package.json
@@ -45,7 +45,7 @@
     "@sats-connect/core": "0.3.0",
     "@scure/base": "^1.1.9",
     "@scure/btc-signer": "1.2.1",
-    "@secretkeylabs/xverse-core": "26.0.0-4023acd",
+    "@secretkeylabs/xverse-core": "27.0.0",
     "@stacks/connect": "7.4.1",
     "@stacks/stacks-blockchain-api-types": "6.1.1",
     "@stacks/transactions": "6.16.1",

From ac27c97f53c130997c91c29c3dbc5324b9f652e1 Mon Sep 17 00:00:00 2001
From: Victor Kirov <victor.kirov@gmail.com>
Date: Thu, 24 Oct 2024 14:01:47 +0300
Subject: [PATCH 215/227] Rate limit account regeneration

---
 src/app/hooks/useWalletReducer.ts | 6 ++++++
 src/app/utils/promises.ts         | 1 +
 2 files changed, 7 insertions(+)
 create mode 100644 src/app/utils/promises.ts

diff --git a/src/app/hooks/useWalletReducer.ts b/src/app/hooks/useWalletReducer.ts
index 6aa9b8f0a..e987ec6b7 100644
--- a/src/app/hooks/useWalletReducer.ts
+++ b/src/app/hooks/useWalletReducer.ts
@@ -41,6 +41,7 @@ import {
   resetMixPanel,
   trackMixPanel,
 } from '@utils/mixpanel';
+import { sleep } from '@utils/promises';
 import { useCallback } from 'react';
 import { useDispatch } from 'react-redux';
 import useBtcClient from './apiClients/useBtcClient';
@@ -183,11 +184,16 @@ const useWalletReducer = () => {
       newSoftwareAccountList.push(newAccount);
 
       if (newSoftwareAccountList.length >= currentAccounts.length) {
+        // we've regenerated the existing accounts, so we can update the store before continuing
         dispatch(updateSoftwareAccountsAction([...newSoftwareAccountList]));
 
         if (options?.accountLoadCallback) {
           await options.accountLoadCallback([...newSoftwareAccountList]);
         }
+
+        // since we've already loaded the existing accounts, we can now check for new accounts, but with a small delay
+        // to not overload the backends
+        await sleep(200);
       }
 
       newAccountResponse = await walletAccountsGenerator.next();
diff --git a/src/app/utils/promises.ts b/src/app/utils/promises.ts
new file mode 100644
index 000000000..fe57bb627
--- /dev/null
+++ b/src/app/utils/promises.ts
@@ -0,0 +1 @@
+export const sleep = (ms: number) => new Promise((resolve) => setTimeout(resolve, ms));

From 008e6ced45d68d1efc4cbda1d787318bb2710612 Mon Sep 17 00:00:00 2001
From: Victor Kirov <victor.kirov@gmail.com>
Date: Thu, 24 Oct 2024 14:22:06 +0300
Subject: [PATCH 216/227] Fix loading hooks on home screen

---
 .../queries/useSelectedAccountBtcBalance.tsx  | 27 ++++++++++++-------
 src/app/screens/home/balanceCard/index.tsx    |  3 ++-
 src/app/screens/home/index.tsx                |  6 ++---
 3 files changed, 22 insertions(+), 14 deletions(-)

diff --git a/src/app/hooks/queries/useSelectedAccountBtcBalance.tsx b/src/app/hooks/queries/useSelectedAccountBtcBalance.tsx
index 8e059cefc..118fac18a 100644
--- a/src/app/hooks/queries/useSelectedAccountBtcBalance.tsx
+++ b/src/app/hooks/queries/useSelectedAccountBtcBalance.tsx
@@ -4,18 +4,24 @@ import BigNumber from 'bignumber.js';
 
 export default function useSelectedAccountBtcBalance() {
   const selectedAccount = useSelectedAccount();
-  const { data: nativeBalance, isLoading: nativeLoading } = useBtcAddressBalance(
-    selectedAccount.btcAddresses.native?.address ?? '',
-  );
-  const { data: nestedBalance, isLoading: nestedLoading } = useBtcAddressBalance(
-    selectedAccount.btcAddresses.nested?.address ?? '',
-  );
-  const { data: taprootBalance, isLoading: taprootLoading } = useBtcAddressBalance(
-    selectedAccount.btcAddresses.taproot.address ?? '',
-  );
+  const {
+    data: nativeBalance,
+    isLoading: nativeLoading,
+    isRefetching: nativeRefetching,
+  } = useBtcAddressBalance(selectedAccount.btcAddresses.native?.address ?? '');
+  const {
+    data: nestedBalance,
+    isLoading: nestedLoading,
+    isRefetching: nestedRefetching,
+  } = useBtcAddressBalance(selectedAccount.btcAddresses.nested?.address ?? '');
+  const {
+    data: taprootBalance,
+    isLoading: taprootLoading,
+    isRefetching: taprootRefetching,
+  } = useBtcAddressBalance(selectedAccount.btcAddresses.taproot.address ?? '');
 
   if (nativeLoading || nestedLoading || taprootLoading) {
-    return { isLoading: true };
+    return { isLoading: true, isRefetching: false };
   }
 
   const confirmedBalance = BigNumber(nativeBalance?.confirmedBalance ?? 0)
@@ -35,5 +41,6 @@ export default function useSelectedAccountBtcBalance() {
     nestedBalance,
     taprootBalance,
     isLoading: false,
+    isRefetching: nativeRefetching || nestedRefetching || taprootRefetching,
   };
 }
diff --git a/src/app/screens/home/balanceCard/index.tsx b/src/app/screens/home/balanceCard/index.tsx
index 857f30222..be465fb48 100644
--- a/src/app/screens/home/balanceCard/index.tsx
+++ b/src/app/screens/home/balanceCard/index.tsx
@@ -80,7 +80,8 @@ function BalanceCard(props: BalanceCardProps) {
   const dispatch = useDispatch();
   const { fiatCurrency, hideStx, accountBalances, balanceHidden } = useWalletSelector();
   const { confirmedBalance: btcBalance, isLoading: btcBalanceLoading } =
-    useSelectedAccountBtcBalance();  const { data: stxData } = useStxWalletData();
+    useSelectedAccountBtcBalance();
+  const { data: stxData } = useStxWalletData();
   const { btcFiatRate, stxBtcRate } = useSupportedCoinRates();
   const { setAccountBalance } = useAccountBalance();
   const { isLoading, isRefetching } = props;
diff --git a/src/app/screens/home/index.tsx b/src/app/screens/home/index.tsx
index 12c256a12..60a78c5e6 100644
--- a/src/app/screens/home/index.tsx
+++ b/src/app/screens/home/index.tsx
@@ -17,8 +17,8 @@ import {
   useVisibleSip10FungibleTokens,
 } from '@hooks/queries/stx/useGetSip10FungibleTokens';
 import useAppConfig from '@hooks/queries/useAppConfig';
-import useBtcWalletData from '@hooks/queries/useBtcWalletData';
 import useFeeMultipliers from '@hooks/queries/useFeeMultipliers';
+import useSelectedAccountBtcBalance from '@hooks/queries/useSelectedAccountBtcBalance';
 import useSpamTokens from '@hooks/queries/useSpamTokens';
 import useStxWalletData from '@hooks/queries/useStxWalletData';
 import useSupportedCoinRates from '@hooks/queries/useSupportedCoinRates';
@@ -93,8 +93,8 @@ function Home() {
   const [openReceiveModal, setOpenReceiveModal] = useState(false);
   const [openSendModal, setOpenSendModal] = useState(false);
   const [openBuyModal, setOpenBuyModal] = useState(false);
-  const { isInitialLoading: loadingBtcWalletData, isRefetching: refetchingBtcWalletData } =
-    useBtcWalletData();
+  const { isLoading: loadingBtcWalletData, isRefetching: refetchingBtcWalletData } =
+    useSelectedAccountBtcBalance();
   const { isInitialLoading: loadingStxWalletData, isRefetching: refetchingStxWalletData } =
     useStxWalletData();
   const { btcFiatRate, stxBtcRate } = useSupportedCoinRates();

From 7167019c1fda1c4207dc9e199b63a7d02cf2822c Mon Sep 17 00:00:00 2001
From: Victor Kirov <victor.kirov@gmail.com>
Date: Thu, 24 Oct 2024 14:24:16 +0300
Subject: [PATCH 217/227] Decrease sleep interval

---
 src/app/hooks/useWalletReducer.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/app/hooks/useWalletReducer.ts b/src/app/hooks/useWalletReducer.ts
index e987ec6b7..acdfd1da6 100644
--- a/src/app/hooks/useWalletReducer.ts
+++ b/src/app/hooks/useWalletReducer.ts
@@ -193,7 +193,7 @@ const useWalletReducer = () => {
 
         // since we've already loaded the existing accounts, we can now check for new accounts, but with a small delay
         // to not overload the backends
-        await sleep(200);
+        await sleep(100);
       }
 
       newAccountResponse = await walletAccountsGenerator.next();

From 752d6f808381be1289a5dcfd9c70ebd72e9aecbb Mon Sep 17 00:00:00 2001
From: Victor Kirov <victor.kirov@gmail.com>
Date: Thu, 24 Oct 2024 15:09:12 +0300
Subject: [PATCH 218/227] Rename sleep to delay and move it to common utils out
 of ledger

---
 src/app/components/confirmStxTransactionComponent/index.tsx  | 2 +-
 src/app/components/ledgerSteps/index.tsx                     | 2 +-
 src/app/components/messageSigning/index.tsx                  | 2 +-
 src/app/hooks/useWalletReducer.ts                            | 4 ++--
 src/app/screens/connect/authenticationRequest/index.tsx      | 2 +-
 src/app/screens/ledger/addStxAddress/index.tsx               | 2 +-
 src/app/screens/ledger/confirmLedgerStxTransaction/index.tsx | 2 +-
 src/app/screens/ledger/importLedgerAccount/index.tsx         | 3 ++-
 src/app/screens/ledger/verifyLedgerAccountAddress/index.tsx  | 2 +-
 src/app/screens/signatureRequest/index.tsx                   | 2 +-
 src/app/screens/speedUpTransaction/index.tsx                 | 2 +-
 src/app/utils/promises.ts                                    | 1 -
 src/common/utils/ledger.ts                                   | 5 -----
 src/common/utils/promises.ts                                 | 2 ++
 14 files changed, 15 insertions(+), 18 deletions(-)
 delete mode 100644 src/app/utils/promises.ts
 create mode 100644 src/common/utils/promises.ts

diff --git a/src/app/components/confirmStxTransactionComponent/index.tsx b/src/app/components/confirmStxTransactionComponent/index.tsx
index 27872a42b..c4a0c78d6 100644
--- a/src/app/components/confirmStxTransactionComponent/index.tsx
+++ b/src/app/components/confirmStxTransactionComponent/index.tsx
@@ -1,6 +1,6 @@
 import ledgerConnectDefaultIcon from '@assets/img/ledger/ledger_connect_default.svg';
 import ledgerConnectStxIcon from '@assets/img/ledger/ledger_import_connect_stx.svg';
-import { delay } from '@common/utils/ledger';
+import { delay } from '@common/utils/promises';
 import BottomModal from '@components/bottomModal';
 import ActionButton from '@components/button';
 import LedgerConnectionView from '@components/ledger/connectLedgerView';
diff --git a/src/app/components/ledgerSteps/index.tsx b/src/app/components/ledgerSteps/index.tsx
index 916efeead..23c79d97c 100644
--- a/src/app/components/ledgerSteps/index.tsx
+++ b/src/app/components/ledgerSteps/index.tsx
@@ -1,4 +1,4 @@
-import { delay } from '@common/utils/ledger';
+import { delay } from '@common/utils/promises';
 import TransportFactory from '@ledgerhq/hw-transport-webusb';
 import { type Transport } from '@secretkeylabs/xverse-core';
 import Button from '@ui-library/button';
diff --git a/src/app/components/messageSigning/index.tsx b/src/app/components/messageSigning/index.tsx
index 9393e1268..3e47d8180 100644
--- a/src/app/components/messageSigning/index.tsx
+++ b/src/app/components/messageSigning/index.tsx
@@ -1,6 +1,6 @@
 import ledgerConnectDefaultIcon from '@assets/img/ledger/ledger_connect_default.svg';
 import ledgerConnectBtcIcon from '@assets/img/ledger/ledger_import_connect_btc.svg';
-import { delay } from '@common/utils/ledger';
+import { delay } from '@common/utils/promises';
 import ConfirmScreen from '@components/confirmScreen';
 import InfoContainer from '@components/infoContainer';
 import LedgerConnectionView from '@components/ledger/connectLedgerView';
diff --git a/src/app/hooks/useWalletReducer.ts b/src/app/hooks/useWalletReducer.ts
index acdfd1da6..c4c3c070d 100644
--- a/src/app/hooks/useWalletReducer.ts
+++ b/src/app/hooks/useWalletReducer.ts
@@ -1,6 +1,7 @@
 import getSelectedAccount from '@common/utils/getSelectedAccount';
 import { getDeviceAccountIndex } from '@common/utils/ledger';
 import { dispatchEventAuthorizedConnectedClients } from '@common/utils/messages/extensionToContentScript/dispatchEvent';
+import { delay } from '@common/utils/promises';
 import { makeAccountResourceId } from '@components/permissionsManager/resources';
 import type { Permission } from '@components/permissionsManager/schemas';
 import useNetworkSelector from '@hooks/useNetwork';
@@ -41,7 +42,6 @@ import {
   resetMixPanel,
   trackMixPanel,
 } from '@utils/mixpanel';
-import { sleep } from '@utils/promises';
 import { useCallback } from 'react';
 import { useDispatch } from 'react-redux';
 import useBtcClient from './apiClients/useBtcClient';
@@ -193,7 +193,7 @@ const useWalletReducer = () => {
 
         // since we've already loaded the existing accounts, we can now check for new accounts, but with a small delay
         // to not overload the backends
-        await sleep(100);
+        await delay(100);
       }
 
       newAccountResponse = await walletAccountsGenerator.next();
diff --git a/src/app/screens/connect/authenticationRequest/index.tsx b/src/app/screens/connect/authenticationRequest/index.tsx
index 0a6bae09f..e13471afd 100644
--- a/src/app/screens/connect/authenticationRequest/index.tsx
+++ b/src/app/screens/connect/authenticationRequest/index.tsx
@@ -3,7 +3,7 @@ import stxIcon from '@assets/img/dashboard/stx_icon.svg';
 import ledgerConnectDefaultIcon from '@assets/img/ledger/ledger_connect_default.svg';
 import ledgerConnectStxIcon from '@assets/img/ledger/ledger_import_connect_stx.svg';
 import { MESSAGE_SOURCE } from '@common/types/message-types';
-import { delay } from '@common/utils/ledger';
+import { delay } from '@common/utils/promises';
 import BottomModal from '@components/bottomModal';
 import ActionButton from '@components/button';
 import LedgerConnectionView from '@components/ledger/connectLedgerView';
diff --git a/src/app/screens/ledger/addStxAddress/index.tsx b/src/app/screens/ledger/addStxAddress/index.tsx
index 343448175..4c2b3ee2c 100644
--- a/src/app/screens/ledger/addStxAddress/index.tsx
+++ b/src/app/screens/ledger/addStxAddress/index.tsx
@@ -1,7 +1,7 @@
 import stxIcon from '@assets/img/dashboard/stx_icon.svg';
 import checkCircleIcon from '@assets/img/ledger/check_circle.svg';
 import ledgerConnectStxIcon from '@assets/img/ledger/ledger_import_connect_stx.svg';
-import { delay } from '@common/utils/ledger';
+import { delay } from '@common/utils/promises';
 import ActionButton from '@components/button';
 import LedgerConnectionView from '@components/ledger/connectLedgerView';
 import LedgerFailView from '@components/ledger/failLedgerView';
diff --git a/src/app/screens/ledger/confirmLedgerStxTransaction/index.tsx b/src/app/screens/ledger/confirmLedgerStxTransaction/index.tsx
index 914d5b1ae..6fdcb74cd 100644
--- a/src/app/screens/ledger/confirmLedgerStxTransaction/index.tsx
+++ b/src/app/screens/ledger/confirmLedgerStxTransaction/index.tsx
@@ -1,7 +1,7 @@
 import checkCircleIcon from '@assets/img/ledger/check_circle.svg';
 import ledgerConnectDefaultIcon from '@assets/img/ledger/ledger_connect_default.svg';
 import ledgerConnectStxIcon from '@assets/img/ledger/ledger_import_connect_stx.svg';
-import { delay } from '@common/utils/ledger';
+import { delay } from '@common/utils/promises';
 import ActionButton from '@components/button';
 import LedgerConnectionView from '@components/ledger/connectLedgerView';
 import FullScreenHeader from '@components/ledger/fullScreenHeader';
diff --git a/src/app/screens/ledger/importLedgerAccount/index.tsx b/src/app/screens/ledger/importLedgerAccount/index.tsx
index 3ceb5db79..713a2285b 100644
--- a/src/app/screens/ledger/importLedgerAccount/index.tsx
+++ b/src/app/screens/ledger/importLedgerAccount/index.tsx
@@ -1,4 +1,5 @@
-import { delay, getDeviceNewAccountIndex, getNewAccountId } from '@common/utils/ledger';
+import { getDeviceNewAccountIndex, getNewAccountId } from '@common/utils/ledger';
+import { delay } from '@common/utils/promises';
 import FullScreenHeader from '@components/ledger/fullScreenHeader';
 import useWalletReducer from '@hooks/useWalletReducer';
 import useWalletSelector from '@hooks/useWalletSelector';
diff --git a/src/app/screens/ledger/verifyLedgerAccountAddress/index.tsx b/src/app/screens/ledger/verifyLedgerAccountAddress/index.tsx
index cf730ec4f..bafacfa91 100644
--- a/src/app/screens/ledger/verifyLedgerAccountAddress/index.tsx
+++ b/src/app/screens/ledger/verifyLedgerAccountAddress/index.tsx
@@ -1,4 +1,4 @@
-import { delay } from '@common/utils/ledger';
+import { delay } from '@common/utils/promises';
 import ActionButton from '@components/button';
 import InfoContainer from '@components/infoContainer';
 import FullScreenHeader from '@components/ledger/fullScreenHeader';
diff --git a/src/app/screens/signatureRequest/index.tsx b/src/app/screens/signatureRequest/index.tsx
index 468e16099..9c8606b42 100644
--- a/src/app/screens/signatureRequest/index.tsx
+++ b/src/app/screens/signatureRequest/index.tsx
@@ -1,6 +1,6 @@
 import ledgerConnectDefaultIcon from '@assets/img/ledger/ledger_connect_default.svg';
 import ledgerConnectStxIcon from '@assets/img/ledger/ledger_import_connect_stx.svg';
-import { delay } from '@common/utils/ledger';
+import { delay } from '@common/utils/promises';
 import { makeRpcSuccessResponse, sendRpcResponse } from '@common/utils/rpc/helpers';
 import AccountHeaderComponent from '@components/accountHeader';
 import BottomModal from '@components/bottomModal';
diff --git a/src/app/screens/speedUpTransaction/index.tsx b/src/app/screens/speedUpTransaction/index.tsx
index 31561a046..3d975b104 100644
--- a/src/app/screens/speedUpTransaction/index.tsx
+++ b/src/app/screens/speedUpTransaction/index.tsx
@@ -1,7 +1,7 @@
 import ledgerConnectDefaultIcon from '@assets/img/ledger/ledger_connect_default.svg';
 import ledgerConnectBtcIcon from '@assets/img/ledger/ledger_import_connect_btc.svg';
 import ledgerConnectStxIcon from '@assets/img/ledger/ledger_import_connect_stx.svg';
-import { delay } from '@common/utils/ledger';
+import { delay } from '@common/utils/promises';
 import BottomModal from '@components/bottomModal';
 import ActionButton from '@components/button';
 import LedgerConnectionView from '@components/ledger/connectLedgerView';
diff --git a/src/app/utils/promises.ts b/src/app/utils/promises.ts
deleted file mode 100644
index fe57bb627..000000000
--- a/src/app/utils/promises.ts
+++ /dev/null
@@ -1 +0,0 @@
-export const sleep = (ms: number) => new Promise((resolve) => setTimeout(resolve, ms));
diff --git a/src/common/utils/ledger.ts b/src/common/utils/ledger.ts
index 88d0c38e8..3f38f08e4 100644
--- a/src/common/utils/ledger.ts
+++ b/src/common/utils/ledger.ts
@@ -1,10 +1,5 @@
 import type { Account, NetworkType } from '@secretkeylabs/xverse-core';
 
-export const delay = (ms: number) =>
-  new Promise((res) => {
-    setTimeout(res, ms);
-  });
-
 export const filterLedgerAccountsByNetwork = (accounts: Account[], network: NetworkType) =>
   accounts.filter((account) =>
     account.btcAddresses.taproot.address.startsWith(network === 'Mainnet' ? 'bc1' : 'tb1'),
diff --git a/src/common/utils/promises.ts b/src/common/utils/promises.ts
new file mode 100644
index 000000000..fc888ab97
--- /dev/null
+++ b/src/common/utils/promises.ts
@@ -0,0 +1,2 @@
+// a function that sleeps for a given amount of time (ms)
+export const delay = (ms: number) => new Promise((resolve) => setTimeout(resolve, ms));

From bce056babbb5b868eb6d8380c2ac2255880ba17e Mon Sep 17 00:00:00 2001
From: Victor Kirov <victor.kirov@gmail.com>
Date: Thu, 24 Oct 2024 15:33:41 +0300
Subject: [PATCH 219/227] Fix some e2e tests

---
 tests/pages/onboarding.ts | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/tests/pages/onboarding.ts b/tests/pages/onboarding.ts
index 4db035c5b..8aa3915ff 100644
--- a/tests/pages/onboarding.ts
+++ b/tests/pages/onboarding.ts
@@ -220,6 +220,10 @@ export default class Onboarding {
     }
     await expect(this.buttonContinue).toBeEnabled();
     await this.buttonContinue.click();
+    // choose the default address type between native and nested segwit
+    // will be the one with the most funds
+    await expect(this.buttonContinue).toBeEnabled();
+    await this.buttonContinue.click();
     await this.inputPassword.fill(password);
     await this.buttonContinue.click();
     await this.inputPassword.fill(password);

From dfd7262a4db99a6370a595a1b3cea22799283c90 Mon Sep 17 00:00:00 2001
From: Victor Kirov <victor.kirov@gmail.com>
Date: Thu, 24 Oct 2024 16:17:30 +0300
Subject: [PATCH 220/227] Add Bitcoin Payment to the recover address type copy

---
 src/locales/en.json              | 2 +-
 tests/specs/createWallet.spec.ts | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/locales/en.json b/src/locales/en.json
index c10d7298a..d40ccf3b9 100644
--- a/src/locales/en.json
+++ b/src/locales/en.json
@@ -689,7 +689,7 @@
     "HAVE_A_COUNT_WORDS_SEED_PHRASE": "Have a {{number}} words seed phrase?",
     "SELECT_ADDRESS_TYPE": {
       "TITLE": "Preferred Address Type",
-      "DESCRIPTION": "Select the default address type you would like to use for all accounts. You can switch at any time from settings.",
+      "DESCRIPTION": "Select the default Bitcoin payment address type you would like to use for all accounts. You can switch at any time from settings.",
       "LEARN_MORE": "Learn more about address types.",
       "ACCOUNT_COUNT": "Accounts: {{accounts}}",
       "ACCOUNT_SUMMARY_DESCRIPTION": "The balances shown are cumulative across all found accounts for each address type.",
diff --git a/tests/specs/createWallet.spec.ts b/tests/specs/createWallet.spec.ts
index e323e2b77..b145d6350 100644
--- a/tests/specs/createWallet.spec.ts
+++ b/tests/specs/createWallet.spec.ts
@@ -129,6 +129,11 @@ test.describe('Create and Restore Wallet Flow', () => {
       }
       await expect(onboardingPage2.buttonContinue).toBeEnabled();
       await onboardingPage2.buttonContinue.click();
+
+      // address type screen (native/nested), we'll just continue with the default
+      await expect(onboardingPage2.buttonContinue).toBeEnabled();
+      await onboardingPage2.buttonContinue.click();
+
       await onboardingPage2.inputPassword.fill(strongPW);
       await onboardingPage2.buttonContinue.click();
       await onboardingPage2.inputPassword.fill(strongPW);

From b7eca34e1fc8e95872d3332f404b5175ef7597dd Mon Sep 17 00:00:00 2001
From: GitHub Actions Bot <>
Date: Mon, 28 Oct 2024 15:17:54 +0000
Subject: [PATCH 221/227] release: v0.44.1

---
 package-lock.json | 4 ++--
 package.json      | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 664b4505f..6198280bc 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "xverse-web-extension",
-  "version": "0.44.0",
+  "version": "0.44.1",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "xverse-web-extension",
-      "version": "0.44.0",
+      "version": "0.44.1",
       "dependencies": {
         "@aryzing/superqs": "0.0.6",
         "@ledgerhq/hw-transport-webusb": "^6.27.13",
diff --git a/package.json b/package.json
index c103b96c0..79f67c13e 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "xverse-web-extension",
   "description": "A Bitcoin wallet for Web3",
-  "version": "0.44.0",
+  "version": "0.44.1",
   "private": true,
   "engines": {
     "node": "^18.18.2"

From e6110071f79a412040608e4d94744aeaf65ebe04 Mon Sep 17 00:00:00 2001
From: Victor Kirov <victor.kirov@gmail.com>
Date: Tue, 29 Oct 2024 08:11:47 +0200
Subject: [PATCH 222/227] Bump core to fix rate limitter issue on electrs
 (#723)

---
 package-lock.json                   | 88 +++++++++++------------------
 package.json                        |  2 +-
 src/app/hooks/useSelectedAccount.ts |  8 ++-
 3 files changed, 41 insertions(+), 57 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 6198280bc..e580b6ba2 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -17,7 +17,7 @@
         "@sats-connect/core": "0.3.0",
         "@scure/base": "^1.1.9",
         "@scure/btc-signer": "1.2.1",
-        "@secretkeylabs/xverse-core": "27.0.0",
+        "@secretkeylabs/xverse-core": "27.0.1",
         "@stacks/connect": "7.4.1",
         "@stacks/stacks-blockchain-api-types": "6.1.1",
         "@stacks/transactions": "6.16.1",
@@ -1284,9 +1284,9 @@
       }
     },
     "node_modules/@secretkeylabs/xverse-core": {
-      "version": "27.0.0",
-      "resolved": "https://npm.pkg.github.com/download/@secretkeylabs/xverse-core/27.0.0/71a2345e4e49a65359370b26459efa86d8e31cd1",
-      "integrity": "sha512-fspQl0C/Svr64ATs88rQFI+pl0Bq3UDtXVWyxAjITzsrJ9Oq9mcQivE/1JOulSqgg+uqOwy1T4RbMEVyXK5A/A==",
+      "version": "27.0.1",
+      "resolved": "https://npm.pkg.github.com/download/@secretkeylabs/xverse-core/27.0.1/f7f818e03657662c070cac51861c7f9343b05e72",
+      "integrity": "sha512-EFKN1ZDxUmQv/fyVrHy3hKdQLCUkMPZjpdtsWayhdLr5VE9zgNE3Y8hfH9q+3KtZp3yiSKDMmSkX2vfAtzhLOg==",
       "license": "ISC",
       "dependencies": {
         "@bitcoinerlab/secp256k1": "^1.0.2",
@@ -1309,7 +1309,6 @@
         "@zondax/ledger-stacks": "^1.0.4",
         "async-mutex": "^0.4.0",
         "axios": "1.7.7",
-        "axios-rate-limit": "1.4.0",
         "axios-retry": "4.5.0",
         "base64url": "^3.0.1",
         "bip32": "^4.0.0",
@@ -2715,9 +2714,9 @@
       }
     },
     "node_modules/@zondax/ledger-stacks/node_modules/@types/node": {
-      "version": "18.19.50",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-18.19.50.tgz",
-      "integrity": "sha512-xonK+NRrMBRtkL1hVCc3G+uXtjh1Al4opBLjqVmipe5ZAaBYWW6cNAiBVZ1BvmkBhep698rP3UM3aRAdSALuhg==",
+      "version": "18.19.59",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-18.19.59.tgz",
+      "integrity": "sha512-vizm2EqwV/7Zay+A6J3tGl9Lhr7CjZe2HmWS988sefiEmsyP9CeXEleho6i4hJk/8UtZAo0bWN4QPZZr83RxvQ==",
       "dependencies": {
         "undici-types": "~5.26.4"
       }
@@ -3208,17 +3207,6 @@
         "proxy-from-env": "^1.1.0"
       }
     },
-    "node_modules/axios-rate-limit": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/axios-rate-limit/-/axios-rate-limit-1.4.0.tgz",
-      "integrity": "sha512-uM5PbmSUdSle1I+59Av/wpLuNRobfatIR+FyylSoHcVHT20ohjflNnLMEHZQr7N2QVG/Wlt8jekIPhWwoKtpXQ==",
-      "dependencies": {
-        "axios": ">=0.18.0"
-      },
-      "peerDependencies": {
-        "axios": "*"
-      }
-    },
     "node_modules/axios-retry": {
       "version": "4.5.0",
       "resolved": "https://registry.npmjs.org/axios-retry/-/axios-retry-4.5.0.tgz",
@@ -5095,9 +5083,9 @@
       "integrity": "sha512-RlFobl4D3ieetbnR+2EpxdzFl9h0RAJkPK3pfiwMug2nhBin2ZCsGIAJWdpNniLz43sgXam/CgipOmvTA+rUiA=="
     },
     "node_modules/elliptic": {
-      "version": "6.5.4",
-      "resolved": "https://registry.npmjs.org/elliptic/-/elliptic-6.5.4.tgz",
-      "integrity": "sha512-iLhC6ULemrljPZb+QutR5TQGB+pdW6KGD5RSegS+8sorOZT+rdQFbsQFJgvN3eRqNALqJer4oQ16YvJHlU8hzQ==",
+      "version": "6.6.0",
+      "resolved": "https://registry.npmjs.org/elliptic/-/elliptic-6.6.0.tgz",
+      "integrity": "sha512-dpwoQcLc/2WLQvJvLRHKZ+f9FgOdjnq11rurqwekGQygGPsYSK29OMMD2WalatiqQ+XGFDglTNixpPfI+lpaAA==",
       "dependencies": {
         "bn.js": "^4.11.9",
         "brorand": "^1.1.0",
@@ -8920,9 +8908,9 @@
       }
     },
     "node_modules/nan": {
-      "version": "2.20.0",
-      "resolved": "https://registry.npmjs.org/nan/-/nan-2.20.0.tgz",
-      "integrity": "sha512-bk3gXBZDGILuuo/6sKtr0DQmSThYHLtNCdSdXk9YkxD/jK6X2vmCyyXBBxyqZ4XcnzTyYEAThfX3DCEnLf6igw=="
+      "version": "2.22.0",
+      "resolved": "https://registry.npmjs.org/nan/-/nan-2.22.0.tgz",
+      "integrity": "sha512-nbajikzWTMwsW+eSsNm3QwlOs7het9gGJU5dDZzRTQGk03vyBOauxgI4VakDzE0PtsGTmXPsXTbbjVhRwR5mpw=="
     },
     "node_modules/nano-time": {
       "version": "1.0.0",
@@ -10770,9 +10758,9 @@
       }
     },
     "node_modules/secp256k1": {
-      "version": "3.8.0",
-      "resolved": "https://registry.npmjs.org/secp256k1/-/secp256k1-3.8.0.tgz",
-      "integrity": "sha512-k5ke5avRZbtl9Tqx/SA7CbY3NF6Ro+Sj9cZxezFzuBlLDmyqPiL8hJJ+EmzD8Ig4LUDByHJ3/iPOVoRixs/hmw==",
+      "version": "3.8.1",
+      "resolved": "https://registry.npmjs.org/secp256k1/-/secp256k1-3.8.1.tgz",
+      "integrity": "sha512-tArjQw2P0RTdY7QmkNehgp6TVvQXq6ulIhxv8gaH6YubKG/wxxAoNKcbuXjDhybbc+b2Ihc7e0xxiGN744UIiQ==",
       "hasInstallScript": true,
       "dependencies": {
         "bindings": "^1.5.0",
@@ -10780,7 +10768,7 @@
         "bn.js": "^4.11.8",
         "create-hash": "^1.2.0",
         "drbg.js": "^1.0.1",
-        "elliptic": "^6.5.2",
+        "elliptic": "^6.5.7",
         "nan": "^2.14.0",
         "safe-buffer": "^5.1.2"
       },
@@ -12257,6 +12245,7 @@
       "version": "6.2.13",
       "resolved": "https://registry.npmjs.org/uuidv4/-/uuidv4-6.2.13.tgz",
       "integrity": "sha512-AXyzMjazYB3ovL3q051VLH06Ixj//Knx7QnUSi1T//Ie3io6CpsPu9nVMOx5MoLWh6xV0B9J0hIaxungxXUbPQ==",
+      "deprecated": "Package no longer supported. Contact Support at https://www.npmjs.com/support for more info.",
       "dependencies": {
         "@types/uuid": "8.3.4",
         "uuid": "8.3.2"
@@ -13672,9 +13661,9 @@
       }
     },
     "@secretkeylabs/xverse-core": {
-      "version": "27.0.0",
-      "resolved": "https://npm.pkg.github.com/download/@secretkeylabs/xverse-core/27.0.0/71a2345e4e49a65359370b26459efa86d8e31cd1",
-      "integrity": "sha512-fspQl0C/Svr64ATs88rQFI+pl0Bq3UDtXVWyxAjITzsrJ9Oq9mcQivE/1JOulSqgg+uqOwy1T4RbMEVyXK5A/A==",
+      "version": "27.0.1",
+      "resolved": "https://npm.pkg.github.com/download/@secretkeylabs/xverse-core/27.0.1/f7f818e03657662c070cac51861c7f9343b05e72",
+      "integrity": "sha512-EFKN1ZDxUmQv/fyVrHy3hKdQLCUkMPZjpdtsWayhdLr5VE9zgNE3Y8hfH9q+3KtZp3yiSKDMmSkX2vfAtzhLOg==",
       "requires": {
         "@bitcoinerlab/secp256k1": "^1.0.2",
         "@noble/curves": "^1.2.0",
@@ -13696,7 +13685,6 @@
         "@zondax/ledger-stacks": "^1.0.4",
         "async-mutex": "^0.4.0",
         "axios": "1.7.7",
-        "axios-rate-limit": "1.4.0",
         "axios-retry": "4.5.0",
         "base64url": "^3.0.1",
         "bip32": "^4.0.0",
@@ -14871,9 +14859,9 @@
           }
         },
         "@types/node": {
-          "version": "18.19.50",
-          "resolved": "https://registry.npmjs.org/@types/node/-/node-18.19.50.tgz",
-          "integrity": "sha512-xonK+NRrMBRtkL1hVCc3G+uXtjh1Al4opBLjqVmipe5ZAaBYWW6cNAiBVZ1BvmkBhep698rP3UM3aRAdSALuhg==",
+          "version": "18.19.59",
+          "resolved": "https://registry.npmjs.org/@types/node/-/node-18.19.59.tgz",
+          "integrity": "sha512-vizm2EqwV/7Zay+A6J3tGl9Lhr7CjZe2HmWS988sefiEmsyP9CeXEleho6i4hJk/8UtZAo0bWN4QPZZr83RxvQ==",
           "requires": {
             "undici-types": "~5.26.4"
           }
@@ -15253,14 +15241,6 @@
         "proxy-from-env": "^1.1.0"
       }
     },
-    "axios-rate-limit": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/axios-rate-limit/-/axios-rate-limit-1.4.0.tgz",
-      "integrity": "sha512-uM5PbmSUdSle1I+59Av/wpLuNRobfatIR+FyylSoHcVHT20ohjflNnLMEHZQr7N2QVG/Wlt8jekIPhWwoKtpXQ==",
-      "requires": {
-        "axios": ">=0.18.0"
-      }
-    },
     "axios-retry": {
       "version": "4.5.0",
       "resolved": "https://registry.npmjs.org/axios-retry/-/axios-retry-4.5.0.tgz",
@@ -16728,9 +16708,9 @@
       "integrity": "sha512-RlFobl4D3ieetbnR+2EpxdzFl9h0RAJkPK3pfiwMug2nhBin2ZCsGIAJWdpNniLz43sgXam/CgipOmvTA+rUiA=="
     },
     "elliptic": {
-      "version": "6.5.4",
-      "resolved": "https://registry.npmjs.org/elliptic/-/elliptic-6.5.4.tgz",
-      "integrity": "sha512-iLhC6ULemrljPZb+QutR5TQGB+pdW6KGD5RSegS+8sorOZT+rdQFbsQFJgvN3eRqNALqJer4oQ16YvJHlU8hzQ==",
+      "version": "6.6.0",
+      "resolved": "https://registry.npmjs.org/elliptic/-/elliptic-6.6.0.tgz",
+      "integrity": "sha512-dpwoQcLc/2WLQvJvLRHKZ+f9FgOdjnq11rurqwekGQygGPsYSK29OMMD2WalatiqQ+XGFDglTNixpPfI+lpaAA==",
       "requires": {
         "bn.js": "^4.11.9",
         "brorand": "^1.1.0",
@@ -19516,9 +19496,9 @@
       }
     },
     "nan": {
-      "version": "2.20.0",
-      "resolved": "https://registry.npmjs.org/nan/-/nan-2.20.0.tgz",
-      "integrity": "sha512-bk3gXBZDGILuuo/6sKtr0DQmSThYHLtNCdSdXk9YkxD/jK6X2vmCyyXBBxyqZ4XcnzTyYEAThfX3DCEnLf6igw=="
+      "version": "2.22.0",
+      "resolved": "https://registry.npmjs.org/nan/-/nan-2.22.0.tgz",
+      "integrity": "sha512-nbajikzWTMwsW+eSsNm3QwlOs7het9gGJU5dDZzRTQGk03vyBOauxgI4VakDzE0PtsGTmXPsXTbbjVhRwR5mpw=="
     },
     "nano-time": {
       "version": "1.0.0",
@@ -20838,16 +20818,16 @@
       }
     },
     "secp256k1": {
-      "version": "3.8.0",
-      "resolved": "https://registry.npmjs.org/secp256k1/-/secp256k1-3.8.0.tgz",
-      "integrity": "sha512-k5ke5avRZbtl9Tqx/SA7CbY3NF6Ro+Sj9cZxezFzuBlLDmyqPiL8hJJ+EmzD8Ig4LUDByHJ3/iPOVoRixs/hmw==",
+      "version": "3.8.1",
+      "resolved": "https://registry.npmjs.org/secp256k1/-/secp256k1-3.8.1.tgz",
+      "integrity": "sha512-tArjQw2P0RTdY7QmkNehgp6TVvQXq6ulIhxv8gaH6YubKG/wxxAoNKcbuXjDhybbc+b2Ihc7e0xxiGN744UIiQ==",
       "requires": {
         "bindings": "^1.5.0",
         "bip66": "^1.1.5",
         "bn.js": "^4.11.8",
         "create-hash": "^1.2.0",
         "drbg.js": "^1.0.1",
-        "elliptic": "^6.5.2",
+        "elliptic": "^6.5.7",
         "nan": "^2.14.0",
         "safe-buffer": "^5.1.2"
       },
diff --git a/package.json b/package.json
index 79f67c13e..431468601 100644
--- a/package.json
+++ b/package.json
@@ -45,7 +45,7 @@
     "@sats-connect/core": "0.3.0",
     "@scure/base": "^1.1.9",
     "@scure/btc-signer": "1.2.1",
-    "@secretkeylabs/xverse-core": "27.0.0",
+    "@secretkeylabs/xverse-core": "27.0.1",
     "@stacks/connect": "7.4.1",
     "@stacks/stacks-blockchain-api-types": "6.1.1",
     "@stacks/transactions": "6.16.1",
diff --git a/src/app/hooks/useSelectedAccount.ts b/src/app/hooks/useSelectedAccount.ts
index 7af390a7e..04ee3cf25 100644
--- a/src/app/hooks/useSelectedAccount.ts
+++ b/src/app/hooks/useSelectedAccount.ts
@@ -27,9 +27,13 @@ const useSelectedAccount = (overridePayAddressType?: BtcPaymentType): AccountWit
 
     if (!account) {
       [account] = softwareAccountsList;
-      if (account) {
-        switchAccount(account);
+      if (!account) {
+        // this should never happen
+        // if it does, then this hook is being called before onboarding is complete, which is a bug
+        // and should be picked up during dev time
+        throw new Error('No account found');
       }
+      switchAccount(account);
     }
 
     let accountType = btcPaymentAddressType;

From 7022df5855cabb6931b074fc2a170ce697bb6d12 Mon Sep 17 00:00:00 2001
From: GitHub Actions Bot <>
Date: Wed, 30 Oct 2024 07:26:11 +0000
Subject: [PATCH 223/227] release: v0.44.2

---
 package-lock.json | 4 ++--
 package.json      | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index e580b6ba2..249bec8ab 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "xverse-web-extension",
-  "version": "0.44.1",
+  "version": "0.44.2",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "xverse-web-extension",
-      "version": "0.44.1",
+      "version": "0.44.2",
       "dependencies": {
         "@aryzing/superqs": "0.0.6",
         "@ledgerhq/hw-transport-webusb": "^6.27.13",
diff --git a/package.json b/package.json
index 431468601..7b325e1a1 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "xverse-web-extension",
   "description": "A Bitcoin wallet for Web3",
-  "version": "0.44.1",
+  "version": "0.44.2",
   "private": true,
   "engines": {
     "node": "^18.18.2"

From 69fb6ac2bd4f0ac990b9db4dfa2c5453b2b65874 Mon Sep 17 00:00:00 2001
From: Victor Kirov <victor.kirov@gmail.com>
Date: Wed, 30 Oct 2024 10:35:01 +0200
Subject: [PATCH 224/227] Remove taproot balance from btc total balance and fix
 stx total to include locked (#727)

* Remove taproot balance from btc total balance and fix stx total to include locked

* Remove logs

* Use confirmedPaymentBalance

* Remove unused var
---
 src/app/components/tokenTile/index.tsx         |  2 +-
 src/app/hooks/queries/useAccountBalance.ts     | 18 +++++-------------
 .../queries/useSelectedAccountBtcBalance.tsx   | 10 ++++------
 src/app/screens/coinDashboard/coinHeader.tsx   |  4 ++--
 .../coins/btc/balanceBreakdown.tsx             |  8 ++++----
 src/app/screens/home/balanceCard/index.tsx     |  7 +++++--
 src/locales/en.json                            |  1 +
 7 files changed, 22 insertions(+), 28 deletions(-)

diff --git a/src/app/components/tokenTile/index.tsx b/src/app/components/tokenTile/index.tsx
index 615b933ef..44959bbc1 100644
--- a/src/app/components/tokenTile/index.tsx
+++ b/src/app/components/tokenTile/index.tsx
@@ -132,7 +132,7 @@ function TokenTile({
   const { fiatCurrency, balanceHidden } = useWalletSelector();
   const { btcFiatRate, stxBtcRate } = useSupportedCoinRates();
   const { data: stxData } = useStxWalletData();
-  const { confirmedBalance: btcBalance } = useSelectedAccountBtcBalance();
+  const { confirmedPaymentBalance: btcBalance } = useSelectedAccountBtcBalance();
 
   const getTickerTitle = () => {
     if (currency === 'STX' || currency === 'BTC') return `${currency}`;
diff --git a/src/app/hooks/queries/useAccountBalance.ts b/src/app/hooks/queries/useAccountBalance.ts
index e5790cc18..2bd5f7f1b 100644
--- a/src/app/hooks/queries/useAccountBalance.ts
+++ b/src/app/hooks/queries/useAccountBalance.ts
@@ -25,16 +25,8 @@ import { fetchSip10FungibleTokens } from './stx/useGetSip10FungibleTokens';
 const useAccountBalance = () => {
   const btcClient = useBtcClient();
   const stacksNetwork = useNetworkSelector();
-  const {
-    fiatCurrency,
-    network,
-    hideStx,
-    brc20ManageTokens,
-    sip10ManageTokens,
-    runesManageTokens,
-    spamTokens,
-    showSpamTokens,
-  } = useWalletSelector();
+  const { fiatCurrency, network, hideStx, sip10ManageTokens, spamTokens, showSpamTokens } =
+    useWalletSelector();
   const { btcFiatRate, stxBtcRate } = useSupportedCoinRates();
   const runesApi = useRunesApi();
   const dispatch = useDispatch();
@@ -73,12 +65,11 @@ const useAccountBalance = () => {
         return btcData.finalBalance.toString();
       };
 
-      const [nativeBalance, nestedBalance, taprootBalance] = await Promise.all([
+      const [nativeBalance, nestedBalance] = await Promise.all([
         getBtcBalance(account.btcAddresses.native?.address),
         getBtcBalance(account.btcAddresses.nested?.address),
-        getBtcBalance(account.btcAddresses.taproot.address),
       ]);
-      btcBalance = BigNumber(nativeBalance).plus(nestedBalance).plus(taprootBalance).toString();
+      btcBalance = BigNumber(nativeBalance).plus(nestedBalance).toString();
 
       if (account.btcAddresses.taproot.address) {
         const fetchBrc20Balances = fetchBrc20FungibleTokens(
@@ -133,6 +124,7 @@ const useAccountBalance = () => {
       btcFiatRate,
       hideStx,
     });
+
     dispatch(setAccountBalanceAction(getAccountBalanceKey(account), totalBalance));
     return totalBalance;
   };
diff --git a/src/app/hooks/queries/useSelectedAccountBtcBalance.tsx b/src/app/hooks/queries/useSelectedAccountBtcBalance.tsx
index 118fac18a..8fe965dde 100644
--- a/src/app/hooks/queries/useSelectedAccountBtcBalance.tsx
+++ b/src/app/hooks/queries/useSelectedAccountBtcBalance.tsx
@@ -24,19 +24,17 @@ export default function useSelectedAccountBtcBalance() {
     return { isLoading: true, isRefetching: false };
   }
 
-  const confirmedBalance = BigNumber(nativeBalance?.confirmedBalance ?? 0)
+  const confirmedPaymentBalance = BigNumber(nativeBalance?.confirmedBalance ?? 0)
     .plus(nestedBalance?.confirmedBalance ?? 0)
-    .plus(taprootBalance?.confirmedBalance ?? 0)
     .toNumber();
 
-  const unconfirmedBalance = BigNumber(nativeBalance?.unconfirmedBalance ?? 0)
+  const unconfirmedPaymentBalance = BigNumber(nativeBalance?.unconfirmedBalance ?? 0)
     .plus(nestedBalance?.unconfirmedBalance ?? 0)
-    .plus(taprootBalance?.unconfirmedBalance ?? 0)
     .toNumber();
 
   return {
-    confirmedBalance,
-    unconfirmedBalance,
+    confirmedPaymentBalance,
+    unconfirmedPaymentBalance,
     nativeBalance,
     nestedBalance,
     taprootBalance,
diff --git a/src/app/screens/coinDashboard/coinHeader.tsx b/src/app/screens/coinDashboard/coinHeader.tsx
index bc813abec..2cb59a979 100644
--- a/src/app/screens/coinDashboard/coinHeader.tsx
+++ b/src/app/screens/coinDashboard/coinHeader.tsx
@@ -66,7 +66,7 @@ export default function CoinHeader({ currency, fungibleToken }: Props) {
   // TODO: this should be a dumb component, move the logic to the parent
   // TODO: currently, we get btc and stx balances here for all currencies and FTs, but we should get them in
   // TODO: the relevant parent and pass them as props
-  const { confirmedBalance: btcBalance } = useSelectedAccountBtcBalance();
+  const { confirmedPaymentBalance: btcBalance } = useSelectedAccountBtcBalance();
   const { data: stxData } = useStxWalletData();
   const { btcFiatRate, stxBtcRate } = useSupportedCoinRates();
   const navigate = useNavigate();
@@ -178,7 +178,7 @@ export default function CoinHeader({ currency, fungibleToken }: Props) {
     }
     if (currency === 'STX') {
       if (new BigNumber(stxData?.locked ?? 0).gt(0)) {
-        return `Available ${commonT('STACKS')} Balance`;
+        return `${commonT('STACKS')} ${commonT('BALANCE')}`;
       }
       return commonT('STACKS');
     }
diff --git a/src/app/screens/coinDashboard/coins/btc/balanceBreakdown.tsx b/src/app/screens/coinDashboard/coins/btc/balanceBreakdown.tsx
index b13c4cc77..dba37bf35 100644
--- a/src/app/screens/coinDashboard/coins/btc/balanceBreakdown.tsx
+++ b/src/app/screens/coinDashboard/coins/btc/balanceBreakdown.tsx
@@ -14,7 +14,7 @@ const SpinnerContainer = styled.div`
 
 export default function BalanceBreakdown() {
   const { btcPaymentAddressType } = useWalletSelector();
-  const { confirmedBalance, nativeBalance, nestedBalance, taprootBalance, isLoading } =
+  const { confirmedPaymentBalance, nativeBalance, nestedBalance, taprootBalance, isLoading } =
     useSelectedAccountBtcBalance();
 
   if (isLoading) {
@@ -34,19 +34,19 @@ export default function BalanceBreakdown() {
       <AddressBalance
         balance={nativeBalance?.confirmedBalance}
         addressType="native"
-        totalBalance={confirmedBalance}
+        totalBalance={confirmedPaymentBalance}
       />
       {showNested && (
         <AddressBalance
           balance={nestedBalance?.confirmedBalance}
           addressType="nested"
-          totalBalance={confirmedBalance}
+          totalBalance={confirmedPaymentBalance}
         />
       )}
       <AddressBalance
         balance={taprootBalance?.confirmedBalance}
         addressType="taproot"
-        totalBalance={confirmedBalance}
+        totalBalance={confirmedPaymentBalance}
       />
     </SecondaryContainer>
   );
diff --git a/src/app/screens/home/balanceCard/index.tsx b/src/app/screens/home/balanceCard/index.tsx
index be465fb48..68943be6f 100644
--- a/src/app/screens/home/balanceCard/index.tsx
+++ b/src/app/screens/home/balanceCard/index.tsx
@@ -13,6 +13,7 @@ import { setBalanceHiddenToggleAction } from '@stores/wallet/actions/actionCreat
 import Spinner from '@ui-library/spinner';
 import { HIDDEN_BALANCE_LABEL, LoaderSize } from '@utils/constants';
 import { calculateTotalBalance, getAccountBalanceKey } from '@utils/helper';
+import BigNumber from 'bignumber.js';
 import { useEffect } from 'react';
 import { useTranslation } from 'react-i18next';
 import { NumericFormat } from 'react-number-format';
@@ -79,7 +80,7 @@ function BalanceCard(props: BalanceCardProps) {
   const selectedAccount = useSelectedAccount();
   const dispatch = useDispatch();
   const { fiatCurrency, hideStx, accountBalances, balanceHidden } = useWalletSelector();
-  const { confirmedBalance: btcBalance, isLoading: btcBalanceLoading } =
+  const { confirmedPaymentBalance: btcBalance, isLoading: btcBalanceLoading } =
     useSelectedAccountBtcBalance();
   const { data: stxData } = useStxWalletData();
   const { btcFiatRate, stxBtcRate } = useSupportedCoinRates();
@@ -92,7 +93,9 @@ function BalanceCard(props: BalanceCardProps) {
   const { data: runesCoinList } = useVisibleRuneFungibleTokens();
 
   const balance = calculateTotalBalance({
-    stxBalance: stxData?.balance.toString() ?? '0',
+    stxBalance: BigNumber(stxData?.balance ?? 0)
+      .plus(stxData?.locked ?? 0)
+      .toString(),
     btcBalance: (btcBalance ?? 0).toString(),
     sipCoinsList: sip10CoinsList,
     brcCoinsList: brc20CoinsList,
diff --git a/src/locales/en.json b/src/locales/en.json
index d40ccf3b9..920d14d53 100644
--- a/src/locales/en.json
+++ b/src/locales/en.json
@@ -5,6 +5,7 @@
     "COMBO": "Combo",
     "SATS": "Sats",
     "BTC": "BTC",
+    "BALANCE": "Balance",
     "BITCOIN": "Bitcoin",
     "STACKS": "Stacks",
     "SATRIBUTES": "Satributes",

From 59de69816921db1f4d9c7ae97ad1fc3636ec48b0 Mon Sep 17 00:00:00 2001
From: Victor Kirov <victor.kirov@gmail.com>
Date: Wed, 30 Oct 2024 11:10:40 +0200
Subject: [PATCH 225/227] Add missing await from onboarding flow (#729)

---
 src/app/components/guards/onboarding/index.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/app/components/guards/onboarding/index.tsx b/src/app/components/guards/onboarding/index.tsx
index 7251342cf..2498b235a 100644
--- a/src/app/components/guards/onboarding/index.tsx
+++ b/src/app/components/guards/onboarding/index.tsx
@@ -38,7 +38,7 @@ function OnboardingGuard({ children }: WalletExistsGuardProps): React.ReactEleme
           return;
         }
 
-        unlockVault('');
+        await unlockVault('');
         setIsWalletInitialized(false);
       } catch (e) {
         // seed exists and unlocking with empty password failed

From d0febe620440afc5da0c97af6191d9a909f98300 Mon Sep 17 00:00:00 2001
From: GitHub Actions Bot <>
Date: Mon, 4 Nov 2024 14:33:03 +0000
Subject: [PATCH 226/227] release: v0.44.3

---
 package-lock.json | 4 ++--
 package.json      | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 249bec8ab..801e726ec 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "xverse-web-extension",
-  "version": "0.44.2",
+  "version": "0.44.3",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "xverse-web-extension",
-      "version": "0.44.2",
+      "version": "0.44.3",
       "dependencies": {
         "@aryzing/superqs": "0.0.6",
         "@ledgerhq/hw-transport-webusb": "^6.27.13",
diff --git a/package.json b/package.json
index 7b325e1a1..59d72c8d7 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "xverse-web-extension",
   "description": "A Bitcoin wallet for Web3",
-  "version": "0.44.2",
+  "version": "0.44.3",
   "private": true,
   "engines": {
     "node": "^18.18.2"

From 186d16d024e09e31f3a91a4d9361d29e6ba00adf Mon Sep 17 00:00:00 2001
From: Victor Kirov <victor.kirov@gmail.com>
Date: Mon, 4 Nov 2024 17:14:41 +0200
Subject: [PATCH 227/227] Remove adding locked stx balance to total balance
 (#748)

---
 src/app/screens/home/balanceCard/index.tsx | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/app/screens/home/balanceCard/index.tsx b/src/app/screens/home/balanceCard/index.tsx
index 68943be6f..302eb7d7c 100644
--- a/src/app/screens/home/balanceCard/index.tsx
+++ b/src/app/screens/home/balanceCard/index.tsx
@@ -93,9 +93,7 @@ function BalanceCard(props: BalanceCardProps) {
   const { data: runesCoinList } = useVisibleRuneFungibleTokens();
 
   const balance = calculateTotalBalance({
-    stxBalance: BigNumber(stxData?.balance ?? 0)
-      .plus(stxData?.locked ?? 0)
-      .toString(),
+    stxBalance: BigNumber(stxData?.balance ?? 0).toString(),
     btcBalance: (btcBalance ?? 0).toString(),
     sipCoinsList: sip10CoinsList,
     brcCoinsList: brc20CoinsList,