From bd01efd2bb75063de368cf73377d616e90cdac1f Mon Sep 17 00:00:00 2001
From: sharad-s <sharadshekar@gmail.com>
Date: Wed, 16 Mar 2022 10:51:24 -0500
Subject: [PATCH 01/19] migrate cvx positions

---
 .../Modals/PluginModal/PluginRewardsModal.tsx |  18 +-
 src/components/shared/Layout/Layout.tsx       |  28 +++
 src/components/shared/SwitchNetworkMenu.tsx   |   1 -
 src/constants/convex.ts                       |   7 +-
 src/context/BalancesContext.tsx               |  15 +-
 src/context/RariContext.tsx                   |   4 +
 src/contracts/abi/ConvexBaseRewardPool.json   |   1 +
 .../convex/useConvexPoolSuppliedCTokens.ts    |   4 +-
 src/hooks/convex/useStakedConvexBalances.ts   |  61 ++++++
 src/utils/convex/migratePositions.ts          | 188 ++++++++++++++++++
 src/utils/multicall.ts                        |  25 ++-
 11 files changed, 328 insertions(+), 24 deletions(-)
 create mode 100644 src/contracts/abi/ConvexBaseRewardPool.json
 create mode 100644 src/hooks/convex/useStakedConvexBalances.ts
 create mode 100644 src/utils/convex/migratePositions.ts

diff --git a/src/components/pages/Fuse/Modals/PluginModal/PluginRewardsModal.tsx b/src/components/pages/Fuse/Modals/PluginModal/PluginRewardsModal.tsx
index 4e31b450..6d06cfda 100644
--- a/src/components/pages/Fuse/Modals/PluginModal/PluginRewardsModal.tsx
+++ b/src/components/pages/Fuse/Modals/PluginModal/PluginRewardsModal.tsx
@@ -21,7 +21,7 @@ import { USDPricedFuseAsset } from "utils/fetchFusePoolData"
 import { InfoIcon } from "@chakra-ui/icons"
 import AppLink from "components/shared/AppLink"
 import { CTokenAvatarGroup } from "components/shared/Icons/CTokenIcon"
-import { eligibleTokens, tokenInfo } from "constants/convex"
+import { eligibleTokens, CONVEX_CTOKEN_INFO } from "constants/convex"
 
 export const PluginRewardsModal = ({
     market,
@@ -61,10 +61,10 @@ export const PluginRewardsModal = ({
                                     <InfoIcon size="15px" />
                                     <Text>This market streams
                                         <CTokenAvatarGroup tokenAddresses={rewardTokens} popOnHover={false} /> rewards
-                                        from the <b>{tokenInfo[market.underlyingSymbol].convexPoolName}</b> Convex pool
-                                        to suppliers of <b>{tokenInfo[market.underlyingSymbol].curvePoolName}</b> Curve LPs. </Text>
-                                    {/* <Text fontSize="sm"> Deposit your {tokenInfo[market.underlyingSymbol].curvePoolName} Curve LP tokens into Fuse to borrow against it while earning all the same rewards from Convex.</Text> */}
-                                    {/* <Text py={1}>View reward rates for <b>{tokenInfo[market.underlyingSymbol].convexPoolName}</b> on Convex </Text> */}
+                                        from the <b>{CONVEX_CTOKEN_INFO[market.underlyingSymbol].convexPoolName}</b> Convex pool
+                                        to suppliers of <b>{CONVEX_CTOKEN_INFO[market.underlyingSymbol].curvePoolName}</b> Curve LPs. </Text>
+                                    {/* <Text fontSize="sm"> Deposit your {CONVEX_CTOKEN_INFO[market.underlyingSymbol].curvePoolName} Curve LP tokens into Fuse to borrow against it while earning all the same rewards from Convex.</Text> */}
+                                    {/* <Text py={1}>View reward rates for <b>{CONVEX_CTOKEN_INFO[market.underlyingSymbol].convexPoolName}</b> on Convex </Text> */}
                                 </VStack>
                                 {/* </AppLink> */}
 
@@ -73,9 +73,9 @@ export const PluginRewardsModal = ({
                                     Info
                                 </Heading>
 
-                                <InfoPairs title="Curve Pool" link={tokenInfo[market.underlyingSymbol].curvePoolLink} address={''} />
-                                <InfoPairs title="Curve LP Token" address={tokenInfo[market.underlyingSymbol].lpToken} />
-                                <InfoPairs title="ERC4626 Plugin" address={tokenInfo[market.underlyingSymbol].plugin} />
+                                <InfoPairs title="Curve Pool" link={CONVEX_CTOKEN_INFO[market.underlyingSymbol].curvePoolLink} address={''} />
+                                <InfoPairs title="Curve LP Token" address={CONVEX_CTOKEN_INFO[market.underlyingSymbol].lpToken} />
+                                <InfoPairs title="ERC4626 Plugin" address={CONVEX_CTOKEN_INFO[market.underlyingSymbol].plugin} />
 
                             </Flex>
                         }
@@ -83,7 +83,7 @@ export const PluginRewardsModal = ({
                     <ModalFooter mt={2}>
                         <AppLink isExternal={true} href="https://www.convexfinance.com/stake">
                             <Button colorScheme='white' minW="100%">
-                                View rates for {' '} <Text mx={1} fontWeight={"bold"}>{tokenInfo[market.underlyingSymbol].convexPoolName}</Text>  {' '} on Convex
+                                View rates for {' '} <Text mx={1} fontWeight={"bold"}>{CONVEX_CTOKEN_INFO[market.underlyingSymbol].convexPoolName}</Text>  {' '} on Convex
                             </Button>
                         </AppLink>
                     </ModalFooter>
diff --git a/src/components/shared/Layout/Layout.tsx b/src/components/shared/Layout/Layout.tsx
index 9d2be4b8..a142a9f0 100644
--- a/src/components/shared/Layout/Layout.tsx
+++ b/src/components/shared/Layout/Layout.tsx
@@ -7,6 +7,14 @@ import { useMemo, useState, useEffect } from "react";
 import NewHeader from "../Header2/NewHeader";
 import Footer from "./Footer";
 
+import { Button, Image } from "@chakra-ui/react"
+
+//CVX
+import { useAccountBalances } from "context/BalancesContext"
+import { useDisclosure } from "@chakra-ui/react";
+import CVXMigrateModal from "components/pages/Fuse/Modals/CVXMigrateModal";
+
+
 
 const Layout = ({ children }) => {
   const { chainId } = useRari()
@@ -37,6 +45,16 @@ const Layout = ({ children }) => {
     return () => document.removeEventListener("keydown", handler);
   }, []);
 
+  const [_, __, cvxBalances] = useAccountBalances()
+  const hasCvxBalances = !!Object.keys(cvxBalances ?? {}).length
+  const { isOpen, onOpen, onClose } = useDisclosure()
+
+  console.log({cvxBalances})
+
+  useEffect(() => {
+    console.log({ hasCvxBalances })
+    if (!!hasCvxBalances) onOpen()
+  }, [hasCvxBalances])
 
   return (
     <Column
@@ -62,11 +80,21 @@ const Layout = ({ children }) => {
 
       <NewHeader />
       {children}
+      {!!hasCvxBalances && <CVXMigrateModal isOpen={isOpen} onClose={onClose} />}
+      {!!hasCvxBalances && <ConvexModalButton onOpen={onOpen} />}
       <Footer />
     </Column>
   );
 };
 
 
+const ConvexModalButton = ({onOpen}: {onOpen: any}) => {
+  return (
+      <Button onClick={onOpen}  position="fixed" bottom={0} right={0} m={5}>
+        <Image src="/static/icons/convex.svg" h="100%" w="100%"/>
+      </Button>
+  )
+}
+
 
 export default Layout;
diff --git a/src/components/shared/SwitchNetworkMenu.tsx b/src/components/shared/SwitchNetworkMenu.tsx
index 407670ee..932e78c4 100644
--- a/src/components/shared/SwitchNetworkMenu.tsx
+++ b/src/components/shared/SwitchNetworkMenu.tsx
@@ -86,7 +86,6 @@ const SwitchNetworkMenu: React.FC = () => {
   // If user presses meta key or control key + slash they will toggle the private allocation claim mode.
   useEffect(() => {
     const handler = (e: KeyboardEvent) => {
-      console.log(e.code)
       if (e.code === "Slash") {
         e.preventDefault();
         setDevMode(true);
diff --git a/src/constants/convex.ts b/src/constants/convex.ts
index ce99792c..6f70fa7a 100644
--- a/src/constants/convex.ts
+++ b/src/constants/convex.ts
@@ -1,6 +1,6 @@
 export const eligibleTokens = ["FRAX3CRV-f", "steCRV", "UST_whv23CRV-f", "crv3crypto", "D3-f", "FEI3CRV3CRV-f", "alUSD3CRV-f"]
 
-export const tokenInfo: PluginCTokenInfoType = {
+export const CONVEX_CTOKEN_INFO: PluginCTokenInfoType = {
     "FRAX3CRV-f": {
         "cToken": "0x2ec70d3Ff3FD7ac5c2a72AAA64A398b6CA7428A5",
         "plugin": "0xd88e89ac6a0859e9b91078cb2a183a36ba6c8933",
@@ -89,3 +89,8 @@ type PluginCTokenInfoType = {
 }
 
 export const POOL_156_COMPTROLLER = "0x07cd53380FE9B2a5E64099591b498c73F0EfaA66"
+
+
+export const SUPPORTED_CONVEX_LPS = [
+
+]
\ No newline at end of file
diff --git a/src/context/BalancesContext.tsx b/src/context/BalancesContext.tsx
index 1d06711c..aab9663f 100644
--- a/src/context/BalancesContext.tsx
+++ b/src/context/BalancesContext.tsx
@@ -1,9 +1,10 @@
+
+import { StakedConvexBalancesMap, useStakedConvexBalances } from "hooks/convex/useStakedConvexBalances";
 import { useTokenBalances } from "hooks/useTokenBalance";
 import { SubgraphUnderlyingAsset } from "pages/api/explore";
-import { createContext, useContext, ReactNode, useMemo } from "react";
+import { createContext, useContext, ReactNode, useMemo, useEffect } from "react";
 import { queryAllUnderlyingAssets } from "services/gql";
 import useSWR from "swr";
-import { UnderlyingAsset } from "types/tokens";
 import { useRari } from "./RariContext";
 
 export const BalancesContext = createContext<any | undefined>(undefined);
@@ -35,6 +36,7 @@ export const BalancesContextProvider = ({
   );
 
   const tokenBalances = useTokenBalances(tokenAddresses);
+  const cvxBalances = useStakedConvexBalances()
 
   const balances: {
     [address: string]: number;
@@ -54,15 +56,16 @@ export const BalancesContextProvider = ({
     return ret;
   }, [tokenBalances, isAuthed]);
 
+
   return (
-    <BalancesContext.Provider value={balances}>
+    <BalancesContext.Provider value={{ balances, cvxBalances }}>
       {children}
     </BalancesContext.Provider>
   );
 };
 
-export const useAccountBalances = (): [any, string[]] => {
-  const balances = useContext(BalancesContext);
+export const useAccountBalances = (): [any, string[], StakedConvexBalancesMap] => {
+  const { balances, cvxBalances } = useContext(BalancesContext);
 
   const significantTokens: string[] = useMemo(
     () =>
@@ -80,5 +83,5 @@ export const useAccountBalances = (): [any, string[]] => {
     );
   }
 
-  return [balances, significantTokens];
+  return [balances, significantTokens, cvxBalances];
 };
diff --git a/src/context/RariContext.tsx b/src/context/RariContext.tsx
index 4a02abf0..0eada725 100644
--- a/src/context/RariContext.tsx
+++ b/src/context/RariContext.tsx
@@ -131,6 +131,10 @@ export const RariProvider = ({ children }: { children: ReactNode }) => {
   const queryClient = useQueryClient();
   const { t } = useTranslation();
 
+  useEffect(() => {
+    // if (!!requestedAddress) setAddress(requestedAddress as string)
+  }, [requestedAddress])
+
   useEffect(() => {
     //toast on brave users
     if(typeof navigator !== 'object') return
diff --git a/src/contracts/abi/ConvexBaseRewardPool.json b/src/contracts/abi/ConvexBaseRewardPool.json
new file mode 100644
index 00000000..35189fec
--- /dev/null
+++ b/src/contracts/abi/ConvexBaseRewardPool.json
@@ -0,0 +1 @@
+[{"inputs":[{"internalType":"uint256","name":"pid_","type":"uint256"},{"internalType":"address","name":"stakingToken_","type":"address"},{"internalType":"address","name":"rewardToken_","type":"address"},{"internalType":"address","name":"operator_","type":"address"},{"internalType":"address","name":"rewardManager_","type":"address"}],"stateMutability":"nonpayable","type":"constructor"},{"anonymous":false,"inputs":[{"indexed":false,"internalType":"uint256","name":"reward","type":"uint256"}],"name":"RewardAdded","type":"event"},{"anonymous":false,"inputs":[{"indexed":true,"internalType":"address","name":"user","type":"address"},{"indexed":false,"internalType":"uint256","name":"reward","type":"uint256"}],"name":"RewardPaid","type":"event"},{"anonymous":false,"inputs":[{"indexed":true,"internalType":"address","name":"user","type":"address"},{"indexed":false,"internalType":"uint256","name":"amount","type":"uint256"}],"name":"Staked","type":"event"},{"anonymous":false,"inputs":[{"indexed":true,"internalType":"address","name":"user","type":"address"},{"indexed":false,"internalType":"uint256","name":"amount","type":"uint256"}],"name":"Withdrawn","type":"event"},{"inputs":[{"internalType":"address","name":"_reward","type":"address"}],"name":"addExtraReward","outputs":[{"internalType":"bool","name":"","type":"bool"}],"stateMutability":"nonpayable","type":"function"},{"inputs":[{"internalType":"address","name":"account","type":"address"}],"name":"balanceOf","outputs":[{"internalType":"uint256","name":"","type":"uint256"}],"stateMutability":"view","type":"function"},{"inputs":[],"name":"clearExtraRewards","outputs":[],"stateMutability":"nonpayable","type":"function"},{"inputs":[],"name":"currentRewards","outputs":[{"internalType":"uint256","name":"","type":"uint256"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"uint256","name":"_amount","type":"uint256"}],"name":"donate","outputs":[{"internalType":"bool","name":"","type":"bool"}],"stateMutability":"nonpayable","type":"function"},{"inputs":[],"name":"duration","outputs":[{"internalType":"uint256","name":"","type":"uint256"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"address","name":"account","type":"address"}],"name":"earned","outputs":[{"internalType":"uint256","name":"","type":"uint256"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"uint256","name":"","type":"uint256"}],"name":"extraRewards","outputs":[{"internalType":"address","name":"","type":"address"}],"stateMutability":"view","type":"function"},{"inputs":[],"name":"extraRewardsLength","outputs":[{"internalType":"uint256","name":"","type":"uint256"}],"stateMutability":"view","type":"function"},{"inputs":[],"name":"getReward","outputs":[{"internalType":"bool","name":"","type":"bool"}],"stateMutability":"nonpayable","type":"function"},{"inputs":[{"internalType":"address","name":"_account","type":"address"},{"internalType":"bool","name":"_claimExtras","type":"bool"}],"name":"getReward","outputs":[{"internalType":"bool","name":"","type":"bool"}],"stateMutability":"nonpayable","type":"function"},{"inputs":[],"name":"historicalRewards","outputs":[{"internalType":"uint256","name":"","type":"uint256"}],"stateMutability":"view","type":"function"},{"inputs":[],"name":"lastTimeRewardApplicable","outputs":[{"internalType":"uint256","name":"","type":"uint256"}],"stateMutability":"view","type":"function"},{"inputs":[],"name":"lastUpdateTime","outputs":[{"internalType":"uint256","name":"","type":"uint256"}],"stateMutability":"view","type":"function"},{"inputs":[],"name":"newRewardRatio","outputs":[{"internalType":"uint256","name":"","type":"uint256"}],"stateMutability":"view","type":"function"},{"inputs":[],"name":"operator","outputs":[{"internalType":"address","name":"","type":"address"}],"stateMutability":"view","type":"function"},{"inputs":[],"name":"periodFinish","outputs":[{"internalType":"uint256","name":"","type":"uint256"}],"stateMutability":"view","type":"function"},{"inputs":[],"name":"pid","outputs":[{"internalType":"uint256","name":"","type":"uint256"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"uint256","name":"_rewards","type":"uint256"}],"name":"queueNewRewards","outputs":[{"internalType":"bool","name":"","type":"bool"}],"stateMutability":"nonpayable","type":"function"},{"inputs":[],"name":"queuedRewards","outputs":[{"internalType":"uint256","name":"","type":"uint256"}],"stateMutability":"view","type":"function"},{"inputs":[],"name":"rewardManager","outputs":[{"internalType":"address","name":"","type":"address"}],"stateMutability":"view","type":"function"},{"inputs":[],"name":"rewardPerToken","outputs":[{"internalType":"uint256","name":"","type":"uint256"}],"stateMutability":"view","type":"function"},{"inputs":[],"name":"rewardPerTokenStored","outputs":[{"internalType":"uint256","name":"","type":"uint256"}],"stateMutability":"view","type":"function"},{"inputs":[],"name":"rewardRate","outputs":[{"internalType":"uint256","name":"","type":"uint256"}],"stateMutability":"view","type":"function"},{"inputs":[],"name":"rewardToken","outputs":[{"internalType":"contract IERC20","name":"","type":"address"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"address","name":"","type":"address"}],"name":"rewards","outputs":[{"internalType":"uint256","name":"","type":"uint256"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"uint256","name":"_amount","type":"uint256"}],"name":"stake","outputs":[{"internalType":"bool","name":"","type":"bool"}],"stateMutability":"nonpayable","type":"function"},{"inputs":[],"name":"stakeAll","outputs":[{"internalType":"bool","name":"","type":"bool"}],"stateMutability":"nonpayable","type":"function"},{"inputs":[{"internalType":"address","name":"_for","type":"address"},{"internalType":"uint256","name":"_amount","type":"uint256"}],"name":"stakeFor","outputs":[{"internalType":"bool","name":"","type":"bool"}],"stateMutability":"nonpayable","type":"function"},{"inputs":[],"name":"stakingToken","outputs":[{"internalType":"contract IERC20","name":"","type":"address"}],"stateMutability":"view","type":"function"},{"inputs":[],"name":"totalSupply","outputs":[{"internalType":"uint256","name":"","type":"uint256"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"address","name":"","type":"address"}],"name":"userRewardPerTokenPaid","outputs":[{"internalType":"uint256","name":"","type":"uint256"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"uint256","name":"amount","type":"uint256"},{"internalType":"bool","name":"claim","type":"bool"}],"name":"withdraw","outputs":[{"internalType":"bool","name":"","type":"bool"}],"stateMutability":"nonpayable","type":"function"},{"inputs":[{"internalType":"bool","name":"claim","type":"bool"}],"name":"withdrawAll","outputs":[],"stateMutability":"nonpayable","type":"function"},{"inputs":[{"internalType":"bool","name":"claim","type":"bool"}],"name":"withdrawAllAndUnwrap","outputs":[],"stateMutability":"nonpayable","type":"function"},{"inputs":[{"internalType":"uint256","name":"amount","type":"uint256"},{"internalType":"bool","name":"claim","type":"bool"}],"name":"withdrawAndUnwrap","outputs":[{"internalType":"bool","name":"","type":"bool"}],"stateMutability":"nonpayable","type":"function"}]
\ No newline at end of file
diff --git a/src/hooks/convex/useConvexPoolSuppliedCTokens.ts b/src/hooks/convex/useConvexPoolSuppliedCTokens.ts
index 4578bb92..2edee266 100644
--- a/src/hooks/convex/useConvexPoolSuppliedCTokens.ts
+++ b/src/hooks/convex/useConvexPoolSuppliedCTokens.ts
@@ -1,4 +1,4 @@
-import { tokenInfo } from 'constants/convex';
+import { CONVEX_CTOKEN_INFO } from 'constants/convex';
 import { useRari } from 'context/RariContext'
 import { BigNumber } from 'ethers';
 import { Interface } from 'ethers/lib/utils';
@@ -11,7 +11,7 @@ export const useConvexPoolSuppliedCTokens = (comptrollerAddress: string) => {
 
     const { data: suppliedMarkets } = useQuery(`Pool ${comptrollerAddress}  CTokens User ${address}`, async () => {
 
-        const markets = Object.values(tokenInfo).map((value => value.cToken))
+        const markets = Object.values(CONVEX_CTOKEN_INFO).map((value => value.cToken))
 
         const IComptroller = new Interface(JSON.parse(
             fuse.compoundContracts["contracts/CErc20Delegate.sol:CErc20Delegate"].abi
diff --git a/src/hooks/convex/useStakedConvexBalances.ts b/src/hooks/convex/useStakedConvexBalances.ts
new file mode 100644
index 00000000..ec8a3a8d
--- /dev/null
+++ b/src/hooks/convex/useStakedConvexBalances.ts
@@ -0,0 +1,61 @@
+import { providers } from "@0xsequence/multicall";
+import { useRari } from "context/RariContext";
+import { useQuery } from "react-query";
+
+import BaseRewardPoolABI from "contracts/abi/ConvexBaseRewardPool.json"
+import { CONVEX_CTOKEN_INFO } from "constants/convex";
+import { Contract } from "ethers";
+import { BigNumber } from "ethers";
+
+export type StakedConvexBalancesMap = {
+    [cToken: string]: {
+        balance: BigNumber,
+        baseRewardsPool: string
+    }
+}
+
+export const useStakedConvexBalances = (): StakedConvexBalancesMap => {
+    const { fuse, address, isAuthed } = useRari();
+    const multiCallProvider = new providers.MulticallProvider(fuse.provider)
+    const { data: stakedConvexBalances } = useQuery<StakedConvexBalancesMap | undefined>(
+        ' staked convex balances for ' + address,
+        async () => {
+            if (!isAuthed) return undefined
+
+            let map: StakedConvexBalancesMap = {}
+
+            await Promise.all(Object.values(CONVEX_CTOKEN_INFO)
+                .map(c => ({ baseRewardsPool: c.rewardsContract, cToken: c.cToken }))
+                .map(({ baseRewardsPool, cToken }) => {
+                    let contract = new Contract(baseRewardsPool, BaseRewardPoolABI as any, multiCallProvider)
+                    return contract.balanceOf(address)
+                        .then((balance: BigNumber) => {
+                            if (!balance.isZero()) {
+                                map[cToken] = {
+                                    balance,
+                                    baseRewardsPool,
+                                }
+                            }
+                        })
+                        .catch((_err: any) => { })
+                }
+                ))
+
+                console.log({map})
+
+            return map
+        },
+        {
+            enabled: !!address ? true : false,
+            refetchOnMount: false,
+            refetchOnWindowFocus: false,
+          }
+    )
+
+    // const hasBalances = 
+
+    return stakedConvexBalances ?? {}
+
+}
+
+
diff --git a/src/utils/convex/migratePositions.ts b/src/utils/convex/migratePositions.ts
new file mode 100644
index 00000000..84a3651b
--- /dev/null
+++ b/src/utils/convex/migratePositions.ts
@@ -0,0 +1,188 @@
+import { testForCTokenErrorAndSend } from "components/pages/Fuse/Modals/PoolModal/AmountSelect";
+import BaseRewardPoolABI from "contracts/abi/ConvexBaseRewardPool.json"
+import { Contract } from "ethers";
+import { constants } from "ethers";
+import { BigNumber } from "ethers";
+import { Interface } from "ethers/lib/utils"
+import { USDPricedFuseAsset } from "utils/fetchFusePoolData";
+import { callStaticWithMultiCall, encodeCall, estimateGasWithMultiCall, sendWithMultiCall } from "utils/multicall"
+import { Fuse } from "../../esm";
+
+
+export const unstakeAndWithdrawCVXPool = async (fuse: Fuse, baseRewardPool: string) => {
+    const IBaseRewardPool = new Interface(JSON.stringify(BaseRewardPoolABI))
+
+    const BaseRewardPool = new Contract(baseRewardPool, IBaseRewardPool, fuse.provider.getSigner())
+
+    try {
+        let estimatedGas = await BaseRewardPool.estimateGas.withdrawAllAndUnwrap(true)
+        console.log({ estimatedGas })
+
+        let result = await BaseRewardPool.callStatic.withdrawAllAndUnwrap(true)
+        console.log({ result })
+
+        result = await BaseRewardPool.withdrawAllAndUnwrap(true)
+        console.log({ result })
+
+        return result
+
+    } catch (err) {
+        console.error("Could not unstake and claim CVX Rewards")
+        throw err
+    }
+}
+
+
+/**
+ * @param marketAddress - Market/ctoken to give approval to.
+ * @param underlyingAddress - The token to approve.
+ * @param amount - Amount user is supplying.
+ * @param provider - An initiated ethers provider.
+ */
+export async function checkAllowanceAndApprove(
+    fuse: Fuse,
+    userAddress: string,
+    marketAddress: string,
+    underlyingAddress: string,
+    amount: BigNumber,
+) {
+    const erc20Interface = new Interface([
+        'function allowance(address owner, address spender) public view returns (uint256 remaining)',
+        'function approve(address spender, uint256 value) public returns (bool success)',
+    ])
+
+    const erc20Contract = new Contract(
+        underlyingAddress,
+        erc20Interface,
+        fuse.provider.getSigner(userAddress)
+    )
+
+    const hasApprovedEnough = (
+        await erc20Contract.callStatic.allowance(userAddress, marketAddress)
+    ).gte(amount);
+
+    if (!hasApprovedEnough) {
+        const max = BigNumber.from(2).pow(BigNumber.from(256)).sub(constants.One); //big fucking #
+        await erc20Contract.approve(marketAddress, max);
+    }
+}
+
+// Todo - remove. Will be replaced by SDK
+export const deposit = async (fuse: Fuse, marketAddress: string, amount: BigNumber) => {
+    const market = new Contract(
+        marketAddress,
+        JSON.parse(
+            fuse.compoundContracts[
+                "contracts/CErc20Delegate.sol:CErc20Delegate"
+            ].abi),
+        fuse.provider.getSigner()
+    );
+
+    let tx = await testForCTokenErrorAndSend(
+        market.callStatic.mint,
+        amount,
+        market.mint,
+        "Cannot deposit this amount right now!"
+    );
+
+    return tx
+}
+
+export const collateralize = async (fuse: Fuse, comptrollerAddress: string, marketAddresses: string[]) => {
+    const comptroller = new Contract(
+        comptrollerAddress,
+        JSON.parse(
+            fuse.compoundContracts["contracts/Comptroller.sol:Comptroller"].abi
+        ),
+        fuse.provider.getSigner()
+    );
+
+    await comptroller.enterMarkets(marketAddresses);
+
+    return comptroller;
+}
+
+/*
+Can't Multicall these :/
+
+export const unstakeAndWithdrawStakedCVXMulti = async (fuse: Fuse, baseRewardPools: string[]) => {
+    const IBaseRewardPool = new Interface(JSON.stringify(BaseRewardPoolABI))
+
+    const encodedCalls = baseRewardPools.map(baseRewardPool => encodeCall(IBaseRewardPool, baseRewardPool, "withdrawAllAndUnwrap", [true]))
+    try {
+        let estimatedGas = await estimateGasWithMultiCall(fuse.provider, encodedCalls)
+        console.log({ estimatedGas })
+
+        let result = await callStaticWithMultiCall(fuse.provider, encodedCalls)
+        console.log({ result })
+
+        result = await sendWithMultiCall(fuse, encodedCalls)
+        console.log({ result })
+
+        return result
+
+    } catch (err) {
+        console.error("Could not unstake and claim CVX Rewards")
+    }
+}
+
+// Todo - move elswhere
+export const approveAllMarketsMulti = async (fuse: Fuse, assets: USDPricedFuseAsset[]) => {
+    const MAX_APPROVAL = BigNumber.from(2).pow(BigNumber.from(256)).sub(constants.One); //big fucking #
+
+    const IERC20 = new Interface(JSON.parse(
+        fuse.compoundContracts[
+            "contracts/EIP20Interface.sol:EIP20Interface"
+        ].abi
+    ))
+
+    const encodedCalls = assets.map(asset => encodeCall(IERC20, asset.underlyingToken, "approve", [asset.cToken, MAX_APPROVAL]))
+    try {
+        let estimatedGas = await estimateGasWithMultiCall(fuse.provider, encodedCalls)
+        console.log({ estimatedGas })
+
+        let result = await callStaticWithMultiCall(fuse.provider, encodedCalls)
+        console.log({ result })
+
+        result = await sendWithMultiCall(fuse, encodedCalls)
+        console.log({ result })
+
+        return result
+
+    } catch (err) {
+        console.error("Could not unstake and claim CVX Rewards")
+    }
+
+}
+
+
+export const unstakeAndWithdrawStakedCVXAndApproveCtokens = async (fuse: Fuse, baseRewardPools: string[], assets: USDPricedFuseAsset[]) => {
+    const IBaseRewardPool = new Interface(JSON.stringify(BaseRewardPoolABI))
+    const IERC20 = new Interface(JSON.parse(
+        fuse.compoundContracts[
+            "contracts/EIP20Interface.sol:EIP20Interface"
+        ].abi
+    ))
+    const MAX_APPROVAL = BigNumber.from(2).pow(BigNumber.from(256)).sub(constants.One); //big fucking #
+
+    let cvxEncodedCalls = baseRewardPools.map(baseRewardPool => encodeCall(IBaseRewardPool, baseRewardPool, "withdrawAllAndUnwrap", [true]))
+    let approvalEncodedCalls = assets.map(asset => encodeCall(IERC20, asset.underlyingToken, "approve", [asset.cToken, MAX_APPROVAL]))
+    const encodedCalls = [...cvxEncodedCalls, ...approvalEncodedCalls]
+
+    try {
+        let estimatedGas = await estimateGasWithMultiCall(fuse.provider, encodedCalls)
+        console.log({ estimatedGas })
+
+        let result = await callStaticWithMultiCall(fuse.provider, encodedCalls)
+        console.log({ result })
+
+        result = await sendWithMultiCall(fuse, encodedCalls)
+        console.log({ result })
+
+        return result
+
+    } catch (err) {
+        console.error("Could not unstake and claim CVX Rewards and Approve CTokens :( :(")
+    }
+}
+*/
\ No newline at end of file
diff --git a/src/utils/multicall.ts b/src/utils/multicall.ts
index 39efc34d..acd021fb 100644
--- a/src/utils/multicall.ts
+++ b/src/utils/multicall.ts
@@ -18,16 +18,16 @@ export const createMultiCall = (provider: JsonRpcProvider | Web3Provider,) => {
 export const sendWithMultiCall = async (
   fuse: Fuse,
   encodedCalls: any,
-  address: string
+  address?: string
 ) => {
   // @ts-ignore
   const multicall = createMultiCall(fuse.provider);
 
-  console.log("sendWithMultiCall", { encodedCalls, multicall });
+  console.log("sendWithMultiCall", { encodedCalls, multicall });  
+  let options: any = {}
+  if (!!address) options.address = address
 
-  const returnDatas = await multicall.aggregate(encodedCalls, {
-    from: address,
-  });
+  const returnDatas = await multicall.aggregate(encodedCalls, options);
 
   return returnDatas;
 };
@@ -48,6 +48,21 @@ export const callStaticWithMultiCall = async (
 };
 
 
+export const estimateGasWithMultiCall = async (
+  provider: JsonRpcProvider | Web3Provider,
+  encodedCalls: EncodedCall[],
+  address?: string
+) => {
+  const multicall = createMultiCall(provider);
+  let options: any = {}
+  if (!!address) options.address = address
+
+  const estimatedGas = await multicall.estimateGas.aggregate(encodedCalls, options)
+
+  return estimatedGas;
+};
+
+
 
 export const callInterfaceWithMulticall = async (
   provider: JsonRpcProvider | Web3Provider,

From f28ef70edb97c2e351789fba4eb4616cf8187f39 Mon Sep 17 00:00:00 2001
From: sharad-s <sharadshekar@gmail.com>
Date: Wed, 16 Mar 2022 11:20:02 -0500
Subject: [PATCH 02/19]  update modal

---
 .../pages/Fuse/Modals/CVXMigrateModal.tsx     | 196 ++++++++++++++++++
 src/esm/utils/networks.js                     |  18 +-
 2 files changed, 205 insertions(+), 9 deletions(-)
 create mode 100644 src/components/pages/Fuse/Modals/CVXMigrateModal.tsx

diff --git a/src/components/pages/Fuse/Modals/CVXMigrateModal.tsx b/src/components/pages/Fuse/Modals/CVXMigrateModal.tsx
new file mode 100644
index 00000000..b1d0e1c9
--- /dev/null
+++ b/src/components/pages/Fuse/Modals/CVXMigrateModal.tsx
@@ -0,0 +1,196 @@
+import {
+    Modal,
+    ModalOverlay,
+    ModalContent,
+    ModalHeader,
+    ModalFooter,
+    ModalBody,
+    ModalCloseButton,
+    Text,
+    Flex,
+    VStack,
+    Spacer,
+    Button,
+    HStack,
+    useToast,
+    Avatar,
+    Box
+} from "@chakra-ui/react"
+import { POOL_156_COMPTROLLER } from "constants/convex"
+import { useAccountBalances } from "context/BalancesContext"
+import { useRari } from "context/RariContext"
+import { commify } from "ethers/lib/utils"
+import { formatEther } from "ethers/lib/utils"
+import { useFusePoolData } from "hooks/useFusePoolData"
+import { useTokensDataAsMap } from "hooks/useTokenData"
+import { useEffect, useMemo, useState } from "react"
+import { checkAllowanceAndApprove, collateralize, deposit, unstakeAndWithdrawCVXPool } from "utils/convex/migratePositions"
+import { handleGenericError } from "utils/errorHandling"
+
+export const CVXMigrateModal = ({
+    isOpen,
+    onClose,
+}: {
+    isOpen: boolean,
+    onClose: () => void,
+}) => {
+
+    const { fuse, address } = useRari()
+    const [_, __, _cvxBalances] = useAccountBalances()
+
+    const toast = useToast()
+    const [step, setStep] = useState<1 | 2 | 3 | 4 | 5|  undefined>()
+    const [assetIndex, setAssetIndex] = useState(0)
+
+    const cvxBalances = useMemo(() => _cvxBalances, [])
+    const fusePoolData = useFusePoolData("156")
+
+    const assets = !fusePoolData ? [] : fusePoolData.assets.filter(a => Object.keys(cvxBalances).includes(a.cToken))
+
+    const marketsUnderlyingMap: { [underlying: string]: string } = assets.reduce((obj, asset) => ({
+        ...obj,
+        [asset.cToken]: asset.underlyingToken
+    }), {})
+    const tokenData = useTokensDataAsMap(assets.map(a => a.underlyingToken))
+
+    console.log({ tokenData, marketsUnderlyingMap })
+
+    useEffect(() => {
+        setStep(undefined)
+    }, [assetIndex])
+
+
+    /*  Unstakes and Claims all CVX Staked Positions supported by Fuse  */
+    const handleUnstake = async () => {
+        try {
+            const baseRewardPool = cvxBalances[assets[assetIndex].cToken].baseRewardsPool
+            const res = await unstakeAndWithdrawCVXPool(fuse, baseRewardPool)
+            setStep(2)
+        } catch (err) {
+            handleGenericError(err, toast)
+        }
+    }
+
+    const handleApproveMarket = async () => {
+        const { cToken, underlyingToken } = assets[assetIndex]
+        try {
+            setStep(2)
+            const res = await checkAllowanceAndApprove(fuse, address, cToken, underlyingToken, cvxBalances[cToken].balance)
+            console.log({ res })
+            setStep(3)
+        } catch (err) {
+            handleGenericError(err, toast)
+        }
+    }
+
+    const handleDeposit = async () => {
+        const { cToken } = assets[assetIndex]
+        try {
+            setStep(3)
+            const res = await deposit(fuse, cToken, cvxBalances[cToken].balance)
+            console.log({ res })
+            setStep(4)
+        } catch (err) {
+            handleGenericError(err, toast)
+        }
+    }
+
+    const handleCollateralize = async () => {
+        const { membership } = assets[assetIndex]
+        const markets = assets.map(({ cToken }) => cToken)
+        if (!!membership) return
+        try {
+            setStep(4)
+            const res = await collateralize(fuse, POOL_156_COMPTROLLER, markets)
+            console.log({ res })
+            setStep(5)
+        } catch (err) {
+            handleGenericError(err, toast)
+        }
+    }
+
+
+    const activeSymbol = tokenData[assets[assetIndex]?.underlyingToken]?.symbol
+
+    const showEnableAsCollateral = !assets[assetIndex]?.membership
+
+
+    return (
+        <>
+            <Modal isOpen={isOpen} onClose={onClose}>
+                <ModalOverlay />
+                <ModalContent>
+                    <ModalHeader display="flex" width="100%" alignSelf="center">
+                        <Text fontSize="lg" mr={4} alignSelf="center">
+                            🔌 Migrate Staked CVX to Fuse Pool 156
+                        </Text>
+                        <ModalCloseButton />
+                    </ModalHeader>
+                    <ModalBody>
+
+                        <Flex direction="column" height="100%">
+                            {/* <AppLink isExternal={true} href="https://www.convexfinance.com/stake"> */}
+                            <VStack align={"flex-start"} my={2}>
+                                <Text>We detected {assets.length} staked Convex positions </Text>
+                                <ul>
+                                    {Object.keys(cvxBalances).map((market, i) =>
+                                        <Box onClick={() => setAssetIndex(i)} bg={assetIndex === i ? "aqua" : "white"}>
+                                            <HStack key={market}>
+                                                <Avatar src={tokenData[marketsUnderlyingMap[market]]?.logoURL} />
+                                                <Text>
+                                                    {commify(parseFloat(formatEther(cvxBalances[market].balance)).toFixed(2))} {tokenData[marketsUnderlyingMap[market]]?.symbol}
+                                                </Text>
+                                            </HStack>
+                                        </Box>
+                                    )}
+                                </ul>
+                                <Spacer />
+                                <Text>
+                                    Migrate {activeSymbol} in four clicks
+                                </Text>
+
+                                <HStack>
+                                    <Text>
+                                        1.)
+                                    </Text>
+                                    <Button disabled={!!step && step !== 1} onClick={handleUnstake}>Unstake {activeSymbol} and Claim Rewards</Button>
+                                </HStack>
+
+                                <HStack>
+                                    <Text>
+                                        2.)
+                                    </Text>
+                                    <Button disabled={step !== 2} onClick={handleApproveMarket}>Approve {activeSymbol}</Button>
+                                </HStack>
+
+                                <HStack>
+                                    <Text>
+                                        3.)
+                                    </Text>
+                                    <Button disabled={step !== 3} onClick={handleDeposit}>Deposit {activeSymbol}</Button>
+                                </HStack>
+
+                                {showEnableAsCollateral && <HStack>
+                                    <Text>
+                                        4.)
+                                    </Text>
+                                    <Button disabled={step !== 4} onClick={handleCollateralize}>Enable Collateral</Button>
+                                </HStack>}
+
+                                {step === 5 && <Text>Done!</Text>} 
+
+                            </VStack>
+                        </Flex>
+                    </ModalBody>
+                    <ModalFooter mt={2}>
+
+                    </ModalFooter>
+                </ModalContent>
+            </Modal>
+        </>
+    )
+}
+
+
+
+export default CVXMigrateModal
\ No newline at end of file
diff --git a/src/esm/utils/networks.js b/src/esm/utils/networks.js
index 4929a457..bfe6ead8 100644
--- a/src/esm/utils/networks.js
+++ b/src/esm/utils/networks.js
@@ -81,15 +81,15 @@ export const chainMetadata = {
         blockExplorerURL: "https://optimistic.etherscan.io",
         color: "#FE0521",
     },
-    // [ChainID.HARDHAT]: {
-    //   chainId: ChainID.HARDHAT,
-    //   name: "Hardhat",
-    //   imageUrl: "/static/networks/optimism.svg", // no logo
-    //   supported: true,
-    //   rpcUrl: "http://localhost:8545",
-    //   blockExplorerURL: "",
-    //   color: "#BC6C6C"
-    // }
+    [ChainID.HARDHAT]: {
+      chainId: ChainID.HARDHAT,
+      name: "Hardhat",
+      imageUrl: "/static/networks/optimism.svg", // no logo
+      supported: true,
+      rpcUrl: "http://localhost:8545",
+      blockExplorerURL: "",
+      color: "#BC6C6C"
+    }
 };
 export const isSupportedChainId = (chainId) => Object.values(ChainID).includes(chainId);
 export function getSupportedChains() {

From cb26dad16afdb470bd9e0bfca562a468d18b071f Mon Sep 17 00:00:00 2001
From: sharad-s <sharadshekar@gmail.com>
Date: Wed, 16 Mar 2022 11:34:54 -0500
Subject: [PATCH 03/19] loading states

---
 .../pages/Fuse/Modals/CVXMigrateModal.tsx     | 41 +++++++++++++++----
 src/utils/convex/migratePositions.ts          | 22 ++++++----
 2 files changed, 46 insertions(+), 17 deletions(-)

diff --git a/src/components/pages/Fuse/Modals/CVXMigrateModal.tsx b/src/components/pages/Fuse/Modals/CVXMigrateModal.tsx
index b1d0e1c9..46d4b85a 100644
--- a/src/components/pages/Fuse/Modals/CVXMigrateModal.tsx
+++ b/src/components/pages/Fuse/Modals/CVXMigrateModal.tsx
@@ -39,7 +39,9 @@ export const CVXMigrateModal = ({
     const [_, __, _cvxBalances] = useAccountBalances()
 
     const toast = useToast()
-    const [step, setStep] = useState<1 | 2 | 3 | 4 | 5|  undefined>()
+    const [step, setStep] = useState<1 | 2 | 3 | 4 | 5 | undefined>()
+    const [activeStep, setActiveStep] = useState<1 | 2 | 3 | 4 | 5 | undefined>()
+
     const [assetIndex, setAssetIndex] = useState(0)
 
     const cvxBalances = useMemo(() => _cvxBalances, [])
@@ -63,10 +65,12 @@ export const CVXMigrateModal = ({
     /*  Unstakes and Claims all CVX Staked Positions supported by Fuse  */
     const handleUnstake = async () => {
         try {
+            setActiveStep(1)
             const baseRewardPool = cvxBalances[assets[assetIndex].cToken].baseRewardsPool
             const res = await unstakeAndWithdrawCVXPool(fuse, baseRewardPool)
             setStep(2)
         } catch (err) {
+            setActiveStep(undefined)
             handleGenericError(err, toast)
         }
     }
@@ -74,11 +78,12 @@ export const CVXMigrateModal = ({
     const handleApproveMarket = async () => {
         const { cToken, underlyingToken } = assets[assetIndex]
         try {
-            setStep(2)
+            setActiveStep(2)
             const res = await checkAllowanceAndApprove(fuse, address, cToken, underlyingToken, cvxBalances[cToken].balance)
             console.log({ res })
             setStep(3)
         } catch (err) {
+            setActiveStep(undefined)
             handleGenericError(err, toast)
         }
     }
@@ -86,11 +91,12 @@ export const CVXMigrateModal = ({
     const handleDeposit = async () => {
         const { cToken } = assets[assetIndex]
         try {
-            setStep(3)
+            setActiveStep(3)
             const res = await deposit(fuse, cToken, cvxBalances[cToken].balance)
             console.log({ res })
             setStep(4)
         } catch (err) {
+            setActiveStep(undefined)
             handleGenericError(err, toast)
         }
     }
@@ -100,11 +106,12 @@ export const CVXMigrateModal = ({
         const markets = assets.map(({ cToken }) => cToken)
         if (!!membership) return
         try {
-            setStep(4)
+            setActiveStep(4)
             const res = await collateralize(fuse, POOL_156_COMPTROLLER, markets)
             console.log({ res })
             setStep(5)
         } catch (err) {
+            setActiveStep(undefined)
             handleGenericError(err, toast)
         }
     }
@@ -153,31 +160,47 @@ export const CVXMigrateModal = ({
                                     <Text>
                                         1.)
                                     </Text>
-                                    <Button disabled={!!step && step !== 1} onClick={handleUnstake}>Unstake {activeSymbol} and Claim Rewards</Button>
+                                    <Button colorScheme="blue" disabled={!!step && step !== 1} onClick={handleUnstake}>
+                                        {
+                                            activeStep === 1 ? "Unstaking and Claiming..." : `Unstake ${activeSymbol} and Claim Rewards`
+                                        }
+                                    </Button>
                                 </HStack>
 
                                 <HStack>
                                     <Text>
                                         2.)
                                     </Text>
-                                    <Button disabled={step !== 2} onClick={handleApproveMarket}>Approve {activeSymbol}</Button>
+                                    <Button colorScheme="blue" disabled={step !== 2} onClick={handleApproveMarket}>
+                                        {
+                                            activeStep === 2 ? `Approving ${activeSymbol}...` : ` Approve ${activeSymbol}`
+                                        }
+                                    </Button>
                                 </HStack>
 
                                 <HStack>
                                     <Text>
                                         3.)
                                     </Text>
-                                    <Button disabled={step !== 3} onClick={handleDeposit}>Deposit {activeSymbol}</Button>
+                                    <Button colorScheme="blue" disabled={step !== 3} onClick={handleDeposit}>
+                                        {
+                                            activeStep === 3 ? `Depositing ${activeSymbol}...` : ` Deposit ${activeSymbol}`
+                                        }
+                                    </Button>
                                 </HStack>
 
                                 {showEnableAsCollateral && <HStack>
                                     <Text>
                                         4.)
                                     </Text>
-                                    <Button disabled={step !== 4} onClick={handleCollateralize}>Enable Collateral</Button>
+                                    <Button colorScheme="blue" disabled={step !== 4} onClick={handleCollateralize}>
+                                        {
+                                            activeStep === 4 ? `Collateralizing...` : `Collateralize`
+                                        }
+                                    </Button>
                                 </HStack>}
 
-                                {step === 5 && <Text>Done!</Text>} 
+                                {step === 5 && <Text>Done!</Text>}
 
                             </VStack>
                         </Flex>
diff --git a/src/utils/convex/migratePositions.ts b/src/utils/convex/migratePositions.ts
index 84a3651b..7ad97eb3 100644
--- a/src/utils/convex/migratePositions.ts
+++ b/src/utils/convex/migratePositions.ts
@@ -21,10 +21,11 @@ export const unstakeAndWithdrawCVXPool = async (fuse: Fuse, baseRewardPool: stri
         let result = await BaseRewardPool.callStatic.withdrawAllAndUnwrap(true)
         console.log({ result })
 
-        result = await BaseRewardPool.withdrawAllAndUnwrap(true)
-        console.log({ result })
+        let tx = await BaseRewardPool.withdrawAllAndUnwrap(true)
+        console.log({ tx })
 
-        return result
+        const txConfirmed = await tx.wait(1)
+        return txConfirmed;
 
     } catch (err) {
         console.error("Could not unstake and claim CVX Rewards")
@@ -63,7 +64,9 @@ export async function checkAllowanceAndApprove(
 
     if (!hasApprovedEnough) {
         const max = BigNumber.from(2).pow(BigNumber.from(256)).sub(constants.One); //big fucking #
-        await erc20Contract.approve(marketAddress, max);
+        let tx = await erc20Contract.approve(marketAddress, max);
+        const txConfirmed = await tx.wait(1)
+        return txConfirmed;
     }
 }
 
@@ -85,7 +88,10 @@ export const deposit = async (fuse: Fuse, marketAddress: string, amount: BigNumb
         "Cannot deposit this amount right now!"
     );
 
-    return tx
+    const txConfirmed = await tx.wait(1)
+    console.log({txConfirmed})
+
+    return txConfirmed
 }
 
 export const collateralize = async (fuse: Fuse, comptrollerAddress: string, marketAddresses: string[]) => {
@@ -97,9 +103,9 @@ export const collateralize = async (fuse: Fuse, comptrollerAddress: string, mark
         fuse.provider.getSigner()
     );
 
-    await comptroller.enterMarkets(marketAddresses);
-
-    return comptroller;
+    let tx = await comptroller.enterMarkets(marketAddresses);
+    const txConfirmed = await tx.wait(1)
+    return txConfirmed;
 }
 
 /*

From f7795c33e50c66efbcb07abf52da0ffb220615d4 Mon Sep 17 00:00:00 2001
From: sharad-s <sharadshekar@gmail.com>
Date: Wed, 16 Mar 2022 13:38:27 -0500
Subject: [PATCH 04/19] support for curve lp tokens

---
 .../pages/Fuse/Modals/CVXMigrateModal.tsx     | 144 +++++++++++++-----
 src/components/shared/Layout/Layout.tsx       |  17 ++-
 src/context/BalancesContext.tsx               |  10 +-
 src/hooks/convex/useStakedConvexBalances.ts   |  59 ++++++-
 src/hooks/useHasApproval.ts                   |  49 ++++++
 5 files changed, 221 insertions(+), 58 deletions(-)
 create mode 100644 src/hooks/useHasApproval.ts

diff --git a/src/components/pages/Fuse/Modals/CVXMigrateModal.tsx b/src/components/pages/Fuse/Modals/CVXMigrateModal.tsx
index 46d4b85a..4235da63 100644
--- a/src/components/pages/Fuse/Modals/CVXMigrateModal.tsx
+++ b/src/components/pages/Fuse/Modals/CVXMigrateModal.tsx
@@ -17,11 +17,13 @@ import {
     Box
 } from "@chakra-ui/react"
 import { POOL_156_COMPTROLLER } from "constants/convex"
-import { useAccountBalances } from "context/BalancesContext"
 import { useRari } from "context/RariContext"
+import { BigNumber, constants } from "ethers"
 import { commify } from "ethers/lib/utils"
 import { formatEther } from "ethers/lib/utils"
+import { useCurveLPBalances, useStakedConvexBalances } from "hooks/convex/useStakedConvexBalances"
 import { useFusePoolData } from "hooks/useFusePoolData"
+import useHasApproval from "hooks/useHasApproval"
 import { useTokensDataAsMap } from "hooks/useTokenData"
 import { useEffect, useMemo, useState } from "react"
 import { checkAllowanceAndApprove, collateralize, deposit, unstakeAndWithdrawCVXPool } from "utils/convex/migratePositions"
@@ -36,8 +38,12 @@ export const CVXMigrateModal = ({
 }) => {
 
     const { fuse, address } = useRari()
-    const [_, __, _cvxBalances] = useAccountBalances()
+    const _cvxBalances = useStakedConvexBalances()
+    const curveLPBalances = useCurveLPBalances()
 
+    console.log({ curveLPBalances })
+
+    // Steppers
     const toast = useToast()
     const [step, setStep] = useState<1 | 2 | 3 | 4 | 5 | undefined>()
     const [activeStep, setActiveStep] = useState<1 | 2 | 3 | 4 | 5 | undefined>()
@@ -47,39 +53,67 @@ export const CVXMigrateModal = ({
     const cvxBalances = useMemo(() => _cvxBalances, [])
     const fusePoolData = useFusePoolData("156")
 
-    const assets = !fusePoolData ? [] : fusePoolData.assets.filter(a => Object.keys(cvxBalances).includes(a.cToken))
+    const assets = !fusePoolData ? [] : fusePoolData.assets.filter(a => Object.keys(cvxBalances).includes(a.cToken) || Object.keys(curveLPBalances).includes(a.underlyingToken))
+    const curveAssets = !fusePoolData ? [] : fusePoolData.assets.filter(a => Object.keys(curveLPBalances).includes(a.underlyingToken))
 
     const marketsUnderlyingMap: { [underlying: string]: string } = assets.reduce((obj, asset) => ({
         ...obj,
         [asset.cToken]: asset.underlyingToken
     }), {})
+
+    const marketsBalancesMap: {
+        [cToken: string]: {
+            stakedBalance: BigNumber,
+            curveBalance: BigNumber,
+            total: BigNumber
+        }
+    } = assets.reduce((obj, asset) => {
+        const stakedBalance = cvxBalances[asset.cToken]?.balance ?? constants.Zero
+        const curveBalance = curveLPBalances[asset.underlyingToken] ?? constants.Zero
+        const total = stakedBalance.add(curveBalance)
+
+        if (total.isZero()) return { ...obj }
+        return {
+            ...obj,
+            [asset.cToken]: {
+                stakedBalance,
+                curveBalance,
+                total
+            }
+        }
+    }, {})
+
     const tokenData = useTokensDataAsMap(assets.map(a => a.underlyingToken))
 
-    console.log({ tokenData, marketsUnderlyingMap })
+    console.log({ tokenData, marketsBalancesMap, marketsUnderlyingMap })
+
+    const marketBalance = marketsBalancesMap[assets[assetIndex]?.cToken]
 
-    useEffect(() => {
-        setStep(undefined)
-    }, [assetIndex])
 
 
     /*  Unstakes and Claims all CVX Staked Positions supported by Fuse  */
     const handleUnstake = async () => {
+        const { stakedBalance } = marketBalance
         try {
             setActiveStep(1)
-            const baseRewardPool = cvxBalances[assets[assetIndex].cToken].baseRewardsPool
-            const res = await unstakeAndWithdrawCVXPool(fuse, baseRewardPool)
-            setStep(2)
+            if (stakedBalance.gt(0)) {
+                const baseRewardPool = cvxBalances[assets[assetIndex].cToken].baseRewardsPool
+                const res = await unstakeAndWithdrawCVXPool(fuse, baseRewardPool)
+            }
         } catch (err) {
             setActiveStep(undefined)
             handleGenericError(err, toast)
         }
+        setStep(2)
     }
 
+    // Approve for stakedBalance + curveBalance
     const handleApproveMarket = async () => {
         const { cToken, underlyingToken } = assets[assetIndex]
+        const { total } = marketBalance
         try {
             setActiveStep(2)
-            const res = await checkAllowanceAndApprove(fuse, address, cToken, underlyingToken, cvxBalances[cToken].balance)
+            const res = await checkAllowanceAndApprove(fuse, address, cToken, underlyingToken, total)
             console.log({ res })
             setStep(3)
         } catch (err) {
@@ -88,11 +122,13 @@ export const CVXMigrateModal = ({
         }
     }
 
+    // Deposit curveBalance
     const handleDeposit = async () => {
         const { cToken } = assets[assetIndex]
+        const { curveBalance } = marketBalance
         try {
             setActiveStep(3)
-            const res = await deposit(fuse, cToken, cvxBalances[cToken].balance)
+            const res = await deposit(fuse, cToken, curveBalance)
             console.log({ res })
             setStep(4)
         } catch (err) {
@@ -101,10 +137,9 @@ export const CVXMigrateModal = ({
         }
     }
 
+    // Collateralize all
     const handleCollateralize = async () => {
-        const { membership } = assets[assetIndex]
-        const markets = assets.map(({ cToken }) => cToken)
-        if (!!membership) return
+        const markets = Object.keys(marketsBalancesMap)
         try {
             setActiveStep(4)
             const res = await collateralize(fuse, POOL_156_COMPTROLLER, markets)
@@ -116,11 +151,24 @@ export const CVXMigrateModal = ({
         }
     }
 
-
     const activeSymbol = tokenData[assets[assetIndex]?.underlyingToken]?.symbol
 
+    const hasApproval = useHasApproval(assets[assetIndex], marketBalance.total.toString())
+
     const showEnableAsCollateral = !assets[assetIndex]?.membership
 
+    const showUnstake = !marketBalance?.stakedBalance?.isZero() ?? true
+
+    const showApproval = !hasApproval
+
+    useEffect(() => {
+        if (!showUnstake) setStep(2)
+        else if (hasApproval) setStep(3)
+        else setStep(undefined)
+    }, [assetIndex])
+
+
+    console.log({ marketBalance, showUnstake })
 
     return (
         <>
@@ -138,16 +186,24 @@ export const CVXMigrateModal = ({
                         <Flex direction="column" height="100%">
                             {/* <AppLink isExternal={true} href="https://www.convexfinance.com/stake"> */}
                             <VStack align={"flex-start"} my={2}>
-                                <Text>We detected {assets.length} staked Convex positions </Text>
+                                <Text>We detected {Object.keys(cvxBalances).length} staked Convex positions {!!curveAssets.length && ` and ${curveAssets.length} Curve LP tokens`} </Text>
                                 <ul>
-                                    {Object.keys(cvxBalances).map((market, i) =>
+                                    {Object.keys(marketsBalancesMap).map((market, i) =>
                                         <Box onClick={() => setAssetIndex(i)} bg={assetIndex === i ? "aqua" : "white"}>
-                                            <HStack key={market}>
-                                                <Avatar src={tokenData[marketsUnderlyingMap[market]]?.logoURL} />
+                                            <VStack>
+                                                <HStack key={market}>
+                                                    <Avatar src={tokenData[marketsUnderlyingMap[market]]?.logoURL} />
+                                                    <Text>
+                                                        {tokenData[marketsUnderlyingMap[market]]?.symbol}
+                                                    </Text>
+                                                </HStack>
                                                 <Text>
-                                                    {commify(parseFloat(formatEther(cvxBalances[market].balance)).toFixed(2))} {tokenData[marketsUnderlyingMap[market]]?.symbol}
+                                                    {commify(parseFloat(formatEther(marketsBalancesMap[market].stakedBalance)).toFixed(2))} staked
                                                 </Text>
-                                            </HStack>
+                                                <Text>
+                                                    {commify(parseFloat(formatEther(marketsBalancesMap[market].curveBalance)).toFixed(2))} in Curve
+                                                </Text>
+                                            </VStack>
                                         </Box>
                                     )}
                                 </ul>
@@ -156,27 +212,31 @@ export const CVXMigrateModal = ({
                                     Migrate {activeSymbol} in four clicks
                                 </Text>
 
-                                <HStack>
-                                    <Text>
-                                        1.)
-                                    </Text>
-                                    <Button colorScheme="blue" disabled={!!step && step !== 1} onClick={handleUnstake}>
-                                        {
-                                            activeStep === 1 ? "Unstaking and Claiming..." : `Unstake ${activeSymbol} and Claim Rewards`
-                                        }
-                                    </Button>
-                                </HStack>
+                                {showUnstake && (
+                                    <HStack>
+                                        <Text>
+                                            1.)
+                                        </Text>
+                                        <Button colorScheme="blue" disabled={!!step && step !== 1} onClick={handleUnstake}>
+                                            {
+                                                activeStep === 1 ? "Unstaking and Claiming..." : `Unstake ${activeSymbol} and Claim Rewards`
+                                            }
+                                        </Button>
+                                    </HStack>
+                                )}
 
-                                <HStack>
-                                    <Text>
-                                        2.)
-                                    </Text>
-                                    <Button colorScheme="blue" disabled={step !== 2} onClick={handleApproveMarket}>
-                                        {
-                                            activeStep === 2 ? `Approving ${activeSymbol}...` : ` Approve ${activeSymbol}`
-                                        }
-                                    </Button>
-                                </HStack>
+                                {showApproval && (
+                                    <HStack>
+                                        <Text>
+                                            2.)
+                                        </Text>
+                                        <Button colorScheme="blue" disabled={step !== 2} onClick={handleApproveMarket}>
+                                            {
+                                                activeStep === 2 ? `Approving ${activeSymbol}...` : ` Approve ${activeSymbol}`
+                                            }
+                                        </Button>
+                                    </HStack>
+                                )}
 
                                 <HStack>
                                     <Text>
diff --git a/src/components/shared/Layout/Layout.tsx b/src/components/shared/Layout/Layout.tsx
index a142a9f0..1d82e601 100644
--- a/src/components/shared/Layout/Layout.tsx
+++ b/src/components/shared/Layout/Layout.tsx
@@ -13,6 +13,7 @@ import { Button, Image } from "@chakra-ui/react"
 import { useAccountBalances } from "context/BalancesContext"
 import { useDisclosure } from "@chakra-ui/react";
 import CVXMigrateModal from "components/pages/Fuse/Modals/CVXMigrateModal";
+import { useCurveLPBalances, useStakedConvexBalances } from "hooks/convex/useStakedConvexBalances";
 
 
 
@@ -45,14 +46,14 @@ const Layout = ({ children }) => {
     return () => document.removeEventListener("keydown", handler);
   }, []);
 
-  const [_, __, cvxBalances] = useAccountBalances()
-  const hasCvxBalances = !!Object.keys(cvxBalances ?? {}).length
+  const cvxBalances = useStakedConvexBalances()
+  const curveLPBalances = useCurveLPBalances()
+  const hasCvxBalances = !!Object.keys(cvxBalances ?? {}).length || !!Object.keys(curveLPBalances ?? {}).length
   const { isOpen, onOpen, onClose } = useDisclosure()
 
-  console.log({cvxBalances})
+  console.log({ cvxBalances, curveLPBalances })
 
   useEffect(() => {
-    console.log({ hasCvxBalances })
     if (!!hasCvxBalances) onOpen()
   }, [hasCvxBalances])
 
@@ -88,11 +89,11 @@ const Layout = ({ children }) => {
 };
 
 
-const ConvexModalButton = ({onOpen}: {onOpen: any}) => {
+const ConvexModalButton = ({ onOpen }: { onOpen: any }) => {
   return (
-      <Button onClick={onOpen}  position="fixed" bottom={0} right={0} m={5}>
-        <Image src="/static/icons/convex.svg" h="100%" w="100%"/>
-      </Button>
+    <Button onClick={onOpen} position="fixed" bottom={0} right={0} m={5}>
+      <Image src="/static/icons/convex.svg" h="100%" w="100%" />
+    </Button>
   )
 }
 
diff --git a/src/context/BalancesContext.tsx b/src/context/BalancesContext.tsx
index aab9663f..d2ffd938 100644
--- a/src/context/BalancesContext.tsx
+++ b/src/context/BalancesContext.tsx
@@ -1,5 +1,4 @@
 
-import { StakedConvexBalancesMap, useStakedConvexBalances } from "hooks/convex/useStakedConvexBalances";
 import { useTokenBalances } from "hooks/useTokenBalance";
 import { SubgraphUnderlyingAsset } from "pages/api/explore";
 import { createContext, useContext, ReactNode, useMemo, useEffect } from "react";
@@ -36,7 +35,6 @@ export const BalancesContextProvider = ({
   );
 
   const tokenBalances = useTokenBalances(tokenAddresses);
-  const cvxBalances = useStakedConvexBalances()
 
   const balances: {
     [address: string]: number;
@@ -58,14 +56,14 @@ export const BalancesContextProvider = ({
 
 
   return (
-    <BalancesContext.Provider value={{ balances, cvxBalances }}>
+    <BalancesContext.Provider value={{ balances }}>
       {children}
     </BalancesContext.Provider>
   );
 };
 
-export const useAccountBalances = (): [any, string[], StakedConvexBalancesMap] => {
-  const { balances, cvxBalances } = useContext(BalancesContext);
+export const useAccountBalances = (): [any, string[]] => {
+  const { balances} = useContext(BalancesContext);
 
   const significantTokens: string[] = useMemo(
     () =>
@@ -83,5 +81,5 @@ export const useAccountBalances = (): [any, string[], StakedConvexBalancesMap] =
     );
   }
 
-  return [balances, significantTokens, cvxBalances];
+  return [balances, significantTokens];
 };
diff --git a/src/hooks/convex/useStakedConvexBalances.ts b/src/hooks/convex/useStakedConvexBalances.ts
index ec8a3a8d..558dd509 100644
--- a/src/hooks/convex/useStakedConvexBalances.ts
+++ b/src/hooks/convex/useStakedConvexBalances.ts
@@ -7,6 +7,10 @@ import { CONVEX_CTOKEN_INFO } from "constants/convex";
 import { Contract } from "ethers";
 import { BigNumber } from "ethers";
 
+import { useTokenBalances } from "hooks/useTokenBalance";
+import { useMemo } from "react";
+import { erc20ABI } from "wagmi";
+
 export type StakedConvexBalancesMap = {
     [cToken: string]: {
         balance: BigNumber,
@@ -14,6 +18,8 @@ export type StakedConvexBalancesMap = {
     }
 }
 
+
+/* For Staked CVX positions - there's no ERC20 to query balance for */
 export const useStakedConvexBalances = (): StakedConvexBalancesMap => {
     const { fuse, address, isAuthed } = useRari();
     const multiCallProvider = new providers.MulticallProvider(fuse.provider)
@@ -41,7 +47,7 @@ export const useStakedConvexBalances = (): StakedConvexBalancesMap => {
                 }
                 ))
 
-                console.log({map})
+            console.log({ map })
 
             return map
         },
@@ -49,7 +55,7 @@ export const useStakedConvexBalances = (): StakedConvexBalancesMap => {
             enabled: !!address ? true : false,
             refetchOnMount: false,
             refetchOnWindowFocus: false,
-          }
+        }
     )
 
     // const hasBalances = 
@@ -59,3 +65,52 @@ export const useStakedConvexBalances = (): StakedConvexBalancesMap => {
 }
 
 
+type BalancesMap = {
+    [token: string]: BigNumber
+}
+
+export const useCurveLPBalances = (): BalancesMap => {
+
+    const { fuse, address, isAuthed } = useRari();
+    const multiCallProvider = new providers.MulticallProvider(fuse.provider)
+
+    const { data: curveLPBalances } = useQuery<BalancesMap | undefined>(
+        ' curve convex balances for ' + address,
+        async () => {
+
+            if (!isAuthed) return undefined
+
+            let map: BalancesMap = {}
+
+            await Promise.all(
+                Object.values(CONVEX_CTOKEN_INFO)
+                    .map(c => ({ curveLPToken: c.lpToken }))
+                    .map(({ curveLPToken }) => {
+                        let contract = new Contract(curveLPToken, erc20ABI, multiCallProvider)
+                        return contract.balanceOf(address)
+                            .then((balance: BigNumber) => {
+                                if (!balance.isZero()) {
+                                    map[curveLPToken] = balance
+                                }
+                            })
+                            .catch((_err: any) => { })
+                    }
+                    ))
+            return map
+        },
+        {
+            enabled: !!address ? true : false,
+            refetchOnMount: false,
+            refetchOnWindowFocus: false,
+        }
+    )
+
+
+    console.log({curveLPBalances})
+    // const hasBalances = 
+
+    return curveLPBalances ?? {}
+
+}
+
+
diff --git a/src/hooks/useHasApproval.ts b/src/hooks/useHasApproval.ts
new file mode 100644
index 00000000..ae425ccc
--- /dev/null
+++ b/src/hooks/useHasApproval.ts
@@ -0,0 +1,49 @@
+import { useQuery } from "react-query"
+import { useRari } from "context/RariContext"
+import { BigNumber, Contract } from "ethers"
+import { Interface, parseUnits } from "ethers/lib/utils"
+import { USDPricedFuseAsset } from "utils/fetchFusePoolData"
+import { isAssetETH } from "utils/tokenUtils"
+
+
+const useHasApproval = (market: USDPricedFuseAsset, amount: string) => {
+    const { fuse, address } = useRari()
+    const { provider } = fuse
+
+    const { data } = useQuery(`${address} has approval for ${market.underlyingSymbol}`, async () => {
+        if (!address) return false
+        let _amount = parseUnits(amount, market.underlyingDecimals)
+        return await checkAllowance(address, market.cToken, market.underlyingToken, _amount, provider)
+    })
+    return data ?? false
+}
+
+export default useHasApproval
+
+export async function checkAllowance(
+    userAddress: string,
+    marketAddress: string,
+    underlyingAddress: string,
+    amount: BigNumber,
+    provider: any
+) {
+    if (isAssetETH(underlyingAddress)) return
+
+    const erc20Interface = new Interface([
+        'function allowance(address owner, address spender) public view returns (uint256 remaining)',
+        'function approve(address spender, uint256 value) public returns (bool success)',
+    ])
+
+    const erc20Contract = new Contract(
+        underlyingAddress,
+        erc20Interface,
+        provider.getSigner(userAddress)
+    )
+
+    const hasApproval = (
+        await erc20Contract.callStatic.allowance(userAddress, marketAddress)
+    ).gte(amount);
+
+    return hasApproval
+
+}
\ No newline at end of file

From 9dc2ff410c589d1758c9e84ced6525813a08f5cc Mon Sep 17 00:00:00 2001
From: sharad-s <sharadshekar@gmail.com>
Date: Wed, 16 Mar 2022 15:03:19 -0500
Subject: [PATCH 05/19] modal shows borrow/supply info

---
 .../pages/Fuse/Modals/CVXMigrateModal.tsx     | 71 +++++++++++++++----
 src/hooks/useBorrowLimit.ts                   | 20 ++++++
 src/hooks/useHasApproval.ts                   |  4 +-
 3 files changed, 80 insertions(+), 15 deletions(-)

diff --git a/src/components/pages/Fuse/Modals/CVXMigrateModal.tsx b/src/components/pages/Fuse/Modals/CVXMigrateModal.tsx
index 4235da63..d92b32f0 100644
--- a/src/components/pages/Fuse/Modals/CVXMigrateModal.tsx
+++ b/src/components/pages/Fuse/Modals/CVXMigrateModal.tsx
@@ -18,16 +18,23 @@ import {
 } from "@chakra-ui/react"
 import { POOL_156_COMPTROLLER } from "constants/convex"
 import { useRari } from "context/RariContext"
+import { getEthUsdPriceBN } from "esm/utils/getUSDPriceBN"
 import { BigNumber, constants } from "ethers"
-import { commify } from "ethers/lib/utils"
+import { commify, parseEther } from "ethers/lib/utils"
 import { formatEther } from "ethers/lib/utils"
 import { useCurveLPBalances, useStakedConvexBalances } from "hooks/convex/useStakedConvexBalances"
+import { useBorrowLimit, useTotalSupply } from "hooks/useBorrowLimit"
 import { useFusePoolData } from "hooks/useFusePoolData"
 import useHasApproval from "hooks/useHasApproval"
 import { useTokensDataAsMap } from "hooks/useTokenData"
 import { useEffect, useMemo, useState } from "react"
+import { useQuery } from "react-query"
+import { smallStringUsdFormatter } from "utils/bigUtils"
 import { checkAllowanceAndApprove, collateralize, deposit, unstakeAndWithdrawCVXPool } from "utils/convex/migratePositions"
 import { handleGenericError } from "utils/errorHandling"
+import { USDPricedFuseAsset } from "utils/fetchFusePoolData"
+
+
 
 export const CVXMigrateModal = ({
     isOpen,
@@ -41,8 +48,6 @@ export const CVXMigrateModal = ({
     const _cvxBalances = useStakedConvexBalances()
     const curveLPBalances = useCurveLPBalances()
 
-    console.log({ curveLPBalances })
-
     // Steppers
     const toast = useToast()
     const [step, setStep] = useState<1 | 2 | 3 | 4 | 5 | undefined>()
@@ -56,6 +61,7 @@ export const CVXMigrateModal = ({
     const assets = !fusePoolData ? [] : fusePoolData.assets.filter(a => Object.keys(cvxBalances).includes(a.cToken) || Object.keys(curveLPBalances).includes(a.underlyingToken))
     const curveAssets = !fusePoolData ? [] : fusePoolData.assets.filter(a => Object.keys(curveLPBalances).includes(a.underlyingToken))
 
+
     const marketsUnderlyingMap: { [underlying: string]: string } = assets.reduce((obj, asset) => ({
         ...obj,
         [asset.cToken]: asset.underlyingToken
@@ -83,13 +89,52 @@ export const CVXMigrateModal = ({
         }
     }, {})
 
-    const tokenData = useTokensDataAsMap(assets.map(a => a.underlyingToken))
 
-    console.log({ tokenData, marketsBalancesMap, marketsUnderlyingMap })
+    // Simulates u depositing all your CVX positions into us >:)
+    const { data: updatedUserAssets } = useQuery('updated assets for convex user ' + address, async () => {
+
+        const ethPrice = await getEthUsdPriceBN()
+
+        const updatedUserAssets: USDPricedFuseAsset[] = fusePoolData?.assets.reduce((arr: USDPricedFuseAsset[], asset) => {
+            if (Object.keys(marketsBalancesMap).includes(asset.cToken)) {
+                const assetToBeUpdated = asset
+                const amount = (marketsBalancesMap[asset.cToken].total)
+
+                console.log({ assetToBeUpdated, amount })
+
+                const supplyBalance = assetToBeUpdated.supplyBalance.add(amount);
+                const totalSupply = assetToBeUpdated.totalSupply.add(amount);
+
+                // Todo - figure out where to better div by 1e18
+                const updatedAsset: USDPricedFuseAsset = {
+                    ...assetToBeUpdated,
+                    supplyBalance,
+                    supplyBalanceUSD: supplyBalance
+                        .mul(assetToBeUpdated.underlyingPrice)
+                        .mul(parseEther(ethPrice.toString()))
+                        .div(constants.WeiPerEther)
+                        .div(constants.WeiPerEther)
+                        .div(constants.WeiPerEther)
+                        .div(constants.WeiPerEther),
+                    totalSupply,
+                    membership: true
+                }
+                return [...arr, updatedAsset]
+            }
+            return [...arr, asset]
+        }, []) ?? []
 
-    const marketBalance = marketsBalancesMap[assets[assetIndex]?.cToken]
+        return updatedUserAssets
+    })
 
+    const borrowLimit = useBorrowLimit(updatedUserAssets ?? [])
+    const newTotalSupply = useTotalSupply(updatedUserAssets ?? [])
 
+    const tokenData = useTokensDataAsMap(assets.map(a => a.underlyingToken))
+
+    console.log({ tokenData, marketsBalancesMap, marketsUnderlyingMap, updatedUserAssets, borrowLimit })
+
+    const marketBalance = marketsBalancesMap[assets[assetIndex]?.cToken]
 
     /*  Unstakes and Claims all CVX Staked Positions supported by Fuse  */
     const handleUnstake = async () => {
@@ -153,7 +198,7 @@ export const CVXMigrateModal = ({
 
     const activeSymbol = tokenData[assets[assetIndex]?.underlyingToken]?.symbol
 
-    const hasApproval = useHasApproval(assets[assetIndex], marketBalance.total.toString())
+    const hasApproval = useHasApproval(assets[assetIndex], marketBalance?.total.toString() ?? "0")
 
     const showEnableAsCollateral = !assets[assetIndex]?.membership
 
@@ -186,10 +231,10 @@ export const CVXMigrateModal = ({
                         <Flex direction="column" height="100%">
                             {/* <AppLink isExternal={true} href="https://www.convexfinance.com/stake"> */}
                             <VStack align={"flex-start"} my={2}>
-                                <Text>We detected {Object.keys(cvxBalances).length} staked Convex positions {!!curveAssets.length && ` and ${curveAssets.length} Curve LP tokens`} </Text>
-                                <ul>
+                                <Text>We detected <b>{smallStringUsdFormatter(newTotalSupply.toString())}</b> from {Object.keys(cvxBalances).length} staked Convex positions {!!curveAssets.length && ` and ${curveAssets.length} Curve LP tokens`}. You can borrow up to <b>{smallStringUsdFormatter(borrowLimit.toString())}</b> by migrating them to Fuse.</Text> 
+                                <HStack>
                                     {Object.keys(marketsBalancesMap).map((market, i) =>
-                                        <Box onClick={() => setAssetIndex(i)} bg={assetIndex === i ? "aqua" : "white"}>
+                                        <Box onClick={() => setAssetIndex(i)} bg={assetIndex === i ? "aqua" : "white"} border="1px solid red">
                                             <VStack>
                                                 <HStack key={market}>
                                                     <Avatar src={tokenData[marketsUnderlyingMap[market]]?.logoURL} />
@@ -206,10 +251,10 @@ export const CVXMigrateModal = ({
                                             </VStack>
                                         </Box>
                                     )}
-                                </ul>
+                                </HStack>
                                 <Spacer />
                                 <Text>
-                                    Migrate {activeSymbol} in four clicks
+                                    Migrate {activeSymbol} in 3 clicks
                                 </Text>
 
                                 {showUnstake && (
@@ -249,7 +294,7 @@ export const CVXMigrateModal = ({
                                     </Button>
                                 </HStack>
 
-                                {showEnableAsCollateral && <HStack>
+                                {showEnableAsCollateral && step === 4 && <HStack>
                                     <Text>
                                         4.)
                                     </Text>
diff --git a/src/hooks/useBorrowLimit.ts b/src/hooks/useBorrowLimit.ts
index 764ca825..4220620d 100644
--- a/src/hooks/useBorrowLimit.ts
+++ b/src/hooks/useBorrowLimit.ts
@@ -30,6 +30,26 @@ export const useBorrowLimit = (
   return maxBorrow;
 };
 
+export const useTotalSupply = (
+  assets: USDPricedFuseAsset[],
+): BigNumber => {
+  const totalSupply = useMemo(() => {
+    let _totalSupplyUSD = constants.Zero;
+
+    for (let i = 0; i < assets.length; i++) {
+      let asset = assets[i];
+      _totalSupplyUSD = _totalSupplyUSD.add(
+        asset.supplyBalanceUSD
+      )
+    }
+
+    // console.log({result, _maxBorrow, id})
+    return _totalSupplyUSD
+  }, [assets]);
+
+  return totalSupply;
+};
+
 export const useBorrowLimits = (
   assetsArray: USDPricedFuseAsset[][] | null,
   options?: { ignoreIsEnabledCheckFor?: string }
diff --git a/src/hooks/useHasApproval.ts b/src/hooks/useHasApproval.ts
index ae425ccc..29b6f646 100644
--- a/src/hooks/useHasApproval.ts
+++ b/src/hooks/useHasApproval.ts
@@ -10,8 +10,8 @@ const useHasApproval = (market: USDPricedFuseAsset, amount: string) => {
     const { fuse, address } = useRari()
     const { provider } = fuse
 
-    const { data } = useQuery(`${address} has approval for ${market.underlyingSymbol}`, async () => {
-        if (!address) return false
+    const { data } = useQuery(`${address} has approval for ${market?.underlyingSymbol}`, async () => {
+        if (!address || !market) return false
         let _amount = parseUnits(amount, market.underlyingDecimals)
         return await checkAllowance(address, market.cToken, market.underlyingToken, _amount, provider)
     })

From f83bee2494b7a21d2c9a5d948d648fa561bc4433 Mon Sep 17 00:00:00 2001
From: sharad-s <sharadshekar@gmail.com>
Date: Wed, 16 Mar 2022 17:51:14 -0500
Subject: [PATCH 06/19] =?UTF-8?q?New=20Button=20=F0=9F=98=B3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/shared/Layout/Layout.tsx       | 14 ++------
 .../shared/Layout/PluginMigratorButton.tsx    | 32 +++++++++++++++++++
 2 files changed, 34 insertions(+), 12 deletions(-)
 create mode 100644 src/components/shared/Layout/PluginMigratorButton.tsx

diff --git a/src/components/shared/Layout/Layout.tsx b/src/components/shared/Layout/Layout.tsx
index 1d82e601..24e0abba 100644
--- a/src/components/shared/Layout/Layout.tsx
+++ b/src/components/shared/Layout/Layout.tsx
@@ -7,14 +7,11 @@ import { useMemo, useState, useEffect } from "react";
 import NewHeader from "../Header2/NewHeader";
 import Footer from "./Footer";
 
-import { Button, Image } from "@chakra-ui/react"
-
 //CVX
-import { useAccountBalances } from "context/BalancesContext"
 import { useDisclosure } from "@chakra-ui/react";
 import CVXMigrateModal from "components/pages/Fuse/Modals/CVXMigrateModal";
 import { useCurveLPBalances, useStakedConvexBalances } from "hooks/convex/useStakedConvexBalances";
-
+import PluginMigratorButton from "./PluginMigratorButton";
 
 
 const Layout = ({ children }) => {
@@ -82,20 +79,13 @@ const Layout = ({ children }) => {
       <NewHeader />
       {children}
       {!!hasCvxBalances && <CVXMigrateModal isOpen={isOpen} onClose={onClose} />}
-      {!!hasCvxBalances && <ConvexModalButton onOpen={onOpen} />}
+      {!!hasCvxBalances && <PluginMigratorButton onOpen={onOpen} />}
       <Footer />
     </Column>
   );
 };
 
 
-const ConvexModalButton = ({ onOpen }: { onOpen: any }) => {
-  return (
-    <Button onClick={onOpen} position="fixed" bottom={0} right={0} m={5}>
-      <Image src="/static/icons/convex.svg" h="100%" w="100%" />
-    </Button>
-  )
-}
 
 
 export default Layout;
diff --git a/src/components/shared/Layout/PluginMigratorButton.tsx b/src/components/shared/Layout/PluginMigratorButton.tsx
new file mode 100644
index 00000000..540ec9b4
--- /dev/null
+++ b/src/components/shared/Layout/PluginMigratorButton.tsx
@@ -0,0 +1,32 @@
+
+
+import { Button, Image, keyframes, usePrefersReducedMotion } from "@chakra-ui/react"
+
+
+const spin = keyframes`
+  from { transform: rotateY(0deg); }
+  to { transform: rotateY(360deg); }
+`
+
+export const PluginMigratorButton = ({ onOpen }: { onOpen: any }) => {
+    const prefersReducedMotion = usePrefersReducedMotion()
+
+    const animation = prefersReducedMotion
+        ? undefined
+        : `${spin} infinite 5s linear`
+    return (
+        <Button onClick={onOpen} position="fixed" 
+        bottom={0} right={0} m={10} bg="none"
+        transition="transform 0.2s ease 0s"
+        boxSize={"75px"}
+        _hover={{
+            transform: "translateY(-10px)",
+        }}>
+            <Image animation={animation} src="/static/icons/convex.svg" h="100%" w="100%" 
+               
+            />
+        </Button>
+    )
+}
+
+export default PluginMigratorButton
\ No newline at end of file

From 57301c67458effd659d510000bd4cf9967f6eb2d Mon Sep 17 00:00:00 2001
From: sharad-s <sharadshekar@gmail.com>
Date: Wed, 16 Mar 2022 18:14:17 -0500
Subject: [PATCH 07/19] Refactored Component + comments

---
 .../pages/Fuse/Modals/CVXMigrateModal.tsx     | 138 ++++++++++++------
 src/context/RariContext.tsx                   |   2 +-
 2 files changed, 92 insertions(+), 48 deletions(-)

diff --git a/src/components/pages/Fuse/Modals/CVXMigrateModal.tsx b/src/components/pages/Fuse/Modals/CVXMigrateModal.tsx
index d92b32f0..ecf103ff 100644
--- a/src/components/pages/Fuse/Modals/CVXMigrateModal.tsx
+++ b/src/components/pages/Fuse/Modals/CVXMigrateModal.tsx
@@ -14,7 +14,8 @@ import {
     HStack,
     useToast,
     Avatar,
-    Box
+    Box,
+    Image,
 } from "@chakra-ui/react"
 import { POOL_156_COMPTROLLER } from "constants/convex"
 import { useRari } from "context/RariContext"
@@ -29,6 +30,7 @@ import useHasApproval from "hooks/useHasApproval"
 import { useTokensDataAsMap } from "hooks/useTokenData"
 import { useEffect, useMemo, useState } from "react"
 import { useQuery } from "react-query"
+import { TokensDataMap } from "types/tokens"
 import { smallStringUsdFormatter } from "utils/bigUtils"
 import { checkAllowanceAndApprove, collateralize, deposit, unstakeAndWithdrawCVXPool } from "utils/convex/migratePositions"
 import { handleGenericError } from "utils/errorHandling"
@@ -45,7 +47,7 @@ export const CVXMigrateModal = ({
 }) => {
 
     const { fuse, address } = useRari()
-    const _cvxBalances = useStakedConvexBalances()
+    const cvxBalances = useStakedConvexBalances()
     const curveLPBalances = useCurveLPBalances()
 
     // Steppers
@@ -53,22 +55,22 @@ export const CVXMigrateModal = ({
     const [step, setStep] = useState<1 | 2 | 3 | 4 | 5 | undefined>()
     const [activeStep, setActiveStep] = useState<1 | 2 | 3 | 4 | 5 | undefined>()
 
-    const [assetIndex, setAssetIndex] = useState(0)
-
-    const cvxBalances = useMemo(() => _cvxBalances, [])
+    // Fuse pool Data
     const fusePoolData = useFusePoolData("156")
-
     const assets = !fusePoolData ? [] : fusePoolData.assets.filter(a => Object.keys(cvxBalances).includes(a.cToken) || Object.keys(curveLPBalances).includes(a.underlyingToken))
-    const curveAssets = !fusePoolData ? [] : fusePoolData.assets.filter(a => Object.keys(curveLPBalances).includes(a.underlyingToken))
-
+    const [assetIndex, setAssetIndex] = useState(0)
+    const tokenData = useTokensDataAsMap(assets.map(a => a.underlyingToken))
 
+    // marketAddr -> underlying
     const marketsUnderlyingMap: { [underlying: string]: string } = assets.reduce((obj, asset) => ({
         ...obj,
         [asset.cToken]: asset.underlyingToken
     }), {})
 
+
+    // marketAddr -> migratable balances data
     const marketsBalancesMap: {
-        [cToken: string]: {
+        [marketAddr: string]: {
             stakedBalance: BigNumber,
             curveBalance: BigNumber,
             total: BigNumber
@@ -89,8 +91,9 @@ export const CVXMigrateModal = ({
         }
     }, {})
 
+    const marketBalanceForAsset = marketsBalancesMap[assets[assetIndex]?.cToken]
 
-    // Simulates u depositing all your CVX positions into us >:)
+    // Simulates you depositing all your CVX positions into us - to get projected totalSupply & projected borrowLimit
     const { data: updatedUserAssets } = useQuery('updated assets for convex user ' + address, async () => {
 
         const ethPrice = await getEthUsdPriceBN()
@@ -127,35 +130,32 @@ export const CVXMigrateModal = ({
         return updatedUserAssets
     })
 
+    // Simulated position
     const borrowLimit = useBorrowLimit(updatedUserAssets ?? [])
     const newTotalSupply = useTotalSupply(updatedUserAssets ?? [])
 
-    const tokenData = useTokensDataAsMap(assets.map(a => a.underlyingToken))
-
-    console.log({ tokenData, marketsBalancesMap, marketsUnderlyingMap, updatedUserAssets, borrowLimit })
-
-    const marketBalance = marketsBalancesMap[assets[assetIndex]?.cToken]
 
     /*  Unstakes and Claims all CVX Staked Positions supported by Fuse  */
     const handleUnstake = async () => {
-        const { stakedBalance } = marketBalance
+        const { stakedBalance } = marketBalanceForAsset
         try {
             setActiveStep(1)
             if (stakedBalance.gt(0)) {
                 const baseRewardPool = cvxBalances[assets[assetIndex].cToken].baseRewardsPool
                 const res = await unstakeAndWithdrawCVXPool(fuse, baseRewardPool)
+                setStep(2)
+
             }
         } catch (err) {
             setActiveStep(undefined)
             handleGenericError(err, toast)
         }
-        setStep(2)
     }
 
     // Approve for stakedBalance + curveBalance
     const handleApproveMarket = async () => {
         const { cToken, underlyingToken } = assets[assetIndex]
-        const { total } = marketBalance
+        const { total } = marketBalanceForAsset
         try {
             setActiveStep(2)
             const res = await checkAllowanceAndApprove(fuse, address, cToken, underlyingToken, total)
@@ -170,7 +170,7 @@ export const CVXMigrateModal = ({
     // Deposit curveBalance
     const handleDeposit = async () => {
         const { cToken } = assets[assetIndex]
-        const { curveBalance } = marketBalance
+        const { curveBalance } = marketBalanceForAsset
         try {
             setActiveStep(3)
             const res = await deposit(fuse, cToken, curveBalance)
@@ -196,16 +196,18 @@ export const CVXMigrateModal = ({
         }
     }
 
-    const activeSymbol = tokenData[assets[assetIndex]?.underlyingToken]?.symbol
-
-    const hasApproval = useHasApproval(assets[assetIndex], marketBalance?.total.toString() ?? "0")
 
+    // If you've already approved this market, skip
+    const hasApproval = useHasApproval(assets[assetIndex], marketBalanceForAsset?.total.toString() ?? "0")
+    const showApproval = !hasApproval
+    // We show enable as Collateral only if this asset has not yet been anabled
     const showEnableAsCollateral = !assets[assetIndex]?.membership
+    // If you dont have any staked, you dont need to unstake to enter this market
+    const showUnstake = !marketBalanceForAsset?.stakedBalance?.isZero() ?? true
 
-    const showUnstake = !marketBalance?.stakedBalance?.isZero() ?? true
-
-    const showApproval = !hasApproval
+    const activeSymbol = tokenData[assets[assetIndex]?.underlyingToken]?.symbol
 
+    // Skip to step conditionally
     useEffect(() => {
         if (!showUnstake) setStep(2)
         else if (hasApproval) setStep(3)
@@ -213,17 +215,18 @@ export const CVXMigrateModal = ({
     }, [assetIndex])
 
 
-    console.log({ marketBalance, showUnstake })
-
     return (
         <>
             <Modal isOpen={isOpen} onClose={onClose}>
                 <ModalOverlay />
                 <ModalContent>
                     <ModalHeader display="flex" width="100%" alignSelf="center">
-                        <Text fontSize="lg" mr={4} alignSelf="center">
-                            🔌 Migrate Staked CVX to Fuse Pool 156
-                        </Text>
+                        <HStack>
+                            <Image src="/static/icons/convex.svg" boxSize="40px" />
+                            <Text fontSize="lg" mr={4} alignSelf="center">
+                                Migrate Staked CVX Positions to Fuse
+                            </Text>
+                        </HStack>
                         <ModalCloseButton />
                     </ModalHeader>
                     <ModalBody>
@@ -231,25 +234,23 @@ export const CVXMigrateModal = ({
                         <Flex direction="column" height="100%">
                             {/* <AppLink isExternal={true} href="https://www.convexfinance.com/stake"> */}
                             <VStack align={"flex-start"} my={2}>
-                                <Text>We detected <b>{smallStringUsdFormatter(newTotalSupply.toString())}</b> from {Object.keys(cvxBalances).length} staked Convex positions {!!curveAssets.length && ` and ${curveAssets.length} Curve LP tokens`}. You can borrow up to <b>{smallStringUsdFormatter(borrowLimit.toString())}</b> by migrating them to Fuse.</Text> 
+                                <Text>
+                                    We detected <b>{smallStringUsdFormatter(newTotalSupply.toString())}</b> from {Object.keys(cvxBalances).length}
+                                    staked Convex positions
+                                    {!!(Object.keys(curveLPBalances)).length && ` and ${Object.keys(curveLPBalances).length} Curve LP tokens`}.
+                                    You can borrow up to <b>{smallStringUsdFormatter(borrowLimit.toString())}</b> by migrating them to Fuse.</Text>
+                                {/* Select from available markets */}
                                 <HStack>
                                     {Object.keys(marketsBalancesMap).map((market, i) =>
-                                        <Box onClick={() => setAssetIndex(i)} bg={assetIndex === i ? "aqua" : "white"} border="1px solid red">
-                                            <VStack>
-                                                <HStack key={market}>
-                                                    <Avatar src={tokenData[marketsUnderlyingMap[market]]?.logoURL} />
-                                                    <Text>
-                                                        {tokenData[marketsUnderlyingMap[market]]?.symbol}
-                                                    </Text>
-                                                </HStack>
-                                                <Text>
-                                                    {commify(parseFloat(formatEther(marketsBalancesMap[market].stakedBalance)).toFixed(2))} staked
-                                                </Text>
-                                                <Text>
-                                                    {commify(parseFloat(formatEther(marketsBalancesMap[market].curveBalance)).toFixed(2))} in Curve
-                                                </Text>
-                                            </VStack>
-                                        </Box>
+                                        <Market
+                                            assetIndex={assetIndex}
+                                            setAssetIndex={setAssetIndex}
+                                            market={market}
+                                            i={i}
+                                            tokensData={tokenData}
+                                            marketsUnderlyingMap={marketsUnderlyingMap}
+                                            marketsBalancesMap={marketsBalancesMap}
+                                        />
                                     )}
                                 </HStack>
                                 <Spacer />
@@ -319,6 +320,49 @@ export const CVXMigrateModal = ({
     )
 }
 
+const Market = ({
+    setAssetIndex,
+    assetIndex,
+    market,
+    i,
+    tokensData,
+    marketsUnderlyingMap,
+    marketsBalancesMap
+}: {
+    setAssetIndex: any,
+    assetIndex: number,
+    market: string,
+    i: number;
+    tokensData: TokensDataMap,
+    marketsUnderlyingMap: { [underlying: string]: string },
+    marketsBalancesMap: {
+        [cToken: string]: {
+            stakedBalance: BigNumber,
+            curveBalance: BigNumber,
+            total: BigNumber
+        }
+    }
+}) => {
+    return (
+        <Box onClick={() => setAssetIndex(i)} bg={assetIndex === i ? "aqua" : "white"} border="1px solid red">
+            <VStack>
+                <HStack key={market}>
+                    <Avatar src={tokensData[marketsUnderlyingMap[market]]?.logoURL} />
+                    <Text>
+                        {tokensData[marketsUnderlyingMap[market]]?.symbol}
+                    </Text>
+                </HStack>
+                <Text>
+                    {commify(parseFloat(formatEther(marketsBalancesMap[market].stakedBalance)).toFixed(2))} staked
+                </Text>
+                <Text>
+                    {commify(parseFloat(formatEther(marketsBalancesMap[market].curveBalance)).toFixed(2))} in Curve
+                </Text>
+            </VStack>
+        </Box>
+    )
+}
+
 
 
 export default CVXMigrateModal
\ No newline at end of file
diff --git a/src/context/RariContext.tsx b/src/context/RariContext.tsx
index 0eada725..a747859e 100644
--- a/src/context/RariContext.tsx
+++ b/src/context/RariContext.tsx
@@ -16,7 +16,7 @@ import { DASHBOARD_BOX_PROPS } from "../components/shared/DashboardBox";
 
 import { Fuse } from "../esm";
 
-import LogRocket, { init } from "logrocket";
+import LogRocket from "logrocket";
 import { useToast } from "@chakra-ui/react";
 
 import {

From 5abb55ab63135f3674df6c89235ebd26b5c76ef7 Mon Sep 17 00:00:00 2001
From: sharad-s <sharadshekar@gmail.com>
Date: Wed, 16 Mar 2022 18:16:09 -0500
Subject: [PATCH 08/19] IERC20

---
 src/hooks/convex/useStakedConvexBalances.ts | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/src/hooks/convex/useStakedConvexBalances.ts b/src/hooks/convex/useStakedConvexBalances.ts
index 558dd509..a2f5e6c2 100644
--- a/src/hooks/convex/useStakedConvexBalances.ts
+++ b/src/hooks/convex/useStakedConvexBalances.ts
@@ -6,10 +6,7 @@ import BaseRewardPoolABI from "contracts/abi/ConvexBaseRewardPool.json"
 import { CONVEX_CTOKEN_INFO } from "constants/convex";
 import { Contract } from "ethers";
 import { BigNumber } from "ethers";
-
-import { useTokenBalances } from "hooks/useTokenBalance";
-import { useMemo } from "react";
-import { erc20ABI } from "wagmi";
+import { Interface } from "ethers/lib/utils";
 
 export type StakedConvexBalancesMap = {
     [cToken: string]: {
@@ -69,7 +66,15 @@ type BalancesMap = {
     [token: string]: BigNumber
 }
 
+const IERC20 =  new Interface([
+    'function name() public view returns (string)',
+    'function symbol() public view returns (string)',
+    'function decimals() public view returns (uint8)',
+    'function balanceOf(address _owner) public view returns (uint256 balance)',
+]) 
+
 export const useCurveLPBalances = (): BalancesMap => {
+    
 
     const { fuse, address, isAuthed } = useRari();
     const multiCallProvider = new providers.MulticallProvider(fuse.provider)
@@ -86,7 +91,7 @@ export const useCurveLPBalances = (): BalancesMap => {
                 Object.values(CONVEX_CTOKEN_INFO)
                     .map(c => ({ curveLPToken: c.lpToken }))
                     .map(({ curveLPToken }) => {
-                        let contract = new Contract(curveLPToken, erc20ABI, multiCallProvider)
+                        let contract = new Contract(curveLPToken, IERC20, multiCallProvider)
                         return contract.balanceOf(address)
                             .then((balance: BigNumber) => {
                                 if (!balance.isZero()) {

From 25f3bfb772ee4fe8a0a0b7f6d7a7ca9350e3525e Mon Sep 17 00:00:00 2001
From: nathanhleung <github@nathanhleung.com>
Date: Wed, 16 Mar 2022 17:58:15 -0700
Subject: [PATCH 09/19] Update CVX migrate modal design

---
 package-lock.json                             | 2860 ++++++++++++-----
 package.json                                  |    2 +-
 .../pages/Fuse/Modals/CVXMigrateModal.tsx     |  102 +-
 src/context/RariContext.tsx                   |    2 +-
 4 files changed, 2076 insertions(+), 890 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 4c6ff0f3..2f10469c 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -41,7 +41,7 @@
         "node-fetch": "^2.6.1",
         "node-vibrant": "^3.1.6",
         "polished": "^4.1.3",
-        "rari-components": "git+https://github.com/Rari-Capital/rari-components#428603bcc0f0c7f4414e06d5b72353e91a343dd0",
+        "rari-components": "git+https://github.com/Rari-Capital/rari-components#69cab37898e8f467cfc9c8bd24267d2d62c5e087",
         "rari-tokens-generator": "^2.0.0",
         "react": "^17.0.2",
         "react-apexcharts": "1.3.7",
@@ -1760,42 +1760,54 @@
       }
     },
     "node_modules/@chakra-ui/accordion": {
-      "version": "1.4.3",
-      "resolved": "https://registry.npmjs.org/@chakra-ui/accordion/-/accordion-1.4.3.tgz",
-      "integrity": "sha512-UKpi7xd+hcT/OIDRBRT4vkvVmpym5K9tf3tPyPdwpJcCfCd0D8dvmgZWBM4vCCRPCNfuoyxba5z97witzLCf+g==",
-      "dependencies": {
-        "@chakra-ui/descendant": "2.1.1",
-        "@chakra-ui/hooks": "1.7.2",
-        "@chakra-ui/icon": "2.0.0",
-        "@chakra-ui/react-utils": "1.2.1",
-        "@chakra-ui/transition": "1.4.2",
-        "@chakra-ui/utils": "1.9.1"
+      "version": "1.4.9",
+      "resolved": "https://registry.npmjs.org/@chakra-ui/accordion/-/accordion-1.4.9.tgz",
+      "integrity": "sha512-ZrfrLwAu6p9B41sZ+iEWjfPW/mn2TdUDXv165qr1O355619e2Btjb01x3IYoN4GlE2iF7GOVjC5uYGNyLpBlZg==",
+      "dependencies": {
+        "@chakra-ui/descendant": "2.1.3",
+        "@chakra-ui/hooks": "1.8.5",
+        "@chakra-ui/icon": "2.0.5",
+        "@chakra-ui/react-utils": "1.2.3",
+        "@chakra-ui/transition": "1.4.7",
+        "@chakra-ui/utils": "1.10.4"
       },
       "peerDependencies": {
         "@chakra-ui/system": ">=1.0.0",
+        "framer-motion": "3.x || 4.x || 5.x || 6.x",
         "react": ">=16.8.6"
       }
     },
     "node_modules/@chakra-ui/accordion/node_modules/@chakra-ui/icon": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/@chakra-ui/icon/-/icon-2.0.0.tgz",
-      "integrity": "sha512-/GuU+xIcOIy9uSUUUCu249ZJB/nLDbjWGkfpoSdBwqT4+ytJrKt+0Ckh3Ub14sz3BJD+Z6IiIt6ySOA9+7lbsA==",
+      "version": "2.0.5",
+      "resolved": "https://registry.npmjs.org/@chakra-ui/icon/-/icon-2.0.5.tgz",
+      "integrity": "sha512-ZrqRvCCIxGr4qFd/r1pmtd9tobRmv8KAxV7ygFoc/t4vOSKTcVIjhE12gsI3FzgvXM15ZFVwsxa1zodwgo5neQ==",
       "dependencies": {
-        "@chakra-ui/utils": "1.9.1"
+        "@chakra-ui/utils": "1.10.4"
       },
       "peerDependencies": {
         "@chakra-ui/system": ">=1.0.0",
         "react": ">=16.8.6"
       }
     },
+    "node_modules/@chakra-ui/accordion/node_modules/@chakra-ui/utils": {
+      "version": "1.10.4",
+      "resolved": "https://registry.npmjs.org/@chakra-ui/utils/-/utils-1.10.4.tgz",
+      "integrity": "sha512-AM91VQQxw8F4F1WDA28mqKY6NFIOuzc2Ekkna88imy2OiqqmYH0xkq8J16L2qj4cLiLozpYqba3C79pWioy6FA==",
+      "dependencies": {
+        "@types/lodash.mergewith": "4.6.6",
+        "css-box-model": "1.2.1",
+        "framesync": "5.3.0",
+        "lodash.mergewith": "4.6.2"
+      }
+    },
     "node_modules/@chakra-ui/alert": {
-      "version": "1.3.2",
-      "resolved": "https://registry.npmjs.org/@chakra-ui/alert/-/alert-1.3.2.tgz",
-      "integrity": "sha512-+OMeVeGtydpj6nry0zH7qFDt36zEaxckRnufx1BGiCfWdUg6ahVwKXl8qX93Q8w82od7eAoBKMgGJz7IVL5NPw==",
+      "version": "1.3.7",
+      "resolved": "https://registry.npmjs.org/@chakra-ui/alert/-/alert-1.3.7.tgz",
+      "integrity": "sha512-fFpJYBpHOIK/BX4BVl/xafYiDBUW+Bq/gUYDOo4iAiO4vHgxo74oa+yOwSRNlNjAgIX7pi2ridsYQALKyWyxxQ==",
       "dependencies": {
-        "@chakra-ui/icon": "2.0.0",
-        "@chakra-ui/react-utils": "1.2.1",
-        "@chakra-ui/utils": "1.9.1"
+        "@chakra-ui/icon": "2.0.5",
+        "@chakra-ui/react-utils": "1.2.3",
+        "@chakra-ui/utils": "1.10.4"
       },
       "peerDependencies": {
         "@chakra-ui/system": ">=1.0.0",
@@ -1803,102 +1815,172 @@
       }
     },
     "node_modules/@chakra-ui/alert/node_modules/@chakra-ui/icon": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/@chakra-ui/icon/-/icon-2.0.0.tgz",
-      "integrity": "sha512-/GuU+xIcOIy9uSUUUCu249ZJB/nLDbjWGkfpoSdBwqT4+ytJrKt+0Ckh3Ub14sz3BJD+Z6IiIt6ySOA9+7lbsA==",
+      "version": "2.0.5",
+      "resolved": "https://registry.npmjs.org/@chakra-ui/icon/-/icon-2.0.5.tgz",
+      "integrity": "sha512-ZrqRvCCIxGr4qFd/r1pmtd9tobRmv8KAxV7ygFoc/t4vOSKTcVIjhE12gsI3FzgvXM15ZFVwsxa1zodwgo5neQ==",
       "dependencies": {
-        "@chakra-ui/utils": "1.9.1"
+        "@chakra-ui/utils": "1.10.4"
       },
       "peerDependencies": {
         "@chakra-ui/system": ">=1.0.0",
         "react": ">=16.8.6"
       }
     },
+    "node_modules/@chakra-ui/alert/node_modules/@chakra-ui/utils": {
+      "version": "1.10.4",
+      "resolved": "https://registry.npmjs.org/@chakra-ui/utils/-/utils-1.10.4.tgz",
+      "integrity": "sha512-AM91VQQxw8F4F1WDA28mqKY6NFIOuzc2Ekkna88imy2OiqqmYH0xkq8J16L2qj4cLiLozpYqba3C79pWioy6FA==",
+      "dependencies": {
+        "@types/lodash.mergewith": "4.6.6",
+        "css-box-model": "1.2.1",
+        "framesync": "5.3.0",
+        "lodash.mergewith": "4.6.2"
+      }
+    },
     "node_modules/@chakra-ui/anatomy": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/@chakra-ui/anatomy/-/anatomy-1.2.1.tgz",
-      "integrity": "sha512-kNS+FiEDTSnwpQUW4dEjZ5745xhkvB0XtmqjY1wpclUSpFfptLZM9QIHPTnBt2bzM9R+idmRRP+WkTt6kyTrLw==",
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/@chakra-ui/anatomy/-/anatomy-1.3.0.tgz",
+      "integrity": "sha512-vj/lcHkCuq/dtbl69DkNsftZTnrGEegB90ODs1B6rxw8iVMdDSYkthPPFAkqzNs4ppv1y2IBjELuVzpeta1OHA==",
       "dependencies": {
-        "@chakra-ui/theme-tools": "^1.3.1"
+        "@chakra-ui/theme-tools": "^1.3.6"
+      },
+      "peerDependencies": {
+        "@chakra-ui/system": ">=1.0.0"
       }
     },
     "node_modules/@chakra-ui/avatar": {
-      "version": "1.3.2",
-      "resolved": "https://registry.npmjs.org/@chakra-ui/avatar/-/avatar-1.3.2.tgz",
-      "integrity": "sha512-Z4CQI2haksy0YIV1gKa967P94WZUVzlMN+Wgs8PJJoxxmeY6tVruuvp5+Zb5D5kSAmQBvGWxlgJjClKXzeCQ7A==",
+      "version": "1.3.9",
+      "resolved": "https://registry.npmjs.org/@chakra-ui/avatar/-/avatar-1.3.9.tgz",
+      "integrity": "sha512-QhtVuFRXhV7X5iMCHI1lXOA0U2hJnpKC9uIEB80EkBuNYJDEz/y8ViOQPRivMVU//wymwLcbvjDCZd1urMjVYQ==",
       "dependencies": {
-        "@chakra-ui/image": "1.1.2",
-        "@chakra-ui/react-utils": "1.2.1",
-        "@chakra-ui/utils": "1.9.1"
+        "@chakra-ui/image": "1.1.8",
+        "@chakra-ui/react-utils": "1.2.3",
+        "@chakra-ui/utils": "1.10.4"
       },
       "peerDependencies": {
         "@chakra-ui/system": ">=1.0.0",
         "react": ">=16.8.6"
       }
     },
+    "node_modules/@chakra-ui/avatar/node_modules/@chakra-ui/utils": {
+      "version": "1.10.4",
+      "resolved": "https://registry.npmjs.org/@chakra-ui/utils/-/utils-1.10.4.tgz",
+      "integrity": "sha512-AM91VQQxw8F4F1WDA28mqKY6NFIOuzc2Ekkna88imy2OiqqmYH0xkq8J16L2qj4cLiLozpYqba3C79pWioy6FA==",
+      "dependencies": {
+        "@types/lodash.mergewith": "4.6.6",
+        "css-box-model": "1.2.1",
+        "framesync": "5.3.0",
+        "lodash.mergewith": "4.6.2"
+      }
+    },
     "node_modules/@chakra-ui/breadcrumb": {
-      "version": "1.3.1",
-      "resolved": "https://registry.npmjs.org/@chakra-ui/breadcrumb/-/breadcrumb-1.3.1.tgz",
-      "integrity": "sha512-b1IoBmtr5FcP2fn5NRbdOdQo2c866OQ/WhcTcZ6UKae1jjik+36/qWE+X+RKzxC6FLfqo5qayV5zSgsnZym7Pg==",
+      "version": "1.3.6",
+      "resolved": "https://registry.npmjs.org/@chakra-ui/breadcrumb/-/breadcrumb-1.3.6.tgz",
+      "integrity": "sha512-iXxienBO6RUnJEcDvyDWyRt+mzPyl7/b6N8i0vrjGKGLpgtayJFvIdo33tFcvx6TCy7V9hiE3HTtZnNomWdR6A==",
       "dependencies": {
-        "@chakra-ui/react-utils": "1.2.1",
-        "@chakra-ui/utils": "1.9.1"
+        "@chakra-ui/react-utils": "1.2.3",
+        "@chakra-ui/utils": "1.10.4"
       },
       "peerDependencies": {
         "@chakra-ui/system": ">=1.0.0",
         "react": ">=16.8.6"
       }
     },
+    "node_modules/@chakra-ui/breadcrumb/node_modules/@chakra-ui/utils": {
+      "version": "1.10.4",
+      "resolved": "https://registry.npmjs.org/@chakra-ui/utils/-/utils-1.10.4.tgz",
+      "integrity": "sha512-AM91VQQxw8F4F1WDA28mqKY6NFIOuzc2Ekkna88imy2OiqqmYH0xkq8J16L2qj4cLiLozpYqba3C79pWioy6FA==",
+      "dependencies": {
+        "@types/lodash.mergewith": "4.6.6",
+        "css-box-model": "1.2.1",
+        "framesync": "5.3.0",
+        "lodash.mergewith": "4.6.2"
+      }
+    },
     "node_modules/@chakra-ui/button": {
-      "version": "1.5.2",
-      "resolved": "https://registry.npmjs.org/@chakra-ui/button/-/button-1.5.2.tgz",
-      "integrity": "sha512-1LyZ7o4g+ZF0Qfwr77Fa3qHtCGhghoIPG2lcUWhhPk+8ygHNF0ZOngfsiDD7aoEj0uXsvlgZ/hdiqv0PmMTRzg==",
+      "version": "1.5.8",
+      "resolved": "https://registry.npmjs.org/@chakra-ui/button/-/button-1.5.8.tgz",
+      "integrity": "sha512-harZywey/6OclxIB5p/Ge/coeGKZWoqmu7JjXlbwTUd3U9IQiOVo/zekY1JscCSz2oZoVBCvoKZVt3on5dPwmA==",
       "dependencies": {
-        "@chakra-ui/hooks": "1.7.2",
-        "@chakra-ui/react-utils": "1.2.1",
-        "@chakra-ui/spinner": "1.2.1",
-        "@chakra-ui/utils": "1.9.1"
+        "@chakra-ui/hooks": "1.8.5",
+        "@chakra-ui/react-utils": "1.2.3",
+        "@chakra-ui/spinner": "1.2.6",
+        "@chakra-ui/utils": "1.10.4"
       },
       "peerDependencies": {
         "@chakra-ui/system": ">=1.0.0",
         "react": ">=16.8.6"
       }
     },
+    "node_modules/@chakra-ui/button/node_modules/@chakra-ui/utils": {
+      "version": "1.10.4",
+      "resolved": "https://registry.npmjs.org/@chakra-ui/utils/-/utils-1.10.4.tgz",
+      "integrity": "sha512-AM91VQQxw8F4F1WDA28mqKY6NFIOuzc2Ekkna88imy2OiqqmYH0xkq8J16L2qj4cLiLozpYqba3C79pWioy6FA==",
+      "dependencies": {
+        "@types/lodash.mergewith": "4.6.6",
+        "css-box-model": "1.2.1",
+        "framesync": "5.3.0",
+        "lodash.mergewith": "4.6.2"
+      }
+    },
     "node_modules/@chakra-ui/checkbox": {
-      "version": "1.6.2",
-      "resolved": "https://registry.npmjs.org/@chakra-ui/checkbox/-/checkbox-1.6.2.tgz",
-      "integrity": "sha512-eu4MeKWqwFc3zakjMnUi1pGXQ17HzeWbvQHwEZCYgIDk+S9DXopQr8o38zaHzs/MHmlelCzM96IBgTWZXWR/eg==",
+      "version": "1.6.8",
+      "resolved": "https://registry.npmjs.org/@chakra-ui/checkbox/-/checkbox-1.6.8.tgz",
+      "integrity": "sha512-CYmJbMA9BXb6ArKmXIAuQ22aQ97HgtslbJlqRKsV/FmZuk1DXF1dcVXzqeInhe5HacQ8z/+SmSqL9Q3fjswKag==",
       "dependencies": {
-        "@chakra-ui/hooks": "1.7.2",
-        "@chakra-ui/react-utils": "1.2.1",
-        "@chakra-ui/utils": "1.9.1",
-        "@chakra-ui/visually-hidden": "1.1.1"
+        "@chakra-ui/form-control": "1.5.9",
+        "@chakra-ui/hooks": "1.8.5",
+        "@chakra-ui/react-utils": "1.2.3",
+        "@chakra-ui/utils": "1.10.4",
+        "@chakra-ui/visually-hidden": "1.1.6"
       },
       "peerDependencies": {
         "@chakra-ui/system": ">=1.0.0",
-        "framer-motion": "3.x || 4.x || 5.x",
+        "framer-motion": "3.x || 4.x || 5.x || 6.x",
         "react": ">=16.8.6"
       }
     },
+    "node_modules/@chakra-ui/checkbox/node_modules/@chakra-ui/utils": {
+      "version": "1.10.4",
+      "resolved": "https://registry.npmjs.org/@chakra-ui/utils/-/utils-1.10.4.tgz",
+      "integrity": "sha512-AM91VQQxw8F4F1WDA28mqKY6NFIOuzc2Ekkna88imy2OiqqmYH0xkq8J16L2qj4cLiLozpYqba3C79pWioy6FA==",
+      "dependencies": {
+        "@types/lodash.mergewith": "4.6.6",
+        "css-box-model": "1.2.1",
+        "framesync": "5.3.0",
+        "lodash.mergewith": "4.6.2"
+      }
+    },
     "node_modules/@chakra-ui/clickable": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/@chakra-ui/clickable/-/clickable-1.2.1.tgz",
-      "integrity": "sha512-B0CIbKzDMwzG1APeTpW9H2Jl8dkarI1Qstb3hDOy23O+N5TU6lpDdVnXQ7fpFJS6mu5JjFqtkwzGAVZnkkv1rw==",
+      "version": "1.2.6",
+      "resolved": "https://registry.npmjs.org/@chakra-ui/clickable/-/clickable-1.2.6.tgz",
+      "integrity": "sha512-89SsrQwwwAadcl/bN8nZqqaaVhVNFdBXqQnxVy1t07DL5ezubmNb5SgFh9LDznkm9YYPQhaGr3W6HFro7iAHMg==",
       "dependencies": {
-        "@chakra-ui/react-utils": "1.2.1",
-        "@chakra-ui/utils": "1.9.1"
+        "@chakra-ui/react-utils": "1.2.3",
+        "@chakra-ui/utils": "1.10.4"
       },
       "peerDependencies": {
         "react": ">=16.8.6"
       }
     },
+    "node_modules/@chakra-ui/clickable/node_modules/@chakra-ui/utils": {
+      "version": "1.10.4",
+      "resolved": "https://registry.npmjs.org/@chakra-ui/utils/-/utils-1.10.4.tgz",
+      "integrity": "sha512-AM91VQQxw8F4F1WDA28mqKY6NFIOuzc2Ekkna88imy2OiqqmYH0xkq8J16L2qj4cLiLozpYqba3C79pWioy6FA==",
+      "dependencies": {
+        "@types/lodash.mergewith": "4.6.6",
+        "css-box-model": "1.2.1",
+        "framesync": "5.3.0",
+        "lodash.mergewith": "4.6.2"
+      }
+    },
     "node_modules/@chakra-ui/close-button": {
-      "version": "1.2.2",
-      "resolved": "https://registry.npmjs.org/@chakra-ui/close-button/-/close-button-1.2.2.tgz",
-      "integrity": "sha512-SqeLib0qgMjK3OsO1g5OnAHUmdCC8GMjToNEea7TeSrA44bH9EXVhFTkMMu2PnDVHbQmi4Ee1cuulNJt0UhQ3g==",
+      "version": "1.2.7",
+      "resolved": "https://registry.npmjs.org/@chakra-ui/close-button/-/close-button-1.2.7.tgz",
+      "integrity": "sha512-cYTxfgrIlPU4IZm1sehZXxx/TNQBk9c3LBPvTpywEM8GVRGINh4YLq8WiMaPtO+TDNBnKoWS/jS4IHnR+abADw==",
       "dependencies": {
-        "@chakra-ui/icon": "2.0.0",
-        "@chakra-ui/utils": "1.9.1"
+        "@chakra-ui/icon": "2.0.5",
+        "@chakra-ui/utils": "1.10.4"
       },
       "peerDependencies": {
         "@chakra-ui/system": ">=1.0.0",
@@ -1906,109 +1988,175 @@
       }
     },
     "node_modules/@chakra-ui/close-button/node_modules/@chakra-ui/icon": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/@chakra-ui/icon/-/icon-2.0.0.tgz",
-      "integrity": "sha512-/GuU+xIcOIy9uSUUUCu249ZJB/nLDbjWGkfpoSdBwqT4+ytJrKt+0Ckh3Ub14sz3BJD+Z6IiIt6ySOA9+7lbsA==",
+      "version": "2.0.5",
+      "resolved": "https://registry.npmjs.org/@chakra-ui/icon/-/icon-2.0.5.tgz",
+      "integrity": "sha512-ZrqRvCCIxGr4qFd/r1pmtd9tobRmv8KAxV7ygFoc/t4vOSKTcVIjhE12gsI3FzgvXM15ZFVwsxa1zodwgo5neQ==",
       "dependencies": {
-        "@chakra-ui/utils": "1.9.1"
+        "@chakra-ui/utils": "1.10.4"
       },
       "peerDependencies": {
         "@chakra-ui/system": ">=1.0.0",
         "react": ">=16.8.6"
       }
     },
+    "node_modules/@chakra-ui/close-button/node_modules/@chakra-ui/utils": {
+      "version": "1.10.4",
+      "resolved": "https://registry.npmjs.org/@chakra-ui/utils/-/utils-1.10.4.tgz",
+      "integrity": "sha512-AM91VQQxw8F4F1WDA28mqKY6NFIOuzc2Ekkna88imy2OiqqmYH0xkq8J16L2qj4cLiLozpYqba3C79pWioy6FA==",
+      "dependencies": {
+        "@types/lodash.mergewith": "4.6.6",
+        "css-box-model": "1.2.1",
+        "framesync": "5.3.0",
+        "lodash.mergewith": "4.6.2"
+      }
+    },
     "node_modules/@chakra-ui/color-mode": {
-      "version": "1.3.3",
-      "resolved": "https://registry.npmjs.org/@chakra-ui/color-mode/-/color-mode-1.3.3.tgz",
-      "integrity": "sha512-vEMG9PRtVllAxbJE76bM4fRdo+hRZsPX/9cO+gR1YegYQNeobbV9Ive/MKNYQzdlbQ855Ytn6cPGr2hzy9MdRg==",
+      "version": "1.4.6",
+      "resolved": "https://registry.npmjs.org/@chakra-ui/color-mode/-/color-mode-1.4.6.tgz",
+      "integrity": "sha512-gCO8Z/jv68jXop94MUQNzigl7JXICAgZQUUqLaKhdy1h2zatVDIPFfjwwjnsgM97G0BxQaNBOC87+PD2UYjzHw==",
       "dependencies": {
-        "@chakra-ui/hooks": "1.7.2",
-        "@chakra-ui/react-env": "1.1.1",
-        "@chakra-ui/utils": "1.9.1"
+        "@chakra-ui/hooks": "1.8.5",
+        "@chakra-ui/react-env": "1.1.6",
+        "@chakra-ui/utils": "1.10.4"
       },
       "peerDependencies": {
         "react": ">=16.8.6"
       }
     },
+    "node_modules/@chakra-ui/color-mode/node_modules/@chakra-ui/utils": {
+      "version": "1.10.4",
+      "resolved": "https://registry.npmjs.org/@chakra-ui/utils/-/utils-1.10.4.tgz",
+      "integrity": "sha512-AM91VQQxw8F4F1WDA28mqKY6NFIOuzc2Ekkna88imy2OiqqmYH0xkq8J16L2qj4cLiLozpYqba3C79pWioy6FA==",
+      "dependencies": {
+        "@types/lodash.mergewith": "4.6.6",
+        "css-box-model": "1.2.1",
+        "framesync": "5.3.0",
+        "lodash.mergewith": "4.6.2"
+      }
+    },
     "node_modules/@chakra-ui/control-box": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/@chakra-ui/control-box/-/control-box-1.1.1.tgz",
-      "integrity": "sha512-ZFbh85pzzZoiSjGnvLUzMB5BoA8Xm6TBMWvMtzLY5xiFGb9/mBeRDH2KFjr1GJzoqleWKkQwvFD6JM0kXcekpg==",
+      "version": "1.1.6",
+      "resolved": "https://registry.npmjs.org/@chakra-ui/control-box/-/control-box-1.1.6.tgz",
+      "integrity": "sha512-EUcq5f854puG6ZA6wAWl4107OPl8+bj4MMHJCa48BB0qec0U8HCEtxQGnFwJmaYLalIAjMfHuY3OwO2A3Hi9hA==",
       "dependencies": {
-        "@chakra-ui/utils": "1.9.1"
+        "@chakra-ui/utils": "1.10.4"
       },
       "peerDependencies": {
         "@chakra-ui/system": ">=1.0.0",
         "react": ">=16.8.6"
       }
     },
+    "node_modules/@chakra-ui/control-box/node_modules/@chakra-ui/utils": {
+      "version": "1.10.4",
+      "resolved": "https://registry.npmjs.org/@chakra-ui/utils/-/utils-1.10.4.tgz",
+      "integrity": "sha512-AM91VQQxw8F4F1WDA28mqKY6NFIOuzc2Ekkna88imy2OiqqmYH0xkq8J16L2qj4cLiLozpYqba3C79pWioy6FA==",
+      "dependencies": {
+        "@types/lodash.mergewith": "4.6.6",
+        "css-box-model": "1.2.1",
+        "framesync": "5.3.0",
+        "lodash.mergewith": "4.6.2"
+      }
+    },
     "node_modules/@chakra-ui/counter": {
-      "version": "1.2.2",
-      "resolved": "https://registry.npmjs.org/@chakra-ui/counter/-/counter-1.2.2.tgz",
-      "integrity": "sha512-EljrsJYHpR5tZ1UczzlZ7gwKZs3ijF2tKCAAmsTpRerPbwGFvrmhfFfLexgbc0vxmeuZYUVeuiClLXQT4lvd5w==",
+      "version": "1.2.8",
+      "resolved": "https://registry.npmjs.org/@chakra-ui/counter/-/counter-1.2.8.tgz",
+      "integrity": "sha512-lVuK+ycKxEE0G4Jkl8A6GWdXUFAih89KA1IkkhQG6NwqdGzbgouTInwBLg1Sm5uwgQ5QqSr9S42QyDoleUyF0g==",
       "dependencies": {
-        "@chakra-ui/hooks": "1.7.2",
-        "@chakra-ui/utils": "1.9.1"
+        "@chakra-ui/hooks": "1.8.5",
+        "@chakra-ui/utils": "1.10.4"
       },
       "peerDependencies": {
         "react": ">=16.8.6"
       }
     },
+    "node_modules/@chakra-ui/counter/node_modules/@chakra-ui/utils": {
+      "version": "1.10.4",
+      "resolved": "https://registry.npmjs.org/@chakra-ui/utils/-/utils-1.10.4.tgz",
+      "integrity": "sha512-AM91VQQxw8F4F1WDA28mqKY6NFIOuzc2Ekkna88imy2OiqqmYH0xkq8J16L2qj4cLiLozpYqba3C79pWioy6FA==",
+      "dependencies": {
+        "@types/lodash.mergewith": "4.6.6",
+        "css-box-model": "1.2.1",
+        "framesync": "5.3.0",
+        "lodash.mergewith": "4.6.2"
+      }
+    },
     "node_modules/@chakra-ui/css-reset": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/@chakra-ui/css-reset/-/css-reset-1.1.1.tgz",
-      "integrity": "sha512-+KNNHL4OWqeKia5SL858K3Qbd8WxMij9mWIilBzLD4j2KFrl/+aWFw8syMKth3NmgIibrjsljo+PU3fy2o50dg==",
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/@chakra-ui/css-reset/-/css-reset-1.1.3.tgz",
+      "integrity": "sha512-AgfrE7bRTJvNi/4zIfacI/kBHmHmHEIeQtHwCvk/0qM9V2gK1VM3ctYlnibf7BTh17F/UszweOGRb1lHSPfWjw==",
       "peerDependencies": {
         "@emotion/react": ">=10.0.35",
         "react": ">=16.8.6"
       }
     },
     "node_modules/@chakra-ui/descendant": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/@chakra-ui/descendant/-/descendant-2.1.1.tgz",
-      "integrity": "sha512-JasdVaN4MjL7QFo1vMnADy6EtFAlPKT1kTJ1LwMtl9AaF9VFLBsfGxm0L+WQK+3NJMuCSDBXWJB8mV4AQ11Edg==",
+      "version": "2.1.3",
+      "resolved": "https://registry.npmjs.org/@chakra-ui/descendant/-/descendant-2.1.3.tgz",
+      "integrity": "sha512-aNYNv99gEPENCdw2N5y3FvL5wgBVcLiOzJ2TxSwb4EVYszbgBZ8Ry1pf7lkoSfysdxD0scgy2cVyxO8TsYTU4g==",
       "dependencies": {
-        "@chakra-ui/react-utils": "^1.2.1"
+        "@chakra-ui/react-utils": "^1.2.3"
       },
       "peerDependencies": {
         "react": ">=16.8.6"
       }
     },
     "node_modules/@chakra-ui/editable": {
-      "version": "1.3.2",
-      "resolved": "https://registry.npmjs.org/@chakra-ui/editable/-/editable-1.3.2.tgz",
-      "integrity": "sha512-WY0dq+hQOIyMAamFj2fECNb1AtOwxoddAbZ6k4/epiKNkaRA5ENzgPdV6Gw3t02fDXv95D0J4V4XcpNgfCz6TA==",
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/@chakra-ui/editable/-/editable-1.4.0.tgz",
+      "integrity": "sha512-QH5ZMCK/U3pQINtSPiqxxA5XCdiXKBfAI1+siiuSqKtmCriltcArEU4groQn/bm7EY6UJIr/MV3azSDeeBIsaQ==",
       "dependencies": {
-        "@chakra-ui/hooks": "1.7.2",
-        "@chakra-ui/react-utils": "1.2.1",
-        "@chakra-ui/utils": "1.9.1"
+        "@chakra-ui/hooks": "1.8.5",
+        "@chakra-ui/react-utils": "1.2.3",
+        "@chakra-ui/utils": "1.10.4"
       },
       "peerDependencies": {
         "@chakra-ui/system": ">=1.0.0",
         "react": ">=16.8.6"
       }
     },
+    "node_modules/@chakra-ui/editable/node_modules/@chakra-ui/utils": {
+      "version": "1.10.4",
+      "resolved": "https://registry.npmjs.org/@chakra-ui/utils/-/utils-1.10.4.tgz",
+      "integrity": "sha512-AM91VQQxw8F4F1WDA28mqKY6NFIOuzc2Ekkna88imy2OiqqmYH0xkq8J16L2qj4cLiLozpYqba3C79pWioy6FA==",
+      "dependencies": {
+        "@types/lodash.mergewith": "4.6.6",
+        "css-box-model": "1.2.1",
+        "framesync": "5.3.0",
+        "lodash.mergewith": "4.6.2"
+      }
+    },
     "node_modules/@chakra-ui/focus-lock": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/@chakra-ui/focus-lock/-/focus-lock-1.2.1.tgz",
-      "integrity": "sha512-HYu39nvfaXUrBx+dIDJkFgebNCGEi9oZTfLUKzIJC+zPkmReTDSXV0dzSb/8vCAOq5fph1gFKsdbGy2U98P8GQ==",
+      "version": "1.2.6",
+      "resolved": "https://registry.npmjs.org/@chakra-ui/focus-lock/-/focus-lock-1.2.6.tgz",
+      "integrity": "sha512-ZJNE1oNdUM1aGWuCJ+bxFa/d3EwxzfMWzTKzSvKDK50GWoUQQ10xFTT9nY/yFpkcwhBvx1KavxKf44mIhIbSog==",
       "dependencies": {
-        "@chakra-ui/utils": "1.9.1",
+        "@chakra-ui/utils": "1.10.4",
         "react-focus-lock": "2.5.2"
       },
       "peerDependencies": {
         "react": ">=16.8.6"
       }
     },
+    "node_modules/@chakra-ui/focus-lock/node_modules/@chakra-ui/utils": {
+      "version": "1.10.4",
+      "resolved": "https://registry.npmjs.org/@chakra-ui/utils/-/utils-1.10.4.tgz",
+      "integrity": "sha512-AM91VQQxw8F4F1WDA28mqKY6NFIOuzc2Ekkna88imy2OiqqmYH0xkq8J16L2qj4cLiLozpYqba3C79pWioy6FA==",
+      "dependencies": {
+        "@types/lodash.mergewith": "4.6.6",
+        "css-box-model": "1.2.1",
+        "framesync": "5.3.0",
+        "lodash.mergewith": "4.6.2"
+      }
+    },
     "node_modules/@chakra-ui/form-control": {
-      "version": "1.5.3",
-      "resolved": "https://registry.npmjs.org/@chakra-ui/form-control/-/form-control-1.5.3.tgz",
-      "integrity": "sha512-+UkOJJYUSGVATeNK/2b+KJx3qRGAtqpD1sR2mqd9DhgmJ/JUGV8q4LVcXIcVs/7BYNqP9B0JQUBIDlHNuTwlJA==",
+      "version": "1.5.9",
+      "resolved": "https://registry.npmjs.org/@chakra-ui/form-control/-/form-control-1.5.9.tgz",
+      "integrity": "sha512-JuUB9dHXFqTYm+Z+cOULk56AcrX9y3eaied0j/KGdPwtIjS2kkjulq7A8sJJdsle4M6XleMinjW+1KO2PMExQg==",
       "dependencies": {
-        "@chakra-ui/hooks": "1.7.2",
-        "@chakra-ui/icon": "2.0.0",
-        "@chakra-ui/react-utils": "1.2.1",
-        "@chakra-ui/utils": "1.9.1"
+        "@chakra-ui/hooks": "1.8.5",
+        "@chakra-ui/icon": "2.0.5",
+        "@chakra-ui/react-utils": "1.2.3",
+        "@chakra-ui/utils": "1.10.4"
       },
       "peerDependencies": {
         "@chakra-ui/system": ">=1.0.0",
@@ -2016,24 +2164,35 @@
       }
     },
     "node_modules/@chakra-ui/form-control/node_modules/@chakra-ui/icon": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/@chakra-ui/icon/-/icon-2.0.0.tgz",
-      "integrity": "sha512-/GuU+xIcOIy9uSUUUCu249ZJB/nLDbjWGkfpoSdBwqT4+ytJrKt+0Ckh3Ub14sz3BJD+Z6IiIt6ySOA9+7lbsA==",
+      "version": "2.0.5",
+      "resolved": "https://registry.npmjs.org/@chakra-ui/icon/-/icon-2.0.5.tgz",
+      "integrity": "sha512-ZrqRvCCIxGr4qFd/r1pmtd9tobRmv8KAxV7ygFoc/t4vOSKTcVIjhE12gsI3FzgvXM15ZFVwsxa1zodwgo5neQ==",
       "dependencies": {
-        "@chakra-ui/utils": "1.9.1"
+        "@chakra-ui/utils": "1.10.4"
       },
       "peerDependencies": {
         "@chakra-ui/system": ">=1.0.0",
         "react": ">=16.8.6"
       }
     },
+    "node_modules/@chakra-ui/form-control/node_modules/@chakra-ui/utils": {
+      "version": "1.10.4",
+      "resolved": "https://registry.npmjs.org/@chakra-ui/utils/-/utils-1.10.4.tgz",
+      "integrity": "sha512-AM91VQQxw8F4F1WDA28mqKY6NFIOuzc2Ekkna88imy2OiqqmYH0xkq8J16L2qj4cLiLozpYqba3C79pWioy6FA==",
+      "dependencies": {
+        "@types/lodash.mergewith": "4.6.6",
+        "css-box-model": "1.2.1",
+        "framesync": "5.3.0",
+        "lodash.mergewith": "4.6.2"
+      }
+    },
     "node_modules/@chakra-ui/hooks": {
-      "version": "1.7.2",
-      "resolved": "https://registry.npmjs.org/@chakra-ui/hooks/-/hooks-1.7.2.tgz",
-      "integrity": "sha512-XJnya9ugAPYUedtQULKaLYBezE9cZMOkDm0MQl7FEuJKZ9ocHD6Pwpwf9Z03R91XQmcNL8gZ1NS0GT9v/xNl3Q==",
+      "version": "1.8.5",
+      "resolved": "https://registry.npmjs.org/@chakra-ui/hooks/-/hooks-1.8.5.tgz",
+      "integrity": "sha512-/UrBfUG7NLxuU/09gy2qQfEH+H5SPBUaUiFtokRlq887D/32JQ3XksZdF78RKMCM/0bbZuIjqUkuN/wO9kAbSw==",
       "dependencies": {
-        "@chakra-ui/react-utils": "1.2.1",
-        "@chakra-ui/utils": "1.9.1",
+        "@chakra-ui/react-utils": "1.2.3",
+        "@chakra-ui/utils": "1.10.4",
         "compute-scroll-into-view": "1.0.14",
         "copy-to-clipboard": "3.3.1"
       },
@@ -2041,6 +2200,17 @@
         "react": ">=16.8.6"
       }
     },
+    "node_modules/@chakra-ui/hooks/node_modules/@chakra-ui/utils": {
+      "version": "1.10.4",
+      "resolved": "https://registry.npmjs.org/@chakra-ui/utils/-/utils-1.10.4.tgz",
+      "integrity": "sha512-AM91VQQxw8F4F1WDA28mqKY6NFIOuzc2Ekkna88imy2OiqqmYH0xkq8J16L2qj4cLiLozpYqba3C79pWioy6FA==",
+      "dependencies": {
+        "@types/lodash.mergewith": "4.6.6",
+        "css-box-model": "1.2.1",
+        "framesync": "5.3.0",
+        "lodash.mergewith": "4.6.2"
+      }
+    },
     "node_modules/@chakra-ui/icon": {
       "version": "1.2.1",
       "resolved": "https://registry.npmjs.org/@chakra-ui/icon/-/icon-1.2.1.tgz",
@@ -2067,40 +2237,62 @@
       }
     },
     "node_modules/@chakra-ui/image": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/@chakra-ui/image/-/image-1.1.2.tgz",
-      "integrity": "sha512-bW4PMONYpWRLJ10di7W5BhYUOcCohNLhiTygOmVRMHWfUk9vmxhORlNu0EaSXUKGXiQ35cTVu4Ysv3L/1xYPRQ==",
+      "version": "1.1.8",
+      "resolved": "https://registry.npmjs.org/@chakra-ui/image/-/image-1.1.8.tgz",
+      "integrity": "sha512-ffO5lyTfGXxaFr9Bdkrb+GahjXsqeph8R1jXYFYwLjos+/sZZJmHJz/cjyoKjKPd6J7puKVZ6Cxz+Ej6PJlQcA==",
       "dependencies": {
-        "@chakra-ui/hooks": "1.7.2",
-        "@chakra-ui/utils": "1.9.1"
+        "@chakra-ui/hooks": "1.8.5",
+        "@chakra-ui/utils": "1.10.4"
       },
       "peerDependencies": {
         "@chakra-ui/system": ">=1.0.0",
         "react": ">=16.8.6"
       }
     },
+    "node_modules/@chakra-ui/image/node_modules/@chakra-ui/utils": {
+      "version": "1.10.4",
+      "resolved": "https://registry.npmjs.org/@chakra-ui/utils/-/utils-1.10.4.tgz",
+      "integrity": "sha512-AM91VQQxw8F4F1WDA28mqKY6NFIOuzc2Ekkna88imy2OiqqmYH0xkq8J16L2qj4cLiLozpYqba3C79pWioy6FA==",
+      "dependencies": {
+        "@types/lodash.mergewith": "4.6.6",
+        "css-box-model": "1.2.1",
+        "framesync": "5.3.0",
+        "lodash.mergewith": "4.6.2"
+      }
+    },
     "node_modules/@chakra-ui/input": {
-      "version": "1.3.3",
-      "resolved": "https://registry.npmjs.org/@chakra-ui/input/-/input-1.3.3.tgz",
-      "integrity": "sha512-Fsivp608cKdc2tSQvPXczHtyfU6YHLju+EuAs5pjqKC8ZTwPawBRkCvlTGPPd7VwyTHkp08X5qARCxEgjRFbzw==",
+      "version": "1.4.4",
+      "resolved": "https://registry.npmjs.org/@chakra-ui/input/-/input-1.4.4.tgz",
+      "integrity": "sha512-A1TYz8lOdSVuMnWRnR7Y+cddnnr5d2o1Vvd8Im09WW2j09xy06xD/EaFy8dI51Ab0ACldglVs66qx5dO7WoV0w==",
       "dependencies": {
-        "@chakra-ui/form-control": "1.5.3",
-        "@chakra-ui/react-utils": "1.2.1",
-        "@chakra-ui/utils": "1.9.1"
+        "@chakra-ui/form-control": "1.5.9",
+        "@chakra-ui/react-utils": "1.2.3",
+        "@chakra-ui/utils": "1.10.4"
       },
       "peerDependencies": {
         "@chakra-ui/system": ">=1.0.0",
         "react": ">=16.8.6"
       }
     },
+    "node_modules/@chakra-ui/input/node_modules/@chakra-ui/utils": {
+      "version": "1.10.4",
+      "resolved": "https://registry.npmjs.org/@chakra-ui/utils/-/utils-1.10.4.tgz",
+      "integrity": "sha512-AM91VQQxw8F4F1WDA28mqKY6NFIOuzc2Ekkna88imy2OiqqmYH0xkq8J16L2qj4cLiLozpYqba3C79pWioy6FA==",
+      "dependencies": {
+        "@types/lodash.mergewith": "4.6.6",
+        "css-box-model": "1.2.1",
+        "framesync": "5.3.0",
+        "lodash.mergewith": "4.6.2"
+      }
+    },
     "node_modules/@chakra-ui/layout": {
-      "version": "1.7.0",
-      "resolved": "https://registry.npmjs.org/@chakra-ui/layout/-/layout-1.7.0.tgz",
-      "integrity": "sha512-ZjRqLGs16T4PcWH445SkELVuxxfecjjUeprtFnNw13QzwydP46L8+GB3ycp6wyJDa6DMo77TxQQnK5jUUwY6Mw==",
+      "version": "1.7.7",
+      "resolved": "https://registry.npmjs.org/@chakra-ui/layout/-/layout-1.7.7.tgz",
+      "integrity": "sha512-HuZ/Zv9xWzLip263tX2Vt0oaqwaS6Srw78Sdl3DiGSifN8x+ooEAxmeDAIaU2PO21YX+f6s+9A738NAtSM2R+Q==",
       "dependencies": {
-        "@chakra-ui/icon": "2.0.0",
-        "@chakra-ui/react-utils": "1.2.1",
-        "@chakra-ui/utils": "1.9.1"
+        "@chakra-ui/icon": "2.0.5",
+        "@chakra-ui/react-utils": "1.2.3",
+        "@chakra-ui/utils": "1.10.4"
       },
       "peerDependencies": {
         "@chakra-ui/system": ">=1.0.0",
@@ -2108,35 +2300,57 @@
       }
     },
     "node_modules/@chakra-ui/layout/node_modules/@chakra-ui/icon": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/@chakra-ui/icon/-/icon-2.0.0.tgz",
-      "integrity": "sha512-/GuU+xIcOIy9uSUUUCu249ZJB/nLDbjWGkfpoSdBwqT4+ytJrKt+0Ckh3Ub14sz3BJD+Z6IiIt6ySOA9+7lbsA==",
+      "version": "2.0.5",
+      "resolved": "https://registry.npmjs.org/@chakra-ui/icon/-/icon-2.0.5.tgz",
+      "integrity": "sha512-ZrqRvCCIxGr4qFd/r1pmtd9tobRmv8KAxV7ygFoc/t4vOSKTcVIjhE12gsI3FzgvXM15ZFVwsxa1zodwgo5neQ==",
       "dependencies": {
-        "@chakra-ui/utils": "1.9.1"
+        "@chakra-ui/utils": "1.10.4"
       },
       "peerDependencies": {
         "@chakra-ui/system": ">=1.0.0",
         "react": ">=16.8.6"
       }
     },
+    "node_modules/@chakra-ui/layout/node_modules/@chakra-ui/utils": {
+      "version": "1.10.4",
+      "resolved": "https://registry.npmjs.org/@chakra-ui/utils/-/utils-1.10.4.tgz",
+      "integrity": "sha512-AM91VQQxw8F4F1WDA28mqKY6NFIOuzc2Ekkna88imy2OiqqmYH0xkq8J16L2qj4cLiLozpYqba3C79pWioy6FA==",
+      "dependencies": {
+        "@types/lodash.mergewith": "4.6.6",
+        "css-box-model": "1.2.1",
+        "framesync": "5.3.0",
+        "lodash.mergewith": "4.6.2"
+      }
+    },
     "node_modules/@chakra-ui/live-region": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/@chakra-ui/live-region/-/live-region-1.1.1.tgz",
-      "integrity": "sha512-BSdI5gLIffNRETEp6W18kBNg9tL0ZLLzfWGRnuO9tEbox7NrcgqIeLF8mNKwhDOZz88NKHtUOPVzjAUKW1SryQ==",
+      "version": "1.1.6",
+      "resolved": "https://registry.npmjs.org/@chakra-ui/live-region/-/live-region-1.1.6.tgz",
+      "integrity": "sha512-9gPQHXf7oW0jXyT5R/JzyDMfJ3hF70TqhN8bRH4fMyfNr2Se+SjztMBqCrv5FS5rPjcCeua+e0eArpoB3ROuWQ==",
       "dependencies": {
-        "@chakra-ui/utils": "1.9.1"
+        "@chakra-ui/utils": "1.10.4"
       },
       "peerDependencies": {
         "react": ">=16.8.6"
       }
     },
+    "node_modules/@chakra-ui/live-region/node_modules/@chakra-ui/utils": {
+      "version": "1.10.4",
+      "resolved": "https://registry.npmjs.org/@chakra-ui/utils/-/utils-1.10.4.tgz",
+      "integrity": "sha512-AM91VQQxw8F4F1WDA28mqKY6NFIOuzc2Ekkna88imy2OiqqmYH0xkq8J16L2qj4cLiLozpYqba3C79pWioy6FA==",
+      "dependencies": {
+        "@types/lodash.mergewith": "4.6.6",
+        "css-box-model": "1.2.1",
+        "framesync": "5.3.0",
+        "lodash.mergewith": "4.6.2"
+      }
+    },
     "node_modules/@chakra-ui/media-query": {
-      "version": "1.2.3",
-      "resolved": "https://registry.npmjs.org/@chakra-ui/media-query/-/media-query-1.2.3.tgz",
-      "integrity": "sha512-DbStv1VUSBwFj/MNemxRUtoibSoR9ZRcW31UUjtkiIH58cSB5lyEPv9rdD/1HRXpJfSaWQ439Tbuf03gOC4SVQ==",
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/@chakra-ui/media-query/-/media-query-2.0.4.tgz",
+      "integrity": "sha512-kn6g/L0IFFUHz2v4yiCsBnhg9jUeA7525Z+AWl+BPtvryi7i9J+AJ27y/QAge7vUGy4dwDeFyxOZTs2oZ9/BsA==",
       "dependencies": {
-        "@chakra-ui/react-env": "1.1.1",
-        "@chakra-ui/utils": "1.9.1"
+        "@chakra-ui/react-env": "1.1.6",
+        "@chakra-ui/utils": "1.10.4"
       },
       "peerDependencies": {
         "@chakra-ui/system": ">=1.0.0",
@@ -2144,58 +2358,91 @@
         "react": ">=16.8.6"
       }
     },
+    "node_modules/@chakra-ui/media-query/node_modules/@chakra-ui/utils": {
+      "version": "1.10.4",
+      "resolved": "https://registry.npmjs.org/@chakra-ui/utils/-/utils-1.10.4.tgz",
+      "integrity": "sha512-AM91VQQxw8F4F1WDA28mqKY6NFIOuzc2Ekkna88imy2OiqqmYH0xkq8J16L2qj4cLiLozpYqba3C79pWioy6FA==",
+      "dependencies": {
+        "@types/lodash.mergewith": "4.6.6",
+        "css-box-model": "1.2.1",
+        "framesync": "5.3.0",
+        "lodash.mergewith": "4.6.2"
+      }
+    },
     "node_modules/@chakra-ui/menu": {
-      "version": "1.8.3",
-      "resolved": "https://registry.npmjs.org/@chakra-ui/menu/-/menu-1.8.3.tgz",
-      "integrity": "sha512-TehcqHLKlMdkeXTtCYXzWNa6nbAk1cpjGz6OPl2ua0eisoOKgPolpkreCfYrWV9NNk0BmzZn+Su+z60jbhqggA==",
-      "dependencies": {
-        "@chakra-ui/clickable": "1.2.1",
-        "@chakra-ui/descendant": "2.1.1",
-        "@chakra-ui/hooks": "1.7.2",
-        "@chakra-ui/popper": "2.4.1",
-        "@chakra-ui/react-utils": "1.2.1",
-        "@chakra-ui/transition": "1.4.2",
-        "@chakra-ui/utils": "1.9.1"
+      "version": "1.8.9",
+      "resolved": "https://registry.npmjs.org/@chakra-ui/menu/-/menu-1.8.9.tgz",
+      "integrity": "sha512-rvQQU56nQoaz+IZXyamKaAU/87IiGIDrX9wEONHth7QDT/93whnFNYPtUMHMzILz0oliysBey4dlmtRzk5vUpQ==",
+      "dependencies": {
+        "@chakra-ui/clickable": "1.2.6",
+        "@chakra-ui/descendant": "2.1.3",
+        "@chakra-ui/hooks": "1.8.5",
+        "@chakra-ui/popper": "2.4.3",
+        "@chakra-ui/react-utils": "1.2.3",
+        "@chakra-ui/transition": "1.4.7",
+        "@chakra-ui/utils": "1.10.4"
       },
       "peerDependencies": {
         "@chakra-ui/system": ">=1.0.0",
-        "framer-motion": "3.x || 4.x || 5.x",
+        "framer-motion": "3.x || 4.x || 5.x || 6.x",
         "react": ">=16.8.6"
       }
     },
+    "node_modules/@chakra-ui/menu/node_modules/@chakra-ui/utils": {
+      "version": "1.10.4",
+      "resolved": "https://registry.npmjs.org/@chakra-ui/utils/-/utils-1.10.4.tgz",
+      "integrity": "sha512-AM91VQQxw8F4F1WDA28mqKY6NFIOuzc2Ekkna88imy2OiqqmYH0xkq8J16L2qj4cLiLozpYqba3C79pWioy6FA==",
+      "dependencies": {
+        "@types/lodash.mergewith": "4.6.6",
+        "css-box-model": "1.2.1",
+        "framesync": "5.3.0",
+        "lodash.mergewith": "4.6.2"
+      }
+    },
     "node_modules/@chakra-ui/modal": {
-      "version": "1.10.3",
-      "resolved": "https://registry.npmjs.org/@chakra-ui/modal/-/modal-1.10.3.tgz",
-      "integrity": "sha512-b0kVv4kNFWVbJPprEgFqqBH8EeneLAueSV+0t9Z1MpvIF0EUB6qe2JQZ0X8eDOtNYX4Tp7Y7LRCQ/M/HMm9WRw==",
-      "dependencies": {
-        "@chakra-ui/close-button": "1.2.2",
-        "@chakra-ui/focus-lock": "1.2.1",
-        "@chakra-ui/hooks": "1.7.2",
-        "@chakra-ui/portal": "1.3.2",
-        "@chakra-ui/react-utils": "1.2.1",
-        "@chakra-ui/transition": "1.4.2",
-        "@chakra-ui/utils": "1.9.1",
+      "version": "1.10.10",
+      "resolved": "https://registry.npmjs.org/@chakra-ui/modal/-/modal-1.10.10.tgz",
+      "integrity": "sha512-/OLnZhhGXQEaCqtrCCf2nu27mVxT/3Kd+NBNMKGZ4X70Dm6HD3x1Zrsto2hVo8l3kLEPRpkfpXhKu61doMc8zw==",
+      "dependencies": {
+        "@chakra-ui/close-button": "1.2.7",
+        "@chakra-ui/focus-lock": "1.2.6",
+        "@chakra-ui/hooks": "1.8.5",
+        "@chakra-ui/portal": "1.3.8",
+        "@chakra-ui/react-utils": "1.2.3",
+        "@chakra-ui/transition": "1.4.7",
+        "@chakra-ui/utils": "1.10.4",
         "aria-hidden": "^1.1.1",
         "react-remove-scroll": "2.4.1"
       },
       "peerDependencies": {
         "@chakra-ui/system": ">=1.0.0",
-        "framer-motion": "3.x || 4.x || 5.x",
+        "framer-motion": "3.x || 4.x || 5.x || 6.x",
         "react": ">=16.8.6",
         "react-dom": ">=16.8.6"
       }
     },
+    "node_modules/@chakra-ui/modal/node_modules/@chakra-ui/utils": {
+      "version": "1.10.4",
+      "resolved": "https://registry.npmjs.org/@chakra-ui/utils/-/utils-1.10.4.tgz",
+      "integrity": "sha512-AM91VQQxw8F4F1WDA28mqKY6NFIOuzc2Ekkna88imy2OiqqmYH0xkq8J16L2qj4cLiLozpYqba3C79pWioy6FA==",
+      "dependencies": {
+        "@types/lodash.mergewith": "4.6.6",
+        "css-box-model": "1.2.1",
+        "framesync": "5.3.0",
+        "lodash.mergewith": "4.6.2"
+      }
+    },
     "node_modules/@chakra-ui/number-input": {
-      "version": "1.3.3",
-      "resolved": "https://registry.npmjs.org/@chakra-ui/number-input/-/number-input-1.3.3.tgz",
-      "integrity": "sha512-nptvORoG+PvvuURkzh0juSYxj3L9HnWIeNncC/7oXgm2AFGxIcqUk8pUJaUNM2mlbLjJZS19/MWlfzgsYJmJrQ==",
-      "dependencies": {
-        "@chakra-ui/counter": "1.2.2",
-        "@chakra-ui/form-control": "1.5.3",
-        "@chakra-ui/hooks": "1.7.2",
-        "@chakra-ui/icon": "2.0.0",
-        "@chakra-ui/react-utils": "1.2.1",
-        "@chakra-ui/utils": "1.9.1"
+      "version": "1.4.5",
+      "resolved": "https://registry.npmjs.org/@chakra-ui/number-input/-/number-input-1.4.5.tgz",
+      "integrity": "sha512-jxOvJUEuXZXQrOgMGZ+rPNjSrIoV7MSb7CPt3C1jVuiumr/GgNu54awmrky3Zj4ikj68rREEUXAGKBgm9oU3nQ==",
+      "dependencies": {
+        "@chakra-ui/counter": "1.2.8",
+        "@chakra-ui/form-control": "1.5.9",
+        "@chakra-ui/hooks": "1.8.5",
+        "@chakra-ui/icon": "2.0.5",
+        "@chakra-ui/react-utils": "1.2.3",
+        "@chakra-ui/utils": "1.10.4"
       },
       "peerDependencies": {
         "@chakra-ui/system": ">=1.0.0",
@@ -2203,55 +2450,88 @@
       }
     },
     "node_modules/@chakra-ui/number-input/node_modules/@chakra-ui/icon": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/@chakra-ui/icon/-/icon-2.0.0.tgz",
-      "integrity": "sha512-/GuU+xIcOIy9uSUUUCu249ZJB/nLDbjWGkfpoSdBwqT4+ytJrKt+0Ckh3Ub14sz3BJD+Z6IiIt6ySOA9+7lbsA==",
+      "version": "2.0.5",
+      "resolved": "https://registry.npmjs.org/@chakra-ui/icon/-/icon-2.0.5.tgz",
+      "integrity": "sha512-ZrqRvCCIxGr4qFd/r1pmtd9tobRmv8KAxV7ygFoc/t4vOSKTcVIjhE12gsI3FzgvXM15ZFVwsxa1zodwgo5neQ==",
       "dependencies": {
-        "@chakra-ui/utils": "1.9.1"
+        "@chakra-ui/utils": "1.10.4"
       },
       "peerDependencies": {
         "@chakra-ui/system": ">=1.0.0",
         "react": ">=16.8.6"
       }
     },
+    "node_modules/@chakra-ui/number-input/node_modules/@chakra-ui/utils": {
+      "version": "1.10.4",
+      "resolved": "https://registry.npmjs.org/@chakra-ui/utils/-/utils-1.10.4.tgz",
+      "integrity": "sha512-AM91VQQxw8F4F1WDA28mqKY6NFIOuzc2Ekkna88imy2OiqqmYH0xkq8J16L2qj4cLiLozpYqba3C79pWioy6FA==",
+      "dependencies": {
+        "@types/lodash.mergewith": "4.6.6",
+        "css-box-model": "1.2.1",
+        "framesync": "5.3.0",
+        "lodash.mergewith": "4.6.2"
+      }
+    },
     "node_modules/@chakra-ui/pin-input": {
-      "version": "1.7.2",
-      "resolved": "https://registry.npmjs.org/@chakra-ui/pin-input/-/pin-input-1.7.2.tgz",
-      "integrity": "sha512-2dGNdU+Xlu0u1OxuelJBKQu7dDKaD5kN9moZMoKpjpXB8Kibh7GM3OO/Z25aMM/E9Kly21qXgHju0Tj/ovBJuw==",
+      "version": "1.7.8",
+      "resolved": "https://registry.npmjs.org/@chakra-ui/pin-input/-/pin-input-1.7.8.tgz",
+      "integrity": "sha512-P4uJBVKDxTetQhj+s0L7TbUTTqbcHwkLpo4bGUEdQpHMfGFlJgGu0wFT5Z8O0fw+vGNfguFfkqkVRRgK8FkHlA==",
       "dependencies": {
-        "@chakra-ui/descendant": "2.1.1",
-        "@chakra-ui/hooks": "1.7.2",
-        "@chakra-ui/react-utils": "1.2.1",
-        "@chakra-ui/utils": "1.9.1"
+        "@chakra-ui/descendant": "2.1.3",
+        "@chakra-ui/hooks": "1.8.5",
+        "@chakra-ui/react-utils": "1.2.3",
+        "@chakra-ui/utils": "1.10.4"
       },
       "peerDependencies": {
         "@chakra-ui/system": ">=1.0.0",
         "react": ">=16.8.6"
       }
     },
+    "node_modules/@chakra-ui/pin-input/node_modules/@chakra-ui/utils": {
+      "version": "1.10.4",
+      "resolved": "https://registry.npmjs.org/@chakra-ui/utils/-/utils-1.10.4.tgz",
+      "integrity": "sha512-AM91VQQxw8F4F1WDA28mqKY6NFIOuzc2Ekkna88imy2OiqqmYH0xkq8J16L2qj4cLiLozpYqba3C79pWioy6FA==",
+      "dependencies": {
+        "@types/lodash.mergewith": "4.6.6",
+        "css-box-model": "1.2.1",
+        "framesync": "5.3.0",
+        "lodash.mergewith": "4.6.2"
+      }
+    },
     "node_modules/@chakra-ui/popover": {
-      "version": "1.11.1",
-      "resolved": "https://registry.npmjs.org/@chakra-ui/popover/-/popover-1.11.1.tgz",
-      "integrity": "sha512-WV1R2L1V6mbpe6/aInr4yFe6rAu7+pT8Od6Hki5KsIv+4QvoEMYsvJ0VOhaURLLD+NaKXFCsfpc9immluia+AA==",
-      "dependencies": {
-        "@chakra-ui/close-button": "1.2.2",
-        "@chakra-ui/hooks": "1.7.2",
-        "@chakra-ui/popper": "2.4.1",
-        "@chakra-ui/react-utils": "1.2.1",
-        "@chakra-ui/utils": "1.9.1"
+      "version": "1.11.7",
+      "resolved": "https://registry.npmjs.org/@chakra-ui/popover/-/popover-1.11.7.tgz",
+      "integrity": "sha512-TjMZlpBomIuGuQgGQi2rTSVFwFbc9HdJSU3anyFyDQb4ZnunyqaIEMoqFdj/dK8tDdWIatozKjX6AzSimmSvLg==",
+      "dependencies": {
+        "@chakra-ui/close-button": "1.2.7",
+        "@chakra-ui/hooks": "1.8.5",
+        "@chakra-ui/popper": "2.4.3",
+        "@chakra-ui/react-utils": "1.2.3",
+        "@chakra-ui/utils": "1.10.4"
       },
       "peerDependencies": {
         "@chakra-ui/system": ">=1.0.0",
-        "framer-motion": "3.x || 4.x || 5.x",
+        "framer-motion": "3.x || 4.x || 5.x || 6.x",
         "react": ">=16.8.6"
       }
     },
+    "node_modules/@chakra-ui/popover/node_modules/@chakra-ui/utils": {
+      "version": "1.10.4",
+      "resolved": "https://registry.npmjs.org/@chakra-ui/utils/-/utils-1.10.4.tgz",
+      "integrity": "sha512-AM91VQQxw8F4F1WDA28mqKY6NFIOuzc2Ekkna88imy2OiqqmYH0xkq8J16L2qj4cLiLozpYqba3C79pWioy6FA==",
+      "dependencies": {
+        "@types/lodash.mergewith": "4.6.6",
+        "css-box-model": "1.2.1",
+        "framesync": "5.3.0",
+        "lodash.mergewith": "4.6.2"
+      }
+    },
     "node_modules/@chakra-ui/popper": {
-      "version": "2.4.1",
-      "resolved": "https://registry.npmjs.org/@chakra-ui/popper/-/popper-2.4.1.tgz",
-      "integrity": "sha512-cuwnwXx6RUXZGGynVOGG8fEIiMNBXUCy3UqWQD1eEd8200eWQobgNk4Z0YwzKuSzJwp0Auy+j5iKefi5FSkyog==",
+      "version": "2.4.3",
+      "resolved": "https://registry.npmjs.org/@chakra-ui/popper/-/popper-2.4.3.tgz",
+      "integrity": "sha512-TGzFnYt3mtIVkIejtYIAu4Ka9DaYLzMR4NgcqI6EtaTvgK7Xep+6RTiY/Nq+ZT3l/eaNUwqHRFoNrDUg1XYasA==",
       "dependencies": {
-        "@chakra-ui/react-utils": "1.2.1",
+        "@chakra-ui/react-utils": "1.2.3",
         "@popperjs/core": "^2.9.3"
       },
       "peerDependencies": {
@@ -2259,43 +2539,65 @@
       }
     },
     "node_modules/@chakra-ui/portal": {
-      "version": "1.3.2",
-      "resolved": "https://registry.npmjs.org/@chakra-ui/portal/-/portal-1.3.2.tgz",
-      "integrity": "sha512-dWUCwEZNpPnbR21+eBbEGuvvOcz5AuS+TZ4V0sUdUEI8B3dPUEylJsveZpYjOCS/YAh4xoxbo6I6haRgrfguvw==",
+      "version": "1.3.8",
+      "resolved": "https://registry.npmjs.org/@chakra-ui/portal/-/portal-1.3.8.tgz",
+      "integrity": "sha512-rpSu/RdtlKfOBzw11qHs91IwUTffUfppBz33PfOFNZpDGmO0+6pWkz40I16eSgYtQigZRQG1spz6Ul7tsh+1ag==",
       "dependencies": {
-        "@chakra-ui/hooks": "1.7.2",
-        "@chakra-ui/react-utils": "1.2.1",
-        "@chakra-ui/utils": "1.9.1"
+        "@chakra-ui/hooks": "1.8.5",
+        "@chakra-ui/react-utils": "1.2.3",
+        "@chakra-ui/utils": "1.10.4"
       },
       "peerDependencies": {
         "react": ">=16.8.6",
         "react-dom": ">=16.8.6"
       }
     },
+    "node_modules/@chakra-ui/portal/node_modules/@chakra-ui/utils": {
+      "version": "1.10.4",
+      "resolved": "https://registry.npmjs.org/@chakra-ui/utils/-/utils-1.10.4.tgz",
+      "integrity": "sha512-AM91VQQxw8F4F1WDA28mqKY6NFIOuzc2Ekkna88imy2OiqqmYH0xkq8J16L2qj4cLiLozpYqba3C79pWioy6FA==",
+      "dependencies": {
+        "@types/lodash.mergewith": "4.6.6",
+        "css-box-model": "1.2.1",
+        "framesync": "5.3.0",
+        "lodash.mergewith": "4.6.2"
+      }
+    },
     "node_modules/@chakra-ui/progress": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/@chakra-ui/progress/-/progress-1.2.1.tgz",
-      "integrity": "sha512-213nN8nbODvD/A23vAtg+r3bRKKatWQHafgmLzeznUcxa/+ac0eVurIS8XSYLRkY4EXQ505re3ZkLhDd98a7QA==",
+      "version": "1.2.6",
+      "resolved": "https://registry.npmjs.org/@chakra-ui/progress/-/progress-1.2.6.tgz",
+      "integrity": "sha512-thaHRIYTVktgV78vJMNwzfCX+ickhSpn2bun6FtGVUphFx4tjV+ggz+IGohm6AH2hapskoR1mQU2iNZb6BK0hQ==",
       "dependencies": {
-        "@chakra-ui/theme-tools": "1.3.1",
-        "@chakra-ui/utils": "1.9.1"
+        "@chakra-ui/theme-tools": "1.3.6",
+        "@chakra-ui/utils": "1.10.4"
       },
       "peerDependencies": {
         "@chakra-ui/system": ">=1.0.0",
         "react": ">=16.8.6"
       }
     },
+    "node_modules/@chakra-ui/progress/node_modules/@chakra-ui/utils": {
+      "version": "1.10.4",
+      "resolved": "https://registry.npmjs.org/@chakra-ui/utils/-/utils-1.10.4.tgz",
+      "integrity": "sha512-AM91VQQxw8F4F1WDA28mqKY6NFIOuzc2Ekkna88imy2OiqqmYH0xkq8J16L2qj4cLiLozpYqba3C79pWioy6FA==",
+      "dependencies": {
+        "@types/lodash.mergewith": "4.6.6",
+        "css-box-model": "1.2.1",
+        "framesync": "5.3.0",
+        "lodash.mergewith": "4.6.2"
+      }
+    },
     "node_modules/@chakra-ui/provider": {
-      "version": "1.7.4",
-      "resolved": "https://registry.npmjs.org/@chakra-ui/provider/-/provider-1.7.4.tgz",
-      "integrity": "sha512-W+mut8fVk6MZx2Sgz4SSIrVVCUAFXE8/AZK3G71qFb9j/7m30zdWCsSzY9yd0XMjJF2cJvEXjEPAVYWz9BEoBA==",
-      "dependencies": {
-        "@chakra-ui/css-reset": "1.1.1",
-        "@chakra-ui/hooks": "1.7.2",
-        "@chakra-ui/portal": "1.3.2",
-        "@chakra-ui/react-env": "1.1.1",
-        "@chakra-ui/system": "1.9.0",
-        "@chakra-ui/utils": "1.9.1"
+      "version": "1.7.12",
+      "resolved": "https://registry.npmjs.org/@chakra-ui/provider/-/provider-1.7.12.tgz",
+      "integrity": "sha512-SSq4z4nMjCbqdGrRkbxzR4o96uRah1HnSFui3lM2263zJN7fyezqiseRboID+i7eIUCBWHMLdsabARAD8t1tDQ==",
+      "dependencies": {
+        "@chakra-ui/css-reset": "1.1.3",
+        "@chakra-ui/hooks": "1.8.5",
+        "@chakra-ui/portal": "1.3.8",
+        "@chakra-ui/react-env": "1.1.6",
+        "@chakra-ui/system": "1.11.2",
+        "@chakra-ui/utils": "1.10.4"
       },
       "peerDependencies": {
         "@emotion/react": "^11.0.0",
@@ -2304,179 +2606,281 @@
         "react-dom": ">=16.8.6"
       }
     },
+    "node_modules/@chakra-ui/provider/node_modules/@chakra-ui/utils": {
+      "version": "1.10.4",
+      "resolved": "https://registry.npmjs.org/@chakra-ui/utils/-/utils-1.10.4.tgz",
+      "integrity": "sha512-AM91VQQxw8F4F1WDA28mqKY6NFIOuzc2Ekkna88imy2OiqqmYH0xkq8J16L2qj4cLiLozpYqba3C79pWioy6FA==",
+      "dependencies": {
+        "@types/lodash.mergewith": "4.6.6",
+        "css-box-model": "1.2.1",
+        "framesync": "5.3.0",
+        "lodash.mergewith": "4.6.2"
+      }
+    },
     "node_modules/@chakra-ui/radio": {
-      "version": "1.4.4",
-      "resolved": "https://registry.npmjs.org/@chakra-ui/radio/-/radio-1.4.4.tgz",
-      "integrity": "sha512-Tz8bl+yhD2pKHUFyNZtP056eawqOUkSA7n2qEebnoH7Zp65B9zwYHkpvL+2nhL5swBwpnGrUpuK3WOqGz4dvXA==",
+      "version": "1.4.10",
+      "resolved": "https://registry.npmjs.org/@chakra-ui/radio/-/radio-1.4.10.tgz",
+      "integrity": "sha512-TgqBgfezypC4do1Vj4iBp4kptXVWdnhASJ97VFuau2QQPT6zKl3Ke2di+XLhH3CZNCDHpvU/KxQNJ6bfj5GMGg==",
       "dependencies": {
-        "@chakra-ui/form-control": "1.5.3",
-        "@chakra-ui/hooks": "1.7.2",
-        "@chakra-ui/react-utils": "1.2.1",
-        "@chakra-ui/utils": "1.9.1",
-        "@chakra-ui/visually-hidden": "1.1.1"
+        "@chakra-ui/form-control": "1.5.9",
+        "@chakra-ui/hooks": "1.8.5",
+        "@chakra-ui/react-utils": "1.2.3",
+        "@chakra-ui/utils": "1.10.4",
+        "@chakra-ui/visually-hidden": "1.1.6"
       },
       "peerDependencies": {
         "@chakra-ui/system": ">=1.0.0",
         "react": ">=16.8.6"
       }
     },
+    "node_modules/@chakra-ui/radio/node_modules/@chakra-ui/utils": {
+      "version": "1.10.4",
+      "resolved": "https://registry.npmjs.org/@chakra-ui/utils/-/utils-1.10.4.tgz",
+      "integrity": "sha512-AM91VQQxw8F4F1WDA28mqKY6NFIOuzc2Ekkna88imy2OiqqmYH0xkq8J16L2qj4cLiLozpYqba3C79pWioy6FA==",
+      "dependencies": {
+        "@types/lodash.mergewith": "4.6.6",
+        "css-box-model": "1.2.1",
+        "framesync": "5.3.0",
+        "lodash.mergewith": "4.6.2"
+      }
+    },
     "node_modules/@chakra-ui/react": {
-      "version": "1.7.4",
-      "resolved": "https://registry.npmjs.org/@chakra-ui/react/-/react-1.7.4.tgz",
-      "integrity": "sha512-wBxfQRcIz6YGXQh3S2E6sXCVcqrVuUygMeMdkCMMfZQTI2VFLkvn6SDYzLHcm1PtMygZnF1mU30GOcmArpVotA==",
-      "dependencies": {
-        "@chakra-ui/accordion": "1.4.3",
-        "@chakra-ui/alert": "1.3.2",
-        "@chakra-ui/avatar": "1.3.2",
-        "@chakra-ui/breadcrumb": "1.3.1",
-        "@chakra-ui/button": "1.5.2",
-        "@chakra-ui/checkbox": "1.6.2",
-        "@chakra-ui/close-button": "1.2.2",
-        "@chakra-ui/control-box": "1.1.1",
-        "@chakra-ui/counter": "1.2.2",
-        "@chakra-ui/css-reset": "1.1.1",
-        "@chakra-ui/editable": "1.3.2",
-        "@chakra-ui/form-control": "1.5.3",
-        "@chakra-ui/hooks": "1.7.2",
-        "@chakra-ui/icon": "2.0.0",
-        "@chakra-ui/image": "1.1.2",
-        "@chakra-ui/input": "1.3.3",
-        "@chakra-ui/layout": "1.7.0",
-        "@chakra-ui/live-region": "1.1.1",
-        "@chakra-ui/media-query": "1.2.3",
-        "@chakra-ui/menu": "1.8.3",
-        "@chakra-ui/modal": "1.10.3",
-        "@chakra-ui/number-input": "1.3.3",
-        "@chakra-ui/pin-input": "1.7.2",
-        "@chakra-ui/popover": "1.11.1",
-        "@chakra-ui/popper": "2.4.1",
-        "@chakra-ui/portal": "1.3.2",
-        "@chakra-ui/progress": "1.2.1",
-        "@chakra-ui/provider": "1.7.4",
-        "@chakra-ui/radio": "1.4.4",
-        "@chakra-ui/react-env": "1.1.1",
-        "@chakra-ui/select": "1.2.3",
-        "@chakra-ui/skeleton": "1.2.4",
-        "@chakra-ui/slider": "1.5.3",
-        "@chakra-ui/spinner": "1.2.1",
-        "@chakra-ui/stat": "1.2.2",
-        "@chakra-ui/switch": "1.3.2",
-        "@chakra-ui/system": "1.9.0",
-        "@chakra-ui/table": "1.3.1",
-        "@chakra-ui/tabs": "1.6.2",
-        "@chakra-ui/tag": "1.2.2",
-        "@chakra-ui/textarea": "1.2.3",
-        "@chakra-ui/theme": "1.12.3",
-        "@chakra-ui/toast": "1.5.1",
-        "@chakra-ui/tooltip": "1.4.3",
-        "@chakra-ui/transition": "1.4.2",
-        "@chakra-ui/utils": "1.9.1",
-        "@chakra-ui/visually-hidden": "1.1.1"
+      "version": "1.8.6",
+      "resolved": "https://registry.npmjs.org/@chakra-ui/react/-/react-1.8.6.tgz",
+      "integrity": "sha512-FEh/KG0uPeNOMQuIlyPfGjHvGB7LN1AAhkdFefqzNt0zNy8Giv4p1PKY7wdCh5QEFor++A83L1wIWvTGQVJ2vQ==",
+      "dependencies": {
+        "@chakra-ui/accordion": "1.4.9",
+        "@chakra-ui/alert": "1.3.7",
+        "@chakra-ui/avatar": "1.3.9",
+        "@chakra-ui/breadcrumb": "1.3.6",
+        "@chakra-ui/button": "1.5.8",
+        "@chakra-ui/checkbox": "1.6.8",
+        "@chakra-ui/close-button": "1.2.7",
+        "@chakra-ui/control-box": "1.1.6",
+        "@chakra-ui/counter": "1.2.8",
+        "@chakra-ui/css-reset": "1.1.3",
+        "@chakra-ui/editable": "1.4.0",
+        "@chakra-ui/form-control": "1.5.9",
+        "@chakra-ui/hooks": "1.8.5",
+        "@chakra-ui/icon": "2.0.5",
+        "@chakra-ui/image": "1.1.8",
+        "@chakra-ui/input": "1.4.4",
+        "@chakra-ui/layout": "1.7.7",
+        "@chakra-ui/live-region": "1.1.6",
+        "@chakra-ui/media-query": "2.0.4",
+        "@chakra-ui/menu": "1.8.9",
+        "@chakra-ui/modal": "1.10.10",
+        "@chakra-ui/number-input": "1.4.5",
+        "@chakra-ui/pin-input": "1.7.8",
+        "@chakra-ui/popover": "1.11.7",
+        "@chakra-ui/popper": "2.4.3",
+        "@chakra-ui/portal": "1.3.8",
+        "@chakra-ui/progress": "1.2.6",
+        "@chakra-ui/provider": "1.7.12",
+        "@chakra-ui/radio": "1.4.10",
+        "@chakra-ui/react-env": "1.1.6",
+        "@chakra-ui/select": "1.2.9",
+        "@chakra-ui/skeleton": "1.2.12",
+        "@chakra-ui/slider": "1.5.9",
+        "@chakra-ui/spinner": "1.2.6",
+        "@chakra-ui/stat": "1.2.7",
+        "@chakra-ui/switch": "1.3.8",
+        "@chakra-ui/system": "1.11.2",
+        "@chakra-ui/table": "1.3.6",
+        "@chakra-ui/tabs": "1.6.8",
+        "@chakra-ui/tag": "1.2.7",
+        "@chakra-ui/textarea": "1.2.9",
+        "@chakra-ui/theme": "1.14.0",
+        "@chakra-ui/toast": "1.5.7",
+        "@chakra-ui/tooltip": "1.4.9",
+        "@chakra-ui/transition": "1.4.7",
+        "@chakra-ui/utils": "1.10.4",
+        "@chakra-ui/visually-hidden": "1.1.6"
       },
       "peerDependencies": {
         "@emotion/react": "^11.0.0",
         "@emotion/styled": "^11.0.0",
-        "framer-motion": "3.x || 4.x || 5.x",
+        "framer-motion": "3.x || 4.x || 5.x || 6.x",
         "react": ">=16.8.6",
         "react-dom": ">=16.8.6"
       }
     },
     "node_modules/@chakra-ui/react-env": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/@chakra-ui/react-env/-/react-env-1.1.1.tgz",
-      "integrity": "sha512-Lgmb0y4kv0ffsGMelAOaYOd4tYZAv4FYWgV86ckGMjmYQWA8drv4v/lHTNltixxWMmBEpjcHALpJuS6yAZYHug==",
+      "version": "1.1.6",
+      "resolved": "https://registry.npmjs.org/@chakra-ui/react-env/-/react-env-1.1.6.tgz",
+      "integrity": "sha512-L90LNvCfe04FTkN9OPok/o2e60zLJNBH8Im/5dUHvqy7dXLXok8ZDad5vEL46XmGbhe7O8fbxhG6FmAYdcCHrQ==",
       "dependencies": {
-        "@chakra-ui/utils": "1.9.1"
+        "@chakra-ui/utils": "1.10.4"
       },
       "peerDependencies": {
         "react": ">=16.8.6"
       }
     },
+    "node_modules/@chakra-ui/react-env/node_modules/@chakra-ui/utils": {
+      "version": "1.10.4",
+      "resolved": "https://registry.npmjs.org/@chakra-ui/utils/-/utils-1.10.4.tgz",
+      "integrity": "sha512-AM91VQQxw8F4F1WDA28mqKY6NFIOuzc2Ekkna88imy2OiqqmYH0xkq8J16L2qj4cLiLozpYqba3C79pWioy6FA==",
+      "dependencies": {
+        "@types/lodash.mergewith": "4.6.6",
+        "css-box-model": "1.2.1",
+        "framesync": "5.3.0",
+        "lodash.mergewith": "4.6.2"
+      }
+    },
     "node_modules/@chakra-ui/react-utils": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/@chakra-ui/react-utils/-/react-utils-1.2.1.tgz",
-      "integrity": "sha512-bV8FRaXiOgGxOg03iTNin/B02I+tHH9PQtqUTl3U7cJaoI+5AUYhrqXvl1Ya2/R7zxSFrb/gBVDTgbZiVkJ+Dg==",
+      "version": "1.2.3",
+      "resolved": "https://registry.npmjs.org/@chakra-ui/react-utils/-/react-utils-1.2.3.tgz",
+      "integrity": "sha512-r8pUwCVVB7UPhb0AiRa9ZzSp4xkMz64yIeJ4O4aGy4WMw7TRH4j4QkbkE1YC9tQitrXrliOlvx4WWJR4VyiGpw==",
       "dependencies": {
-        "@chakra-ui/utils": "^1.9.1"
+        "@chakra-ui/utils": "^1.10.4"
       },
       "peerDependencies": {
         "react": ">=16.8.6"
       }
     },
+    "node_modules/@chakra-ui/react-utils/node_modules/@chakra-ui/utils": {
+      "version": "1.10.4",
+      "resolved": "https://registry.npmjs.org/@chakra-ui/utils/-/utils-1.10.4.tgz",
+      "integrity": "sha512-AM91VQQxw8F4F1WDA28mqKY6NFIOuzc2Ekkna88imy2OiqqmYH0xkq8J16L2qj4cLiLozpYqba3C79pWioy6FA==",
+      "dependencies": {
+        "@types/lodash.mergewith": "4.6.6",
+        "css-box-model": "1.2.1",
+        "framesync": "5.3.0",
+        "lodash.mergewith": "4.6.2"
+      }
+    },
     "node_modules/@chakra-ui/react/node_modules/@chakra-ui/icon": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/@chakra-ui/icon/-/icon-2.0.0.tgz",
-      "integrity": "sha512-/GuU+xIcOIy9uSUUUCu249ZJB/nLDbjWGkfpoSdBwqT4+ytJrKt+0Ckh3Ub14sz3BJD+Z6IiIt6ySOA9+7lbsA==",
+      "version": "2.0.5",
+      "resolved": "https://registry.npmjs.org/@chakra-ui/icon/-/icon-2.0.5.tgz",
+      "integrity": "sha512-ZrqRvCCIxGr4qFd/r1pmtd9tobRmv8KAxV7ygFoc/t4vOSKTcVIjhE12gsI3FzgvXM15ZFVwsxa1zodwgo5neQ==",
       "dependencies": {
-        "@chakra-ui/utils": "1.9.1"
+        "@chakra-ui/utils": "1.10.4"
       },
       "peerDependencies": {
         "@chakra-ui/system": ">=1.0.0",
         "react": ">=16.8.6"
       }
     },
+    "node_modules/@chakra-ui/react/node_modules/@chakra-ui/utils": {
+      "version": "1.10.4",
+      "resolved": "https://registry.npmjs.org/@chakra-ui/utils/-/utils-1.10.4.tgz",
+      "integrity": "sha512-AM91VQQxw8F4F1WDA28mqKY6NFIOuzc2Ekkna88imy2OiqqmYH0xkq8J16L2qj4cLiLozpYqba3C79pWioy6FA==",
+      "dependencies": {
+        "@types/lodash.mergewith": "4.6.6",
+        "css-box-model": "1.2.1",
+        "framesync": "5.3.0",
+        "lodash.mergewith": "4.6.2"
+      }
+    },
     "node_modules/@chakra-ui/select": {
-      "version": "1.2.3",
-      "resolved": "https://registry.npmjs.org/@chakra-ui/select/-/select-1.2.3.tgz",
-      "integrity": "sha512-LGT8z06InjfMTQyWgQUqinucvObkO0bOR87c4swWlAESkS6w+g8PsH9UJ87NT5W+hzCybvqSfRjMHYwC9qUnrg==",
+      "version": "1.2.9",
+      "resolved": "https://registry.npmjs.org/@chakra-ui/select/-/select-1.2.9.tgz",
+      "integrity": "sha512-f8cRy3whXFYviuKGfugPnvXTGarPVt2ux5pffipmliYOhfaJ8O2OtdmNJ/od4WaeGStUH13x12GsEqVw2LBKOg==",
       "dependencies": {
-        "@chakra-ui/form-control": "1.5.3",
-        "@chakra-ui/utils": "1.9.1"
+        "@chakra-ui/form-control": "1.5.9",
+        "@chakra-ui/utils": "1.10.4"
       },
       "peerDependencies": {
         "@chakra-ui/system": ">=1.0.0",
         "react": ">=16.8.6"
       }
     },
+    "node_modules/@chakra-ui/select/node_modules/@chakra-ui/utils": {
+      "version": "1.10.4",
+      "resolved": "https://registry.npmjs.org/@chakra-ui/utils/-/utils-1.10.4.tgz",
+      "integrity": "sha512-AM91VQQxw8F4F1WDA28mqKY6NFIOuzc2Ekkna88imy2OiqqmYH0xkq8J16L2qj4cLiLozpYqba3C79pWioy6FA==",
+      "dependencies": {
+        "@types/lodash.mergewith": "4.6.6",
+        "css-box-model": "1.2.1",
+        "framesync": "5.3.0",
+        "lodash.mergewith": "4.6.2"
+      }
+    },
     "node_modules/@chakra-ui/skeleton": {
-      "version": "1.2.4",
-      "resolved": "https://registry.npmjs.org/@chakra-ui/skeleton/-/skeleton-1.2.4.tgz",
-      "integrity": "sha512-j5cAwXfyb7sybk+QjSz5TlQkQVeekdRZBF4xEm4TXGGZiMSTsd9/7BOBtxopakn/YKDP1owZ4oSGZGYGNmTS8w==",
+      "version": "1.2.12",
+      "resolved": "https://registry.npmjs.org/@chakra-ui/skeleton/-/skeleton-1.2.12.tgz",
+      "integrity": "sha512-buHqfKw24+EQXFGHlSRq2obHxZgz0FUKSFNMlQS3tMoFwBkLRO/jAQfjj9KKR5b0m2qu1qLBmwFHJLih1+bnzg==",
       "dependencies": {
-        "@chakra-ui/hooks": "1.7.2",
-        "@chakra-ui/media-query": "1.2.3",
-        "@chakra-ui/system": "1.9.0",
-        "@chakra-ui/utils": "1.9.1"
+        "@chakra-ui/hooks": "1.8.5",
+        "@chakra-ui/media-query": "2.0.4",
+        "@chakra-ui/system": "1.11.2",
+        "@chakra-ui/utils": "1.10.4"
       },
       "peerDependencies": {
+        "@chakra-ui/theme": ">=1.0.0",
+        "@emotion/react": "^11.0.0",
+        "@emotion/styled": "^11.0.0",
         "react": ">=16.8.6"
       }
     },
+    "node_modules/@chakra-ui/skeleton/node_modules/@chakra-ui/utils": {
+      "version": "1.10.4",
+      "resolved": "https://registry.npmjs.org/@chakra-ui/utils/-/utils-1.10.4.tgz",
+      "integrity": "sha512-AM91VQQxw8F4F1WDA28mqKY6NFIOuzc2Ekkna88imy2OiqqmYH0xkq8J16L2qj4cLiLozpYqba3C79pWioy6FA==",
+      "dependencies": {
+        "@types/lodash.mergewith": "4.6.6",
+        "css-box-model": "1.2.1",
+        "framesync": "5.3.0",
+        "lodash.mergewith": "4.6.2"
+      }
+    },
     "node_modules/@chakra-ui/slider": {
-      "version": "1.5.3",
-      "resolved": "https://registry.npmjs.org/@chakra-ui/slider/-/slider-1.5.3.tgz",
-      "integrity": "sha512-i14b8MYlantiACI4jyjxU5PdX3Nwmz65TdINd7LywrKZu0ahE4GRXCcIGyM48vlXWfdkFhKLqLuF7+EYwLYtHA==",
+      "version": "1.5.9",
+      "resolved": "https://registry.npmjs.org/@chakra-ui/slider/-/slider-1.5.9.tgz",
+      "integrity": "sha512-m9n/BpnD/hEDS9q3T17ezgTFWDdvCocPzxQXzLLDN2Z2xOgwyLTQVLk4iB1yROvLCUl7Ig9C4+a4/7fivm+IHw==",
       "dependencies": {
-        "@chakra-ui/hooks": "1.7.2",
-        "@chakra-ui/react-utils": "1.2.1",
-        "@chakra-ui/utils": "1.9.1"
+        "@chakra-ui/hooks": "1.8.5",
+        "@chakra-ui/react-utils": "1.2.3",
+        "@chakra-ui/utils": "1.10.4"
       },
       "peerDependencies": {
         "@chakra-ui/system": ">=1.0.0",
         "react": ">=16.8.6"
       }
     },
+    "node_modules/@chakra-ui/slider/node_modules/@chakra-ui/utils": {
+      "version": "1.10.4",
+      "resolved": "https://registry.npmjs.org/@chakra-ui/utils/-/utils-1.10.4.tgz",
+      "integrity": "sha512-AM91VQQxw8F4F1WDA28mqKY6NFIOuzc2Ekkna88imy2OiqqmYH0xkq8J16L2qj4cLiLozpYqba3C79pWioy6FA==",
+      "dependencies": {
+        "@types/lodash.mergewith": "4.6.6",
+        "css-box-model": "1.2.1",
+        "framesync": "5.3.0",
+        "lodash.mergewith": "4.6.2"
+      }
+    },
     "node_modules/@chakra-ui/spinner": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/@chakra-ui/spinner/-/spinner-1.2.1.tgz",
-      "integrity": "sha512-CQsUJNJWWSot1ku5Se41Nz1dXIDhk+/7FIhTbfRHSjtYZnAab3CPMHBkTGqwbJxQ9oHYgk9Rso3cfG+/ra6aTQ==",
+      "version": "1.2.6",
+      "resolved": "https://registry.npmjs.org/@chakra-ui/spinner/-/spinner-1.2.6.tgz",
+      "integrity": "sha512-GoUCccN120fGRVgUtfuwcEjeoaxffB+XsgpxX7jhWloXf8b6lkqm68bsxX4Ybb2vGN1fANI98/45JmrnddZO/A==",
       "dependencies": {
-        "@chakra-ui/utils": "1.9.1",
-        "@chakra-ui/visually-hidden": "1.1.1"
+        "@chakra-ui/utils": "1.10.4",
+        "@chakra-ui/visually-hidden": "1.1.6"
       },
       "peerDependencies": {
         "@chakra-ui/system": ">=1.0.0",
         "react": ">=16.8.6"
       }
     },
+    "node_modules/@chakra-ui/spinner/node_modules/@chakra-ui/utils": {
+      "version": "1.10.4",
+      "resolved": "https://registry.npmjs.org/@chakra-ui/utils/-/utils-1.10.4.tgz",
+      "integrity": "sha512-AM91VQQxw8F4F1WDA28mqKY6NFIOuzc2Ekkna88imy2OiqqmYH0xkq8J16L2qj4cLiLozpYqba3C79pWioy6FA==",
+      "dependencies": {
+        "@types/lodash.mergewith": "4.6.6",
+        "css-box-model": "1.2.1",
+        "framesync": "5.3.0",
+        "lodash.mergewith": "4.6.2"
+      }
+    },
     "node_modules/@chakra-ui/stat": {
-      "version": "1.2.2",
-      "resolved": "https://registry.npmjs.org/@chakra-ui/stat/-/stat-1.2.2.tgz",
-      "integrity": "sha512-0StsPDC56MjzhdlBl0R8wU0uwj9L1tvhQzge/ELSDn4tQDI7VovrxpFzVH0qsj7EZDwZa0BRQaSrstzWvgmJ/Q==",
+      "version": "1.2.7",
+      "resolved": "https://registry.npmjs.org/@chakra-ui/stat/-/stat-1.2.7.tgz",
+      "integrity": "sha512-m76jumFW1N+mCG4ytrUz9Mh09nZtS4OQcADEvOslfdI5StwwuzasTA1tueaelPzdhBioMwFUWL05Fr1fXbPJ/Q==",
       "dependencies": {
-        "@chakra-ui/icon": "2.0.0",
-        "@chakra-ui/utils": "1.9.1",
-        "@chakra-ui/visually-hidden": "1.1.1"
+        "@chakra-ui/icon": "2.0.5",
+        "@chakra-ui/utils": "1.10.4",
+        "@chakra-ui/visually-hidden": "1.1.6"
       },
       "peerDependencies": {
         "@chakra-ui/system": ">=1.0.0",
@@ -2484,48 +2888,82 @@
       }
     },
     "node_modules/@chakra-ui/stat/node_modules/@chakra-ui/icon": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/@chakra-ui/icon/-/icon-2.0.0.tgz",
-      "integrity": "sha512-/GuU+xIcOIy9uSUUUCu249ZJB/nLDbjWGkfpoSdBwqT4+ytJrKt+0Ckh3Ub14sz3BJD+Z6IiIt6ySOA9+7lbsA==",
+      "version": "2.0.5",
+      "resolved": "https://registry.npmjs.org/@chakra-ui/icon/-/icon-2.0.5.tgz",
+      "integrity": "sha512-ZrqRvCCIxGr4qFd/r1pmtd9tobRmv8KAxV7ygFoc/t4vOSKTcVIjhE12gsI3FzgvXM15ZFVwsxa1zodwgo5neQ==",
       "dependencies": {
-        "@chakra-ui/utils": "1.9.1"
+        "@chakra-ui/utils": "1.10.4"
       },
       "peerDependencies": {
         "@chakra-ui/system": ">=1.0.0",
         "react": ">=16.8.6"
       }
     },
+    "node_modules/@chakra-ui/stat/node_modules/@chakra-ui/utils": {
+      "version": "1.10.4",
+      "resolved": "https://registry.npmjs.org/@chakra-ui/utils/-/utils-1.10.4.tgz",
+      "integrity": "sha512-AM91VQQxw8F4F1WDA28mqKY6NFIOuzc2Ekkna88imy2OiqqmYH0xkq8J16L2qj4cLiLozpYqba3C79pWioy6FA==",
+      "dependencies": {
+        "@types/lodash.mergewith": "4.6.6",
+        "css-box-model": "1.2.1",
+        "framesync": "5.3.0",
+        "lodash.mergewith": "4.6.2"
+      }
+    },
     "node_modules/@chakra-ui/styled-system": {
-      "version": "1.16.0",
-      "resolved": "https://registry.npmjs.org/@chakra-ui/styled-system/-/styled-system-1.16.0.tgz",
-      "integrity": "sha512-5vGU4eCixFMXp9u9PT+5724ptzBLP5AcFks88h19TpIevcElCkvAXw2G2CDJ0jJZM59l61nJGHIjn246f3iJUA==",
+      "version": "1.18.1",
+      "resolved": "https://registry.npmjs.org/@chakra-ui/styled-system/-/styled-system-1.18.1.tgz",
+      "integrity": "sha512-uhWMNAfkk1DFAQ4nKu+t23WBQ1/XSJq8Y3sBZJQpvopfwOcarbVvEiM5voSUWPA7pkpD/BprGM7zjIRockUcmw==",
       "dependencies": {
-        "@chakra-ui/utils": "1.9.1",
+        "@chakra-ui/utils": "1.10.4",
         "csstype": "^3.0.9"
       }
     },
+    "node_modules/@chakra-ui/styled-system/node_modules/@chakra-ui/utils": {
+      "version": "1.10.4",
+      "resolved": "https://registry.npmjs.org/@chakra-ui/utils/-/utils-1.10.4.tgz",
+      "integrity": "sha512-AM91VQQxw8F4F1WDA28mqKY6NFIOuzc2Ekkna88imy2OiqqmYH0xkq8J16L2qj4cLiLozpYqba3C79pWioy6FA==",
+      "dependencies": {
+        "@types/lodash.mergewith": "4.6.6",
+        "css-box-model": "1.2.1",
+        "framesync": "5.3.0",
+        "lodash.mergewith": "4.6.2"
+      }
+    },
     "node_modules/@chakra-ui/switch": {
-      "version": "1.3.2",
-      "resolved": "https://registry.npmjs.org/@chakra-ui/switch/-/switch-1.3.2.tgz",
-      "integrity": "sha512-aqhAq93DW97qD/KTBiWe2ip64vxSkN/qimMRFdG4xqtS2DxGeicQiv7Eis3NgAq2xIMM9XOoeXutU4kGkha1+w==",
+      "version": "1.3.8",
+      "resolved": "https://registry.npmjs.org/@chakra-ui/switch/-/switch-1.3.8.tgz",
+      "integrity": "sha512-xcsq4G9YUNRSp0F+XBDjeGZFlJeEdGJptuixk6PZjqRJYUyH+k2bk1bJ2Bv2bjvmkDCojI42MkvWTLHrOqp41A==",
       "dependencies": {
-        "@chakra-ui/checkbox": "1.6.2",
-        "@chakra-ui/utils": "1.9.1"
+        "@chakra-ui/checkbox": "1.6.8",
+        "@chakra-ui/utils": "1.10.4"
       },
       "peerDependencies": {
         "@chakra-ui/system": ">=1.0.0",
+        "framer-motion": "3.x || 4.x || 5.x || 6.x",
         "react": ">=16.8.6"
       }
     },
+    "node_modules/@chakra-ui/switch/node_modules/@chakra-ui/utils": {
+      "version": "1.10.4",
+      "resolved": "https://registry.npmjs.org/@chakra-ui/utils/-/utils-1.10.4.tgz",
+      "integrity": "sha512-AM91VQQxw8F4F1WDA28mqKY6NFIOuzc2Ekkna88imy2OiqqmYH0xkq8J16L2qj4cLiLozpYqba3C79pWioy6FA==",
+      "dependencies": {
+        "@types/lodash.mergewith": "4.6.6",
+        "css-box-model": "1.2.1",
+        "framesync": "5.3.0",
+        "lodash.mergewith": "4.6.2"
+      }
+    },
     "node_modules/@chakra-ui/system": {
-      "version": "1.9.0",
-      "resolved": "https://registry.npmjs.org/@chakra-ui/system/-/system-1.9.0.tgz",
-      "integrity": "sha512-CnLmx3nVZo87puSKxDNNQUwJyWYCnx4ZUFXdDFNdKroQyZUpSYLVv1OniXbkjwEt1YdZMsWm93lZQb/0VRcKvg==",
-      "dependencies": {
-        "@chakra-ui/color-mode": "1.3.3",
-        "@chakra-ui/react-utils": "1.2.1",
-        "@chakra-ui/styled-system": "1.16.0",
-        "@chakra-ui/utils": "1.9.1",
+      "version": "1.11.2",
+      "resolved": "https://registry.npmjs.org/@chakra-ui/system/-/system-1.11.2.tgz",
+      "integrity": "sha512-s4HGYVo86XuSav5PLfuVT26Y+l3ca/nQVF6QxS6YCNiUxdBlahlzsZz3yMz3MKp11voljnY8vj4z4dvOd2sjUQ==",
+      "dependencies": {
+        "@chakra-ui/color-mode": "1.4.6",
+        "@chakra-ui/react-utils": "1.2.3",
+        "@chakra-ui/styled-system": "1.18.1",
+        "@chakra-ui/utils": "1.10.4",
         "react-fast-compare": "3.2.0"
       },
       "peerDependencies": {
@@ -2534,41 +2972,74 @@
         "react": ">=16.8.6"
       }
     },
+    "node_modules/@chakra-ui/system/node_modules/@chakra-ui/utils": {
+      "version": "1.10.4",
+      "resolved": "https://registry.npmjs.org/@chakra-ui/utils/-/utils-1.10.4.tgz",
+      "integrity": "sha512-AM91VQQxw8F4F1WDA28mqKY6NFIOuzc2Ekkna88imy2OiqqmYH0xkq8J16L2qj4cLiLozpYqba3C79pWioy6FA==",
+      "dependencies": {
+        "@types/lodash.mergewith": "4.6.6",
+        "css-box-model": "1.2.1",
+        "framesync": "5.3.0",
+        "lodash.mergewith": "4.6.2"
+      }
+    },
     "node_modules/@chakra-ui/table": {
-      "version": "1.3.1",
-      "resolved": "https://registry.npmjs.org/@chakra-ui/table/-/table-1.3.1.tgz",
-      "integrity": "sha512-+ia/7zs7AGj01lon301EEx+mK4918yGc0K6e68Kxomex8tnxkwbskFWs6hX+6Kzbj56ZBm99eLlKpo2iGYX0HA==",
+      "version": "1.3.6",
+      "resolved": "https://registry.npmjs.org/@chakra-ui/table/-/table-1.3.6.tgz",
+      "integrity": "sha512-7agZAgAeDFKviqStvixqnLAH54+setzhx67EztioZTr5Xu+6hQ4rotfJbu8L4i587pcbNg98kCEXEkidjw0XRQ==",
       "dependencies": {
-        "@chakra-ui/utils": "1.9.1"
+        "@chakra-ui/utils": "1.10.4"
       },
       "peerDependencies": {
         "@chakra-ui/system": ">=1.0.0",
         "react": ">=16.8.6"
       }
     },
+    "node_modules/@chakra-ui/table/node_modules/@chakra-ui/utils": {
+      "version": "1.10.4",
+      "resolved": "https://registry.npmjs.org/@chakra-ui/utils/-/utils-1.10.4.tgz",
+      "integrity": "sha512-AM91VQQxw8F4F1WDA28mqKY6NFIOuzc2Ekkna88imy2OiqqmYH0xkq8J16L2qj4cLiLozpYqba3C79pWioy6FA==",
+      "dependencies": {
+        "@types/lodash.mergewith": "4.6.6",
+        "css-box-model": "1.2.1",
+        "framesync": "5.3.0",
+        "lodash.mergewith": "4.6.2"
+      }
+    },
     "node_modules/@chakra-ui/tabs": {
-      "version": "1.6.2",
-      "resolved": "https://registry.npmjs.org/@chakra-ui/tabs/-/tabs-1.6.2.tgz",
-      "integrity": "sha512-J0OY4sEhZW0jxlj4MkotLiD0/snMk7IsqvDxUB17MxuFRs5ytUssHzCqO7fexH7fSfd54ITNoUIns6Ir2ueCsA==",
+      "version": "1.6.8",
+      "resolved": "https://registry.npmjs.org/@chakra-ui/tabs/-/tabs-1.6.8.tgz",
+      "integrity": "sha512-f1kM9VhAXqKzTAVRoPRIINNiUgvBcadP9m5GtjAgE4DzCrQKnTDImjIkFhXlMvWEmB5ynXZcCGlsgIZ2A9Hs9g==",
       "dependencies": {
-        "@chakra-ui/clickable": "1.2.1",
-        "@chakra-ui/descendant": "2.1.1",
-        "@chakra-ui/hooks": "1.7.2",
-        "@chakra-ui/react-utils": "1.2.1",
-        "@chakra-ui/utils": "1.9.1"
+        "@chakra-ui/clickable": "1.2.6",
+        "@chakra-ui/descendant": "2.1.3",
+        "@chakra-ui/hooks": "1.8.5",
+        "@chakra-ui/react-utils": "1.2.3",
+        "@chakra-ui/utils": "1.10.4"
       },
       "peerDependencies": {
         "@chakra-ui/system": ">=1.0.0",
         "react": ">=16.8.6"
       }
     },
+    "node_modules/@chakra-ui/tabs/node_modules/@chakra-ui/utils": {
+      "version": "1.10.4",
+      "resolved": "https://registry.npmjs.org/@chakra-ui/utils/-/utils-1.10.4.tgz",
+      "integrity": "sha512-AM91VQQxw8F4F1WDA28mqKY6NFIOuzc2Ekkna88imy2OiqqmYH0xkq8J16L2qj4cLiLozpYqba3C79pWioy6FA==",
+      "dependencies": {
+        "@types/lodash.mergewith": "4.6.6",
+        "css-box-model": "1.2.1",
+        "framesync": "5.3.0",
+        "lodash.mergewith": "4.6.2"
+      }
+    },
     "node_modules/@chakra-ui/tag": {
-      "version": "1.2.2",
-      "resolved": "https://registry.npmjs.org/@chakra-ui/tag/-/tag-1.2.2.tgz",
-      "integrity": "sha512-H25y9nEyUAUdwQDND9P4mMXKf1wf9UH4A3DyP237qVKIyYBpa4aCH8eJU4dunh2yIzASB0DWcr7lsul/HAHxmg==",
+      "version": "1.2.7",
+      "resolved": "https://registry.npmjs.org/@chakra-ui/tag/-/tag-1.2.7.tgz",
+      "integrity": "sha512-RKrKOol4i/CnpFfo3T9LMm1abaqM+5Bs0soQLbo1iJBbBACY09sWXrQYvveQ2GYzU/OrAUloHqqmKjyVGOlNtg==",
       "dependencies": {
-        "@chakra-ui/icon": "2.0.0",
-        "@chakra-ui/utils": "1.9.1"
+        "@chakra-ui/icon": "2.0.5",
+        "@chakra-ui/utils": "1.10.4"
       },
       "peerDependencies": {
         "@chakra-ui/system": ">=1.0.0",
@@ -2576,106 +3047,183 @@
       }
     },
     "node_modules/@chakra-ui/tag/node_modules/@chakra-ui/icon": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/@chakra-ui/icon/-/icon-2.0.0.tgz",
-      "integrity": "sha512-/GuU+xIcOIy9uSUUUCu249ZJB/nLDbjWGkfpoSdBwqT4+ytJrKt+0Ckh3Ub14sz3BJD+Z6IiIt6ySOA9+7lbsA==",
+      "version": "2.0.5",
+      "resolved": "https://registry.npmjs.org/@chakra-ui/icon/-/icon-2.0.5.tgz",
+      "integrity": "sha512-ZrqRvCCIxGr4qFd/r1pmtd9tobRmv8KAxV7ygFoc/t4vOSKTcVIjhE12gsI3FzgvXM15ZFVwsxa1zodwgo5neQ==",
       "dependencies": {
-        "@chakra-ui/utils": "1.9.1"
+        "@chakra-ui/utils": "1.10.4"
       },
       "peerDependencies": {
         "@chakra-ui/system": ">=1.0.0",
         "react": ">=16.8.6"
       }
     },
+    "node_modules/@chakra-ui/tag/node_modules/@chakra-ui/utils": {
+      "version": "1.10.4",
+      "resolved": "https://registry.npmjs.org/@chakra-ui/utils/-/utils-1.10.4.tgz",
+      "integrity": "sha512-AM91VQQxw8F4F1WDA28mqKY6NFIOuzc2Ekkna88imy2OiqqmYH0xkq8J16L2qj4cLiLozpYqba3C79pWioy6FA==",
+      "dependencies": {
+        "@types/lodash.mergewith": "4.6.6",
+        "css-box-model": "1.2.1",
+        "framesync": "5.3.0",
+        "lodash.mergewith": "4.6.2"
+      }
+    },
     "node_modules/@chakra-ui/textarea": {
-      "version": "1.2.3",
-      "resolved": "https://registry.npmjs.org/@chakra-ui/textarea/-/textarea-1.2.3.tgz",
-      "integrity": "sha512-yLObhuSnIX11GyjsiEIC2gFTDtUoGSpHUqHRD8nF9BmuePHqFzG3jdkBrFMd09u0Ee6kr6o0tia6g9Wt29TyQQ==",
+      "version": "1.2.9",
+      "resolved": "https://registry.npmjs.org/@chakra-ui/textarea/-/textarea-1.2.9.tgz",
+      "integrity": "sha512-HHeUdBA2JrH/S4PopcpOjRmBWKv4wpxQ+Q4mD03UBznyFARZe3XFJOnxhAPdpB/ZadbdgiyXK27TR0uzaqlONw==",
       "dependencies": {
-        "@chakra-ui/form-control": "1.5.3",
-        "@chakra-ui/utils": "1.9.1"
+        "@chakra-ui/form-control": "1.5.9",
+        "@chakra-ui/utils": "1.10.4"
       },
       "peerDependencies": {
         "@chakra-ui/system": ">=1.0.0",
         "react": ">=16.8.6"
       }
     },
+    "node_modules/@chakra-ui/textarea/node_modules/@chakra-ui/utils": {
+      "version": "1.10.4",
+      "resolved": "https://registry.npmjs.org/@chakra-ui/utils/-/utils-1.10.4.tgz",
+      "integrity": "sha512-AM91VQQxw8F4F1WDA28mqKY6NFIOuzc2Ekkna88imy2OiqqmYH0xkq8J16L2qj4cLiLozpYqba3C79pWioy6FA==",
+      "dependencies": {
+        "@types/lodash.mergewith": "4.6.6",
+        "css-box-model": "1.2.1",
+        "framesync": "5.3.0",
+        "lodash.mergewith": "4.6.2"
+      }
+    },
     "node_modules/@chakra-ui/theme": {
-      "version": "1.12.3",
-      "resolved": "https://registry.npmjs.org/@chakra-ui/theme/-/theme-1.12.3.tgz",
-      "integrity": "sha512-aqMGSfQLYOrcWBKaD5GuVYrpI5Zoq4Gt3D9P+drB/CDTRgBLWuJI1rbKOSSSJUK4RNZ0WbakPwz6wXiVS3vVdQ==",
+      "version": "1.14.0",
+      "resolved": "https://registry.npmjs.org/@chakra-ui/theme/-/theme-1.14.0.tgz",
+      "integrity": "sha512-zKy/8JSbiCP0QeBsLzdub7aBnfX2k0qp5vD+RA+mxPEiykEvPGg+TwryxRM5KMZK1Zdgg95aH+9mwiGe9tJt3A==",
       "dependencies": {
-        "@chakra-ui/anatomy": "1.2.1",
-        "@chakra-ui/theme-tools": "1.3.1",
-        "@chakra-ui/utils": "1.9.1"
+        "@chakra-ui/anatomy": "1.3.0",
+        "@chakra-ui/theme-tools": "1.3.6",
+        "@chakra-ui/utils": "1.10.4"
       },
       "peerDependencies": {
         "@chakra-ui/system": ">=1.0.0"
       }
     },
     "node_modules/@chakra-ui/theme-tools": {
-      "version": "1.3.1",
-      "resolved": "https://registry.npmjs.org/@chakra-ui/theme-tools/-/theme-tools-1.3.1.tgz",
-      "integrity": "sha512-D8arJ5uFGuYZrrFGpXqgov8FhsJYWRyar5oBZY5TJR9gsVYBlJ8Ai91pwM/NflCFqzerTOgyt7bNSGQMdZ8ghA==",
+      "version": "1.3.6",
+      "resolved": "https://registry.npmjs.org/@chakra-ui/theme-tools/-/theme-tools-1.3.6.tgz",
+      "integrity": "sha512-Wxz3XSJhPCU6OwCHEyH44EegEDQHwvlsx+KDkUDGevOjUU88YuNqOVkKtgTpgMLNQcsrYZ93oPWZUJqqCVNRew==",
       "dependencies": {
-        "@chakra-ui/utils": "1.9.1",
+        "@chakra-ui/utils": "1.10.4",
         "@ctrl/tinycolor": "^3.4.0"
       },
       "peerDependencies": {
         "@chakra-ui/system": ">=1.0.0"
       }
     },
+    "node_modules/@chakra-ui/theme-tools/node_modules/@chakra-ui/utils": {
+      "version": "1.10.4",
+      "resolved": "https://registry.npmjs.org/@chakra-ui/utils/-/utils-1.10.4.tgz",
+      "integrity": "sha512-AM91VQQxw8F4F1WDA28mqKY6NFIOuzc2Ekkna88imy2OiqqmYH0xkq8J16L2qj4cLiLozpYqba3C79pWioy6FA==",
+      "dependencies": {
+        "@types/lodash.mergewith": "4.6.6",
+        "css-box-model": "1.2.1",
+        "framesync": "5.3.0",
+        "lodash.mergewith": "4.6.2"
+      }
+    },
+    "node_modules/@chakra-ui/theme/node_modules/@chakra-ui/utils": {
+      "version": "1.10.4",
+      "resolved": "https://registry.npmjs.org/@chakra-ui/utils/-/utils-1.10.4.tgz",
+      "integrity": "sha512-AM91VQQxw8F4F1WDA28mqKY6NFIOuzc2Ekkna88imy2OiqqmYH0xkq8J16L2qj4cLiLozpYqba3C79pWioy6FA==",
+      "dependencies": {
+        "@types/lodash.mergewith": "4.6.6",
+        "css-box-model": "1.2.1",
+        "framesync": "5.3.0",
+        "lodash.mergewith": "4.6.2"
+      }
+    },
     "node_modules/@chakra-ui/toast": {
-      "version": "1.5.1",
-      "resolved": "https://registry.npmjs.org/@chakra-ui/toast/-/toast-1.5.1.tgz",
-      "integrity": "sha512-cynOM/mGqf/dPulYOQMcpQnbf8pQWV2SEz1ymW1Nni1hh6zCqW6+pI+YeMxeadJLAwohnRumwzLsRiSL4l+YRQ==",
-      "dependencies": {
-        "@chakra-ui/alert": "1.3.2",
-        "@chakra-ui/close-button": "1.2.2",
-        "@chakra-ui/hooks": "1.7.2",
-        "@chakra-ui/theme": "1.12.3",
-        "@chakra-ui/transition": "1.4.2",
-        "@chakra-ui/utils": "1.9.1",
+      "version": "1.5.7",
+      "resolved": "https://registry.npmjs.org/@chakra-ui/toast/-/toast-1.5.7.tgz",
+      "integrity": "sha512-vM88vX2jTfSwOXWqcj9o9pm+msojJS0cG0Pe/wSuYP+D274SdE8oB2OFqJyijsQ7WQq/P6BIlgquzUcS4smu9A==",
+      "dependencies": {
+        "@chakra-ui/alert": "1.3.7",
+        "@chakra-ui/close-button": "1.2.7",
+        "@chakra-ui/hooks": "1.8.5",
+        "@chakra-ui/theme": "1.14.0",
+        "@chakra-ui/transition": "1.4.7",
+        "@chakra-ui/utils": "1.10.4",
         "@reach/alert": "0.13.2"
       },
       "peerDependencies": {
         "@chakra-ui/system": ">=1.0.0",
-        "framer-motion": "3.x || 4.x || 5.x",
+        "framer-motion": "3.x || 4.x || 5.x || 6.x",
         "react": ">=16.8.6",
         "react-dom": ">=16.8.6"
       }
     },
+    "node_modules/@chakra-ui/toast/node_modules/@chakra-ui/utils": {
+      "version": "1.10.4",
+      "resolved": "https://registry.npmjs.org/@chakra-ui/utils/-/utils-1.10.4.tgz",
+      "integrity": "sha512-AM91VQQxw8F4F1WDA28mqKY6NFIOuzc2Ekkna88imy2OiqqmYH0xkq8J16L2qj4cLiLozpYqba3C79pWioy6FA==",
+      "dependencies": {
+        "@types/lodash.mergewith": "4.6.6",
+        "css-box-model": "1.2.1",
+        "framesync": "5.3.0",
+        "lodash.mergewith": "4.6.2"
+      }
+    },
     "node_modules/@chakra-ui/tooltip": {
-      "version": "1.4.3",
-      "resolved": "https://registry.npmjs.org/@chakra-ui/tooltip/-/tooltip-1.4.3.tgz",
-      "integrity": "sha512-d+JsT65LPYFoGEfmqvqa3xDzW1enBdAHns3GYoHnie92pLseMKQYJsITO5SmwNGnEiOHbJ8pkB/hggo+xHKkpg==",
+      "version": "1.4.9",
+      "resolved": "https://registry.npmjs.org/@chakra-ui/tooltip/-/tooltip-1.4.9.tgz",
+      "integrity": "sha512-W1GVMFWkLLBfiFsOddhr7oWr2rTKqSy2xxMkR5MuomNaqORW4tvjN/wNSLMUuUHVxtWM+iRQkslE5r6k5/1HAw==",
       "dependencies": {
-        "@chakra-ui/hooks": "1.7.2",
-        "@chakra-ui/popper": "2.4.1",
-        "@chakra-ui/portal": "1.3.2",
-        "@chakra-ui/react-utils": "1.2.1",
-        "@chakra-ui/utils": "1.9.1",
-        "@chakra-ui/visually-hidden": "1.1.1"
+        "@chakra-ui/hooks": "1.8.5",
+        "@chakra-ui/popper": "2.4.3",
+        "@chakra-ui/portal": "1.3.8",
+        "@chakra-ui/react-utils": "1.2.3",
+        "@chakra-ui/utils": "1.10.4",
+        "@chakra-ui/visually-hidden": "1.1.6"
       },
       "peerDependencies": {
         "@chakra-ui/system": ">=1.0.0",
-        "framer-motion": "3.x || 4.x || 5.x",
+        "framer-motion": "3.x || 4.x || 5.x || 6.x",
         "react": ">=16.8.6",
         "react-dom": ">=16.8.6"
       }
     },
+    "node_modules/@chakra-ui/tooltip/node_modules/@chakra-ui/utils": {
+      "version": "1.10.4",
+      "resolved": "https://registry.npmjs.org/@chakra-ui/utils/-/utils-1.10.4.tgz",
+      "integrity": "sha512-AM91VQQxw8F4F1WDA28mqKY6NFIOuzc2Ekkna88imy2OiqqmYH0xkq8J16L2qj4cLiLozpYqba3C79pWioy6FA==",
+      "dependencies": {
+        "@types/lodash.mergewith": "4.6.6",
+        "css-box-model": "1.2.1",
+        "framesync": "5.3.0",
+        "lodash.mergewith": "4.6.2"
+      }
+    },
     "node_modules/@chakra-ui/transition": {
-      "version": "1.4.2",
-      "resolved": "https://registry.npmjs.org/@chakra-ui/transition/-/transition-1.4.2.tgz",
-      "integrity": "sha512-S+BNmpErHlntl//uaqv0sJegzMsQms0OnJapeZaRsvZL4s1SVYrR8kMrXigkdpeh4lAUqGsLpQHPKkzaKGbBOw==",
+      "version": "1.4.7",
+      "resolved": "https://registry.npmjs.org/@chakra-ui/transition/-/transition-1.4.7.tgz",
+      "integrity": "sha512-2sbMoKB/enp6Qbte3DD6zwBHyO4YAUSgvSr3wn7DAy4hz9kRZHPuUf/N+i9QZ0whL2koXLgdZvV6RNtSTShq4g==",
       "dependencies": {
-        "@chakra-ui/utils": "1.9.1"
+        "@chakra-ui/utils": "1.10.4"
       },
       "peerDependencies": {
-        "framer-motion": "3.x || 4.x || 5.x",
+        "framer-motion": "3.x || 4.x || 5.x || 6.x",
         "react": ">=16.8.6"
       }
     },
+    "node_modules/@chakra-ui/transition/node_modules/@chakra-ui/utils": {
+      "version": "1.10.4",
+      "resolved": "https://registry.npmjs.org/@chakra-ui/utils/-/utils-1.10.4.tgz",
+      "integrity": "sha512-AM91VQQxw8F4F1WDA28mqKY6NFIOuzc2Ekkna88imy2OiqqmYH0xkq8J16L2qj4cLiLozpYqba3C79pWioy6FA==",
+      "dependencies": {
+        "@types/lodash.mergewith": "4.6.6",
+        "css-box-model": "1.2.1",
+        "framesync": "5.3.0",
+        "lodash.mergewith": "4.6.2"
+      }
+    },
     "node_modules/@chakra-ui/utils": {
       "version": "1.9.1",
       "resolved": "https://registry.npmjs.org/@chakra-ui/utils/-/utils-1.9.1.tgz",
@@ -2688,17 +3236,28 @@
       }
     },
     "node_modules/@chakra-ui/visually-hidden": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/@chakra-ui/visually-hidden/-/visually-hidden-1.1.1.tgz",
-      "integrity": "sha512-AGK9YBQS2FW/1e5tfivS8VVXn8y2uTyJ9ACOnGiLm9FNdth9pR0fGil9axlcmhZpEYcSRlnCuma3nkqaCjJnAA==",
+      "version": "1.1.6",
+      "resolved": "https://registry.npmjs.org/@chakra-ui/visually-hidden/-/visually-hidden-1.1.6.tgz",
+      "integrity": "sha512-Xzy5bA0UA+IyMgwJizQYSEdgz8cC/tHdmFB3CniXzmpKTSK8mJddeEBl+cGbXHBzxEUhH7xF1eaS41O+0ezWEQ==",
       "dependencies": {
-        "@chakra-ui/utils": "1.9.1"
+        "@chakra-ui/utils": "1.10.4"
       },
       "peerDependencies": {
         "@chakra-ui/system": ">=1.0.0",
         "react": ">=16.8.6"
       }
     },
+    "node_modules/@chakra-ui/visually-hidden/node_modules/@chakra-ui/utils": {
+      "version": "1.10.4",
+      "resolved": "https://registry.npmjs.org/@chakra-ui/utils/-/utils-1.10.4.tgz",
+      "integrity": "sha512-AM91VQQxw8F4F1WDA28mqKY6NFIOuzc2Ekkna88imy2OiqqmYH0xkq8J16L2qj4cLiLozpYqba3C79pWioy6FA==",
+      "dependencies": {
+        "@types/lodash.mergewith": "4.6.6",
+        "css-box-model": "1.2.1",
+        "framesync": "5.3.0",
+        "lodash.mergewith": "4.6.2"
+      }
+    },
     "node_modules/@ctrl/tinycolor": {
       "version": "3.4.0",
       "resolved": "https://registry.npmjs.org/@ctrl/tinycolor/-/tinycolor-3.4.0.tgz",
@@ -4592,9 +5151,9 @@
       "dev": true
     },
     "node_modules/@popperjs/core": {
-      "version": "2.11.2",
-      "resolved": "https://registry.npmjs.org/@popperjs/core/-/core-2.11.2.tgz",
-      "integrity": "sha512-92FRmppjjqz29VMJ2dn+xdyXZBrMlE42AV6Kq6BwjWV7CNUW1hs2FtxSNLQE+gJhaZ6AAmYuO9y8dshhcBl7vA==",
+      "version": "2.11.4",
+      "resolved": "https://registry.npmjs.org/@popperjs/core/-/core-2.11.4.tgz",
+      "integrity": "sha512-q/ytXxO5NKvyT37pmisQAItCFqA7FD/vNb8dgaJy3/630Fsc+Mz9/9f2SziBoIZ30TJooXyTwZmhi1zjXmObYg==",
       "funding": {
         "type": "opencollective",
         "url": "https://opencollective.com/popperjs"
@@ -15249,11 +15808,11 @@
     },
     "node_modules/rari-components": {
       "version": "0.0.1",
-      "resolved": "git+ssh://git@github.com/Rari-Capital/rari-components.git#428603bcc0f0c7f4414e06d5b72353e91a343dd0",
-      "integrity": "sha512-lwRIRDGp0VzI0KGqSnDqGOCMmvYuvQqJfFkNOtGoZS69E10cA4ThrfuzqXSHpAgBp/tiRwI/KX+xV+g4BvlLBw==",
+      "resolved": "git+ssh://git@github.com/Rari-Capital/rari-components.git#69cab37898e8f467cfc9c8bd24267d2d62c5e087",
+      "integrity": "sha512-+Bd0usOflaGUNhhfkpq6HUVd4ZiLlXxGTcq4S1+zcHzoFbRLlt+U2vm58/viFnWZZIvfdmR1N0ZlAOu/xhvpDw==",
       "peerDependencies": {
         "@chakra-ui/icons": "1.x",
-        "@chakra-ui/react": "1.x",
+        "@chakra-ui/react": "^1.8",
         "@emotion/react": "^11.0.0",
         "@emotion/styled": "^11.0.0",
         "ethers": "5.x",
@@ -20857,215 +21416,403 @@
       }
     },
     "@chakra-ui/accordion": {
-      "version": "1.4.3",
-      "resolved": "https://registry.npmjs.org/@chakra-ui/accordion/-/accordion-1.4.3.tgz",
-      "integrity": "sha512-UKpi7xd+hcT/OIDRBRT4vkvVmpym5K9tf3tPyPdwpJcCfCd0D8dvmgZWBM4vCCRPCNfuoyxba5z97witzLCf+g==",
-      "requires": {
-        "@chakra-ui/descendant": "2.1.1",
-        "@chakra-ui/hooks": "1.7.2",
-        "@chakra-ui/icon": "2.0.0",
-        "@chakra-ui/react-utils": "1.2.1",
-        "@chakra-ui/transition": "1.4.2",
-        "@chakra-ui/utils": "1.9.1"
+      "version": "1.4.9",
+      "resolved": "https://registry.npmjs.org/@chakra-ui/accordion/-/accordion-1.4.9.tgz",
+      "integrity": "sha512-ZrfrLwAu6p9B41sZ+iEWjfPW/mn2TdUDXv165qr1O355619e2Btjb01x3IYoN4GlE2iF7GOVjC5uYGNyLpBlZg==",
+      "requires": {
+        "@chakra-ui/descendant": "2.1.3",
+        "@chakra-ui/hooks": "1.8.5",
+        "@chakra-ui/icon": "2.0.5",
+        "@chakra-ui/react-utils": "1.2.3",
+        "@chakra-ui/transition": "1.4.7",
+        "@chakra-ui/utils": "1.10.4"
       },
       "dependencies": {
         "@chakra-ui/icon": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/@chakra-ui/icon/-/icon-2.0.0.tgz",
-          "integrity": "sha512-/GuU+xIcOIy9uSUUUCu249ZJB/nLDbjWGkfpoSdBwqT4+ytJrKt+0Ckh3Ub14sz3BJD+Z6IiIt6ySOA9+7lbsA==",
+          "version": "2.0.5",
+          "resolved": "https://registry.npmjs.org/@chakra-ui/icon/-/icon-2.0.5.tgz",
+          "integrity": "sha512-ZrqRvCCIxGr4qFd/r1pmtd9tobRmv8KAxV7ygFoc/t4vOSKTcVIjhE12gsI3FzgvXM15ZFVwsxa1zodwgo5neQ==",
+          "requires": {
+            "@chakra-ui/utils": "1.10.4"
+          }
+        },
+        "@chakra-ui/utils": {
+          "version": "1.10.4",
+          "resolved": "https://registry.npmjs.org/@chakra-ui/utils/-/utils-1.10.4.tgz",
+          "integrity": "sha512-AM91VQQxw8F4F1WDA28mqKY6NFIOuzc2Ekkna88imy2OiqqmYH0xkq8J16L2qj4cLiLozpYqba3C79pWioy6FA==",
           "requires": {
-            "@chakra-ui/utils": "1.9.1"
+            "@types/lodash.mergewith": "4.6.6",
+            "css-box-model": "1.2.1",
+            "framesync": "5.3.0",
+            "lodash.mergewith": "4.6.2"
           }
         }
       }
     },
     "@chakra-ui/alert": {
-      "version": "1.3.2",
-      "resolved": "https://registry.npmjs.org/@chakra-ui/alert/-/alert-1.3.2.tgz",
-      "integrity": "sha512-+OMeVeGtydpj6nry0zH7qFDt36zEaxckRnufx1BGiCfWdUg6ahVwKXl8qX93Q8w82od7eAoBKMgGJz7IVL5NPw==",
+      "version": "1.3.7",
+      "resolved": "https://registry.npmjs.org/@chakra-ui/alert/-/alert-1.3.7.tgz",
+      "integrity": "sha512-fFpJYBpHOIK/BX4BVl/xafYiDBUW+Bq/gUYDOo4iAiO4vHgxo74oa+yOwSRNlNjAgIX7pi2ridsYQALKyWyxxQ==",
       "requires": {
-        "@chakra-ui/icon": "2.0.0",
-        "@chakra-ui/react-utils": "1.2.1",
-        "@chakra-ui/utils": "1.9.1"
+        "@chakra-ui/icon": "2.0.5",
+        "@chakra-ui/react-utils": "1.2.3",
+        "@chakra-ui/utils": "1.10.4"
       },
       "dependencies": {
         "@chakra-ui/icon": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/@chakra-ui/icon/-/icon-2.0.0.tgz",
-          "integrity": "sha512-/GuU+xIcOIy9uSUUUCu249ZJB/nLDbjWGkfpoSdBwqT4+ytJrKt+0Ckh3Ub14sz3BJD+Z6IiIt6ySOA9+7lbsA==",
+          "version": "2.0.5",
+          "resolved": "https://registry.npmjs.org/@chakra-ui/icon/-/icon-2.0.5.tgz",
+          "integrity": "sha512-ZrqRvCCIxGr4qFd/r1pmtd9tobRmv8KAxV7ygFoc/t4vOSKTcVIjhE12gsI3FzgvXM15ZFVwsxa1zodwgo5neQ==",
+          "requires": {
+            "@chakra-ui/utils": "1.10.4"
+          }
+        },
+        "@chakra-ui/utils": {
+          "version": "1.10.4",
+          "resolved": "https://registry.npmjs.org/@chakra-ui/utils/-/utils-1.10.4.tgz",
+          "integrity": "sha512-AM91VQQxw8F4F1WDA28mqKY6NFIOuzc2Ekkna88imy2OiqqmYH0xkq8J16L2qj4cLiLozpYqba3C79pWioy6FA==",
           "requires": {
-            "@chakra-ui/utils": "1.9.1"
+            "@types/lodash.mergewith": "4.6.6",
+            "css-box-model": "1.2.1",
+            "framesync": "5.3.0",
+            "lodash.mergewith": "4.6.2"
           }
         }
       }
     },
     "@chakra-ui/anatomy": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/@chakra-ui/anatomy/-/anatomy-1.2.1.tgz",
-      "integrity": "sha512-kNS+FiEDTSnwpQUW4dEjZ5745xhkvB0XtmqjY1wpclUSpFfptLZM9QIHPTnBt2bzM9R+idmRRP+WkTt6kyTrLw==",
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/@chakra-ui/anatomy/-/anatomy-1.3.0.tgz",
+      "integrity": "sha512-vj/lcHkCuq/dtbl69DkNsftZTnrGEegB90ODs1B6rxw8iVMdDSYkthPPFAkqzNs4ppv1y2IBjELuVzpeta1OHA==",
       "requires": {
-        "@chakra-ui/theme-tools": "^1.3.1"
+        "@chakra-ui/theme-tools": "^1.3.6"
       }
     },
     "@chakra-ui/avatar": {
-      "version": "1.3.2",
-      "resolved": "https://registry.npmjs.org/@chakra-ui/avatar/-/avatar-1.3.2.tgz",
-      "integrity": "sha512-Z4CQI2haksy0YIV1gKa967P94WZUVzlMN+Wgs8PJJoxxmeY6tVruuvp5+Zb5D5kSAmQBvGWxlgJjClKXzeCQ7A==",
+      "version": "1.3.9",
+      "resolved": "https://registry.npmjs.org/@chakra-ui/avatar/-/avatar-1.3.9.tgz",
+      "integrity": "sha512-QhtVuFRXhV7X5iMCHI1lXOA0U2hJnpKC9uIEB80EkBuNYJDEz/y8ViOQPRivMVU//wymwLcbvjDCZd1urMjVYQ==",
       "requires": {
-        "@chakra-ui/image": "1.1.2",
-        "@chakra-ui/react-utils": "1.2.1",
-        "@chakra-ui/utils": "1.9.1"
+        "@chakra-ui/image": "1.1.8",
+        "@chakra-ui/react-utils": "1.2.3",
+        "@chakra-ui/utils": "1.10.4"
+      },
+      "dependencies": {
+        "@chakra-ui/utils": {
+          "version": "1.10.4",
+          "resolved": "https://registry.npmjs.org/@chakra-ui/utils/-/utils-1.10.4.tgz",
+          "integrity": "sha512-AM91VQQxw8F4F1WDA28mqKY6NFIOuzc2Ekkna88imy2OiqqmYH0xkq8J16L2qj4cLiLozpYqba3C79pWioy6FA==",
+          "requires": {
+            "@types/lodash.mergewith": "4.6.6",
+            "css-box-model": "1.2.1",
+            "framesync": "5.3.0",
+            "lodash.mergewith": "4.6.2"
+          }
+        }
       }
     },
     "@chakra-ui/breadcrumb": {
-      "version": "1.3.1",
-      "resolved": "https://registry.npmjs.org/@chakra-ui/breadcrumb/-/breadcrumb-1.3.1.tgz",
-      "integrity": "sha512-b1IoBmtr5FcP2fn5NRbdOdQo2c866OQ/WhcTcZ6UKae1jjik+36/qWE+X+RKzxC6FLfqo5qayV5zSgsnZym7Pg==",
+      "version": "1.3.6",
+      "resolved": "https://registry.npmjs.org/@chakra-ui/breadcrumb/-/breadcrumb-1.3.6.tgz",
+      "integrity": "sha512-iXxienBO6RUnJEcDvyDWyRt+mzPyl7/b6N8i0vrjGKGLpgtayJFvIdo33tFcvx6TCy7V9hiE3HTtZnNomWdR6A==",
       "requires": {
-        "@chakra-ui/react-utils": "1.2.1",
-        "@chakra-ui/utils": "1.9.1"
+        "@chakra-ui/react-utils": "1.2.3",
+        "@chakra-ui/utils": "1.10.4"
+      },
+      "dependencies": {
+        "@chakra-ui/utils": {
+          "version": "1.10.4",
+          "resolved": "https://registry.npmjs.org/@chakra-ui/utils/-/utils-1.10.4.tgz",
+          "integrity": "sha512-AM91VQQxw8F4F1WDA28mqKY6NFIOuzc2Ekkna88imy2OiqqmYH0xkq8J16L2qj4cLiLozpYqba3C79pWioy6FA==",
+          "requires": {
+            "@types/lodash.mergewith": "4.6.6",
+            "css-box-model": "1.2.1",
+            "framesync": "5.3.0",
+            "lodash.mergewith": "4.6.2"
+          }
+        }
       }
     },
     "@chakra-ui/button": {
-      "version": "1.5.2",
-      "resolved": "https://registry.npmjs.org/@chakra-ui/button/-/button-1.5.2.tgz",
-      "integrity": "sha512-1LyZ7o4g+ZF0Qfwr77Fa3qHtCGhghoIPG2lcUWhhPk+8ygHNF0ZOngfsiDD7aoEj0uXsvlgZ/hdiqv0PmMTRzg==",
+      "version": "1.5.8",
+      "resolved": "https://registry.npmjs.org/@chakra-ui/button/-/button-1.5.8.tgz",
+      "integrity": "sha512-harZywey/6OclxIB5p/Ge/coeGKZWoqmu7JjXlbwTUd3U9IQiOVo/zekY1JscCSz2oZoVBCvoKZVt3on5dPwmA==",
       "requires": {
-        "@chakra-ui/hooks": "1.7.2",
-        "@chakra-ui/react-utils": "1.2.1",
-        "@chakra-ui/spinner": "1.2.1",
-        "@chakra-ui/utils": "1.9.1"
+        "@chakra-ui/hooks": "1.8.5",
+        "@chakra-ui/react-utils": "1.2.3",
+        "@chakra-ui/spinner": "1.2.6",
+        "@chakra-ui/utils": "1.10.4"
+      },
+      "dependencies": {
+        "@chakra-ui/utils": {
+          "version": "1.10.4",
+          "resolved": "https://registry.npmjs.org/@chakra-ui/utils/-/utils-1.10.4.tgz",
+          "integrity": "sha512-AM91VQQxw8F4F1WDA28mqKY6NFIOuzc2Ekkna88imy2OiqqmYH0xkq8J16L2qj4cLiLozpYqba3C79pWioy6FA==",
+          "requires": {
+            "@types/lodash.mergewith": "4.6.6",
+            "css-box-model": "1.2.1",
+            "framesync": "5.3.0",
+            "lodash.mergewith": "4.6.2"
+          }
+        }
       }
     },
     "@chakra-ui/checkbox": {
-      "version": "1.6.2",
-      "resolved": "https://registry.npmjs.org/@chakra-ui/checkbox/-/checkbox-1.6.2.tgz",
-      "integrity": "sha512-eu4MeKWqwFc3zakjMnUi1pGXQ17HzeWbvQHwEZCYgIDk+S9DXopQr8o38zaHzs/MHmlelCzM96IBgTWZXWR/eg==",
+      "version": "1.6.8",
+      "resolved": "https://registry.npmjs.org/@chakra-ui/checkbox/-/checkbox-1.6.8.tgz",
+      "integrity": "sha512-CYmJbMA9BXb6ArKmXIAuQ22aQ97HgtslbJlqRKsV/FmZuk1DXF1dcVXzqeInhe5HacQ8z/+SmSqL9Q3fjswKag==",
       "requires": {
-        "@chakra-ui/hooks": "1.7.2",
-        "@chakra-ui/react-utils": "1.2.1",
-        "@chakra-ui/utils": "1.9.1",
-        "@chakra-ui/visually-hidden": "1.1.1"
+        "@chakra-ui/form-control": "1.5.9",
+        "@chakra-ui/hooks": "1.8.5",
+        "@chakra-ui/react-utils": "1.2.3",
+        "@chakra-ui/utils": "1.10.4",
+        "@chakra-ui/visually-hidden": "1.1.6"
+      },
+      "dependencies": {
+        "@chakra-ui/utils": {
+          "version": "1.10.4",
+          "resolved": "https://registry.npmjs.org/@chakra-ui/utils/-/utils-1.10.4.tgz",
+          "integrity": "sha512-AM91VQQxw8F4F1WDA28mqKY6NFIOuzc2Ekkna88imy2OiqqmYH0xkq8J16L2qj4cLiLozpYqba3C79pWioy6FA==",
+          "requires": {
+            "@types/lodash.mergewith": "4.6.6",
+            "css-box-model": "1.2.1",
+            "framesync": "5.3.0",
+            "lodash.mergewith": "4.6.2"
+          }
+        }
       }
     },
     "@chakra-ui/clickable": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/@chakra-ui/clickable/-/clickable-1.2.1.tgz",
-      "integrity": "sha512-B0CIbKzDMwzG1APeTpW9H2Jl8dkarI1Qstb3hDOy23O+N5TU6lpDdVnXQ7fpFJS6mu5JjFqtkwzGAVZnkkv1rw==",
+      "version": "1.2.6",
+      "resolved": "https://registry.npmjs.org/@chakra-ui/clickable/-/clickable-1.2.6.tgz",
+      "integrity": "sha512-89SsrQwwwAadcl/bN8nZqqaaVhVNFdBXqQnxVy1t07DL5ezubmNb5SgFh9LDznkm9YYPQhaGr3W6HFro7iAHMg==",
       "requires": {
-        "@chakra-ui/react-utils": "1.2.1",
-        "@chakra-ui/utils": "1.9.1"
+        "@chakra-ui/react-utils": "1.2.3",
+        "@chakra-ui/utils": "1.10.4"
+      },
+      "dependencies": {
+        "@chakra-ui/utils": {
+          "version": "1.10.4",
+          "resolved": "https://registry.npmjs.org/@chakra-ui/utils/-/utils-1.10.4.tgz",
+          "integrity": "sha512-AM91VQQxw8F4F1WDA28mqKY6NFIOuzc2Ekkna88imy2OiqqmYH0xkq8J16L2qj4cLiLozpYqba3C79pWioy6FA==",
+          "requires": {
+            "@types/lodash.mergewith": "4.6.6",
+            "css-box-model": "1.2.1",
+            "framesync": "5.3.0",
+            "lodash.mergewith": "4.6.2"
+          }
+        }
       }
     },
     "@chakra-ui/close-button": {
-      "version": "1.2.2",
-      "resolved": "https://registry.npmjs.org/@chakra-ui/close-button/-/close-button-1.2.2.tgz",
-      "integrity": "sha512-SqeLib0qgMjK3OsO1g5OnAHUmdCC8GMjToNEea7TeSrA44bH9EXVhFTkMMu2PnDVHbQmi4Ee1cuulNJt0UhQ3g==",
+      "version": "1.2.7",
+      "resolved": "https://registry.npmjs.org/@chakra-ui/close-button/-/close-button-1.2.7.tgz",
+      "integrity": "sha512-cYTxfgrIlPU4IZm1sehZXxx/TNQBk9c3LBPvTpywEM8GVRGINh4YLq8WiMaPtO+TDNBnKoWS/jS4IHnR+abADw==",
       "requires": {
-        "@chakra-ui/icon": "2.0.0",
-        "@chakra-ui/utils": "1.9.1"
+        "@chakra-ui/icon": "2.0.5",
+        "@chakra-ui/utils": "1.10.4"
       },
       "dependencies": {
         "@chakra-ui/icon": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/@chakra-ui/icon/-/icon-2.0.0.tgz",
-          "integrity": "sha512-/GuU+xIcOIy9uSUUUCu249ZJB/nLDbjWGkfpoSdBwqT4+ytJrKt+0Ckh3Ub14sz3BJD+Z6IiIt6ySOA9+7lbsA==",
+          "version": "2.0.5",
+          "resolved": "https://registry.npmjs.org/@chakra-ui/icon/-/icon-2.0.5.tgz",
+          "integrity": "sha512-ZrqRvCCIxGr4qFd/r1pmtd9tobRmv8KAxV7ygFoc/t4vOSKTcVIjhE12gsI3FzgvXM15ZFVwsxa1zodwgo5neQ==",
           "requires": {
-            "@chakra-ui/utils": "1.9.1"
+            "@chakra-ui/utils": "1.10.4"
+          }
+        },
+        "@chakra-ui/utils": {
+          "version": "1.10.4",
+          "resolved": "https://registry.npmjs.org/@chakra-ui/utils/-/utils-1.10.4.tgz",
+          "integrity": "sha512-AM91VQQxw8F4F1WDA28mqKY6NFIOuzc2Ekkna88imy2OiqqmYH0xkq8J16L2qj4cLiLozpYqba3C79pWioy6FA==",
+          "requires": {
+            "@types/lodash.mergewith": "4.6.6",
+            "css-box-model": "1.2.1",
+            "framesync": "5.3.0",
+            "lodash.mergewith": "4.6.2"
           }
         }
       }
     },
     "@chakra-ui/color-mode": {
-      "version": "1.3.3",
-      "resolved": "https://registry.npmjs.org/@chakra-ui/color-mode/-/color-mode-1.3.3.tgz",
-      "integrity": "sha512-vEMG9PRtVllAxbJE76bM4fRdo+hRZsPX/9cO+gR1YegYQNeobbV9Ive/MKNYQzdlbQ855Ytn6cPGr2hzy9MdRg==",
+      "version": "1.4.6",
+      "resolved": "https://registry.npmjs.org/@chakra-ui/color-mode/-/color-mode-1.4.6.tgz",
+      "integrity": "sha512-gCO8Z/jv68jXop94MUQNzigl7JXICAgZQUUqLaKhdy1h2zatVDIPFfjwwjnsgM97G0BxQaNBOC87+PD2UYjzHw==",
       "requires": {
-        "@chakra-ui/hooks": "1.7.2",
-        "@chakra-ui/react-env": "1.1.1",
-        "@chakra-ui/utils": "1.9.1"
+        "@chakra-ui/hooks": "1.8.5",
+        "@chakra-ui/react-env": "1.1.6",
+        "@chakra-ui/utils": "1.10.4"
+      },
+      "dependencies": {
+        "@chakra-ui/utils": {
+          "version": "1.10.4",
+          "resolved": "https://registry.npmjs.org/@chakra-ui/utils/-/utils-1.10.4.tgz",
+          "integrity": "sha512-AM91VQQxw8F4F1WDA28mqKY6NFIOuzc2Ekkna88imy2OiqqmYH0xkq8J16L2qj4cLiLozpYqba3C79pWioy6FA==",
+          "requires": {
+            "@types/lodash.mergewith": "4.6.6",
+            "css-box-model": "1.2.1",
+            "framesync": "5.3.0",
+            "lodash.mergewith": "4.6.2"
+          }
+        }
       }
     },
     "@chakra-ui/control-box": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/@chakra-ui/control-box/-/control-box-1.1.1.tgz",
-      "integrity": "sha512-ZFbh85pzzZoiSjGnvLUzMB5BoA8Xm6TBMWvMtzLY5xiFGb9/mBeRDH2KFjr1GJzoqleWKkQwvFD6JM0kXcekpg==",
+      "version": "1.1.6",
+      "resolved": "https://registry.npmjs.org/@chakra-ui/control-box/-/control-box-1.1.6.tgz",
+      "integrity": "sha512-EUcq5f854puG6ZA6wAWl4107OPl8+bj4MMHJCa48BB0qec0U8HCEtxQGnFwJmaYLalIAjMfHuY3OwO2A3Hi9hA==",
       "requires": {
-        "@chakra-ui/utils": "1.9.1"
+        "@chakra-ui/utils": "1.10.4"
+      },
+      "dependencies": {
+        "@chakra-ui/utils": {
+          "version": "1.10.4",
+          "resolved": "https://registry.npmjs.org/@chakra-ui/utils/-/utils-1.10.4.tgz",
+          "integrity": "sha512-AM91VQQxw8F4F1WDA28mqKY6NFIOuzc2Ekkna88imy2OiqqmYH0xkq8J16L2qj4cLiLozpYqba3C79pWioy6FA==",
+          "requires": {
+            "@types/lodash.mergewith": "4.6.6",
+            "css-box-model": "1.2.1",
+            "framesync": "5.3.0",
+            "lodash.mergewith": "4.6.2"
+          }
+        }
       }
     },
     "@chakra-ui/counter": {
-      "version": "1.2.2",
-      "resolved": "https://registry.npmjs.org/@chakra-ui/counter/-/counter-1.2.2.tgz",
-      "integrity": "sha512-EljrsJYHpR5tZ1UczzlZ7gwKZs3ijF2tKCAAmsTpRerPbwGFvrmhfFfLexgbc0vxmeuZYUVeuiClLXQT4lvd5w==",
+      "version": "1.2.8",
+      "resolved": "https://registry.npmjs.org/@chakra-ui/counter/-/counter-1.2.8.tgz",
+      "integrity": "sha512-lVuK+ycKxEE0G4Jkl8A6GWdXUFAih89KA1IkkhQG6NwqdGzbgouTInwBLg1Sm5uwgQ5QqSr9S42QyDoleUyF0g==",
       "requires": {
-        "@chakra-ui/hooks": "1.7.2",
-        "@chakra-ui/utils": "1.9.1"
+        "@chakra-ui/hooks": "1.8.5",
+        "@chakra-ui/utils": "1.10.4"
+      },
+      "dependencies": {
+        "@chakra-ui/utils": {
+          "version": "1.10.4",
+          "resolved": "https://registry.npmjs.org/@chakra-ui/utils/-/utils-1.10.4.tgz",
+          "integrity": "sha512-AM91VQQxw8F4F1WDA28mqKY6NFIOuzc2Ekkna88imy2OiqqmYH0xkq8J16L2qj4cLiLozpYqba3C79pWioy6FA==",
+          "requires": {
+            "@types/lodash.mergewith": "4.6.6",
+            "css-box-model": "1.2.1",
+            "framesync": "5.3.0",
+            "lodash.mergewith": "4.6.2"
+          }
+        }
       }
     },
     "@chakra-ui/css-reset": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/@chakra-ui/css-reset/-/css-reset-1.1.1.tgz",
-      "integrity": "sha512-+KNNHL4OWqeKia5SL858K3Qbd8WxMij9mWIilBzLD4j2KFrl/+aWFw8syMKth3NmgIibrjsljo+PU3fy2o50dg==",
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/@chakra-ui/css-reset/-/css-reset-1.1.3.tgz",
+      "integrity": "sha512-AgfrE7bRTJvNi/4zIfacI/kBHmHmHEIeQtHwCvk/0qM9V2gK1VM3ctYlnibf7BTh17F/UszweOGRb1lHSPfWjw==",
       "requires": {}
     },
     "@chakra-ui/descendant": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/@chakra-ui/descendant/-/descendant-2.1.1.tgz",
-      "integrity": "sha512-JasdVaN4MjL7QFo1vMnADy6EtFAlPKT1kTJ1LwMtl9AaF9VFLBsfGxm0L+WQK+3NJMuCSDBXWJB8mV4AQ11Edg==",
+      "version": "2.1.3",
+      "resolved": "https://registry.npmjs.org/@chakra-ui/descendant/-/descendant-2.1.3.tgz",
+      "integrity": "sha512-aNYNv99gEPENCdw2N5y3FvL5wgBVcLiOzJ2TxSwb4EVYszbgBZ8Ry1pf7lkoSfysdxD0scgy2cVyxO8TsYTU4g==",
       "requires": {
-        "@chakra-ui/react-utils": "^1.2.1"
+        "@chakra-ui/react-utils": "^1.2.3"
       }
     },
     "@chakra-ui/editable": {
-      "version": "1.3.2",
-      "resolved": "https://registry.npmjs.org/@chakra-ui/editable/-/editable-1.3.2.tgz",
-      "integrity": "sha512-WY0dq+hQOIyMAamFj2fECNb1AtOwxoddAbZ6k4/epiKNkaRA5ENzgPdV6Gw3t02fDXv95D0J4V4XcpNgfCz6TA==",
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/@chakra-ui/editable/-/editable-1.4.0.tgz",
+      "integrity": "sha512-QH5ZMCK/U3pQINtSPiqxxA5XCdiXKBfAI1+siiuSqKtmCriltcArEU4groQn/bm7EY6UJIr/MV3azSDeeBIsaQ==",
       "requires": {
-        "@chakra-ui/hooks": "1.7.2",
-        "@chakra-ui/react-utils": "1.2.1",
-        "@chakra-ui/utils": "1.9.1"
+        "@chakra-ui/hooks": "1.8.5",
+        "@chakra-ui/react-utils": "1.2.3",
+        "@chakra-ui/utils": "1.10.4"
+      },
+      "dependencies": {
+        "@chakra-ui/utils": {
+          "version": "1.10.4",
+          "resolved": "https://registry.npmjs.org/@chakra-ui/utils/-/utils-1.10.4.tgz",
+          "integrity": "sha512-AM91VQQxw8F4F1WDA28mqKY6NFIOuzc2Ekkna88imy2OiqqmYH0xkq8J16L2qj4cLiLozpYqba3C79pWioy6FA==",
+          "requires": {
+            "@types/lodash.mergewith": "4.6.6",
+            "css-box-model": "1.2.1",
+            "framesync": "5.3.0",
+            "lodash.mergewith": "4.6.2"
+          }
+        }
       }
     },
     "@chakra-ui/focus-lock": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/@chakra-ui/focus-lock/-/focus-lock-1.2.1.tgz",
-      "integrity": "sha512-HYu39nvfaXUrBx+dIDJkFgebNCGEi9oZTfLUKzIJC+zPkmReTDSXV0dzSb/8vCAOq5fph1gFKsdbGy2U98P8GQ==",
+      "version": "1.2.6",
+      "resolved": "https://registry.npmjs.org/@chakra-ui/focus-lock/-/focus-lock-1.2.6.tgz",
+      "integrity": "sha512-ZJNE1oNdUM1aGWuCJ+bxFa/d3EwxzfMWzTKzSvKDK50GWoUQQ10xFTT9nY/yFpkcwhBvx1KavxKf44mIhIbSog==",
       "requires": {
-        "@chakra-ui/utils": "1.9.1",
+        "@chakra-ui/utils": "1.10.4",
         "react-focus-lock": "2.5.2"
+      },
+      "dependencies": {
+        "@chakra-ui/utils": {
+          "version": "1.10.4",
+          "resolved": "https://registry.npmjs.org/@chakra-ui/utils/-/utils-1.10.4.tgz",
+          "integrity": "sha512-AM91VQQxw8F4F1WDA28mqKY6NFIOuzc2Ekkna88imy2OiqqmYH0xkq8J16L2qj4cLiLozpYqba3C79pWioy6FA==",
+          "requires": {
+            "@types/lodash.mergewith": "4.6.6",
+            "css-box-model": "1.2.1",
+            "framesync": "5.3.0",
+            "lodash.mergewith": "4.6.2"
+          }
+        }
       }
     },
     "@chakra-ui/form-control": {
-      "version": "1.5.3",
-      "resolved": "https://registry.npmjs.org/@chakra-ui/form-control/-/form-control-1.5.3.tgz",
-      "integrity": "sha512-+UkOJJYUSGVATeNK/2b+KJx3qRGAtqpD1sR2mqd9DhgmJ/JUGV8q4LVcXIcVs/7BYNqP9B0JQUBIDlHNuTwlJA==",
+      "version": "1.5.9",
+      "resolved": "https://registry.npmjs.org/@chakra-ui/form-control/-/form-control-1.5.9.tgz",
+      "integrity": "sha512-JuUB9dHXFqTYm+Z+cOULk56AcrX9y3eaied0j/KGdPwtIjS2kkjulq7A8sJJdsle4M6XleMinjW+1KO2PMExQg==",
       "requires": {
-        "@chakra-ui/hooks": "1.7.2",
-        "@chakra-ui/icon": "2.0.0",
-        "@chakra-ui/react-utils": "1.2.1",
-        "@chakra-ui/utils": "1.9.1"
+        "@chakra-ui/hooks": "1.8.5",
+        "@chakra-ui/icon": "2.0.5",
+        "@chakra-ui/react-utils": "1.2.3",
+        "@chakra-ui/utils": "1.10.4"
       },
       "dependencies": {
         "@chakra-ui/icon": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/@chakra-ui/icon/-/icon-2.0.0.tgz",
-          "integrity": "sha512-/GuU+xIcOIy9uSUUUCu249ZJB/nLDbjWGkfpoSdBwqT4+ytJrKt+0Ckh3Ub14sz3BJD+Z6IiIt6ySOA9+7lbsA==",
+          "version": "2.0.5",
+          "resolved": "https://registry.npmjs.org/@chakra-ui/icon/-/icon-2.0.5.tgz",
+          "integrity": "sha512-ZrqRvCCIxGr4qFd/r1pmtd9tobRmv8KAxV7ygFoc/t4vOSKTcVIjhE12gsI3FzgvXM15ZFVwsxa1zodwgo5neQ==",
+          "requires": {
+            "@chakra-ui/utils": "1.10.4"
+          }
+        },
+        "@chakra-ui/utils": {
+          "version": "1.10.4",
+          "resolved": "https://registry.npmjs.org/@chakra-ui/utils/-/utils-1.10.4.tgz",
+          "integrity": "sha512-AM91VQQxw8F4F1WDA28mqKY6NFIOuzc2Ekkna88imy2OiqqmYH0xkq8J16L2qj4cLiLozpYqba3C79pWioy6FA==",
           "requires": {
-            "@chakra-ui/utils": "1.9.1"
+            "@types/lodash.mergewith": "4.6.6",
+            "css-box-model": "1.2.1",
+            "framesync": "5.3.0",
+            "lodash.mergewith": "4.6.2"
           }
         }
       }
     },
     "@chakra-ui/hooks": {
-      "version": "1.7.2",
-      "resolved": "https://registry.npmjs.org/@chakra-ui/hooks/-/hooks-1.7.2.tgz",
-      "integrity": "sha512-XJnya9ugAPYUedtQULKaLYBezE9cZMOkDm0MQl7FEuJKZ9ocHD6Pwpwf9Z03R91XQmcNL8gZ1NS0GT9v/xNl3Q==",
+      "version": "1.8.5",
+      "resolved": "https://registry.npmjs.org/@chakra-ui/hooks/-/hooks-1.8.5.tgz",
+      "integrity": "sha512-/UrBfUG7NLxuU/09gy2qQfEH+H5SPBUaUiFtokRlq887D/32JQ3XksZdF78RKMCM/0bbZuIjqUkuN/wO9kAbSw==",
       "requires": {
-        "@chakra-ui/react-utils": "1.2.1",
-        "@chakra-ui/utils": "1.9.1",
+        "@chakra-ui/react-utils": "1.2.3",
+        "@chakra-ui/utils": "1.10.4",
         "compute-scroll-into-view": "1.0.14",
         "copy-to-clipboard": "3.3.1"
+      },
+      "dependencies": {
+        "@chakra-ui/utils": {
+          "version": "1.10.4",
+          "resolved": "https://registry.npmjs.org/@chakra-ui/utils/-/utils-1.10.4.tgz",
+          "integrity": "sha512-AM91VQQxw8F4F1WDA28mqKY6NFIOuzc2Ekkna88imy2OiqqmYH0xkq8J16L2qj4cLiLozpYqba3C79pWioy6FA==",
+          "requires": {
+            "@types/lodash.mergewith": "4.6.6",
+            "css-box-model": "1.2.1",
+            "framesync": "5.3.0",
+            "lodash.mergewith": "4.6.2"
+          }
+        }
       }
     },
     "@chakra-ui/icon": {
@@ -21086,459 +21833,891 @@
       }
     },
     "@chakra-ui/image": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/@chakra-ui/image/-/image-1.1.2.tgz",
-      "integrity": "sha512-bW4PMONYpWRLJ10di7W5BhYUOcCohNLhiTygOmVRMHWfUk9vmxhORlNu0EaSXUKGXiQ35cTVu4Ysv3L/1xYPRQ==",
+      "version": "1.1.8",
+      "resolved": "https://registry.npmjs.org/@chakra-ui/image/-/image-1.1.8.tgz",
+      "integrity": "sha512-ffO5lyTfGXxaFr9Bdkrb+GahjXsqeph8R1jXYFYwLjos+/sZZJmHJz/cjyoKjKPd6J7puKVZ6Cxz+Ej6PJlQcA==",
       "requires": {
-        "@chakra-ui/hooks": "1.7.2",
-        "@chakra-ui/utils": "1.9.1"
+        "@chakra-ui/hooks": "1.8.5",
+        "@chakra-ui/utils": "1.10.4"
+      },
+      "dependencies": {
+        "@chakra-ui/utils": {
+          "version": "1.10.4",
+          "resolved": "https://registry.npmjs.org/@chakra-ui/utils/-/utils-1.10.4.tgz",
+          "integrity": "sha512-AM91VQQxw8F4F1WDA28mqKY6NFIOuzc2Ekkna88imy2OiqqmYH0xkq8J16L2qj4cLiLozpYqba3C79pWioy6FA==",
+          "requires": {
+            "@types/lodash.mergewith": "4.6.6",
+            "css-box-model": "1.2.1",
+            "framesync": "5.3.0",
+            "lodash.mergewith": "4.6.2"
+          }
+        }
       }
     },
     "@chakra-ui/input": {
-      "version": "1.3.3",
-      "resolved": "https://registry.npmjs.org/@chakra-ui/input/-/input-1.3.3.tgz",
-      "integrity": "sha512-Fsivp608cKdc2tSQvPXczHtyfU6YHLju+EuAs5pjqKC8ZTwPawBRkCvlTGPPd7VwyTHkp08X5qARCxEgjRFbzw==",
+      "version": "1.4.4",
+      "resolved": "https://registry.npmjs.org/@chakra-ui/input/-/input-1.4.4.tgz",
+      "integrity": "sha512-A1TYz8lOdSVuMnWRnR7Y+cddnnr5d2o1Vvd8Im09WW2j09xy06xD/EaFy8dI51Ab0ACldglVs66qx5dO7WoV0w==",
       "requires": {
-        "@chakra-ui/form-control": "1.5.3",
-        "@chakra-ui/react-utils": "1.2.1",
-        "@chakra-ui/utils": "1.9.1"
+        "@chakra-ui/form-control": "1.5.9",
+        "@chakra-ui/react-utils": "1.2.3",
+        "@chakra-ui/utils": "1.10.4"
+      },
+      "dependencies": {
+        "@chakra-ui/utils": {
+          "version": "1.10.4",
+          "resolved": "https://registry.npmjs.org/@chakra-ui/utils/-/utils-1.10.4.tgz",
+          "integrity": "sha512-AM91VQQxw8F4F1WDA28mqKY6NFIOuzc2Ekkna88imy2OiqqmYH0xkq8J16L2qj4cLiLozpYqba3C79pWioy6FA==",
+          "requires": {
+            "@types/lodash.mergewith": "4.6.6",
+            "css-box-model": "1.2.1",
+            "framesync": "5.3.0",
+            "lodash.mergewith": "4.6.2"
+          }
+        }
       }
     },
     "@chakra-ui/layout": {
-      "version": "1.7.0",
-      "resolved": "https://registry.npmjs.org/@chakra-ui/layout/-/layout-1.7.0.tgz",
-      "integrity": "sha512-ZjRqLGs16T4PcWH445SkELVuxxfecjjUeprtFnNw13QzwydP46L8+GB3ycp6wyJDa6DMo77TxQQnK5jUUwY6Mw==",
+      "version": "1.7.7",
+      "resolved": "https://registry.npmjs.org/@chakra-ui/layout/-/layout-1.7.7.tgz",
+      "integrity": "sha512-HuZ/Zv9xWzLip263tX2Vt0oaqwaS6Srw78Sdl3DiGSifN8x+ooEAxmeDAIaU2PO21YX+f6s+9A738NAtSM2R+Q==",
       "requires": {
-        "@chakra-ui/icon": "2.0.0",
-        "@chakra-ui/react-utils": "1.2.1",
-        "@chakra-ui/utils": "1.9.1"
+        "@chakra-ui/icon": "2.0.5",
+        "@chakra-ui/react-utils": "1.2.3",
+        "@chakra-ui/utils": "1.10.4"
       },
       "dependencies": {
         "@chakra-ui/icon": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/@chakra-ui/icon/-/icon-2.0.0.tgz",
-          "integrity": "sha512-/GuU+xIcOIy9uSUUUCu249ZJB/nLDbjWGkfpoSdBwqT4+ytJrKt+0Ckh3Ub14sz3BJD+Z6IiIt6ySOA9+7lbsA==",
+          "version": "2.0.5",
+          "resolved": "https://registry.npmjs.org/@chakra-ui/icon/-/icon-2.0.5.tgz",
+          "integrity": "sha512-ZrqRvCCIxGr4qFd/r1pmtd9tobRmv8KAxV7ygFoc/t4vOSKTcVIjhE12gsI3FzgvXM15ZFVwsxa1zodwgo5neQ==",
           "requires": {
-            "@chakra-ui/utils": "1.9.1"
+            "@chakra-ui/utils": "1.10.4"
+          }
+        },
+        "@chakra-ui/utils": {
+          "version": "1.10.4",
+          "resolved": "https://registry.npmjs.org/@chakra-ui/utils/-/utils-1.10.4.tgz",
+          "integrity": "sha512-AM91VQQxw8F4F1WDA28mqKY6NFIOuzc2Ekkna88imy2OiqqmYH0xkq8J16L2qj4cLiLozpYqba3C79pWioy6FA==",
+          "requires": {
+            "@types/lodash.mergewith": "4.6.6",
+            "css-box-model": "1.2.1",
+            "framesync": "5.3.0",
+            "lodash.mergewith": "4.6.2"
           }
         }
       }
     },
     "@chakra-ui/live-region": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/@chakra-ui/live-region/-/live-region-1.1.1.tgz",
-      "integrity": "sha512-BSdI5gLIffNRETEp6W18kBNg9tL0ZLLzfWGRnuO9tEbox7NrcgqIeLF8mNKwhDOZz88NKHtUOPVzjAUKW1SryQ==",
+      "version": "1.1.6",
+      "resolved": "https://registry.npmjs.org/@chakra-ui/live-region/-/live-region-1.1.6.tgz",
+      "integrity": "sha512-9gPQHXf7oW0jXyT5R/JzyDMfJ3hF70TqhN8bRH4fMyfNr2Se+SjztMBqCrv5FS5rPjcCeua+e0eArpoB3ROuWQ==",
       "requires": {
-        "@chakra-ui/utils": "1.9.1"
+        "@chakra-ui/utils": "1.10.4"
+      },
+      "dependencies": {
+        "@chakra-ui/utils": {
+          "version": "1.10.4",
+          "resolved": "https://registry.npmjs.org/@chakra-ui/utils/-/utils-1.10.4.tgz",
+          "integrity": "sha512-AM91VQQxw8F4F1WDA28mqKY6NFIOuzc2Ekkna88imy2OiqqmYH0xkq8J16L2qj4cLiLozpYqba3C79pWioy6FA==",
+          "requires": {
+            "@types/lodash.mergewith": "4.6.6",
+            "css-box-model": "1.2.1",
+            "framesync": "5.3.0",
+            "lodash.mergewith": "4.6.2"
+          }
+        }
       }
     },
     "@chakra-ui/media-query": {
-      "version": "1.2.3",
-      "resolved": "https://registry.npmjs.org/@chakra-ui/media-query/-/media-query-1.2.3.tgz",
-      "integrity": "sha512-DbStv1VUSBwFj/MNemxRUtoibSoR9ZRcW31UUjtkiIH58cSB5lyEPv9rdD/1HRXpJfSaWQ439Tbuf03gOC4SVQ==",
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/@chakra-ui/media-query/-/media-query-2.0.4.tgz",
+      "integrity": "sha512-kn6g/L0IFFUHz2v4yiCsBnhg9jUeA7525Z+AWl+BPtvryi7i9J+AJ27y/QAge7vUGy4dwDeFyxOZTs2oZ9/BsA==",
       "requires": {
-        "@chakra-ui/react-env": "1.1.1",
-        "@chakra-ui/utils": "1.9.1"
+        "@chakra-ui/react-env": "1.1.6",
+        "@chakra-ui/utils": "1.10.4"
+      },
+      "dependencies": {
+        "@chakra-ui/utils": {
+          "version": "1.10.4",
+          "resolved": "https://registry.npmjs.org/@chakra-ui/utils/-/utils-1.10.4.tgz",
+          "integrity": "sha512-AM91VQQxw8F4F1WDA28mqKY6NFIOuzc2Ekkna88imy2OiqqmYH0xkq8J16L2qj4cLiLozpYqba3C79pWioy6FA==",
+          "requires": {
+            "@types/lodash.mergewith": "4.6.6",
+            "css-box-model": "1.2.1",
+            "framesync": "5.3.0",
+            "lodash.mergewith": "4.6.2"
+          }
+        }
       }
     },
     "@chakra-ui/menu": {
-      "version": "1.8.3",
-      "resolved": "https://registry.npmjs.org/@chakra-ui/menu/-/menu-1.8.3.tgz",
-      "integrity": "sha512-TehcqHLKlMdkeXTtCYXzWNa6nbAk1cpjGz6OPl2ua0eisoOKgPolpkreCfYrWV9NNk0BmzZn+Su+z60jbhqggA==",
-      "requires": {
-        "@chakra-ui/clickable": "1.2.1",
-        "@chakra-ui/descendant": "2.1.1",
-        "@chakra-ui/hooks": "1.7.2",
-        "@chakra-ui/popper": "2.4.1",
-        "@chakra-ui/react-utils": "1.2.1",
-        "@chakra-ui/transition": "1.4.2",
-        "@chakra-ui/utils": "1.9.1"
+      "version": "1.8.9",
+      "resolved": "https://registry.npmjs.org/@chakra-ui/menu/-/menu-1.8.9.tgz",
+      "integrity": "sha512-rvQQU56nQoaz+IZXyamKaAU/87IiGIDrX9wEONHth7QDT/93whnFNYPtUMHMzILz0oliysBey4dlmtRzk5vUpQ==",
+      "requires": {
+        "@chakra-ui/clickable": "1.2.6",
+        "@chakra-ui/descendant": "2.1.3",
+        "@chakra-ui/hooks": "1.8.5",
+        "@chakra-ui/popper": "2.4.3",
+        "@chakra-ui/react-utils": "1.2.3",
+        "@chakra-ui/transition": "1.4.7",
+        "@chakra-ui/utils": "1.10.4"
+      },
+      "dependencies": {
+        "@chakra-ui/utils": {
+          "version": "1.10.4",
+          "resolved": "https://registry.npmjs.org/@chakra-ui/utils/-/utils-1.10.4.tgz",
+          "integrity": "sha512-AM91VQQxw8F4F1WDA28mqKY6NFIOuzc2Ekkna88imy2OiqqmYH0xkq8J16L2qj4cLiLozpYqba3C79pWioy6FA==",
+          "requires": {
+            "@types/lodash.mergewith": "4.6.6",
+            "css-box-model": "1.2.1",
+            "framesync": "5.3.0",
+            "lodash.mergewith": "4.6.2"
+          }
+        }
       }
     },
     "@chakra-ui/modal": {
-      "version": "1.10.3",
-      "resolved": "https://registry.npmjs.org/@chakra-ui/modal/-/modal-1.10.3.tgz",
-      "integrity": "sha512-b0kVv4kNFWVbJPprEgFqqBH8EeneLAueSV+0t9Z1MpvIF0EUB6qe2JQZ0X8eDOtNYX4Tp7Y7LRCQ/M/HMm9WRw==",
-      "requires": {
-        "@chakra-ui/close-button": "1.2.2",
-        "@chakra-ui/focus-lock": "1.2.1",
-        "@chakra-ui/hooks": "1.7.2",
-        "@chakra-ui/portal": "1.3.2",
-        "@chakra-ui/react-utils": "1.2.1",
-        "@chakra-ui/transition": "1.4.2",
-        "@chakra-ui/utils": "1.9.1",
+      "version": "1.10.10",
+      "resolved": "https://registry.npmjs.org/@chakra-ui/modal/-/modal-1.10.10.tgz",
+      "integrity": "sha512-/OLnZhhGXQEaCqtrCCf2nu27mVxT/3Kd+NBNMKGZ4X70Dm6HD3x1Zrsto2hVo8l3kLEPRpkfpXhKu61doMc8zw==",
+      "requires": {
+        "@chakra-ui/close-button": "1.2.7",
+        "@chakra-ui/focus-lock": "1.2.6",
+        "@chakra-ui/hooks": "1.8.5",
+        "@chakra-ui/portal": "1.3.8",
+        "@chakra-ui/react-utils": "1.2.3",
+        "@chakra-ui/transition": "1.4.7",
+        "@chakra-ui/utils": "1.10.4",
         "aria-hidden": "^1.1.1",
         "react-remove-scroll": "2.4.1"
+      },
+      "dependencies": {
+        "@chakra-ui/utils": {
+          "version": "1.10.4",
+          "resolved": "https://registry.npmjs.org/@chakra-ui/utils/-/utils-1.10.4.tgz",
+          "integrity": "sha512-AM91VQQxw8F4F1WDA28mqKY6NFIOuzc2Ekkna88imy2OiqqmYH0xkq8J16L2qj4cLiLozpYqba3C79pWioy6FA==",
+          "requires": {
+            "@types/lodash.mergewith": "4.6.6",
+            "css-box-model": "1.2.1",
+            "framesync": "5.3.0",
+            "lodash.mergewith": "4.6.2"
+          }
+        }
       }
     },
     "@chakra-ui/number-input": {
-      "version": "1.3.3",
-      "resolved": "https://registry.npmjs.org/@chakra-ui/number-input/-/number-input-1.3.3.tgz",
-      "integrity": "sha512-nptvORoG+PvvuURkzh0juSYxj3L9HnWIeNncC/7oXgm2AFGxIcqUk8pUJaUNM2mlbLjJZS19/MWlfzgsYJmJrQ==",
-      "requires": {
-        "@chakra-ui/counter": "1.2.2",
-        "@chakra-ui/form-control": "1.5.3",
-        "@chakra-ui/hooks": "1.7.2",
-        "@chakra-ui/icon": "2.0.0",
-        "@chakra-ui/react-utils": "1.2.1",
-        "@chakra-ui/utils": "1.9.1"
+      "version": "1.4.5",
+      "resolved": "https://registry.npmjs.org/@chakra-ui/number-input/-/number-input-1.4.5.tgz",
+      "integrity": "sha512-jxOvJUEuXZXQrOgMGZ+rPNjSrIoV7MSb7CPt3C1jVuiumr/GgNu54awmrky3Zj4ikj68rREEUXAGKBgm9oU3nQ==",
+      "requires": {
+        "@chakra-ui/counter": "1.2.8",
+        "@chakra-ui/form-control": "1.5.9",
+        "@chakra-ui/hooks": "1.8.5",
+        "@chakra-ui/icon": "2.0.5",
+        "@chakra-ui/react-utils": "1.2.3",
+        "@chakra-ui/utils": "1.10.4"
       },
       "dependencies": {
         "@chakra-ui/icon": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/@chakra-ui/icon/-/icon-2.0.0.tgz",
-          "integrity": "sha512-/GuU+xIcOIy9uSUUUCu249ZJB/nLDbjWGkfpoSdBwqT4+ytJrKt+0Ckh3Ub14sz3BJD+Z6IiIt6ySOA9+7lbsA==",
+          "version": "2.0.5",
+          "resolved": "https://registry.npmjs.org/@chakra-ui/icon/-/icon-2.0.5.tgz",
+          "integrity": "sha512-ZrqRvCCIxGr4qFd/r1pmtd9tobRmv8KAxV7ygFoc/t4vOSKTcVIjhE12gsI3FzgvXM15ZFVwsxa1zodwgo5neQ==",
           "requires": {
-            "@chakra-ui/utils": "1.9.1"
+            "@chakra-ui/utils": "1.10.4"
+          }
+        },
+        "@chakra-ui/utils": {
+          "version": "1.10.4",
+          "resolved": "https://registry.npmjs.org/@chakra-ui/utils/-/utils-1.10.4.tgz",
+          "integrity": "sha512-AM91VQQxw8F4F1WDA28mqKY6NFIOuzc2Ekkna88imy2OiqqmYH0xkq8J16L2qj4cLiLozpYqba3C79pWioy6FA==",
+          "requires": {
+            "@types/lodash.mergewith": "4.6.6",
+            "css-box-model": "1.2.1",
+            "framesync": "5.3.0",
+            "lodash.mergewith": "4.6.2"
           }
         }
       }
     },
     "@chakra-ui/pin-input": {
-      "version": "1.7.2",
-      "resolved": "https://registry.npmjs.org/@chakra-ui/pin-input/-/pin-input-1.7.2.tgz",
-      "integrity": "sha512-2dGNdU+Xlu0u1OxuelJBKQu7dDKaD5kN9moZMoKpjpXB8Kibh7GM3OO/Z25aMM/E9Kly21qXgHju0Tj/ovBJuw==",
+      "version": "1.7.8",
+      "resolved": "https://registry.npmjs.org/@chakra-ui/pin-input/-/pin-input-1.7.8.tgz",
+      "integrity": "sha512-P4uJBVKDxTetQhj+s0L7TbUTTqbcHwkLpo4bGUEdQpHMfGFlJgGu0wFT5Z8O0fw+vGNfguFfkqkVRRgK8FkHlA==",
       "requires": {
-        "@chakra-ui/descendant": "2.1.1",
-        "@chakra-ui/hooks": "1.7.2",
-        "@chakra-ui/react-utils": "1.2.1",
-        "@chakra-ui/utils": "1.9.1"
+        "@chakra-ui/descendant": "2.1.3",
+        "@chakra-ui/hooks": "1.8.5",
+        "@chakra-ui/react-utils": "1.2.3",
+        "@chakra-ui/utils": "1.10.4"
+      },
+      "dependencies": {
+        "@chakra-ui/utils": {
+          "version": "1.10.4",
+          "resolved": "https://registry.npmjs.org/@chakra-ui/utils/-/utils-1.10.4.tgz",
+          "integrity": "sha512-AM91VQQxw8F4F1WDA28mqKY6NFIOuzc2Ekkna88imy2OiqqmYH0xkq8J16L2qj4cLiLozpYqba3C79pWioy6FA==",
+          "requires": {
+            "@types/lodash.mergewith": "4.6.6",
+            "css-box-model": "1.2.1",
+            "framesync": "5.3.0",
+            "lodash.mergewith": "4.6.2"
+          }
+        }
       }
     },
     "@chakra-ui/popover": {
-      "version": "1.11.1",
-      "resolved": "https://registry.npmjs.org/@chakra-ui/popover/-/popover-1.11.1.tgz",
-      "integrity": "sha512-WV1R2L1V6mbpe6/aInr4yFe6rAu7+pT8Od6Hki5KsIv+4QvoEMYsvJ0VOhaURLLD+NaKXFCsfpc9immluia+AA==",
-      "requires": {
-        "@chakra-ui/close-button": "1.2.2",
-        "@chakra-ui/hooks": "1.7.2",
-        "@chakra-ui/popper": "2.4.1",
-        "@chakra-ui/react-utils": "1.2.1",
-        "@chakra-ui/utils": "1.9.1"
+      "version": "1.11.7",
+      "resolved": "https://registry.npmjs.org/@chakra-ui/popover/-/popover-1.11.7.tgz",
+      "integrity": "sha512-TjMZlpBomIuGuQgGQi2rTSVFwFbc9HdJSU3anyFyDQb4ZnunyqaIEMoqFdj/dK8tDdWIatozKjX6AzSimmSvLg==",
+      "requires": {
+        "@chakra-ui/close-button": "1.2.7",
+        "@chakra-ui/hooks": "1.8.5",
+        "@chakra-ui/popper": "2.4.3",
+        "@chakra-ui/react-utils": "1.2.3",
+        "@chakra-ui/utils": "1.10.4"
+      },
+      "dependencies": {
+        "@chakra-ui/utils": {
+          "version": "1.10.4",
+          "resolved": "https://registry.npmjs.org/@chakra-ui/utils/-/utils-1.10.4.tgz",
+          "integrity": "sha512-AM91VQQxw8F4F1WDA28mqKY6NFIOuzc2Ekkna88imy2OiqqmYH0xkq8J16L2qj4cLiLozpYqba3C79pWioy6FA==",
+          "requires": {
+            "@types/lodash.mergewith": "4.6.6",
+            "css-box-model": "1.2.1",
+            "framesync": "5.3.0",
+            "lodash.mergewith": "4.6.2"
+          }
+        }
       }
     },
     "@chakra-ui/popper": {
-      "version": "2.4.1",
-      "resolved": "https://registry.npmjs.org/@chakra-ui/popper/-/popper-2.4.1.tgz",
-      "integrity": "sha512-cuwnwXx6RUXZGGynVOGG8fEIiMNBXUCy3UqWQD1eEd8200eWQobgNk4Z0YwzKuSzJwp0Auy+j5iKefi5FSkyog==",
+      "version": "2.4.3",
+      "resolved": "https://registry.npmjs.org/@chakra-ui/popper/-/popper-2.4.3.tgz",
+      "integrity": "sha512-TGzFnYt3mtIVkIejtYIAu4Ka9DaYLzMR4NgcqI6EtaTvgK7Xep+6RTiY/Nq+ZT3l/eaNUwqHRFoNrDUg1XYasA==",
       "requires": {
-        "@chakra-ui/react-utils": "1.2.1",
+        "@chakra-ui/react-utils": "1.2.3",
         "@popperjs/core": "^2.9.3"
       }
     },
     "@chakra-ui/portal": {
-      "version": "1.3.2",
-      "resolved": "https://registry.npmjs.org/@chakra-ui/portal/-/portal-1.3.2.tgz",
-      "integrity": "sha512-dWUCwEZNpPnbR21+eBbEGuvvOcz5AuS+TZ4V0sUdUEI8B3dPUEylJsveZpYjOCS/YAh4xoxbo6I6haRgrfguvw==",
+      "version": "1.3.8",
+      "resolved": "https://registry.npmjs.org/@chakra-ui/portal/-/portal-1.3.8.tgz",
+      "integrity": "sha512-rpSu/RdtlKfOBzw11qHs91IwUTffUfppBz33PfOFNZpDGmO0+6pWkz40I16eSgYtQigZRQG1spz6Ul7tsh+1ag==",
       "requires": {
-        "@chakra-ui/hooks": "1.7.2",
-        "@chakra-ui/react-utils": "1.2.1",
-        "@chakra-ui/utils": "1.9.1"
+        "@chakra-ui/hooks": "1.8.5",
+        "@chakra-ui/react-utils": "1.2.3",
+        "@chakra-ui/utils": "1.10.4"
+      },
+      "dependencies": {
+        "@chakra-ui/utils": {
+          "version": "1.10.4",
+          "resolved": "https://registry.npmjs.org/@chakra-ui/utils/-/utils-1.10.4.tgz",
+          "integrity": "sha512-AM91VQQxw8F4F1WDA28mqKY6NFIOuzc2Ekkna88imy2OiqqmYH0xkq8J16L2qj4cLiLozpYqba3C79pWioy6FA==",
+          "requires": {
+            "@types/lodash.mergewith": "4.6.6",
+            "css-box-model": "1.2.1",
+            "framesync": "5.3.0",
+            "lodash.mergewith": "4.6.2"
+          }
+        }
       }
     },
     "@chakra-ui/progress": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/@chakra-ui/progress/-/progress-1.2.1.tgz",
-      "integrity": "sha512-213nN8nbODvD/A23vAtg+r3bRKKatWQHafgmLzeznUcxa/+ac0eVurIS8XSYLRkY4EXQ505re3ZkLhDd98a7QA==",
+      "version": "1.2.6",
+      "resolved": "https://registry.npmjs.org/@chakra-ui/progress/-/progress-1.2.6.tgz",
+      "integrity": "sha512-thaHRIYTVktgV78vJMNwzfCX+ickhSpn2bun6FtGVUphFx4tjV+ggz+IGohm6AH2hapskoR1mQU2iNZb6BK0hQ==",
       "requires": {
-        "@chakra-ui/theme-tools": "1.3.1",
-        "@chakra-ui/utils": "1.9.1"
+        "@chakra-ui/theme-tools": "1.3.6",
+        "@chakra-ui/utils": "1.10.4"
+      },
+      "dependencies": {
+        "@chakra-ui/utils": {
+          "version": "1.10.4",
+          "resolved": "https://registry.npmjs.org/@chakra-ui/utils/-/utils-1.10.4.tgz",
+          "integrity": "sha512-AM91VQQxw8F4F1WDA28mqKY6NFIOuzc2Ekkna88imy2OiqqmYH0xkq8J16L2qj4cLiLozpYqba3C79pWioy6FA==",
+          "requires": {
+            "@types/lodash.mergewith": "4.6.6",
+            "css-box-model": "1.2.1",
+            "framesync": "5.3.0",
+            "lodash.mergewith": "4.6.2"
+          }
+        }
       }
     },
     "@chakra-ui/provider": {
-      "version": "1.7.4",
-      "resolved": "https://registry.npmjs.org/@chakra-ui/provider/-/provider-1.7.4.tgz",
-      "integrity": "sha512-W+mut8fVk6MZx2Sgz4SSIrVVCUAFXE8/AZK3G71qFb9j/7m30zdWCsSzY9yd0XMjJF2cJvEXjEPAVYWz9BEoBA==",
-      "requires": {
-        "@chakra-ui/css-reset": "1.1.1",
-        "@chakra-ui/hooks": "1.7.2",
-        "@chakra-ui/portal": "1.3.2",
-        "@chakra-ui/react-env": "1.1.1",
-        "@chakra-ui/system": "1.9.0",
-        "@chakra-ui/utils": "1.9.1"
+      "version": "1.7.12",
+      "resolved": "https://registry.npmjs.org/@chakra-ui/provider/-/provider-1.7.12.tgz",
+      "integrity": "sha512-SSq4z4nMjCbqdGrRkbxzR4o96uRah1HnSFui3lM2263zJN7fyezqiseRboID+i7eIUCBWHMLdsabARAD8t1tDQ==",
+      "requires": {
+        "@chakra-ui/css-reset": "1.1.3",
+        "@chakra-ui/hooks": "1.8.5",
+        "@chakra-ui/portal": "1.3.8",
+        "@chakra-ui/react-env": "1.1.6",
+        "@chakra-ui/system": "1.11.2",
+        "@chakra-ui/utils": "1.10.4"
+      },
+      "dependencies": {
+        "@chakra-ui/utils": {
+          "version": "1.10.4",
+          "resolved": "https://registry.npmjs.org/@chakra-ui/utils/-/utils-1.10.4.tgz",
+          "integrity": "sha512-AM91VQQxw8F4F1WDA28mqKY6NFIOuzc2Ekkna88imy2OiqqmYH0xkq8J16L2qj4cLiLozpYqba3C79pWioy6FA==",
+          "requires": {
+            "@types/lodash.mergewith": "4.6.6",
+            "css-box-model": "1.2.1",
+            "framesync": "5.3.0",
+            "lodash.mergewith": "4.6.2"
+          }
+        }
       }
     },
     "@chakra-ui/radio": {
-      "version": "1.4.4",
-      "resolved": "https://registry.npmjs.org/@chakra-ui/radio/-/radio-1.4.4.tgz",
-      "integrity": "sha512-Tz8bl+yhD2pKHUFyNZtP056eawqOUkSA7n2qEebnoH7Zp65B9zwYHkpvL+2nhL5swBwpnGrUpuK3WOqGz4dvXA==",
+      "version": "1.4.10",
+      "resolved": "https://registry.npmjs.org/@chakra-ui/radio/-/radio-1.4.10.tgz",
+      "integrity": "sha512-TgqBgfezypC4do1Vj4iBp4kptXVWdnhASJ97VFuau2QQPT6zKl3Ke2di+XLhH3CZNCDHpvU/KxQNJ6bfj5GMGg==",
       "requires": {
-        "@chakra-ui/form-control": "1.5.3",
-        "@chakra-ui/hooks": "1.7.2",
-        "@chakra-ui/react-utils": "1.2.1",
-        "@chakra-ui/utils": "1.9.1",
-        "@chakra-ui/visually-hidden": "1.1.1"
+        "@chakra-ui/form-control": "1.5.9",
+        "@chakra-ui/hooks": "1.8.5",
+        "@chakra-ui/react-utils": "1.2.3",
+        "@chakra-ui/utils": "1.10.4",
+        "@chakra-ui/visually-hidden": "1.1.6"
+      },
+      "dependencies": {
+        "@chakra-ui/utils": {
+          "version": "1.10.4",
+          "resolved": "https://registry.npmjs.org/@chakra-ui/utils/-/utils-1.10.4.tgz",
+          "integrity": "sha512-AM91VQQxw8F4F1WDA28mqKY6NFIOuzc2Ekkna88imy2OiqqmYH0xkq8J16L2qj4cLiLozpYqba3C79pWioy6FA==",
+          "requires": {
+            "@types/lodash.mergewith": "4.6.6",
+            "css-box-model": "1.2.1",
+            "framesync": "5.3.0",
+            "lodash.mergewith": "4.6.2"
+          }
+        }
       }
     },
     "@chakra-ui/react": {
-      "version": "1.7.4",
-      "resolved": "https://registry.npmjs.org/@chakra-ui/react/-/react-1.7.4.tgz",
-      "integrity": "sha512-wBxfQRcIz6YGXQh3S2E6sXCVcqrVuUygMeMdkCMMfZQTI2VFLkvn6SDYzLHcm1PtMygZnF1mU30GOcmArpVotA==",
-      "requires": {
-        "@chakra-ui/accordion": "1.4.3",
-        "@chakra-ui/alert": "1.3.2",
-        "@chakra-ui/avatar": "1.3.2",
-        "@chakra-ui/breadcrumb": "1.3.1",
-        "@chakra-ui/button": "1.5.2",
-        "@chakra-ui/checkbox": "1.6.2",
-        "@chakra-ui/close-button": "1.2.2",
-        "@chakra-ui/control-box": "1.1.1",
-        "@chakra-ui/counter": "1.2.2",
-        "@chakra-ui/css-reset": "1.1.1",
-        "@chakra-ui/editable": "1.3.2",
-        "@chakra-ui/form-control": "1.5.3",
-        "@chakra-ui/hooks": "1.7.2",
-        "@chakra-ui/icon": "2.0.0",
-        "@chakra-ui/image": "1.1.2",
-        "@chakra-ui/input": "1.3.3",
-        "@chakra-ui/layout": "1.7.0",
-        "@chakra-ui/live-region": "1.1.1",
-        "@chakra-ui/media-query": "1.2.3",
-        "@chakra-ui/menu": "1.8.3",
-        "@chakra-ui/modal": "1.10.3",
-        "@chakra-ui/number-input": "1.3.3",
-        "@chakra-ui/pin-input": "1.7.2",
-        "@chakra-ui/popover": "1.11.1",
-        "@chakra-ui/popper": "2.4.1",
-        "@chakra-ui/portal": "1.3.2",
-        "@chakra-ui/progress": "1.2.1",
-        "@chakra-ui/provider": "1.7.4",
-        "@chakra-ui/radio": "1.4.4",
-        "@chakra-ui/react-env": "1.1.1",
-        "@chakra-ui/select": "1.2.3",
-        "@chakra-ui/skeleton": "1.2.4",
-        "@chakra-ui/slider": "1.5.3",
-        "@chakra-ui/spinner": "1.2.1",
-        "@chakra-ui/stat": "1.2.2",
-        "@chakra-ui/switch": "1.3.2",
-        "@chakra-ui/system": "1.9.0",
-        "@chakra-ui/table": "1.3.1",
-        "@chakra-ui/tabs": "1.6.2",
-        "@chakra-ui/tag": "1.2.2",
-        "@chakra-ui/textarea": "1.2.3",
-        "@chakra-ui/theme": "1.12.3",
-        "@chakra-ui/toast": "1.5.1",
-        "@chakra-ui/tooltip": "1.4.3",
-        "@chakra-ui/transition": "1.4.2",
-        "@chakra-ui/utils": "1.9.1",
-        "@chakra-ui/visually-hidden": "1.1.1"
+      "version": "1.8.6",
+      "resolved": "https://registry.npmjs.org/@chakra-ui/react/-/react-1.8.6.tgz",
+      "integrity": "sha512-FEh/KG0uPeNOMQuIlyPfGjHvGB7LN1AAhkdFefqzNt0zNy8Giv4p1PKY7wdCh5QEFor++A83L1wIWvTGQVJ2vQ==",
+      "requires": {
+        "@chakra-ui/accordion": "1.4.9",
+        "@chakra-ui/alert": "1.3.7",
+        "@chakra-ui/avatar": "1.3.9",
+        "@chakra-ui/breadcrumb": "1.3.6",
+        "@chakra-ui/button": "1.5.8",
+        "@chakra-ui/checkbox": "1.6.8",
+        "@chakra-ui/close-button": "1.2.7",
+        "@chakra-ui/control-box": "1.1.6",
+        "@chakra-ui/counter": "1.2.8",
+        "@chakra-ui/css-reset": "1.1.3",
+        "@chakra-ui/editable": "1.4.0",
+        "@chakra-ui/form-control": "1.5.9",
+        "@chakra-ui/hooks": "1.8.5",
+        "@chakra-ui/icon": "2.0.5",
+        "@chakra-ui/image": "1.1.8",
+        "@chakra-ui/input": "1.4.4",
+        "@chakra-ui/layout": "1.7.7",
+        "@chakra-ui/live-region": "1.1.6",
+        "@chakra-ui/media-query": "2.0.4",
+        "@chakra-ui/menu": "1.8.9",
+        "@chakra-ui/modal": "1.10.10",
+        "@chakra-ui/number-input": "1.4.5",
+        "@chakra-ui/pin-input": "1.7.8",
+        "@chakra-ui/popover": "1.11.7",
+        "@chakra-ui/popper": "2.4.3",
+        "@chakra-ui/portal": "1.3.8",
+        "@chakra-ui/progress": "1.2.6",
+        "@chakra-ui/provider": "1.7.12",
+        "@chakra-ui/radio": "1.4.10",
+        "@chakra-ui/react-env": "1.1.6",
+        "@chakra-ui/select": "1.2.9",
+        "@chakra-ui/skeleton": "1.2.12",
+        "@chakra-ui/slider": "1.5.9",
+        "@chakra-ui/spinner": "1.2.6",
+        "@chakra-ui/stat": "1.2.7",
+        "@chakra-ui/switch": "1.3.8",
+        "@chakra-ui/system": "1.11.2",
+        "@chakra-ui/table": "1.3.6",
+        "@chakra-ui/tabs": "1.6.8",
+        "@chakra-ui/tag": "1.2.7",
+        "@chakra-ui/textarea": "1.2.9",
+        "@chakra-ui/theme": "1.14.0",
+        "@chakra-ui/toast": "1.5.7",
+        "@chakra-ui/tooltip": "1.4.9",
+        "@chakra-ui/transition": "1.4.7",
+        "@chakra-ui/utils": "1.10.4",
+        "@chakra-ui/visually-hidden": "1.1.6"
       },
       "dependencies": {
         "@chakra-ui/icon": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/@chakra-ui/icon/-/icon-2.0.0.tgz",
-          "integrity": "sha512-/GuU+xIcOIy9uSUUUCu249ZJB/nLDbjWGkfpoSdBwqT4+ytJrKt+0Ckh3Ub14sz3BJD+Z6IiIt6ySOA9+7lbsA==",
+          "version": "2.0.5",
+          "resolved": "https://registry.npmjs.org/@chakra-ui/icon/-/icon-2.0.5.tgz",
+          "integrity": "sha512-ZrqRvCCIxGr4qFd/r1pmtd9tobRmv8KAxV7ygFoc/t4vOSKTcVIjhE12gsI3FzgvXM15ZFVwsxa1zodwgo5neQ==",
           "requires": {
-            "@chakra-ui/utils": "1.9.1"
+            "@chakra-ui/utils": "1.10.4"
+          }
+        },
+        "@chakra-ui/utils": {
+          "version": "1.10.4",
+          "resolved": "https://registry.npmjs.org/@chakra-ui/utils/-/utils-1.10.4.tgz",
+          "integrity": "sha512-AM91VQQxw8F4F1WDA28mqKY6NFIOuzc2Ekkna88imy2OiqqmYH0xkq8J16L2qj4cLiLozpYqba3C79pWioy6FA==",
+          "requires": {
+            "@types/lodash.mergewith": "4.6.6",
+            "css-box-model": "1.2.1",
+            "framesync": "5.3.0",
+            "lodash.mergewith": "4.6.2"
           }
         }
       }
     },
     "@chakra-ui/react-env": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/@chakra-ui/react-env/-/react-env-1.1.1.tgz",
-      "integrity": "sha512-Lgmb0y4kv0ffsGMelAOaYOd4tYZAv4FYWgV86ckGMjmYQWA8drv4v/lHTNltixxWMmBEpjcHALpJuS6yAZYHug==",
+      "version": "1.1.6",
+      "resolved": "https://registry.npmjs.org/@chakra-ui/react-env/-/react-env-1.1.6.tgz",
+      "integrity": "sha512-L90LNvCfe04FTkN9OPok/o2e60zLJNBH8Im/5dUHvqy7dXLXok8ZDad5vEL46XmGbhe7O8fbxhG6FmAYdcCHrQ==",
       "requires": {
-        "@chakra-ui/utils": "1.9.1"
+        "@chakra-ui/utils": "1.10.4"
+      },
+      "dependencies": {
+        "@chakra-ui/utils": {
+          "version": "1.10.4",
+          "resolved": "https://registry.npmjs.org/@chakra-ui/utils/-/utils-1.10.4.tgz",
+          "integrity": "sha512-AM91VQQxw8F4F1WDA28mqKY6NFIOuzc2Ekkna88imy2OiqqmYH0xkq8J16L2qj4cLiLozpYqba3C79pWioy6FA==",
+          "requires": {
+            "@types/lodash.mergewith": "4.6.6",
+            "css-box-model": "1.2.1",
+            "framesync": "5.3.0",
+            "lodash.mergewith": "4.6.2"
+          }
+        }
       }
     },
     "@chakra-ui/react-utils": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/@chakra-ui/react-utils/-/react-utils-1.2.1.tgz",
-      "integrity": "sha512-bV8FRaXiOgGxOg03iTNin/B02I+tHH9PQtqUTl3U7cJaoI+5AUYhrqXvl1Ya2/R7zxSFrb/gBVDTgbZiVkJ+Dg==",
+      "version": "1.2.3",
+      "resolved": "https://registry.npmjs.org/@chakra-ui/react-utils/-/react-utils-1.2.3.tgz",
+      "integrity": "sha512-r8pUwCVVB7UPhb0AiRa9ZzSp4xkMz64yIeJ4O4aGy4WMw7TRH4j4QkbkE1YC9tQitrXrliOlvx4WWJR4VyiGpw==",
       "requires": {
-        "@chakra-ui/utils": "^1.9.1"
+        "@chakra-ui/utils": "^1.10.4"
+      },
+      "dependencies": {
+        "@chakra-ui/utils": {
+          "version": "1.10.4",
+          "resolved": "https://registry.npmjs.org/@chakra-ui/utils/-/utils-1.10.4.tgz",
+          "integrity": "sha512-AM91VQQxw8F4F1WDA28mqKY6NFIOuzc2Ekkna88imy2OiqqmYH0xkq8J16L2qj4cLiLozpYqba3C79pWioy6FA==",
+          "requires": {
+            "@types/lodash.mergewith": "4.6.6",
+            "css-box-model": "1.2.1",
+            "framesync": "5.3.0",
+            "lodash.mergewith": "4.6.2"
+          }
+        }
       }
     },
     "@chakra-ui/select": {
-      "version": "1.2.3",
-      "resolved": "https://registry.npmjs.org/@chakra-ui/select/-/select-1.2.3.tgz",
-      "integrity": "sha512-LGT8z06InjfMTQyWgQUqinucvObkO0bOR87c4swWlAESkS6w+g8PsH9UJ87NT5W+hzCybvqSfRjMHYwC9qUnrg==",
+      "version": "1.2.9",
+      "resolved": "https://registry.npmjs.org/@chakra-ui/select/-/select-1.2.9.tgz",
+      "integrity": "sha512-f8cRy3whXFYviuKGfugPnvXTGarPVt2ux5pffipmliYOhfaJ8O2OtdmNJ/od4WaeGStUH13x12GsEqVw2LBKOg==",
       "requires": {
-        "@chakra-ui/form-control": "1.5.3",
-        "@chakra-ui/utils": "1.9.1"
+        "@chakra-ui/form-control": "1.5.9",
+        "@chakra-ui/utils": "1.10.4"
+      },
+      "dependencies": {
+        "@chakra-ui/utils": {
+          "version": "1.10.4",
+          "resolved": "https://registry.npmjs.org/@chakra-ui/utils/-/utils-1.10.4.tgz",
+          "integrity": "sha512-AM91VQQxw8F4F1WDA28mqKY6NFIOuzc2Ekkna88imy2OiqqmYH0xkq8J16L2qj4cLiLozpYqba3C79pWioy6FA==",
+          "requires": {
+            "@types/lodash.mergewith": "4.6.6",
+            "css-box-model": "1.2.1",
+            "framesync": "5.3.0",
+            "lodash.mergewith": "4.6.2"
+          }
+        }
       }
     },
     "@chakra-ui/skeleton": {
-      "version": "1.2.4",
-      "resolved": "https://registry.npmjs.org/@chakra-ui/skeleton/-/skeleton-1.2.4.tgz",
-      "integrity": "sha512-j5cAwXfyb7sybk+QjSz5TlQkQVeekdRZBF4xEm4TXGGZiMSTsd9/7BOBtxopakn/YKDP1owZ4oSGZGYGNmTS8w==",
+      "version": "1.2.12",
+      "resolved": "https://registry.npmjs.org/@chakra-ui/skeleton/-/skeleton-1.2.12.tgz",
+      "integrity": "sha512-buHqfKw24+EQXFGHlSRq2obHxZgz0FUKSFNMlQS3tMoFwBkLRO/jAQfjj9KKR5b0m2qu1qLBmwFHJLih1+bnzg==",
       "requires": {
-        "@chakra-ui/hooks": "1.7.2",
-        "@chakra-ui/media-query": "1.2.3",
-        "@chakra-ui/system": "1.9.0",
-        "@chakra-ui/utils": "1.9.1"
+        "@chakra-ui/hooks": "1.8.5",
+        "@chakra-ui/media-query": "2.0.4",
+        "@chakra-ui/system": "1.11.2",
+        "@chakra-ui/utils": "1.10.4"
+      },
+      "dependencies": {
+        "@chakra-ui/utils": {
+          "version": "1.10.4",
+          "resolved": "https://registry.npmjs.org/@chakra-ui/utils/-/utils-1.10.4.tgz",
+          "integrity": "sha512-AM91VQQxw8F4F1WDA28mqKY6NFIOuzc2Ekkna88imy2OiqqmYH0xkq8J16L2qj4cLiLozpYqba3C79pWioy6FA==",
+          "requires": {
+            "@types/lodash.mergewith": "4.6.6",
+            "css-box-model": "1.2.1",
+            "framesync": "5.3.0",
+            "lodash.mergewith": "4.6.2"
+          }
+        }
       }
     },
     "@chakra-ui/slider": {
-      "version": "1.5.3",
-      "resolved": "https://registry.npmjs.org/@chakra-ui/slider/-/slider-1.5.3.tgz",
-      "integrity": "sha512-i14b8MYlantiACI4jyjxU5PdX3Nwmz65TdINd7LywrKZu0ahE4GRXCcIGyM48vlXWfdkFhKLqLuF7+EYwLYtHA==",
+      "version": "1.5.9",
+      "resolved": "https://registry.npmjs.org/@chakra-ui/slider/-/slider-1.5.9.tgz",
+      "integrity": "sha512-m9n/BpnD/hEDS9q3T17ezgTFWDdvCocPzxQXzLLDN2Z2xOgwyLTQVLk4iB1yROvLCUl7Ig9C4+a4/7fivm+IHw==",
       "requires": {
-        "@chakra-ui/hooks": "1.7.2",
-        "@chakra-ui/react-utils": "1.2.1",
-        "@chakra-ui/utils": "1.9.1"
+        "@chakra-ui/hooks": "1.8.5",
+        "@chakra-ui/react-utils": "1.2.3",
+        "@chakra-ui/utils": "1.10.4"
+      },
+      "dependencies": {
+        "@chakra-ui/utils": {
+          "version": "1.10.4",
+          "resolved": "https://registry.npmjs.org/@chakra-ui/utils/-/utils-1.10.4.tgz",
+          "integrity": "sha512-AM91VQQxw8F4F1WDA28mqKY6NFIOuzc2Ekkna88imy2OiqqmYH0xkq8J16L2qj4cLiLozpYqba3C79pWioy6FA==",
+          "requires": {
+            "@types/lodash.mergewith": "4.6.6",
+            "css-box-model": "1.2.1",
+            "framesync": "5.3.0",
+            "lodash.mergewith": "4.6.2"
+          }
+        }
       }
     },
     "@chakra-ui/spinner": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/@chakra-ui/spinner/-/spinner-1.2.1.tgz",
-      "integrity": "sha512-CQsUJNJWWSot1ku5Se41Nz1dXIDhk+/7FIhTbfRHSjtYZnAab3CPMHBkTGqwbJxQ9oHYgk9Rso3cfG+/ra6aTQ==",
+      "version": "1.2.6",
+      "resolved": "https://registry.npmjs.org/@chakra-ui/spinner/-/spinner-1.2.6.tgz",
+      "integrity": "sha512-GoUCccN120fGRVgUtfuwcEjeoaxffB+XsgpxX7jhWloXf8b6lkqm68bsxX4Ybb2vGN1fANI98/45JmrnddZO/A==",
       "requires": {
-        "@chakra-ui/utils": "1.9.1",
-        "@chakra-ui/visually-hidden": "1.1.1"
+        "@chakra-ui/utils": "1.10.4",
+        "@chakra-ui/visually-hidden": "1.1.6"
+      },
+      "dependencies": {
+        "@chakra-ui/utils": {
+          "version": "1.10.4",
+          "resolved": "https://registry.npmjs.org/@chakra-ui/utils/-/utils-1.10.4.tgz",
+          "integrity": "sha512-AM91VQQxw8F4F1WDA28mqKY6NFIOuzc2Ekkna88imy2OiqqmYH0xkq8J16L2qj4cLiLozpYqba3C79pWioy6FA==",
+          "requires": {
+            "@types/lodash.mergewith": "4.6.6",
+            "css-box-model": "1.2.1",
+            "framesync": "5.3.0",
+            "lodash.mergewith": "4.6.2"
+          }
+        }
       }
     },
     "@chakra-ui/stat": {
-      "version": "1.2.2",
-      "resolved": "https://registry.npmjs.org/@chakra-ui/stat/-/stat-1.2.2.tgz",
-      "integrity": "sha512-0StsPDC56MjzhdlBl0R8wU0uwj9L1tvhQzge/ELSDn4tQDI7VovrxpFzVH0qsj7EZDwZa0BRQaSrstzWvgmJ/Q==",
+      "version": "1.2.7",
+      "resolved": "https://registry.npmjs.org/@chakra-ui/stat/-/stat-1.2.7.tgz",
+      "integrity": "sha512-m76jumFW1N+mCG4ytrUz9Mh09nZtS4OQcADEvOslfdI5StwwuzasTA1tueaelPzdhBioMwFUWL05Fr1fXbPJ/Q==",
       "requires": {
-        "@chakra-ui/icon": "2.0.0",
-        "@chakra-ui/utils": "1.9.1",
-        "@chakra-ui/visually-hidden": "1.1.1"
+        "@chakra-ui/icon": "2.0.5",
+        "@chakra-ui/utils": "1.10.4",
+        "@chakra-ui/visually-hidden": "1.1.6"
       },
       "dependencies": {
         "@chakra-ui/icon": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/@chakra-ui/icon/-/icon-2.0.0.tgz",
-          "integrity": "sha512-/GuU+xIcOIy9uSUUUCu249ZJB/nLDbjWGkfpoSdBwqT4+ytJrKt+0Ckh3Ub14sz3BJD+Z6IiIt6ySOA9+7lbsA==",
+          "version": "2.0.5",
+          "resolved": "https://registry.npmjs.org/@chakra-ui/icon/-/icon-2.0.5.tgz",
+          "integrity": "sha512-ZrqRvCCIxGr4qFd/r1pmtd9tobRmv8KAxV7ygFoc/t4vOSKTcVIjhE12gsI3FzgvXM15ZFVwsxa1zodwgo5neQ==",
+          "requires": {
+            "@chakra-ui/utils": "1.10.4"
+          }
+        },
+        "@chakra-ui/utils": {
+          "version": "1.10.4",
+          "resolved": "https://registry.npmjs.org/@chakra-ui/utils/-/utils-1.10.4.tgz",
+          "integrity": "sha512-AM91VQQxw8F4F1WDA28mqKY6NFIOuzc2Ekkna88imy2OiqqmYH0xkq8J16L2qj4cLiLozpYqba3C79pWioy6FA==",
           "requires": {
-            "@chakra-ui/utils": "1.9.1"
+            "@types/lodash.mergewith": "4.6.6",
+            "css-box-model": "1.2.1",
+            "framesync": "5.3.0",
+            "lodash.mergewith": "4.6.2"
           }
         }
       }
     },
     "@chakra-ui/styled-system": {
-      "version": "1.16.0",
-      "resolved": "https://registry.npmjs.org/@chakra-ui/styled-system/-/styled-system-1.16.0.tgz",
-      "integrity": "sha512-5vGU4eCixFMXp9u9PT+5724ptzBLP5AcFks88h19TpIevcElCkvAXw2G2CDJ0jJZM59l61nJGHIjn246f3iJUA==",
+      "version": "1.18.1",
+      "resolved": "https://registry.npmjs.org/@chakra-ui/styled-system/-/styled-system-1.18.1.tgz",
+      "integrity": "sha512-uhWMNAfkk1DFAQ4nKu+t23WBQ1/XSJq8Y3sBZJQpvopfwOcarbVvEiM5voSUWPA7pkpD/BprGM7zjIRockUcmw==",
       "requires": {
-        "@chakra-ui/utils": "1.9.1",
+        "@chakra-ui/utils": "1.10.4",
         "csstype": "^3.0.9"
+      },
+      "dependencies": {
+        "@chakra-ui/utils": {
+          "version": "1.10.4",
+          "resolved": "https://registry.npmjs.org/@chakra-ui/utils/-/utils-1.10.4.tgz",
+          "integrity": "sha512-AM91VQQxw8F4F1WDA28mqKY6NFIOuzc2Ekkna88imy2OiqqmYH0xkq8J16L2qj4cLiLozpYqba3C79pWioy6FA==",
+          "requires": {
+            "@types/lodash.mergewith": "4.6.6",
+            "css-box-model": "1.2.1",
+            "framesync": "5.3.0",
+            "lodash.mergewith": "4.6.2"
+          }
+        }
       }
     },
     "@chakra-ui/switch": {
-      "version": "1.3.2",
-      "resolved": "https://registry.npmjs.org/@chakra-ui/switch/-/switch-1.3.2.tgz",
-      "integrity": "sha512-aqhAq93DW97qD/KTBiWe2ip64vxSkN/qimMRFdG4xqtS2DxGeicQiv7Eis3NgAq2xIMM9XOoeXutU4kGkha1+w==",
+      "version": "1.3.8",
+      "resolved": "https://registry.npmjs.org/@chakra-ui/switch/-/switch-1.3.8.tgz",
+      "integrity": "sha512-xcsq4G9YUNRSp0F+XBDjeGZFlJeEdGJptuixk6PZjqRJYUyH+k2bk1bJ2Bv2bjvmkDCojI42MkvWTLHrOqp41A==",
       "requires": {
-        "@chakra-ui/checkbox": "1.6.2",
-        "@chakra-ui/utils": "1.9.1"
+        "@chakra-ui/checkbox": "1.6.8",
+        "@chakra-ui/utils": "1.10.4"
+      },
+      "dependencies": {
+        "@chakra-ui/utils": {
+          "version": "1.10.4",
+          "resolved": "https://registry.npmjs.org/@chakra-ui/utils/-/utils-1.10.4.tgz",
+          "integrity": "sha512-AM91VQQxw8F4F1WDA28mqKY6NFIOuzc2Ekkna88imy2OiqqmYH0xkq8J16L2qj4cLiLozpYqba3C79pWioy6FA==",
+          "requires": {
+            "@types/lodash.mergewith": "4.6.6",
+            "css-box-model": "1.2.1",
+            "framesync": "5.3.0",
+            "lodash.mergewith": "4.6.2"
+          }
+        }
       }
     },
     "@chakra-ui/system": {
-      "version": "1.9.0",
-      "resolved": "https://registry.npmjs.org/@chakra-ui/system/-/system-1.9.0.tgz",
-      "integrity": "sha512-CnLmx3nVZo87puSKxDNNQUwJyWYCnx4ZUFXdDFNdKroQyZUpSYLVv1OniXbkjwEt1YdZMsWm93lZQb/0VRcKvg==",
-      "requires": {
-        "@chakra-ui/color-mode": "1.3.3",
-        "@chakra-ui/react-utils": "1.2.1",
-        "@chakra-ui/styled-system": "1.16.0",
-        "@chakra-ui/utils": "1.9.1",
+      "version": "1.11.2",
+      "resolved": "https://registry.npmjs.org/@chakra-ui/system/-/system-1.11.2.tgz",
+      "integrity": "sha512-s4HGYVo86XuSav5PLfuVT26Y+l3ca/nQVF6QxS6YCNiUxdBlahlzsZz3yMz3MKp11voljnY8vj4z4dvOd2sjUQ==",
+      "requires": {
+        "@chakra-ui/color-mode": "1.4.6",
+        "@chakra-ui/react-utils": "1.2.3",
+        "@chakra-ui/styled-system": "1.18.1",
+        "@chakra-ui/utils": "1.10.4",
         "react-fast-compare": "3.2.0"
+      },
+      "dependencies": {
+        "@chakra-ui/utils": {
+          "version": "1.10.4",
+          "resolved": "https://registry.npmjs.org/@chakra-ui/utils/-/utils-1.10.4.tgz",
+          "integrity": "sha512-AM91VQQxw8F4F1WDA28mqKY6NFIOuzc2Ekkna88imy2OiqqmYH0xkq8J16L2qj4cLiLozpYqba3C79pWioy6FA==",
+          "requires": {
+            "@types/lodash.mergewith": "4.6.6",
+            "css-box-model": "1.2.1",
+            "framesync": "5.3.0",
+            "lodash.mergewith": "4.6.2"
+          }
+        }
       }
     },
     "@chakra-ui/table": {
-      "version": "1.3.1",
-      "resolved": "https://registry.npmjs.org/@chakra-ui/table/-/table-1.3.1.tgz",
-      "integrity": "sha512-+ia/7zs7AGj01lon301EEx+mK4918yGc0K6e68Kxomex8tnxkwbskFWs6hX+6Kzbj56ZBm99eLlKpo2iGYX0HA==",
+      "version": "1.3.6",
+      "resolved": "https://registry.npmjs.org/@chakra-ui/table/-/table-1.3.6.tgz",
+      "integrity": "sha512-7agZAgAeDFKviqStvixqnLAH54+setzhx67EztioZTr5Xu+6hQ4rotfJbu8L4i587pcbNg98kCEXEkidjw0XRQ==",
       "requires": {
-        "@chakra-ui/utils": "1.9.1"
+        "@chakra-ui/utils": "1.10.4"
+      },
+      "dependencies": {
+        "@chakra-ui/utils": {
+          "version": "1.10.4",
+          "resolved": "https://registry.npmjs.org/@chakra-ui/utils/-/utils-1.10.4.tgz",
+          "integrity": "sha512-AM91VQQxw8F4F1WDA28mqKY6NFIOuzc2Ekkna88imy2OiqqmYH0xkq8J16L2qj4cLiLozpYqba3C79pWioy6FA==",
+          "requires": {
+            "@types/lodash.mergewith": "4.6.6",
+            "css-box-model": "1.2.1",
+            "framesync": "5.3.0",
+            "lodash.mergewith": "4.6.2"
+          }
+        }
       }
     },
     "@chakra-ui/tabs": {
-      "version": "1.6.2",
-      "resolved": "https://registry.npmjs.org/@chakra-ui/tabs/-/tabs-1.6.2.tgz",
-      "integrity": "sha512-J0OY4sEhZW0jxlj4MkotLiD0/snMk7IsqvDxUB17MxuFRs5ytUssHzCqO7fexH7fSfd54ITNoUIns6Ir2ueCsA==",
+      "version": "1.6.8",
+      "resolved": "https://registry.npmjs.org/@chakra-ui/tabs/-/tabs-1.6.8.tgz",
+      "integrity": "sha512-f1kM9VhAXqKzTAVRoPRIINNiUgvBcadP9m5GtjAgE4DzCrQKnTDImjIkFhXlMvWEmB5ynXZcCGlsgIZ2A9Hs9g==",
       "requires": {
-        "@chakra-ui/clickable": "1.2.1",
-        "@chakra-ui/descendant": "2.1.1",
-        "@chakra-ui/hooks": "1.7.2",
-        "@chakra-ui/react-utils": "1.2.1",
-        "@chakra-ui/utils": "1.9.1"
+        "@chakra-ui/clickable": "1.2.6",
+        "@chakra-ui/descendant": "2.1.3",
+        "@chakra-ui/hooks": "1.8.5",
+        "@chakra-ui/react-utils": "1.2.3",
+        "@chakra-ui/utils": "1.10.4"
+      },
+      "dependencies": {
+        "@chakra-ui/utils": {
+          "version": "1.10.4",
+          "resolved": "https://registry.npmjs.org/@chakra-ui/utils/-/utils-1.10.4.tgz",
+          "integrity": "sha512-AM91VQQxw8F4F1WDA28mqKY6NFIOuzc2Ekkna88imy2OiqqmYH0xkq8J16L2qj4cLiLozpYqba3C79pWioy6FA==",
+          "requires": {
+            "@types/lodash.mergewith": "4.6.6",
+            "css-box-model": "1.2.1",
+            "framesync": "5.3.0",
+            "lodash.mergewith": "4.6.2"
+          }
+        }
       }
     },
     "@chakra-ui/tag": {
-      "version": "1.2.2",
-      "resolved": "https://registry.npmjs.org/@chakra-ui/tag/-/tag-1.2.2.tgz",
-      "integrity": "sha512-H25y9nEyUAUdwQDND9P4mMXKf1wf9UH4A3DyP237qVKIyYBpa4aCH8eJU4dunh2yIzASB0DWcr7lsul/HAHxmg==",
+      "version": "1.2.7",
+      "resolved": "https://registry.npmjs.org/@chakra-ui/tag/-/tag-1.2.7.tgz",
+      "integrity": "sha512-RKrKOol4i/CnpFfo3T9LMm1abaqM+5Bs0soQLbo1iJBbBACY09sWXrQYvveQ2GYzU/OrAUloHqqmKjyVGOlNtg==",
       "requires": {
-        "@chakra-ui/icon": "2.0.0",
-        "@chakra-ui/utils": "1.9.1"
+        "@chakra-ui/icon": "2.0.5",
+        "@chakra-ui/utils": "1.10.4"
       },
       "dependencies": {
         "@chakra-ui/icon": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/@chakra-ui/icon/-/icon-2.0.0.tgz",
-          "integrity": "sha512-/GuU+xIcOIy9uSUUUCu249ZJB/nLDbjWGkfpoSdBwqT4+ytJrKt+0Ckh3Ub14sz3BJD+Z6IiIt6ySOA9+7lbsA==",
+          "version": "2.0.5",
+          "resolved": "https://registry.npmjs.org/@chakra-ui/icon/-/icon-2.0.5.tgz",
+          "integrity": "sha512-ZrqRvCCIxGr4qFd/r1pmtd9tobRmv8KAxV7ygFoc/t4vOSKTcVIjhE12gsI3FzgvXM15ZFVwsxa1zodwgo5neQ==",
           "requires": {
-            "@chakra-ui/utils": "1.9.1"
+            "@chakra-ui/utils": "1.10.4"
+          }
+        },
+        "@chakra-ui/utils": {
+          "version": "1.10.4",
+          "resolved": "https://registry.npmjs.org/@chakra-ui/utils/-/utils-1.10.4.tgz",
+          "integrity": "sha512-AM91VQQxw8F4F1WDA28mqKY6NFIOuzc2Ekkna88imy2OiqqmYH0xkq8J16L2qj4cLiLozpYqba3C79pWioy6FA==",
+          "requires": {
+            "@types/lodash.mergewith": "4.6.6",
+            "css-box-model": "1.2.1",
+            "framesync": "5.3.0",
+            "lodash.mergewith": "4.6.2"
           }
         }
       }
     },
     "@chakra-ui/textarea": {
-      "version": "1.2.3",
-      "resolved": "https://registry.npmjs.org/@chakra-ui/textarea/-/textarea-1.2.3.tgz",
-      "integrity": "sha512-yLObhuSnIX11GyjsiEIC2gFTDtUoGSpHUqHRD8nF9BmuePHqFzG3jdkBrFMd09u0Ee6kr6o0tia6g9Wt29TyQQ==",
+      "version": "1.2.9",
+      "resolved": "https://registry.npmjs.org/@chakra-ui/textarea/-/textarea-1.2.9.tgz",
+      "integrity": "sha512-HHeUdBA2JrH/S4PopcpOjRmBWKv4wpxQ+Q4mD03UBznyFARZe3XFJOnxhAPdpB/ZadbdgiyXK27TR0uzaqlONw==",
       "requires": {
-        "@chakra-ui/form-control": "1.5.3",
-        "@chakra-ui/utils": "1.9.1"
+        "@chakra-ui/form-control": "1.5.9",
+        "@chakra-ui/utils": "1.10.4"
+      },
+      "dependencies": {
+        "@chakra-ui/utils": {
+          "version": "1.10.4",
+          "resolved": "https://registry.npmjs.org/@chakra-ui/utils/-/utils-1.10.4.tgz",
+          "integrity": "sha512-AM91VQQxw8F4F1WDA28mqKY6NFIOuzc2Ekkna88imy2OiqqmYH0xkq8J16L2qj4cLiLozpYqba3C79pWioy6FA==",
+          "requires": {
+            "@types/lodash.mergewith": "4.6.6",
+            "css-box-model": "1.2.1",
+            "framesync": "5.3.0",
+            "lodash.mergewith": "4.6.2"
+          }
+        }
       }
     },
     "@chakra-ui/theme": {
-      "version": "1.12.3",
-      "resolved": "https://registry.npmjs.org/@chakra-ui/theme/-/theme-1.12.3.tgz",
-      "integrity": "sha512-aqMGSfQLYOrcWBKaD5GuVYrpI5Zoq4Gt3D9P+drB/CDTRgBLWuJI1rbKOSSSJUK4RNZ0WbakPwz6wXiVS3vVdQ==",
+      "version": "1.14.0",
+      "resolved": "https://registry.npmjs.org/@chakra-ui/theme/-/theme-1.14.0.tgz",
+      "integrity": "sha512-zKy/8JSbiCP0QeBsLzdub7aBnfX2k0qp5vD+RA+mxPEiykEvPGg+TwryxRM5KMZK1Zdgg95aH+9mwiGe9tJt3A==",
       "requires": {
-        "@chakra-ui/anatomy": "1.2.1",
-        "@chakra-ui/theme-tools": "1.3.1",
-        "@chakra-ui/utils": "1.9.1"
+        "@chakra-ui/anatomy": "1.3.0",
+        "@chakra-ui/theme-tools": "1.3.6",
+        "@chakra-ui/utils": "1.10.4"
+      },
+      "dependencies": {
+        "@chakra-ui/utils": {
+          "version": "1.10.4",
+          "resolved": "https://registry.npmjs.org/@chakra-ui/utils/-/utils-1.10.4.tgz",
+          "integrity": "sha512-AM91VQQxw8F4F1WDA28mqKY6NFIOuzc2Ekkna88imy2OiqqmYH0xkq8J16L2qj4cLiLozpYqba3C79pWioy6FA==",
+          "requires": {
+            "@types/lodash.mergewith": "4.6.6",
+            "css-box-model": "1.2.1",
+            "framesync": "5.3.0",
+            "lodash.mergewith": "4.6.2"
+          }
+        }
       }
     },
     "@chakra-ui/theme-tools": {
-      "version": "1.3.1",
-      "resolved": "https://registry.npmjs.org/@chakra-ui/theme-tools/-/theme-tools-1.3.1.tgz",
-      "integrity": "sha512-D8arJ5uFGuYZrrFGpXqgov8FhsJYWRyar5oBZY5TJR9gsVYBlJ8Ai91pwM/NflCFqzerTOgyt7bNSGQMdZ8ghA==",
+      "version": "1.3.6",
+      "resolved": "https://registry.npmjs.org/@chakra-ui/theme-tools/-/theme-tools-1.3.6.tgz",
+      "integrity": "sha512-Wxz3XSJhPCU6OwCHEyH44EegEDQHwvlsx+KDkUDGevOjUU88YuNqOVkKtgTpgMLNQcsrYZ93oPWZUJqqCVNRew==",
       "requires": {
-        "@chakra-ui/utils": "1.9.1",
+        "@chakra-ui/utils": "1.10.4",
         "@ctrl/tinycolor": "^3.4.0"
+      },
+      "dependencies": {
+        "@chakra-ui/utils": {
+          "version": "1.10.4",
+          "resolved": "https://registry.npmjs.org/@chakra-ui/utils/-/utils-1.10.4.tgz",
+          "integrity": "sha512-AM91VQQxw8F4F1WDA28mqKY6NFIOuzc2Ekkna88imy2OiqqmYH0xkq8J16L2qj4cLiLozpYqba3C79pWioy6FA==",
+          "requires": {
+            "@types/lodash.mergewith": "4.6.6",
+            "css-box-model": "1.2.1",
+            "framesync": "5.3.0",
+            "lodash.mergewith": "4.6.2"
+          }
+        }
       }
     },
     "@chakra-ui/toast": {
-      "version": "1.5.1",
-      "resolved": "https://registry.npmjs.org/@chakra-ui/toast/-/toast-1.5.1.tgz",
-      "integrity": "sha512-cynOM/mGqf/dPulYOQMcpQnbf8pQWV2SEz1ymW1Nni1hh6zCqW6+pI+YeMxeadJLAwohnRumwzLsRiSL4l+YRQ==",
-      "requires": {
-        "@chakra-ui/alert": "1.3.2",
-        "@chakra-ui/close-button": "1.2.2",
-        "@chakra-ui/hooks": "1.7.2",
-        "@chakra-ui/theme": "1.12.3",
-        "@chakra-ui/transition": "1.4.2",
-        "@chakra-ui/utils": "1.9.1",
+      "version": "1.5.7",
+      "resolved": "https://registry.npmjs.org/@chakra-ui/toast/-/toast-1.5.7.tgz",
+      "integrity": "sha512-vM88vX2jTfSwOXWqcj9o9pm+msojJS0cG0Pe/wSuYP+D274SdE8oB2OFqJyijsQ7WQq/P6BIlgquzUcS4smu9A==",
+      "requires": {
+        "@chakra-ui/alert": "1.3.7",
+        "@chakra-ui/close-button": "1.2.7",
+        "@chakra-ui/hooks": "1.8.5",
+        "@chakra-ui/theme": "1.14.0",
+        "@chakra-ui/transition": "1.4.7",
+        "@chakra-ui/utils": "1.10.4",
         "@reach/alert": "0.13.2"
+      },
+      "dependencies": {
+        "@chakra-ui/utils": {
+          "version": "1.10.4",
+          "resolved": "https://registry.npmjs.org/@chakra-ui/utils/-/utils-1.10.4.tgz",
+          "integrity": "sha512-AM91VQQxw8F4F1WDA28mqKY6NFIOuzc2Ekkna88imy2OiqqmYH0xkq8J16L2qj4cLiLozpYqba3C79pWioy6FA==",
+          "requires": {
+            "@types/lodash.mergewith": "4.6.6",
+            "css-box-model": "1.2.1",
+            "framesync": "5.3.0",
+            "lodash.mergewith": "4.6.2"
+          }
+        }
       }
     },
     "@chakra-ui/tooltip": {
-      "version": "1.4.3",
-      "resolved": "https://registry.npmjs.org/@chakra-ui/tooltip/-/tooltip-1.4.3.tgz",
-      "integrity": "sha512-d+JsT65LPYFoGEfmqvqa3xDzW1enBdAHns3GYoHnie92pLseMKQYJsITO5SmwNGnEiOHbJ8pkB/hggo+xHKkpg==",
-      "requires": {
-        "@chakra-ui/hooks": "1.7.2",
-        "@chakra-ui/popper": "2.4.1",
-        "@chakra-ui/portal": "1.3.2",
-        "@chakra-ui/react-utils": "1.2.1",
-        "@chakra-ui/utils": "1.9.1",
-        "@chakra-ui/visually-hidden": "1.1.1"
+      "version": "1.4.9",
+      "resolved": "https://registry.npmjs.org/@chakra-ui/tooltip/-/tooltip-1.4.9.tgz",
+      "integrity": "sha512-W1GVMFWkLLBfiFsOddhr7oWr2rTKqSy2xxMkR5MuomNaqORW4tvjN/wNSLMUuUHVxtWM+iRQkslE5r6k5/1HAw==",
+      "requires": {
+        "@chakra-ui/hooks": "1.8.5",
+        "@chakra-ui/popper": "2.4.3",
+        "@chakra-ui/portal": "1.3.8",
+        "@chakra-ui/react-utils": "1.2.3",
+        "@chakra-ui/utils": "1.10.4",
+        "@chakra-ui/visually-hidden": "1.1.6"
+      },
+      "dependencies": {
+        "@chakra-ui/utils": {
+          "version": "1.10.4",
+          "resolved": "https://registry.npmjs.org/@chakra-ui/utils/-/utils-1.10.4.tgz",
+          "integrity": "sha512-AM91VQQxw8F4F1WDA28mqKY6NFIOuzc2Ekkna88imy2OiqqmYH0xkq8J16L2qj4cLiLozpYqba3C79pWioy6FA==",
+          "requires": {
+            "@types/lodash.mergewith": "4.6.6",
+            "css-box-model": "1.2.1",
+            "framesync": "5.3.0",
+            "lodash.mergewith": "4.6.2"
+          }
+        }
       }
     },
     "@chakra-ui/transition": {
-      "version": "1.4.2",
-      "resolved": "https://registry.npmjs.org/@chakra-ui/transition/-/transition-1.4.2.tgz",
-      "integrity": "sha512-S+BNmpErHlntl//uaqv0sJegzMsQms0OnJapeZaRsvZL4s1SVYrR8kMrXigkdpeh4lAUqGsLpQHPKkzaKGbBOw==",
+      "version": "1.4.7",
+      "resolved": "https://registry.npmjs.org/@chakra-ui/transition/-/transition-1.4.7.tgz",
+      "integrity": "sha512-2sbMoKB/enp6Qbte3DD6zwBHyO4YAUSgvSr3wn7DAy4hz9kRZHPuUf/N+i9QZ0whL2koXLgdZvV6RNtSTShq4g==",
       "requires": {
-        "@chakra-ui/utils": "1.9.1"
+        "@chakra-ui/utils": "1.10.4"
+      },
+      "dependencies": {
+        "@chakra-ui/utils": {
+          "version": "1.10.4",
+          "resolved": "https://registry.npmjs.org/@chakra-ui/utils/-/utils-1.10.4.tgz",
+          "integrity": "sha512-AM91VQQxw8F4F1WDA28mqKY6NFIOuzc2Ekkna88imy2OiqqmYH0xkq8J16L2qj4cLiLozpYqba3C79pWioy6FA==",
+          "requires": {
+            "@types/lodash.mergewith": "4.6.6",
+            "css-box-model": "1.2.1",
+            "framesync": "5.3.0",
+            "lodash.mergewith": "4.6.2"
+          }
+        }
       }
     },
     "@chakra-ui/utils": {
@@ -21553,11 +22732,24 @@
       }
     },
     "@chakra-ui/visually-hidden": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/@chakra-ui/visually-hidden/-/visually-hidden-1.1.1.tgz",
-      "integrity": "sha512-AGK9YBQS2FW/1e5tfivS8VVXn8y2uTyJ9ACOnGiLm9FNdth9pR0fGil9axlcmhZpEYcSRlnCuma3nkqaCjJnAA==",
+      "version": "1.1.6",
+      "resolved": "https://registry.npmjs.org/@chakra-ui/visually-hidden/-/visually-hidden-1.1.6.tgz",
+      "integrity": "sha512-Xzy5bA0UA+IyMgwJizQYSEdgz8cC/tHdmFB3CniXzmpKTSK8mJddeEBl+cGbXHBzxEUhH7xF1eaS41O+0ezWEQ==",
       "requires": {
-        "@chakra-ui/utils": "1.9.1"
+        "@chakra-ui/utils": "1.10.4"
+      },
+      "dependencies": {
+        "@chakra-ui/utils": {
+          "version": "1.10.4",
+          "resolved": "https://registry.npmjs.org/@chakra-ui/utils/-/utils-1.10.4.tgz",
+          "integrity": "sha512-AM91VQQxw8F4F1WDA28mqKY6NFIOuzc2Ekkna88imy2OiqqmYH0xkq8J16L2qj4cLiLozpYqba3C79pWioy6FA==",
+          "requires": {
+            "@types/lodash.mergewith": "4.6.6",
+            "css-box-model": "1.2.1",
+            "framesync": "5.3.0",
+            "lodash.mergewith": "4.6.2"
+          }
+        }
       }
     },
     "@ctrl/tinycolor": {
@@ -22881,9 +24073,9 @@
       "dev": true
     },
     "@popperjs/core": {
-      "version": "2.11.2",
-      "resolved": "https://registry.npmjs.org/@popperjs/core/-/core-2.11.2.tgz",
-      "integrity": "sha512-92FRmppjjqz29VMJ2dn+xdyXZBrMlE42AV6Kq6BwjWV7CNUW1hs2FtxSNLQE+gJhaZ6AAmYuO9y8dshhcBl7vA=="
+      "version": "2.11.4",
+      "resolved": "https://registry.npmjs.org/@popperjs/core/-/core-2.11.4.tgz",
+      "integrity": "sha512-q/ytXxO5NKvyT37pmisQAItCFqA7FD/vNb8dgaJy3/630Fsc+Mz9/9f2SziBoIZ30TJooXyTwZmhi1zjXmObYg=="
     },
     "@reach/alert": {
       "version": "0.13.2",
@@ -31420,9 +32612,9 @@
       "integrity": "sha512-Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg=="
     },
     "rari-components": {
-      "version": "git+ssh://git@github.com/Rari-Capital/rari-components.git#428603bcc0f0c7f4414e06d5b72353e91a343dd0",
-      "integrity": "sha512-lwRIRDGp0VzI0KGqSnDqGOCMmvYuvQqJfFkNOtGoZS69E10cA4ThrfuzqXSHpAgBp/tiRwI/KX+xV+g4BvlLBw==",
-      "from": "rari-components@git+https://github.com/Rari-Capital/rari-components#428603bcc0f0c7f4414e06d5b72353e91a343dd0",
+      "version": "git+ssh://git@github.com/Rari-Capital/rari-components.git#69cab37898e8f467cfc9c8bd24267d2d62c5e087",
+      "integrity": "sha512-+Bd0usOflaGUNhhfkpq6HUVd4ZiLlXxGTcq4S1+zcHzoFbRLlt+U2vm58/viFnWZZIvfdmR1N0ZlAOu/xhvpDw==",
+      "from": "rari-components@git+https://github.com/Rari-Capital/rari-components#69cab37898e8f467cfc9c8bd24267d2d62c5e087",
       "requires": {}
     },
     "rari-tokens-generator": {
diff --git a/package.json b/package.json
index 3506d1e4..7d822042 100644
--- a/package.json
+++ b/package.json
@@ -35,7 +35,7 @@
     "node-fetch": "^2.6.1",
     "node-vibrant": "^3.1.6",
     "polished": "^4.1.3",
-    "rari-components": "git+https://github.com/Rari-Capital/rari-components#428603bcc0f0c7f4414e06d5b72353e91a343dd0",
+    "rari-components": "git+https://github.com/Rari-Capital/rari-components#69cab37898e8f467cfc9c8bd24267d2d62c5e087",
     "rari-tokens-generator": "^2.0.0",
     "react": "^17.0.2",
     "react-apexcharts": "1.3.7",
diff --git a/src/components/pages/Fuse/Modals/CVXMigrateModal.tsx b/src/components/pages/Fuse/Modals/CVXMigrateModal.tsx
index 9c31400e..bda48d03 100644
--- a/src/components/pages/Fuse/Modals/CVXMigrateModal.tsx
+++ b/src/components/pages/Fuse/Modals/CVXMigrateModal.tsx
@@ -10,12 +10,11 @@ import {
     Flex,
     VStack,
     Spacer,
-    Button,
     HStack,
     useToast,
     Avatar,
-    Box,
     Image,
+    Center,
 } from "@chakra-ui/react"
 import { POOL_156_COMPTROLLER } from "constants/convex"
 import { useRari } from "context/RariContext"
@@ -28,6 +27,7 @@ import { useBorrowLimit, useTotalSupply } from "hooks/useBorrowLimit"
 import { useFusePoolData } from "hooks/useFusePoolData"
 import useHasApproval from "hooks/useHasApproval"
 import { useTokensDataAsMap } from "hooks/useTokenData"
+import { Button, Card, Heading, StepBubbles } from "rari-components";
 import { useEffect, useMemo, useState } from "react"
 import { useQuery } from "react-query"
 import { TokensDataMap } from "types/tokens"
@@ -238,14 +238,14 @@ export const CVXMigrateModal = ({
 
                         <Flex direction="column" height="100%">
                             {/* <AppLink isExternal={true} href="https://www.convexfinance.com/stake"> */}
-                            <VStack align={"flex-start"} my={2}>
+                            <VStack align="stretch" my={2}>
                                 <Text>
-                                    We detected <b>{smallStringUsdFormatter(newTotalSupply.toString())}</b> from {Object.keys(cvxBalances).length}
+                                    We detected <b>{smallStringUsdFormatter(newTotalSupply.toString())}</b> from {Object.keys(cvxBalances).length}{' '}
                                     staked Convex positions
                                     {!!(Object.keys(curveLPBalances)).length && ` and ${Object.keys(curveLPBalances).length} Curve LP tokens`}.
                                     You can borrow up to <b>{smallStringUsdFormatter(borrowLimit.toString())}</b> by migrating them to Fuse.</Text>
                                 {/* Select from available markets */}
-                                <HStack>
+                                <VStack align="stretch" py={4}>
                                     {Object.keys(marketsBalancesMap).map((market, i) =>
                                         <Market
                                             assetIndex={assetIndex}
@@ -257,64 +257,49 @@ export const CVXMigrateModal = ({
                                             marketsBalancesMap={marketsBalancesMap}
                                         />
                                     )}
-                                </HStack>
+                                </VStack>
                                 <Spacer />
                                 <Text>
-                                    Migrate {activeSymbol} in 3 clicks
+                                    Migrate <b>{activeSymbol}</b> in 3 clicks
                                 </Text>
 
-                                {showUnstake && (
-                                    <HStack>
-                                        <Text>
-                                            1.)
-                                        </Text>
-                                        <Button colorScheme="blue" disabled={!!step && step !== 1} onClick={handleUnstake}>
+                                <VStack py={2} align="stretch">
+                                    {showUnstake && (
+                                        <Button disabled={!!step && step !== 1} onClick={handleUnstake}>
                                             {
                                                 activeStep === 1 ? "Unstaking and Claiming..." : `Unstake ${activeSymbol} and Claim Rewards`
                                             }
                                         </Button>
-                                    </HStack>
-                                )}
-
-                                {showApproval && (
-                                    <HStack>
-                                        <Text>
-                                            2.)
-                                        </Text>
-                                        <Button colorScheme="blue" disabled={step !== 2} onClick={handleApproveMarket}>
+                                    )}
+
+                                    {showApproval && (
+                                        <Button disabled={step !== 2} onClick={handleApproveMarket}>
                                             {
                                                 activeStep === 2 ? `Approving ${activeSymbol}...` : ` Approve ${activeSymbol}`
                                             }
                                         </Button>
-                                    </HStack>
-                                )}
-
+                                    )}
 
-                                <HStack>
-                                    <Text>
-                                        3.)
-                                    </Text>
-                                    <Button colorScheme="blue" disabled={step !== 3} onClick={handleDeposit}>
+                                    <Button disabled={step !== 3} onClick={handleDeposit}>
                                         {
                                             activeStep === 3 ? `Depositing ${activeSymbol}...` : ` Deposit ${activeSymbol}`
                                         }
                                     </Button>
-                                </HStack>
-
-                                {showEnableAsCollateral && step === 4 && <HStack>
-                                    <Text>
-                                        4.)
-                                    </Text>
-                                    <Button colorScheme="blue" disabled={step !== 4} onClick={handleCollateralize}>
-                                        {
-                                            activeStep === 4 ? `Collateralizing...` : `Collateralize`
-                                        }
-                                    </Button>
-                                </HStack>}
-
-                                {step === 5 && <Text>Done!</Text>}
-
 
+                                    {showEnableAsCollateral && step === 4 && <HStack>
+                                        <Button disabled={step !== 4} onClick={handleCollateralize}>
+                                            {
+                                                activeStep === 4 ? `Collateralizing...` : `Collateralize`
+                                            }
+                                        </Button>
+                                    </HStack>}
+
+                                    {step === 5 && <Text>Done!</Text>}
+                                </VStack>
+                                    
+                                <Center pt={4}>
+                                    <StepBubbles activeIndex={(activeStep ?? 1) - 1}  steps={4} />
+                                </Center>
                             </VStack>
                         </Flex>
                     </ModalBody>
@@ -351,22 +336,31 @@ const Market = ({
     }
 }) => {
     return (
-        <Box onClick={() => setAssetIndex(i)} bg={assetIndex === i ? "aqua" : "white"} border="1px solid red">
+        <Card
+            onClick={() => setAssetIndex(i)}
+            variant={assetIndex === i ? "active" : "light"}
+            p={3}
+        >
             <VStack>
                 <HStack key={market}>
                     <Avatar src={tokensData[marketsUnderlyingMap[market]]?.logoURL} />
-                    <Text>
+                    <Heading>
                         {tokensData[marketsUnderlyingMap[market]]?.symbol}
+                    </Heading>
+                </HStack>
+                <HStack>
+                    <Text>
+                        {commify(parseFloat(formatEther(marketsBalancesMap[market].stakedBalance)).toFixed(2))} staked
+                    </Text>
+                    <Text>
+                        &middot;
+                    </Text>
+                    <Text>
+                        {commify(parseFloat(formatEther(marketsBalancesMap[market].curveBalance)).toFixed(2))} in Curve
                     </Text>
                 </HStack>
-                <Text>
-                    {commify(parseFloat(formatEther(marketsBalancesMap[market].stakedBalance)).toFixed(2))} staked
-                </Text>
-                <Text>
-                    {commify(parseFloat(formatEther(marketsBalancesMap[market].curveBalance)).toFixed(2))} in Curve
-                </Text>
             </VStack>
-        </Box>
+        </Card>
     )
 }
 
diff --git a/src/context/RariContext.tsx b/src/context/RariContext.tsx
index a747859e..c9937b04 100644
--- a/src/context/RariContext.tsx
+++ b/src/context/RariContext.tsx
@@ -132,7 +132,7 @@ export const RariProvider = ({ children }: { children: ReactNode }) => {
   const { t } = useTranslation();
 
   useEffect(() => {
-    // if (!!requestedAddress) setAddress(requestedAddress as string)
+    if (!!requestedAddress) setAddress(requestedAddress as string)
   }, [requestedAddress])
 
   useEffect(() => {

From ec05dc9575d8514b02e6ae6cbc04c57bb6289231 Mon Sep 17 00:00:00 2001
From: nathanhleung <github@nathanhleung.com>
Date: Wed, 16 Mar 2022 21:08:19 -0700
Subject: [PATCH 10/19] Use ExpandableCard

---
 .../pages/Fuse/Modals/CVXMigrateModal.tsx     | 292 +++++++++---------
 1 file changed, 147 insertions(+), 145 deletions(-)

diff --git a/src/components/pages/Fuse/Modals/CVXMigrateModal.tsx b/src/components/pages/Fuse/Modals/CVXMigrateModal.tsx
index bda48d03..0f98bbfe 100644
--- a/src/components/pages/Fuse/Modals/CVXMigrateModal.tsx
+++ b/src/components/pages/Fuse/Modals/CVXMigrateModal.tsx
@@ -9,12 +9,11 @@ import {
     Text,
     Flex,
     VStack,
-    Spacer,
     HStack,
     useToast,
     Avatar,
     Image,
-    Center,
+    Box,
 } from "@chakra-ui/react"
 import { POOL_156_COMPTROLLER } from "constants/convex"
 import { useRari } from "context/RariContext"
@@ -27,8 +26,8 @@ import { useBorrowLimit, useTotalSupply } from "hooks/useBorrowLimit"
 import { useFusePoolData } from "hooks/useFusePoolData"
 import useHasApproval from "hooks/useHasApproval"
 import { useTokensDataAsMap } from "hooks/useTokenData"
-import { Button, Card, Heading, StepBubbles } from "rari-components";
-import { useEffect, useMemo, useState } from "react"
+import { Button, ExpandableCard, Heading } from "rari-components";
+import { useEffect, useState } from "react"
 import { useQuery } from "react-query"
 import { TokensDataMap } from "types/tokens"
 import { smallStringUsdFormatter } from "utils/bigUtils"
@@ -44,15 +43,10 @@ export const CVXMigrateModal = ({
     onClose: () => void,
 }) => {
 
-    const { fuse, address } = useRari()
+    const { address } = useRari()
     const cvxBalances = useStakedConvexBalances()
     const curveLPBalances = useCurveLPBalances()
 
-    // Steppers
-    const toast = useToast()
-    const [step, setStep] = useState<1 | 2 | 3 | 4 | 5 | undefined>()
-    const [activeStep, setActiveStep] = useState<1 | 2 | 3 | 4 | 5 | undefined>()
-
     // Fuse pool Data
     const fusePoolData = useFusePoolData("156")
     const assets = !fusePoolData ? [] : fusePoolData.assets.filter(a => Object.keys(cvxBalances).includes(a.cToken) || Object.keys(curveLPBalances).includes(a.underlyingToken))
@@ -89,8 +83,6 @@ export const CVXMigrateModal = ({
         }
     }, {})
 
-    const marketBalanceForAsset = marketsBalancesMap[assets[assetIndex]?.cToken]
-
     // Simulates you depositing all your CVX positions into us - to get projected totalSupply & projected borrowLimit
     const { data: updatedUserAssets } = useQuery('updated assets for convex user ' + address, async () => {
 
@@ -132,93 +124,6 @@ export const CVXMigrateModal = ({
     const borrowLimit = useBorrowLimit(updatedUserAssets ?? [])
     const newTotalSupply = useTotalSupply(updatedUserAssets ?? [])
 
-
-
-    /*  Unstakes and Claims all CVX Staked Positions supported by Fuse  */
-    const handleUnstake = async () => {
-        const { stakedBalance } = marketBalanceForAsset
-        try {
-            setActiveStep(1)
-            if (stakedBalance.gt(0)) {
-                const baseRewardPool = cvxBalances[assets[assetIndex].cToken].baseRewardsPool
-                const res = await unstakeAndWithdrawCVXPool(fuse, baseRewardPool)
-                setStep(2)
-
-            }
-        } catch (err) {
-            setActiveStep(undefined)
-
-            handleGenericError(err, toast)
-        }
-    }
-
-    // Approve for stakedBalance + curveBalance
-    const handleApproveMarket = async () => {
-        const { cToken, underlyingToken } = assets[assetIndex]
-        const { total } = marketBalanceForAsset
-        try {
-            setActiveStep(2)
-            const res = await checkAllowanceAndApprove(fuse, address, cToken, underlyingToken, total)
-            console.log({ res })
-            setStep(3)
-        } catch (err) {
-            setActiveStep(undefined)
-
-            handleGenericError(err, toast)
-        }
-    }
-
-    // Deposit curveBalance
-    const handleDeposit = async () => {
-        const { cToken } = assets[assetIndex]
-        const { curveBalance } = marketBalanceForAsset
-        try {
-            setActiveStep(3)
-            const res = await deposit(fuse, cToken, curveBalance)
-            console.log({ res })
-            setStep(4)
-        } catch (err) {
-            setActiveStep(undefined)
-
-            handleGenericError(err, toast)
-        }
-    }
-
-    // Collateralize all
-    const handleCollateralize = async () => {
-        const markets = Object.keys(marketsBalancesMap)
-        try {
-            setActiveStep(4)
-            const res = await collateralize(fuse, POOL_156_COMPTROLLER, markets)
-            console.log({ res })
-            setStep(5)
-        } catch (err) {
-            setActiveStep(undefined)
-
-            handleGenericError(err, toast)
-        }
-    }
-
-
-    // If you've already approved this market, skip
-    const hasApproval = useHasApproval(assets[assetIndex], marketBalanceForAsset?.total.toString() ?? "0")
-    const showApproval = !hasApproval
-    // We show enable as Collateral only if this asset has not yet been anabled
-    const showEnableAsCollateral = !assets[assetIndex]?.membership
-    // If you dont have any staked, you dont need to unstake to enter this market
-    const showUnstake = !marketBalanceForAsset?.stakedBalance?.isZero() ?? true
-
-    const activeSymbol = tokenData[assets[assetIndex]?.underlyingToken]?.symbol
-
-    // Skip to step conditionally
-    useEffect(() => {
-        if (!showUnstake) setStep(2)
-        else if (hasApproval) setStep(3)
-        else setStep(undefined)
-    }, [assetIndex])
-
-
-
     return (
         <>
             <Modal isOpen={isOpen} onClose={onClose}>
@@ -258,48 +163,6 @@ export const CVXMigrateModal = ({
                                         />
                                     )}
                                 </VStack>
-                                <Spacer />
-                                <Text>
-                                    Migrate <b>{activeSymbol}</b> in 3 clicks
-                                </Text>
-
-                                <VStack py={2} align="stretch">
-                                    {showUnstake && (
-                                        <Button disabled={!!step && step !== 1} onClick={handleUnstake}>
-                                            {
-                                                activeStep === 1 ? "Unstaking and Claiming..." : `Unstake ${activeSymbol} and Claim Rewards`
-                                            }
-                                        </Button>
-                                    )}
-
-                                    {showApproval && (
-                                        <Button disabled={step !== 2} onClick={handleApproveMarket}>
-                                            {
-                                                activeStep === 2 ? `Approving ${activeSymbol}...` : ` Approve ${activeSymbol}`
-                                            }
-                                        </Button>
-                                    )}
-
-                                    <Button disabled={step !== 3} onClick={handleDeposit}>
-                                        {
-                                            activeStep === 3 ? `Depositing ${activeSymbol}...` : ` Deposit ${activeSymbol}`
-                                        }
-                                    </Button>
-
-                                    {showEnableAsCollateral && step === 4 && <HStack>
-                                        <Button disabled={step !== 4} onClick={handleCollateralize}>
-                                            {
-                                                activeStep === 4 ? `Collateralizing...` : `Collateralize`
-                                            }
-                                        </Button>
-                                    </HStack>}
-
-                                    {step === 5 && <Text>Done!</Text>}
-                                </VStack>
-                                    
-                                <Center pt={4}>
-                                    <StepBubbles activeIndex={(activeStep ?? 1) - 1}  steps={4} />
-                                </Center>
                             </VStack>
                         </Flex>
                     </ModalBody>
@@ -335,11 +198,150 @@ const Market = ({
         }
     }
 }) => {
+    const { address, fuse } = useRari();
+    const fusePoolData = useFusePoolData("156")
+    const cvxBalances = useStakedConvexBalances();
+    const curveLPBalances = useCurveLPBalances()
+    const assets = !fusePoolData
+        ? []
+        : fusePoolData.assets.filter(a =>
+            Object.keys(cvxBalances).includes(a.cToken) ||
+            Object.keys(curveLPBalances).includes(a.underlyingToken)
+        )
+
+    // Skip to step conditionally
+    useEffect(() => {
+        if (!showUnstake) setStep(2)
+        else if (hasApproval) setStep(3)
+        else setStep(undefined)
+    }, [assetIndex])
+
+    const marketBalanceForAsset = marketsBalancesMap[assets[assetIndex]?.cToken]
+
+    // Steppers
+    const toast = useToast()
+    const [step, setStep] = useState<1 | 2 | 3 | 4 | 5 | undefined>()
+    const [activeStep, setActiveStep] = useState<1 | 2 | 3 | 4 | 5 | undefined>()
+        
+    /*  Unstakes and Claims all CVX Staked Positions supported by Fuse  */
+    const handleUnstake = async () => {
+        const { stakedBalance } = marketBalanceForAsset
+        try {
+            setActiveStep(1)
+            if (stakedBalance.gt(0)) {
+                const baseRewardPool = cvxBalances[assets[assetIndex].cToken].baseRewardsPool
+                const res = await unstakeAndWithdrawCVXPool(fuse, baseRewardPool)
+                setStep(2)
+
+            }
+        } catch (err) {
+            setActiveStep(undefined)
+
+            handleGenericError(err, toast)
+        }
+    }
+
+    // Approve for stakedBalance + curveBalance
+    const handleApproveMarket = async () => {
+        const { cToken, underlyingToken } = assets[assetIndex]
+        const { total } = marketBalanceForAsset
+        try {
+            setActiveStep(2)
+            const res = await checkAllowanceAndApprove(fuse, address, cToken, underlyingToken, total)
+            console.log({ res })
+            setStep(3)
+        } catch (err) {
+            setActiveStep(undefined)
+
+            handleGenericError(err, toast)
+        }
+    }
+
+    // Deposit curveBalance
+    const handleDeposit = async () => {
+        const { cToken } = assets[assetIndex]
+        const { curveBalance } = marketBalanceForAsset
+        try {
+            setActiveStep(3)
+            const res = await deposit(fuse, cToken, curveBalance)
+            console.log({ res })
+            setStep(4)
+        } catch (err) {
+            setActiveStep(undefined)
+
+            handleGenericError(err, toast)
+        }
+    }
+
+    // Collateralize all
+    const handleCollateralize = async () => {
+        const markets = Object.keys(marketsBalancesMap)
+        try {
+            setActiveStep(4)
+            const res = await collateralize(fuse, POOL_156_COMPTROLLER, markets)
+            console.log({ res })
+            setStep(5)
+        } catch (err) {
+            setActiveStep(undefined)
+
+            handleGenericError(err, toast)
+        }
+    }
+    
+    const hasApproval = useHasApproval(assets[assetIndex], marketBalanceForAsset?.total.toString() ?? "0")
+    const showApproval = !hasApproval
+    // We show enable as Collateral only if this asset has not yet been anabled
+    const showEnableAsCollateral = !assets[assetIndex]?.membership
+    // If you dont have any staked, you dont need to unstake to enter this market
+    const showUnstake = !marketBalanceForAsset?.stakedBalance?.isZero() ?? true
+
+    const activeSymbol = tokensData[assets[assetIndex]?.underlyingToken]?.symbol
+
     return (
-        <Card
-            onClick={() => setAssetIndex(i)}
-            variant={assetIndex === i ? "active" : "light"}
+        <ExpandableCard
+            variant="light"
             p={3}
+            expandableChildren={
+                <Box textAlign="center">
+                    <Text pb={4}>
+                        Migrate <b>{activeSymbol}</b> in 3 clicks
+                    </Text>
+
+                    <VStack py={2} align="stretch">
+                        {showUnstake && (
+                            <Button disabled={!!step && step !== 1} onClick={handleUnstake}>
+                                {
+                                    activeStep === 1 ? "Unstaking and Claiming..." : `Unstake ${activeSymbol} and Claim Rewards`
+                                }
+                            </Button>
+                        )}
+
+                        {showApproval && (
+                            <Button disabled={step !== 2} onClick={handleApproveMarket}>
+                                {
+                                    activeStep === 2 ? `Approving ${activeSymbol}...` : ` Approve ${activeSymbol}`
+                                }
+                            </Button>
+                        )}
+
+                        <Button disabled={step !== 3} onClick={handleDeposit}>
+                            {
+                                activeStep === 3 ? `Depositing ${activeSymbol}...` : ` Deposit ${activeSymbol}`
+                            }
+                        </Button>
+
+                        {showEnableAsCollateral && step === 4 && <HStack>
+                            <Button disabled={step !== 4} onClick={handleCollateralize}>
+                                {
+                                    activeStep === 4 ? `Collateralizing...` : `Collateralize`
+                                }
+                            </Button>
+                        </HStack>}
+
+                        {step === 5 && <Text>Done!</Text>}
+                    </VStack>
+                </Box>
+            }
         >
             <VStack>
                 <HStack key={market}>
@@ -360,7 +362,7 @@ const Market = ({
                     </Text>
                 </HStack>
             </VStack>
-        </Card>
+        </ExpandableCard>
     )
 }
 

From dea14e2647d2f3eff28580f4e6cdd4aa6c627f61 Mon Sep 17 00:00:00 2001
From: sharad-s <sharadshekar@gmail.com>
Date: Thu, 17 Mar 2022 00:18:54 -0500
Subject: [PATCH 11/19] accordion

---
 src/components/pages/Fuse/Modals/PoolModal/AmountSelect.tsx | 3 +++
 src/hooks/fuse/useUpdatedUserAssets.ts                      | 1 -
 src/hooks/useTokenBalance.ts                                | 3 ++-
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/components/pages/Fuse/Modals/PoolModal/AmountSelect.tsx b/src/components/pages/Fuse/Modals/PoolModal/AmountSelect.tsx
index 420c7f66..747a1831 100644
--- a/src/components/pages/Fuse/Modals/PoolModal/AmountSelect.tsx
+++ b/src/components/pages/Fuse/Modals/PoolModal/AmountSelect.tsx
@@ -704,6 +704,9 @@ const StatsColumn = ({
     ignoreIsEnabledCheckFor: enableAsCollateral ? asset.cToken : undefined,
   }, `new limit`);
 
+
+  console.log({})
+
   // console.log({ assets, updatedAssets })
 
   const isSupplyingOrWithdrawing =
diff --git a/src/hooks/fuse/useUpdatedUserAssets.ts b/src/hooks/fuse/useUpdatedUserAssets.ts
index 3c9f2135..623a9822 100644
--- a/src/hooks/fuse/useUpdatedUserAssets.ts
+++ b/src/hooks/fuse/useUpdatedUserAssets.ts
@@ -53,7 +53,6 @@ const useUpdatedUserAssets = ({
               .mul(assetToBeUpdated.underlyingPrice)
               .mul(parseEther(ethPrice.toString()))
               .div(constants.WeiPerEther),
-
             totalSupply,
             supplyRatePerBlock: interestRateModel.getSupplyRate(
               totalSupply.gt(0)
diff --git a/src/hooks/useTokenBalance.ts b/src/hooks/useTokenBalance.ts
index a02458b4..08ff1784 100644
--- a/src/hooks/useTokenBalance.ts
+++ b/src/hooks/useTokenBalance.ts
@@ -14,6 +14,7 @@ import { ETH_TOKEN_DATA } from "./useTokenData";
 import { Contract, BigNumber as EthersBigNumber, constants } from "ethers";
 
 import { providers } from "@0xsequence/multicall"
+import { BigNumber } from "ethers";
 
 export const fetchTokenBalance = async (
   tokenAddress: string | undefined,
@@ -76,7 +77,7 @@ export const useTokenBalances = (tokenAddresses: string[]): number[] => {
           
           let contract = new Contract(tokenAddress, ERC20ABI as any, multiCallProvider)
           return contract.balanceOf(address)
-            .then((balance: number) => parseFloat(balance.toString()))
+            .then((balance: BigNumber) => parseFloat(balance.toString()))
             .catch((_err: any) => { })
         })
       )

From f6bb6f203e9072999fc642313c9c9d62f5676981 Mon Sep 17 00:00:00 2001
From: sharad-s <sharadshekar@gmail.com>
Date: Thu, 17 Mar 2022 00:19:08 -0500
Subject: [PATCH 12/19]  accordion

---
 .../pages/Fuse/Modals/CVXMigrateModal.tsx     | 235 ++++++++++--------
 src/context/RariContext.tsx                   |   2 +-
 src/hooks/useBorrowLimit.ts                   |   1 -
 3 files changed, 127 insertions(+), 111 deletions(-)

diff --git a/src/components/pages/Fuse/Modals/CVXMigrateModal.tsx b/src/components/pages/Fuse/Modals/CVXMigrateModal.tsx
index 0f98bbfe..b347d554 100644
--- a/src/components/pages/Fuse/Modals/CVXMigrateModal.tsx
+++ b/src/components/pages/Fuse/Modals/CVXMigrateModal.tsx
@@ -14,6 +14,7 @@ import {
     Avatar,
     Image,
     Box,
+    Accordion,
 } from "@chakra-ui/react"
 import { POOL_156_COMPTROLLER } from "constants/convex"
 import { useRari } from "context/RariContext"
@@ -43,7 +44,7 @@ export const CVXMigrateModal = ({
     onClose: () => void,
 }) => {
 
-    const { address } = useRari()
+    const { address, fuse } = useRari()
     const cvxBalances = useStakedConvexBalances()
     const curveLPBalances = useCurveLPBalances()
 
@@ -53,6 +54,12 @@ export const CVXMigrateModal = ({
     const [assetIndex, setAssetIndex] = useState(0)
     const tokenData = useTokensDataAsMap(assets.map(a => a.underlyingToken))
 
+
+    // Steppers
+    const toast = useToast()
+    const [step, setStep] = useState<number | undefined>()
+    const [activeStep, setActiveStep] = useState<number | undefined>()
+
     // marketAddr -> underlying
     const marketsUnderlyingMap: { [underlying: string]: string } = assets.reduce((obj, asset) => ({
         ...obj,
@@ -83,6 +90,9 @@ export const CVXMigrateModal = ({
         }
     }, {})
 
+    const market = assets[assetIndex]
+    const marketBalanceForAsset = marketsBalancesMap[market?.cToken]
+
     // Simulates you depositing all your CVX positions into us - to get projected totalSupply & projected borrowLimit
     const { data: updatedUserAssets } = useQuery('updated assets for convex user ' + address, async () => {
 
@@ -124,105 +134,6 @@ export const CVXMigrateModal = ({
     const borrowLimit = useBorrowLimit(updatedUserAssets ?? [])
     const newTotalSupply = useTotalSupply(updatedUserAssets ?? [])
 
-    return (
-        <>
-            <Modal isOpen={isOpen} onClose={onClose}>
-                <ModalOverlay />
-                <ModalContent>
-                    <ModalHeader display="flex" width="100%" alignSelf="center">
-                        <HStack>
-                            <Image src="/static/icons/convex.svg" boxSize="40px" />
-                            <Text fontSize="lg" mr={4} alignSelf="center">
-                                Migrate Staked CVX Positions to Fuse
-                            </Text>
-                        </HStack>
-
-                        <ModalCloseButton />
-                    </ModalHeader>
-                    <ModalBody>
-
-                        <Flex direction="column" height="100%">
-                            {/* <AppLink isExternal={true} href="https://www.convexfinance.com/stake"> */}
-                            <VStack align="stretch" my={2}>
-                                <Text>
-                                    We detected <b>{smallStringUsdFormatter(newTotalSupply.toString())}</b> from {Object.keys(cvxBalances).length}{' '}
-                                    staked Convex positions
-                                    {!!(Object.keys(curveLPBalances)).length && ` and ${Object.keys(curveLPBalances).length} Curve LP tokens`}.
-                                    You can borrow up to <b>{smallStringUsdFormatter(borrowLimit.toString())}</b> by migrating them to Fuse.</Text>
-                                {/* Select from available markets */}
-                                <VStack align="stretch" py={4}>
-                                    {Object.keys(marketsBalancesMap).map((market, i) =>
-                                        <Market
-                                            assetIndex={assetIndex}
-                                            setAssetIndex={setAssetIndex}
-                                            market={market}
-                                            i={i}
-                                            tokensData={tokenData}
-                                            marketsUnderlyingMap={marketsUnderlyingMap}
-                                            marketsBalancesMap={marketsBalancesMap}
-                                        />
-                                    )}
-                                </VStack>
-                            </VStack>
-                        </Flex>
-                    </ModalBody>
-                    <ModalFooter mt={2}>
-
-                    </ModalFooter>
-                </ModalContent>
-            </Modal>
-        </>
-    )
-}
-
-const Market = ({
-    setAssetIndex,
-    assetIndex,
-    market,
-    i,
-    tokensData,
-    marketsUnderlyingMap,
-    marketsBalancesMap
-}: {
-    setAssetIndex: any,
-    assetIndex: number,
-    market: string,
-    i: number;
-    tokensData: TokensDataMap,
-    marketsUnderlyingMap: { [underlying: string]: string },
-    marketsBalancesMap: {
-        [cToken: string]: {
-            stakedBalance: BigNumber,
-            curveBalance: BigNumber,
-            total: BigNumber
-        }
-    }
-}) => {
-    const { address, fuse } = useRari();
-    const fusePoolData = useFusePoolData("156")
-    const cvxBalances = useStakedConvexBalances();
-    const curveLPBalances = useCurveLPBalances()
-    const assets = !fusePoolData
-        ? []
-        : fusePoolData.assets.filter(a =>
-            Object.keys(cvxBalances).includes(a.cToken) ||
-            Object.keys(curveLPBalances).includes(a.underlyingToken)
-        )
-
-    // Skip to step conditionally
-    useEffect(() => {
-        if (!showUnstake) setStep(2)
-        else if (hasApproval) setStep(3)
-        else setStep(undefined)
-    }, [assetIndex])
-
-    const marketBalanceForAsset = marketsBalancesMap[assets[assetIndex]?.cToken]
-
-    // Steppers
-    const toast = useToast()
-    const [step, setStep] = useState<1 | 2 | 3 | 4 | 5 | undefined>()
-    const [activeStep, setActiveStep] = useState<1 | 2 | 3 | 4 | 5 | undefined>()
-        
     /*  Unstakes and Claims all CVX Staked Positions supported by Fuse  */
     const handleUnstake = async () => {
         const { stakedBalance } = marketBalanceForAsset
@@ -287,20 +198,126 @@ const Market = ({
             handleGenericError(err, toast)
         }
     }
-    
-    const hasApproval = useHasApproval(assets[assetIndex], marketBalanceForAsset?.total.toString() ?? "0")
+
+    return (
+        <>
+            <Modal isOpen={isOpen} onClose={onClose}>
+                <ModalOverlay />
+                <ModalContent>
+                    <ModalHeader display="flex" width="100%" alignSelf="center">
+                        <HStack>
+                            <Image src="/static/icons/convex.svg" boxSize="40px" />
+                            <Text fontSize="lg" mr={4} alignSelf="center">
+                                Migrate Staked CVX Positions to Fuse
+                            </Text>
+                        </HStack>
+
+                        <ModalCloseButton />
+                    </ModalHeader>
+                    <ModalBody>
+
+                        <Flex direction="column" height="100%">
+                            {/* <AppLink isExternal={true} href="https://www.convexfinance.com/stake"> */}
+                            <VStack align="stretch" my={2}>
+                                <Text>
+                                    We detected <b>{smallStringUsdFormatter(newTotalSupply.toString())}</b> from {Object.keys(cvxBalances).length}{' '}
+                                    staked Convex positions
+                                    {!!(Object.keys(curveLPBalances)).length && ` and ${Object.keys(curveLPBalances).length} Curve LP tokens`}.
+                                    You can borrow up to <b>{smallStringUsdFormatter(borrowLimit.toString())}</b> by migrating them to Fuse.</Text>
+                                {/* Select from available markets */}
+                                <Accordion  allowToggle index={assetIndex} onChange={(i: number) => setAssetIndex(i)}>
+                                <VStack align="stretch" py={4}>
+                                    {Object.keys(marketsBalancesMap).map((market, i) =>
+                                        <Market
+                                            assetIndex={assetIndex}
+                                            asset={assets[i]}
+                                            setAssetIndex={setAssetIndex}
+                                            i={i}
+                                            tokensData={tokenData}
+                                            marketsUnderlyingMap={marketsUnderlyingMap}
+                                            marketBalanceForAsset={marketsBalancesMap[market]}
+                                            step={step}
+                                            activeStep={activeStep}
+                                            setStep={setStep}
+                                            handleUnstake={handleUnstake}
+                                            handleApproveMarket={handleApproveMarket}
+                                            handleDeposit={handleDeposit}
+                                            handleCollateralize={handleCollateralize}
+                                        />
+                                    )}
+                                </VStack>
+                                </Accordion>
+                            </VStack>
+                        </Flex>
+                    </ModalBody>
+                    <ModalFooter mt={2}>
+
+                    </ModalFooter>
+                </ModalContent>
+            </Modal>
+        </>
+    )
+}
+
+const Market = ({
+    assetIndex,
+    asset,
+    i,
+    tokensData,
+    marketsUnderlyingMap,
+    marketBalanceForAsset,
+    step,
+    activeStep,
+    setStep,
+    handleUnstake,
+    handleApproveMarket,
+    handleDeposit,
+    handleCollateralize
+}: {
+    assetIndex: number,
+    setAssetIndex: (step: number) => void,
+    asset: USDPricedFuseAsset,
+    i: number;
+    tokensData: TokensDataMap,
+    marketsUnderlyingMap: { [underlying: string]: string },
+    marketBalanceForAsset: {
+        stakedBalance: BigNumber,
+        curveBalance: BigNumber,
+        total: BigNumber
+    },
+    step: number | undefined,
+    activeStep: number | undefined,
+    setStep: (step: number | undefined) => void,
+    handleUnstake: any,
+    handleApproveMarket: any,
+    handleDeposit: any,
+    handleCollateralize: any,
+}) => {
+
+
+    const hasApproval = useHasApproval(asset, marketBalanceForAsset?.total.toString() ?? "0")
     const showApproval = !hasApproval
     // We show enable as Collateral only if this asset has not yet been anabled
-    const showEnableAsCollateral = !assets[assetIndex]?.membership
+    const showEnableAsCollateral = !asset?.membership
     // If you dont have any staked, you dont need to unstake to enter this market
     const showUnstake = !marketBalanceForAsset?.stakedBalance?.isZero() ?? true
 
-    const activeSymbol = tokensData[assets[assetIndex]?.underlyingToken]?.symbol
+    const activeSymbol = tokensData[asset?.underlyingToken]?.symbol
+
+    // Skip to step conditionally
+    useEffect(() => {
+        if (!showUnstake) setStep(2)
+        else if (hasApproval) setStep(3)
+        else setStep(undefined)
+    }, [assetIndex])
+
 
     return (
         <ExpandableCard
             variant="light"
             p={3}
+            inAccordion={true}
+            
             expandableChildren={
                 <Box textAlign="center">
                     <Text pb={4}>
@@ -344,21 +361,21 @@ const Market = ({
             }
         >
             <VStack>
-                <HStack key={market}>
-                    <Avatar src={tokensData[marketsUnderlyingMap[market]]?.logoURL} />
+                <HStack key={asset.cToken}>
+                    <Avatar src={tokensData[marketsUnderlyingMap[asset.cToken]]?.logoURL} />
                     <Heading>
-                        {tokensData[marketsUnderlyingMap[market]]?.symbol}
+                        {tokensData[marketsUnderlyingMap[asset.cToken]]?.symbol}
                     </Heading>
                 </HStack>
                 <HStack>
                     <Text>
-                        {commify(parseFloat(formatEther(marketsBalancesMap[market].stakedBalance)).toFixed(2))} staked
+                        {commify(parseFloat(formatEther(marketBalanceForAsset.stakedBalance)).toFixed(2))} staked
                     </Text>
                     <Text>
                         &middot;
                     </Text>
                     <Text>
-                        {commify(parseFloat(formatEther(marketsBalancesMap[market].curveBalance)).toFixed(2))} in Curve
+                        {commify(parseFloat(formatEther(marketBalanceForAsset.curveBalance)).toFixed(2))} in Curve
                     </Text>
                 </HStack>
             </VStack>
diff --git a/src/context/RariContext.tsx b/src/context/RariContext.tsx
index c9937b04..a747859e 100644
--- a/src/context/RariContext.tsx
+++ b/src/context/RariContext.tsx
@@ -132,7 +132,7 @@ export const RariProvider = ({ children }: { children: ReactNode }) => {
   const { t } = useTranslation();
 
   useEffect(() => {
-    if (!!requestedAddress) setAddress(requestedAddress as string)
+    // if (!!requestedAddress) setAddress(requestedAddress as string)
   }, [requestedAddress])
 
   useEffect(() => {
diff --git a/src/hooks/useBorrowLimit.ts b/src/hooks/useBorrowLimit.ts
index 4220620d..9c1a9628 100644
--- a/src/hooks/useBorrowLimit.ts
+++ b/src/hooks/useBorrowLimit.ts
@@ -23,7 +23,6 @@ export const useBorrowLimit = (
     }
 
     const result = _maxBorrow.div(constants.WeiPerEther);
-    // console.log({result, _maxBorrow, id})
     return result
   }, [assets, options?.ignoreIsEnabledCheckFor]);
 

From 434df496ad7bda1e9b42e994805e47e77ef79ffe Mon Sep 17 00:00:00 2001
From: sharad-s <sharadshekar@gmail.com>
Date: Thu, 17 Mar 2022 10:11:55 -0500
Subject: [PATCH 13/19] modal ui

---
 .../pages/Fuse/Modals/CVXMigrateModal.tsx     | 89 ++++++++++++-------
 1 file changed, 58 insertions(+), 31 deletions(-)

diff --git a/src/components/pages/Fuse/Modals/CVXMigrateModal.tsx b/src/components/pages/Fuse/Modals/CVXMigrateModal.tsx
index 2338ef07..bf3d11c9 100644
--- a/src/components/pages/Fuse/Modals/CVXMigrateModal.tsx
+++ b/src/components/pages/Fuse/Modals/CVXMigrateModal.tsx
@@ -28,10 +28,10 @@ import { useFusePoolData } from "hooks/useFusePoolData"
 import useHasApproval from "hooks/useHasApproval"
 import { useTokensDataAsMap } from "hooks/useTokenData"
 import { Button, ExpandableCard, Heading } from "rari-components";
-import { useEffect, useState } from "react"
+import { useEffect, useMemo, useState } from "react"
 import { useQuery } from "react-query"
 import { TokensDataMap } from "types/tokens"
-import { smallStringUsdFormatter } from "utils/bigUtils"
+import { shortUsdFormatter, smallStringUsdFormatter } from "utils/bigUtils"
 import { checkAllowanceAndApprove, collateralize, deposit, unstakeAndWithdrawCVXPool } from "utils/convex/migratePositions"
 import { handleGenericError } from "utils/errorHandling"
 import { USDPricedFuseAsset } from "utils/fetchFusePoolData"
@@ -90,6 +90,8 @@ export const CVXMigrateModal = ({
         }
     }, {})
 
+    console.log({ marketsBalancesMap })
+
     const market = assets[assetIndex]
     const marketBalanceForAsset = marketsBalancesMap[market?.cToken]
 
@@ -225,33 +227,34 @@ export const CVXMigrateModal = ({
                                     {!!(Object.keys(curveLPBalances)).length && ` and ${Object.keys(curveLPBalances).length} Curve LP tokens`}.
                                     You can borrow up to <b>{smallStringUsdFormatter(borrowLimit.toString())}</b> by migrating them to Fuse.</Text>
                                 {/* Select from available markets */}
-                                <Accordion  allowToggle index={assetIndex} onChange={(i: number) => setAssetIndex(i)}>
-                                <VStack align="stretch" py={4}>
-                                    {Object.keys(marketsBalancesMap).map((market, i) =>
-                                        <Market
-                                            assetIndex={assetIndex}
-                                            asset={assets[i]}
-                                            setAssetIndex={setAssetIndex}
-                                            i={i}
-                                            tokensData={tokenData}
-                                            marketsUnderlyingMap={marketsUnderlyingMap}
-                                            marketBalanceForAsset={marketsBalancesMap[market]}
-                                            step={step}
-                                            activeStep={activeStep}
-                                            setStep={setStep}
-                                            handleUnstake={handleUnstake}
-                                            handleApproveMarket={handleApproveMarket}
-                                            handleDeposit={handleDeposit}
-                                            handleCollateralize={handleCollateralize}
-                                        />
-                                    )}
-                                </VStack>
+                                <Accordion allowToggle index={assetIndex} onChange={(i: number) => setAssetIndex(i)}>
+                                    <VStack align="stretch" py={4}>
+                                        {Object.keys(marketsBalancesMap).map((market, i) =>
+                                            <Market
+                                                assetIndex={assetIndex}
+                                                asset={assets[i]}
+                                                setAssetIndex={setAssetIndex}
+                                                i={i}
+                                                tokensData={tokenData}
+                                                marketsUnderlyingMap={marketsUnderlyingMap}
+                                                marketBalanceForAsset={marketsBalancesMap[market]}
+                                                step={step}
+                                                activeStep={activeStep}
+                                                setStep={setStep}
+                                                handleUnstake={handleUnstake}
+                                                handleApproveMarket={handleApproveMarket}
+                                                handleDeposit={handleDeposit}
+                                                handleCollateralize={handleCollateralize}
+                                                updatedAssets={updatedUserAssets}
+                                            />
+                                        )}
+                                    </VStack>
                                 </Accordion>
                             </VStack>
                         </Flex>
                     </ModalBody>
                     <ModalFooter mt={2}>
-
+                        <Button onClick={onClose}>Close</Button>
                     </ModalFooter>
                 </ModalContent>
             </Modal>
@@ -272,7 +275,8 @@ const Market = ({
     handleUnstake,
     handleApproveMarket,
     handleDeposit,
-    handleCollateralize
+    handleCollateralize,
+    updatedAssets
 }: {
     assetIndex: number,
     setAssetIndex: (step: number) => void,
@@ -292,6 +296,7 @@ const Market = ({
     handleApproveMarket: any,
     handleDeposit: any,
     handleCollateralize: any,
+    updatedAssets: USDPricedFuseAsset[] | undefined
 }) => {
 
 
@@ -304,11 +309,27 @@ const Market = ({
 
     const activeSymbol = tokensData[asset?.underlyingToken]?.symbol
 
+    const [numClicks, setNumClicks] = useState(3)
+
+    const updatedAsset = useMemo(() => {
+        if (!!updatedAssets && !!asset) {
+            return updatedAssets.find(a => a.cToken === asset.cToken)
+        }
+    }, [updatedAssets, asset])
+
     // Skip to step conditionally
     useEffect(() => {
-        if (!showUnstake) setStep(2)
-        else if (hasApproval) setStep(3)
+        let clicks = 3
+        if (!showUnstake) {
+            setStep(2)
+            clicks -= 1
+        }
+        if (hasApproval) {
+            setStep(3)
+            clicks -= 1
+        }
         else setStep(undefined)
+        setNumClicks(clicks)
     }, [assetIndex])
 
 
@@ -317,11 +338,11 @@ const Market = ({
             variant="light"
             p={3}
             inAccordion={true}
-            
+
             expandableChildren={
                 <Box textAlign="center">
                     <Text pb={4}>
-                        Migrate <b>{activeSymbol}</b> in 3 clicks
+                        Migrate <b>{activeSymbol}</b> in {numClicks} click{numClicks !== 1 && 's'}
                     </Text>
 
                     <VStack py={2} align="stretch">
@@ -375,9 +396,15 @@ const Market = ({
                         &middot;
                     </Text>
                     <Text>
-                        {commify(parseFloat(formatEther(marketBalanceForAsset.curveBalance)).toFixed(2))} in Curve
+                        {commify(parseFloat(formatEther(marketBalanceForAsset.curveBalance)).toFixed(2))} unstaked
                     </Text>
-                </HStack>
+                    {/* <Text>
+                        &middot;
+                    </Text>
+                    <Text>
+                        {shortUsdFormatter(updatedAsset?.supplyBalanceUSD.toString() ?? '0')}
+                    </Text>               */}
+                      </HStack>
             </VStack>
         </ExpandableCard>
     )

From 0475fd09b146899614e01017b00a3f8a5d941353 Mon Sep 17 00:00:00 2001
From: sharad-s <sharadshekar@gmail.com>
Date: Mon, 21 Mar 2022 23:24:36 -0500
Subject: [PATCH 14/19] convex rewards APRs without base crv rewards

---
 .../Fuse/FusePoolPage/IncentivesRows.tsx      | 54 +++++++++++--------
 .../Modals/PluginModal/PluginRewardsModal.tsx | 14 ++---
 src/utils/multicall.ts                        |  3 --
 3 files changed, 39 insertions(+), 32 deletions(-)

diff --git a/src/components/pages/Fuse/FusePoolPage/IncentivesRows.tsx b/src/components/pages/Fuse/FusePoolPage/IncentivesRows.tsx
index b90ee714..a082e4f5 100644
--- a/src/components/pages/Fuse/FusePoolPage/IncentivesRows.tsx
+++ b/src/components/pages/Fuse/FusePoolPage/IncentivesRows.tsx
@@ -4,6 +4,7 @@ import {
     Text,
     useDisclosure,
     AvatarGroup,
+    HStack,
 } from "@chakra-ui/react";
 import { Row } from "lib/chakraUtils";
 import { SimpleTooltip } from "components/shared/SimpleTooltip";
@@ -77,8 +78,8 @@ export const PluginIncentivesRow: React.FC<{
 }> = ({ incentives, market, tokenData }) => {
 
     const { isOpen, onOpen, onClose } = useDisclosure()
-
     const rewardTokens = Object.keys(incentives).map((flywheel, i) => incentives[flywheel].rewardToken)
+    const apr = Object.values(incentives).reduce((number, value) => value.formattedAPR + number, 0)
 
     return (
         <>
@@ -88,35 +89,42 @@ export const PluginIncentivesRow: React.FC<{
                 // mb={.5}
                 crossAxisAlignment="center"
                 mainAxisAlignment="flex-end"
-                py={2}
+                py={4}
                 zIndex={10}
                 onClick={(e) => {
                     e.stopPropagation();
                     onOpen();
                 }}
             >
-                <Text fontWeight="bold" mr={1}>
-                    + 🔌
-                </Text>
+                <HStack>
+                    <Text fontWeight="bold" px={1} fontSize="sm">
+                    {`+`}
+                    </Text>
+                </HStack>
                 <SimpleTooltip label={"Click for more info"}>
-                    <AvatarGroup size="xs" max={30} ml={2} mr={1} spacing={1} >
-                        {rewardTokens.map((rewardToken, i) => {
-                            return (
-                                <CTokenIcon
-                                    key={i}
-                                    address={rewardToken}
-                                    boxSize="20px"
-                                    // onMouseEnter={() => handleMouseEnter(i)}
-                                    // onMouseLeave={() => handleMouseLeave()}
-                                    _hover={{
-                                        zIndex: 9,
-                                        border: ".5px solid white",
-                                        transform: "scale(1.3);",
-                                    }}
-                                />
-                            );
-                        })}
-                    </AvatarGroup>
+                    <HStack>
+                        <AvatarGroup size="xs" max={30} ml={1} mr={1} spacing={1} >
+                            {rewardTokens.map((rewardToken, i) => {
+                                return (
+                                    <CTokenIcon
+                                        key={i}
+                                        address={rewardToken}
+                                        boxSize="20px"
+                                        // onMouseEnter={() => handleMouseEnter(i)}
+                                        // onMouseLeave={() => handleMouseLeave()}
+                                        _hover={{
+                                            zIndex: 9,
+                                            border: ".5px solid white",
+                                            transform: "scale(1.3);",
+                                        }}
+                                    />
+                                );
+                            })}
+                        </AvatarGroup>
+                        <Text color={tokenData?.color} fontWeight="bold" pl={1} fontSize="sm">
+                            {apr.toFixed(2)}% APR
+                        </Text>
+                    </HStack>
                 </SimpleTooltip>
             </Row>
         </>
diff --git a/src/components/pages/Fuse/Modals/PluginModal/PluginRewardsModal.tsx b/src/components/pages/Fuse/Modals/PluginModal/PluginRewardsModal.tsx
index 6d06cfda..44aeb673 100644
--- a/src/components/pages/Fuse/Modals/PluginModal/PluginRewardsModal.tsx
+++ b/src/components/pages/Fuse/Modals/PluginModal/PluginRewardsModal.tsx
@@ -13,7 +13,8 @@ import {
     Link,
     Button,
     Heading,
-VStack,
+    VStack,
+    HStack,
 } from "@chakra-ui/react"
 import { TokenData } from "hooks/useTokenData"
 import { USDPricedFuseAsset } from "utils/fetchFusePoolData"
@@ -59,10 +60,11 @@ export const PluginRewardsModal = ({
                                 {/* <AppLink isExternal={true} href="https://www.convexfinance.com/stake"> */}
                                 <VStack align={"flex-start"} my={2}>
                                     <InfoIcon size="15px" />
-                                    <Text>This market streams
-                                        <CTokenAvatarGroup tokenAddresses={rewardTokens} popOnHover={false} /> rewards
-                                        from the <b>{CONVEX_CTOKEN_INFO[market.underlyingSymbol].convexPoolName}</b> Convex pool
-                                        to suppliers of <b>{CONVEX_CTOKEN_INFO[market.underlyingSymbol].curvePoolName}</b> Curve LPs. </Text>
+                                    <HStack>
+                                        <Text>This market streams </Text> <CTokenAvatarGroup tokenAddresses={rewardTokens} popOnHover={false} /> <Text>rewards</Text>
+                                    </HStack>
+                                    <Text> from the <b>{CONVEX_CTOKEN_INFO[market.underlyingSymbol].convexPoolName}</b> Convex pool </Text>
+                                    <Text> to suppliers of <b>{CONVEX_CTOKEN_INFO[market.underlyingSymbol].curvePoolName}</b> Curve LPs. </Text>
                                     {/* <Text fontSize="sm"> Deposit your {CONVEX_CTOKEN_INFO[market.underlyingSymbol].curvePoolName} Curve LP tokens into Fuse to borrow against it while earning all the same rewards from Convex.</Text> */}
                                     {/* <Text py={1}>View reward rates for <b>{CONVEX_CTOKEN_INFO[market.underlyingSymbol].convexPoolName}</b> on Convex </Text> */}
                                 </VStack>
@@ -82,7 +84,7 @@ export const PluginRewardsModal = ({
                     </ModalBody>
                     <ModalFooter mt={2}>
                         <AppLink isExternal={true} href="https://www.convexfinance.com/stake">
-                            <Button colorScheme='white' minW="100%">
+                            <Button colorScheme='blue' minW="100%">
                                 View rates for {' '} <Text mx={1} fontWeight={"bold"}>{CONVEX_CTOKEN_INFO[market.underlyingSymbol].convexPoolName}</Text>  {' '} on Convex
                             </Button>
                         </AppLink>
diff --git a/src/utils/multicall.ts b/src/utils/multicall.ts
index acd021fb..2b6456ef 100644
--- a/src/utils/multicall.ts
+++ b/src/utils/multicall.ts
@@ -102,9 +102,6 @@ export const decodeCall = (
   iface.decodeFunctionResult(functionName, txResult);
 
 
-
-
-  
 const MULTICALL_ADDRESS = "0xcA11bde05977b3631167028862bE2a173976CA11";
 
 const MultiCallAbi = [

From 36d474990c3cafa4f08433c57ac76898c5219f54 Mon Sep 17 00:00:00 2001
From: sharad-s <sharadshekar@gmail.com>
Date: Tue, 22 Mar 2022 08:49:27 -0500
Subject: [PATCH 15/19] ui cleanup for migrator

---
 .../pages/Fuse/Modals/CVXMigrateModal.tsx     | 71 ++++++++++++-------
 .../Modals/PluginModal/PluginRewardsModal.tsx |  3 +-
 src/components/shared/Layout/Layout.tsx       |  2 +-
 src/hooks/useTokenData.ts                     |  2 +-
 4 files changed, 49 insertions(+), 29 deletions(-)

diff --git a/src/components/pages/Fuse/Modals/CVXMigrateModal.tsx b/src/components/pages/Fuse/Modals/CVXMigrateModal.tsx
index bf3d11c9..92b85172 100644
--- a/src/components/pages/Fuse/Modals/CVXMigrateModal.tsx
+++ b/src/components/pages/Fuse/Modals/CVXMigrateModal.tsx
@@ -15,13 +15,16 @@ import {
     Image,
     Box,
     Accordion,
+    AvatarGroup,
 } from "@chakra-ui/react"
+import { CTokenAvatarGroup, CTokenIcon } from "components/shared/Icons/CTokenIcon"
 import { POOL_156_COMPTROLLER } from "constants/convex"
 import { useRari } from "context/RariContext"
 import { getEthUsdPriceBN } from "esm/utils/getUSDPriceBN"
 import { BigNumber, constants } from "ethers"
 import { commify, parseEther } from "ethers/lib/utils"
 import { formatEther } from "ethers/lib/utils"
+import { FlywheelPluginRewardsMap, useConvexPoolIncentives } from "hooks/convex/useConvexRewards"
 import { useCurveLPBalances, useStakedConvexBalances } from "hooks/convex/useStakedConvexBalances"
 import { useBorrowLimit, useTotalSupply } from "hooks/useBorrowLimit"
 import { useFusePoolData } from "hooks/useFusePoolData"
@@ -50,23 +53,24 @@ export const CVXMigrateModal = ({
 
     // Fuse pool Data
     const fusePoolData = useFusePoolData("156")
+    const { incentives } = useConvexPoolIncentives(fusePoolData?.comptroller) ?? { incentives: {} };
+
     const assets = !fusePoolData ? [] : fusePoolData.assets.filter(a => Object.keys(cvxBalances).includes(a.cToken) || Object.keys(curveLPBalances).includes(a.underlyingToken))
     const [assetIndex, setAssetIndex] = useState(0)
     const tokenData = useTokensDataAsMap(assets.map(a => a.underlyingToken))
 
-
     // Steppers
     const toast = useToast()
     const [step, setStep] = useState<number | undefined>()
     const [activeStep, setActiveStep] = useState<number | undefined>()
 
+
     // marketAddr -> underlying
     const marketsUnderlyingMap: { [underlying: string]: string } = assets.reduce((obj, asset) => ({
         ...obj,
         [asset.cToken]: asset.underlyingToken
     }), {})
 
-
     // marketAddr -> migratable balances data
     const marketsBalancesMap: {
         [marketAddr: string]: {
@@ -90,10 +94,9 @@ export const CVXMigrateModal = ({
         }
     }, {})
 
-    console.log({ marketsBalancesMap })
-
     const market = assets[assetIndex]
     const marketBalanceForAsset = marketsBalancesMap[market?.cToken]
+    const pluginIncentivesForAsset = incentives[market?.cToken]
 
     // Simulates you depositing all your CVX positions into us - to get projected totalSupply & projected borrowLimit
     const { data: updatedUserAssets } = useQuery('updated assets for convex user ' + address, async () => {
@@ -105,8 +108,6 @@ export const CVXMigrateModal = ({
                 const assetToBeUpdated = asset
                 const amount = (marketsBalancesMap[asset.cToken].total)
 
-                console.log({ assetToBeUpdated, amount })
-
                 const supplyBalance = assetToBeUpdated.supplyBalance.add(amount);
                 const totalSupply = assetToBeUpdated.totalSupply.add(amount);
 
@@ -222,10 +223,10 @@ export const CVXMigrateModal = ({
                             {/* <AppLink isExternal={true} href="https://www.convexfinance.com/stake"> */}
                             <VStack align="stretch" my={2}>
                                 <Text>
-                                    We detected <b>{smallStringUsdFormatter(newTotalSupply.toString())}</b> from {Object.keys(cvxBalances).length}{' '}
+                                    We detected <b>{newTotalSupply.isZero() ? '?' : smallStringUsdFormatter(newTotalSupply.toString())}</b> from {Object.keys(cvxBalances).length}{' '}
                                     staked Convex positions
                                     {!!(Object.keys(curveLPBalances)).length && ` and ${Object.keys(curveLPBalances).length} Curve LP tokens`}.
-                                    You can borrow up to <b>{smallStringUsdFormatter(borrowLimit.toString())}</b> by migrating them to Fuse.</Text>
+                                    You can keep earning CVX + CRV rewards and borrow up to <b>{borrowLimit.isZero() ? '?' : smallStringUsdFormatter(borrowLimit.toString())}</b> by migrating them to Fuse.</Text>
                                 {/* Select from available markets */}
                                 <Accordion allowToggle index={assetIndex} onChange={(i: number) => setAssetIndex(i)}>
                                     <VStack align="stretch" py={4}>
@@ -246,6 +247,7 @@ export const CVXMigrateModal = ({
                                                 handleDeposit={handleDeposit}
                                                 handleCollateralize={handleCollateralize}
                                                 updatedAssets={updatedUserAssets}
+                                                pluginIncentivesForAsset={pluginIncentivesForAsset}
                                             />
                                         )}
                                     </VStack>
@@ -254,7 +256,19 @@ export const CVXMigrateModal = ({
                         </Flex>
                     </ModalBody>
                     <ModalFooter mt={2}>
-                        <Button onClick={onClose}>Close</Button>
+                        {!localStorage.RARI_HIDE_MIGRATOR_POPUP && (
+                            <Button bg="grey"
+                                onClick={() => {
+                                    localStorage.setItem("RARI_HIDE_MIGRATOR_POPUP", "true")
+                                    onClose()
+                                }}
+                            >
+                                <Text>Close and Don't Show Again</Text>
+                            </Button>
+                        )}
+                        <Button colorScheme="blue" onClick={onClose} ml={2}>
+                            <Text>Close</Text>
+                        </Button>
                     </ModalFooter>
                 </ModalContent>
             </Modal>
@@ -276,7 +290,8 @@ const Market = ({
     handleApproveMarket,
     handleDeposit,
     handleCollateralize,
-    updatedAssets
+    updatedAssets,
+    pluginIncentivesForAsset
 }: {
     assetIndex: number,
     setAssetIndex: (step: number) => void,
@@ -296,10 +311,10 @@ const Market = ({
     handleApproveMarket: any,
     handleDeposit: any,
     handleCollateralize: any,
-    updatedAssets: USDPricedFuseAsset[] | undefined
+    updatedAssets: USDPricedFuseAsset[] | undefined,
+    pluginIncentivesForAsset: FlywheelPluginRewardsMap | undefined,
 }) => {
 
-
     const hasApproval = useHasApproval(asset, marketBalanceForAsset?.total.toString() ?? "0")
     const showApproval = !hasApproval
     // We show enable as Collateral only if this asset has not yet been anabled
@@ -307,7 +322,8 @@ const Market = ({
     // If you dont have any staked, you dont need to unstake to enter this market
     const showUnstake = !marketBalanceForAsset?.stakedBalance?.isZero() ?? true
 
-    const activeSymbol = tokensData[asset?.underlyingToken]?.symbol
+    const tokenData = tokensData[asset?.underlyingToken]
+    const activeSymbol = tokenData?.symbol ?? asset?.underlyingSymbol
 
     const [numClicks, setNumClicks] = useState(3)
 
@@ -317,6 +333,9 @@ const Market = ({
         }
     }, [updatedAssets, asset])
 
+    const rewardTokens = Object.keys(pluginIncentivesForAsset ?? {})?.map((flywheel, i) => pluginIncentivesForAsset[flywheel].rewardToken) ?? []
+    const apr = Object.values(pluginIncentivesForAsset ?? {})?.reduce((number, value) => value.formattedAPR + number, 0) ?? 0
+
     // Skip to step conditionally
     useEffect(() => {
         let clicks = 3
@@ -338,12 +357,20 @@ const Market = ({
             variant="light"
             p={3}
             inAccordion={true}
-
             expandableChildren={
                 <Box textAlign="center">
-                    <Text pb={4}>
-                        Migrate <b>{activeSymbol}</b> in {numClicks} click{numClicks !== 1 && 's'}
-                    </Text>
+                    <VStack align="center" pb={3}>
+                        <Text>
+                            Migrate <b>{activeSymbol}</b> in {numClicks} click{numClicks !== 1 && 's'} and earn
+                        </Text>
+                        <HStack>
+                            <CTokenAvatarGroup tokenAddresses={rewardTokens} size="xs" max={30} ml={1} mr={1} />
+                            <Text color={tokenData?.color} pl={1} fontSize="sm" fontWeight={"bold"}>
+                                {apr.toFixed(2)}% APR
+                            </Text>
+                        </HStack>
+                    </VStack>
+
 
                     <VStack py={2} align="stretch">
                         {showUnstake && (
@@ -385,7 +412,7 @@ const Market = ({
                 <HStack key={asset.cToken}>
                     <Avatar src={tokensData[marketsUnderlyingMap[asset.cToken]]?.logoURL} />
                     <Heading>
-                        {tokensData[marketsUnderlyingMap[asset.cToken]]?.symbol}
+                        {activeSymbol}
                     </Heading>
                 </HStack>
                 <HStack>
@@ -398,13 +425,7 @@ const Market = ({
                     <Text>
                         {commify(parseFloat(formatEther(marketBalanceForAsset.curveBalance)).toFixed(2))} unstaked
                     </Text>
-                    {/* <Text>
-                        &middot;
-                    </Text>
-                    <Text>
-                        {shortUsdFormatter(updatedAsset?.supplyBalanceUSD.toString() ?? '0')}
-                    </Text>               */}
-                      </HStack>
+                </HStack>
             </VStack>
         </ExpandableCard>
     )
diff --git a/src/components/pages/Fuse/Modals/PluginModal/PluginRewardsModal.tsx b/src/components/pages/Fuse/Modals/PluginModal/PluginRewardsModal.tsx
index 44aeb673..448f0cbc 100644
--- a/src/components/pages/Fuse/Modals/PluginModal/PluginRewardsModal.tsx
+++ b/src/components/pages/Fuse/Modals/PluginModal/PluginRewardsModal.tsx
@@ -67,14 +67,13 @@ export const PluginRewardsModal = ({
                                     <Text> to suppliers of <b>{CONVEX_CTOKEN_INFO[market.underlyingSymbol].curvePoolName}</b> Curve LPs. </Text>
                                     {/* <Text fontSize="sm"> Deposit your {CONVEX_CTOKEN_INFO[market.underlyingSymbol].curvePoolName} Curve LP tokens into Fuse to borrow against it while earning all the same rewards from Convex.</Text> */}
                                     {/* <Text py={1}>View reward rates for <b>{CONVEX_CTOKEN_INFO[market.underlyingSymbol].convexPoolName}</b> on Convex </Text> */}
+                                    <Text fontSize={"sm"}> * Rates shown do not include the base Curve vAPRs, but you get those too</Text>
                                 </VStack>
                                 {/* </AppLink> */}
 
-
                                 <Heading size="sm" mt={6} mb={1}>
                                     Info
                                 </Heading>
-
                                 <InfoPairs title="Curve Pool" link={CONVEX_CTOKEN_INFO[market.underlyingSymbol].curvePoolLink} address={''} />
                                 <InfoPairs title="Curve LP Token" address={CONVEX_CTOKEN_INFO[market.underlyingSymbol].lpToken} />
                                 <InfoPairs title="ERC4626 Plugin" address={CONVEX_CTOKEN_INFO[market.underlyingSymbol].plugin} />
diff --git a/src/components/shared/Layout/Layout.tsx b/src/components/shared/Layout/Layout.tsx
index 24e0abba..0bb005ac 100644
--- a/src/components/shared/Layout/Layout.tsx
+++ b/src/components/shared/Layout/Layout.tsx
@@ -51,7 +51,7 @@ const Layout = ({ children }) => {
   console.log({ cvxBalances, curveLPBalances })
 
   useEffect(() => {
-    if (!!hasCvxBalances) onOpen()
+    if (!!hasCvxBalances && (!localStorage.RARI_HIDE_MIGRATOR_POPUP)) onOpen()
   }, [hasCvxBalances])
 
   return (
diff --git a/src/hooks/useTokenData.ts b/src/hooks/useTokenData.ts
index 4b8d4c92..691b57e1 100644
--- a/src/hooks/useTokenData.ts
+++ b/src/hooks/useTokenData.ts
@@ -70,7 +70,7 @@ export const fetchTokenData = async (
     try {
       // Since running the vercel functions requires a Vercel account and is super slow,
       // just fetch this data from the live site in development:
-      let url = `https://v2.rari.capital/api/tokenData?address=${address.toLowerCase()}&chainId=${_chainId}`;
+      let url =  _chainId === 1 ? `https://v2.rari.capital/api/tokenData?address=${address.toLowerCase()}` :  `https://v2.rari.capital/api/tokenData?address=${address.toLowerCase()}&chainId=${_chainId}`;
 
       data = {
         ...(await fetch(url).then((res) => res.json())),

From b1fd26476986c275f763f1be9dd99a8a65550538 Mon Sep 17 00:00:00 2001
From: sharad-s <sharadshekar@gmail.com>
Date: Tue, 22 Mar 2022 08:53:51 -0500
Subject: [PATCH 16/19] build err

---
 src/components/pages/Fuse/Modals/CVXMigrateModal.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/pages/Fuse/Modals/CVXMigrateModal.tsx b/src/components/pages/Fuse/Modals/CVXMigrateModal.tsx
index 92b85172..6c2c9b2a 100644
--- a/src/components/pages/Fuse/Modals/CVXMigrateModal.tsx
+++ b/src/components/pages/Fuse/Modals/CVXMigrateModal.tsx
@@ -333,7 +333,7 @@ const Market = ({
         }
     }, [updatedAssets, asset])
 
-    const rewardTokens = Object.keys(pluginIncentivesForAsset ?? {})?.map((flywheel, i) => pluginIncentivesForAsset[flywheel].rewardToken) ?? []
+    const rewardTokens = Object.keys(pluginIncentivesForAsset ?? {})?.map((flywheel, i) => pluginIncentivesForAsset?.[flywheel].rewardToken) ?? []
     const apr = Object.values(pluginIncentivesForAsset ?? {})?.reduce((number, value) => value.formattedAPR + number, 0) ?? 0
 
     // Skip to step conditionally

From a045db4cf1c8fbd55d757ef0273f290e6f4729d5 Mon Sep 17 00:00:00 2001
From: sharad-s <sharadshekar@gmail.com>
Date: Tue, 22 Mar 2022 08:57:36 -0500
Subject: [PATCH 17/19] build err

---
 src/components/pages/Fuse/Modals/CVXMigrateModal.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/pages/Fuse/Modals/CVXMigrateModal.tsx b/src/components/pages/Fuse/Modals/CVXMigrateModal.tsx
index 6c2c9b2a..f05de227 100644
--- a/src/components/pages/Fuse/Modals/CVXMigrateModal.tsx
+++ b/src/components/pages/Fuse/Modals/CVXMigrateModal.tsx
@@ -333,7 +333,7 @@ const Market = ({
         }
     }, [updatedAssets, asset])
 
-    const rewardTokens = Object.keys(pluginIncentivesForAsset ?? {})?.map((flywheel, i) => pluginIncentivesForAsset?.[flywheel].rewardToken) ?? []
+    const rewardTokens = Object.keys(pluginIncentivesForAsset ?? {})?.map((flywheel, i) => pluginIncentivesForAsset![flywheel].rewardToken) ?? []
     const apr = Object.values(pluginIncentivesForAsset ?? {})?.reduce((number, value) => value.formattedAPR + number, 0) ?? 0
 
     // Skip to step conditionally

From 87f1af0f3e8ad41c7d9b01dadc0d85df454420e8 Mon Sep 17 00:00:00 2001
From: sharad-s <sharadshekar@gmail.com>
Date: Tue, 22 Mar 2022 11:07:32 -0500
Subject: [PATCH 18/19] bump rari components

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

diff --git a/package.json b/package.json
index 8beec3e9..b904132a 100644
--- a/package.json
+++ b/package.json
@@ -35,7 +35,7 @@
     "node-fetch": "^2.6.1",
     "node-vibrant": "^3.1.6",
     "polished": "^4.1.3",
-    "rari-components": "git+https://github.com/Rari-Capital/rari-components#9541f72a093da5969155d53324d281a90f7c6b1e",
+    "rari-components": "git+https://github.com/Rari-Capital/rari-components#7ddc0eb58507b28e8b4be026cabb26294f179d0b",
     "rari-tokens-generator": "^2.0.0",
     "react": "^17.0.2",
     "react-apexcharts": "1.3.7",

From 14cf6876c055655618b3d92367f17196603be186 Mon Sep 17 00:00:00 2001
From: nathanhleung <github@nathanhleung.com>
Date: Tue, 22 Mar 2022 09:57:45 -0700
Subject: [PATCH 19/19] Import from rari-components/standalone instead

---
 package-lock.json                                    | 12 ++++++------
 src/components/pages/Fuse/Modals/CVXMigrateModal.tsx |  2 +-
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 77d213d5..b2ab9991 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -41,7 +41,7 @@
         "node-fetch": "^2.6.1",
         "node-vibrant": "^3.1.6",
         "polished": "^4.1.3",
-        "rari-components": "git+https://github.com/Rari-Capital/rari-components#9541f72a093da5969155d53324d281a90f7c6b1e",
+        "rari-components": "git+https://github.com/Rari-Capital/rari-components#7ddc0eb58507b28e8b4be026cabb26294f179d0b",
         "rari-tokens-generator": "^2.0.0",
         "react": "^17.0.2",
         "react-apexcharts": "1.3.7",
@@ -15788,8 +15788,8 @@
     },
     "node_modules/rari-components": {
       "version": "0.0.1",
-      "resolved": "git+ssh://git@github.com/Rari-Capital/rari-components.git#9541f72a093da5969155d53324d281a90f7c6b1e",
-      "integrity": "sha512-4bPXZTlG+RbAyrhoZzVSaUNIibshxfv0Sj8ta5Ni1xraUKrTDLCJ+FGQ0q6M34okz4bHNOz8yaT6PHdO+FvU4Q==",
+      "resolved": "git+ssh://git@github.com/Rari-Capital/rari-components.git#7ddc0eb58507b28e8b4be026cabb26294f179d0b",
+      "integrity": "sha512-27en+sZhntPvTW1XKaZ1jt6+NN1RmZcxgdn9/7tt34rBAohRRbZIhh/pkAt7Z5pjwLoBvscT0PSyXWCmXUqmjg==",
       "peerDependencies": {
         "@chakra-ui/icons": "1.x",
         "@chakra-ui/react": "^1.8",
@@ -32578,9 +32578,9 @@
       "integrity": "sha512-Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg=="
     },
     "rari-components": {
-      "version": "git+ssh://git@github.com/Rari-Capital/rari-components.git#9541f72a093da5969155d53324d281a90f7c6b1e",
-      "integrity": "sha512-4bPXZTlG+RbAyrhoZzVSaUNIibshxfv0Sj8ta5Ni1xraUKrTDLCJ+FGQ0q6M34okz4bHNOz8yaT6PHdO+FvU4Q==",
-      "from": "rari-components@git+https://github.com/Rari-Capital/rari-components#9541f72a093da5969155d53324d281a90f7c6b1e",
+      "version": "git+ssh://git@github.com/Rari-Capital/rari-components.git#7ddc0eb58507b28e8b4be026cabb26294f179d0b",
+      "integrity": "sha512-27en+sZhntPvTW1XKaZ1jt6+NN1RmZcxgdn9/7tt34rBAohRRbZIhh/pkAt7Z5pjwLoBvscT0PSyXWCmXUqmjg==",
+      "from": "rari-components@git+https://github.com/Rari-Capital/rari-components#7ddc0eb58507b28e8b4be026cabb26294f179d0b",
       "requires": {}
     },
     "rari-tokens-generator": {
diff --git a/src/components/pages/Fuse/Modals/CVXMigrateModal.tsx b/src/components/pages/Fuse/Modals/CVXMigrateModal.tsx
index f05de227..de9622c7 100644
--- a/src/components/pages/Fuse/Modals/CVXMigrateModal.tsx
+++ b/src/components/pages/Fuse/Modals/CVXMigrateModal.tsx
@@ -30,7 +30,7 @@ import { useBorrowLimit, useTotalSupply } from "hooks/useBorrowLimit"
 import { useFusePoolData } from "hooks/useFusePoolData"
 import useHasApproval from "hooks/useHasApproval"
 import { useTokensDataAsMap } from "hooks/useTokenData"
-import { Button, ExpandableCard, Heading } from "rari-components";
+import { Button, ExpandableCard, Heading } from "rari-components/standalone";
 import { useEffect, useMemo, useState } from "react"
 import { useQuery } from "react-query"
 import { TokensDataMap } from "types/tokens"